diff --git a/deps/v8/.github/mistaken-pull-closer.yml b/deps/v8/.github/mistaken-pull-closer.yml
new file mode 100644
index 00000000000000..b78f1f6bfc043c
--- /dev/null
+++ b/deps/v8/.github/mistaken-pull-closer.yml
@@ -0,0 +1,13 @@
+# `true` will close all PRs.
+filters:
+  - true
+
+# The message to post to the closed PR.
+commentBody: |
+  Thanks for your contribution!  Unfortunately, we don't use GitHub pull
+  requests to manage code contributions to this repository.  Instead, please
+  see https://v8.dev/docs/contribute which provides full instructions on
+  how to get involved.
+
+# Whether to add a label to the closed PR.
+addLabel: false
diff --git a/deps/v8/.gitignore b/deps/v8/.gitignore
index 11c7ae61ddaf53..b340100517a5a4 100644
--- a/deps/v8/.gitignore
+++ b/deps/v8/.gitignore
@@ -23,6 +23,7 @@
 *~
 .#*
 .*.sw?
+.cache
 .ccls-cache
 .clangd
 .cpplint-cache
@@ -60,7 +61,6 @@
 /test/wasm-spec-tests/tests.tar.gz
 /third_party/*
 !/third_party/antlr4
-!/third_party/binutils
 !/third_party/inspector_protocol
 !/third_party/jsoncpp
 /third_party/jsoncpp/source
@@ -78,6 +78,7 @@
 !/third_party/v8
 !/third_party/wasm-api
 /tools/clang
+/tools/gcmole/bootstrap
 /tools/gcmole/gcmole-tools
 /tools/gcmole/gcmole-tools.tar.gz
 /tools/jsfunfuzz/jsfunfuzz
diff --git a/deps/v8/AUTHORS b/deps/v8/AUTHORS
index 5dba6abe9b5546..716a23b5bf4058 100644
--- a/deps/v8/AUTHORS
+++ b/deps/v8/AUTHORS
@@ -28,7 +28,6 @@ IBM Inc. <*@ibm.com>
 Red Hat Inc. <*@redhat.com>
 Samsung <*@*.samsung.com>
 Samsung <*@samsung.com>
-Joyent, Inc <*@joyent.com>
 RT-RK Computer Based System <*@rt-rk.com>
 Amazon, Inc <*@amazon.com>
 ST Microelectronics <*@st.com>
@@ -61,7 +60,6 @@ Andreas Anyuru <andreas.anyuru@gmail.com>
 Andrew Paprocki <andrew@ishiboo.com>
 Andrei Kashcha <anvaka@gmail.com>
 Anna Henningsen <anna@addaleax.net>
-Antoine du Hamel <duhamelantoine1995@gmail.com>
 Anton Bikineev <ant.bikineev@gmail.com>
 Bangfu Tao <bangfu.tao@samsung.com>
 Daniel Shelton <d1.shelton@samsung.com>
@@ -136,6 +134,7 @@ Kevin Gibbons <bakkot@gmail.com>
 Kris Selden <kris.selden@gmail.com>
 Kyounga Ra <kyounga@alticast.com>
 Loo Rong Jie <loorongjie@gmail.com>
+Lu Yahan <yahan@iscas.ac.cn>
 Luis Reis <luis.m.reis@gmail.com>
 Luke Zarko <lukezarko@gmail.com>
 Maciej Małecki <me@mmalecki.com>
diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn
index 1dc6c7d5ac51df..f39529a3a953a3 100644
--- a/deps/v8/BUILD.gn
+++ b/deps/v8/BUILD.gn
@@ -45,6 +45,12 @@ declare_args() {
   # Sets --DV8_LITE_MODE.
   v8_enable_lite_mode = false
 
+  # Sets -DSYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing
+  v8_enable_system_instrumentation = false
+
+  # Sets the GUID for the ETW provider
+  v8_etw_guid = ""
+
   # Sets -DVERIFY_HEAP.
   v8_enable_verify_heap = ""
 
@@ -113,7 +119,8 @@ declare_args() {
   v8_disable_arguments_adaptor =
       v8_current_cpu == "x86" || v8_current_cpu == "x64" ||
       v8_current_cpu == "arm" || v8_current_cpu == "arm64" ||
-      v8_current_cpu == "mipsel" || v8_current_cpu == "mips64el"
+      v8_current_cpu == "mipsel" || v8_current_cpu == "mips64el" ||
+      v8_current_cpu == "ppc64" || v8_current_cpu == "s390x"
 
   # Sets -dOBJECT_PRINT.
   v8_enable_object_print = ""
@@ -422,6 +429,7 @@ config("internal_config") {
     "//build/config/compiler:wexit_time_destructors",
     ":internal_config_base",
     ":v8_header_features",
+    ":cppgc_header_features",
   ]
 
   if (is_component_build) {
@@ -459,17 +467,15 @@ config("libbase_config") {
   }
 }
 
+# Standalone cppgc cannot be built within chrome or with perfetto.
+assert(!cppgc_is_standalone || !build_with_chromium)
+assert(!cppgc_is_standalone || !v8_use_perfetto)
+
 # This config should be applied to code using the cppgc_base.
 config("cppgc_base_config") {
   defines = []
-  if (cppgc_enable_object_names) {
-    defines += [ "CPPGC_SUPPORTS_OBJECT_NAMES" ]
-  }
-  if (cppgc_enable_caged_heap) {
-    defines += [ "CPPGC_CAGED_HEAP" ]
-  }
-  if (cppgc_enable_young_generation) {
-    defines += [ "CPPGC_YOUNG_GENERATION" ]
+  if (cppgc_is_standalone) {
+    defines += [ "CPPGC_IS_STANDALONE" ]
   }
 }
 
@@ -482,7 +488,10 @@ config("libsampler_config") {
 # itself.
 config("external_config") {
   defines = []
-  configs = [ ":v8_header_features" ]
+  configs = [
+    ":v8_header_features",
+    ":cppgc_header_features",
+  ]
   if (is_component_build) {
     defines += [ "USING_V8_SHARED" ]
   }
@@ -531,6 +540,25 @@ config("v8_header_features") {
   if (v8_disable_arguments_adaptor) {
     defines += [ "V8_NO_ARGUMENTS_ADAPTOR" ]
   }
+  if (v8_use_perfetto) {
+    defines += [ "V8_USE_PERFETTO" ]
+  }
+}
+
+config("cppgc_header_features") {
+  visibility = [ ":*" ]
+
+  defines = []
+
+  if (cppgc_enable_object_names) {
+    defines += [ "CPPGC_SUPPORTS_OBJECT_NAMES" ]
+  }
+  if (cppgc_enable_caged_heap) {
+    defines += [ "CPPGC_CAGED_HEAP" ]
+  }
+  if (cppgc_enable_young_generation) {
+    defines += [ "CPPGC_YOUNG_GENERATION" ]
+  }
 }
 
 # Put defines here that are only used in our internal files and NEVER in
@@ -541,7 +569,10 @@ config("features") {
 
   defines = []
 
-  configs = [ ":v8_header_features" ]
+  configs = [
+    ":v8_header_features",
+    ":cppgc_header_features",
+  ]
 
   if (v8_embedder_string != "") {
     defines += [ "V8_EMBEDDER_STRING=\"$v8_embedder_string\"" ]
@@ -646,9 +677,6 @@ config("features") {
   if (v8_enable_shared_ro_heap) {
     defines += [ "V8_SHARED_RO_HEAP" ]
   }
-  if (v8_use_perfetto) {
-    defines += [ "V8_USE_PERFETTO" ]
-  }
   if (v8_win64_unwinding_info) {
     defines += [ "V8_WIN64_UNWINDING_INFO" ]
   }
@@ -673,6 +701,12 @@ config("features") {
   if (v8_dict_mode_prototypes) {
     defines += [ "V8_DICT_MODE_PROTOTYPES" ]
   }
+  if (v8_enable_system_instrumentation) {
+    defines += [ "V8_ENABLE_SYSTEM_INSTRUMENTATION" ]
+  }
+  if (v8_etw_guid != "") {
+    defines += [ "V8_ETW_GUID=\"$v8_etw_guid\"" ]
+  }
 }
 
 config("toolchain") {
@@ -720,6 +754,7 @@ config("toolchain") {
       # TODO(v8:10026): Enable this in src/build.
       if (current_cpu == "arm64") {
         cflags += [ "-mbranch-protection=standard" ]
+        asmflags = [ "-mmark-bti-property" ]
       }
     }
   }
@@ -811,6 +846,7 @@ config("toolchain") {
       defines += [ "V8_TARGET_ARCH_PPC" ]
     } else if (v8_current_cpu == "ppc64") {
       defines += [ "V8_TARGET_ARCH_PPC64" ]
+      cflags += [ "-ffp-contract=off" ]
     }
     if (host_byteorder == "little") {
       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
@@ -1132,6 +1168,7 @@ action("postmortem-metadata") {
 
 torque_files = [
   "src/builtins/aggregate-error.tq",
+  "src/builtins/array-at.tq",
   "src/builtins/array-copywithin.tq",
   "src/builtins/array-every.tq",
   "src/builtins/array-filter.tq",
@@ -1171,7 +1208,7 @@ torque_files = [
   "src/builtins/function.tq",
   "src/builtins/growable-fixed-array.tq",
   "src/builtins/ic-callable.tq",
-  "src/builtins/ic-dynamic-map-checks.tq",
+  "src/builtins/ic-dynamic-check-maps.tq",
   "src/builtins/ic.tq",
   "src/builtins/internal-coverage.tq",
   "src/builtins/internal.tq",
@@ -1214,6 +1251,7 @@ torque_files = [
   "src/builtins/regexp-split.tq",
   "src/builtins/regexp-test.tq",
   "src/builtins/regexp.tq",
+  "src/builtins/string-at.tq",
   "src/builtins/string-endswith.tq",
   "src/builtins/string-html.tq",
   "src/builtins/string-iterator.tq",
@@ -1227,6 +1265,7 @@ torque_files = [
   "src/builtins/string-trim.tq",
   "src/builtins/symbol.tq",
   "src/builtins/torque-internal.tq",
+  "src/builtins/typed-array-at.tq",
   "src/builtins/typed-array-createtypedarray.tq",
   "src/builtins/typed-array-every.tq",
   "src/builtins/typed-array-entries.tq",
@@ -1373,8 +1412,6 @@ template("run_torque") {
       "$target_gen_dir/torque-generated/exported-macros-assembler.h",
       "$target_gen_dir/torque-generated/csa-types.h",
       "$target_gen_dir/torque-generated/instance-types.h",
-      "$target_gen_dir/torque-generated/runtime-macros.cc",
-      "$target_gen_dir/torque-generated/runtime-macros.h",
       "$target_gen_dir/torque-generated/class-forward-declarations.h",
     ]
 
@@ -1495,7 +1532,6 @@ v8_source_set("torque_generated_definitions") {
     "$target_gen_dir/torque-generated/class-verifiers.h",
     "$target_gen_dir/torque-generated/factory.cc",
     "$target_gen_dir/torque-generated/objects-printer.cc",
-    "$target_gen_dir/torque-generated/runtime-macros.cc",
   ]
   foreach(file, torque_files) {
     filetq = string_replace(file, ".tq", "-tq")
@@ -1961,7 +1997,10 @@ v8_header_set("v8_version") {
 # can depend upon to get basic v8 types.
 v8_header_set("v8_headers") {
   configs = [ ":internal_config" ]
-  public_configs = [ ":v8_header_features" ]
+  public_configs = [
+    ":v8_header_features",
+    ":cppgc_header_features",
+  ]
 
   sources = [
     "include/v8-cppgc.h",
@@ -1982,6 +2021,12 @@ v8_header_set("v8_headers") {
   deps = [ ":v8_version" ]
 }
 
+v8_source_set("v8_wrappers") {
+  configs = [ ":internal_config" ]
+
+  sources = [ "src/base/platform/wrappers.h" ]
+}
+
 # This is split out to share basic headers with Torque.
 v8_header_set("v8_shared_internal_headers") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
@@ -2495,6 +2540,8 @@ v8_source_set("v8_base_without_compiler") {
     "src/debug/debug-stack-trace-iterator.h",
     "src/debug/debug-type-profile.cc",
     "src/debug/debug-type-profile.h",
+    "src/debug/debug-wasm-support.cc",
+    "src/debug/debug-wasm-support.h",
     "src/debug/debug.cc",
     "src/debug/debug.h",
     "src/debug/interface-types.h",
@@ -2555,6 +2602,7 @@ v8_source_set("v8_base_without_compiler") {
     "src/execution/protectors.h",
     "src/execution/runtime-profiler.cc",
     "src/execution/runtime-profiler.h",
+    "src/execution/shared-mutex-guard-if-off-thread.h",
     "src/execution/simulator-base.cc",
     "src/execution/simulator-base.h",
     "src/execution/simulator.h",
@@ -2709,6 +2757,7 @@ v8_source_set("v8_base_without_compiler") {
     "src/heap/paged-spaces.cc",
     "src/heap/paged-spaces.h",
     "src/heap/parallel-work-item.h",
+    "src/heap/parked-scope.h",
     "src/heap/read-only-heap-inl.h",
     "src/heap/read-only-heap.cc",
     "src/heap/read-only-heap.h",
@@ -3111,6 +3160,8 @@ v8_source_set("v8_base_without_compiler") {
     "src/parsing/expression-scope.h",
     "src/parsing/func-name-inferrer.cc",
     "src/parsing/func-name-inferrer.h",
+    "src/parsing/import-assertions.cc",
+    "src/parsing/import-assertions.h",
     "src/parsing/literal-buffer.cc",
     "src/parsing/literal-buffer.h",
     "src/parsing/parse-info.cc",
@@ -3307,6 +3358,8 @@ v8_source_set("v8_base_without_compiler") {
     "src/strings/uri.h",
     "src/tasks/cancelable-task.cc",
     "src/tasks/cancelable-task.h",
+    "src/tasks/operations-barrier.cc",
+    "src/tasks/operations-barrier.h",
     "src/tasks/task-utils.cc",
     "src/tasks/task-utils.h",
     "src/third_party/siphash/halfsiphash.cc",
@@ -3391,8 +3444,6 @@ v8_source_set("v8_base_without_compiler") {
     "src/wasm/wasm-code-manager.cc",
     "src/wasm/wasm-code-manager.h",
     "src/wasm/wasm-constants.h",
-    "src/wasm/wasm-debug-evaluate.cc",
-    "src/wasm/wasm-debug-evaluate.h",
     "src/wasm/wasm-debug.cc",
     "src/wasm/wasm-engine.cc",
     "src/wasm/wasm-engine.h",
@@ -3808,9 +3859,7 @@ v8_source_set("v8_base_without_compiler") {
     ":cppgc_base_config",
   ]
 
-  defines = []
   deps = [
-    ":cppgc_base",
     ":torque_generated_definitions",
     ":v8_cppgc_shared",
     ":v8_headers",
@@ -3819,10 +3868,12 @@ v8_source_set("v8_base_without_compiler") {
     ":v8_shared_internal_headers",
     ":v8_tracing",
     ":v8_version",
+    ":v8_wrappers",
     "src/inspector:inspector",
   ]
 
   public_deps = [
+    ":cppgc_base",
     ":generate_bytecode_builtins_list",
     ":run_torque",
     ":v8_maybe_icu",
@@ -3983,7 +4034,10 @@ v8_source_set("torque_base") {
 
   deps = [ ":v8_shared_internal_headers" ]
 
-  public_deps = [ ":v8_libbase" ]
+  public_deps = [
+    ":v8_libbase",
+    ":v8_wrappers",
+  ]
 
   # The use of exceptions for Torque in violation of the Chromium style-guide
   # is justified by the fact that it is only used from the non-essential
@@ -4106,8 +4160,6 @@ v8_component("v8_libbase") {
     "src/base/platform/semaphore.h",
     "src/base/platform/time.cc",
     "src/base/platform/time.h",
-    "src/base/platform/wrappers.h",
-    "src/base/platform/wrappers_std.cc",
     "src/base/region-allocator.cc",
     "src/base/region-allocator.h",
     "src/base/ring-buffer.h",
@@ -4132,7 +4184,7 @@ v8_component("v8_libbase") {
 
   deps = [ ":v8_headers" ]
 
-  public_deps = []
+  public_deps = [ ":v8_wrappers" ]
 
   data = []
 
@@ -4173,10 +4225,7 @@ v8_component("v8_libbase") {
       "src/base/platform/platform-aix.cc",
     ]
 
-    libs = [
-      "dl",
-      "rt",
-    ]
+    libs = [ "dl" ]
   } else if (is_android) {
     if (current_toolchain == host_toolchain) {
       libs = [
@@ -4205,6 +4254,7 @@ v8_component("v8_libbase") {
       "src/base/debug/stack_trace_fuchsia.cc",
       "src/base/platform/platform-fuchsia.cc",
     ]
+    deps += [ "//third_party/fuchsia-sdk/sdk/pkg/zx" ]
   } else if (is_mac || is_ios) {
     sources += [
       "src/base/debug/stack_trace_posix.cc",
@@ -4226,6 +4276,10 @@ v8_component("v8_libbase") {
       "ws2_32.lib",
     ]
 
+    if (v8_enable_system_instrumentation) {
+      libs += [ "advapi32.lib" ]  # Needed for TraceLoggingProvider.h
+    }
+
     data_deps += [ "//build/win:runtime_libs" ]
   }
 
@@ -4268,6 +4322,8 @@ v8_component("v8_libplatform") {
     "src/libplatform/delayed-task-queue.h",
     "src/libplatform/task-queue.cc",
     "src/libplatform/task-queue.h",
+    "src/libplatform/tracing/recorder-default.cc",
+    "src/libplatform/tracing/recorder.h",
     "src/libplatform/tracing/trace-buffer.cc",
     "src/libplatform/tracing/trace-buffer.h",
     "src/libplatform/tracing/trace-config.cc",
@@ -4287,15 +4343,19 @@ v8_component("v8_libplatform") {
 
   public_configs = [ ":libplatform_config" ]
 
+  public_deps = []
+
   deps = [
     ":v8_headers",
     ":v8_libbase",
     ":v8_tracing",
+    ":v8_wrappers",
   ]
 
   if (v8_use_perfetto) {
     sources -= [
       "//base/trace_event/common/trace_event_common.h",
+      "src/libplatform/tracing/recorder-default.cc",
       "src/libplatform/tracing/trace-buffer.cc",
       "src/libplatform/tracing/trace-buffer.h",
       "src/libplatform/tracing/trace-object.cc",
@@ -4310,6 +4370,9 @@ v8_component("v8_libplatform") {
       # TODO(skyostil): Switch TraceEventListener to protozero.
       "//third_party/perfetto/protos/perfetto/trace:lite",
     ]
+  } else if (is_win) {
+    sources -= [ "src/libplatform/tracing/recorder-default.cc" ]
+    sources += [ "src/libplatform/tracing/recorder-win.cc" ]
   }
 }
 
@@ -4385,6 +4448,26 @@ v8_source_set("v8_cppgc_shared") {
   public_deps = [ ":v8_libbase" ]
 }
 
+# This is split out to be a non-code containing target that the Chromium browser
+# can depend upon to get basic cppgc types.
+v8_header_set("cppgc_headers") {
+  configs = [ ":internal_config" ]
+  public_configs = [
+    ":v8_header_features",
+    ":cppgc_header_features",
+  ]
+
+  sources = [
+    "include/cppgc/garbage-collected.h",
+    "include/cppgc/member.h",
+    "include/cppgc/persistent.h",
+    "include/cppgc/type-traits.h",
+    "include/cppgc/visitor.h",
+  ]
+
+  public_deps = [ ":v8_headers" ]
+}
+
 v8_source_set("cppgc_base") {
   visibility = [ ":*" ]
 
@@ -4395,6 +4478,7 @@ v8_source_set("cppgc_base") {
     "include/cppgc/default-platform.h",
     "include/cppgc/ephemeron-pair.h",
     "include/cppgc/garbage-collected.h",
+    "include/cppgc/heap-consistency.h",
     "include/cppgc/heap.h",
     "include/cppgc/internal/api-constants.h",
     "include/cppgc/internal/atomic-entry-flag.h",
@@ -4426,6 +4510,7 @@ v8_source_set("cppgc_base") {
     "src/heap/cppgc/compactor.h",
     "src/heap/cppgc/concurrent-marker.cc",
     "src/heap/cppgc/concurrent-marker.h",
+    "src/heap/cppgc/default-platform.cc",
     "src/heap/cppgc/free-list.cc",
     "src/heap/cppgc/free-list.h",
     "src/heap/cppgc/garbage-collector.h",
@@ -4484,6 +4569,7 @@ v8_source_set("cppgc_base") {
     "src/heap/cppgc/sweeper.cc",
     "src/heap/cppgc/sweeper.h",
     "src/heap/cppgc/task-handle.h",
+    "src/heap/cppgc/trace-event.h",
     "src/heap/cppgc/trace-trait.cc",
     "src/heap/cppgc/virtual-memory.cc",
     "src/heap/cppgc/virtual-memory.h",
@@ -4491,6 +4577,12 @@ v8_source_set("cppgc_base") {
     "src/heap/cppgc/write-barrier.cc",
   ]
 
+  if (cppgc_is_standalone) {
+    sources += [ "//base/trace_event/common/trace_event_common.h" ]
+  } else {
+    deps = [ ":v8_tracing" ]
+  }
+
   if (cppgc_enable_caged_heap) {
     sources += [
       "include/cppgc/internal/caged-heap-local-data.h",
@@ -4621,6 +4713,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
       ":v8_libplatform",
       ":v8_maybe_icu",
       ":v8_tracing",
+      ":v8_wrappers",
       "//build/win:default_exe_manifest",
     ]
   }
@@ -4765,7 +4858,10 @@ group("v8_python_base") {
 group("v8_clusterfuzz") {
   testonly = true
 
-  deps = [ ":d8" ]
+  deps = [
+    ":d8",
+    ":v8_simple_inspector_fuzzer",
+  ]
 
   if (v8_multi_arch_build) {
     deps += [
@@ -4861,16 +4957,22 @@ if (is_component_build) {
 
     configs = [ ":internal_config" ]
 
+    if (!cppgc_is_standalone) {
+      deps = [ ":v8" ]
+    }
+
     public_configs = [ ":external_config" ]
   }
 
-  v8_component("cppgc_for_testing") {
-    testonly = true
+  if (cppgc_is_standalone) {
+    v8_component("cppgc_for_testing") {
+      testonly = true
 
-    public_deps = [ ":cppgc_base" ]
+      public_deps = [ ":cppgc_base" ]
 
-    configs = [ ":internal_config" ]
-    public_configs = [ ":external_config" ]
+      configs = [ ":internal_config" ]
+      public_configs = [ ":external_config" ]
+    }
   }
 
   v8_component("v8_cppgc_shared_for_testing") {
@@ -4908,15 +5010,21 @@ if (is_component_build) {
   group("cppgc") {
     public_deps = [ ":cppgc_base" ]
 
+    if (!cppgc_is_standalone) {
+      deps = [ ":v8" ]
+    }
+
     public_configs = [ ":external_config" ]
   }
 
-  group("cppgc_for_testing") {
-    testonly = true
+  if (cppgc_is_standalone) {
+    group("cppgc_for_testing") {
+      testonly = true
 
-    public_deps = [ ":cppgc_base" ]
+      public_deps = [ ":cppgc_base" ]
 
-    public_configs = [ ":external_config" ]
+      public_configs = [ ":external_config" ]
+    }
   }
 
   group("v8_cppgc_shared_for_testing") {
@@ -4961,6 +5069,7 @@ v8_executable("d8") {
     ":v8_libbase",
     ":v8_libplatform",
     ":v8_tracing",
+    ":v8_wrappers",
     "//build/win:default_exe_manifest",
   ]
 
@@ -5037,34 +5146,24 @@ if (want_v8_shell) {
   }
 }
 
-v8_executable("cppgc_for_v8_embedders") {
-  sources = [ "samples/cppgc/cppgc-for-v8-embedders.cc" ]
-
-  configs = [
-    # Note: don't use :internal_config here because this target will get
-    # the :external_config applied to it by virtue of depending on :cppgc, and
-    # you can't have both applied to the same target.
-    ":internal_config_base",
-  ]
-
-  deps = [
-    ":cppgc",
-    ":v8_libplatform",
-    "//build/win:default_exe_manifest",
-  ]
-}
-
-v8_executable("cppgc_standalone") {
-  sources = [ "samples/cppgc/cppgc-standalone.cc" ]
+v8_executable("cppgc_sample") {
+  sources = [ "samples/cppgc/cppgc-sample.cc" ]
 
   configs = [
     # Note: don't use :internal_config here because this target will get
     # the :external_config applied to it by virtue of depending on :cppgc, and
     # you can't have both applied to the same target.
     ":internal_config_base",
+    ":cppgc_base_config",
   ]
 
   deps = [ ":cppgc" ]
+  if (!cppgc_is_standalone) {
+    deps += [
+      ":v8",
+      "//build/win:default_exe_manifest",
+    ]
+  }
 }
 
 template("v8_fuzzer") {
@@ -5099,7 +5198,10 @@ v8_fuzzer("json_fuzzer") {
 v8_source_set("multi_return_fuzzer") {
   sources = [ "test/fuzzer/multi-return.cc" ]
 
-  deps = [ ":fuzzer_support" ]
+  deps = [
+    ":fuzzer_support",
+    ":v8_wrappers",
+  ]
 
   configs = [
     ":external_config",
@@ -5113,7 +5215,10 @@ v8_fuzzer("multi_return_fuzzer") {
 v8_source_set("parser_fuzzer") {
   sources = [ "test/fuzzer/parser.cc" ]
 
-  deps = [ ":fuzzer_support" ]
+  deps = [
+    ":fuzzer_support",
+    ":v8_wrappers",
+  ]
 
   configs = [
     ":external_config",
@@ -5130,7 +5235,10 @@ v8_source_set("regexp_builtins_fuzzer") {
     "test/fuzzer/regexp_builtins/mjsunit.js.h",
   ]
 
-  deps = [ ":fuzzer_support" ]
+  deps = [
+    ":fuzzer_support",
+    ":v8_wrappers",
+  ]
 
   configs = [
     ":external_config",
@@ -5144,7 +5252,10 @@ v8_fuzzer("regexp_builtins_fuzzer") {
 v8_source_set("regexp_fuzzer") {
   sources = [ "test/fuzzer/regexp.cc" ]
 
-  deps = [ ":fuzzer_support" ]
+  deps = [
+    ":fuzzer_support",
+    ":v8_wrappers",
+  ]
 
   configs = [
     ":external_config",
@@ -5183,6 +5294,7 @@ v8_source_set("wasm_fuzzer") {
   deps = [
     ":fuzzer_support",
     ":lib_wasm_fuzzer_common",
+    ":v8_wrappers",
     ":wasm_test_common",
   ]
 
@@ -5201,6 +5313,7 @@ v8_source_set("wasm_async_fuzzer") {
   deps = [
     ":fuzzer_support",
     ":lib_wasm_fuzzer_common",
+    ":v8_wrappers",
     ":wasm_test_common",
   ]
 
@@ -5222,6 +5335,7 @@ v8_source_set("wasm_code_fuzzer") {
   deps = [
     ":fuzzer_support",
     ":lib_wasm_fuzzer_common",
+    ":v8_wrappers",
     ":wasm_test_common",
   ]
 
@@ -5263,6 +5377,7 @@ v8_source_set("wasm_compile_fuzzer") {
   deps = [
     ":fuzzer_support",
     ":lib_wasm_fuzzer_common",
+    ":v8_wrappers",
     ":wasm_test_common",
   ]
 
@@ -5280,6 +5395,7 @@ v8_source_set("inspector_fuzzer") {
 
   deps = [
     ":fuzzer_support",
+    ":v8_wrappers",
     "test/inspector:inspector_test",
   ]
 
diff --git a/deps/v8/DEPS b/deps/v8/DEPS
index 3e3fed387db216..e6c2e762e01392 100644
--- a/deps/v8/DEPS
+++ b/deps/v8/DEPS
@@ -10,7 +10,6 @@ gclient_gn_args = [
   # Remove when migration is complete.
   'checkout_fuchsia_for_arm64_host',
   'checkout_google_benchmark',
-  'mac_xcode_version',
 ]
 
 vars = {
@@ -47,13 +46,11 @@ vars = {
 
   'checkout_google_benchmark' : False,
 
-  'mac_xcode_version': 'default',
-
   # GN CIPD package version.
-  'gn_version': 'git_revision:53d92014bf94c3893886470a1c7c1289f8818db0',
+  'gn_version': 'git_revision:595e3be7c8381d4eeefce62a63ec12bae9ce5140',
 
   # luci-go CIPD package version.
-  'luci_go': 'git_revision:1a022d3a4c50be4207ee93451255d71896416596',
+  'luci_go': 'git_revision:67aba6e3373bb0b9e3ef9871362045736cd29b6e',
 
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling android_sdk_build-tools_version
@@ -91,15 +88,15 @@ vars = {
 
 deps = {
   'build':
-    Var('chromium_url') + '/chromium/src/build.git' + '@' + '2101eff1ac4bfd25f2dfa71ad632a600a38c1ed9',
+    Var('chromium_url') + '/chromium/src/build.git' + '@' + 'd5995537211ebc4d1bc37f215c25fa3781ba9d6e',
   'third_party/depot_tools':
-    Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '982b2a757087c2519e42b82b93cbfe5adf43cdd5',
+    Var('chromium_url') + '/chromium/tools/depot_tools.git' + '@' + '82b992a1656d7d1cd0ee3cbea8ff609ffdfed380',
   'third_party/icu':
-    Var('chromium_url') + '/chromium/deps/icu.git' + '@' + 'c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1',
+    Var('chromium_url') + '/chromium/deps/icu.git' + '@' + '899e18383fd732b47e6978db2b960a1b2a80179b',
   'third_party/instrumented_libraries':
-    Var('chromium_url') + '/chromium/src/third_party/instrumented_libraries.git' + '@' + '6ba978ccb754d270b6cd12da58c8269b617e4f6e',
+    Var('chromium_url') + '/chromium/src/third_party/instrumented_libraries.git' + '@' + '4d3867052d35b2171f2edbb3466fa8f7e2d11319',
   'buildtools':
-    Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + '6302c1175607a436e18947a5abe9df2209e845fc',
+    Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + '235cfe435ca5a9826569ee4ef603e226216bd768',
   'buildtools/clang_format/script':
     Var('chromium_url') + '/chromium/llvm-project/cfe/tools/clang-format.git' + '@' + '96636aa0e9f047f17447f2d45a094d0b59ed7917',
   'buildtools/linux64': {
@@ -187,7 +184,7 @@ deps = {
       'dep_type': 'cipd',
   },
   'third_party/catapult': {
-    'url': Var('chromium_url') + '/catapult.git' + '@' + '434681c2378b686117c2b003a58c54d78f22185f',
+    'url': Var('chromium_url') + '/catapult.git' + '@' + 'd1a3011cd91205aa96b74b5dfc227d391e88108d',
     'condition': 'checkout_android',
   },
   'third_party/colorama/src': {
@@ -195,27 +192,27 @@ deps = {
     'condition': 'checkout_android',
   },
   'third_party/fuchsia-sdk': {
-    'url': Var('chromium_url') + '/chromium/src/third_party/fuchsia-sdk.git' + '@' + 'f8df9ff79b878d1998970cc04a197061069e48ce',
+    'url': Var('chromium_url') + '/chromium/src/third_party/fuchsia-sdk.git' + '@' + 'efa46583d89ea8c97523281d9f52a0d96472114d',
     'condition': 'checkout_fuchsia',
   },
   'third_party/googletest/src':
-    Var('chromium_url') + '/external/github.com/google/googletest.git' + '@' + '4fe018038f87675c083d0cfb6a6b57c274fb1753',
+    Var('chromium_url') + '/external/github.com/google/googletest.git' + '@' + '1b0cdaae57c046c87fb99cb4f69c312a7e794adb',
   'third_party/google_benchmark/src': {
     'url': Var('chromium_url') + '/external/github.com/google/benchmark.git' + '@' + '7f27afe83b82f3a98baf58ef595814b9d42a5b2b',
     'condition': 'checkout_google_benchmark',
   },
   'third_party/jinja2':
-    Var('chromium_url') + '/chromium/src/third_party/jinja2.git' + '@' + 'a82a4944a7f2496639f34a89c9923be5908b80aa',
+    Var('chromium_url') + '/chromium/src/third_party/jinja2.git' + '@' + '11b6b3e5971d760bd2d310f77643f55a818a6d25',
   'third_party/markupsafe':
     Var('chromium_url') + '/chromium/src/third_party/markupsafe.git' + '@' + '0944e71f4b2cb9a871bcbe353f95e889b64a611a',
   'tools/swarming_client':
-    Var('chromium_url') + '/infra/luci/client-py.git' + '@' + 'd46ea7635f2911208268170512cb611412488fd8',
+    Var('chromium_url') + '/infra/luci/client-py.git' + '@' + '1a072711d4388c62e02480fabc26c68c24494be9',
   'test/benchmarks/data':
     Var('chromium_url') + '/v8/deps/third_party/benchmarks.git' + '@' + '05d7188267b4560491ff9155c5ee13e207ecd65f',
   'test/mozilla/data':
     Var('chromium_url') + '/v8/deps/third_party/mozilla-tests.git' + '@' + 'f6c578a10ea707b1a8ab0b88943fe5115ce2b9be',
   'test/test262/data':
-    Var('chromium_url') + '/external/github.com/tc39/test262.git' + '@' + '0e7319c015fe935594f8bcafaedb0c94f7fec1df',
+    Var('chromium_url') + '/external/github.com/tc39/test262.git' + '@' + 'b2e9dff2816cceb5ee84c0c226c50a31d01a7297',
   'test/test262/harness':
     Var('chromium_url') + '/external/github.com/test262-utils/test262-harness-py.git' + '@' + '4555345a943d0c99a9461182705543fb171dda4b',
   'third_party/qemu-linux-x64': {
@@ -242,7 +239,7 @@ deps = {
       'packages': [
           {
               'package': 'fuchsia/third_party/aemu/linux-amd64',
-              'version': 'xP4TXh9wWGTG0qr4y6eFcUO_0HOBmt3vorgtVmpwBJsC'
+              'version': 'xAHa1IXmKteChkPvba9ezjSnKL7IyDePQRzWVUEAx9UC'
           },
       ],
       'condition': 'host_os == "linux" and checkout_fuchsia',
@@ -259,7 +256,7 @@ deps = {
       'dep_type': 'cipd',
   },
   'tools/clang':
-    Var('chromium_url') + '/chromium/src/tools/clang.git' + '@' + 'a37c0858a645506c8e9d3bebab1ed5a5b1f9df61',
+    Var('chromium_url') + '/chromium/src/tools/clang.git' + '@' + '2246bee280e908ac1fd27ab75e7d0021b14d875c',
   'tools/luci-go': {
       'packages': [
         {
@@ -293,7 +290,7 @@ deps = {
   'third_party/protobuf':
     Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91',
   'third_party/zlib':
-    Var('chromium_url') + '/chromium/src/third_party/zlib.git'+ '@' + 'e84c9a3fd75fdc39055b7ae27d6ec508e50bd39e',
+    Var('chromium_url') + '/chromium/src/third_party/zlib.git'+ '@' + '2c183c9f93a328bfb3121284da13cf89a0f7e64a',
   'third_party/jsoncpp/source':
     Var('chromium_url') + '/external/github.com/open-source-parsers/jsoncpp.git'+ '@' + '9059f5cad030ba11d37818847443a53918c327b1',
   'third_party/ittapi': {
@@ -490,20 +487,7 @@ hooks = [
     'name': 'mac_toolchain',
     'pattern': '.',
     'condition': 'checkout_mac',
-    'action': ['python', 'build/mac_toolchain.py',
-               '--xcode-version', Var('mac_xcode_version')],
-  },
-  # Pull binutils for linux, enabled debug fission for faster linking /
-  # debugging when used with clang on Ubuntu Precise.
-  # https://code.google.com/p/chromium/issues/detail?id=352046
-  {
-    'name': 'binutils',
-    'pattern': 'third_party/binutils',
-    'condition': 'host_os == "linux"',
-    'action': [
-        'python',
-        'third_party/binutils/download.py',
-    ],
+    'action': ['python', 'build/mac_toolchain.py'],
   },
   {
     # Note: On Win, this should run after win_toolchain, as it may use it.
diff --git a/deps/v8/MIPS_OWNERS b/deps/v8/MIPS_OWNERS
index cab3679d656e6a..6c65e34e9c3bf7 100644
--- a/deps/v8/MIPS_OWNERS
+++ b/deps/v8/MIPS_OWNERS
@@ -1 +1,2 @@
 xwafish@gmail.com
+zhaojiazhong-hf@loongson.cn
diff --git a/deps/v8/WATCHLISTS b/deps/v8/WATCHLISTS
index 54d6bbec1c51ff..fa95f144cb73cb 100644
--- a/deps/v8/WATCHLISTS
+++ b/deps/v8/WATCHLISTS
@@ -87,6 +87,11 @@
     'tracing': {
       'filepath': 'src/tracing/',
     },
+    'ieee754': {
+      'filepath': 'src/base/ieee754\.(cc|h)' \
+                  '|src/base/overflowing-math.h' \
+                  '|LICENSE.fdlibm',
+    }
   },
 
   'WATCHLISTS': {
@@ -133,5 +138,9 @@
       'lpy+v8tracing@chromium.org',
       'fmeawad@chromium.org',
     ],
+    'ieee754': [
+      'rtoy+watch@chromium.org',
+      'hongchan+watch@chromium.org'
+    ],
   },
 }
diff --git a/deps/v8/build_overrides/build.gni b/deps/v8/build_overrides/build.gni
index dde92c46eaa78d..4e0c284efaeae9 100644
--- a/deps/v8/build_overrides/build.gni
+++ b/deps/v8/build_overrides/build.gni
@@ -32,9 +32,6 @@ use_perfetto_client_library = false
 # Some non-Chromium builds don't support building java targets.
 enable_java_templates = false
 
-# Some non-Chromium builds don't use Chromium's third_party/binutils.
-linux_use_bundled_binutils_override = true
-
 # Allows different projects to specify their own suppressions files.
 asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc"
 lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc"
diff --git a/deps/v8/gni/v8.gni b/deps/v8/gni/v8.gni
index edc944ef0c7a96..5651a178c283df 100644
--- a/deps/v8/gni/v8.gni
+++ b/deps/v8/gni/v8.gni
@@ -71,6 +71,8 @@ declare_args() {
   v8_enable_conservative_stack_scanning = false
 
   v8_enable_google_benchmark = checkout_google_benchmark
+
+  cppgc_is_standalone = false
 }
 
 if (v8_use_external_startup_data == "") {
diff --git a/deps/v8/include/DEPS b/deps/v8/include/DEPS
index 7d60081fb480b7..9f4002059b3051 100644
--- a/deps/v8/include/DEPS
+++ b/deps/v8/include/DEPS
@@ -2,5 +2,8 @@ include_rules = [
   # v8-inspector-protocol.h depends on generated files under include/inspector.
   "+inspector",
   "+cppgc/common.h",
+  # Used by v8-cppgc.h to bridge to cppgc.
+  "+cppgc/custom-space.h",
+  "+cppgc/internal/write-barrier.h",
   "+cppgc/visitor.h",
 ]
diff --git a/deps/v8/include/cppgc/allocation.h b/deps/v8/include/cppgc/allocation.h
index 556f313a4ac81c..1164f6925cdcf7 100644
--- a/deps/v8/include/cppgc/allocation.h
+++ b/deps/v8/include/cppgc/allocation.h
@@ -39,9 +39,8 @@ class V8_EXPORT MakeGarbageCollectedTraitInternal {
             const_cast<uint16_t*>(reinterpret_cast<const uint16_t*>(
                 reinterpret_cast<const uint8_t*>(payload) -
                 api_constants::kFullyConstructedBitFieldOffsetFromPayload)));
-    uint16_t value = atomic_mutable_bitfield->load(std::memory_order_relaxed);
-    value = value | api_constants::kFullyConstructedBitMask;
-    atomic_mutable_bitfield->store(value, std::memory_order_release);
+    atomic_mutable_bitfield->fetch_or(api_constants::kFullyConstructedBitMask,
+                                      std::memory_order_release);
   }
 
   static void* Allocate(cppgc::AllocationHandle& handle, size_t size,
@@ -113,11 +112,29 @@ class MakeGarbageCollectedTraitBase
 };
 
 /**
- * struct used specify to MakeGarbageCollected how many bytes should be
- * appended to the allocated object.
+ * Passed to MakeGarbageCollected to specify how many bytes should be appended
+ * to the allocated object.
+ *
+ * Example:
+ * \code
+ * class InlinedArray final : public GarbageCollected<InlinedArray> {
+ *  public:
+ *   explicit InlinedArray(size_t bytes) : size(bytes), byte_array(this + 1) {}
+ *   void Trace(Visitor*) const {}
+
+ *   size_t size;
+ *   char* byte_array;
+ * };
+ *
+ * auto* inlined_array = MakeGarbageCollected<InlinedArray(
+ *    GetAllocationHandle(), AdditionalBytes(4), 4);
+ * for (size_t i = 0; i < 4; i++) {
+ *   Process(inlined_array->byte_array[i]);
+ * }
+ * \endcode
  */
 struct AdditionalBytes {
-  explicit AdditionalBytes(size_t bytes) : value(bytes) {}
+  constexpr explicit AdditionalBytes(size_t bytes) : value(bytes) {}
   const size_t value;
 };
 
diff --git a/deps/v8/include/cppgc/common.h b/deps/v8/include/cppgc/common.h
index 228b9abb74e763..1fff1a03fe369f 100644
--- a/deps/v8/include/cppgc/common.h
+++ b/deps/v8/include/cppgc/common.h
@@ -14,11 +14,11 @@ namespace cppgc {
 enum class EmbedderStackState {
   kMayContainHeapPointers,
   kNoHeapPointers,
-  kUnknown V8_ENUM_DEPRECATE_SOON("Use kMayContainHeapPointers") =
+  kUnknown V8_ENUM_DEPRECATED("Use kMayContainHeapPointers") =
       kMayContainHeapPointers,
-  kNonEmpty V8_ENUM_DEPRECATE_SOON("Use kMayContainHeapPointers") =
+  kNonEmpty V8_ENUM_DEPRECATED("Use kMayContainHeapPointers") =
       kMayContainHeapPointers,
-  kEmpty V8_ENUM_DEPRECATE_SOON("Use kNoHeapPointers") = kNoHeapPointers,
+  kEmpty V8_ENUM_DEPRECATED("Use kNoHeapPointers") = kNoHeapPointers,
 };
 
 }  // namespace cppgc
diff --git a/deps/v8/include/cppgc/default-platform.h b/deps/v8/include/cppgc/default-platform.h
index 28990da92e6550..2ccdeddd8376f4 100644
--- a/deps/v8/include/cppgc/default-platform.h
+++ b/deps/v8/include/cppgc/default-platform.h
@@ -20,12 +20,24 @@ namespace cppgc {
  */
 class V8_EXPORT DefaultPlatform : public Platform {
  public:
+  /**
+   * Use this method instead of 'cppgc::InitializeProcess' when using
+   * 'cppgc::DefaultPlatform'. 'cppgc::DefaultPlatform::InitializeProcess'
+   * will initialize cppgc and v8 if needed (for non-standalone builds).
+   *
+   * \param platform DefaultPlatform instance used to initialize cppgc/v8.
+   */
+  static void InitializeProcess(DefaultPlatform* platform);
+
   using IdleTaskSupport = v8::platform::IdleTaskSupport;
   explicit DefaultPlatform(
       int thread_pool_size = 0,
-      IdleTaskSupport idle_task_support = IdleTaskSupport::kDisabled)
-      : v8_platform_(v8::platform::NewDefaultPlatform(thread_pool_size,
-                                                      idle_task_support)) {}
+      IdleTaskSupport idle_task_support = IdleTaskSupport::kDisabled,
+      std::unique_ptr<TracingController> tracing_controller = {})
+      : v8_platform_(v8::platform::NewDefaultPlatform(
+            thread_pool_size, idle_task_support,
+            v8::platform::InProcessStackDumping::kDisabled,
+            std::move(tracing_controller))) {}
 
   cppgc::PageAllocator* GetPageAllocator() override {
     return v8_platform_->GetPageAllocator();
@@ -48,6 +60,10 @@ class V8_EXPORT DefaultPlatform : public Platform {
     return v8_platform_->PostJob(priority, std::move(job_task));
   }
 
+  TracingController* GetTracingController() override {
+    return v8_platform_->GetTracingController();
+  }
+
  protected:
   static constexpr v8::Isolate* kNoIsolate = nullptr;
 
diff --git a/deps/v8/include/cppgc/heap-consistency.h b/deps/v8/include/cppgc/heap-consistency.h
new file mode 100644
index 00000000000000..4a4eb103817e6e
--- /dev/null
+++ b/deps/v8/include/cppgc/heap-consistency.h
@@ -0,0 +1,137 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef INCLUDE_CPPGC_HEAP_CONSISTENCY_H_
+#define INCLUDE_CPPGC_HEAP_CONSISTENCY_H_
+
+#include <cstddef>
+
+#include "cppgc/internal/write-barrier.h"
+#include "cppgc/trace-trait.h"
+#include "v8config.h"  // NOLINT(build/include_directory)
+
+namespace cppgc {
+
+class HeapHandle;
+
+namespace subtle {
+
+/**
+ * **DO NOT USE: Use the appropriate managed types.**
+ *
+ * Consistency helpers that aid in maintaining a consistent internal state of
+ * the garbage collector.
+ */
+class HeapConsistency final {
+ public:
+  using WriteBarrierParams = internal::WriteBarrier::Params;
+  using WriteBarrierType = internal::WriteBarrier::Type;
+
+  /**
+   * Gets the required write barrier type for a specific write.
+   *
+   * \param slot Slot containing the pointer to the object. The slot itself
+   *   must reside in an object that has been allocated using
+   *   `MakeGarbageCollected()`.
+   * \param value The pointer to the object. May be an interior pointer to an
+   *   interface of the actual object.
+   * \param params Parameters that may be used for actual write barrier calls.
+   *   Only filled if return value indicates that a write barrier is needed. The
+   *   contents of the `params` are an implementation detail.
+   * \returns whether a write barrier is needed and which barrier to invoke.
+   */
+  static V8_INLINE WriteBarrierType GetWriteBarrierType(
+      const void* slot, const void* value, WriteBarrierParams& params) {
+    return internal::WriteBarrier::GetWriteBarrierType(slot, value, params);
+  }
+
+  /**
+   * Gets the required write barrier type for a specific write.
+   *
+   * \param slot Slot containing the pointer to some part of an object object
+   *   that has been allocated using `MakeGarbageCollected()`. Does not consider
+   *   the value of `slot`.
+   * \param params Parameters that may be used for actual write barrier calls.
+   *   Only filled if return value indicates that a write barrier is needed. The
+   *   contents of the `params` are an implementation detail.
+   * \returns whether a write barrier is needed and which barrier to invoke.
+   */
+  static V8_INLINE WriteBarrierType
+  GetWriteBarrierType(const void* slot, WriteBarrierParams& params) {
+    return internal::WriteBarrier::GetWriteBarrierType(slot, params);
+  }
+
+  /**
+   * Conservative Dijkstra-style write barrier that processes an object if it
+   * has not yet been processed.
+   *
+   * \param params The parameters retrieved from `GetWriteBarrierType()`.
+   * \param object The pointer to the object. May be an interior pointer to a
+   *   an interface of the actual object.
+   */
+  static V8_INLINE void DijkstraWriteBarrier(const WriteBarrierParams& params,
+                                             const void* object) {
+    internal::WriteBarrier::DijkstraMarkingBarrier(params, object);
+  }
+
+  /**
+   * Conservative Dijkstra-style write barrier that processes a range of
+   * elements if they have not yet been processed.
+   *
+   * \param params The parameters retrieved from `GetWriteBarrierType()`.
+   * \param heap The corresponding heap.
+   * \param first_element Pointer to the first element that should be processed.
+   *   The slot itself must reside in an object that has been allocated using
+   *   `MakeGarbageCollected()`.
+   * \param element_size Size of the element in bytes.
+   * \param number_of_elements Number of elements that should be processed,
+   *   starting with `first_element`.
+   * \param trace_callback The trace callback that should be invoked for each
+   *   element if necessary.
+   */
+  static V8_INLINE void DijkstraWriteBarrierRange(
+      const WriteBarrierParams& params, HeapHandle& heap,
+      const void* first_element, size_t element_size, size_t number_of_elements,
+      TraceCallback trace_callback) {
+    internal::WriteBarrier::DijkstraMarkingBarrierRange(
+        params, heap, first_element, element_size, number_of_elements,
+        trace_callback);
+  }
+
+  /**
+   * Steele-style write barrier that re-processes an object if it has already
+   * been processed.
+   *
+   * \param params The parameters retrieved from `GetWriteBarrierType()`.
+   * \param object The pointer to the object which must point to an object that
+   *   has been allocated using `MakeGarbageCollected()`. Interior pointers are
+   *   not supported.
+   */
+  static V8_INLINE void SteeleWriteBarrier(const WriteBarrierParams& params,
+                                           const void* object) {
+    internal::WriteBarrier::SteeleMarkingBarrier(params, object);
+  }
+
+  /**
+   * Generational barrier for maintaining consistency when running with multiple
+   * generations.
+   *
+   * \param params The parameters retrieved from `GetWriteBarrierType()`.
+   * \param slot Slot containing the pointer to the object. The slot itself
+   *   must reside in an object that has been allocated using
+   *   `MakeGarbageCollected()`.
+   */
+  static V8_INLINE void GenerationalBarrier(const WriteBarrierParams& params,
+                                            const void* slot) {
+    internal::WriteBarrier::GenerationalBarrier(params, slot);
+  }
+
+ private:
+  HeapConsistency() = delete;
+};
+
+}  // namespace subtle
+}  // namespace cppgc
+
+#endif  // INCLUDE_CPPGC_HEAP_CONSISTENCY_H_
diff --git a/deps/v8/include/cppgc/heap.h b/deps/v8/include/cppgc/heap.h
index 04a55598bd853a..fd0512f1f18e16 100644
--- a/deps/v8/include/cppgc/heap.h
+++ b/deps/v8/include/cppgc/heap.h
@@ -29,6 +29,11 @@ namespace internal {
 class Heap;
 }  // namespace internal
 
+/**
+ * Used for additional heap APIs.
+ */
+class HeapHandle;
+
 class V8_EXPORT Heap {
  public:
   /**
@@ -51,6 +56,41 @@ class V8_EXPORT Heap {
     kNoConservativeStackScan,
   };
 
+  /**
+   * Specifies supported marking types
+   */
+  enum class MarkingType : uint8_t {
+    /**
+     * Atomic stop-the-world marking. This option does not require any write
+     * barriers but is the most intrusive in terms of jank.
+     */
+    kAtomic,
+    /**
+     * Incremental marking, i.e. interleave marking is the rest of the
+     * application on the same thread.
+     */
+    kIncremental,
+    /**
+     * Incremental and concurrent marking.
+     */
+    kIncrementalAndConcurrent
+  };
+
+  /**
+   * Specifies supported sweeping types
+   */
+  enum class SweepingType : uint8_t {
+    /**
+     * Atomic stop-the-world sweeping. All of sweeping is performed at once.
+     */
+    kAtomic,
+    /**
+     * Incremental and concurrent sweeping. Sweeping is split and interleaved
+     * with the rest of the application.
+     */
+    kIncrementalAndConcurrent
+  };
+
   /**
    * Constraints for a Heap setup.
    */
@@ -93,6 +133,16 @@ class V8_EXPORT Heap {
      */
     StackSupport stack_support = StackSupport::kSupportsConservativeStackScan;
 
+    /**
+     * Specifies which types of marking are supported by the heap.
+     */
+    MarkingType marking_support = MarkingType::kIncrementalAndConcurrent;
+
+    /**
+     * Specifies which types of sweeping are supported by the heap.
+     */
+    SweepingType sweeping_support = SweepingType::kIncrementalAndConcurrent;
+
     /**
      * Resource constraints specifying various properties that the internal
      * GC scheduler follows.
@@ -132,6 +182,12 @@ class V8_EXPORT Heap {
    */
   AllocationHandle& GetAllocationHandle();
 
+  /**
+   * \returns the opaque heap handle which may be used to refer to this heap in
+   *   other APIs. Valid as long as the underlying `Heap` is alive.
+   */
+  HeapHandle& GetHeapHandle();
+
  private:
   Heap() = default;
 
diff --git a/deps/v8/include/cppgc/internal/api-constants.h b/deps/v8/include/cppgc/internal/api-constants.h
index 1303b8b861f648..a70f00710c8b8a 100644
--- a/deps/v8/include/cppgc/internal/api-constants.h
+++ b/deps/v8/include/cppgc/internal/api-constants.h
@@ -28,7 +28,7 @@ constexpr size_t kGB = kMB * 1024;
 static constexpr size_t kFullyConstructedBitFieldOffsetFromPayload =
     2 * sizeof(uint16_t);
 // Mask for in-construction bit.
-static constexpr size_t kFullyConstructedBitMask = size_t{1};
+static constexpr uint16_t kFullyConstructedBitMask = uint16_t{1};
 
 static constexpr size_t kPageSize = size_t{1} << 17;
 
diff --git a/deps/v8/include/cppgc/internal/pointer-policies.h b/deps/v8/include/cppgc/internal/pointer-policies.h
index 50c5d5768fcf84..58f2515a3d7e1b 100644
--- a/deps/v8/include/cppgc/internal/pointer-policies.h
+++ b/deps/v8/include/cppgc/internal/pointer-policies.h
@@ -28,7 +28,17 @@ struct DijkstraWriteBarrierPolicy {
     // barrier doesn't break the tri-color invariant.
   }
   static void AssigningBarrier(const void* slot, const void* value) {
-    WriteBarrier::MarkingBarrier(slot, value);
+    WriteBarrier::Params params;
+    switch (WriteBarrier::GetWriteBarrierType(slot, value, params)) {
+      case WriteBarrier::Type::kGenerational:
+        WriteBarrier::GenerationalBarrier(params, slot);
+        break;
+      case WriteBarrier::Type::kMarking:
+        WriteBarrier::DijkstraMarkingBarrier(params, value);
+        break;
+      case WriteBarrier::Type::kNone:
+        break;
+    }
   }
 };
 
diff --git a/deps/v8/include/cppgc/internal/write-barrier.h b/deps/v8/include/cppgc/internal/write-barrier.h
index 5bf550b02610dd..e3cc4c989d89dd 100644
--- a/deps/v8/include/cppgc/internal/write-barrier.h
+++ b/deps/v8/include/cppgc/internal/write-barrier.h
@@ -7,6 +7,7 @@
 
 #include "cppgc/internal/api-constants.h"
 #include "cppgc/internal/process-heap.h"
+#include "cppgc/trace-trait.h"
 #include "v8config.h"  // NOLINT(build/include_directory)
 
 #if defined(CPPGC_CAGED_HEAP)
@@ -14,64 +15,235 @@
 #endif
 
 namespace cppgc {
+
+class HeapHandle;
+
 namespace internal {
 
+class WriteBarrierTypeForCagedHeapPolicy;
+class WriteBarrierTypeForNonCagedHeapPolicy;
+
 class V8_EXPORT WriteBarrier final {
  public:
-  static V8_INLINE void MarkingBarrier(const void* slot, const void* value) {
+  enum class Type : uint8_t {
+    kNone,
+    kMarking,
+    kGenerational,
+  };
+
+  struct Params {
+#if V8_ENABLE_CHECKS
+    Type type = Type::kNone;
+#endif  // !V8_ENABLE_CHECKS
 #if defined(CPPGC_CAGED_HEAP)
-    const uintptr_t start =
-        reinterpret_cast<uintptr_t>(value) &
-        ~(api_constants::kCagedHeapReservationAlignment - 1);
-    const uintptr_t slot_offset = reinterpret_cast<uintptr_t>(slot) - start;
-    if (slot_offset > api_constants::kCagedHeapReservationSize) {
-      // Check if slot is on stack or value is sentinel or nullptr. This relies
-      // on the fact that kSentinelPointer is encoded as 0x1.
-      return;
-    }
+    uintptr_t start;
 
-    CagedHeapLocalData* local_data =
-        reinterpret_cast<CagedHeapLocalData*>(start);
-    if (V8_UNLIKELY(local_data->is_marking_in_progress)) {
-      MarkingBarrierSlow(value);
-      return;
+    CagedHeapLocalData& caged_heap() const {
+      return *reinterpret_cast<CagedHeapLocalData*>(start);
     }
+    uintptr_t slot_offset;
+    uintptr_t value_offset;
+#endif  // CPPGC_CAGED_HEAP
+  };
+
+  enum class ValueMode {
+    kValuePresent,
+    kNoValuePresent,
+  };
+
+  // Returns the required write barrier for a given `slot` and `value`.
+  static V8_INLINE Type GetWriteBarrierType(const void* slot, const void* value,
+                                            Params& params);
+  // Returns the required write barrier for a given `slot`.
+  static V8_INLINE Type GetWriteBarrierType(const void* slot, Params& params);
+
+  static V8_INLINE void DijkstraMarkingBarrier(const Params& params,
+                                               const void* object);
+  static V8_INLINE void DijkstraMarkingBarrierRange(
+      const Params& params, HeapHandle& heap, const void* first_element,
+      size_t element_size, size_t number_of_elements,
+      TraceCallback trace_callback);
+  static V8_INLINE void SteeleMarkingBarrier(const Params& params,
+                                             const void* object);
 #if defined(CPPGC_YOUNG_GENERATION)
-    GenerationalBarrier(local_data, slot, slot_offset,
-                        reinterpret_cast<uintptr_t>(value) - start);
-#endif
-#else
-    if (V8_LIKELY(!ProcessHeap::IsAnyIncrementalOrConcurrentMarking())) return;
+  static V8_INLINE void GenerationalBarrier(const Params& params,
+                                            const void* slot);
+#else   // !CPPGC_YOUNG_GENERATION
+  static V8_INLINE void GenerationalBarrier(const Params& params,
+                                            const void* slot) {}
+#endif  // CPPGC_YOUNG_GENERATION
 
-    MarkingBarrierSlowWithSentinelCheck(value);
-#endif  // CPPGC_CAGED_HEAP
-  }
+#if V8_ENABLE_CHECKS
+  static void CheckParams(Type expected_type, const Params& params);
+#else   // !V8_ENABLE_CHECKS
+  static void CheckParams(Type expected_type, const Params& params) {}
+#endif  // !V8_ENABLE_CHECKS
 
  private:
   WriteBarrier() = delete;
 
-  static void MarkingBarrierSlow(const void* value);
-  static void MarkingBarrierSlowWithSentinelCheck(const void* value);
+#if defined(CPPGC_CAGED_HEAP)
+  using WriteBarrierTypePolicy = WriteBarrierTypeForCagedHeapPolicy;
+#else   // !CPPGC_CAGED_HEAP
+  using WriteBarrierTypePolicy = WriteBarrierTypeForNonCagedHeapPolicy;
+#endif  // !CPPGC_CAGED_HEAP
+
+  static void DijkstraMarkingBarrierSlow(const void* value);
+  static void DijkstraMarkingBarrierSlowWithSentinelCheck(const void* value);
+  static void DijkstraMarkingBarrierRangeSlow(HeapHandle& heap_handle,
+                                              const void* first_element,
+                                              size_t element_size,
+                                              size_t number_of_elements,
+                                              TraceCallback trace_callback);
+  static void SteeleMarkingBarrierSlow(const void* value);
+  static void SteeleMarkingBarrierSlowWithSentinelCheck(const void* value);
 
 #if defined(CPPGC_YOUNG_GENERATION)
-  static V8_INLINE void GenerationalBarrier(CagedHeapLocalData* local_data,
-                                            const void* slot,
-                                            uintptr_t slot_offset,
-                                            uintptr_t value_offset) {
-    const AgeTable& age_table = local_data->age_table;
+  static void GenerationalBarrierSlow(const CagedHeapLocalData& local_data,
+                                      const AgeTable& ageTable,
+                                      const void* slot, uintptr_t value_offset);
+#endif  // CPPGC_YOUNG_GENERATION
+};
 
-    // Bail out if the slot is in young generation.
-    if (V8_LIKELY(age_table[slot_offset] == AgeTable::Age::kYoung)) return;
+#if defined(CPPGC_CAGED_HEAP)
+class WriteBarrierTypeForCagedHeapPolicy final {
+ public:
+  template <WriteBarrier::ValueMode value_mode>
+  static V8_INLINE WriteBarrier::Type Get(const void* slot, const void* value,
+                                          WriteBarrier::Params& params) {
+    const bool have_caged_heap =
+        value_mode == WriteBarrier::ValueMode::kValuePresent
+            ? TryGetCagedHeap(slot, value, params)
+            : TryGetCagedHeap(slot, slot, params);
+    if (!have_caged_heap) {
+      return WriteBarrier::Type::kNone;
+    }
+    if (V8_UNLIKELY(params.caged_heap().is_marking_in_progress)) {
+#if V8_ENABLE_CHECKS
+      params.type = WriteBarrier::Type::kMarking;
+#endif  // !V8_ENABLE_CHECKS
+      return WriteBarrier::Type::kMarking;
+    }
+#if defined(CPPGC_YOUNG_GENERATION)
+    params.slot_offset = reinterpret_cast<uintptr_t>(slot) - params.start;
+    if (value_mode == WriteBarrier::ValueMode::kValuePresent) {
+      params.value_offset = reinterpret_cast<uintptr_t>(value) - params.start;
+    } else {
+      params.value_offset = 0;
+    }
+#if V8_ENABLE_CHECKS
+    params.type = WriteBarrier::Type::kGenerational;
+#endif  // !V8_ENABLE_CHECKS
+    return WriteBarrier::Type::kGenerational;
+#else   // !CPPGC_YOUNG_GENERATION
+    return WriteBarrier::Type::kNone;
+#endif  // !CPPGC_YOUNG_GENERATION
+  }
 
-    GenerationalBarrierSlow(local_data, age_table, slot, value_offset);
+ private:
+  WriteBarrierTypeForCagedHeapPolicy() = delete;
+
+  static V8_INLINE bool TryGetCagedHeap(const void* slot, const void* value,
+                                        WriteBarrier::Params& params) {
+    params.start = reinterpret_cast<uintptr_t>(value) &
+                   ~(api_constants::kCagedHeapReservationAlignment - 1);
+    const uintptr_t slot_offset =
+        reinterpret_cast<uintptr_t>(slot) - params.start;
+    if (slot_offset > api_constants::kCagedHeapReservationSize) {
+      // Check if slot is on stack or value is sentinel or nullptr. This relies
+      // on the fact that kSentinelPointer is encoded as 0x1.
+      return false;
+    }
+    return true;
+  }
+};
+#endif  // CPPGC_CAGED_HEAP
+
+class WriteBarrierTypeForNonCagedHeapPolicy final {
+ public:
+  template <WriteBarrier::ValueMode value_mode>
+  static V8_INLINE WriteBarrier::Type Get(const void* slot, const void* value,
+                                          WriteBarrier::Params& params) {
+    WriteBarrier::Type type =
+        V8_LIKELY(!ProcessHeap::IsAnyIncrementalOrConcurrentMarking())
+            ? WriteBarrier::Type::kNone
+            : WriteBarrier::Type::kMarking;
+#if V8_ENABLE_CHECKS
+    params.type = type;
+#endif  // !V8_ENABLE_CHECKS
+    return type;
   }
 
-  static void GenerationalBarrierSlow(CagedHeapLocalData* local_data,
-                                      const AgeTable& ageTable,
-                                      const void* slot, uintptr_t value_offset);
-#endif
+ private:
+  WriteBarrierTypeForNonCagedHeapPolicy() = delete;
 };
 
+// static
+WriteBarrier::Type WriteBarrier::GetWriteBarrierType(
+    const void* slot, const void* value, WriteBarrier::Params& params) {
+  return WriteBarrierTypePolicy::Get<ValueMode::kValuePresent>(slot, value,
+                                                               params);
+}
+
+// static
+WriteBarrier::Type WriteBarrier::GetWriteBarrierType(
+    const void* slot, WriteBarrier::Params& params) {
+  return WriteBarrierTypePolicy::Get<ValueMode::kNoValuePresent>(slot, nullptr,
+                                                                 params);
+}
+
+// static
+void WriteBarrier::DijkstraMarkingBarrier(const Params& params,
+                                          const void* object) {
+  CheckParams(Type::kMarking, params);
+#if defined(CPPGC_CAGED_HEAP)
+  // Caged heap already filters out sentinels.
+  DijkstraMarkingBarrierSlow(object);
+#else   // !CPPGC_CAGED_HEAP
+  DijkstraMarkingBarrierSlowWithSentinelCheck(object);
+#endif  // !CPPGC_CAGED_HEAP
+}
+
+// static
+void WriteBarrier::DijkstraMarkingBarrierRange(const Params& params,
+                                               HeapHandle& heap,
+                                               const void* first_element,
+                                               size_t element_size,
+                                               size_t number_of_elements,
+                                               TraceCallback trace_callback) {
+  CheckParams(Type::kMarking, params);
+  DijkstraMarkingBarrierRangeSlow(heap, first_element, element_size,
+                                  number_of_elements, trace_callback);
+}
+
+// static
+void WriteBarrier::SteeleMarkingBarrier(const Params& params,
+                                        const void* object) {
+  CheckParams(Type::kMarking, params);
+#if defined(CPPGC_CAGED_HEAP)
+  // Caged heap already filters out sentinels.
+  SteeleMarkingBarrierSlow(object);
+#else   // !CPPGC_CAGED_HEAP
+  SteeleMarkingBarrierSlowWithSentinelCheck(object);
+#endif  // !CPPGC_CAGED_HEAP
+}
+
+#if defined(CPPGC_YOUNG_GENERATION)
+// static
+void WriteBarrier::GenerationalBarrier(const Params& params, const void* slot) {
+  CheckParams(Type::kGenerational, params);
+
+  const CagedHeapLocalData& local_data = params.caged_heap();
+  const AgeTable& age_table = local_data.age_table;
+
+  // Bail out if the slot is in young generation.
+  if (V8_LIKELY(age_table[params.slot_offset] == AgeTable::Age::kYoung)) return;
+
+  GenerationalBarrierSlow(local_data, age_table, slot, params.value_offset);
+}
+
+#endif  // !CPPGC_YOUNG_GENERATION
+
 }  // namespace internal
 }  // namespace cppgc
 
diff --git a/deps/v8/include/cppgc/platform.h b/deps/v8/include/cppgc/platform.h
index fb0b6b208275c9..571aa80c3b80f1 100644
--- a/deps/v8/include/cppgc/platform.h
+++ b/deps/v8/include/cppgc/platform.h
@@ -20,6 +20,7 @@ using PageAllocator = v8::PageAllocator;
 using Task = v8::Task;
 using TaskPriority = v8::TaskPriority;
 using TaskRunner = v8::TaskRunner;
+using TracingController = v8::TracingController;
 
 /**
  * Platform interface used by Heap. Contains allocators and executors.
@@ -113,6 +114,13 @@ class V8_EXPORT Platform {
       TaskPriority priority, std::unique_ptr<JobTask> job_task) {
     return nullptr;
   }
+
+  /**
+   * Returns an instance of a `TracingController`. This must be non-nullptr. The
+   * default implementation returns an empty `TracingController` that consumes
+   * trace data without effect.
+   */
+  virtual TracingController* GetTracingController();
 };
 
 /**
diff --git a/deps/v8/include/cppgc/prefinalizer.h b/deps/v8/include/cppgc/prefinalizer.h
index bde76429ec95c4..9b7bc0e5943870 100644
--- a/deps/v8/include/cppgc/prefinalizer.h
+++ b/deps/v8/include/cppgc/prefinalizer.h
@@ -34,7 +34,7 @@ class PrefinalizerRegistration final {
  public:                                                                       \
   static bool InvokePreFinalizer(const cppgc::LivenessBroker& liveness_broker, \
                                  void* object) {                               \
-    static_assert(cppgc::internal::IsGarbageCollectedTypeV<Class>,             \
+    static_assert(cppgc::IsGarbageCollectedTypeV<Class>,                       \
                   "Only garbage collected objects can have prefinalizers");    \
     Class* self = static_cast<Class*>(object);                                 \
     if (liveness_broker.IsHeapObjectAlive(self)) return false;                 \
diff --git a/deps/v8/include/cppgc/type-traits.h b/deps/v8/include/cppgc/type-traits.h
index 4d8ab809c8d439..c7d02db902389c 100644
--- a/deps/v8/include/cppgc/type-traits.h
+++ b/deps/v8/include/cppgc/type-traits.h
@@ -5,6 +5,8 @@
 #ifndef INCLUDE_CPPGC_TYPE_TRAITS_H_
 #define INCLUDE_CPPGC_TYPE_TRAITS_H_
 
+// This file should stay with minimal dependencies to allow embedder to check
+// against Oilpan types without including any other parts.
 #include <type_traits>
 
 namespace cppgc {
@@ -12,6 +14,14 @@ namespace cppgc {
 class Visitor;
 
 namespace internal {
+template <typename T, typename WeaknessTag, typename WriteBarrierPolicy,
+          typename CheckingPolicy>
+class BasicMember;
+struct DijkstraWriteBarrierPolicy;
+struct NoWriteBarrierPolicy;
+class StrongMemberTag;
+class UntracedMemberTag;
+class WeakMemberTag;
 
 // Pre-C++17 custom implementation of std::void_t.
 template <typename... Ts>
@@ -25,18 +35,6 @@ using void_t = typename make_void<Ts...>::type;
 template <typename T>
 struct IsWeak : std::false_type {};
 
-template <typename T, template <typename... V> class U>
-struct IsSubclassOfTemplate {
- private:
-  template <typename... W>
-  static std::true_type SubclassCheck(U<W...>*);
-  static std::false_type SubclassCheck(...);
-
- public:
-  static constexpr bool value =
-      decltype(SubclassCheck(std::declval<T*>()))::value;
-};
-
 // IsTraceMethodConst is used to verify that all Trace methods are marked as
 // const. It is equivalent to IsTraceable but for a non-const object.
 template <typename T, typename = void>
@@ -91,16 +89,56 @@ struct IsGarbageCollectedType<
   static_assert(sizeof(T), "T must be fully defined");
 };
 
+template <typename BasicMemberCandidate, typename WeaknessTag,
+          typename WriteBarrierPolicy>
+struct IsSubclassOfBasicMemberTemplate {
+ private:
+  template <typename T, typename CheckingPolicy>
+  static std::true_type SubclassCheck(
+      BasicMember<T, WeaknessTag, WriteBarrierPolicy, CheckingPolicy>*);
+  static std::false_type SubclassCheck(...);
+
+ public:
+  static constexpr bool value =
+      decltype(SubclassCheck(std::declval<BasicMemberCandidate*>()))::value;
+};
+
+template <typename T,
+          bool = IsSubclassOfBasicMemberTemplate<
+              T, StrongMemberTag, DijkstraWriteBarrierPolicy>::value>
+struct IsMemberType : std::false_type {};
+
 template <typename T>
-constexpr bool IsGarbageCollectedTypeV =
-    internal::IsGarbageCollectedType<T>::value;
+struct IsMemberType<T, true> : std::true_type {};
+
+template <typename T, bool = IsSubclassOfBasicMemberTemplate<
+                          T, WeakMemberTag, DijkstraWriteBarrierPolicy>::value>
+struct IsWeakMemberType : std::false_type {};
 
 template <typename T>
-constexpr bool IsGarbageCollectedMixinTypeV =
-    internal::IsGarbageCollectedMixinType<T>::value;
+struct IsWeakMemberType<T, true> : std::true_type {};
+
+template <typename T, bool = IsSubclassOfBasicMemberTemplate<
+                          T, UntracedMemberTag, NoWriteBarrierPolicy>::value>
+struct IsUntracedMemberType : std::false_type {};
+
+template <typename T>
+struct IsUntracedMemberType<T, true> : std::true_type {};
 
 }  // namespace internal
 
+template <typename T>
+constexpr bool IsGarbageCollectedMixinTypeV =
+    internal::IsGarbageCollectedMixinType<T>::value;
+template <typename T>
+constexpr bool IsGarbageCollectedTypeV =
+    internal::IsGarbageCollectedType<T>::value;
+template <typename T>
+constexpr bool IsMemberTypeV = internal::IsMemberType<T>::value;
+template <typename T>
+constexpr bool IsUntracedMemberTypeV = internal::IsUntracedMemberType<T>::value;
+template <typename T>
+constexpr bool IsWeakMemberTypeV = internal::IsWeakMemberType<T>::value;
 template <typename T>
 constexpr bool IsWeakV = internal::IsWeak<T>::value;
 
diff --git a/deps/v8/include/cppgc/visitor.h b/deps/v8/include/cppgc/visitor.h
index 01f5f20e520b65..74024c3d0e2568 100644
--- a/deps/v8/include/cppgc/visitor.h
+++ b/deps/v8/include/cppgc/visitor.h
@@ -190,7 +190,7 @@ class V8_EXPORT Visitor {
     static_assert(internal::IsAllocatedOnCompactableSpace<T>::value,
                   "Only references to objects allocated on compactable spaces "
                   "should be registered as movable slots.");
-    static_assert(!internal::IsGarbageCollectedMixinTypeV<T>,
+    static_assert(!IsGarbageCollectedMixinTypeV<T>,
                   "Mixin types do not support compaction.");
     HandleMovableReference(reinterpret_cast<const void**>(slot));
   }
diff --git a/deps/v8/include/js_protocol.pdl b/deps/v8/include/js_protocol.pdl
index 6971edd5103a72..42470d88efd577 100644
--- a/deps/v8/include/js_protocol.pdl
+++ b/deps/v8/include/js_protocol.pdl
@@ -211,21 +211,6 @@ domain Debugger
       # Exception details.
       optional Runtime.ExceptionDetails exceptionDetails
 
-  # Execute a Wasm Evaluator module on a given call frame.
-  experimental command executeWasmEvaluator
-    parameters
-      # WebAssembly call frame identifier to evaluate on.
-      CallFrameId callFrameId
-      # Code of the evaluator module.
-      binary evaluator
-      # Terminate execution after timing out (number of milliseconds).
-      experimental optional Runtime.TimeDelta timeout
-    returns
-      # Object wrapper for the evaluation result.
-      Runtime.RemoteObject result
-      # Exception details.
-      optional Runtime.ExceptionDetails exceptionDetails
-
   # Returns possible locations for breakpoint. scriptId in start and end range locations should be
   # the same.
   command getPossibleBreakpoints
@@ -508,6 +493,7 @@ domain Debugger
       enum reason
         ambiguous
         assert
+        CSPViolation
         debugCommand
         DOM
         EventListener
@@ -1022,8 +1008,9 @@ domain Runtime
         boolean
         symbol
         bigint
-        wasm
-      # Object subtype hint. Specified for `object` or `wasm` type values only.
+      # Object subtype hint. Specified for `object` type values only.
+      # NOTE: If you change anything here, make sure to also update
+      # `subtype` in `ObjectPreview` and `PropertyPreview` below.
       optional enum subtype
         array
         null
@@ -1042,12 +1029,7 @@ domain Runtime
         typedarray
         arraybuffer
         dataview
-        i32
-        i64
-        f32
-        f64
-        v128
-        externref
+        webassemblymemory
       # Object class (constructor) name. Specified for `object` type values only.
       optional string className
       # Remote object value in case of primitive values or JSON values (if it was requested).
@@ -1100,6 +1082,12 @@ domain Runtime
         iterator
         generator
         error
+        proxy
+        promise
+        typedarray
+        arraybuffer
+        dataview
+        webassemblymemory
       # String representation of the object.
       optional string description
       # True iff some of the properties or entries of the original object did not fit.
@@ -1142,6 +1130,12 @@ domain Runtime
         iterator
         generator
         error
+        proxy
+        promise
+        typedarray
+        arraybuffer
+        dataview
+        webassemblymemory
 
   experimental type EntryPreview extends object
     properties
@@ -1224,6 +1218,10 @@ domain Runtime
       string origin
       # Human readable name describing given context.
       string name
+      # A system-unique execution context identifier. Unlike the id, this is unique accross
+      # multiple processes, so can be reliably used to identify specific context while backend
+      # performs a cross-process navigation.
+      experimental string uniqueId
       # Embedder-specific auxiliary data.
       optional object auxData
 
@@ -1387,6 +1385,9 @@ domain Runtime
       optional boolean silent
       # Specifies in which execution context to perform evaluation. If the parameter is omitted the
       # evaluation will be performed in the context of the inspected page.
+      # This is mutually exclusive with `uniqueContextId`, which offers an
+      # alternative way to identify the execution context that is more reliable
+      # in a multi-process environment.
       optional ExecutionContextId contextId
       # Whether the result is expected to be a JSON object that should be sent by value.
       optional boolean returnByValue
@@ -1413,6 +1414,13 @@ domain Runtime
       # when called with non-callable arguments. This flag bypasses CSP for this
       # evaluation and allows unsafe-eval. Defaults to true.
       experimental optional boolean allowUnsafeEvalBlockedByCSP
+      # An alternative way to specify the execution context to evaluate in.
+      # Compared to contextId that may be reused accross processes, this is guaranteed to be
+      # system-unique, so it can be used to prevent accidental evaluation of the expression
+      # in context different than intended (e.g. as a result of navigation accross process
+      # boundaries).
+      # This is mutually exclusive with `contextId`.
+      experimental optional string uniqueContextId
     returns
       # Evaluation result.
       RemoteObject result
diff --git a/deps/v8/include/libplatform/libplatform.h b/deps/v8/include/libplatform/libplatform.h
index 1c874ba29b2e94..00de81df887fc4 100644
--- a/deps/v8/include/libplatform/libplatform.h
+++ b/deps/v8/include/libplatform/libplatform.h
@@ -43,6 +43,17 @@ V8_PLATFORM_EXPORT std::unique_ptr<v8::Platform> NewDefaultPlatform(
         InProcessStackDumping::kDisabled,
     std::unique_ptr<v8::TracingController> tracing_controller = {});
 
+/**
+ * The same as NewDefaultPlatform but disables the worker thread pool.
+ * It must be used with the --single-threaded V8 flag.
+ */
+V8_PLATFORM_EXPORT std::unique_ptr<v8::Platform>
+NewSingleThreadedDefaultPlatform(
+    IdleTaskSupport idle_task_support = IdleTaskSupport::kDisabled,
+    InProcessStackDumping in_process_stack_dumping =
+        InProcessStackDumping::kDisabled,
+    std::unique_ptr<v8::TracingController> tracing_controller = {});
+
 /**
  * Returns a new instance of the default v8::JobHandle implementation.
  *
diff --git a/deps/v8/include/libplatform/v8-tracing.h b/deps/v8/include/libplatform/v8-tracing.h
index 45822d00f371d4..c7a5c4f9f5fb5a 100644
--- a/deps/v8/include/libplatform/v8-tracing.h
+++ b/deps/v8/include/libplatform/v8-tracing.h
@@ -125,6 +125,8 @@ class V8_PLATFORM_EXPORT TraceWriter {
   static TraceWriter* CreateJSONTraceWriter(std::ostream& stream,
                                             const std::string& tag);
 
+  static TraceWriter* CreateSystemInstrumentationTraceWriter();
+
  private:
   // Disallow copy and assign
   TraceWriter(const TraceWriter&) = delete;
diff --git a/deps/v8/include/v8-cppgc.h b/deps/v8/include/v8-cppgc.h
index 805eb015e053d3..8a0d9cb9a0737e 100644
--- a/deps/v8/include/v8-cppgc.h
+++ b/deps/v8/include/v8-cppgc.h
@@ -5,12 +5,55 @@
 #ifndef INCLUDE_V8_CPPGC_H_
 #define INCLUDE_V8_CPPGC_H_
 
+#include <memory>
+#include <vector>
+
+#include "cppgc/custom-space.h"
+#include "cppgc/internal/write-barrier.h"
 #include "cppgc/visitor.h"
 #include "v8-internal.h"  // NOLINT(build/include_directory)
-#include "v8.h"  // NOLINT(build/include_directory)
+#include "v8.h"           // NOLINT(build/include_directory)
+
+namespace cppgc {
+class AllocationHandle;
+class HeapHandle;
+}  // namespace cppgc
 
 namespace v8 {
 
+namespace internal {
+class CppHeap;
+}  // namespace internal
+
+struct V8_EXPORT CppHeapCreateParams {
+  std::vector<std::unique_ptr<cppgc::CustomSpaceBase>> custom_spaces;
+};
+
+/**
+ * A heap for allocating managed C++ objects.
+ */
+class V8_EXPORT CppHeap {
+ public:
+  virtual ~CppHeap() = default;
+
+  /**
+   * \returns the opaque handle for allocating objects using
+   * `MakeGarbageCollected()`.
+   */
+  cppgc::AllocationHandle& GetAllocationHandle();
+
+  /**
+   * \returns the opaque heap handle which may be used to refer to this heap in
+   *   other APIs. Valid as long as the underlying `CppHeap` is alive.
+   */
+  cppgc::HeapHandle& GetHeapHandle();
+
+ private:
+  CppHeap() = default;
+
+  friend class internal::CppHeap;
+};
+
 class JSVisitor : public cppgc::Visitor {
  public:
   explicit JSVisitor(cppgc::Visitor::Key key) : cppgc::Visitor(key) {}
@@ -26,6 +69,64 @@ class JSVisitor : public cppgc::Visitor {
   virtual void Visit(const TracedReferenceBase& ref) {}
 };
 
+/**
+ * **DO NOT USE: Use the appropriate managed types.**
+ *
+ * Consistency helpers that aid in maintaining a consistent internal state of
+ * the garbage collector.
+ */
+class JSHeapConsistency final {
+ public:
+  using WriteBarrierParams = cppgc::internal::WriteBarrier::Params;
+  using WriteBarrierType = cppgc::internal::WriteBarrier::Type;
+
+  /**
+   * Gets the required write barrier type for a specific write.
+   *
+   * \param ref The reference being written to.
+   * \param params Parameters that may be used for actual write barrier calls.
+   *   Only filled if return value indicates that a write barrier is needed. The
+   *   contents of the `params` are an implementation detail.
+   * \returns whether a write barrier is needed and which barrier to invoke.
+   */
+  static V8_INLINE WriteBarrierType GetWriteBarrierType(
+      const TracedReferenceBase& ref, WriteBarrierParams& params) {
+    if (ref.IsEmpty()) return WriteBarrierType::kNone;
+    return cppgc::internal::WriteBarrier::GetWriteBarrierType(&ref, params);
+  }
+
+  /**
+   * Conservative Dijkstra-style write barrier that processes an object if it
+   * has not yet been processed.
+   *
+   * \param params The parameters retrieved from `GetWriteBarrierType()`.
+   * \param ref The reference being written to.
+   */
+  static V8_INLINE void DijkstraMarkingBarrier(const WriteBarrierParams& params,
+                                               cppgc::HeapHandle& heap_handle,
+                                               const TracedReferenceBase& ref) {
+    cppgc::internal::WriteBarrier::CheckParams(WriteBarrierType::kMarking,
+                                               params);
+    DijkstraMarkingBarrierSlow(heap_handle, ref);
+  }
+
+  /**
+   * Generational barrier for maintaining consistency when running with multiple
+   * generations.
+   *
+   * \param params The parameters retrieved from `GetWriteBarrierType()`.
+   * \param ref The reference being written to.
+   */
+  static V8_INLINE void GenerationalBarrier(const WriteBarrierParams& params,
+                                            const TracedReferenceBase& ref) {}
+
+ private:
+  JSHeapConsistency() = delete;
+
+  static void DijkstraMarkingBarrierSlow(cppgc::HeapHandle&,
+                                         const TracedReferenceBase& ref);
+};
+
 }  // namespace v8
 
 namespace cppgc {
diff --git a/deps/v8/include/v8-inspector.h b/deps/v8/include/v8-inspector.h
index 86fcf5187701c1..a55518e45930e1 100644
--- a/deps/v8/include/v8-inspector.h
+++ b/deps/v8/include/v8-inspector.h
@@ -106,6 +106,7 @@ class V8_EXPORT V8StackTrace {
   virtual int topLineNumber() const = 0;
   virtual int topColumnNumber() const = 0;
   virtual StringView topScriptId() const = 0;
+  virtual int topScriptIdAsInteger() const = 0;
   virtual StringView topFunctionName() const = 0;
 
   virtual ~V8StackTrace() = default;
@@ -228,6 +229,10 @@ class V8_EXPORT V8InspectorClient {
       const StringView& resourceName) {
     return nullptr;
   }
+
+  // The caller would defer to generating a random 64 bit integer if
+  // this method returns 0.
+  virtual int64_t generateUniqueId() { return 0; }
 };
 
 // These stack trace ids are intended to be passed between debuggers and be
diff --git a/deps/v8/include/v8-internal.h b/deps/v8/include/v8-internal.h
index 06846d7005550e..8abbcfb416b2a6 100644
--- a/deps/v8/include/v8-internal.h
+++ b/deps/v8/include/v8-internal.h
@@ -207,8 +207,10 @@ class Internals {
       kNumIsolateDataSlots * kApiSystemPointerSize;
   static const int kIsolateFastCCallCallerPcOffset =
       kIsolateFastCCallCallerFpOffset + kApiSystemPointerSize;
-  static const int kIsolateStackGuardOffset =
+  static const int kIsolateFastApiCallTargetOffset =
       kIsolateFastCCallCallerPcOffset + kApiSystemPointerSize;
+  static const int kIsolateStackGuardOffset =
+      kIsolateFastApiCallTargetOffset + kApiSystemPointerSize;
   static const int kIsolateRootsOffset =
       kIsolateStackGuardOffset + 7 * kApiSystemPointerSize;
 
diff --git a/deps/v8/include/v8-metrics.h b/deps/v8/include/v8-metrics.h
index 69784dcb0fcbf6..1e2bd50acf6494 100644
--- a/deps/v8/include/v8-metrics.h
+++ b/deps/v8/include/v8-metrics.h
@@ -10,14 +10,12 @@
 namespace v8 {
 namespace metrics {
 
-// TODO(sartang@microsoft.com): Remove wall_clock_time_in_us.
 struct WasmModuleDecoded {
   bool async = false;
   bool streamed = false;
   bool success = false;
   size_t module_size_in_bytes = 0;
   size_t function_count = 0;
-  int64_t wall_clock_time_in_us = -1;
   int64_t wall_clock_duration_in_us = -1;
 };
 
@@ -30,7 +28,6 @@ struct WasmModuleCompiled {
   bool success = false;
   size_t code_size_in_bytes = 0;
   size_t liftoff_bailout_count = 0;
-  int64_t wall_clock_time_in_us = -1;
   int64_t wall_clock_duration_in_us = -1;
 };
 
@@ -38,14 +35,12 @@ struct WasmModuleInstantiated {
   bool async = false;
   bool success = false;
   size_t imported_function_count = 0;
-  int64_t wall_clock_time_in_us = -1;
   int64_t wall_clock_duration_in_us = -1;
 };
 
 struct WasmModuleTieredUp {
   bool lazy = false;
   size_t code_size_in_bytes = 0;
-  int64_t wall_clock_time_in_us = -1;
   int64_t wall_clock_duration_in_us = -1;
 };
 
diff --git a/deps/v8/include/v8-platform.h b/deps/v8/include/v8-platform.h
index 1f1497f6ccd7f2..e27d26cb692e46 100644
--- a/deps/v8/include/v8-platform.h
+++ b/deps/v8/include/v8-platform.h
@@ -225,22 +225,24 @@ class JobHandle {
   virtual void CancelAndDetach() { Cancel(); }
 
   /**
-   * Returns true if there's currently no work pending and no worker running.
-   * TODO(etiennep): Deprecate IsCompleted in favor of IsActive once implemented
-   * by all embedders.
+   * Returns true if there's any work pending or any worker running.
    */
-  virtual bool IsCompleted() = 0;
-  virtual bool IsActive() { return !IsCompleted(); }
+  virtual bool IsActive() = 0;
+
+  // TODO(etiennep): Clean up once all overrides are removed.
+  V8_DEPRECATED("Use !IsActive() instead.")
+  virtual bool IsCompleted() { return !IsActive(); }
 
   /**
    * Returns true if associated with a Job and other methods may be called.
    * Returns false after Join() or Cancel() was called. This may return true
    * even if no workers are running and IsCompleted() returns true
-   * TODO(etiennep): Deprecate IsRunning in favor of IsValid once implemented by
-   * all embedders.
    */
-  virtual bool IsRunning() = 0;
-  virtual bool IsValid() { return IsRunning(); }
+  virtual bool IsValid() = 0;
+
+  // TODO(etiennep): Clean up once all overrides are removed.
+  V8_DEPRECATED("Use IsValid() instead.")
+  virtual bool IsRunning() { return IsValid(); }
 
   /**
    * Returns true if job priority can be changed.
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index 8ecd81cb5dad1a..67c1c84b32b84b 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -9,9 +9,9 @@
 // NOTE these macros are used by some of the tool scripts and the build
 // system so their names cannot be changed without changing the scripts.
 #define V8_MAJOR_VERSION 8
-#define V8_MINOR_VERSION 8
-#define V8_BUILD_NUMBER 278
-#define V8_PATCH_LEVEL 17
+#define V8_MINOR_VERSION 9
+#define V8_BUILD_NUMBER 255
+#define V8_PATCH_LEVEL 19
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h
index f6426f8edf2bab..e9235d17955089 100644
--- a/deps/v8/include/v8.h
+++ b/deps/v8/include/v8.h
@@ -48,6 +48,8 @@ class Boolean;
 class BooleanObject;
 class CFunction;
 class Context;
+class CppHeap;
+struct CppHeapCreateParams;
 class Data;
 class Date;
 class External;
@@ -89,6 +91,7 @@ class Private;
 class Uint32;
 class Utils;
 class Value;
+class WasmMemoryObject;
 class WasmModuleObject;
 template <class T> class Local;
 template <class T>
@@ -433,7 +436,7 @@ static const int kEmbedderFieldsInWeakCallback = 2;
 template <typename T>
 class WeakCallbackInfo {
  public:
-  typedef void (*Callback)(const WeakCallbackInfo<T>& data);
+  using Callback = void (*)(const WeakCallbackInfo<T>& data);
 
   WeakCallbackInfo(Isolate* isolate, T* parameter,
                    void* embedder_fields[kEmbedderFieldsInWeakCallback],
@@ -627,7 +630,7 @@ template <class T> class PersistentBase {
 template<class T>
 class NonCopyablePersistentTraits {
  public:
-  typedef Persistent<T, NonCopyablePersistentTraits<T> > NonCopyablePersistent;
+  using NonCopyablePersistent = Persistent<T, NonCopyablePersistentTraits<T>>;
   static const bool kResetInDestructor = false;
   template<class S, class M>
   V8_INLINE static void Copy(const Persistent<S, M>& source,
@@ -644,7 +647,7 @@ class NonCopyablePersistentTraits {
  */
 template<class T>
 struct CopyablePersistentTraits {
-  typedef Persistent<T, CopyablePersistentTraits<T> > CopyablePersistent;
+  using CopyablePersistent = Persistent<T, CopyablePersistentTraits<T>>;
   static const bool kResetInDestructor = true;
   template<class S, class M>
   static V8_INLINE void Copy(const Persistent<S, M>& source,
@@ -806,7 +809,7 @@ class Global : public PersistentBase<T> {
   /*
    * For compatibility with Chromium's base::Bind (base::Passed).
    */
-  typedef void MoveOnlyTypeForCPP03;
+  using MoveOnlyTypeForCPP03 = void;
 
   Global(const Global&) = delete;
   void operator=(const Global&) = delete;
@@ -1195,7 +1198,7 @@ class TracedReference : public BasicTracedReference<T> {
  * handle and may deallocate it.  The behavior of accessing a handle
  * for which the handle scope has been deleted is undefined.
  */
-class V8_EXPORT HandleScope {
+class V8_EXPORT V8_NODISCARD HandleScope {
  public:
   explicit HandleScope(Isolate* isolate);
 
@@ -1242,12 +1245,11 @@ class V8_EXPORT HandleScope {
   friend class Context;
 };
 
-
 /**
  * A HandleScope which first allocates a handle in the current scope
  * which will be later filled with the escape value.
  */
-class V8_EXPORT EscapableHandleScope : public HandleScope {
+class V8_EXPORT V8_NODISCARD EscapableHandleScope : public HandleScope {
  public:
   explicit EscapableHandleScope(Isolate* isolate);
   V8_INLINE ~EscapableHandleScope() = default;
@@ -1288,7 +1290,7 @@ class V8_EXPORT EscapableHandleScope : public HandleScope {
  * are allowed. It can be useful for debugging handle leaks.
  * Handles can be allocated within inner normal HandleScopes.
  */
-class V8_EXPORT SealHandleScope {
+class V8_EXPORT V8_NODISCARD SealHandleScope {
  public:
   explicit SealHandleScope(Isolate* isolate);
   ~SealHandleScope();
@@ -1309,7 +1311,6 @@ class V8_EXPORT SealHandleScope {
   int prev_sealed_level_;
 };
 
-
 // --- Special objects ---
 
 /**
@@ -1422,10 +1423,10 @@ class ScriptOriginOptions {
  */
 class ScriptOrigin {
  public:
-  V8_INLINE ScriptOrigin(
-      Local<Value> resource_name,
-      Local<Integer> resource_line_offset = Local<Integer>(),
-      Local<Integer> resource_column_offset = Local<Integer>(),
+  V8_DEPRECATE_SOON("Use constructor with primitvie C++ types")
+  V8_INLINE explicit ScriptOrigin(
+      Local<Value> resource_name, Local<Integer> resource_line_offset,
+      Local<Integer> resource_column_offset,
       Local<Boolean> resource_is_shared_cross_origin = Local<Boolean>(),
       Local<Integer> script_id = Local<Integer>(),
       Local<Value> source_map_url = Local<Value>(),
@@ -1433,21 +1434,36 @@ class ScriptOrigin {
       Local<Boolean> is_wasm = Local<Boolean>(),
       Local<Boolean> is_module = Local<Boolean>(),
       Local<PrimitiveArray> host_defined_options = Local<PrimitiveArray>());
+  V8_INLINE explicit ScriptOrigin(
+      Local<Value> resource_name, int resource_line_offset = 0,
+      int resource_column_offset = 0,
+      bool resource_is_shared_cross_origin = false, int script_id = -1,
+      Local<Value> source_map_url = Local<Value>(),
+      bool resource_is_opaque = false, bool is_wasm = false,
+      bool is_module = false,
+      Local<PrimitiveArray> host_defined_options = Local<PrimitiveArray>());
 
   V8_INLINE Local<Value> ResourceName() const;
+  V8_DEPRECATE_SOON("Use getter with primitvie C++ types.")
   V8_INLINE Local<Integer> ResourceLineOffset() const;
+  V8_DEPRECATE_SOON("Use getter with primitvie C++ types.")
   V8_INLINE Local<Integer> ResourceColumnOffset() const;
+  V8_DEPRECATE_SOON("Use getter with primitvie C++ types.")
   V8_INLINE Local<Integer> ScriptID() const;
+  V8_INLINE int LineOffset() const;
+  V8_INLINE int ColumnOffset() const;
+  V8_INLINE int ScriptId() const;
   V8_INLINE Local<Value> SourceMapUrl() const;
   V8_INLINE Local<PrimitiveArray> HostDefinedOptions() const;
   V8_INLINE ScriptOriginOptions Options() const { return options_; }
 
  private:
+  Isolate* isolate_;
   Local<Value> resource_name_;
-  Local<Integer> resource_line_offset_;
-  Local<Integer> resource_column_offset_;
+  int resource_line_offset_;
+  int resource_column_offset_;
   ScriptOriginOptions options_;
-  Local<Integer> script_id_;
+  int script_id_;
   Local<Value> source_map_url_;
   Local<PrimitiveArray> host_defined_options_;
 };
@@ -1506,6 +1522,43 @@ class V8_EXPORT Location {
   int column_number_;
 };
 
+/**
+ * A fixed-sized array with elements of type Data.
+ */
+class V8_EXPORT FixedArray : public Data {
+ public:
+  int Length() const;
+  Local<Data> Get(Local<Context> context, int i) const;
+};
+
+class V8_EXPORT ModuleRequest : public Data {
+ public:
+  /**
+   * Returns the module specifier for this ModuleRequest.
+   */
+  Local<String> GetSpecifier() const;
+
+  /**
+   * Returns the source code offset of this module request.
+   * Use Module::SourceOffsetToLocation to convert this to line/column numbers.
+   */
+  int GetSourceOffset() const;
+
+  /**
+   * Contains the import assertions for this request in the form:
+   * [key1, value1, source_offset1, key2, value2, source_offset2, ...].
+   * The keys and values are of type v8::String, and the source offsets are of
+   * type Int32. Use Module::SourceOffsetToLocation to convert the source
+   * offsets to Locations with line/column numbers.
+   */
+  Local<FixedArray> GetImportAssertions() const;
+
+  V8_INLINE static ModuleRequest* Cast(Data* data);
+
+ private:
+  static void CheckCast(Data* obj);
+};
+
 /**
  * A compiled JavaScript module.
  */
@@ -1540,28 +1593,48 @@ class V8_EXPORT Module : public Data {
   /**
    * Returns the number of modules requested by this module.
    */
+  V8_DEPRECATE_SOON("Use Module::GetModuleRequests() and FixedArray::Length().")
   int GetModuleRequestsLength() const;
 
   /**
    * Returns the ith module specifier in this module.
    * i must be < GetModuleRequestsLength() and >= 0.
    */
+  V8_DEPRECATE_SOON(
+      "Use Module::GetModuleRequests() and ModuleRequest::GetSpecifier().")
   Local<String> GetModuleRequest(int i) const;
 
   /**
    * Returns the source location (line number and column number) of the ith
    * module specifier's first occurrence in this module.
    */
+  V8_DEPRECATE_SOON(
+      "Use Module::GetModuleRequests(), ModuleRequest::GetSourceOffset(), and "
+      "Module::SourceOffsetToLocation().")
   Location GetModuleRequestLocation(int i) const;
 
+  /**
+   * Returns the ModuleRequests for this module.
+   */
+  Local<FixedArray> GetModuleRequests() const;
+
+  /**
+   * For the given source text offset in this module, returns the corresponding
+   * Location with line and column numbers.
+   */
+  Location SourceOffsetToLocation(int offset) const;
+
   /**
    * Returns the identity hash for this object.
    */
   int GetIdentityHash() const;
 
-  typedef MaybeLocal<Module> (*ResolveCallback)(Local<Context> context,
-                                                Local<String> specifier,
-                                                Local<Module> referrer);
+  using ResolveCallback V8_DEPRECATE_SOON("Use ResolveModuleCallback") =
+      MaybeLocal<Module> (*)(Local<Context> context, Local<String> specifier,
+                             Local<Module> referrer);
+  using ResolveModuleCallback = MaybeLocal<Module> (*)(
+      Local<Context> context, Local<String> specifier,
+      Local<FixedArray> import_assertions, Local<Module> referrer);
 
   /**
    * Instantiates the module and its dependencies.
@@ -1570,8 +1643,13 @@ class V8_EXPORT Module : public Data {
    * instantiation. (In the case where the callback throws an exception, that
    * exception is propagated.)
    */
+  V8_DEPRECATE_SOON(
+      "Use the version of InstantiateModule that takes a ResolveModuleCallback "
+      "parameter")
   V8_WARN_UNUSED_RESULT Maybe<bool> InstantiateModule(Local<Context> context,
                                                       ResolveCallback callback);
+  V8_WARN_UNUSED_RESULT Maybe<bool> InstantiateModule(
+      Local<Context> context, ResolveModuleCallback callback);
 
   /**
    * Evaluates the module and its dependencies.
@@ -1630,8 +1708,8 @@ class V8_EXPORT Module : public Data {
    * exception was thrown) and return an empy MaybeLocal to indicate falure
    * (where an exception was thrown).
    */
-  typedef MaybeLocal<Value> (*SyntheticModuleEvaluationSteps)(
-      Local<Context> context, Local<Module> module);
+  using SyntheticModuleEvaluationSteps =
+      MaybeLocal<Value> (*)(Local<Context> context, Local<Module> module);
 
   /**
    * Creates a new SyntheticModule with the specified export names, where
@@ -1654,7 +1732,7 @@ class V8_EXPORT Module : public Data {
    */
   V8_WARN_UNUSED_RESULT Maybe<bool> SetSyntheticModuleExport(
       Isolate* isolate, Local<String> export_name, Local<Value> export_value);
-  V8_DEPRECATE_SOON(
+  V8_DEPRECATED(
       "Use the preceding SetSyntheticModuleExport with an Isolate parameter, "
       "instead of the one that follows.  The former will throw a runtime "
       "error if called for an export that doesn't exist (as per spec); "
@@ -1694,6 +1772,7 @@ class V8_EXPORT Script {
   Local<UnboundScript> GetUnboundScript();
 };
 
+enum class ScriptType { kClassic, kModule };
 
 /**
  * For compiling scripts.
@@ -1746,8 +1825,8 @@ class V8_EXPORT ScriptCompiler {
     // Source takes ownership of CachedData.
     V8_INLINE Source(Local<String> source_string, const ScriptOrigin& origin,
                      CachedData* cached_data = nullptr);
-    V8_INLINE Source(Local<String> source_string,
-                     CachedData* cached_data = nullptr);
+    V8_INLINE explicit Source(Local<String> source_string,
+                              CachedData* cached_data = nullptr);
     V8_INLINE ~Source();
 
     // Ownership of the CachedData or its buffers is *not* transferred to the
@@ -1768,8 +1847,8 @@ class V8_EXPORT ScriptCompiler {
 
     // Origin information
     Local<Value> resource_name;
-    Local<Integer> resource_line_offset;
-    Local<Integer> resource_column_offset;
+    int resource_line_offset;
+    int resource_column_offset;
     ScriptOriginOptions resource_options;
     Local<Value> source_map_url;
     Local<PrimitiveArray> host_defined_options;
@@ -1839,11 +1918,9 @@ class V8_EXPORT ScriptCompiler {
    public:
     enum Encoding { ONE_BYTE, TWO_BYTE, UTF8 };
 
-#if defined(_MSC_VER) && _MSC_VER >= 1910 /* Disable on VS2015 */
-    V8_DEPRECATE_SOON(
+    V8_DEPRECATED(
         "This class takes ownership of source_stream, so use the constructor "
         "taking a unique_ptr to make these semantics clearer")
-#endif
     StreamedSource(ExternalSourceStream* source_stream, Encoding encoding);
     StreamedSource(std::unique_ptr<ExternalSourceStream> source_stream,
                    Encoding encoding);
@@ -1948,12 +2025,13 @@ class V8_EXPORT ScriptCompiler {
    * This API allows to start the streaming with as little data as possible, and
    * the remaining data (for example, the ScriptOrigin) is passed to Compile.
    */
-  V8_DEPRECATE_SOON("Use ScriptCompiler::StartStreamingScript instead.")
+  V8_DEPRECATED("Use ScriptCompiler::StartStreaming instead.")
   static ScriptStreamingTask* StartStreamingScript(
       Isolate* isolate, StreamedSource* source,
       CompileOptions options = kNoCompileOptions);
-  static ScriptStreamingTask* StartStreaming(Isolate* isolate,
-                                             StreamedSource* source);
+  static ScriptStreamingTask* StartStreaming(
+      Isolate* isolate, StreamedSource* source,
+      ScriptType type = ScriptType::kClassic);
 
   /**
    * Compiles a streamed script (bound to current context).
@@ -1998,6 +2076,17 @@ class V8_EXPORT ScriptCompiler {
       CompileOptions options = kNoCompileOptions,
       NoCacheReason no_cache_reason = kNoCacheNoReason);
 
+  /**
+   * Compiles a streamed module script.
+   *
+   * This can only be called after the streaming has finished
+   * (ScriptStreamingTask has been run). V8 doesn't construct the source string
+   * during streaming, so the embedder needs to pass the full source here.
+   */
+  static V8_WARN_UNUSED_RESULT MaybeLocal<Module> CompileModule(
+      Local<Context> context, StreamedSource* v8_source,
+      Local<String> full_source_string, const ScriptOrigin& origin);
+
   /**
    * Compile a function for a given context. This is equivalent to running
    *
@@ -2873,6 +2962,11 @@ class V8_EXPORT Value : public Data {
    */
   bool IsProxy() const;
 
+  /**
+   * Returns true if this value is a WasmMemoryObject.
+   */
+  bool IsWasmMemoryObject() const;
+
   /**
    * Returns true if this value is a WasmModuleObject.
    */
@@ -2995,11 +3089,11 @@ class V8_EXPORT Primitive : public Value { };
 class V8_EXPORT Boolean : public Primitive {
  public:
   bool Value() const;
-  V8_INLINE static Boolean* Cast(v8::Value* obj);
+  V8_INLINE static Boolean* Cast(v8::Data* data);
   V8_INLINE static Local<Boolean> New(Isolate* isolate, bool value);
 
  private:
-  static void CheckCast(v8::Value* obj);
+  static void CheckCast(v8::Data* that);
 };
 
 
@@ -3017,10 +3111,10 @@ class V8_EXPORT Name : public Primitive {
    */
   int GetIdentityHash();
 
-  V8_INLINE static Name* Cast(Value* obj);
+  V8_INLINE static Name* Cast(Data* data);
 
  private:
-  static void CheckCast(Value* obj);
+  static void CheckCast(Data* that);
 };
 
 /**
@@ -3133,14 +3227,6 @@ class V8_EXPORT String : public Name {
    */
   V8_INLINE static Local<String> Empty(Isolate* isolate);
 
-  /**
-   * Returns true if the string is external two-byte.
-   *
-   */
-  V8_DEPRECATED(
-      "Use String::IsExternalTwoByte() or String::IsExternalOneByte()")
-  bool IsExternal() const;
-
   /**
    * Returns true if the string is both external and two-byte.
    */
@@ -3276,7 +3362,7 @@ class V8_EXPORT String : public Name {
    */
   const ExternalOneByteStringResource* GetExternalOneByteStringResource() const;
 
-  V8_INLINE static String* Cast(v8::Value* obj);
+  V8_INLINE static String* Cast(v8::Data* data);
 
   /**
    * Allocates a new string from a UTF-8 literal. This is equivalent to calling
@@ -3433,7 +3519,7 @@ class V8_EXPORT String : public Name {
                                               const char* literal,
                                               NewStringType type, int length);
 
-  static void CheckCast(v8::Value* obj);
+  static void CheckCast(v8::Data* that);
 };
 
 // Zero-length string specialization (templated string size includes
@@ -3454,7 +3540,7 @@ class V8_EXPORT Symbol : public Name {
    */
   Local<Value> Description() const;
 
-  V8_DEPRECATE_SOON("Use Symbol::Description()")
+  V8_DEPRECATED("Use Symbol::Description()")
   Local<Value> Name() const { return Description(); }
 
   /**
@@ -3493,11 +3579,11 @@ class V8_EXPORT Symbol : public Name {
   static Local<Symbol> GetToStringTag(Isolate* isolate);
   static Local<Symbol> GetUnscopables(Isolate* isolate);
 
-  V8_INLINE static Symbol* Cast(Value* obj);
+  V8_INLINE static Symbol* Cast(Data* data);
 
  private:
   Symbol();
-  static void CheckCast(Value* obj);
+  static void CheckCast(Data* that);
 };
 
 
@@ -3546,10 +3632,11 @@ class V8_EXPORT Number : public Primitive {
  public:
   double Value() const;
   static Local<Number> New(Isolate* isolate, double value);
-  V8_INLINE static Number* Cast(v8::Value* obj);
+  V8_INLINE static Number* Cast(v8::Data* data);
+
  private:
   Number();
-  static void CheckCast(v8::Value* obj);
+  static void CheckCast(v8::Data* that);
 };
 
 
@@ -3561,10 +3648,11 @@ class V8_EXPORT Integer : public Number {
   static Local<Integer> New(Isolate* isolate, int32_t value);
   static Local<Integer> NewFromUnsigned(Isolate* isolate, uint32_t value);
   int64_t Value() const;
-  V8_INLINE static Integer* Cast(v8::Value* obj);
+  V8_INLINE static Integer* Cast(v8::Data* data);
+
  private:
   Integer();
-  static void CheckCast(v8::Value* obj);
+  static void CheckCast(v8::Data* that);
 };
 
 
@@ -3574,11 +3662,11 @@ class V8_EXPORT Integer : public Number {
 class V8_EXPORT Int32 : public Integer {
  public:
   int32_t Value() const;
-  V8_INLINE static Int32* Cast(v8::Value* obj);
+  V8_INLINE static Int32* Cast(v8::Data* data);
 
  private:
   Int32();
-  static void CheckCast(v8::Value* obj);
+  static void CheckCast(v8::Data* that);
 };
 
 
@@ -3588,11 +3676,11 @@ class V8_EXPORT Int32 : public Integer {
 class V8_EXPORT Uint32 : public Integer {
  public:
   uint32_t Value() const;
-  V8_INLINE static Uint32* Cast(v8::Value* obj);
+  V8_INLINE static Uint32* Cast(v8::Data* data);
 
  private:
   Uint32();
-  static void CheckCast(v8::Value* obj);
+  static void CheckCast(v8::Data* that);
 };
 
 /**
@@ -3643,11 +3731,11 @@ class V8_EXPORT BigInt : public Primitive {
    */
   void ToWordsArray(int* sign_bit, int* word_count, uint64_t* words) const;
 
-  V8_INLINE static BigInt* Cast(v8::Value* obj);
+  V8_INLINE static BigInt* Cast(v8::Data* data);
 
  private:
   BigInt();
-  static void CheckCast(v8::Value* obj);
+  static void CheckCast(v8::Data* that);
 };
 
 /**
@@ -3669,23 +3757,17 @@ enum PropertyAttribute {
  * setting|getting a particular property. See Object and ObjectTemplate's
  * method SetAccessor.
  */
-typedef void (*AccessorGetterCallback)(
-    Local<String> property,
-    const PropertyCallbackInfo<Value>& info);
-typedef void (*AccessorNameGetterCallback)(
-    Local<Name> property,
-    const PropertyCallbackInfo<Value>& info);
-
-
-typedef void (*AccessorSetterCallback)(
-    Local<String> property,
-    Local<Value> value,
-    const PropertyCallbackInfo<void>& info);
-typedef void (*AccessorNameSetterCallback)(
-    Local<Name> property,
-    Local<Value> value,
-    const PropertyCallbackInfo<void>& info);
+using AccessorGetterCallback =
+    void (*)(Local<String> property, const PropertyCallbackInfo<Value>& info);
+using AccessorNameGetterCallback =
+    void (*)(Local<Name> property, const PropertyCallbackInfo<Value>& info);
 
+using AccessorSetterCallback = void (*)(Local<String> property,
+                                        Local<Value> value,
+                                        const PropertyCallbackInfo<void>& info);
+using AccessorNameSetterCallback =
+    void (*)(Local<Name> property, Local<Value> value,
+             const PropertyCallbackInfo<void>& info);
 
 /**
  * Access control specifications.
@@ -4537,8 +4619,7 @@ class PropertyCallbackInfo {
   internal::Address* args_;
 };
 
-
-typedef void (*FunctionCallback)(const FunctionCallbackInfo<Value>& info);
+using FunctionCallback = void (*)(const FunctionCallbackInfo<Value>& info);
 
 enum class ConstructorBehavior { kThrow, kAllow };
 
@@ -4899,6 +4980,22 @@ class V8_EXPORT CompiledWasmModule {
   const std::string source_url_;
 };
 
+// An instance of WebAssembly.Memory.
+class V8_EXPORT WasmMemoryObject : public Object {
+ public:
+  WasmMemoryObject() = delete;
+
+  /**
+   * Returns underlying ArrayBuffer.
+   */
+  Local<ArrayBuffer> Buffer();
+
+  V8_INLINE static WasmMemoryObject* Cast(Value* obj);
+
+ private:
+  static void CheckCast(Value* object);
+};
+
 // An instance of WebAssembly.Module.
 class V8_EXPORT WasmModuleObject : public Object {
  public:
@@ -6239,8 +6336,8 @@ class V8_EXPORT Template : public Data {
  *
  * See also `ObjectTemplate::SetHandler`.
  */
-typedef void (*GenericNamedPropertyGetterCallback)(
-    Local<Name> property, const PropertyCallbackInfo<Value>& info);
+using GenericNamedPropertyGetterCallback =
+    void (*)(Local<Name> property, const PropertyCallbackInfo<Value>& info);
 
 /**
  * Interceptor for set requests on an object.
@@ -6263,9 +6360,9 @@ typedef void (*GenericNamedPropertyGetterCallback)(
  * See also
  * `ObjectTemplate::SetHandler.`
  */
-typedef void (*GenericNamedPropertySetterCallback)(
-    Local<Name> property, Local<Value> value,
-    const PropertyCallbackInfo<Value>& info);
+using GenericNamedPropertySetterCallback =
+    void (*)(Local<Name> property, Local<Value> value,
+             const PropertyCallbackInfo<Value>& info);
 
 /**
  * Intercepts all requests that query the attributes of the
@@ -6288,8 +6385,8 @@ typedef void (*GenericNamedPropertySetterCallback)(
  * See also
  * `ObjectTemplate::SetHandler.`
  */
-typedef void (*GenericNamedPropertyQueryCallback)(
-    Local<Name> property, const PropertyCallbackInfo<Integer>& info);
+using GenericNamedPropertyQueryCallback =
+    void (*)(Local<Name> property, const PropertyCallbackInfo<Integer>& info);
 
 /**
  * Interceptor for delete requests on an object.
@@ -6312,8 +6409,8 @@ typedef void (*GenericNamedPropertyQueryCallback)(
  *
  * See also `ObjectTemplate::SetHandler.`
  */
-typedef void (*GenericNamedPropertyDeleterCallback)(
-    Local<Name> property, const PropertyCallbackInfo<Boolean>& info);
+using GenericNamedPropertyDeleterCallback =
+    void (*)(Local<Name> property, const PropertyCallbackInfo<Boolean>& info);
 
 /**
  * Returns an array containing the names of the properties the named
@@ -6321,8 +6418,8 @@ typedef void (*GenericNamedPropertyDeleterCallback)(
  *
  * Note: The values in the array must be of type v8::Name.
  */
-typedef void (*GenericNamedPropertyEnumeratorCallback)(
-    const PropertyCallbackInfo<Array>& info);
+using GenericNamedPropertyEnumeratorCallback =
+    void (*)(const PropertyCallbackInfo<Array>& info);
 
 /**
  * Interceptor for defineProperty requests on an object.
@@ -6344,9 +6441,9 @@ typedef void (*GenericNamedPropertyEnumeratorCallback)(
  *
  * See also `ObjectTemplate::SetHandler`.
  */
-typedef void (*GenericNamedPropertyDefinerCallback)(
-    Local<Name> property, const PropertyDescriptor& desc,
-    const PropertyCallbackInfo<Value>& info);
+using GenericNamedPropertyDefinerCallback =
+    void (*)(Local<Name> property, const PropertyDescriptor& desc,
+             const PropertyCallbackInfo<Value>& info);
 
 /**
  * Interceptor for getOwnPropertyDescriptor requests on an object.
@@ -6367,37 +6464,33 @@ typedef void (*GenericNamedPropertyDefinerCallback)(
  *
  * See also `ObjectTemplate::SetHandler`.
  */
-typedef void (*GenericNamedPropertyDescriptorCallback)(
-    Local<Name> property, const PropertyCallbackInfo<Value>& info);
+using GenericNamedPropertyDescriptorCallback =
+    void (*)(Local<Name> property, const PropertyCallbackInfo<Value>& info);
 
 /**
  * See `v8::GenericNamedPropertyGetterCallback`.
  */
-typedef void (*IndexedPropertyGetterCallback)(
-    uint32_t index,
-    const PropertyCallbackInfo<Value>& info);
+using IndexedPropertyGetterCallback =
+    void (*)(uint32_t index, const PropertyCallbackInfo<Value>& info);
 
 /**
  * See `v8::GenericNamedPropertySetterCallback`.
  */
-typedef void (*IndexedPropertySetterCallback)(
-    uint32_t index,
-    Local<Value> value,
-    const PropertyCallbackInfo<Value>& info);
+using IndexedPropertySetterCallback =
+    void (*)(uint32_t index, Local<Value> value,
+             const PropertyCallbackInfo<Value>& info);
 
 /**
  * See `v8::GenericNamedPropertyQueryCallback`.
  */
-typedef void (*IndexedPropertyQueryCallback)(
-    uint32_t index,
-    const PropertyCallbackInfo<Integer>& info);
+using IndexedPropertyQueryCallback =
+    void (*)(uint32_t index, const PropertyCallbackInfo<Integer>& info);
 
 /**
  * See `v8::GenericNamedPropertyDeleterCallback`.
  */
-typedef void (*IndexedPropertyDeleterCallback)(
-    uint32_t index,
-    const PropertyCallbackInfo<Boolean>& info);
+using IndexedPropertyDeleterCallback =
+    void (*)(uint32_t index, const PropertyCallbackInfo<Boolean>& info);
 
 /**
  * Returns an array containing the indices of the properties the indexed
@@ -6405,21 +6498,21 @@ typedef void (*IndexedPropertyDeleterCallback)(
  *
  * Note: The values in the array must be uint32_t.
  */
-typedef void (*IndexedPropertyEnumeratorCallback)(
-    const PropertyCallbackInfo<Array>& info);
+using IndexedPropertyEnumeratorCallback =
+    void (*)(const PropertyCallbackInfo<Array>& info);
 
 /**
  * See `v8::GenericNamedPropertyDefinerCallback`.
  */
-typedef void (*IndexedPropertyDefinerCallback)(
-    uint32_t index, const PropertyDescriptor& desc,
-    const PropertyCallbackInfo<Value>& info);
+using IndexedPropertyDefinerCallback =
+    void (*)(uint32_t index, const PropertyDescriptor& desc,
+             const PropertyCallbackInfo<Value>& info);
 
 /**
  * See `v8::GenericNamedPropertyDescriptorCallback`.
  */
-typedef void (*IndexedPropertyDescriptorCallback)(
-    uint32_t index, const PropertyCallbackInfo<Value>& info);
+using IndexedPropertyDescriptorCallback =
+    void (*)(uint32_t index, const PropertyCallbackInfo<Value>& info);
 
 /**
  * Access type specification.
@@ -6437,9 +6530,9 @@ enum AccessType {
  * Returns true if the given context should be allowed to access the given
  * object.
  */
-typedef bool (*AccessCheckCallback)(Local<Context> accessing_context,
-                                    Local<Object> accessed_object,
-                                    Local<Value> data);
+using AccessCheckCallback = bool (*)(Local<Context> accessing_context,
+                                     Local<Object> accessed_object,
+                                     Local<Value> data);
 
 /**
  * A FunctionTemplate is used to create functions at runtime. There
@@ -7230,36 +7323,11 @@ class V8_EXPORT ResourceConstraints {
     initial_young_generation_size_ = initial_size;
   }
 
-  /**
-   * Deprecated functions. Do not use in new code.
-   */
-  V8_DEPRECATED("Use code_range_size_in_bytes.")
-  size_t code_range_size() const { return code_range_size_ / kMB; }
-  V8_DEPRECATED("Use set_code_range_size_in_bytes.")
-  void set_code_range_size(size_t limit_in_mb) {
-    code_range_size_ = limit_in_mb * kMB;
-  }
-  V8_DEPRECATED("Use max_young_generation_size_in_bytes.")
-  size_t max_semi_space_size_in_kb() const;
-  V8_DEPRECATED("Use set_max_young_generation_size_in_bytes.")
-  void set_max_semi_space_size_in_kb(size_t limit_in_kb);
-  V8_DEPRECATED("Use max_old_generation_size_in_bytes.")
-  size_t max_old_space_size() const { return max_old_generation_size_ / kMB; }
-  V8_DEPRECATED("Use set_max_old_generation_size_in_bytes.")
-  void set_max_old_space_size(size_t limit_in_mb) {
-    max_old_generation_size_ = limit_in_mb * kMB;
-  }
-  V8_DEPRECATED("Zone does not pool memory any more.")
-  size_t max_zone_pool_size() const { return max_zone_pool_size_; }
-  V8_DEPRECATED("Zone does not pool memory any more.")
-  void set_max_zone_pool_size(size_t bytes) { max_zone_pool_size_ = bytes; }
-
  private:
   static constexpr size_t kMB = 1048576u;
   size_t code_range_size_ = 0;
   size_t max_old_generation_size_ = 0;
   size_t max_young_generation_size_ = 0;
-  size_t max_zone_pool_size_ = 0;
   size_t initial_old_generation_size_ = 0;
   size_t initial_young_generation_size_ = 0;
   uint32_t* stack_limit_ = nullptr;
@@ -7268,19 +7336,18 @@ class V8_EXPORT ResourceConstraints {
 
 // --- Exceptions ---
 
+using FatalErrorCallback = void (*)(const char* location, const char* message);
 
-typedef void (*FatalErrorCallback)(const char* location, const char* message);
-
-typedef void (*OOMErrorCallback)(const char* location, bool is_heap_oom);
+using OOMErrorCallback = void (*)(const char* location, bool is_heap_oom);
 
-typedef void (*DcheckErrorCallback)(const char* file, int line,
-                                    const char* message);
+using DcheckErrorCallback = void (*)(const char* file, int line,
+                                     const char* message);
 
-typedef void (*MessageCallback)(Local<Message> message, Local<Value> data);
+using MessageCallback = void (*)(Local<Message> message, Local<Value> data);
 
 // --- Tracing ---
 
-typedef void (*LogEventCallback)(const char* name, int event);
+using LogEventCallback = void (*)(const char* name, int event);
 
 /**
  * Create new error objects by calling the corresponding error object
@@ -7314,14 +7381,12 @@ class V8_EXPORT Exception {
 
 // --- Counters Callbacks ---
 
-typedef int* (*CounterLookupCallback)(const char* name);
+using CounterLookupCallback = int* (*)(const char* name);
 
-typedef void* (*CreateHistogramCallback)(const char* name,
-                                         int min,
-                                         int max,
-                                         size_t buckets);
+using CreateHistogramCallback = void* (*)(const char* name, int min, int max,
+                                          size_t buckets);
 
-typedef void (*AddHistogramSampleCallback)(void* histogram, int sample);
+using AddHistogramSampleCallback = void (*)(void* histogram, int sample);
 
 // --- Crashkeys Callback ---
 enum class CrashKeyId {
@@ -7332,11 +7397,11 @@ enum class CrashKeyId {
   kDumpType,
 };
 
-typedef void (*AddCrashKeyCallback)(CrashKeyId id, const std::string& value);
+using AddCrashKeyCallback = void (*)(CrashKeyId id, const std::string& value);
 
 // --- Enter/Leave Script Callback ---
-typedef void (*BeforeCallEnteredCallback)(Isolate*);
-typedef void (*CallCompletedCallback)(Isolate*);
+using BeforeCallEnteredCallback = void (*)(Isolate*);
+using CallCompletedCallback = void (*)(Isolate*);
 
 /**
  * HostImportModuleDynamicallyCallback is called when we require the
@@ -7358,7 +7423,7 @@ typedef void (*CallCompletedCallback)(Isolate*);
  * fails (e.g. due to stack overflow), the embedder must propagate
  * that exception by returning an empty MaybeLocal.
  */
-typedef MaybeLocal<Promise> (*HostImportModuleDynamicallyCallback)(
+using HostImportModuleDynamicallyCallback = MaybeLocal<Promise> (*)(
     Local<Context> context, Local<ScriptOrModule> referrer,
     Local<String> specifier);
 
@@ -7372,9 +7437,9 @@ typedef MaybeLocal<Promise> (*HostImportModuleDynamicallyCallback)(
  * The embedder should use v8::Object::CreateDataProperty to add properties on
  * the meta object.
  */
-typedef void (*HostInitializeImportMetaObjectCallback)(Local<Context> context,
-                                                       Local<Module> module,
-                                                       Local<Object> meta);
+using HostInitializeImportMetaObjectCallback = void (*)(Local<Context> context,
+                                                        Local<Module> module,
+                                                        Local<Object> meta);
 
 /**
  * PrepareStackTraceCallback is called when the stack property of an error is
@@ -7383,9 +7448,9 @@ typedef void (*HostInitializeImportMetaObjectCallback)(Local<Context> context,
  * |sites| is an array of call sites, specified in
  * https://v8.dev/docs/stack-trace-api
  */
-typedef MaybeLocal<Value> (*PrepareStackTraceCallback)(Local<Context> context,
-                                                       Local<Value> error,
-                                                       Local<Array> sites);
+using PrepareStackTraceCallback = MaybeLocal<Value> (*)(Local<Context> context,
+                                                        Local<Value> error,
+                                                        Local<Array> sites);
 
 /**
  * PromiseHook with type kInit is called when a new promise is
@@ -7405,8 +7470,8 @@ typedef MaybeLocal<Value> (*PrepareStackTraceCallback)(Local<Context> context,
  */
 enum class PromiseHookType { kInit, kResolve, kBefore, kAfter };
 
-typedef void (*PromiseHook)(PromiseHookType type, Local<Promise> promise,
-                            Local<Value> parent);
+using PromiseHook = void (*)(PromiseHookType type, Local<Promise> promise,
+                             Local<Value> parent);
 
 // --- Promise Reject Callback ---
 enum PromiseRejectEvent {
@@ -7432,12 +7497,11 @@ class PromiseRejectMessage {
   Local<Value> value_;
 };
 
-typedef void (*PromiseRejectCallback)(PromiseRejectMessage message);
+using PromiseRejectCallback = void (*)(PromiseRejectMessage message);
 
 // --- Microtasks Callbacks ---
-typedef void (*MicrotasksCompletedCallback)(Isolate*);
-typedef void (*MicrotasksCompletedCallbackWithData)(Isolate*, void*);
-typedef void (*MicrotaskCallback)(void* data);
+using MicrotasksCompletedCallbackWithData = void (*)(Isolate*, void*);
+using MicrotaskCallback = void (*)(void* data);
 
 /**
  * Policy for running microtasks:
@@ -7541,7 +7605,7 @@ class V8_EXPORT MicrotaskQueue {
  * kDoNotRunMicrotasks should be used to annotate calls not intended to trigger
  * microtasks.
  */
-class V8_EXPORT MicrotasksScope {
+class V8_EXPORT V8_NODISCARD MicrotasksScope {
  public:
   enum Type { kRunMicrotasks, kDoNotRunMicrotasks };
 
@@ -7574,11 +7638,9 @@ class V8_EXPORT MicrotasksScope {
   bool run_;
 };
 
-
 // --- Failed Access Check Callback ---
-typedef void (*FailedAccessCheckCallback)(Local<Object> target,
-                                          AccessType type,
-                                          Local<Value> data);
+using FailedAccessCheckCallback = void (*)(Local<Object> target,
+                                           AccessType type, Local<Value> data);
 
 // --- AllowCodeGenerationFromStrings callbacks ---
 
@@ -7586,8 +7648,8 @@ typedef void (*FailedAccessCheckCallback)(Local<Object> target,
  * Callback to check if code generation from strings is allowed. See
  * Context::AllowCodeGenerationFromStrings.
  */
-typedef bool (*AllowCodeGenerationFromStringsCallback)(Local<Context> context,
-                                                       Local<String> source);
+using AllowCodeGenerationFromStringsCallback = bool (*)(Local<Context> context,
+                                                        Local<String> source);
 
 struct ModifyCodeGenerationFromStringsResult {
   // If true, proceed with the codegen algorithm. Otherwise, block it.
@@ -7602,36 +7664,36 @@ struct ModifyCodeGenerationFromStringsResult {
  * Callback to check if codegen is allowed from a source object, and convert
  * the source to string if necessary. See: ModifyCodeGenerationFromStrings.
  */
-typedef ModifyCodeGenerationFromStringsResult (
-    *ModifyCodeGenerationFromStringsCallback)(Local<Context> context,
+using ModifyCodeGenerationFromStringsCallback =
+    ModifyCodeGenerationFromStringsResult (*)(Local<Context> context,
                                               Local<Value> source);
-typedef ModifyCodeGenerationFromStringsResult (
-    *ModifyCodeGenerationFromStringsCallback2)(Local<Context> context,
-                                               Local<Value> source,
-                                               bool is_code_like);
+using ModifyCodeGenerationFromStringsCallback2 =
+    ModifyCodeGenerationFromStringsResult (*)(Local<Context> context,
+                                              Local<Value> source,
+                                              bool is_code_like);
 
 // --- WebAssembly compilation callbacks ---
-typedef bool (*ExtensionCallback)(const FunctionCallbackInfo<Value>&);
+using ExtensionCallback = bool (*)(const FunctionCallbackInfo<Value>&);
 
-typedef bool (*AllowWasmCodeGenerationCallback)(Local<Context> context,
-                                                Local<String> source);
+using AllowWasmCodeGenerationCallback = bool (*)(Local<Context> context,
+                                                 Local<String> source);
 
 // --- Callback for APIs defined on v8-supported objects, but implemented
 // by the embedder. Example: WebAssembly.{compile|instantiate}Streaming ---
-typedef void (*ApiImplementationCallback)(const FunctionCallbackInfo<Value>&);
+using ApiImplementationCallback = void (*)(const FunctionCallbackInfo<Value>&);
 
 // --- Callback for WebAssembly.compileStreaming ---
-typedef void (*WasmStreamingCallback)(const FunctionCallbackInfo<Value>&);
+using WasmStreamingCallback = void (*)(const FunctionCallbackInfo<Value>&);
 
 // --- Callback for checking if WebAssembly threads are enabled ---
-typedef bool (*WasmThreadsEnabledCallback)(Local<Context> context);
+using WasmThreadsEnabledCallback = bool (*)(Local<Context> context);
 
 // --- Callback for loading source map file for Wasm profiling support
-typedef Local<String> (*WasmLoadSourceMapCallback)(Isolate* isolate,
-                                                   const char* name);
+using WasmLoadSourceMapCallback = Local<String> (*)(Isolate* isolate,
+                                                    const char* name);
 
 // --- Callback for checking if WebAssembly Simd is enabled ---
-typedef bool (*WasmSimdEnabledCallback)(Local<Context> context);
+using WasmSimdEnabledCallback = bool (*)(Local<Context> context);
 
 // --- Garbage Collection Callbacks ---
 
@@ -7675,9 +7737,9 @@ enum GCCallbackFlags {
   kGCCallbackScheduleIdleGarbageCollection = 1 << 6,
 };
 
-typedef void (*GCCallback)(GCType type, GCCallbackFlags flags);
+using GCCallback = void (*)(GCType type, GCCallbackFlags flags);
 
-typedef void (*InterruptCallback)(Isolate* isolate, void* data);
+using InterruptCallback = void (*)(Isolate* isolate, void* data);
 
 /**
  * This callback is invoked when the heap size is close to the heap limit and
@@ -7686,8 +7748,8 @@ typedef void (*InterruptCallback)(Isolate* isolate, void* data);
  * than the current_heap_limit. The initial heap limit is the limit that was
  * set after heap setup.
  */
-typedef size_t (*NearHeapLimitCallback)(void* data, size_t current_heap_limit,
-                                        size_t initial_heap_limit);
+using NearHeapLimitCallback = size_t (*)(void* data, size_t current_heap_limit,
+                                         size_t initial_heap_limit);
 
 /**
  * Collection of shared per-process V8 memory information.
@@ -7941,14 +8003,14 @@ enum JitCodeEventOptions {
  *
  * \param event code add, move or removal event.
  */
-typedef void (*JitCodeEventHandler)(const JitCodeEvent* event);
+using JitCodeEventHandler = void (*)(const JitCodeEvent* event);
 
 /**
  * Callback function passed to SetUnhandledExceptionCallback.
  */
 #if defined(V8_OS_WIN)
-typedef int (*UnhandledExceptionCallback)(
-    _EXCEPTION_POINTERS* exception_pointers);
+using UnhandledExceptionCallback =
+    int (*)(_EXCEPTION_POINTERS* exception_pointers);
 #endif
 
 /**
@@ -8175,8 +8237,8 @@ class V8_EXPORT EmbedderHeapTracer {
  * serialized verbatim.
  */
 struct SerializeInternalFieldsCallback {
-  typedef StartupData (*CallbackFunction)(Local<Object> holder, int index,
-                                          void* data);
+  using CallbackFunction = StartupData (*)(Local<Object> holder, int index,
+                                           void* data);
   SerializeInternalFieldsCallback(CallbackFunction function = nullptr,
                                   void* data_arg = nullptr)
       : callback(function), data(data_arg) {}
@@ -8185,15 +8247,15 @@ struct SerializeInternalFieldsCallback {
 };
 // Note that these fields are called "internal fields" in the API and called
 // "embedder fields" within V8.
-typedef SerializeInternalFieldsCallback SerializeEmbedderFieldsCallback;
+using SerializeEmbedderFieldsCallback = SerializeInternalFieldsCallback;
 
 /**
  * Callback and supporting data used to implement embedder logic to deserialize
  * internal fields.
  */
 struct DeserializeInternalFieldsCallback {
-  typedef void (*CallbackFunction)(Local<Object> holder, int index,
-                                   StartupData payload, void* data);
+  using CallbackFunction = void (*)(Local<Object> holder, int index,
+                                    StartupData payload, void* data);
   DeserializeInternalFieldsCallback(CallbackFunction function = nullptr,
                                     void* data_arg = nullptr)
       : callback(function), data(data_arg) {}
@@ -8201,7 +8263,7 @@ struct DeserializeInternalFieldsCallback {
                    void* data);
   void* data;
 };
-typedef DeserializeInternalFieldsCallback DeserializeEmbedderFieldsCallback;
+using DeserializeEmbedderFieldsCallback = DeserializeInternalFieldsCallback;
 
 /**
  * Controls how the default MeasureMemoryDelegate reports the result of
@@ -8277,26 +8339,15 @@ class V8_EXPORT Isolate {
   /**
    * Initial configuration parameters for a new Isolate.
    */
-  struct CreateParams {
-    CreateParams()
-        : code_event_handler(nullptr),
-          snapshot_blob(nullptr),
-          counter_lookup_callback(nullptr),
-          create_histogram_callback(nullptr),
-          add_histogram_sample_callback(nullptr),
-          array_buffer_allocator(nullptr),
-          array_buffer_allocator_shared(),
-          external_references(nullptr),
-          allow_atomics_wait(true),
-          only_terminate_in_safe_scope(false),
-          embedder_wrapper_type_index(-1),
-          embedder_wrapper_object_index(-1) {}
+  struct V8_EXPORT CreateParams {
+    CreateParams();
+    ~CreateParams();
 
     /**
      * Allows the host application to provide the address of a function that is
      * notified each time code is added, moved or removed.
      */
-    JitCodeEventHandler code_event_handler;
+    JitCodeEventHandler code_event_handler = nullptr;
 
     /**
      * ResourceConstraints to use for the new Isolate.
@@ -8306,14 +8357,13 @@ class V8_EXPORT Isolate {
     /**
      * Explicitly specify a startup snapshot blob. The embedder owns the blob.
      */
-    StartupData* snapshot_blob;
-
+    StartupData* snapshot_blob = nullptr;
 
     /**
      * Enables the host application to provide a mechanism for recording
      * statistics counters.
      */
-    CounterLookupCallback counter_lookup_callback;
+    CounterLookupCallback counter_lookup_callback = nullptr;
 
     /**
      * Enables the host application to provide a mechanism for recording
@@ -8321,8 +8371,8 @@ class V8_EXPORT Isolate {
      * histogram which will later be passed to the AddHistogramSample
      * function.
      */
-    CreateHistogramCallback create_histogram_callback;
-    AddHistogramSampleCallback add_histogram_sample_callback;
+    CreateHistogramCallback create_histogram_callback = nullptr;
+    AddHistogramSampleCallback add_histogram_sample_callback = nullptr;
 
     /**
      * The ArrayBuffer::Allocator to use for allocating and freeing the backing
@@ -8333,7 +8383,7 @@ class V8_EXPORT Isolate {
      * to the allocator, in order to facilitate lifetime
      * management for the allocator instance.
      */
-    ArrayBuffer::Allocator* array_buffer_allocator;
+    ArrayBuffer::Allocator* array_buffer_allocator = nullptr;
     std::shared_ptr<ArrayBuffer::Allocator> array_buffer_allocator_shared;
 
     /**
@@ -8342,34 +8392,57 @@ class V8_EXPORT Isolate {
      * deserialization. This array and its content must stay valid for the
      * entire lifetime of the isolate.
      */
-    const intptr_t* external_references;
+    const intptr_t* external_references = nullptr;
 
     /**
      * Whether calling Atomics.wait (a function that may block) is allowed in
      * this isolate. This can also be configured via SetAllowAtomicsWait.
      */
-    bool allow_atomics_wait;
+    bool allow_atomics_wait = true;
 
     /**
      * Termination is postponed when there is no active SafeForTerminationScope.
      */
-    bool only_terminate_in_safe_scope;
+    bool only_terminate_in_safe_scope = false;
 
     /**
      * The following parameters describe the offsets for addressing type info
      * for wrapped API objects and are used by the fast C API
      * (for details see v8-fast-api-calls.h).
      */
-    int embedder_wrapper_type_index;
-    int embedder_wrapper_object_index;
-  };
+    int embedder_wrapper_type_index = -1;
+    int embedder_wrapper_object_index = -1;
+
+    /**
+     * If parameters are set, V8 creates a managed C++ heap as extension to its
+     * JavaScript heap.
+     *
+     * See v8::Isolate::GetCppHeap() for working with the heap.
+     *
+     * This is an experimental feature and may still change significantly.
+     */
+    std::shared_ptr<CppHeapCreateParams> cpp_heap_params;
 
+    /**
+     * This list is provided by the embedder to indicate which import assertions
+     * they want to handle. Only import assertions whose keys are present in
+     * supported_import_assertions will be included in the import assertions
+     * lists of ModuleRequests that will be passed to the embedder. If
+     * supported_import_assertions is left empty, then the embedder will not
+     * receive any import assertions.
+     *
+     * This corresponds to the list returned by the HostGetSupportedAssertions
+     * host-defined abstract operation:
+     * https://tc39.es/proposal-import-assertions/#sec-hostgetsupportedimportassertions
+     */
+    std::vector<std::string> supported_import_assertions;
+  };
 
   /**
    * Stack-allocated class which sets the isolate for all operations
    * executed within a local scope.
    */
-  class V8_EXPORT Scope {
+  class V8_EXPORT V8_NODISCARD Scope {
    public:
     explicit Scope(Isolate* isolate) : isolate_(isolate) {
       isolate->Enter();
@@ -8385,11 +8458,10 @@ class V8_EXPORT Isolate {
     Isolate* const isolate_;
   };
 
-
   /**
    * Assert that no Javascript code is invoked.
    */
-  class V8_EXPORT DisallowJavascriptExecutionScope {
+  class V8_EXPORT V8_NODISCARD DisallowJavascriptExecutionScope {
    public:
     enum OnFailure { CRASH_ON_FAILURE, THROW_ON_FAILURE, DUMP_ON_FAILURE };
 
@@ -8407,11 +8479,10 @@ class V8_EXPORT Isolate {
     void* internal_;
   };
 
-
   /**
    * Introduce exception to DisallowJavascriptExecutionScope.
    */
-  class V8_EXPORT AllowJavascriptExecutionScope {
+  class V8_EXPORT V8_NODISCARD AllowJavascriptExecutionScope {
    public:
     explicit AllowJavascriptExecutionScope(Isolate* isolate);
     ~AllowJavascriptExecutionScope();
@@ -8432,7 +8503,7 @@ class V8_EXPORT Isolate {
    * Do not run microtasks while this scope is active, even if microtasks are
    * automatically executed otherwise.
    */
-  class V8_EXPORT SuppressMicrotaskExecutionScope {
+  class V8_EXPORT V8_NODISCARD SuppressMicrotaskExecutionScope {
    public:
     explicit SuppressMicrotaskExecutionScope(
         Isolate* isolate, MicrotaskQueue* microtask_queue = nullptr);
@@ -8456,7 +8527,7 @@ class V8_EXPORT Isolate {
    * This scope allows terminations inside direct V8 API calls and forbid them
    * inside any recursive API calls without explicit SafeForTerminationScope.
    */
-  class V8_EXPORT SafeForTerminationScope {
+  class V8_EXPORT V8_NODISCARD SafeForTerminationScope {
    public:
     explicit SafeForTerminationScope(v8::Isolate* isolate);
     ~SafeForTerminationScope();
@@ -8613,8 +8684,8 @@ class V8_EXPORT Isolate {
                   kMessageWarning,
   };
 
-  typedef void (*UseCounterCallback)(Isolate* isolate,
-                                     UseCounterFeature feature);
+  using UseCounterCallback = void (*)(Isolate* isolate,
+                                      UseCounterFeature feature);
 
   /**
    * Allocates a new isolate but does not initialize it. Does not change the
@@ -8680,7 +8751,7 @@ class V8_EXPORT Isolate {
    * - the custom callback set returns true.
    * Otherwise, the custom callback will not be called and V8 will not abort.
    */
-  typedef bool (*AbortOnUncaughtExceptionCallback)(Isolate*);
+  using AbortOnUncaughtExceptionCallback = bool (*)(Isolate*);
   void SetAbortOnUncaughtExceptionCallback(
       AbortOnUncaughtExceptionCallback callback);
 
@@ -8844,7 +8915,7 @@ class V8_EXPORT Isolate {
       std::unique_ptr<MeasureMemoryDelegate> delegate,
       MeasureMemoryExecution execution = MeasureMemoryExecution::kDefault);
 
-  V8_DEPRECATE_SOON("Use the version with a delegate")
+  V8_DEPRECATED("Use the version with a delegate")
   MaybeLocal<Promise> MeasureMemory(Local<Context> context,
                                     MeasureMemoryMode mode);
 
@@ -8907,10 +8978,6 @@ class V8_EXPORT Isolate {
    */
   Local<Context> GetCurrentContext();
 
-  /** Returns the last context entered through V8's C++ API. */
-  V8_DEPRECATED("Use GetEnteredOrMicrotaskContext().")
-  Local<Context> GetEnteredContext();
-
   /**
    * Returns either the last context entered through V8's C++ API, or the
    * context of the currently running microtask while processing microtasks.
@@ -8933,10 +9000,10 @@ class V8_EXPORT Isolate {
    */
   Local<Value> ThrowException(Local<Value> exception);
 
-  typedef void (*GCCallback)(Isolate* isolate, GCType type,
-                             GCCallbackFlags flags);
-  typedef void (*GCCallbackWithData)(Isolate* isolate, GCType type,
-                                     GCCallbackFlags flags, void* data);
+  using GCCallback = void (*)(Isolate* isolate, GCType type,
+                              GCCallbackFlags flags);
+  using GCCallbackWithData = void (*)(Isolate* isolate, GCType type,
+                                      GCCallbackFlags flags, void* data);
 
   /**
    * Enables the host application to receive a notification before a
@@ -8969,6 +9036,12 @@ class V8_EXPORT Isolate {
    */
   EmbedderHeapTracer* GetEmbedderHeapTracer();
 
+  /**
+   * \returns the C++ heap managed by V8. Only available if the Isolate was
+   *   created with proper CreatePrams::cpp_heap_params option.
+   */
+  CppHeap* GetCppHeap() const;
+
   /**
    * Use for |AtomicsWaitCallback| to indicate the type of event it receives.
    */
@@ -9033,12 +9106,12 @@ class V8_EXPORT Isolate {
    * This callback may schedule exceptions, *unless* |event| is equal to
    * |kTerminatedExecution|.
    */
-  typedef void (*AtomicsWaitCallback)(AtomicsWaitEvent event,
-                                      Local<SharedArrayBuffer> array_buffer,
-                                      size_t offset_in_bytes, int64_t value,
-                                      double timeout_in_ms,
-                                      AtomicsWaitWakeHandle* stop_handle,
-                                      void* data);
+  using AtomicsWaitCallback = void (*)(AtomicsWaitEvent event,
+                                       Local<SharedArrayBuffer> array_buffer,
+                                       size_t offset_in_bytes, int64_t value,
+                                       double timeout_in_ms,
+                                       AtomicsWaitWakeHandle* stop_handle,
+                                       void* data);
 
   /**
    * Set a new |AtomicsWaitCallback|. This overrides an earlier
@@ -9070,7 +9143,7 @@ class V8_EXPORT Isolate {
                                 void* data = nullptr);
   void RemoveGCEpilogueCallback(GCCallback callback);
 
-  typedef size_t (*GetExternallyAllocatedMemoryInBytesCallback)();
+  using GetExternallyAllocatedMemoryInBytesCallback = size_t (*)();
 
   /**
    * Set the callback that tells V8 how much memory is currently allocated
@@ -9189,12 +9262,6 @@ class V8_EXPORT Isolate {
    */
   void SetPromiseRejectCallback(PromiseRejectCallback callback);
 
-  /**
-   * An alias for PerformMicrotaskCheckpoint.
-   */
-  V8_DEPRECATED("Use PerformMicrotaskCheckpoint.")
-  void RunMicrotasks() { PerformMicrotaskCheckpoint(); }
-
   /**
    * Runs the default MicrotaskQueue until it gets empty and perform other
    * microtask checkpoint steps, such as calling ClearKeptObjects. Asserts that
@@ -9236,16 +9303,12 @@ class V8_EXPORT Isolate {
    * Executing scripts inside the callback will not re-trigger microtasks and
    * the callback.
    */
-  V8_DEPRECATED("Use *WithData version.")
-  void AddMicrotasksCompletedCallback(MicrotasksCompletedCallback callback);
   void AddMicrotasksCompletedCallback(
       MicrotasksCompletedCallbackWithData callback, void* data = nullptr);
 
   /**
    * Removes callback that was installed by AddMicrotasksCompletedCallback.
    */
-  V8_DEPRECATED("Use *WithData version.")
-  void RemoveMicrotasksCompletedCallback(MicrotasksCompletedCallback callback);
   void RemoveMicrotasksCompletedCallback(
       MicrotasksCompletedCallbackWithData callback, void* data = nullptr);
 
@@ -9488,11 +9551,6 @@ class V8_EXPORT Isolate {
    * strings should be allowed.
    */
   V8_DEPRECATED(
-      "Use Isolate::SetModifyCodeGenerationFromStringsCallback instead. "
-      "See http://crbug.com/v8/10096.")
-  void SetAllowCodeGenerationFromStringsCallback(
-      AllowCodeGenerationFromStringsCallback callback);
-  V8_DEPRECATE_SOON(
       "Use Isolate::SetModifyCodeGenerationFromStringsCallback with "
       "ModifyCodeGenerationFromStringsCallback2 instead. See "
       "http://crbug.com/1096017 and TC39 Dynamic Code Brand Checks proposal "
@@ -9686,7 +9744,7 @@ class V8_EXPORT StartupData {
  * EntropySource is used as a callback function when v8 needs a source
  * of entropy.
  */
-typedef bool (*EntropySource)(unsigned char* buffer, size_t length);
+using EntropySource = bool (*)(unsigned char* buffer, size_t length);
 
 /**
  * ReturnAddressLocationResolver is used as a callback function when v8 is
@@ -9701,9 +9759,8 @@ typedef bool (*EntropySource)(unsigned char* buffer, size_t length);
  *
  * \note The resolver function must not cause garbage collection.
  */
-typedef uintptr_t (*ReturnAddressLocationResolver)(
-    uintptr_t return_addr_location);
-
+using ReturnAddressLocationResolver =
+    uintptr_t (*)(uintptr_t return_addr_location);
 
 /**
  * Container class for static utility functions.
@@ -9857,7 +9914,7 @@ class V8_EXPORT V8 {
    * \param context The third argument passed to the Linux signal handler, which
    * points to a ucontext_t structure.
    */
-  V8_DEPRECATE_SOON("Use TryHandleWebAssemblyTrapPosix")
+  V8_DEPRECATED("Use TryHandleWebAssemblyTrapPosix")
   static bool TryHandleSignal(int signal_number, void* info, void* context);
 #endif  // V8_OS_POSIX
 
@@ -10588,8 +10645,8 @@ class V8_EXPORT Context {
    * context, call the specified callback, and throw an exception.
    * To unset abort, pass nullptr as callback.
    */
-  typedef void (*AbortScriptExecutionCallback)(Isolate* isolate,
-                                               Local<Context> context);
+  using AbortScriptExecutionCallback = void (*)(Isolate* isolate,
+                                                Local<Context> context);
   void SetAbortScriptExecution(AbortScriptExecutionCallback callback);
 
   /**
@@ -10608,7 +10665,7 @@ class V8_EXPORT Context {
    * Stack-allocated class which sets the execution context for all
    * operations executed within a local scope.
    */
-  class Scope {
+  class V8_NODISCARD Scope {
    public:
     explicit V8_INLINE Scope(Local<Context> context) : context_(context) {
       context_->Enter();
@@ -10624,7 +10681,7 @@ class V8_EXPORT Context {
    * stack.
    * https://html.spec.whatwg.org/multipage/webappapis.html#backup-incumbent-settings-object-stack
    */
-  class V8_EXPORT BackupIncumbentScope final {
+  class V8_EXPORT V8_NODISCARD BackupIncumbentScope final {
    public:
     /**
      * |backup_incumbent_context| is pushed onto the backup incumbent settings
@@ -10925,7 +10982,7 @@ void Persistent<T, M>::Copy(const Persistent<S, M2>& that) {
 
 template <class T>
 bool PersistentBase<T>::IsWeak() const {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (this->IsEmpty()) return false;
   return I::GetNodeState(reinterpret_cast<internal::Address*>(this->val_)) ==
          I::kNodeStateIsWeakValue;
@@ -10966,7 +11023,7 @@ template <typename P>
 V8_INLINE void PersistentBase<T>::SetWeak(
     P* parameter, typename WeakCallbackInfo<P>::Callback callback,
     WeakCallbackType type) {
-  typedef typename WeakCallbackInfo<void>::Callback Callback;
+  using Callback = WeakCallbackInfo<void>::Callback;
 #if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
@@ -10998,7 +11055,7 @@ void PersistentBase<T>::AnnotateStrongRetainer(const char* label) {
 
 template <class T>
 void PersistentBase<T>::SetWrapperClassId(uint16_t class_id) {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (this->IsEmpty()) return;
   internal::Address* obj = reinterpret_cast<internal::Address*>(this->val_);
   uint8_t* addr = reinterpret_cast<uint8_t*>(obj) + I::kNodeClassIdOffset;
@@ -11008,7 +11065,7 @@ void PersistentBase<T>::SetWrapperClassId(uint16_t class_id) {
 
 template <class T>
 uint16_t PersistentBase<T>::WrapperClassId() const {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (this->IsEmpty()) return 0;
   internal::Address* obj = reinterpret_cast<internal::Address*>(this->val_);
   uint8_t* addr = reinterpret_cast<uint8_t*>(obj) + I::kNodeClassIdOffset;
@@ -11206,7 +11263,7 @@ TracedReference<T>& TracedReference<T>::operator=(const TracedReference& rhs) {
 }
 
 void TracedReferenceBase::SetWrapperClassId(uint16_t class_id) {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (IsEmpty()) return;
   internal::Address* obj = reinterpret_cast<internal::Address*>(val_);
   uint8_t* addr = reinterpret_cast<uint8_t*>(obj) + I::kNodeClassIdOffset;
@@ -11214,7 +11271,7 @@ void TracedReferenceBase::SetWrapperClassId(uint16_t class_id) {
 }
 
 uint16_t TracedReferenceBase::WrapperClassId() const {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (IsEmpty()) return 0;
   internal::Address* obj = reinterpret_cast<internal::Address*>(val_);
   uint8_t* addr = reinterpret_cast<uint8_t*>(obj) + I::kNodeClassIdOffset;
@@ -11274,7 +11331,7 @@ void ReturnValue<T>::Set(double i) {
 template<typename T>
 void ReturnValue<T>::Set(int32_t i) {
   static_assert(std::is_base_of<T, Integer>::value, "type check");
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (V8_LIKELY(I::IsValidSmi(i))) {
     *value_ = I::IntToSmi(i);
     return;
@@ -11297,7 +11354,7 @@ void ReturnValue<T>::Set(uint32_t i) {
 template<typename T>
 void ReturnValue<T>::Set(bool value) {
   static_assert(std::is_base_of<T, Boolean>::value, "type check");
-  typedef internal::Internals I;
+  using I = internal::Internals;
   int root_index;
   if (value) {
     root_index = I::kTrueValueRootIndex;
@@ -11310,21 +11367,21 @@ void ReturnValue<T>::Set(bool value) {
 template<typename T>
 void ReturnValue<T>::SetNull() {
   static_assert(std::is_base_of<T, Primitive>::value, "type check");
-  typedef internal::Internals I;
+  using I = internal::Internals;
   *value_ = *I::GetRoot(GetIsolate(), I::kNullValueRootIndex);
 }
 
 template<typename T>
 void ReturnValue<T>::SetUndefined() {
   static_assert(std::is_base_of<T, Primitive>::value, "type check");
-  typedef internal::Internals I;
+  using I = internal::Internals;
   *value_ = *I::GetRoot(GetIsolate(), I::kUndefinedValueRootIndex);
 }
 
 template<typename T>
 void ReturnValue<T>::SetEmptyString() {
   static_assert(std::is_base_of<T, String>::value, "type check");
-  typedef internal::Internals I;
+  using I = internal::Internals;
   *value_ = *I::GetRoot(GetIsolate(), I::kEmptyStringRootIndex);
 }
 
@@ -11336,7 +11393,7 @@ Isolate* ReturnValue<T>::GetIsolate() const {
 
 template <typename T>
 Local<Value> ReturnValue<T>::Get() const {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (*value_ == *I::GetRoot(GetIsolate(), I::kTheHoleValueRootIndex))
     return Local<Value>(*Undefined(GetIsolate()));
   return Local<Value>::New(GetIsolate(), reinterpret_cast<Value*>(value_));
@@ -11416,23 +11473,33 @@ int FunctionCallbackInfo<T>::Length() const {
   return length_;
 }
 
-ScriptOrigin::ScriptOrigin(Local<Value> resource_name,
-                           Local<Integer> resource_line_offset,
-                           Local<Integer> resource_column_offset,
-                           Local<Boolean> resource_is_shared_cross_origin,
-                           Local<Integer> script_id,
-                           Local<Value> source_map_url,
-                           Local<Boolean> resource_is_opaque,
-                           Local<Boolean> is_wasm, Local<Boolean> is_module,
+ScriptOrigin::ScriptOrigin(
+    Local<Value> resource_name, Local<Integer> line_offset,
+    Local<Integer> column_offset, Local<Boolean> is_shared_cross_origin,
+    Local<Integer> script_id, Local<Value> source_map_url,
+    Local<Boolean> is_opaque, Local<Boolean> is_wasm, Local<Boolean> is_module,
+    Local<PrimitiveArray> host_defined_options)
+    : ScriptOrigin(
+          resource_name,
+          line_offset.IsEmpty() ? 0 : static_cast<int>(line_offset->Value()),
+          column_offset.IsEmpty() ? 0
+                                  : static_cast<int>(column_offset->Value()),
+          !is_shared_cross_origin.IsEmpty() && is_shared_cross_origin->IsTrue(),
+          static_cast<int>(script_id.IsEmpty() ? -1 : script_id->Value()),
+          source_map_url, !is_opaque.IsEmpty() && is_opaque->IsTrue(),
+          !is_wasm.IsEmpty() && is_wasm->IsTrue(),
+          !is_module.IsEmpty() && is_module->IsTrue(), host_defined_options) {}
+
+ScriptOrigin::ScriptOrigin(Local<Value> resource_name, int line_offset,
+                           int column_offset, bool is_shared_cross_origin,
+                           int script_id, Local<Value> source_map_url,
+                           bool is_opaque, bool is_wasm, bool is_module,
                            Local<PrimitiveArray> host_defined_options)
-    : resource_name_(resource_name),
-      resource_line_offset_(resource_line_offset),
-      resource_column_offset_(resource_column_offset),
-      options_(!resource_is_shared_cross_origin.IsEmpty() &&
-                   resource_is_shared_cross_origin->IsTrue(),
-               !resource_is_opaque.IsEmpty() && resource_is_opaque->IsTrue(),
-               !is_wasm.IsEmpty() && is_wasm->IsTrue(),
-               !is_module.IsEmpty() && is_module->IsTrue()),
+    : isolate_(Isolate::GetCurrent()),
+      resource_name_(resource_name),
+      resource_line_offset_(line_offset),
+      resource_column_offset_(column_offset),
+      options_(is_shared_cross_origin, is_opaque, is_wasm, is_module),
       script_id_(script_id),
       source_map_url_(source_map_url),
       host_defined_options_(host_defined_options) {}
@@ -11444,17 +11511,22 @@ Local<PrimitiveArray> ScriptOrigin::HostDefinedOptions() const {
 }
 
 Local<Integer> ScriptOrigin::ResourceLineOffset() const {
-  return resource_line_offset_;
+  return v8::Integer::New(isolate_, resource_line_offset_);
 }
 
-
 Local<Integer> ScriptOrigin::ResourceColumnOffset() const {
-  return resource_column_offset_;
+  return v8::Integer::New(isolate_, resource_column_offset_);
+}
+
+Local<Integer> ScriptOrigin::ScriptID() const {
+  return v8::Integer::New(isolate_, script_id_);
 }
 
+int ScriptOrigin::LineOffset() const { return resource_line_offset_; }
 
-Local<Integer> ScriptOrigin::ScriptID() const { return script_id_; }
+int ScriptOrigin::ColumnOffset() const { return resource_column_offset_; }
 
+int ScriptOrigin::ScriptId() const { return script_id_; }
 
 Local<Value> ScriptOrigin::SourceMapUrl() const { return source_map_url_; }
 
@@ -11462,8 +11534,8 @@ ScriptCompiler::Source::Source(Local<String> string, const ScriptOrigin& origin,
                                CachedData* data)
     : source_string(string),
       resource_name(origin.ResourceName()),
-      resource_line_offset(origin.ResourceLineOffset()),
-      resource_column_offset(origin.ResourceColumnOffset()),
+      resource_line_offset(origin.LineOffset()),
+      resource_column_offset(origin.ColumnOffset()),
       resource_options(origin.Options()),
       source_map_url(origin.SourceMapUrl()),
       host_defined_options(origin.HostDefinedOptions()),
@@ -11528,8 +11600,8 @@ AccessorSignature* AccessorSignature::Cast(Data* data) {
 
 Local<Value> Object::GetInternalField(int index) {
 #ifndef V8_ENABLE_CHECKS
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<A*>(this);
   // Fast path: If the object is a plain JSObject, which is the common case, we
   // know where to find the internal fields and can return the value directly.
@@ -11556,8 +11628,8 @@ Local<Value> Object::GetInternalField(int index) {
 
 void* Object::GetAlignedPointerFromInternalField(int index) {
 #ifndef V8_ENABLE_CHECKS
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<A*>(this);
   // Fast path: If the object is a plain JSObject, which is the common case, we
   // know where to find the internal fields and can return the value directly.
@@ -11578,17 +11650,16 @@ void* Object::GetAlignedPointerFromInternalField(int index) {
   return SlowGetAlignedPointerFromInternalField(index);
 }
 
-String* String::Cast(v8::Value* value) {
+String* String::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<String*>(value);
+  return static_cast<String*>(data);
 }
 
-
 Local<String> String::Empty(Isolate* isolate) {
-  typedef internal::Address S;
-  typedef internal::Internals I;
+  using S = internal::Address;
+  using I = internal::Internals;
   I::CheckInitialized(isolate);
   S* slot = I::GetRoot(isolate, I::kEmptyStringRootIndex);
   return Local<String>(reinterpret_cast<String*>(slot));
@@ -11596,8 +11667,8 @@ Local<String> String::Empty(Isolate* isolate) {
 
 
 String::ExternalStringResource* String::GetExternalStringResource() const {
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<const A*>(this);
 
   ExternalStringResource* result;
@@ -11619,8 +11690,8 @@ String::ExternalStringResource* String::GetExternalStringResource() const {
 
 String::ExternalStringResourceBase* String::GetExternalStringResourceBase(
     String::Encoding* encoding_out) const {
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<const A*>(this);
   int type = I::GetInstanceType(obj) & I::kFullStringRepresentationMask;
   *encoding_out = static_cast<Encoding>(type & I::kStringEncodingMask);
@@ -11651,8 +11722,8 @@ bool Value::IsUndefined() const {
 }
 
 bool Value::QuickIsUndefined() const {
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<const A*>(this);
   if (!I::HasHeapObjectTag(obj)) return false;
   if (I::GetInstanceType(obj) != I::kOddballType) return false;
@@ -11669,8 +11740,8 @@ bool Value::IsNull() const {
 }
 
 bool Value::QuickIsNull() const {
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<const A*>(this);
   if (!I::HasHeapObjectTag(obj)) return false;
   if (I::GetInstanceType(obj) != I::kOddballType) return false;
@@ -11686,8 +11757,8 @@ bool Value::IsNullOrUndefined() const {
 }
 
 bool Value::QuickIsNullOrUndefined() const {
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<const A*>(this);
   if (!I::HasHeapObjectTag(obj)) return false;
   if (I::GetInstanceType(obj) != I::kOddballType) return false;
@@ -11704,8 +11775,8 @@ bool Value::IsString() const {
 }
 
 bool Value::QuickIsString() const {
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A obj = *reinterpret_cast<const A*>(this);
   if (!I::HasHeapObjectTag(obj)) return false;
   return (I::GetInstanceType(obj) < I::kFirstNonstringType);
@@ -11724,30 +11795,27 @@ V8_INLINE Value* Value::Cast(Data* value) {
   return static_cast<Value*>(value);
 }
 
-Boolean* Boolean::Cast(v8::Value* value) {
+Boolean* Boolean::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<Boolean*>(value);
+  return static_cast<Boolean*>(data);
 }
 
-
-Name* Name::Cast(v8::Value* value) {
+Name* Name::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<Name*>(value);
+  return static_cast<Name*>(data);
 }
 
-
-Symbol* Symbol::Cast(v8::Value* value) {
+Symbol* Symbol::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<Symbol*>(value);
+  return static_cast<Symbol*>(data);
 }
 
-
 Private* Private::Cast(Data* data) {
 #ifdef V8_ENABLE_CHECKS
   CheckCast(data);
@@ -11755,6 +11823,13 @@ Private* Private::Cast(Data* data) {
   return reinterpret_cast<Private*>(data);
 }
 
+ModuleRequest* ModuleRequest::Cast(Data* data) {
+#ifdef V8_ENABLE_CHECKS
+  CheckCast(data);
+#endif
+  return reinterpret_cast<ModuleRequest*>(data);
+}
+
 Module* Module::Cast(Data* data) {
 #ifdef V8_ENABLE_CHECKS
   CheckCast(data);
@@ -11762,42 +11837,39 @@ Module* Module::Cast(Data* data) {
   return reinterpret_cast<Module*>(data);
 }
 
-Number* Number::Cast(v8::Value* value) {
+Number* Number::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<Number*>(value);
+  return static_cast<Number*>(data);
 }
 
-
-Integer* Integer::Cast(v8::Value* value) {
+Integer* Integer::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<Integer*>(value);
+  return static_cast<Integer*>(data);
 }
 
-
-Int32* Int32::Cast(v8::Value* value) {
+Int32* Int32::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<Int32*>(value);
+  return static_cast<Int32*>(data);
 }
 
-
-Uint32* Uint32::Cast(v8::Value* value) {
+Uint32* Uint32::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<Uint32*>(value);
+  return static_cast<Uint32*>(data);
 }
 
-BigInt* BigInt::Cast(v8::Value* value) {
+BigInt* BigInt::Cast(v8::Data* data) {
 #ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
+  CheckCast(data);
 #endif
-  return static_cast<BigInt*>(value);
+  return static_cast<BigInt*>(data);
 }
 
 Date* Date::Cast(v8::Value* value) {
@@ -11901,6 +11973,13 @@ Proxy* Proxy::Cast(v8::Value* value) {
   return static_cast<Proxy*>(value);
 }
 
+WasmMemoryObject* WasmMemoryObject::Cast(v8::Value* value) {
+#ifdef V8_ENABLE_CHECKS
+  CheckCast(value);
+#endif
+  return static_cast<WasmMemoryObject*>(value);
+}
+
 WasmModuleObject* WasmModuleObject::Cast(v8::Value* value) {
 #ifdef V8_ENABLE_CHECKS
   CheckCast(value);
@@ -12088,7 +12167,7 @@ ReturnValue<T> PropertyCallbackInfo<T>::GetReturnValue() const {
 
 template <typename T>
 bool PropertyCallbackInfo<T>::ShouldThrowOnError() const {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   if (args_[kShouldThrowOnErrorIndex] !=
       I::IntToSmi(I::kInferShouldThrowMode)) {
     return args_[kShouldThrowOnErrorIndex] != I::IntToSmi(I::kDontThrow);
@@ -12098,8 +12177,8 @@ bool PropertyCallbackInfo<T>::ShouldThrowOnError() const {
 }
 
 Local<Primitive> Undefined(Isolate* isolate) {
-  typedef internal::Address S;
-  typedef internal::Internals I;
+  using S = internal::Address;
+  using I = internal::Internals;
   I::CheckInitialized(isolate);
   S* slot = I::GetRoot(isolate, I::kUndefinedValueRootIndex);
   return Local<Primitive>(reinterpret_cast<Primitive*>(slot));
@@ -12107,8 +12186,8 @@ Local<Primitive> Undefined(Isolate* isolate) {
 
 
 Local<Primitive> Null(Isolate* isolate) {
-  typedef internal::Address S;
-  typedef internal::Internals I;
+  using S = internal::Address;
+  using I = internal::Internals;
   I::CheckInitialized(isolate);
   S* slot = I::GetRoot(isolate, I::kNullValueRootIndex);
   return Local<Primitive>(reinterpret_cast<Primitive*>(slot));
@@ -12116,8 +12195,8 @@ Local<Primitive> Null(Isolate* isolate) {
 
 
 Local<Boolean> True(Isolate* isolate) {
-  typedef internal::Address S;
-  typedef internal::Internals I;
+  using S = internal::Address;
+  using I = internal::Internals;
   I::CheckInitialized(isolate);
   S* slot = I::GetRoot(isolate, I::kTrueValueRootIndex);
   return Local<Boolean>(reinterpret_cast<Boolean*>(slot));
@@ -12125,8 +12204,8 @@ Local<Boolean> True(Isolate* isolate) {
 
 
 Local<Boolean> False(Isolate* isolate) {
-  typedef internal::Address S;
-  typedef internal::Internals I;
+  using S = internal::Address;
+  using I = internal::Internals;
   I::CheckInitialized(isolate);
   S* slot = I::GetRoot(isolate, I::kFalseValueRootIndex);
   return Local<Boolean>(reinterpret_cast<Boolean*>(slot));
@@ -12134,19 +12213,19 @@ Local<Boolean> False(Isolate* isolate) {
 
 
 void Isolate::SetData(uint32_t slot, void* data) {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   I::SetEmbedderData(this, slot, data);
 }
 
 
 void* Isolate::GetData(uint32_t slot) {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   return I::GetEmbedderData(this, slot);
 }
 
 
 uint32_t Isolate::GetNumberOfDataSlots() {
-  typedef internal::Internals I;
+  using I = internal::Internals;
   return I::kNumIsolateDataSlots;
 }
 
@@ -12159,8 +12238,8 @@ MaybeLocal<T> Isolate::GetDataFromSnapshotOnce(size_t index) {
 
 Local<Value> Context::GetEmbedderData(int index) {
 #ifndef V8_ENABLE_CHECKS
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A ctx = *reinterpret_cast<const A*>(this);
   A embedder_data =
       I::ReadTaggedPointerField(ctx, I::kNativeContextEmbedderDataOffset);
@@ -12185,8 +12264,8 @@ Local<Value> Context::GetEmbedderData(int index) {
 
 void* Context::GetAlignedPointerFromEmbedderData(int index) {
 #ifndef V8_ENABLE_CHECKS
-  typedef internal::Address A;
-  typedef internal::Internals I;
+  using A = internal::Address;
+  using I = internal::Internals;
   A ctx = *reinterpret_cast<const A*>(this);
   A embedder_data =
       I::ReadTaggedPointerField(ctx, I::kNativeContextEmbedderDataOffset);
diff --git a/deps/v8/include/v8config.h b/deps/v8/include/v8config.h
index ae89edb2c9b791..0886f691d56a19 100644
--- a/deps/v8/include/v8config.h
+++ b/deps/v8/include/v8config.h
@@ -239,6 +239,7 @@
 //  V8_HAS_ATTRIBUTE_VISIBILITY         - __attribute__((visibility)) supported
 //  V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT - __attribute__((warn_unused_result))
 //                                        supported
+//  V8_HAS_CPP_ATTRIBUTE_NODISCARD      - [[nodiscard]] supported
 //  V8_HAS_BUILTIN_BSWAP16              - __builtin_bswap16() supported
 //  V8_HAS_BUILTIN_BSWAP32              - __builtin_bswap32() supported
 //  V8_HAS_BUILTIN_BSWAP64              - __builtin_bswap64() supported
@@ -262,6 +263,12 @@
 //   ...
 //  #endif
 
+#if defined(__has_cpp_attribute)
+#define V8_HAS_CPP_ATTRIBUTE(FEATURE) __has_cpp_attribute(FEATURE)
+#else
+#define V8_HAS_CPP_ATTRIBUTE(FEATURE) 0
+#endif
+
 #if defined(__clang__)
 
 #if defined(__GNUC__)  // Clang in gcc mode.
@@ -276,6 +283,8 @@
 # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT \
     (__has_attribute(warn_unused_result))
 
+# define V8_HAS_CPP_ATTRIBUTE_NODISCARD (V8_HAS_CPP_ATTRIBUTE(nodiscard))
+
 # define V8_HAS_BUILTIN_ASSUME_ALIGNED (__has_builtin(__builtin_assume_aligned))
 # define V8_HAS_BUILTIN_BSWAP16 (__has_builtin(__builtin_bswap16))
 # define V8_HAS_BUILTIN_BSWAP32 (__has_builtin(__builtin_bswap32))
@@ -319,6 +328,7 @@
 # define V8_HAS_ATTRIBUTE_UNUSED 1
 # define V8_HAS_ATTRIBUTE_VISIBILITY 1
 # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT (!V8_CC_INTEL)
+# define V8_HAS_CPP_ATTRIBUTE_NODISCARD (V8_HAS_CPP_ATTRIBUTE(nodiscard))
 
 # define V8_HAS_BUILTIN_ASSUME_ALIGNED 1
 # define V8_HAS_BUILTIN_CLZ 1
@@ -436,6 +446,20 @@
 #define V8_WARN_UNUSED_RESULT /* NOT SUPPORTED */
 #endif
 
+
+// Annotate a class or constructor indicating the caller must assign the
+// constructed instances.
+// Apply to the whole class like:
+//   class V8_NODISCARD Foo() { ... };
+// or apply to just one constructor like:
+//   V8_NODISCARD Foo() { ... };
+// [[nodiscard]] comes in C++17 but supported in clang with -std >= c++11.
+#if V8_HAS_CPP_ATTRIBUTE_NODISCARD
+#define V8_NODISCARD [[nodiscard]]
+#else
+#define V8_NODISCARD /* NOT SUPPORTED */
+#endif
+
 // Helper macro to define no_sanitize attributes only with clang.
 #if defined(__clang__) && defined(__has_attribute)
 #if __has_attribute(no_sanitize)
@@ -484,4 +508,6 @@ V8 shared library set USING_V8_SHARED.
 
 // clang-format on
 
+#undef V8_HAS_CPP_ATTRIBUTE
+
 #endif  // V8CONFIG_H_
diff --git a/deps/v8/infra/mb/mb_config.pyl b/deps/v8/infra/mb/mb_config.pyl
index aab725feece2fa..b95f7d2fbf5033 100644
--- a/deps/v8/infra/mb/mb_config.pyl
+++ b/deps/v8/infra/mb/mb_config.pyl
@@ -68,11 +68,14 @@
       # TODO(machenbach): Remove after switching to x64 on infra side.
       'V8 Win64 ASAN': 'release_x64_asan_no_lsan',
       'V8 Win64': 'release_x64_minimal_symbols',
+      'V8 Win64 - dev image': 'release_x64_minimal_symbols',
       'V8 Win64 - debug': 'debug_x64_minimal_symbols',
       'V8 Win64 - msvc': 'release_x64_msvc',
       # Mac.
       'V8 Mac64': 'release_x64',
       'V8 Mac64 - debug': 'debug_x64',
+      'V8 Official Mac ARM64': 'release_arm64',
+      'V8 Official Mac ARM64 Debug': 'debug_arm64',
       'V8 Mac64 GC Stress': 'debug_x64',
       'V8 Mac64 ASAN': 'release_x64_asan_no_lsan',
       'V8 Mac - arm64 - release builder': 'release_arm64',
@@ -169,6 +172,8 @@
       # IBM.
       'V8 Linux - ppc64 - sim': 'release_simulate_ppc64',
       'V8 Linux - s390x - sim': 'release_simulate_s390x',
+      # RISC-V
+      'V8 Linux - riscv64 - sim - builder': 'release_simulate_riscv64',
     },
     'client.v8.branches': {
       'V8 Linux - previous branch': 'release_x86',
@@ -237,6 +242,7 @@
       'v8_linux64_cfi_rel_ng': 'release_x64_cfi',
       'v8_linux64_fuzzilli_ng': 'release_x64_fuzzilli',
       'v8_linux64_msan_rel_ng': 'release_simulate_arm64_msan_minimal_symbols',
+      'v8_linux64_riscv64_rel_ng': 'release_simulate_riscv64',
       'v8_linux64_tsan_rel_ng': 'release_x64_tsan_minimal_symbols',
       'v8_linux64_tsan_no_cm_rel_ng': 'release_x64_tsan_no_cm',
       'v8_linux64_tsan_isolates_rel_ng':
@@ -401,6 +407,8 @@
       'release_bot', 'simulate_mips64el'],
     'release_simulate_ppc64': [
       'release_bot', 'simulate_ppc64'],
+    'release_simulate_riscv64': [
+      'release_bot', 'simulate_riscv64'],
     'release_simulate_s390x': [
       'release_bot', 'simulate_s390x'],
 
@@ -696,7 +704,7 @@
     },
 
     'ios_simulator': {
-      'gn_args': 'target_cpu="x64" target_os="ios" ios_use_goma_rbe=true',
+      'gn_args': 'target_cpu="x64" target_os="ios"',
     },
 
     'lsan': {
@@ -783,6 +791,10 @@
       'gn_args': 'target_cpu="x64" v8_target_cpu="ppc64"',
     },
 
+    'simulate_riscv64': {
+      'gn_args': 'target_cpu="x64" v8_target_cpu="riscv64"',
+    },
+
     'simulate_s390x': {
       'gn_args': 'target_cpu="x64" v8_target_cpu="s390x"',
     },
diff --git a/deps/v8/infra/testing/builders.pyl b/deps/v8/infra/testing/builders.pyl
index 9414e17377abf2..bffd21d01b2c17 100644
--- a/deps/v8/infra/testing/builders.pyl
+++ b/deps/v8/infra/testing/builders.pyl
@@ -549,6 +549,16 @@
     ],
   },
   ##############################################################################
+  # Linux64 with RISC-V simulators
+  'v8_linux64_riscv64_rel_ng_triggered': {
+    'swarming_dimensions': {
+      'os': 'Ubuntu-16.04',
+    },
+    'tests': [
+      {'name': 'v8testing', 'shards': 3},
+    ],
+  },
+  ##############################################################################
   # Odroids with native arm
   'v8_odroid_arm_rel_ng_triggered': {
     'swarming_dimensions' : {
@@ -685,7 +695,7 @@
   'v8_mac_arm64_rel_ng_triggered': {
     'swarming_dimensions' : {
       'cpu': 'arm64',
-      'os': 'Mac-11',
+      'os': 'Mac-11.0',
       'pool': 'chromium.tests.mac-arm64',
     },
     'tests': [
@@ -695,7 +705,7 @@
   'v8_mac_arm64_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'cpu': 'arm64',
-      'os': 'Mac-11',
+      'os': 'Mac-11.0',
       'pool': 'chromium.tests.mac-arm64',
     },
     'tests': [
@@ -705,7 +715,7 @@
   'v8_mac_arm64_full_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'cpu': 'arm64',
-      'os': 'Mac-11',
+      'os': 'Mac-11.0',
       'pool': 'chromium.tests.mac-arm64',
     },
     'tests': [
@@ -1350,7 +1360,7 @@
   },
   'V8 Mac - arm64 - release': {
     'swarming_dimensions' : {
-      'os': 'Mac-11',
+      'os': 'Mac-11.0',
       'cpu': 'arm64',
       'pool': 'chromium.tests.mac-arm64',
     },
@@ -1754,6 +1764,19 @@
       {'name': 'v8testing', 'shards': 3},
     ],
   },
+  'V8 Linux - riscv64 - sim': {
+    'swarming_dimensions': {
+      'os': 'Ubuntu-16.04',
+    },
+    'swarming_task_attrs': {
+      'expiration': 14400,
+      'hard_timeout': 3600,
+      'priority': 35,
+    },
+    'tests': [
+      {'name': 'v8testing', 'shards': 3},
+    ],
+  },
   'V8 Linux - s390x - sim': {
     'swarming_dimensions': {
       'os': 'Ubuntu-16.04',
diff --git a/deps/v8/samples/cppgc/OWNERS b/deps/v8/samples/cppgc/OWNERS
new file mode 100644
index 00000000000000..3c480d06f70bb8
--- /dev/null
+++ b/deps/v8/samples/cppgc/OWNERS
@@ -0,0 +1,3 @@
+bikineev@chromium.org
+mlippautz@chromium.org
+omerkatz@chromium.org
diff --git a/deps/v8/samples/cppgc/cppgc-for-v8-embedders.cc b/deps/v8/samples/cppgc/cppgc-for-v8-embedders.cc
deleted file mode 100644
index b4d7ed9e4d72da..00000000000000
--- a/deps/v8/samples/cppgc/cppgc-for-v8-embedders.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <include/cppgc/allocation.h>
-#include <include/cppgc/default-platform.h>
-#include <include/cppgc/garbage-collected.h>
-#include <include/cppgc/heap.h>
-#include <include/cppgc/member.h>
-#include <include/cppgc/platform.h>
-#include <include/cppgc/visitor.h>
-#include <include/v8.h>
-
-#include <iostream>
-#include <memory>
-#include <string>
-
-/**
- * This sample program shows how to set up a stand-alone cppgc heap as an
- * embedder of V8. Most importantly, this example shows how to reuse V8's
- * platform for cppgc.
- */
-
-/**
- * Simple string rope to illustrate allocation and garbage collection below. The
- * rope keeps the next parts alive via regular managed reference.
- */
-class Rope final : public cppgc::GarbageCollected<Rope> {
- public:
-  explicit Rope(std::string part, Rope* next = nullptr)
-      : part_(part), next_(next) {}
-
-  void Trace(cppgc::Visitor* visitor) const { visitor->Trace(next_); }
-
- private:
-  std::string part_;
-  cppgc::Member<Rope> next_;
-
-  friend std::ostream& operator<<(std::ostream& os, const Rope& rope);
-};
-
-std::ostream& operator<<(std::ostream& os, const Rope& rope) {
-  os << rope.part_;
-  if (rope.next_) {
-    os << *rope.next_;
-  }
-  return os;
-}
-
-int main(int argc, char* argv[]) {
-  // Create a platform that is used by cppgc::Heap for execution and backend
-  // allocation.
-  auto cppgc_platform = std::make_shared<cppgc::DefaultPlatform>();
-  // Initialize the process. This must happen before any cppgc::Heap::Create()
-  // calls.
-  cppgc::InitializeProcess(cppgc_platform->GetPageAllocator());
-  // Create a managed heap.
-  std::unique_ptr<cppgc::Heap> heap = cppgc::Heap::Create(cppgc_platform);
-  // Allocate a string rope on the managed heap.
-  auto* greeting = cppgc::MakeGarbageCollected<Rope>(
-      heap->GetAllocationHandle(), "Hello ",
-      cppgc::MakeGarbageCollected<Rope>(heap->GetAllocationHandle(), "World!"));
-  // Manually trigger garbage collection. The object greeting is held alive
-  // through conservative stack scanning.
-  heap->ForceGarbageCollectionSlow("V8 embedders example", "Testing");
-  std::cout << *greeting << std::endl;
-  // Gracefully shutdown the process.
-  cppgc::ShutdownProcess();
-  return 0;
-}
diff --git a/deps/v8/samples/cppgc/cppgc-standalone.cc b/deps/v8/samples/cppgc/cppgc-sample.cc
similarity index 77%
rename from deps/v8/samples/cppgc/cppgc-standalone.cc
rename to deps/v8/samples/cppgc/cppgc-sample.cc
index f8cb4020c3a53d..befda9619796ff 100644
--- a/deps/v8/samples/cppgc/cppgc-standalone.cc
+++ b/deps/v8/samples/cppgc/cppgc-sample.cc
@@ -45,9 +45,13 @@ int main(int argc, char* argv[]) {
   // Create a default platform that is used by cppgc::Heap for execution and
   // backend allocation.
   auto cppgc_platform = std::make_shared<cppgc::DefaultPlatform>();
-  // Initialize the process. This must happen before any
-  // cppgc::Heap::Create() calls.
-  cppgc::InitializeProcess(cppgc_platform->GetPageAllocator());
+  // Initialize the process. This must happen before any cppgc::Heap::Create()
+  // calls. cppgc::DefaultPlatform::InitializeProcess initializes both cppgc
+  // and v8 (if cppgc is not used as a standalone) as needed.
+  // If using a platform other than cppgc::DefaultPlatform, should call
+  // cppgc::InitializeProcess (for standalone builds) or
+  // v8::V8::InitializePlatform (for non-standalone builds) directly.
+  cppgc::DefaultPlatform::InitializeProcess(cppgc_platform.get());
   // Create a managed heap.
   std::unique_ptr<cppgc::Heap> heap = cppgc::Heap::Create(cppgc_platform);
   // Allocate a string rope on the managed heap.
@@ -56,7 +60,7 @@ int main(int argc, char* argv[]) {
       cppgc::MakeGarbageCollected<Rope>(heap->GetAllocationHandle(), "World!"));
   // Manually trigger garbage collection. The object greeting is held alive
   // through conservative stack scanning.
-  heap->ForceGarbageCollectionSlow("CppGC stand-alone example", "Testing");
+  heap->ForceGarbageCollectionSlow("CppGC example", "Testing");
   std::cout << *greeting << std::endl;
   // Gracefully shutdown the process.
   cppgc::ShutdownProcess();
diff --git a/deps/v8/samples/process.cc b/deps/v8/samples/process.cc
index dec0d570311f15..16e70a20644e50 100644
--- a/deps/v8/samples/process.cc
+++ b/deps/v8/samples/process.cc
@@ -219,7 +219,7 @@ bool JsHttpRequestProcessor::Initialize(map<string, string>* opts,
   }
 
   // It is a function; cast it to a Function
-  Local<Function> process_fun = Local<Function>::Cast(process_val);
+  Local<Function> process_fun = process_val.As<Function>();
 
   // Store the function in a Global handle, since we also want
   // that to remain after this call returns
@@ -375,7 +375,7 @@ Local<Object> JsHttpRequestProcessor::WrapMap(map<string, string>* obj) {
 // Utility function that extracts the C++ map pointer from a wrapper
 // object.
 map<string, string>* JsHttpRequestProcessor::UnwrapMap(Local<Object> obj) {
-  Local<External> field = Local<External>::Cast(obj->GetInternalField(0));
+  Local<External> field = obj->GetInternalField(0).As<External>();
   void* ptr = field->Value();
   return static_cast<map<string, string>*>(ptr);
 }
@@ -397,7 +397,7 @@ void JsHttpRequestProcessor::MapGet(Local<Name> name,
   map<string, string>* obj = UnwrapMap(info.Holder());
 
   // Convert the JavaScript string to a std::string.
-  string key = ObjectToString(info.GetIsolate(), Local<String>::Cast(name));
+  string key = ObjectToString(info.GetIsolate(), name.As<String>());
 
   // Look up the value if it exists using the standard STL ideom.
   map<string, string>::iterator iter = obj->find(key);
@@ -422,7 +422,7 @@ void JsHttpRequestProcessor::MapSet(Local<Name> name, Local<Value> value_obj,
   map<string, string>* obj = UnwrapMap(info.Holder());
 
   // Convert the key and value to std::strings.
-  string key = ObjectToString(info.GetIsolate(), Local<String>::Cast(name));
+  string key = ObjectToString(info.GetIsolate(), name.As<String>());
   string value = ObjectToString(info.GetIsolate(), value_obj);
 
   // Update the map.
@@ -491,7 +491,7 @@ Local<Object> JsHttpRequestProcessor::WrapRequest(HttpRequest* request) {
  * wrapper object.
  */
 HttpRequest* JsHttpRequestProcessor::UnwrapRequest(Local<Object> obj) {
-  Local<External> field = Local<External>::Cast(obj->GetInternalField(0));
+  Local<External> field = obj->GetInternalField(0).As<External>();
   void* ptr = field->Value();
   return static_cast<HttpRequest*>(ptr);
 }
diff --git a/deps/v8/samples/shell.cc b/deps/v8/samples/shell.cc
index 70450296c76389..4cff77cc040f04 100644
--- a/deps/v8/samples/shell.cc
+++ b/deps/v8/samples/shell.cc
@@ -380,7 +380,7 @@ void ReportException(v8::Isolate* isolate, v8::TryCatch* try_catch) {
     v8::Local<v8::Value> stack_trace_string;
     if (try_catch->StackTrace(context).ToLocal(&stack_trace_string) &&
         stack_trace_string->IsString() &&
-        v8::Local<v8::String>::Cast(stack_trace_string)->Length() > 0) {
+        stack_trace_string.As<v8::String>()->Length() > 0) {
       v8::String::Utf8Value stack_trace(isolate, stack_trace_string);
       const char* stack_trace_string = ToCString(stack_trace);
       fprintf(stderr, "%s\n", stack_trace_string);
diff --git a/deps/v8/src/DEPS b/deps/v8/src/DEPS
index e10d171f260d36..42d0c2d8a40371 100644
--- a/deps/v8/src/DEPS
+++ b/deps/v8/src/DEPS
@@ -8,6 +8,7 @@ include_rules = [
   "+src/compiler/code-assembler.h",
   "+src/compiler/wasm-compiler.h",
   "-src/heap",
+  "+src/heap/basic-memory-chunk.h",
   "+src/heap/combined-heap.h",
   "+src/heap/embedder-tracing.h",
   "+src/heap/factory.h",
@@ -25,6 +26,7 @@ include_rules = [
   # TODO(v8:10496): Don't expose memory chunk outside of heap/.
   "+src/heap/memory-chunk.h",
   "+src/heap/memory-chunk-inl.h",
+  "+src/heap/parked-scope.h",
   "+src/heap/read-only-heap-inl.h",
   "+src/heap/read-only-heap.h",
   "+src/heap/safepoint.h",
diff --git a/deps/v8/src/api/api-arguments-inl.h b/deps/v8/src/api/api-arguments-inl.h
index 05bb35786a94e9..57b533c7c9fb11 100644
--- a/deps/v8/src/api/api-arguments-inl.h
+++ b/deps/v8/src/api/api-arguments-inl.h
@@ -57,8 +57,8 @@ inline Object PropertyCallbackArguments::receiver() {
   return *slot_at(T::kThisIndex);
 }
 
-inline JSObject FunctionCallbackArguments::holder() {
-  return JSObject::cast(*slot_at(T::kHolderIndex));
+inline JSReceiver FunctionCallbackArguments::holder() {
+  return JSReceiver::cast(*slot_at(T::kHolderIndex));
 }
 
 #define FOR_EACH_CALLBACK(F)                        \
diff --git a/deps/v8/src/api/api-arguments.h b/deps/v8/src/api/api-arguments.h
index 18690b5db2b6d7..464ebadf37b360 100644
--- a/deps/v8/src/api/api-arguments.h
+++ b/deps/v8/src/api/api-arguments.h
@@ -74,6 +74,12 @@ class PropertyCallbackArguments
   PropertyCallbackArguments(Isolate* isolate, Object data, Object self,
                             JSObject holder, Maybe<ShouldThrow> should_throw);
 
+  // Don't copy PropertyCallbackArguments, because they would both have the
+  // same prev_ pointer.
+  PropertyCallbackArguments(const PropertyCallbackArguments&) = delete;
+  PropertyCallbackArguments& operator=(const PropertyCallbackArguments&) =
+      delete;
+
   // -------------------------------------------------------------------------
   // Accessor Callbacks
   // Also used for AccessorSetterCallback.
@@ -141,10 +147,6 @@ class PropertyCallbackArguments
 
   inline JSObject holder();
   inline Object receiver();
-
-  // Don't copy PropertyCallbackArguments, because they would both have the
-  // same prev_ pointer.
-  DISALLOW_COPY_AND_ASSIGN(PropertyCallbackArguments);
 };
 
 class FunctionCallbackArguments
@@ -175,7 +177,7 @@ class FunctionCallbackArguments
   inline Handle<Object> Call(CallHandlerInfo handler);
 
  private:
-  inline JSObject holder();
+  inline JSReceiver holder();
 
   internal::Address* argv_;
   int argc_;
diff --git a/deps/v8/src/api/api-inl.h b/deps/v8/src/api/api-inl.h
index f686424286d8fe..b8a5c195324937 100644
--- a/deps/v8/src/api/api-inl.h
+++ b/deps/v8/src/api/api-inl.h
@@ -104,7 +104,8 @@ MAKE_TO_LOCAL(ToLocal, BigInt, BigInt)
 MAKE_TO_LOCAL(ExternalToLocal, JSObject, External)
 MAKE_TO_LOCAL(CallableToLocal, JSReceiver, Function)
 MAKE_TO_LOCAL(ToLocalPrimitive, Object, Primitive)
-MAKE_TO_LOCAL(ToLocal, FixedArray, PrimitiveArray)
+MAKE_TO_LOCAL(FixedArrayToLocal, FixedArray, FixedArray)
+MAKE_TO_LOCAL(PrimitiveArrayToLocal, FixedArray, PrimitiveArray)
 MAKE_TO_LOCAL(ScriptOrModuleToLocal, Script, ScriptOrModule)
 
 #undef MAKE_TO_LOCAL_TYPED_ARRAY
diff --git a/deps/v8/src/api/api-natives.cc b/deps/v8/src/api/api-natives.cc
index f8f660ea15c939..43d0b3a166a339 100644
--- a/deps/v8/src/api/api-natives.cc
+++ b/deps/v8/src/api/api-natives.cc
@@ -18,7 +18,7 @@ namespace internal {
 
 namespace {
 
-class InvokeScope {
+class V8_NODISCARD InvokeScope {
  public:
   explicit InvokeScope(Isolate* isolate)
       : isolate_(isolate), save_context_(isolate) {}
@@ -67,33 +67,31 @@ MaybeHandle<Object> Instantiate(
   }
 }
 
-MaybeHandle<Object> DefineAccessorProperty(
-    Isolate* isolate, Handle<JSObject> object, Handle<Name> name,
-    Handle<Object> getter, Handle<Object> setter, PropertyAttributes attributes,
-    bool force_instantiate) {
+MaybeHandle<Object> DefineAccessorProperty(Isolate* isolate,
+                                           Handle<JSObject> object,
+                                           Handle<Name> name,
+                                           Handle<Object> getter,
+                                           Handle<Object> setter,
+                                           PropertyAttributes attributes) {
   DCHECK(!getter->IsFunctionTemplateInfo() ||
          !FunctionTemplateInfo::cast(*getter).do_not_cache());
   DCHECK(!setter->IsFunctionTemplateInfo() ||
          !FunctionTemplateInfo::cast(*setter).do_not_cache());
-  if (getter->IsFunctionTemplateInfo()) {
-    if (force_instantiate ||
-        FunctionTemplateInfo::cast(*getter).BreakAtEntry()) {
-      ASSIGN_RETURN_ON_EXCEPTION(
-          isolate, getter,
-          InstantiateFunction(isolate,
-                              Handle<FunctionTemplateInfo>::cast(getter)),
-          Object);
-    }
+  if (getter->IsFunctionTemplateInfo() &&
+      FunctionTemplateInfo::cast(*getter).BreakAtEntry()) {
+    ASSIGN_RETURN_ON_EXCEPTION(
+        isolate, getter,
+        InstantiateFunction(isolate,
+                            Handle<FunctionTemplateInfo>::cast(getter)),
+        Object);
   }
-  if (setter->IsFunctionTemplateInfo()) {
-    if (force_instantiate ||
-        FunctionTemplateInfo::cast(*setter).BreakAtEntry()) {
-      ASSIGN_RETURN_ON_EXCEPTION(
-          isolate, setter,
-          InstantiateFunction(isolate,
-                              Handle<FunctionTemplateInfo>::cast(setter)),
-          Object);
-    }
+  if (setter->IsFunctionTemplateInfo() &&
+      FunctionTemplateInfo::cast(*setter).BreakAtEntry()) {
+    ASSIGN_RETURN_ON_EXCEPTION(
+        isolate, setter,
+        InstantiateFunction(isolate,
+                            Handle<FunctionTemplateInfo>::cast(setter)),
+        Object);
   }
   RETURN_ON_EXCEPTION(
       isolate,
@@ -148,7 +146,7 @@ void EnableAccessChecks(Isolate* isolate, Handle<JSObject> object) {
   JSObject::MigrateToMap(isolate, object, new_map);
 }
 
-class AccessCheckDisableScope {
+class V8_NODISCARD AccessCheckDisableScope {
  public:
   AccessCheckDisableScope(Isolate* isolate, Handle<JSObject> obj)
       : isolate_(isolate),
@@ -186,6 +184,8 @@ Object GetIntrinsic(Isolate* isolate, v8::Intrinsic intrinsic) {
 template <typename TemplateInfoT>
 MaybeHandle<JSObject> ConfigureInstance(Isolate* isolate, Handle<JSObject> obj,
                                         Handle<TemplateInfoT> data) {
+  RuntimeCallTimerScope timer(isolate,
+                              RuntimeCallCounterId::kConfigureInstance);
   HandleScope scope(isolate);
   // Disable access checks while instantiating the object.
   AccessCheckDisableScope access_check_scope(isolate, obj);
@@ -254,7 +254,7 @@ MaybeHandle<JSObject> ConfigureInstance(Isolate* isolate, Handle<JSObject> obj,
         auto setter = handle(properties->get(i++), isolate);
         RETURN_ON_EXCEPTION(isolate,
                             DefineAccessorProperty(isolate, obj, name, getter,
-                                                   setter, attributes, false),
+                                                   setter, attributes),
                             JSObject);
       }
     } else {
@@ -293,7 +293,7 @@ MaybeHandle<JSObject> ProbeInstantiationsCache(
     FixedArray fast_cache =
         native_context->fast_template_instantiations_cache();
     Handle<Object> object{fast_cache.get(serial_number - 1), isolate};
-    if (object->IsUndefined(isolate)) return {};
+    if (object->IsTheHole(isolate)) return {};
     return Handle<JSObject>::cast(object);
   }
   if (caching_mode == CachingMode::kUnlimited ||
@@ -357,7 +357,7 @@ void UncacheTemplateInstantiation(Isolate* isolate,
 
 bool IsSimpleInstantiation(Isolate* isolate, ObjectTemplateInfo info,
                            JSReceiver new_target) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (!new_target.IsJSFunction()) return false;
   JSFunction fun = JSFunction::cast(new_target);
@@ -371,6 +371,8 @@ MaybeHandle<JSObject> InstantiateObject(Isolate* isolate,
                                         Handle<ObjectTemplateInfo> info,
                                         Handle<JSReceiver> new_target,
                                         bool is_prototype) {
+  RuntimeCallTimerScope timer(isolate,
+                              RuntimeCallCounterId::kInstantiateObject);
   Handle<JSFunction> constructor;
   int serial_number = info->serial_number();
   if (!new_target.is_null()) {
@@ -463,6 +465,8 @@ MaybeHandle<Object> GetInstancePrototype(Isolate* isolate,
 MaybeHandle<JSFunction> InstantiateFunction(
     Isolate* isolate, Handle<NativeContext> native_context,
     Handle<FunctionTemplateInfo> data, MaybeHandle<Name> maybe_name) {
+  RuntimeCallTimerScope timer(isolate,
+                              RuntimeCallCounterId::kInstantiateFunction);
   int serial_number = data->serial_number();
   if (serial_number) {
     Handle<JSObject> result;
@@ -646,6 +650,8 @@ Handle<JSFunction> ApiNatives::CreateApiFunction(
     Isolate* isolate, Handle<NativeContext> native_context,
     Handle<FunctionTemplateInfo> obj, Handle<Object> prototype,
     InstanceType type, MaybeHandle<Name> maybe_name) {
+  RuntimeCallTimerScope timer(isolate,
+                              RuntimeCallCounterId::kCreateApiFunction);
   Handle<SharedFunctionInfo> shared =
       FunctionTemplateInfo::GetOrCreateSharedFunctionInfo(isolate, obj,
                                                           maybe_name);
@@ -653,8 +659,7 @@ Handle<JSFunction> ApiNatives::CreateApiFunction(
   DCHECK(shared->HasSharedName());
 
   Handle<JSFunction> result =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(shared,
-                                                            native_context);
+      Factory::JSFunctionBuilder{isolate, shared, native_context}.Build();
 
   if (obj->remove_prototype()) {
     DCHECK(prototype.is_null());
diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc
index 66afdb19681517..9b19d155bd80c4 100644
--- a/deps/v8/src/api/api.cc
+++ b/deps/v8/src/api/api.cc
@@ -11,6 +11,7 @@
 #include <utility>  // For move
 #include <vector>
 
+#include "include/cppgc/custom-space.h"
 #include "include/v8-cppgc.h"
 #include "include/v8-fast-api-calls.h"
 #include "include/v8-profiler.h"
@@ -84,6 +85,7 @@
 #include "src/objects/property-details.h"
 #include "src/objects/property.h"
 #include "src/objects/prototype.h"
+#include "src/objects/shared-function-info.h"
 #include "src/objects/slots.h"
 #include "src/objects/smi.h"
 #include "src/objects/stack-frame-info-inl.h"
@@ -99,6 +101,7 @@
 #include "src/profiler/heap-snapshot-generator-inl.h"
 #include "src/profiler/profile-generator-inl.h"
 #include "src/profiler/tick-sample.h"
+#include "src/regexp/regexp-stack.h"
 #include "src/regexp/regexp-utils.h"
 #include "src/runtime/runtime.h"
 #include "src/snapshot/code-serializer.h"
@@ -131,6 +134,7 @@
 #include "include/v8-wasm-trap-handler-win.h"
 #include "src/trap-handler/handler-inside-win.h"
 #if defined(V8_OS_WIN64)
+#include "src/base/platform/wrappers.h"
 #include "src/diagnostics/unwinding-info-win64.h"
 #endif  // V8_OS_WIN64
 #endif  // V8_OS_WIN
@@ -216,11 +220,15 @@ namespace v8 {
                              bailout_value, HandleScopeClass, false);     \
   i::DisallowJavascriptExecutionDebugOnly __no_script__((isolate))
 
-#define ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate)                    \
-  i::VMState<v8::OTHER> __state__((isolate));                       \
+// Lightweight version for APIs that don't require an active context.
+#define ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate)                      \
   i::DisallowJavascriptExecutionDebugOnly __no_script__((isolate)); \
   i::DisallowExceptions __no_exceptions__((isolate))
 
+#define ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate) \
+  i::VMState<v8::OTHER> __state__((isolate));    \
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate)
+
 #define ENTER_V8_FOR_NEW_CONTEXT(isolate)     \
   i::VMState<v8::OTHER> __state__((isolate)); \
   i::DisallowExceptions __no_exceptions__((isolate))
@@ -230,6 +238,8 @@ namespace v8 {
   ENTER_V8_HELPER_DO_NOT_USE(isolate, context, class_name, function_name, \
                              bailout_value, HandleScopeClass, false)
 
+#define ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate)
+
 #define ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate) \
   i::VMState<v8::OTHER> __state__((isolate));
 
@@ -255,7 +265,7 @@ namespace v8 {
 
 namespace {
 
-class InternalEscapableScope : public v8::EscapableHandleScope {
+class V8_NODISCARD InternalEscapableScope : public v8::EscapableHandleScope {
  public:
   explicit inline InternalEscapableScope(i::Isolate* isolate)
       : v8::EscapableHandleScope(reinterpret_cast<v8::Isolate*>(isolate)) {}
@@ -273,7 +283,7 @@ void CheckMicrotasksScopesConsistency(i::MicrotaskQueue* microtask_queue) {
 #endif
 
 template <bool do_callback>
-class CallDepthScope {
+class V8_NODISCARD CallDepthScope {
  public:
   CallDepthScope(i::Isolate* isolate, Local<Context> context)
       : isolate_(isolate),
@@ -320,6 +330,9 @@ class CallDepthScope {
     isolate_->set_next_v8_call_is_safe_for_termination(safe_for_termination_);
   }
 
+  CallDepthScope(const CallDepthScope&) = delete;
+  CallDepthScope& operator=(const CallDepthScope&) = delete;
+
   void Escape() {
     DCHECK(!escaped_);
     escaped_ = true;
@@ -352,7 +365,6 @@ class CallDepthScope {
   friend class i::ThreadLocalTop;
 
   DISALLOW_NEW_AND_DELETE()
-  DISALLOW_COPY_AND_ASSIGN(CallDepthScope);
 };
 
 }  // namespace
@@ -363,19 +375,13 @@ static ScriptOrigin GetScriptOriginForScript(i::Isolate* isolate,
   i::Handle<i::Object> source_map_url(script->source_mapping_url(), isolate);
   i::Handle<i::FixedArray> host_defined_options(script->host_defined_options(),
                                                 isolate);
-  v8::Isolate* v8_isolate = reinterpret_cast<v8::Isolate*>(isolate);
   ScriptOriginOptions options(script->origin_options());
   v8::ScriptOrigin origin(
-      Utils::ToLocal(scriptName),
-      v8::Integer::New(v8_isolate, script->line_offset()),
-      v8::Integer::New(v8_isolate, script->column_offset()),
-      v8::Boolean::New(v8_isolate, options.IsSharedCrossOrigin()),
-      v8::Integer::New(v8_isolate, script->id()),
-      Utils::ToLocal(source_map_url),
-      v8::Boolean::New(v8_isolate, options.IsOpaque()),
-      v8::Boolean::New(v8_isolate, script->type() == i::Script::TYPE_WASM),
-      v8::Boolean::New(v8_isolate, options.IsModule()),
-      Utils::ToLocal(host_defined_options));
+      Utils::ToLocal(scriptName), script->line_offset(),
+      script->column_offset(), options.IsSharedCrossOrigin(), script->id(),
+      Utils::ToLocal(source_map_url), options.IsOpaque(),
+      script->type() == i::Script::TYPE_WASM, options.IsModule(),
+      Utils::PrimitiveArrayToLocal(host_defined_options));
   return origin;
 }
 
@@ -549,7 +555,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
     // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79839
     void* data = __linux_calloc(length, 1);
 #else
-    void* data = calloc(length, 1);
+    void* data = base::Calloc(length, 1);
 #endif
     return data;
   }
@@ -560,12 +566,12 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
     // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79839
     void* data = __linux_malloc(length);
 #else
-    void* data = malloc(length);
+    void* data = base::Malloc(length);
 #endif
     return data;
   }
 
-  void Free(void* data, size_t) override { free(data); }
+  void Free(void* data, size_t) override { base::Free(data); }
 
   void* Reallocate(void* data, size_t old_length, size_t new_length) override {
 #if V8_OS_AIX && _LINUX_SOURCE_COMPAT
@@ -573,7 +579,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
     // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79839
     void* new_data = __linux_realloc(data, new_length);
 #else
-    void* new_data = realloc(data, new_length);
+    void* new_data = base::Realloc(data, new_length);
 #endif
     if (new_length > old_length) {
       memset(reinterpret_cast<uint8_t*>(new_data) + old_length, 0,
@@ -793,7 +799,7 @@ StartupData SnapshotCreator::CreateBlob(
 
   // Create a vector with all contexts and clear associated Persistent fields.
   // Note these contexts may be dead after calling Clear(), but will not be
-  // collected until serialization completes and the DisallowHeapAllocation
+  // collected until serialization completes and the DisallowGarbageCollection
   // scope above goes out of scope.
   std::vector<i::Context> contexts;
   contexts.reserve(num_contexts);
@@ -954,17 +960,6 @@ void ResourceConstraints::ConfigureDefaults(uint64_t physical_memory,
   }
 }
 
-size_t ResourceConstraints::max_semi_space_size_in_kb() const {
-  return i::Heap::SemiSpaceSizeFromYoungGenerationSize(
-             max_young_generation_size_) /
-         i::KB;
-}
-
-void ResourceConstraints::set_max_semi_space_size_in_kb(size_t limit_in_kb) {
-  set_max_young_generation_size_in_bytes(
-      i::Heap::YoungGenerationSizeFromSemiSpaceSize(limit_in_kb * i::KB));
-}
-
 i::Address* V8::GlobalizeReference(i::Isolate* isolate, i::Address* obj) {
   LOG_API(isolate, Persistent, New);
   i::Handle<i::Object> result = isolate->global_handles()->Create(*obj);
@@ -1162,7 +1157,7 @@ void SealHandleScope::operator delete[](void*, size_t) { base::OS::Abort(); }
 bool Data::IsModule() const { return Utils::OpenHandle(this)->IsModule(); }
 
 bool Data::IsValue() const {
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::Handle<i::Object> self = Utils::OpenHandle(this);
   if (self->IsSmi()) {
     return true;
@@ -1241,6 +1236,7 @@ static i::Handle<i::EmbedderDataArray> EmbedderDataFor(Context* context,
                                                        const char* location) {
   i::Handle<i::Context> env = Utils::OpenHandle(context);
   i::Isolate* isolate = env->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   bool ok = Utils::ApiCheck(env->IsNativeContext(), location,
                             "Not a native context") &&
             Utils::ApiCheck(index >= 0, location, "Negative index");
@@ -1260,7 +1256,10 @@ static i::Handle<i::EmbedderDataArray> EmbedderDataFor(Context* context,
 
 uint32_t Context::GetNumberOfEmbedderDataFields() {
   i::Handle<i::Context> context = Utils::OpenHandle(this);
-  CHECK(context->IsNativeContext());
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(context->GetIsolate());
+  Utils::ApiCheck(context->IsNativeContext(),
+                  "Context::GetNumberOfEmbedderDataFields",
+                  "Not a native context");
   // TODO(ishell): remove cast once embedder_data slot has a proper type.
   return static_cast<uint32_t>(
       i::EmbedderDataArray::cast(context->embedder_data()).length());
@@ -1430,7 +1429,7 @@ static Local<FunctionTemplate> FunctionTemplateNew(
       i::Handle<i::FunctionTemplateInfo>::cast(struct_obj);
   {
     // Disallow GC until all fields of obj have acceptable types.
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     InitializeFunctionTemplate(obj);
     obj->set_length(length);
     obj->set_do_not_cache(do_not_cache);
@@ -1651,7 +1650,7 @@ static Local<ObjectTemplate> ObjectTemplateNew(
       i::Handle<i::ObjectTemplateInfo>::cast(struct_obj);
   {
     // Disallow GC until all fields of obj have acceptable types.
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     InitializeTemplate(obj, Consts::OBJECT_TEMPLATE);
     int next_serial_number = 0;
     if (!do_not_cache) {
@@ -2052,9 +2051,11 @@ Local<Script> UnboundScript::BindToCurrentContext() {
   auto function_info =
       i::Handle<i::SharedFunctionInfo>::cast(Utils::OpenHandle(this));
   i::Isolate* isolate = function_info->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::Handle<i::JSFunction> function =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          function_info, isolate->native_context());
+      i::Factory::JSFunctionBuilder{isolate, function_info,
+                                    isolate->native_context()}
+          .Build();
   return ToApiHandle<Script>(function);
 }
 
@@ -2073,6 +2074,7 @@ int UnboundScript::GetLineNumber(int code_pos) {
   i::Handle<i::SharedFunctionInfo> obj =
       i::Handle<i::SharedFunctionInfo>::cast(Utils::OpenHandle(this));
   i::Isolate* isolate = obj->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   LOG_API(isolate, UnboundScript, GetLineNumber);
   if (obj->script().IsScript()) {
     i::Handle<i::Script> script(i::Script::cast(obj->script()), isolate);
@@ -2086,6 +2088,7 @@ Local<Value> UnboundScript::GetScriptName() {
   i::Handle<i::SharedFunctionInfo> obj =
       i::Handle<i::SharedFunctionInfo>::cast(Utils::OpenHandle(this));
   i::Isolate* isolate = obj->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   LOG_API(isolate, UnboundScript, GetName);
   if (obj->script().IsScript()) {
     i::Object name = i::Script::cast(obj->script()).name();
@@ -2099,6 +2102,7 @@ Local<Value> UnboundScript::GetSourceURL() {
   i::Handle<i::SharedFunctionInfo> obj =
       i::Handle<i::SharedFunctionInfo>::cast(Utils::OpenHandle(this));
   i::Isolate* isolate = obj->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   LOG_API(isolate, UnboundScript, GetSourceURL);
   if (obj->script().IsScript()) {
     i::Object url = i::Script::cast(obj->script()).source_url();
@@ -2113,6 +2117,7 @@ Local<Value> UnboundScript::GetSourceMappingURL() {
       i::Handle<i::SharedFunctionInfo>::cast(Utils::OpenHandle(this));
   i::Isolate* isolate = obj->GetIsolate();
   LOG_API(isolate, UnboundScript, GetSourceMappingURL);
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   if (obj->script().IsScript()) {
     i::Object url = i::Script::cast(obj->script()).source_mapping_url();
     return Utils::ToLocal(i::Handle<i::Object>(url, isolate));
@@ -2203,6 +2208,35 @@ Local<Primitive> PrimitiveArray::Get(Isolate* v8_isolate, int index) {
   return ToApiHandle<Primitive>(i_item);
 }
 
+int FixedArray::Length() const {
+  i::Handle<i::FixedArray> self = Utils::OpenHandle(this);
+  return self->length();
+}
+
+Local<Data> FixedArray::Get(Local<Context> context, int i) const {
+  i::Handle<i::FixedArray> self = Utils::OpenHandle(this);
+  auto isolate = reinterpret_cast<i::Isolate*>(context->GetIsolate());
+  CHECK_LT(i, self->length());
+  i::Handle<i::Object> entry(self->get(i), isolate);
+  return ToApiHandle<Data>(entry);
+}
+
+Local<String> ModuleRequest::GetSpecifier() const {
+  i::Handle<i::ModuleRequest> self = Utils::OpenHandle(this);
+  i::Isolate* isolate = self->GetIsolate();
+  return ToApiHandle<String>(i::handle(self->specifier(), isolate));
+}
+
+int ModuleRequest::GetSourceOffset() const {
+  return Utils::OpenHandle(this)->position();
+}
+
+Local<FixedArray> ModuleRequest::GetImportAssertions() const {
+  i::Handle<i::ModuleRequest> self = Utils::OpenHandle(this);
+  i::Isolate* isolate = self->GetIsolate();
+  return ToApiHandle<FixedArray>(i::handle(self->import_assertions(), isolate));
+}
+
 Module::Status Module::GetStatus() const {
   i::Handle<i::Module> self = Utils::OpenHandle(this);
   switch (self->status()) {
@@ -2228,12 +2262,14 @@ Local<Value> Module::GetException() const {
                   "Module status must be kErrored");
   i::Handle<i::Module> self = Utils::OpenHandle(this);
   i::Isolate* isolate = self->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   return ToApiHandle<Value>(i::handle(self->GetException(), isolate));
 }
 
 int Module::GetModuleRequestsLength() const {
   i::Handle<i::Module> self = Utils::OpenHandle(this);
   if (self->IsSyntheticModule()) return 0;
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(self->GetIsolate());
   return i::Handle<i::SourceTextModule>::cast(self)
       ->info()
       .module_requests()
@@ -2243,8 +2279,10 @@ int Module::GetModuleRequestsLength() const {
 Local<String> Module::GetModuleRequest(int i) const {
   CHECK_GE(i, 0);
   i::Handle<i::Module> self = Utils::OpenHandle(this);
-  CHECK(self->IsSourceTextModule());
+  Utils::ApiCheck(self->IsSourceTextModule(), "Module::GetModuleRequest",
+                  "Expected SourceTextModule");
   i::Isolate* isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::Handle<i::FixedArray> module_requests(
       i::Handle<i::SourceTextModule>::cast(self)->info().module_requests(),
       isolate);
@@ -2258,55 +2296,86 @@ Location Module::GetModuleRequestLocation(int i) const {
   CHECK_GE(i, 0);
   i::Handle<i::Module> self = Utils::OpenHandle(this);
   i::Isolate* isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::HandleScope scope(isolate);
-  CHECK(self->IsSourceTextModule());
-  i::Handle<i::FixedArray> module_request_positions(
-      i::Handle<i::SourceTextModule>::cast(self)
-          ->info()
-          .module_request_positions(),
+  Utils::ApiCheck(self->IsSourceTextModule(),
+                  "Module::GetModuleRequestLocation",
+                  "Expected SourceTextModule");
+  i::Handle<i::FixedArray> module_requests(
+      i::Handle<i::SourceTextModule>::cast(self)->info().module_requests(),
       isolate);
-  CHECK_LT(i, module_request_positions->length());
-  int position = i::Smi::ToInt(module_request_positions->get(i));
+  CHECK_LT(i, module_requests->length());
+  i::Handle<i::ModuleRequest> module_request(
+      i::ModuleRequest::cast(module_requests->get(i)), isolate);
+  int position = module_request->position();
   i::Handle<i::Script> script(
-      i::Handle<i::SourceTextModule>::cast(self)->script(), isolate);
+      i::Handle<i::SourceTextModule>::cast(self)->GetScript(), isolate);
   i::Script::PositionInfo info;
   i::Script::GetPositionInfo(script, position, &info, i::Script::WITH_OFFSET);
   return v8::Location(info.line, info.column);
 }
 
+Local<FixedArray> Module::GetModuleRequests() const {
+  i::Handle<i::Module> self = Utils::OpenHandle(this);
+  if (self->IsSyntheticModule()) {
+    // Synthetic modules are leaf nodes in the module graph. They have no
+    // ModuleRequests.
+    return ToApiHandle<FixedArray>(
+        self->GetReadOnlyRoots().empty_fixed_array_handle());
+  } else {
+    i::Isolate* isolate = self->GetIsolate();
+    i::Handle<i::FixedArray> module_requests(
+        i::Handle<i::SourceTextModule>::cast(self)->info().module_requests(),
+        isolate);
+    return ToApiHandle<FixedArray>(module_requests);
+  }
+}
+
+Location Module::SourceOffsetToLocation(int offset) const {
+  i::Handle<i::Module> self = Utils::OpenHandle(this);
+  i::Isolate* isolate = self->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
+  i::HandleScope scope(isolate);
+  Utils::ApiCheck(
+      self->IsSourceTextModule(), "v8::Module::SourceOffsetToLocation",
+      "v8::Module::SourceOffsetToLocation must be used on an SourceTextModule");
+  i::Handle<i::Script> script(
+      i::Handle<i::SourceTextModule>::cast(self)->GetScript(), isolate);
+  i::Script::PositionInfo info;
+  i::Script::GetPositionInfo(script, offset, &info, i::Script::WITH_OFFSET);
+  return v8::Location(info.line, info.column);
+}
+
 Local<Value> Module::GetModuleNamespace() {
   Utils::ApiCheck(
       GetStatus() >= kInstantiated, "v8::Module::GetModuleNamespace",
       "v8::Module::GetModuleNamespace must be used on an instantiated module");
   i::Handle<i::Module> self = Utils::OpenHandle(this);
+  auto isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::Handle<i::JSModuleNamespace> module_namespace =
-      i::Module::GetModuleNamespace(self->GetIsolate(), self);
+      i::Module::GetModuleNamespace(isolate, self);
   return ToApiHandle<Value>(module_namespace);
 }
 
 Local<UnboundModuleScript> Module::GetUnboundModuleScript() {
-  Utils::ApiCheck(
-      GetStatus() < kEvaluating, "v8::Module::GetUnboundScript",
-      "v8::Module::GetUnboundScript must be used on an unevaluated module");
   i::Handle<i::Module> self = Utils::OpenHandle(this);
-  CHECK(self->IsSourceTextModule());
-  return ToApiHandle<UnboundModuleScript>(i::Handle<i::SharedFunctionInfo>(
+  Utils::ApiCheck(
+      self->IsSourceTextModule(), "v8::Module::GetUnboundModuleScript",
+      "v8::Module::GetUnboundModuleScript must be used on an SourceTextModule");
+  auto isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
+  return ToApiHandle<UnboundModuleScript>(i::handle(
       i::Handle<i::SourceTextModule>::cast(self)->GetSharedFunctionInfo(),
-      self->GetIsolate()));
+      isolate));
 }
 
 int Module::ScriptId() {
   i::Handle<i::Module> self = Utils::OpenHandle(this);
   Utils::ApiCheck(self->IsSourceTextModule(), "v8::Module::ScriptId",
                   "v8::Module::ScriptId must be used on an SourceTextModule");
-
-  // The SharedFunctionInfo is not available for errored modules.
-  Utils::ApiCheck(GetStatus() != kErrored, "v8::Module::ScriptId",
-                  "v8::Module::ScriptId must not be used on an errored module");
-  i::Handle<i::SharedFunctionInfo> sfi(
-      i::Handle<i::SourceTextModule>::cast(self)->GetSharedFunctionInfo(),
-      self->GetIsolate());
-  return ToApiHandle<UnboundScript>(sfi)->GetId();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(self->GetIsolate());
+  return i::Handle<i::SourceTextModule>::cast(self)->GetScript().id();
 }
 
 bool Module::IsGraphAsync() const {
@@ -2314,7 +2383,8 @@ bool Module::IsGraphAsync() const {
       GetStatus() >= kInstantiated, "v8::Module::IsGraphAsync",
       "v8::Module::IsGraphAsync must be used on an instantiated module");
   i::Handle<i::Module> self = Utils::OpenHandle(this);
-  auto isolate = reinterpret_cast<i::Isolate*>(self->GetIsolate());
+  auto isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   return self->IsGraphAsync(isolate);
 }
 
@@ -2331,10 +2401,23 @@ int Module::GetIdentityHash() const { return Utils::OpenHandle(this)->hash(); }
 Maybe<bool> Module::InstantiateModule(Local<Context> context,
                                       Module::ResolveCallback callback) {
   auto isolate = reinterpret_cast<i::Isolate*>(context->GetIsolate());
+  ENTER_V8(isolate, context, Module, InstantiateModule, Nothing<bool>(),
+           i::HandleScope);
+  ResolveModuleCallback callback_with_import_assertions = nullptr;
+  has_pending_exception =
+      !i::Module::Instantiate(isolate, Utils::OpenHandle(this), context,
+                              callback_with_import_assertions, callback);
+  RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
+  return Just(true);
+}
+
+Maybe<bool> Module::InstantiateModule(Local<Context> context,
+                                      Module::ResolveModuleCallback callback) {
+  auto isolate = reinterpret_cast<i::Isolate*>(context->GetIsolate());
   ENTER_V8(isolate, context, Module, InstantiateModule, Nothing<bool>(),
            i::HandleScope);
   has_pending_exception = !i::Module::Instantiate(
-      isolate, Utils::OpenHandle(this), context, callback);
+      isolate, Utils::OpenHandle(this), context, callback, nullptr);
   RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
   return Just(true);
 }
@@ -2363,6 +2446,7 @@ Local<Module> Module::CreateSyntheticModule(
     const std::vector<Local<v8::String>>& export_names,
     v8::Module::SyntheticModuleEvaluationSteps evaluation_steps) {
   auto i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate);
   i::Handle<i::String> i_module_name = Utils::OpenHandle(*module_name);
   i::Handle<i::FixedArray> i_export_names = i_isolate->factory()->NewFixedArray(
       static_cast<int>(export_names.size()));
@@ -2403,6 +2487,7 @@ void Module::SetSyntheticModuleExport(Local<String> export_name,
   i::Handle<i::String> i_export_name = Utils::OpenHandle(*export_name);
   i::Handle<i::Object> i_export_value = Utils::OpenHandle(*export_value);
   i::Handle<i::Module> self = Utils::OpenHandle(this);
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(self->GetIsolate());
   Utils::ApiCheck(self->IsSyntheticModule(),
                   "v8::Module::SetSyntheticModuleExport",
                   "v8::Module::SetSyntheticModuleExport must only be called on "
@@ -2415,26 +2500,19 @@ void Module::SetSyntheticModuleExport(Local<String> export_name,
 namespace {
 
 i::Compiler::ScriptDetails GetScriptDetails(
-    i::Isolate* isolate, Local<Value> resource_name,
-    Local<Integer> resource_line_offset, Local<Integer> resource_column_offset,
-    Local<Value> source_map_url, Local<PrimitiveArray> host_defined_options) {
+    i::Isolate* isolate, Local<Value> resource_name, int resource_line_offset,
+    int resource_column_offset, Local<Value> source_map_url,
+    Local<PrimitiveArray> host_defined_options) {
   i::Compiler::ScriptDetails script_details;
   if (!resource_name.IsEmpty()) {
     script_details.name_obj = Utils::OpenHandle(*(resource_name));
   }
-  if (!resource_line_offset.IsEmpty()) {
-    script_details.line_offset =
-        static_cast<int>(resource_line_offset->Value());
-  }
-  if (!resource_column_offset.IsEmpty()) {
-    script_details.column_offset =
-        static_cast<int>(resource_column_offset->Value());
-  }
-  script_details.host_defined_options = isolate->factory()->empty_fixed_array();
-  if (!host_defined_options.IsEmpty()) {
-    script_details.host_defined_options =
-        Utils::OpenHandle(*(host_defined_options));
-  }
+  script_details.line_offset = resource_line_offset;
+  script_details.column_offset = resource_column_offset;
+  script_details.host_defined_options =
+      host_defined_options.IsEmpty()
+          ? isolate->factory()->empty_fixed_array()
+          : Utils::OpenHandle(*(host_defined_options));
   if (!source_map_url.IsEmpty()) {
     script_details.source_map_url = Utils::OpenHandle(*(source_map_url));
   }
@@ -2511,8 +2589,6 @@ MaybeLocal<Module> ScriptCompiler::CompileModule(
     NoCacheReason no_cache_reason) {
   CHECK(options == kNoCompileOptions || options == kConsumeCodeCache);
 
-  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
-
   Utils::ApiCheck(source->GetResourceOptions().IsModule(),
                   "v8::ScriptCompiler::CompileModule",
                   "Invalid ScriptOrigin: is_module must be true");
@@ -2522,6 +2598,7 @@ MaybeLocal<Module> ScriptCompiler::CompileModule(
   if (!maybe.ToLocal(&unbound)) return MaybeLocal<Module>();
 
   i::Handle<i::SharedFunctionInfo> shared = Utils::OpenHandle(*unbound);
+  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
   return ToApiHandle<Module>(i_isolate->factory()->NewSourceTextModule(shared));
 }
 
@@ -2531,7 +2608,7 @@ bool IsIdentifier(i::Isolate* isolate, i::Handle<i::String> string) {
   const int length = string->length();
   if (length == 0) return false;
   if (!i::IsIdentifierStart(string->Get(0))) return false;
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::String::FlatContent flat = string->GetFlatContent(no_gc);
   if (flat.IsOneByte()) {
     auto vector = flat.ToOneByteVector();
@@ -2642,16 +2719,33 @@ ScriptCompiler::ScriptStreamingTask* ScriptCompiler::StartStreamingScript(
 }
 
 ScriptCompiler::ScriptStreamingTask* ScriptCompiler::StartStreaming(
-    Isolate* v8_isolate, StreamedSource* source) {
+    Isolate* v8_isolate, StreamedSource* source, v8::ScriptType type) {
   if (!i::FLAG_script_streaming) return nullptr;
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::ScriptStreamingData* data = source->impl();
   std::unique_ptr<i::BackgroundCompileTask> task =
-      std::make_unique<i::BackgroundCompileTask>(data, isolate);
+      std::make_unique<i::BackgroundCompileTask>(data, isolate, type);
   data->task = std::move(task);
   return new ScriptCompiler::ScriptStreamingTask(data);
 }
 
+namespace {
+i::MaybeHandle<i::SharedFunctionInfo> CompileStreamedSource(
+    i::Isolate* isolate, ScriptCompiler::StreamedSource* v8_source,
+    Local<String> full_source_string, const ScriptOrigin& origin) {
+  i::Handle<i::String> str = Utils::OpenHandle(*(full_source_string));
+  i::Compiler::ScriptDetails script_details =
+      GetScriptDetails(isolate, origin.ResourceName(), origin.LineOffset(),
+                       origin.ColumnOffset(), origin.SourceMapUrl(),
+                       origin.HostDefinedOptions());
+  i::ScriptStreamingData* data = v8_source->impl();
+  return i::Compiler::GetSharedFunctionInfoForStreamedScript(
+      isolate, str, script_details, origin.Options(), data);
+}
+
+}  // namespace
+
 MaybeLocal<Script> ScriptCompiler::Compile(Local<Context> context,
                                            StreamedSource* v8_source,
                                            Local<String> full_source_string,
@@ -2660,31 +2754,37 @@ MaybeLocal<Script> ScriptCompiler::Compile(Local<Context> context,
   TRACE_EVENT_CALL_STATS_SCOPED(isolate, "v8", "V8.ScriptCompiler");
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"),
                "V8.CompileStreamedScript");
-
-  i::Handle<i::String> str = Utils::OpenHandle(*(full_source_string));
-  i::Compiler::ScriptDetails script_details = GetScriptDetails(
-      isolate, origin.ResourceName(), origin.ResourceLineOffset(),
-      origin.ResourceColumnOffset(), origin.SourceMapUrl(),
-      origin.HostDefinedOptions());
-  i::ScriptStreamingData* data = v8_source->impl();
-
-  i::MaybeHandle<i::SharedFunctionInfo> maybe_function_info =
-      i::Compiler::GetSharedFunctionInfoForStreamedScript(
-          isolate, str, script_details, origin.Options(), data);
-
-  i::Handle<i::SharedFunctionInfo> result;
-  has_pending_exception = !maybe_function_info.ToHandle(&result);
+  i::Handle<i::SharedFunctionInfo> sfi;
+  i::MaybeHandle<i::SharedFunctionInfo> maybe_sfi =
+      CompileStreamedSource(isolate, v8_source, full_source_string, origin);
+  has_pending_exception = !maybe_sfi.ToHandle(&sfi);
   if (has_pending_exception) isolate->ReportPendingMessages();
-
   RETURN_ON_FAILED_EXECUTION(Script);
-
-  Local<UnboundScript> generic = ToApiHandle<UnboundScript>(result);
+  Local<UnboundScript> generic = ToApiHandle<UnboundScript>(sfi);
   if (generic.IsEmpty()) return Local<Script>();
   Local<Script> bound = generic->BindToCurrentContext();
   if (bound.IsEmpty()) return Local<Script>();
   RETURN_ESCAPED(bound);
 }
 
+MaybeLocal<Module> ScriptCompiler::CompileModule(
+    Local<Context> context, StreamedSource* v8_source,
+    Local<String> full_source_string, const ScriptOrigin& origin) {
+  PREPARE_FOR_EXECUTION(context, ScriptCompiler, Compile, Module);
+  TRACE_EVENT_CALL_STATS_SCOPED(isolate, "v8", "V8.ScriptCompiler");
+  TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"),
+               "V8.CompileStreamedModule");
+  i::Handle<i::SharedFunctionInfo> sfi;
+  i::MaybeHandle<i::SharedFunctionInfo> maybe_sfi =
+      CompileStreamedSource(isolate, v8_source, full_source_string, origin);
+  has_pending_exception = !maybe_sfi.ToHandle(&sfi);
+  if (has_pending_exception) isolate->ReportPendingMessages();
+  RETURN_ON_FAILED_EXECUTION(Module);
+  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+  RETURN_ESCAPED(
+      ToApiHandle<Module>(i_isolate->factory()->NewSourceTextModule(sfi)));
+}
+
 uint32_t ScriptCompiler::CachedDataVersionTag() {
   return static_cast<uint32_t>(base::hash_combine(
       internal::Version::Hash(), internal::FlagList::Hash(),
@@ -2696,6 +2796,7 @@ ScriptCompiler::CachedData* ScriptCompiler::CreateCodeCache(
   i::Handle<i::SharedFunctionInfo> shared =
       i::Handle<i::SharedFunctionInfo>::cast(
           Utils::OpenHandle(*unbound_script));
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(shared->GetIsolate());
   DCHECK(shared->is_toplevel());
   return i::CodeSerializer::Serialize(shared);
 }
@@ -2706,6 +2807,7 @@ ScriptCompiler::CachedData* ScriptCompiler::CreateCodeCache(
   i::Handle<i::SharedFunctionInfo> shared =
       i::Handle<i::SharedFunctionInfo>::cast(
           Utils::OpenHandle(*unbound_module_script));
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(shared->GetIsolate());
   DCHECK(shared->is_toplevel());
   return i::CodeSerializer::Serialize(shared);
 }
@@ -2716,6 +2818,7 @@ ScriptCompiler::CachedData* ScriptCompiler::CreateCodeCacheForFunction(
       i::Handle<i::JSFunction>::cast(Utils::OpenHandle(*function));
   i::Handle<i::SharedFunctionInfo> shared(js_function->shared(),
                                           js_function->GetIsolate());
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(shared->GetIsolate());
   CHECK(shared->is_wrapped());
   return i::CodeSerializer::Serialize(shared);
 }
@@ -2888,6 +2991,7 @@ ScriptOrigin Message::GetScriptOrigin() const {
 }
 
 v8::Local<Value> Message::GetScriptResourceName() const {
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(Utils::OpenHandle(this)->GetIsolate());
   return GetScriptOrigin().ResourceName();
 }
 
@@ -2931,6 +3035,7 @@ int Message::GetEndPosition() const {
 
 int Message::ErrorLevel() const {
   auto self = Utils::OpenHandle(this);
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(self->GetIsolate());
   return self->error_level();
 }
 
@@ -3056,6 +3161,7 @@ int StackFrame::GetScriptId() const {
 Local<String> StackFrame::GetScriptName() const {
   auto self = Utils::OpenHandle(this);
   i::Isolate* isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
   i::Handle<i::Object> name = i::StackTraceFrame::GetFileName(self);
   return name->IsString()
@@ -3066,6 +3172,7 @@ Local<String> StackFrame::GetScriptName() const {
 Local<String> StackFrame::GetScriptNameOrSourceURL() const {
   auto self = Utils::OpenHandle(this);
   i::Isolate* isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
   i::Handle<i::Object> name =
       i::StackTraceFrame::GetScriptNameOrSourceUrl(self);
@@ -3077,6 +3184,7 @@ Local<String> StackFrame::GetScriptNameOrSourceURL() const {
 Local<String> StackFrame::GetFunctionName() const {
   auto self = Utils::OpenHandle(this);
   i::Isolate* isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
   i::Handle<i::Object> name = i::StackTraceFrame::GetFunctionName(self);
   return name->IsString()
@@ -3166,11 +3274,11 @@ void* ValueSerializer::Delegate::ReallocateBufferMemory(void* old_buffer,
                                                         size_t size,
                                                         size_t* actual_size) {
   *actual_size = size;
-  return realloc(old_buffer, size);
+  return base::Realloc(old_buffer, size);
 }
 
 void ValueSerializer::Delegate::FreeBufferMemory(void* buffer) {
-  return free(buffer);
+  return base::Free(buffer);
 }
 
 struct ValueSerializer::PrivateData {
@@ -3476,6 +3584,7 @@ VALUE_IS_SPECIFIC_TYPE(SymbolObject, SymbolWrapper)
 VALUE_IS_SPECIFIC_TYPE(Date, JSDate)
 VALUE_IS_SPECIFIC_TYPE(Map, JSMap)
 VALUE_IS_SPECIFIC_TYPE(Set, JSSet)
+VALUE_IS_SPECIFIC_TYPE(WasmMemoryObject, WasmMemoryObject)
 VALUE_IS_SPECIFIC_TYPE(WasmModuleObject, WasmModuleObject)
 VALUE_IS_SPECIFIC_TYPE(WeakMap, JSWeakMap)
 VALUE_IS_SPECIFIC_TYPE(WeakSet, JSWeakSet)
@@ -3493,6 +3602,7 @@ bool Value::IsExternal() const {
   // and GetIsolate will work.
   if (heap_obj->map().instance_type() != i::JS_OBJECT_TYPE) return false;
   i::Isolate* isolate = i::JSObject::cast(*heap_obj).GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   return heap_obj->IsExternal(isolate);
 }
 
@@ -3536,6 +3646,7 @@ bool Value::IsGeneratorFunction() const {
   i::Handle<i::Object> obj = Utils::OpenHandle(this);
   if (!obj->IsJSFunction()) return false;
   i::Handle<i::JSFunction> func = i::Handle<i::JSFunction>::cast(obj);
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(func->GetIsolate());
   return i::IsGeneratorFunction(func->shared().kind());
 }
 
@@ -3607,6 +3718,7 @@ bool Value::BooleanValue(Isolate* v8_isolate) const {
 
 Local<Boolean> Value::ToBoolean(Isolate* v8_isolate) const {
   auto isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   return ToApiHandle<Boolean>(
       isolate->factory()->ToBoolean(BooleanValue(v8_isolate)));
 }
@@ -3698,23 +3810,23 @@ void v8::Function::CheckCast(Value* that) {
                   "Value is not a Function");
 }
 
-void v8::Boolean::CheckCast(v8::Value* that) {
+void v8::Boolean::CheckCast(v8::Data* that) {
   i::Handle<i::Object> obj = Utils::OpenHandle(that);
   Utils::ApiCheck(obj->IsBoolean(), "v8::Boolean::Cast",
                   "Value is not a Boolean");
 }
 
-void v8::Name::CheckCast(v8::Value* that) {
+void v8::Name::CheckCast(v8::Data* that) {
   i::Handle<i::Object> obj = Utils::OpenHandle(that);
   Utils::ApiCheck(obj->IsName(), "v8::Name::Cast", "Value is not a Name");
 }
 
-void v8::String::CheckCast(v8::Value* that) {
+void v8::String::CheckCast(v8::Data* that) {
   i::Handle<i::Object> obj = Utils::OpenHandle(that);
   Utils::ApiCheck(obj->IsString(), "v8::String::Cast", "Value is not a String");
 }
 
-void v8::Symbol::CheckCast(v8::Value* that) {
+void v8::Symbol::CheckCast(v8::Data* that) {
   i::Handle<i::Object> obj = Utils::OpenHandle(that);
   Utils::ApiCheck(obj->IsSymbol(), "v8::Symbol::Cast", "Value is not a Symbol");
 }
@@ -3726,35 +3838,41 @@ void v8::Private::CheckCast(v8::Data* that) {
       "v8::Private::Cast", "Value is not a Private");
 }
 
+void v8::ModuleRequest::CheckCast(v8::Data* that) {
+  i::Handle<i::Object> obj = Utils::OpenHandle(that);
+  Utils::ApiCheck(obj->IsModuleRequest(), "v8::ModuleRequest::Cast",
+                  "Value is not a ModuleRequest");
+}
+
 void v8::Module::CheckCast(v8::Data* that) {
   i::Handle<i::Object> obj = Utils::OpenHandle(that);
   Utils::ApiCheck(obj->IsModule(), "v8::Module::Cast", "Value is not a Module");
 }
 
-void v8::Number::CheckCast(v8::Value* that) {
+void v8::Number::CheckCast(v8::Data* that) {
   i::Handle<i::Object> obj = Utils::OpenHandle(that);
   Utils::ApiCheck(obj->IsNumber(), "v8::Number::Cast()",
                   "Value is not a Number");
 }
 
-void v8::Integer::CheckCast(v8::Value* that) {
+void v8::Integer::CheckCast(v8::Data* that) {
   i::Handle<i::Object> obj = Utils::OpenHandle(that);
   Utils::ApiCheck(obj->IsNumber(), "v8::Integer::Cast",
                   "Value is not an Integer");
 }
 
-void v8::Int32::CheckCast(v8::Value* that) {
-  Utils::ApiCheck(that->IsInt32(), "v8::Int32::Cast",
+void v8::Int32::CheckCast(v8::Data* that) {
+  Utils::ApiCheck(Value::Cast(that)->IsInt32(), "v8::Int32::Cast",
                   "Value is not a 32-bit signed integer");
 }
 
-void v8::Uint32::CheckCast(v8::Value* that) {
-  Utils::ApiCheck(that->IsUint32(), "v8::Uint32::Cast",
+void v8::Uint32::CheckCast(v8::Data* that) {
+  Utils::ApiCheck(Value::Cast(that)->IsUint32(), "v8::Uint32::Cast",
                   "Value is not a 32-bit unsigned integer");
 }
 
-void v8::BigInt::CheckCast(v8::Value* that) {
-  Utils::ApiCheck(that->IsBigInt(), "v8::BigInt::Cast",
+void v8::BigInt::CheckCast(v8::Data* that) {
+  Utils::ApiCheck(Value::Cast(that)->IsBigInt(), "v8::BigInt::Cast",
                   "Value is not a BigInt");
 }
 
@@ -3787,6 +3905,11 @@ void v8::Proxy::CheckCast(Value* that) {
   Utils::ApiCheck(that->IsProxy(), "v8::Proxy::Cast", "Value is not a Proxy");
 }
 
+void v8::WasmMemoryObject::CheckCast(Value* that) {
+  Utils::ApiCheck(that->IsWasmMemoryObject(), "v8::WasmMemoryObject::Cast",
+                  "Value is not a WasmMemoryObject");
+}
+
 void v8::WasmModuleObject::CheckCast(Value* that) {
   Utils::ApiCheck(that->IsWasmModuleObject(), "v8::WasmModuleObject::Cast",
                   "Value is not a WasmModuleObject");
@@ -3798,12 +3921,6 @@ void v8::debug::AccessorPair::CheckCast(Value* that) {
                   "Value is not a debug::AccessorPair");
 }
 
-void v8::debug::WasmValue::CheckCast(Value* that) {
-  i::Handle<i::Object> obj = Utils::OpenHandle(that);
-  Utils::ApiCheck(obj->IsWasmValue(), "v8::WasmValue::Cast",
-                  "Value is not a debug::WasmValue");
-}
-
 v8::BackingStore::~BackingStore() {
   auto i_this = reinterpret_cast<const i::BackingStore*>(this);
   i_this->~BackingStore();  // manually call internal destructor
@@ -4033,9 +4150,13 @@ MaybeLocal<Uint32> Value::ToArrayIndex(Local<Context> context) const {
 
 Maybe<bool> Value::Equals(Local<Context> context, Local<Value> that) const {
   i::Isolate* isolate = Utils::OpenHandle(*context)->GetIsolate();
+  ENTER_V8(isolate, context, Value, Equals, Nothing<bool>(), i::HandleScope);
   auto self = Utils::OpenHandle(this);
   auto other = Utils::OpenHandle(*that);
-  return i::Object::Equals(isolate, self, other);
+  Maybe<bool> result = i::Object::Equals(isolate, self, other);
+  has_pending_exception = result.IsNothing();
+  RETURN_ON_FAILED_EXECUTION_PRIMITIVE(bool);
+  return result;
 }
 
 bool Value::StrictEquals(Local<Value> that) const {
@@ -4840,9 +4961,10 @@ Local<v8::Context> v8::Object::CreationContext() {
 }
 
 int v8::Object::GetIdentityHash() {
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   auto self = Utils::OpenHandle(this);
   auto isolate = self->GetIsolate();
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::HandleScope scope(isolate);
   return self->GetOrCreateIdentityHash(isolate).value();
 }
@@ -4997,6 +5119,7 @@ void Function::SetName(v8::Local<v8::String> name) {
   auto self = Utils::OpenHandle(this);
   if (!self->IsJSFunction()) return;
   auto func = i::Handle<i::JSFunction>::cast(self);
+  ASSERT_NO_SCRIPT_NO_EXCEPTION(func->GetIsolate());
   func->shared().SetName(*Utils::OpenHandle(*name));
 }
 
@@ -5061,9 +5184,7 @@ Local<Value> Function::GetDisplayName() const {
 
 ScriptOrigin Function::GetScriptOrigin() const {
   auto self = Utils::OpenHandle(this);
-  if (!self->IsJSFunction()) {
-    return v8::ScriptOrigin(Local<Value>());
-  }
+  if (!self->IsJSFunction()) return v8::ScriptOrigin(Local<Value>());
   auto func = i::Handle<i::JSFunction>::cast(self);
   if (func->shared().script().IsScript()) {
     i::Handle<i::Script> script(i::Script::cast(func->shared().script()),
@@ -5142,7 +5263,7 @@ MaybeLocal<String> v8::Function::FunctionProtoToString(Local<Context> context) {
 
 int Name::GetIdentityHash() {
   auto self = Utils::OpenHandle(this);
-  return static_cast<int>(self->Hash());
+  return static_cast<int>(self->EnsureHash());
 }
 
 int String::Length() const {
@@ -5180,6 +5301,9 @@ static inline const uint16_t* Align(const uint16_t* chars) {
 class ContainsOnlyOneByteHelper {
  public:
   ContainsOnlyOneByteHelper() : is_one_byte_(true) {}
+  ContainsOnlyOneByteHelper(const ContainsOnlyOneByteHelper&) = delete;
+  ContainsOnlyOneByteHelper& operator=(const ContainsOnlyOneByteHelper&) =
+      delete;
   bool Check(i::String string) {
     i::ConsString cons_string = i::String::VisitFlat(this, string, 0);
     if (cons_string.is_null()) return is_one_byte_;
@@ -5260,7 +5384,6 @@ class ContainsOnlyOneByteHelper {
     return is_one_byte_;
   }
   bool is_one_byte_;
-  DISALLOW_COPY_AND_ASSIGN(ContainsOnlyOneByteHelper);
 };
 
 bool String::ContainsOnlyOneByte() const {
@@ -5275,7 +5398,7 @@ int String::Utf8Length(Isolate* isolate) const {
   str = i::String::Flatten(reinterpret_cast<i::Isolate*>(isolate), str);
   int length = str->length();
   if (length == 0) return 0;
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::String::FlatContent flat = str->GetFlatContent(no_gc);
   DCHECK(flat.IsFlat());
   int utf8_length = 0;
@@ -5337,7 +5460,7 @@ static int WriteUtf8Impl(i::Vector<const Char> string, char* write_start,
       for (int i = read_index; i < up_to; i++) char_mask |= read_start[i];
       if ((char_mask & 0x80) == 0) {
         int copy_length = up_to - read_index;
-        memcpy(current_write, read_start + read_index, copy_length);
+        base::Memcpy(current_write, read_start + read_index, copy_length);
         current_write += copy_length;
         read_index = up_to;
       } else {
@@ -5429,7 +5552,7 @@ int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity,
   LOG_API(isolate, String, WriteUtf8);
   ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   str = i::String::Flatten(isolate, str);
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::String::FlatContent content = str->GetFlatContent(no_gc);
   if (content.IsOneByte()) {
     return WriteUtf8Impl<uint8_t>(content.ToOneByteVector(), buffer, capacity,
@@ -5472,10 +5595,6 @@ int String::Write(Isolate* isolate, uint16_t* buffer, int start, int length,
                      start, length, options);
 }
 
-bool v8::String::IsExternal() const {
-  return IsExternalTwoByte();
-}
-
 bool v8::String::IsExternalTwoByte() const {
   i::Handle<i::String> str = Utils::OpenHandle(this);
   return i::StringShape(*str).IsExternalTwoByte();
@@ -5488,7 +5607,7 @@ bool v8::String::IsExternalOneByte() const {
 
 void v8::String::VerifyExternalStringResource(
     v8::String::ExternalStringResource* value) const {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   i::String str = *Utils::OpenHandle(this);
   const v8::String::ExternalStringResource* expected;
 
@@ -5507,7 +5626,7 @@ void v8::String::VerifyExternalStringResource(
 
 void v8::String::VerifyExternalStringResourceBase(
     v8::String::ExternalStringResourceBase* value, Encoding encoding) const {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   i::String str = *Utils::OpenHandle(this);
   const v8::String::ExternalStringResourceBase* expected;
   Encoding expectedEncoding;
@@ -5534,7 +5653,7 @@ void v8::String::VerifyExternalStringResourceBase(
 }
 
 String::ExternalStringResource* String::GetExternalStringResourceSlow() const {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   using I = internal::Internals;
   i::String str = *Utils::OpenHandle(this);
 
@@ -5554,7 +5673,7 @@ String::ExternalStringResource* String::GetExternalStringResourceSlow() const {
 
 String::ExternalStringResourceBase* String::GetExternalStringResourceBaseSlow(
     String::Encoding* encoding_out) const {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   using I = internal::Internals;
   ExternalStringResourceBase* resource = nullptr;
   i::String str = *Utils::OpenHandle(this);
@@ -5579,7 +5698,7 @@ String::ExternalStringResourceBase* String::GetExternalStringResourceBaseSlow(
 
 const v8::String::ExternalOneByteStringResource*
 v8::String::GetExternalOneByteStringResource() const {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   i::String str = *Utils::OpenHandle(this);
   if (i::StringShape(str).IsExternalOneByte()) {
     return i::ExternalOneByteString::cast(str).resource();
@@ -5709,7 +5828,7 @@ void v8::Object::SetAlignedPointerInInternalFields(int argc, int indices[],
                                                    void* values[]) {
   i::Handle<i::JSReceiver> obj = Utils::OpenHandle(this);
   const char* location = "v8::Object::SetAlignedPointerInInternalFields()";
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::JSObject js_obj = i::JSObject::cast(*obj);
   int nof_embedder_fields = js_obj.GetEmbedderFieldCount();
   for (int i = 0; i < argc; i++) {
@@ -5893,6 +6012,7 @@ void V8::GetSharedMemoryStatistics(SharedMemoryStatistics* statistics) {
 
 void V8::SetIsCrossOriginIsolated() {
   i::FLAG_harmony_sharedarraybuffer = true;
+  i::FLAG_experimental_wasm_threads = true;
 }
 
 template <typename ObjectType>
@@ -6535,7 +6655,7 @@ MaybeLocal<String> v8::String::NewExternalOneByte(
 }
 
 bool v8::String::MakeExternal(v8::String::ExternalStringResource* resource) {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
 
   i::String obj = *Utils::OpenHandle(this);
 
@@ -6562,7 +6682,7 @@ bool v8::String::MakeExternal(v8::String::ExternalStringResource* resource) {
 
 bool v8::String::MakeExternal(
     v8::String::ExternalOneByteStringResource* resource) {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
 
   i::String obj = *Utils::OpenHandle(this);
 
@@ -6587,7 +6707,7 @@ bool v8::String::MakeExternal(
 }
 
 bool v8::String::CanMakeExternal() {
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   i::String obj = *Utils::OpenHandle(this);
 
   if (obj.IsThinString()) {
@@ -6622,27 +6742,27 @@ Local<v8::Object> v8::Object::New(Isolate* isolate) {
   return Utils::ToLocal(obj);
 }
 
-Local<v8::Object> v8::Object::New(Isolate* isolate,
-                                  Local<Value> prototype_or_null,
-                                  Local<Name>* names, Local<Value>* values,
-                                  size_t length) {
-  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
-  i::Handle<i::Object> proto = Utils::OpenHandle(*prototype_or_null);
-  if (!Utils::ApiCheck(proto->IsNull() || proto->IsJSReceiver(),
-                       "v8::Object::New", "prototype must be null or object")) {
-    return Local<v8::Object>();
-  }
-  LOG_API(i_isolate, Object, New);
-  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate);
+namespace {
 
-  // We assume that this API is mostly used to create objects with named
-  // properties, and so we default to creating a properties backing store
-  // large enough to hold all of them, while we start with no elements
-  // (see http://bit.ly/v8-fast-object-create-cpp for the motivation).
-  i::Handle<i::NameDictionary> properties =
-      i::NameDictionary::New(i_isolate, static_cast<int>(length));
-  i::Handle<i::FixedArrayBase> elements =
-      i_isolate->factory()->empty_fixed_array();
+// TODO(v8:7569): This is a workaround for the Handle vs MaybeHandle difference
+// in the return types of the different Add functions:
+// OrderedNameDictionary::Add returns MaybeHandle, NameDictionary::Add returns
+// Handle.
+template <typename T>
+i::Handle<T> ToHandle(i::Handle<T> h) {
+  return h;
+}
+template <typename T>
+i::Handle<T> ToHandle(i::MaybeHandle<T> h) {
+  return h.ToHandleChecked();
+}
+
+template <typename Dictionary>
+void AddPropertiesAndElementsToObject(i::Isolate* i_isolate,
+                                      i::Handle<Dictionary>& properties,
+                                      i::Handle<i::FixedArrayBase>& elements,
+                                      Local<Name>* names, Local<Value>* values,
+                                      size_t length) {
   for (size_t i = 0; i < length; ++i) {
     i::Handle<i::Name> name = Utils::OpenHandle(*names[i]);
     i::Handle<i::Object> value = Utils::OpenHandle(*values[i]);
@@ -6667,18 +6787,58 @@ Local<v8::Object> v8::Object::New(Isolate* isolate,
       i::InternalIndex const entry = properties->FindEntry(i_isolate, name);
       if (entry.is_not_found()) {
         // Add the {name}/{value} pair as a new entry.
-        properties = i::NameDictionary::Add(i_isolate, properties, name, value,
-                                            i::PropertyDetails::Empty());
+        properties = ToHandle(Dictionary::Add(
+            i_isolate, properties, name, value, i::PropertyDetails::Empty()));
       } else {
         // Overwrite the {entry} with the {value}.
         properties->ValueAtPut(entry, *value);
       }
     }
   }
-  i::Handle<i::JSObject> obj =
-      i_isolate->factory()->NewSlowJSObjectWithPropertiesAndElements(
-          i::Handle<i::HeapObject>::cast(proto), properties, elements);
-  return Utils::ToLocal(obj);
+}
+
+}  // namespace
+
+Local<v8::Object> v8::Object::New(Isolate* isolate,
+                                  Local<Value> prototype_or_null,
+                                  Local<Name>* names, Local<Value>* values,
+                                  size_t length) {
+  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+  i::Handle<i::Object> proto = Utils::OpenHandle(*prototype_or_null);
+  if (!Utils::ApiCheck(proto->IsNull() || proto->IsJSReceiver(),
+                       "v8::Object::New", "prototype must be null or object")) {
+    return Local<v8::Object>();
+  }
+  LOG_API(i_isolate, Object, New);
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate);
+
+  i::Handle<i::FixedArrayBase> elements =
+      i_isolate->factory()->empty_fixed_array();
+
+  // We assume that this API is mostly used to create objects with named
+  // properties, and so we default to creating a properties backing store
+  // large enough to hold all of them, while we start with no elements
+  // (see http://bit.ly/v8-fast-object-create-cpp for the motivation).
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    i::Handle<i::OrderedNameDictionary> properties =
+        i::OrderedNameDictionary::Allocate(i_isolate, static_cast<int>(length))
+            .ToHandleChecked();
+    AddPropertiesAndElementsToObject(i_isolate, properties, elements, names,
+                                     values, length);
+    i::Handle<i::JSObject> obj =
+        i_isolate->factory()->NewSlowJSObjectWithPropertiesAndElements(
+            i::Handle<i::HeapObject>::cast(proto), properties, elements);
+    return Utils::ToLocal(obj);
+  } else {
+    i::Handle<i::NameDictionary> properties =
+        i::NameDictionary::New(i_isolate, static_cast<int>(length));
+    AddPropertiesAndElementsToObject(i_isolate, properties, elements, names,
+                                     values, length);
+    i::Handle<i::JSObject> obj =
+        i_isolate->factory()->NewSlowJSObjectWithPropertiesAndElements(
+            i::Handle<i::HeapObject>::cast(proto), properties, elements);
+    return Utils::ToLocal(obj);
+  }
 }
 
 Local<v8::Value> v8::NumberObject::New(Isolate* isolate, double value) {
@@ -7032,7 +7192,7 @@ i::Handle<i::JSArray> MapAsArray(i::Isolate* isolate, i::Object table_obj,
   i::Handle<i::FixedArray> result = factory->NewFixedArray(max_length);
   int result_index = 0;
   {
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     i::Oddball the_hole = i::ReadOnlyRoots(isolate).the_hole_value();
     for (int i = offset; i < capacity; ++i) {
       i::InternalIndex entry(i);
@@ -7136,7 +7296,7 @@ i::Handle<i::JSArray> SetAsArray(i::Isolate* isolate, i::Object table_obj,
   i::Handle<i::FixedArray> result = factory->NewFixedArray(max_length);
   int result_index = 0;
   {
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     i::Oddball the_hole = i::ReadOnlyRoots(isolate).the_hole_value();
     for (int i = offset; i < capacity; ++i) {
       i::InternalIndex entry(i);
@@ -7217,10 +7377,14 @@ MaybeLocal<Promise> Promise::Catch(Local<Context> context,
                                    Local<Function> handler) {
   PREPARE_FOR_EXECUTION(context, Promise, Catch, Promise);
   auto self = Utils::OpenHandle(this);
-  i::Handle<i::Object> argv[] = {Utils::OpenHandle(*handler)};
+  i::Handle<i::Object> argv[] = {isolate->factory()->undefined_value(),
+                                 Utils::OpenHandle(*handler)};
   i::Handle<i::Object> result;
+  // Do not call the built-in Promise.prototype.catch!
+  // v8::Promise should not call out to a monkeypatched Promise.prototype.then
+  // as the implementation of Promise.prototype.catch does.
   has_pending_exception =
-      !i::Execution::CallBuiltin(isolate, isolate->promise_catch(), self,
+      !i::Execution::CallBuiltin(isolate, isolate->promise_then(), self,
                                  arraysize(argv), argv)
            .ToHandle(&result);
   RETURN_ON_FAILED_EXECUTION(Promise);
@@ -7350,6 +7514,12 @@ MemorySpan<const uint8_t> CompiledWasmModule::GetWireBytesRef() {
   return {bytes_vec.begin(), bytes_vec.size()};
 }
 
+Local<ArrayBuffer> v8::WasmMemoryObject::Buffer() {
+  i::Handle<i::WasmMemoryObject> obj = Utils::OpenHandle(this);
+  i::Handle<i::JSArrayBuffer> buffer(obj->array_buffer(), obj->GetIsolate());
+  return Utils::ToLocal(buffer);
+}
+
 CompiledWasmModule WasmModuleObject::GetCompiledModule() {
   i::Handle<i::WasmModuleObject> obj =
       i::Handle<i::WasmModuleObject>::cast(Utils::OpenHandle(this));
@@ -7394,7 +7564,7 @@ void* v8::ArrayBuffer::Allocator::Reallocate(void* data, size_t old_length,
       reinterpret_cast<uint8_t*>(AllocateUninitialized(new_length));
   if (new_data == nullptr) return nullptr;
   size_t bytes_to_copy = std::min(old_length, new_length);
-  memcpy(new_data, data, bytes_to_copy);
+  base::Memcpy(new_data, data, bytes_to_copy);
   if (new_length > bytes_to_copy) {
     memset(new_data + bytes_to_copy, 0, new_length - bytes_to_copy);
   }
@@ -7690,7 +7860,7 @@ size_t v8::ArrayBufferView::CopyContents(void* dest, size_t byte_length) {
   size_t byte_offset = self->byte_offset();
   size_t bytes_to_copy = std::min(byte_length, self->byte_length());
   if (bytes_to_copy) {
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     i::Isolate* isolate = self->GetIsolate();
     i::Handle<i::JSArrayBuffer> buffer(i::JSArrayBuffer::cast(self->buffer()),
                                        isolate);
@@ -7701,7 +7871,7 @@ size_t v8::ArrayBufferView::CopyContents(void* dest, size_t byte_length) {
                                              isolate);
       source = reinterpret_cast<char*>(typed_array->DataPtr());
     }
-    memcpy(dest, source + byte_offset, bytes_to_copy);
+    base::Memcpy(dest, source + byte_offset, bytes_to_copy);
   }
   return bytes_to_copy;
 }
@@ -8185,14 +8355,6 @@ v8::Local<v8::Context> Isolate::GetCurrentContext() {
   return Utils::ToLocal(i::Handle<i::Context>(native_context, isolate));
 }
 
-v8::Local<v8::Context> Isolate::GetEnteredContext() {
-  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-  i::Handle<i::Object> last =
-      isolate->handle_scope_implementer()->LastEnteredContext();
-  if (last.is_null()) return Local<Context>();
-  return Utils::ToLocal(i::Handle<i::Context>::cast(last));
-}
-
 v8::Local<v8::Context> Isolate::GetEnteredOrMicrotaskContext() {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
   i::Handle<i::Object> last =
@@ -8280,6 +8442,11 @@ EmbedderHeapTracer* Isolate::GetEmbedderHeapTracer() {
   return isolate->heap()->GetEmbedderHeapTracer();
 }
 
+CppHeap* Isolate::GetCppHeap() const {
+  const i::Isolate* isolate = reinterpret_cast<const i::Isolate*>(this);
+  return isolate->heap()->cpp_heap();
+}
+
 void Isolate::SetGetExternallyAllocatedMemoryInBytesCallback(
     GetExternallyAllocatedMemoryInBytesCallback callback) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
@@ -8336,6 +8503,10 @@ Isolate* Isolate::Allocate() {
   return reinterpret_cast<Isolate*>(i::Isolate::New());
 }
 
+Isolate::CreateParams::CreateParams() = default;
+
+Isolate::CreateParams::~CreateParams() = default;
+
 // static
 // This is separate so that tests can provide a different |isolate|.
 void Isolate::Initialize(Isolate* isolate,
@@ -8382,7 +8553,13 @@ void Isolate::Initialize(Isolate* isolate,
   i_isolate->set_api_external_references(params.external_references);
   i_isolate->set_allow_atomics_wait(params.allow_atomics_wait);
 
+  i_isolate->set_supported_import_assertions(
+      params.supported_import_assertions);
+
   i_isolate->heap()->ConfigureHeap(params.constraints);
+  if (params.cpp_heap_params) {
+    i_isolate->heap()->ConfigureCppHeap(params.cpp_heap_params);
+  }
   if (params.constraints.stack_limit() != nullptr) {
     uintptr_t limit =
         reinterpret_cast<uintptr_t>(params.constraints.stack_limit());
@@ -8752,6 +8929,14 @@ size_t Isolate::NumberOfPhantomHandleResetsSinceLastCall() {
 
 int64_t Isolate::AdjustAmountOfExternalAllocatedMemory(
     int64_t change_in_bytes) {
+  // Try to check for unreasonably large or small values from the embedder.
+  const int64_t kMaxReasonableBytes = int64_t(1) << 60;
+  const int64_t kMinReasonableBytes = -kMaxReasonableBytes;
+  STATIC_ASSERT(kMaxReasonableBytes >= i::JSArrayBuffer::kMaxByteLength);
+
+  CHECK(kMinReasonableBytes <= change_in_bytes &&
+        change_in_bytes < kMaxReasonableBytes);
+
   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(this);
   int64_t amount = i_isolate->heap()->update_external_memory(change_in_bytes);
 
@@ -8846,23 +9031,6 @@ MicrotasksPolicy Isolate::GetMicrotasksPolicy() const {
   return isolate->default_microtask_queue()->microtasks_policy();
 }
 
-namespace {
-
-void MicrotasksCompletedCallbackAdapter(v8::Isolate* isolate, void* data) {
-  auto callback = reinterpret_cast<void (*)(v8::Isolate*)>(data);
-  callback(isolate);
-}
-
-}  // namespace
-
-void Isolate::AddMicrotasksCompletedCallback(
-    MicrotasksCompletedCallback callback) {
-  DCHECK(callback);
-  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-  isolate->default_microtask_queue()->AddMicrotasksCompletedCallback(
-      &MicrotasksCompletedCallbackAdapter, reinterpret_cast<void*>(callback));
-}
-
 void Isolate::AddMicrotasksCompletedCallback(
     MicrotasksCompletedCallbackWithData callback, void* data) {
   DCHECK(callback);
@@ -8871,13 +9039,6 @@ void Isolate::AddMicrotasksCompletedCallback(
                                                                      data);
 }
 
-void Isolate::RemoveMicrotasksCompletedCallback(
-    MicrotasksCompletedCallback callback) {
-  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-  isolate->default_microtask_queue()->RemoveMicrotasksCompletedCallback(
-      &MicrotasksCompletedCallbackAdapter, reinterpret_cast<void*>(callback));
-}
-
 void Isolate::RemoveMicrotasksCompletedCallback(
     MicrotasksCompletedCallbackWithData callback, void* data) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
@@ -9076,11 +9237,6 @@ size_t Isolate::CopyCodePages(size_t capacity, MemoryRange* code_pages_out) {
 
 CALLBACK_SETTER(FatalErrorHandler, FatalErrorCallback, exception_behavior)
 CALLBACK_SETTER(OOMErrorHandler, OOMErrorCallback, oom_behavior)
-CALLBACK_SETTER(AllowCodeGenerationFromStringsCallback,
-                AllowCodeGenerationFromStringsCallback, allow_code_gen_callback)
-CALLBACK_SETTER(ModifyCodeGenerationFromStringsCallback,
-                ModifyCodeGenerationFromStringsCallback,
-                modify_code_gen_callback)
 CALLBACK_SETTER(ModifyCodeGenerationFromStringsCallback,
                 ModifyCodeGenerationFromStringsCallback2,
                 modify_code_gen_callback2)
@@ -9153,7 +9309,7 @@ void Isolate::RemoveMessageListeners(MessageCallback that) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
   ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::HandleScope scope(isolate);
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::TemplateList listeners = isolate->heap()->message_listeners();
   for (int i = 0; i < listeners.length(); i++) {
     if (listeners.get(i).IsUndefined(isolate)) continue;  // skip deleted ones
@@ -9190,13 +9346,13 @@ bool Isolate::IsInUse() {
 
 void Isolate::VisitHandlesWithClassIds(PersistentHandleVisitor* visitor) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   isolate->global_handles()->IterateAllRootsWithClassIds(visitor);
 }
 
 void Isolate::VisitWeakHandles(PersistentHandleVisitor* visitor) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   isolate->global_handles()->IterateYoungWeakRootsWithClassIds(visitor);
 }
 
@@ -9605,10 +9761,13 @@ void debug::SetTerminateOnResume(Isolate* v8_isolate) {
   isolate->debug()->SetTerminateOnResume();
 }
 
-bool debug::AllFramesOnStackAreBlackboxed(Isolate* v8_isolate) {
+bool debug::CanBreakProgram(Isolate* v8_isolate) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
   ENTER_V8_DO_NOT_USE(isolate);
-  return isolate->debug()->AllFramesOnStackAreBlackboxed();
+  // We cannot break a program if we are currently running a regexp.
+  // TODO(yangguo): fix this exception.
+  return !isolate->regexp_stack()->is_in_use() &&
+         isolate->debug()->AllFramesOnStackAreBlackboxed();
 }
 
 v8::Isolate* debug::Script::GetIsolate() const {
@@ -9910,7 +10069,7 @@ MemorySpan<const char> debug::WasmScript::ExternalSymbolsURL() const {
 }
 
 int debug::WasmScript::NumFunctions() const {
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::Handle<i::Script> script = Utils::OpenHandle(this);
   DCHECK_EQ(i::Script::TYPE_WASM, script->type());
   i::wasm::NativeModule* native_module = script->wasm_native_module();
@@ -9920,7 +10079,7 @@ int debug::WasmScript::NumFunctions() const {
 }
 
 int debug::WasmScript::NumImportedFunctions() const {
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::Handle<i::Script> script = Utils::OpenHandle(this);
   DCHECK_EQ(i::Script::TYPE_WASM, script->type());
   i::wasm::NativeModule* native_module = script->wasm_native_module();
@@ -9938,7 +10097,7 @@ MemorySpan<const uint8_t> debug::WasmScript::Bytecode() const {
 
 std::pair<int, int> debug::WasmScript::GetFunctionRange(
     int function_index) const {
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::Handle<i::Script> script = Utils::OpenHandle(this);
   DCHECK_EQ(i::Script::TYPE_WASM, script->type());
   i::wasm::NativeModule* native_module = script->wasm_native_module();
@@ -9953,7 +10112,7 @@ std::pair<int, int> debug::WasmScript::GetFunctionRange(
 }
 
 int debug::WasmScript::GetContainingFunction(int byte_offset) const {
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::Handle<i::Script> script = Utils::OpenHandle(this);
   DCHECK_EQ(i::Script::TYPE_WASM, script->type());
   i::wasm::NativeModule* native_module = script->wasm_native_module();
@@ -9964,7 +10123,7 @@ int debug::WasmScript::GetContainingFunction(int byte_offset) const {
 }
 
 uint32_t debug::WasmScript::GetFunctionHash(int function_index) {
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::Handle<i::Script> script = Utils::OpenHandle(this);
   DCHECK_EQ(i::Script::TYPE_WASM, script->type());
   i::wasm::NativeModule* native_module = script->wasm_native_module();
@@ -10019,7 +10178,7 @@ void debug::GetLoadedScripts(v8::Isolate* v8_isolate,
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
   ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   {
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     i::Script::Iterator iterator(isolate);
     for (i::Script script = iterator.Next(); !script.is_null();
          script = iterator.Next()) {
@@ -10082,7 +10241,7 @@ void debug::ResetBlackboxedStateCache(Isolate* v8_isolate,
                                       v8::Local<debug::Script> script) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
   ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   i::SharedFunctionInfo::ScriptIterator iter(isolate,
                                              *Utils::OpenHandle(*script));
   for (i::SharedFunctionInfo info = iter.Next(); !info.is_null();
@@ -10146,19 +10305,20 @@ Local<Function> debug::GetBuiltin(Isolate* v8_isolate, Builtin builtin) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
   ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
   i::HandleScope handle_scope(isolate);
-  i::Builtins::Name builtin_id;
-  switch (builtin) {
-    case kStringToLowerCase:
-      builtin_id = i::Builtins::kStringPrototypeToLocaleLowerCase;
-      break;
-    default:
-      UNREACHABLE();
-  }
 
+  CHECK_EQ(builtin, kStringToLowerCase);
+  i::Builtins::Name builtin_id = i::Builtins::kStringPrototypeToLocaleLowerCase;
+
+  i::Factory* factory = isolate->factory();
   i::Handle<i::String> name = isolate->factory()->empty_string();
-  i::NewFunctionArgs args = i::NewFunctionArgs::ForBuiltinWithoutPrototype(
-      name, builtin_id, i::LanguageMode::kStrict);
-  i::Handle<i::JSFunction> fun = isolate->factory()->NewFunction(args);
+  i::Handle<i::NativeContext> context(isolate->native_context());
+  i::Handle<i::SharedFunctionInfo> info =
+      factory->NewSharedFunctionInfoForBuiltin(name, builtin_id);
+  info->set_language_mode(i::LanguageMode::kStrict);
+  i::Handle<i::JSFunction> fun =
+      i::Factory::JSFunctionBuilder{isolate, info, context}
+          .set_map(isolate->strict_function_without_prototype_map())
+          .Build();
 
   fun->shared().set_internal_formal_parameter_count(0);
   fun->shared().set_length(0);
@@ -10524,52 +10684,6 @@ bool debug::AccessorPair::IsAccessorPair(Local<Value> that) {
   return obj->IsAccessorPair();
 }
 
-int debug::WasmValue::value_type() {
-  i::Handle<i::WasmValue> obj = Utils::OpenHandle(this);
-  return obj->value_type();
-}
-
-v8::Local<v8::Array> debug::WasmValue::bytes() {
-  i::Handle<i::WasmValue> obj = Utils::OpenHandle(this);
-  DCHECK(i::wasm::ValueType::Kind::kI32 == obj->value_type() ||
-         i::wasm::ValueType::Kind::kI64 == obj->value_type() ||
-         i::wasm::ValueType::Kind::kF32 == obj->value_type() ||
-         i::wasm::ValueType::Kind::kF64 == obj->value_type() ||
-         i::wasm::ValueType::Kind::kS128 == obj->value_type());
-
-  i::Isolate* isolate = obj->GetIsolate();
-  i::Handle<i::Object> bytes_or_ref(obj->bytes_or_ref(), isolate);
-  i::Handle<i::ByteArray> bytes(i::Handle<i::ByteArray>::cast(bytes_or_ref));
-
-  int length = bytes->length();
-
-  i::Handle<i::FixedArray> fa = isolate->factory()->NewFixedArray(length);
-  i::Handle<i::JSArray> arr = obj->GetIsolate()->factory()->NewJSArray(
-      i::PACKED_SMI_ELEMENTS, length, length);
-  i::JSArray::SetContent(arr, fa);
-
-  for (int i = 0; i < length; i++) {
-    fa->set(i, i::Smi::FromInt(bytes->get(i)));
-  }
-
-  return Utils::ToLocal(arr);
-}
-
-v8::Local<v8::Value> debug::WasmValue::ref() {
-  i::Handle<i::WasmValue> obj = Utils::OpenHandle(this);
-  DCHECK_EQ(i::wasm::HeapType::kExtern, obj->value_type());
-
-  i::Isolate* isolate = obj->GetIsolate();
-  i::Handle<i::Object> bytes_or_ref(obj->bytes_or_ref(), isolate);
-
-  return Utils::ToLocal(bytes_or_ref);
-}
-
-bool debug::WasmValue::IsWasmValue(Local<Value> that) {
-  i::Handle<i::Object> obj = Utils::OpenHandle(*that);
-  return obj->IsWasmValue();
-}
-
 MaybeLocal<Message> debug::GetMessageFromPromise(Local<Promise> p) {
   i::Handle<i::JSPromise> promise = Utils::OpenHandle(*p);
   i::Isolate* isolate = promise->GetIsolate();
@@ -11133,7 +11247,7 @@ void EmbedderHeapTracer::RegisterEmbedderReference(
 void EmbedderHeapTracer::IterateTracedGlobalHandles(
     TracedGlobalHandleVisitor* visitor) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(isolate_);
-  i::DisallowHeapAllocation no_allocation;
+  i::DisallowGarbageCollection no_gc;
   isolate->global_handles()->IterateTracedNodes(visitor);
 }
 
diff --git a/deps/v8/src/api/api.h b/deps/v8/src/api/api.h
index 6c0ea8faea2ee7..bf9afb7959fd06 100644
--- a/deps/v8/src/api/api.h
+++ b/deps/v8/src/api/api.h
@@ -33,7 +33,6 @@ namespace debug {
 class AccessorPair;
 class GeneratorObject;
 class Script;
-class WasmValue;
 class WeakMap;
 }  // namespace debug
 
@@ -129,12 +128,14 @@ class RegisteredExtension {
   V(debug::Script, Script)                     \
   V(debug::WeakMap, JSWeakMap)                 \
   V(debug::AccessorPair, AccessorPair)         \
-  V(debug::WasmValue, WasmValue)               \
   V(Promise, JSPromise)                        \
   V(Primitive, Object)                         \
   V(PrimitiveArray, FixedArray)                \
   V(BigInt, BigInt)                            \
-  V(ScriptOrModule, Script)
+  V(ScriptOrModule, Script)                    \
+  V(FixedArray, FixedArray)                    \
+  V(ModuleRequest, ModuleRequest)              \
+  V(WasmMemoryObject, WasmMemoryObject)
 
 class Utils {
  public:
@@ -240,7 +241,9 @@ class Utils {
       v8::internal::Handle<v8::internal::JSReceiver> obj);
   static inline Local<Primitive> ToLocalPrimitive(
       v8::internal::Handle<v8::internal::Object> obj);
-  static inline Local<PrimitiveArray> ToLocal(
+  static inline Local<FixedArray> FixedArrayToLocal(
+      v8::internal::Handle<v8::internal::FixedArray> obj);
+  static inline Local<PrimitiveArray> PrimitiveArrayToLocal(
       v8::internal::Handle<v8::internal::FixedArray> obj);
   static inline Local<ScriptOrModule> ScriptOrModuleToLocal(
       v8::internal::Handle<v8::internal::Script> obj);
@@ -315,7 +318,7 @@ class PersistentHandles;
 // data.
 class HandleScopeImplementer {
  public:
-  class EnteredContextRewindScope {
+  class V8_NODISCARD EnteredContextRewindScope {
    public:
     explicit EnteredContextRewindScope(HandleScopeImplementer* hsi)
         : hsi_(hsi), saved_entered_context_count_(hsi->EnteredContextCount()) {}
@@ -338,6 +341,9 @@ class HandleScopeImplementer {
 
   ~HandleScopeImplementer() { DeleteArray(spare_); }
 
+  HandleScopeImplementer(const HandleScopeImplementer&) = delete;
+  HandleScopeImplementer& operator=(const HandleScopeImplementer&) = delete;
+
   // Threading support for handle data.
   static int ArchiveSpacePerThread();
   char* RestoreThread(char* from);
@@ -434,8 +440,6 @@ class HandleScopeImplementer {
 
   friend class HandleScopeImplementerOffsets;
   friend class PersistentHandlesScope;
-
-  DISALLOW_COPY_AND_ASSIGN(HandleScopeImplementer);
 };
 
 const int kHandleBlockSize = v8::internal::KB - 2;  // fit in one page
diff --git a/deps/v8/src/asmjs/asm-js.cc b/deps/v8/src/asmjs/asm-js.cc
index 2553ecb91927ba..6467c40834b5f7 100644
--- a/deps/v8/src/asmjs/asm-js.cc
+++ b/deps/v8/src/asmjs/asm-js.cc
@@ -196,6 +196,9 @@ class AsmJsCompilationJob final : public UnoptimizedCompilationJob {
         compile_time_(0),
         module_source_size_(0) {}
 
+  AsmJsCompilationJob(const AsmJsCompilationJob&) = delete;
+  AsmJsCompilationJob& operator=(const AsmJsCompilationJob&) = delete;
+
  protected:
   Status ExecuteJobImpl() final;
   Status FinalizeJobImpl(Handle<SharedFunctionInfo> shared_info,
@@ -217,8 +220,6 @@ class AsmJsCompilationJob final : public UnoptimizedCompilationJob {
 
   double compile_time_;     // Time (milliseconds) taken to execute step [2].
   int module_source_size_;  // Module source size in bytes.
-
-  DISALLOW_COPY_AND_ASSIGN(AsmJsCompilationJob);
 };
 
 UnoptimizedCompilationJob::Status AsmJsCompilationJob::ExecuteJobImpl() {
diff --git a/deps/v8/src/asmjs/asm-parser.cc b/deps/v8/src/asmjs/asm-parser.cc
index 42179bace1cc45..18035cf1fdd43e 100644
--- a/deps/v8/src/asmjs/asm-parser.cc
+++ b/deps/v8/src/asmjs/asm-parser.cc
@@ -179,7 +179,7 @@ bool AsmJsParser::Run() {
   return !failed_;
 }
 
-class AsmJsParser::TemporaryVariableScope {
+class V8_NODISCARD AsmJsParser::TemporaryVariableScope {
  public:
   explicit TemporaryVariableScope(AsmJsParser* parser) : parser_(parser) {
     local_depth_ = parser_->function_temp_locals_depth_;
diff --git a/deps/v8/src/asmjs/asm-types.h b/deps/v8/src/asmjs/asm-types.h
index 9f6390c1a9d8da..253bad4eeb65bd 100644
--- a/deps/v8/src/asmjs/asm-types.h
+++ b/deps/v8/src/asmjs/asm-types.h
@@ -101,6 +101,9 @@ class AsmValueType {
 
 class V8_EXPORT_PRIVATE AsmCallableType : public NON_EXPORTED_BASE(ZoneObject) {
  public:
+  AsmCallableType(const AsmCallableType&) = delete;
+  AsmCallableType& operator=(const AsmCallableType&) = delete;
+
   virtual std::string Name() = 0;
 
   virtual bool CanBeInvokedWith(AsmType* return_type,
@@ -118,12 +121,13 @@ class V8_EXPORT_PRIVATE AsmCallableType : public NON_EXPORTED_BASE(ZoneObject) {
 
  private:
   friend class AsmType;
-
-  DISALLOW_COPY_AND_ASSIGN(AsmCallableType);
 };
 
 class V8_EXPORT_PRIVATE AsmFunctionType final : public AsmCallableType {
  public:
+  AsmFunctionType(const AsmFunctionType&) = delete;
+  AsmFunctionType& operator=(const AsmFunctionType&) = delete;
+
   AsmFunctionType* AsFunctionType() final { return this; }
 
   void AddArgument(AsmType* type) { args_.push_back(type); }
@@ -146,8 +150,6 @@ class V8_EXPORT_PRIVATE AsmFunctionType final : public AsmCallableType {
 
   AsmType* return_type_;
   ZoneVector<AsmType*> args_;
-
-  DISALLOW_COPY_AND_ASSIGN(AsmFunctionType);
 };
 
 class V8_EXPORT_PRIVATE AsmOverloadedFunctionType final
diff --git a/deps/v8/src/ast/ast-function-literal-id-reindexer.h b/deps/v8/src/ast/ast-function-literal-id-reindexer.h
index f4dac7b01e6fc1..2c1eb108afda74 100644
--- a/deps/v8/src/ast/ast-function-literal-id-reindexer.h
+++ b/deps/v8/src/ast/ast-function-literal-id-reindexer.h
@@ -21,6 +21,9 @@ class AstFunctionLiteralIdReindexer final
     : public AstTraversalVisitor<AstFunctionLiteralIdReindexer> {
  public:
   AstFunctionLiteralIdReindexer(size_t stack_limit, int delta);
+  AstFunctionLiteralIdReindexer(const AstFunctionLiteralIdReindexer&) = delete;
+  AstFunctionLiteralIdReindexer& operator=(
+      const AstFunctionLiteralIdReindexer&) = delete;
   ~AstFunctionLiteralIdReindexer();
 
   void Reindex(Expression* pattern);
@@ -42,8 +45,6 @@ class AstFunctionLiteralIdReindexer final
 #else
   void CheckVisited(Expression* expr) {}
 #endif
-
-  DISALLOW_COPY_AND_ASSIGN(AstFunctionLiteralIdReindexer);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/ast/ast-source-ranges.h b/deps/v8/src/ast/ast-source-ranges.h
index 1e96ec4c27c58b..1b42a055dd642d 100644
--- a/deps/v8/src/ast/ast-source-ranges.h
+++ b/deps/v8/src/ast/ast-source-ranges.h
@@ -47,7 +47,6 @@ struct SourceRange {
   V(Block)                       \
   V(CaseClause)                  \
   V(Conditional)                 \
-  V(Expression)                  \
   V(FunctionLiteral)             \
   V(IfStatement)                 \
   V(IterationStatement)          \
@@ -282,24 +281,6 @@ class NaryOperationSourceRanges final : public AstNodeSourceRanges {
   ZoneVector<SourceRange> ranges_;
 };
 
-class ExpressionSourceRanges final : public AstNodeSourceRanges {
- public:
-  explicit ExpressionSourceRanges(const SourceRange& right_range)
-      : right_range_(right_range) {}
-
-  SourceRange GetRange(SourceRangeKind kind) override {
-    DCHECK(HasRange(kind));
-    return right_range_;
-  }
-
-  bool HasRange(SourceRangeKind kind) override {
-    return kind == SourceRangeKind::kRight;
-  }
-
- private:
-  SourceRange right_range_;
-};
-
 class SuspendSourceRanges final : public ContinuationSourceRanges {
  public:
   explicit SuspendSourceRanges(int32_t continuation_position)
diff --git a/deps/v8/src/ast/ast-traversal-visitor.h b/deps/v8/src/ast/ast-traversal-visitor.h
index 8a1f8b2f16ebc1..c80b29975b9df3 100644
--- a/deps/v8/src/ast/ast-traversal-visitor.h
+++ b/deps/v8/src/ast/ast-traversal-visitor.h
@@ -30,6 +30,8 @@ class AstTraversalVisitor : public AstVisitor<Subclass> {
  public:
   explicit AstTraversalVisitor(Isolate* isolate, AstNode* root = nullptr);
   explicit AstTraversalVisitor(uintptr_t stack_limit, AstNode* root = nullptr);
+  AstTraversalVisitor(const AstTraversalVisitor&) = delete;
+  AstTraversalVisitor& operator=(const AstTraversalVisitor&) = delete;
 
   void Run() {
     DCHECK_NOT_NULL(root_);
@@ -56,8 +58,6 @@ class AstTraversalVisitor : public AstVisitor<Subclass> {
 
   AstNode* root_;
   int depth_;
-
-  DISALLOW_COPY_AND_ASSIGN(AstTraversalVisitor);
 };
 
 // ----------------------------------------------------------------------------
@@ -536,7 +536,10 @@ template <class Subclass>
 void AstTraversalVisitor<Subclass>::VisitImportCallExpression(
     ImportCallExpression* expr) {
   PROCESS_EXPRESSION(expr);
-  RECURSE_EXPRESSION(Visit(expr->argument()));
+  RECURSE_EXPRESSION(Visit(expr->specifier()));
+  if (expr->import_assertions()) {
+    RECURSE_EXPRESSION(Visit(expr->import_assertions()));
+  }
 }
 
 template <class Subclass>
diff --git a/deps/v8/src/ast/ast-value-factory.cc b/deps/v8/src/ast/ast-value-factory.cc
index b5a39b22cf3b9d..6e454b22f1ded5 100644
--- a/deps/v8/src/ast/ast-value-factory.cc
+++ b/deps/v8/src/ast/ast-value-factory.cc
@@ -29,6 +29,7 @@
 
 #include "src/base/hashmap-entry.h"
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/heap/factory-inl.h"
 #include "src/heap/local-factory-inl.h"
@@ -66,10 +67,10 @@ void AstRawString::Internalize(LocalIsolate* isolate) {
   if (literal_bytes_.length() == 0) {
     set_string(isolate->factory()->empty_string());
   } else if (is_one_byte()) {
-    OneByteStringKey key(hash_field_, literal_bytes_);
+    OneByteStringKey key(raw_hash_field_, literal_bytes_);
     set_string(isolate->factory()->InternalizeStringWithKey(&key));
   } else {
-    TwoByteStringKey key(hash_field_,
+    TwoByteStringKey key(raw_hash_field_,
                          Vector<const uint16_t>::cast(literal_bytes_));
     set_string(isolate->factory()->InternalizeStringWithKey(&key));
   }
@@ -83,9 +84,9 @@ template EXPORT_TEMPLATE_DEFINE(
 bool AstRawString::AsArrayIndex(uint32_t* index) const {
   // The StringHasher will set up the hash. Bail out early if we know it
   // can't be convertible to an array index.
-  if ((hash_field_ & Name::kIsNotIntegerIndexMask) != 0) return false;
+  if ((raw_hash_field_ & Name::kIsNotIntegerIndexMask) != 0) return false;
   if (length() <= Name::kMaxCachedArrayIndexLength) {
-    *index = Name::ArrayIndexValueBits::decode(hash_field_);
+    *index = Name::ArrayIndexValueBits::decode(raw_hash_field_);
     return true;
   }
   // Might be an index, but too big to cache it. Do the slow conversion. This
@@ -96,7 +97,7 @@ bool AstRawString::AsArrayIndex(uint32_t* index) const {
 }
 
 bool AstRawString::IsIntegerIndex() const {
-  return (hash_field_ & Name::kIsNotIntegerIndexMask) == 0;
+  return (raw_hash_field_ & Name::kIsNotIntegerIndexMask) == 0;
 }
 
 bool AstRawString::IsOneByteEqualTo(const char* data) const {
@@ -115,7 +116,7 @@ uint16_t AstRawString::FirstCharacter() const {
   return *c;
 }
 
-bool AstRawString::Compare(const AstRawString* lhs, const AstRawString* rhs) {
+bool AstRawString::Equal(const AstRawString* lhs, const AstRawString* rhs) {
   DCHECK_EQ(lhs->Hash(), rhs->Hash());
 
   if (lhs->length() != rhs->length()) return false;
@@ -125,27 +126,65 @@ bool AstRawString::Compare(const AstRawString* lhs, const AstRawString* rhs) {
   size_t length = rhs->length();
   if (lhs->is_one_byte()) {
     if (rhs->is_one_byte()) {
-      return CompareCharsUnsigned(reinterpret_cast<const uint8_t*>(l),
-                                  reinterpret_cast<const uint8_t*>(r),
-                                  length) == 0;
+      return CompareCharsEqualUnsigned(reinterpret_cast<const uint8_t*>(l),
+                                       reinterpret_cast<const uint8_t*>(r),
+                                       length);
     } else {
-      return CompareCharsUnsigned(reinterpret_cast<const uint8_t*>(l),
-                                  reinterpret_cast<const uint16_t*>(r),
-                                  length) == 0;
+      return CompareCharsEqualUnsigned(reinterpret_cast<const uint8_t*>(l),
+                                       reinterpret_cast<const uint16_t*>(r),
+                                       length);
     }
   } else {
     if (rhs->is_one_byte()) {
-      return CompareCharsUnsigned(reinterpret_cast<const uint16_t*>(l),
-                                  reinterpret_cast<const uint8_t*>(r),
-                                  length) == 0;
+      return CompareCharsEqualUnsigned(reinterpret_cast<const uint16_t*>(l),
+                                       reinterpret_cast<const uint8_t*>(r),
+                                       length);
     } else {
-      return CompareCharsUnsigned(reinterpret_cast<const uint16_t*>(l),
-                                  reinterpret_cast<const uint16_t*>(r),
-                                  length) == 0;
+      return CompareCharsEqualUnsigned(reinterpret_cast<const uint16_t*>(l),
+                                       reinterpret_cast<const uint16_t*>(r),
+                                       length);
     }
   }
 }
 
+int AstRawString::Compare(const AstRawString* lhs, const AstRawString* rhs) {
+  // Fast path for equal pointers.
+  if (lhs == rhs) return 0;
+
+  const unsigned char* lhs_data = lhs->raw_data();
+  const unsigned char* rhs_data = rhs->raw_data();
+  size_t length = std::min(lhs->length(), rhs->length());
+
+  // Code point order by contents.
+  if (lhs->is_one_byte()) {
+    if (rhs->is_one_byte()) {
+      if (int result = CompareCharsUnsigned(
+              reinterpret_cast<const uint8_t*>(lhs_data),
+              reinterpret_cast<const uint8_t*>(rhs_data), length))
+        return result;
+    } else {
+      if (int result = CompareCharsUnsigned(
+              reinterpret_cast<const uint8_t*>(lhs_data),
+              reinterpret_cast<const uint16_t*>(rhs_data), length))
+        return result;
+    }
+  } else {
+    if (rhs->is_one_byte()) {
+      if (int result = CompareCharsUnsigned(
+              reinterpret_cast<const uint16_t*>(lhs_data),
+              reinterpret_cast<const uint8_t*>(rhs_data), length))
+        return result;
+    } else {
+      if (int result = CompareCharsUnsigned(
+              reinterpret_cast<const uint16_t*>(lhs_data),
+              reinterpret_cast<const uint16_t*>(rhs_data), length))
+        return result;
+    }
+  }
+
+  return lhs->byte_length() - rhs->byte_length();
+}
+
 template <typename LocalIsolate>
 Handle<String> AstConsString::Allocate(LocalIsolate* isolate) const {
   DCHECK(string_.is_null());
@@ -193,7 +232,7 @@ Handle<String> AstConsString::AllocateFlat(LocalIsolate* isolate) const {
         isolate->factory()
             ->NewRawOneByteString(result_length, AllocationType::kOld)
             .ToHandleChecked();
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     uint8_t* dest =
         result->GetChars(no_gc, SharedStringAccessGuardIfNeeded::NotNeeded()) +
         result_length;
@@ -212,7 +251,7 @@ Handle<String> AstConsString::AllocateFlat(LocalIsolate* isolate) const {
       isolate->factory()
           ->NewRawTwoByteString(result_length, AllocationType::kOld)
           .ToHandleChecked();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   uint16_t* dest =
       result->GetChars(no_gc, SharedStringAccessGuardIfNeeded::NotNeeded()) +
       result_length;
@@ -257,18 +296,18 @@ AstStringConstants::AstStringConstants(Isolate* isolate, uint64_t hash_seed)
       string_table_(),
       hash_seed_(hash_seed) {
   DCHECK_EQ(ThreadId::Current(), isolate->thread_id());
-#define F(name, str)                                                      \
-  {                                                                       \
-    const char* data = str;                                               \
-    Vector<const uint8_t> literal(reinterpret_cast<const uint8_t*>(data), \
-                                  static_cast<int>(strlen(data)));        \
-    uint32_t hash_field = StringHasher::HashSequentialString<uint8_t>(    \
-        literal.begin(), literal.length(), hash_seed_);                   \
-    name##_string_ = zone_.New<AstRawString>(true, literal, hash_field);  \
-    /* The Handle returned by the factory is located on the roots */      \
-    /* array, not on the temporary HandleScope, so this is safe.  */      \
-    name##_string_->set_string(isolate->factory()->name##_string());      \
-    string_table_.InsertNew(name##_string_, name##_string_->Hash());      \
+#define F(name, str)                                                         \
+  {                                                                          \
+    const char* data = str;                                                  \
+    Vector<const uint8_t> literal(reinterpret_cast<const uint8_t*>(data),    \
+                                  static_cast<int>(strlen(data)));           \
+    uint32_t raw_hash_field = StringHasher::HashSequentialString<uint8_t>(   \
+        literal.begin(), literal.length(), hash_seed_);                      \
+    name##_string_ = zone_.New<AstRawString>(true, literal, raw_hash_field); \
+    /* The Handle returned by the factory is located on the roots */         \
+    /* array, not on the temporary HandleScope, so this is safe.  */         \
+    name##_string_->set_string(isolate->factory()->name##_string());         \
+    string_table_.InsertNew(name##_string_, name##_string_->Hash());         \
   }
   AST_STRING_CONSTANTS(F)
 #undef F
@@ -279,27 +318,27 @@ const AstRawString* AstValueFactory::GetOneByteStringInternal(
   if (literal.length() == 1 && literal[0] < kMaxOneCharStringValue) {
     int key = literal[0];
     if (V8_UNLIKELY(one_character_strings_[key] == nullptr)) {
-      uint32_t hash_field = StringHasher::HashSequentialString<uint8_t>(
+      uint32_t raw_hash_field = StringHasher::HashSequentialString<uint8_t>(
           literal.begin(), literal.length(), hash_seed_);
-      one_character_strings_[key] = GetString(hash_field, true, literal);
+      one_character_strings_[key] = GetString(raw_hash_field, true, literal);
     }
     return one_character_strings_[key];
   }
-  uint32_t hash_field = StringHasher::HashSequentialString<uint8_t>(
+  uint32_t raw_hash_field = StringHasher::HashSequentialString<uint8_t>(
       literal.begin(), literal.length(), hash_seed_);
-  return GetString(hash_field, true, literal);
+  return GetString(raw_hash_field, true, literal);
 }
 
 const AstRawString* AstValueFactory::GetTwoByteStringInternal(
     Vector<const uint16_t> literal) {
-  uint32_t hash_field = StringHasher::HashSequentialString<uint16_t>(
+  uint32_t raw_hash_field = StringHasher::HashSequentialString<uint16_t>(
       literal.begin(), literal.length(), hash_seed_);
-  return GetString(hash_field, false, Vector<const byte>::cast(literal));
+  return GetString(raw_hash_field, false, Vector<const byte>::cast(literal));
 }
 
 const AstRawString* AstValueFactory::GetString(Handle<String> literal) {
   const AstRawString* result = nullptr;
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   String::FlatContent content = literal->GetFlatContent(no_gc);
   if (content.IsOneByte()) {
     result = GetOneByteStringInternal(content.ToOneByteVector());
@@ -313,7 +352,7 @@ const AstRawString* AstValueFactory::GetString(Handle<String> literal) {
 const AstRawString* AstValueFactory::CloneFromOtherFactory(
     const AstRawString* raw_string) {
   const AstRawString* result = GetString(
-      raw_string->hash_field(), raw_string->is_one_byte(),
+      raw_string->raw_hash_field(), raw_string->is_one_byte(),
       Vector<const byte>(raw_string->raw_data(), raw_string->byte_length()));
   return result;
 }
@@ -352,22 +391,23 @@ template EXPORT_TEMPLATE_DEFINE(
     V8_EXPORT_PRIVATE) void AstValueFactory::Internalize(LocalIsolate* isolate);
 
 const AstRawString* AstValueFactory::GetString(
-    uint32_t hash_field, bool is_one_byte, Vector<const byte> literal_bytes) {
+    uint32_t raw_hash_field, bool is_one_byte,
+    Vector<const byte> literal_bytes) {
   // literal_bytes here points to whatever the user passed, and this is OK
   // because we use vector_compare (which checks the contents) to compare
   // against the AstRawStrings which are in the string_table_. We should not
   // return this AstRawString.
-  AstRawString key(is_one_byte, literal_bytes, hash_field);
+  AstRawString key(is_one_byte, literal_bytes, raw_hash_field);
   AstRawStringMap::Entry* entry = string_table_.LookupOrInsert(
       &key, key.Hash(),
       [&]() {
         // Copy literal contents for later comparison.
         int length = literal_bytes.length();
         byte* new_literal_bytes = zone()->NewArray<byte>(length);
-        memcpy(new_literal_bytes, literal_bytes.begin(), length);
+        base::Memcpy(new_literal_bytes, literal_bytes.begin(), length);
         AstRawString* new_string = zone()->New<AstRawString>(
             is_one_byte, Vector<const byte>(new_literal_bytes, length),
-            hash_field);
+            raw_hash_field);
         CHECK_NOT_NULL(new_string);
         AddString(new_string);
         return new_string;
diff --git a/deps/v8/src/ast/ast-value-factory.h b/deps/v8/src/ast/ast-value-factory.h
index 776b45a670e051..115f23ee0db945 100644
--- a/deps/v8/src/ast/ast-value-factory.h
+++ b/deps/v8/src/ast/ast-value-factory.h
@@ -48,7 +48,12 @@ class Isolate;
 
 class AstRawString final : public ZoneObject {
  public:
-  static bool Compare(const AstRawString* a, const AstRawString* b);
+  static bool Equal(const AstRawString* lhs, const AstRawString* rhs);
+
+  // Returns 0 if lhs is equal to rhs.
+  // Returns <0 if lhs is less than rhs in code point order.
+  // Returns >0 if lhs is greater than than rhs in code point order.
+  static int Compare(const AstRawString* lhs, const AstRawString* rhs);
 
   bool IsEmpty() const { return literal_bytes_.length() == 0; }
   int length() const {
@@ -71,8 +76,12 @@ class AstRawString final : public ZoneObject {
   bool IsPrivateName() const { return length() > 0 && FirstCharacter() == '#'; }
 
   // For storing AstRawStrings in a hash map.
-  uint32_t hash_field() const { return hash_field_; }
-  uint32_t Hash() const { return hash_field_ >> Name::kHashShift; }
+  uint32_t raw_hash_field() const { return raw_hash_field_; }
+  uint32_t Hash() const {
+    // Hash field must be computed.
+    DCHECK_EQ(raw_hash_field_ & Name::kHashNotComputedMask, 0);
+    return raw_hash_field_ >> Name::kHashShift;
+  }
 
   // This function can be called after internalizing.
   V8_INLINE Handle<String> string() const {
@@ -88,10 +97,10 @@ class AstRawString final : public ZoneObject {
 
   // Members accessed only by the AstValueFactory & related classes:
   AstRawString(bool is_one_byte, const Vector<const byte>& literal_bytes,
-               uint32_t hash_field)
+               uint32_t raw_hash_field)
       : next_(nullptr),
         literal_bytes_(literal_bytes),
-        hash_field_(hash_field),
+        raw_hash_field_(raw_hash_field),
         is_one_byte_(is_one_byte) {}
   AstRawString* next() {
     DCHECK(!has_string_);
@@ -117,7 +126,7 @@ class AstRawString final : public ZoneObject {
   };
 
   Vector<const byte> literal_bytes_;  // Memory owned by Zone.
-  uint32_t hash_field_;
+  uint32_t raw_hash_field_;
   bool is_one_byte_;
 #ifdef DEBUG
   // (Debug-only:) Verify the object life-cylce: Some functions may only be
@@ -210,7 +219,7 @@ struct AstRawStringMapMatcher {
   bool operator()(uint32_t hash1, uint32_t hash2,
                   const AstRawString* lookup_key,
                   const AstRawString* entry_key) const {
-    return hash1 == hash2 && AstRawString::Compare(lookup_key, entry_key);
+    return hash1 == hash2 && AstRawString::Equal(lookup_key, entry_key);
   }
 };
 
@@ -277,6 +286,8 @@ using AstRawStringMap =
 class AstStringConstants final {
  public:
   AstStringConstants(Isolate* isolate, uint64_t hash_seed);
+  AstStringConstants(const AstStringConstants&) = delete;
+  AstStringConstants& operator=(const AstStringConstants&) = delete;
 
 #define F(name, str) \
   const AstRawString* name##_string() const { return name##_string_; }
@@ -294,8 +305,6 @@ class AstStringConstants final {
 #define F(name, str) AstRawString* name##_string_;
   AST_STRING_CONSTANTS(F)
 #undef F
-
-  DISALLOW_COPY_AND_ASSIGN(AstStringConstants);
 };
 
 class AstValueFactory {
@@ -369,7 +378,7 @@ class AstValueFactory {
   V8_EXPORT_PRIVATE const AstRawString* GetOneByteStringInternal(
       Vector<const uint8_t> literal);
   const AstRawString* GetTwoByteStringInternal(Vector<const uint16_t> literal);
-  const AstRawString* GetString(uint32_t hash, bool is_one_byte,
+  const AstRawString* GetString(uint32_t raw_hash_field, bool is_one_byte,
                                 Vector<const byte> literal_bytes);
 
   // All strings are copied here.
diff --git a/deps/v8/src/ast/ast.cc b/deps/v8/src/ast/ast.cc
index e8c7796abc2b09..835f2f42dece88 100644
--- a/deps/v8/src/ast/ast.cc
+++ b/deps/v8/src/ast/ast.cc
@@ -11,6 +11,7 @@
 #include "src/ast/scopes.h"
 #include "src/base/hashmap.h"
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 #include "src/builtins/builtins-constructor.h"
 #include "src/builtins/builtins.h"
 #include "src/common/assert-scope.h"
@@ -266,7 +267,7 @@ std::unique_ptr<char[]> FunctionLiteral::GetDebugName() const {
     }
   }
   std::unique_ptr<char[]> result(new char[result_vec.size() + 1]);
-  memcpy(result.get(), result_vec.data(), result_vec.size());
+  base::Memcpy(result.get(), result_vec.data(), result_vec.size());
   result[result_vec.size()] = '\0';
   return result;
 }
@@ -654,7 +655,7 @@ void ArrayLiteral::BuildBoilerplateDescription(LocalIsolate* isolate) {
 
       Object boilerplate_value = *GetBoilerplateValue(element, isolate);
       // We shouldn't allocate after creating the boilerplate value.
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
 
       if (boilerplate_value.IsTheHole(isolate)) {
         DCHECK(IsHoleyElementsKind(kind));
diff --git a/deps/v8/src/ast/ast.h b/deps/v8/src/ast/ast.h
index 7b70181e6a0721..3b79dce992aafe 100644
--- a/deps/v8/src/ast/ast.h
+++ b/deps/v8/src/ast/ast.h
@@ -2543,16 +2543,26 @@ class SuperCallReference final : public Expression {
 // import(argument).
 class ImportCallExpression final : public Expression {
  public:
-  Expression* argument() const { return argument_; }
+  Expression* specifier() const { return specifier_; }
+  Expression* import_assertions() const { return import_assertions_; }
 
  private:
   friend class AstNodeFactory;
   friend Zone;
 
-  ImportCallExpression(Expression* argument, int pos)
-      : Expression(pos, kImportCallExpression), argument_(argument) {}
+  ImportCallExpression(Expression* specifier, int pos)
+      : Expression(pos, kImportCallExpression),
+        specifier_(specifier),
+        import_assertions_(nullptr) {}
 
-  Expression* argument_;
+  ImportCallExpression(Expression* specifier, Expression* import_assertions,
+                       int pos)
+      : Expression(pos, kImportCallExpression),
+        specifier_(specifier),
+        import_assertions_(import_assertions) {}
+
+  Expression* specifier_;
+  Expression* import_assertions_;
 };
 
 // This class is produced when parsing the () in arrow functions without any
@@ -3227,8 +3237,15 @@ class AstNodeFactory final {
     return zone_->New<TemplateLiteral>(string_parts, substitutions, pos);
   }
 
-  ImportCallExpression* NewImportCallExpression(Expression* args, int pos) {
-    return zone_->New<ImportCallExpression>(args, pos);
+  ImportCallExpression* NewImportCallExpression(Expression* specifier,
+                                                int pos) {
+    return zone_->New<ImportCallExpression>(specifier, pos);
+  }
+
+  ImportCallExpression* NewImportCallExpression(Expression* specifier,
+                                                Expression* import_assertions,
+                                                int pos) {
+    return zone_->New<ImportCallExpression>(specifier, import_assertions, pos);
   }
 
   InitializeClassMembersStatement* NewInitializeClassMembersStatement(
diff --git a/deps/v8/src/ast/modules.cc b/deps/v8/src/ast/modules.cc
index 3c9a5080adfb3b..162e263e4ddb66 100644
--- a/deps/v8/src/ast/modules.cc
+++ b/deps/v8/src/ast/modules.cc
@@ -16,44 +16,35 @@ namespace internal {
 
 bool SourceTextModuleDescriptor::AstRawStringComparer::operator()(
     const AstRawString* lhs, const AstRawString* rhs) const {
-  return ThreeWayCompare(lhs, rhs) < 0;
-}
-
-int SourceTextModuleDescriptor::AstRawStringComparer::ThreeWayCompare(
-    const AstRawString* lhs, const AstRawString* rhs) {
-  // Fast path for equal pointers: a pointer is not strictly less than itself.
-  if (lhs == rhs) return false;
-
-  // Order by contents (ordering by hash is unstable across runs).
-  if (lhs->is_one_byte() != rhs->is_one_byte()) {
-    return lhs->is_one_byte() ? -1 : 1;
-  }
-  if (lhs->byte_length() != rhs->byte_length()) {
-    return lhs->byte_length() - rhs->byte_length();
-  }
-  return memcmp(lhs->raw_data(), rhs->raw_data(), lhs->byte_length());
+  return AstRawString::Compare(lhs, rhs) < 0;
 }
 
 bool SourceTextModuleDescriptor::ModuleRequestComparer::operator()(
     const AstModuleRequest* lhs, const AstModuleRequest* rhs) const {
-  if (int specifier_comparison = AstRawStringComparer::ThreeWayCompare(
-          lhs->specifier(), rhs->specifier()))
+  if (int specifier_comparison =
+          AstRawString::Compare(lhs->specifier(), rhs->specifier())) {
     return specifier_comparison < 0;
-
-  if (lhs->import_assertions()->size() != rhs->import_assertions()->size())
-    return (lhs->import_assertions()->size() <
-            rhs->import_assertions()->size());
+  }
 
   auto lhsIt = lhs->import_assertions()->cbegin();
   auto rhsIt = rhs->import_assertions()->cbegin();
-  for (; lhsIt != lhs->import_assertions()->cend(); ++lhsIt, ++rhsIt) {
+  for (; lhsIt != lhs->import_assertions()->cend() &&
+         rhsIt != rhs->import_assertions()->cend();
+       ++lhsIt, ++rhsIt) {
     if (int assertion_key_comparison =
-            AstRawStringComparer::ThreeWayCompare(lhsIt->first, rhsIt->first))
+            AstRawString::Compare(lhsIt->first, rhsIt->first)) {
       return assertion_key_comparison < 0;
+    }
 
-    if (int assertion_value_comparison = AstRawStringComparer::ThreeWayCompare(
-            lhsIt->second.first, rhsIt->second.first))
+    if (int assertion_value_comparison =
+            AstRawString::Compare(lhsIt->second.first, rhsIt->second.first)) {
       return assertion_value_comparison < 0;
+    }
+  }
+
+  if (lhs->import_assertions()->size() != rhs->import_assertions()->size()) {
+    return (lhs->import_assertions()->size() <
+            rhs->import_assertions()->size());
   }
 
   return false;
@@ -136,22 +127,62 @@ Handle<PrimitiveHeapObject> ToStringOrUndefined(LocalIsolate* isolate,
 template <typename LocalIsolate>
 Handle<ModuleRequest> SourceTextModuleDescriptor::AstModuleRequest::Serialize(
     LocalIsolate* isolate) const {
-  // The import assertions will be stored in this array in the form:
-  // [key1, value1, location1, key2, value2, location2, ...]
+  // Copy the assertions to a FixedArray, filtering out as we go the import
+  // assertions that are not supported by the embedder.
+  //
+  // This is O(m * n) where m is the number of import assertions in this
+  // request and n is the number of supported assertions.  Both m and n are
+  // expected to be quite small, with m being 0 in the common case and n
+  // currently expected to be at most 1 since "type" is the only import
+  // assertion in use at the time of this writing. So for now we go with
+  // this simple nested loop approach, which should not result in a larger
+  // than necessary performance cost unless more than a few additional
+  // import assertions are standardized.
+  //
+  // The import assertions will be stored in the new array in the form: [key1,
+  // value1, location1, key2, value2, location2, ...].
+  const std::vector<std::string>& supported_assertions =
+      isolate->supported_import_assertions();
   Handle<FixedArray> import_assertions_array =
-      isolate->factory()->NewFixedArray(
-          static_cast<int>(import_assertions()->size() * 3));
-
-  int i = 0;
+      isolate->factory()->NewFixedArray(static_cast<int>(
+          import_assertions()->size() * ModuleRequest::kAssertionEntrySize));
+  int filtered_assertions_index = 0;
   for (auto iter = import_assertions()->cbegin();
-       iter != import_assertions()->cend(); ++iter, i += 3) {
-    import_assertions_array->set(i, *iter->first->string());
-    import_assertions_array->set(i + 1, *iter->second.first->string());
-    import_assertions_array->set(i + 2,
-                                 Smi::FromInt(iter->second.second.beg_pos));
+       iter != import_assertions()->cend(); ++iter) {
+    for (const std::string& supported_assertion : supported_assertions) {
+      Handle<String> assertion_key = iter->first->string();
+      if (assertion_key->IsEqualTo(Vector<const char>(
+              supported_assertion.c_str(), supported_assertion.length()))) {
+        import_assertions_array->set(filtered_assertions_index,
+                                     *iter->first->string());
+        import_assertions_array->set(filtered_assertions_index + 1,
+                                     *iter->second.first->string());
+        import_assertions_array->set(filtered_assertions_index + 2,
+                                     Smi::FromInt(iter->second.second.beg_pos));
+        filtered_assertions_index += ModuleRequest::kAssertionEntrySize;
+        break;
+      }
+    }
   }
+
+  Handle<FixedArray> shortened_import_assertions_array;
+  if (filtered_assertions_index < import_assertions_array->length()) {
+    // If we did filter out any assertions, create a FixedArray with the correct
+    // length. This should be rare, since it would be unexpected for developers
+    // to commonly use unsupported assertions.  Note, we don't use
+    // FixedArray::ShrinkOrEmpty here since FixedArray::Shrink isn't available
+    // on a LocalIsolate/LocalHeap.
+    shortened_import_assertions_array =
+        isolate->factory()->NewFixedArray(filtered_assertions_index);
+    import_assertions_array->CopyTo(0, *shortened_import_assertions_array, 0,
+                                    filtered_assertions_index);
+  } else {
+    shortened_import_assertions_array = import_assertions_array;
+  }
+
   return v8::internal::ModuleRequest::New(isolate, specifier()->string(),
-                                          import_assertions_array);
+                                          shortened_import_assertions_array,
+                                          position());
 }
 template Handle<ModuleRequest>
 SourceTextModuleDescriptor::AstModuleRequest::Serialize(Isolate* isolate) const;
diff --git a/deps/v8/src/ast/modules.h b/deps/v8/src/ast/modules.h
index f156d7a411ac79..f776d2b522631c 100644
--- a/deps/v8/src/ast/modules.h
+++ b/deps/v8/src/ast/modules.h
@@ -5,6 +5,7 @@
 #ifndef V8_AST_MODULES_H_
 #define V8_AST_MODULES_H_
 
+#include "src/parsing/import-assertions.h"
 #include "src/parsing/scanner.h"  // Only for Scanner::Location.
 #include "src/zone/zone-containers.h"
 
@@ -13,6 +14,7 @@ namespace internal {
 
 
 class AstRawString;
+class AstRawStringComparer;
 class ModuleRequest;
 class SourceTextModuleInfo;
 class SourceTextModuleInfoEntry;
@@ -27,10 +29,6 @@ class SourceTextModuleDescriptor : public ZoneObject {
         regular_exports_(zone),
         regular_imports_(zone) {}
 
-  using ImportAssertions =
-      ZoneMap<const AstRawString*,
-              std::pair<const AstRawString*, Scanner::Location>>;
-
   // The following Add* methods are high-level convenience functions for use by
   // the parser.
 
@@ -126,11 +124,13 @@ class SourceTextModuleDescriptor : public ZoneObject {
 
   class AstModuleRequest : public ZoneObject {
    public:
-    // TODO(v8:10958): Consider storing module request location here
-    // instead of using separate ModuleRequestLocation struct.
     AstModuleRequest(const AstRawString* specifier,
-                     const ImportAssertions* import_assertions)
-        : specifier_(specifier), import_assertions_(import_assertions) {}
+                     const ImportAssertions* import_assertions, int position,
+                     int index)
+        : specifier_(specifier),
+          import_assertions_(import_assertions),
+          position_(position),
+          index_(index) {}
 
     template <typename LocalIsolate>
     Handle<v8::internal::ModuleRequest> Serialize(LocalIsolate* isolate) const;
@@ -140,29 +140,25 @@ class SourceTextModuleDescriptor : public ZoneObject {
       return import_assertions_;
     }
 
+    int position() const { return position_; }
+    int index() const { return index_; }
+
    private:
     const AstRawString* specifier_;
     const ImportAssertions* import_assertions_;
-  };
-
-  struct ModuleRequestLocation {
-    // The index at which we will place the request in SourceTextModuleInfo's
-    // module_requests FixedArray.
-    int index;
 
     // The JS source code position of the request, used for reporting errors.
-    int position;
+    int position_;
 
-    ModuleRequestLocation(int index, int position)
-        : index(index), position(position) {}
+    // The index at which we will place the request in SourceTextModuleInfo's
+    // module_requests FixedArray.
+    int index_;
   };
 
   // Custom content-based comparer for the below maps, to keep them stable
   // across parses.
   struct V8_EXPORT_PRIVATE AstRawStringComparer {
     bool operator()(const AstRawString* lhs, const AstRawString* rhs) const;
-    static int ThreeWayCompare(const AstRawString* lhs,
-                               const AstRawString* rhs);
   };
 
   struct V8_EXPORT_PRIVATE ModuleRequestComparer {
@@ -171,8 +167,7 @@ class SourceTextModuleDescriptor : public ZoneObject {
   };
 
   using ModuleRequestMap =
-      ZoneMap<const AstModuleRequest*, ModuleRequestLocation,
-              ModuleRequestComparer>;
+      ZoneSet<const AstModuleRequest*, ModuleRequestComparer>;
   using RegularExportMap =
       ZoneMultimap<const AstRawString*, Entry*, AstRawStringComparer>;
   using RegularImportMap =
@@ -274,12 +269,11 @@ class SourceTextModuleDescriptor : public ZoneObject {
     DCHECK_NOT_NULL(specifier);
     int module_requests_count = static_cast<int>(module_requests_.size());
     auto it = module_requests_
-                  .insert(std::make_pair(
-                      zone->New<AstModuleRequest>(specifier, import_assertions),
-                      ModuleRequestLocation(module_requests_count,
-                                            specifier_loc.beg_pos)))
+                  .insert(zone->New<AstModuleRequest>(
+                      specifier, import_assertions, specifier_loc.beg_pos,
+                      module_requests_count))
                   .first;
-    return it->second.index;
+    return (*it)->index();
   }
 };
 
diff --git a/deps/v8/src/ast/prettyprinter.cc b/deps/v8/src/ast/prettyprinter.cc
index e53d9c9e6e1b1e..595b05701070e3 100644
--- a/deps/v8/src/ast/prettyprinter.cc
+++ b/deps/v8/src/ast/prettyprinter.cc
@@ -551,7 +551,10 @@ void CallPrinter::VisitTemplateLiteral(TemplateLiteral* node) {
 
 void CallPrinter::VisitImportCallExpression(ImportCallExpression* node) {
   Print("ImportCall(");
-  Find(node->argument(), true);
+  Find(node->specifier(), true);
+  if (node->import_assertions()) {
+    Find(node->import_assertions(), true);
+  }
   Print(")");
 }
 
@@ -721,7 +724,7 @@ void AstPrinter::PrintLiteral(const AstConsString* value, bool quote) {
 
 //-----------------------------------------------------------------------------
 
-class IndentedScope {
+class V8_NODISCARD IndentedScope {
  public:
   IndentedScope(AstPrinter* printer, const char* txt)
       : ast_printer_(printer) {
@@ -745,7 +748,6 @@ class IndentedScope {
   AstPrinter* ast_printer_;
 };
 
-
 //-----------------------------------------------------------------------------
 
 AstPrinter::AstPrinter(uintptr_t stack_limit)
@@ -1435,7 +1437,10 @@ void AstPrinter::VisitTemplateLiteral(TemplateLiteral* node) {
 
 void AstPrinter::VisitImportCallExpression(ImportCallExpression* node) {
   IndentedScope indent(this, "IMPORT-CALL", node->position());
-  Visit(node->argument());
+  Visit(node->specifier());
+  if (node->import_assertions()) {
+    Visit(node->import_assertions());
+  }
 }
 
 void AstPrinter::VisitThisExpression(ThisExpression* node) {
diff --git a/deps/v8/src/ast/scopes.cc b/deps/v8/src/ast/scopes.cc
index c9a3b400a70383..2644184a43a2e9 100644
--- a/deps/v8/src/ast/scopes.cc
+++ b/deps/v8/src/ast/scopes.cc
@@ -835,7 +835,7 @@ Variable* Scope::LookupInScopeInfo(const AstRawString* name, Scope* cache) {
       cache != this,
       cache->outer_scope()->deserialized_scope_uses_external_cache());
   DCHECK_NULL(cache->variables_.Lookup(name));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   String name_handle = *name->string();
   ScopeInfo scope_info = *scope_info_;
@@ -2669,7 +2669,7 @@ void ClassScope::MigrateUnresolvedPrivateNameTail(
 Variable* ClassScope::LookupPrivateNameInScopeInfo(const AstRawString* name) {
   DCHECK(!scope_info_.is_null());
   DCHECK_NULL(LookupLocalPrivateName(name));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   String name_handle = *name->string();
   VariableMode mode;
diff --git a/deps/v8/src/base/atomicops_internals_portable.h b/deps/v8/src/base/atomicops_internals_portable.h
index 9abaf17c066b43..ac162e2a8257ca 100644
--- a/deps/v8/src/base/atomicops_internals_portable.h
+++ b/deps/v8/src/base/atomicops_internals_portable.h
@@ -124,6 +124,10 @@ inline void Relaxed_Store(volatile Atomic32* ptr, Atomic32 value) {
   __atomic_store_n(ptr, value, __ATOMIC_RELAXED);
 }
 
+inline void Release_Store(volatile Atomic8* ptr, Atomic8 value) {
+  __atomic_store_n(ptr, value, __ATOMIC_RELEASE);
+}
+
 inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
   __atomic_store_n(ptr, value, __ATOMIC_RELEASE);
 }
@@ -140,6 +144,10 @@ inline Atomic32 Relaxed_Load(volatile const Atomic32* ptr) {
   return __atomic_load_n(ptr, __ATOMIC_RELAXED);
 }
 
+inline Atomic8 Acquire_Load(volatile const Atomic8* ptr) {
+  return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
+}
+
 inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
   return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
 }
diff --git a/deps/v8/src/base/atomicops_internals_std.h b/deps/v8/src/base/atomicops_internals_std.h
index 1b423c842c6cf8..1638b8b52a0b40 100644
--- a/deps/v8/src/base/atomicops_internals_std.h
+++ b/deps/v8/src/base/atomicops_internals_std.h
@@ -114,6 +114,11 @@ inline void Relaxed_Store(volatile Atomic32* ptr, Atomic32 value) {
                              std::memory_order_relaxed);
 }
 
+inline void Release_Store(volatile Atomic8* ptr, Atomic8 value) {
+  std::atomic_store_explicit(helper::to_std_atomic(ptr), value,
+                             std::memory_order_release);
+}
+
 inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
   std::atomic_store_explicit(helper::to_std_atomic(ptr), value,
                              std::memory_order_release);
@@ -134,6 +139,11 @@ inline Atomic32 Relaxed_Load(volatile const Atomic32* ptr) {
                                    std::memory_order_relaxed);
 }
 
+inline Atomic8 Acquire_Load(volatile const Atomic8* ptr) {
+  return std::atomic_load_explicit(helper::to_std_atomic_const(ptr),
+                                   std::memory_order_acquire);
+}
+
 inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
   return std::atomic_load_explicit(helper::to_std_atomic_const(ptr),
                                    std::memory_order_acquire);
diff --git a/deps/v8/src/base/cpu.cc b/deps/v8/src/base/cpu.cc
index c0e9e707aa27bd..45700b707f6c99 100644
--- a/deps/v8/src/base/cpu.cc
+++ b/deps/v8/src/base/cpu.cc
@@ -41,9 +41,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <algorithm>
 
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 #if V8_OS_WIN
 #include "src/base/win32-headers.h"  // NOLINT
 #endif
@@ -164,7 +166,7 @@ static uint32_t ReadELFHWCaps() {
   result = static_cast<uint32_t>(getauxval(AT_HWCAP));
 #else
   // Read the ELF HWCAP flags by parsing /proc/self/auxv.
-  FILE* fp = fopen("/proc/self/auxv", "r");
+  FILE* fp = base::Fopen("/proc/self/auxv", "r");
   if (fp != nullptr) {
     struct {
       uint32_t tag;
@@ -180,7 +182,7 @@ static uint32_t ReadELFHWCaps() {
         break;
       }
     }
-    fclose(fp);
+    base::Fclose(fp);
   }
 #endif
   return result;
@@ -238,7 +240,7 @@ class CPUInfo final {
     // required because files under /proc do not always return a valid size
     // when using fseek(0, SEEK_END) + ftell(). Nor can the be mmap()-ed.
     static const char PATHNAME[] = "/proc/cpuinfo";
-    FILE* fp = fopen(PATHNAME, "r");
+    FILE* fp = base::Fopen(PATHNAME, "r");
     if (fp != nullptr) {
       for (;;) {
         char buffer[256];
@@ -248,12 +250,12 @@ class CPUInfo final {
         }
         datalen_ += n;
       }
-      fclose(fp);
+      base::Fclose(fp);
     }
 
     // Read the contents of the cpuinfo file.
     data_ = new char[datalen_ + 1];
-    fp = fopen(PATHNAME, "r");
+    fp = base::Fopen(PATHNAME, "r");
     if (fp != nullptr) {
       for (size_t offset = 0; offset < datalen_; ) {
         size_t n = fread(data_ + offset, 1, datalen_ - offset, fp);
@@ -262,7 +264,7 @@ class CPUInfo final {
         }
         offset += n;
       }
-      fclose(fp);
+      base::Fclose(fp);
     }
 
     // Zero-terminate the data.
@@ -311,7 +313,7 @@ class CPUInfo final {
     size_t len = q - p;
     char* result = new char[len + 1];
     if (result != nullptr) {
-      memcpy(result, p, len);
+      base::Memcpy(result, p, len);
       result[len] = '\0';
     }
     return result;
@@ -381,6 +383,7 @@ bool CPU::StarboardDetectCPU() {
       has_sse41_ = features.x86.has_sse41;
       has_sahf_ = features.x86.has_sahf;
       has_avx_ = features.x86.has_avx;
+      has_avx2_ = features.x86.has_avx2;
       has_fma3_ = features.x86.has_fma3;
       has_bmi1_ = features.x86.has_bmi1;
       has_bmi2_ = features.x86.has_bmi2;
@@ -425,6 +428,7 @@ CPU::CPU()
       is_atom_(false),
       has_osxsave_(false),
       has_avx_(false),
+      has_avx2_(false),
       has_fma3_(false),
       has_bmi1_(false),
       has_bmi2_(false),
@@ -440,7 +444,7 @@ CPU::CPU()
       is_fp64_mode_(false),
       has_non_stop_time_stamp_counter_(false),
       has_msa_(false) {
-  memcpy(vendor_, "Unknown", 8);
+  base::Memcpy(vendor_, "Unknown", 8);
 
 #if defined(STARBOARD)
   if (StarboardDetectCPU()) {
@@ -461,12 +465,18 @@ CPU::CPU()
   __cpuid(cpu_info, 0);
   unsigned num_ids = cpu_info[0];
   std::swap(cpu_info[2], cpu_info[3]);
-  memcpy(vendor_, cpu_info + 1, 12);
+  base::Memcpy(vendor_, cpu_info + 1, 12);
   vendor_[12] = '\0';
 
   // Interpret CPU feature information.
   if (num_ids > 0) {
     __cpuid(cpu_info, 1);
+
+    int cpu_info7[4] = {0};
+    if (num_ids >= 7) {
+      __cpuid(cpu_info7, 7);
+    }
+
     stepping_ = cpu_info[0] & 0xF;
     model_ = ((cpu_info[0] >> 4) & 0xF) + ((cpu_info[0] >> 12) & 0xF0);
     family_ = (cpu_info[0] >> 8) & 0xF;
@@ -485,6 +495,7 @@ CPU::CPU()
     has_popcnt_ = (cpu_info[2] & 0x00800000) != 0;
     has_osxsave_ = (cpu_info[2] & 0x08000000) != 0;
     has_avx_ = (cpu_info[2] & 0x10000000) != 0;
+    has_avx2_ = (cpu_info7[1] & 0x00000020) != 0;
     has_fma3_ = (cpu_info[2] & 0x00001000) != 0;
 
     if (family_ == 0x6) {
@@ -729,6 +740,9 @@ CPU::CPU()
     has_jscvt_ = HasListItem(features, "jscvt");
     delete[] features;
   }
+#elif V8_OS_MAC
+  // ARM64 Macs always have JSCVT.
+  has_jscvt_ = true;
 #endif  // V8_OS_WIN
 
 #elif V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64
@@ -737,7 +751,7 @@ CPU::CPU()
 #if V8_OS_LINUX
   // Read processor info from /proc/self/auxv.
   char* auxv_cpu_type = nullptr;
-  FILE* fp = fopen("/proc/self/auxv", "r");
+  FILE* fp = base::Fopen("/proc/self/auxv", "r");
   if (fp != nullptr) {
 #if V8_TARGET_ARCH_PPC64
     Elf64_auxv_t entry;
@@ -761,7 +775,7 @@ CPU::CPU()
           break;
       }
     }
-    fclose(fp);
+    base::Fclose(fp);
   }
 
   part_ = -1;
diff --git a/deps/v8/src/base/cpu.h b/deps/v8/src/base/cpu.h
index 8cec23c8e8e4bc..5086584c130020 100644
--- a/deps/v8/src/base/cpu.h
+++ b/deps/v8/src/base/cpu.h
@@ -93,6 +93,7 @@ class V8_BASE_EXPORT CPU final {
   bool has_sse42() const { return has_sse42_; }
   bool has_osxsave() const { return has_osxsave_; }
   bool has_avx() const { return has_avx_; }
+  bool has_avx2() const { return has_avx2_; }
   bool has_fma3() const { return has_fma3_; }
   bool has_bmi1() const { return has_bmi1_; }
   bool has_bmi2() const { return has_bmi2_; }
@@ -143,6 +144,7 @@ class V8_BASE_EXPORT CPU final {
   bool is_atom_;
   bool has_osxsave_;
   bool has_avx_;
+  bool has_avx2_;
   bool has_fma3_;
   bool has_bmi1_;
   bool has_bmi2_;
diff --git a/deps/v8/src/base/file-utils.cc b/deps/v8/src/base/file-utils.cc
index 6e1c4921440f3c..721092e7ddf8ce 100644
--- a/deps/v8/src/base/file-utils.cc
+++ b/deps/v8/src/base/file-utils.cc
@@ -8,6 +8,7 @@
 #include <string.h>
 
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace base {
@@ -21,8 +22,8 @@ std::unique_ptr<char[]> RelativePath(const char* exec_path, const char* name) {
   }
   size_t name_length = strlen(name);
   auto buffer = std::make_unique<char[]>(basename_start + name_length + 1);
-  if (basename_start > 0) memcpy(buffer.get(), exec_path, basename_start);
-  memcpy(buffer.get() + basename_start, name, name_length);
+  if (basename_start > 0) base::Memcpy(buffer.get(), exec_path, basename_start);
+  base::Memcpy(buffer.get() + basename_start, name, name_length);
   return buffer;
 }
 
diff --git a/deps/v8/src/base/free_deleter.h b/deps/v8/src/base/free_deleter.h
index a556926685949d..4f4efcda17ece0 100644
--- a/deps/v8/src/base/free_deleter.h
+++ b/deps/v8/src/base/free_deleter.h
@@ -9,8 +9,11 @@
 #define V8_BASE_FREE_DELETER_H_
 
 #include <stdlib.h>
+
 #include <memory>
 
+#include "src/base/platform/wrappers.h"
+
 namespace v8 {
 namespace base {
 
@@ -20,7 +23,7 @@ namespace base {
 // std::unique_ptr<int, base::FreeDeleter> foo_ptr(
 //     static_cast<int*>(malloc(sizeof(int))));
 struct FreeDeleter {
-  inline void operator()(void* ptr) const { free(ptr); }
+  inline void operator()(void* ptr) const { base::Free(ptr); }
 };
 
 }  // namespace base
diff --git a/deps/v8/src/base/hashmap.h b/deps/v8/src/base/hashmap.h
index c0a7f21bf542c0..179da5ecba6965 100644
--- a/deps/v8/src/base/hashmap.h
+++ b/deps/v8/src/base/hashmap.h
@@ -14,6 +14,7 @@
 #include "src/base/bits.h"
 #include "src/base/hashmap-entry.h"
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace base {
@@ -22,11 +23,11 @@ class DefaultAllocationPolicy {
  public:
   template <typename T, typename TypeTag = T[]>
   V8_INLINE T* NewArray(size_t length) {
-    return static_cast<T*>(malloc(length * sizeof(T)));
+    return static_cast<T*>(base::Malloc(length * sizeof(T)));
   }
   template <typename T, typename TypeTag = T[]>
   V8_INLINE void DeleteArray(T* p, size_t length) {
-    free(p);
+    base::Free(p);
   }
 };
 
@@ -197,7 +198,7 @@ TemplateHashMapImpl<Key, Value, MatchFun, AllocationPolicy>::
   impl_.capacity_ = original->capacity();
   impl_.occupancy_ = original->occupancy();
   impl_.map_ = impl_.allocator().template NewArray<Entry>(capacity());
-  memcpy(impl_.map_, original->impl_.map_, capacity() * sizeof(Entry));
+  base::Memcpy(impl_.map_, original->impl_.map_, capacity() * sizeof(Entry));
 }
 
 template <typename Key, typename Value, typename MatchFun,
diff --git a/deps/v8/src/base/macros.h b/deps/v8/src/base/macros.h
index 8b39da2451f702..9079d156628368 100644
--- a/deps/v8/src/base/macros.h
+++ b/deps/v8/src/base/macros.h
@@ -10,6 +10,7 @@
 
 #include "src/base/compiler-specific.h"
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 
 // No-op macro which is used to work around MSVC's funky VA_ARGS support.
 #define EXPAND(x) x
@@ -104,7 +105,7 @@ V8_INLINE Dest bit_cast(Source const& source) {
   static_assert(sizeof(Dest) == sizeof(Source),
                 "source and dest must be same size");
   Dest dest;
-  memcpy(&dest, &source, sizeof(dest));
+  v8::base::Memcpy(&dest, &source, sizeof(dest));
   return dest;
 }
 
@@ -113,21 +114,13 @@ V8_INLINE Dest bit_cast(Source const& source) {
 // delete the assignment operator instead.
 #define DISALLOW_ASSIGN(TypeName) TypeName& operator=(const TypeName&) = delete
 
-// Explicitly declare the copy constructor and assignment operator as deleted.
-// This also deletes the implicit move constructor and implicit move assignment
-// operator, but still allows to manually define them.
-// Note: This macro is deprecated and will be removed soon. Please explicitly
-// delete the copy constructor and assignment operator instead.
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&) = delete;      \
-  DISALLOW_ASSIGN(TypeName)
-
 // Explicitly declare all implicit constructors as deleted, namely the
 // default constructor, copy constructor and operator= functions.
 // This is especially useful for classes containing only static methods.
 #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
   TypeName() = delete;                           \
-  DISALLOW_COPY_AND_ASSIGN(TypeName)
+  TypeName(const TypeName&) = delete;            \
+  DISALLOW_ASSIGN(TypeName)
 
 // Disallow copying a type, but provide default construction, move construction
 // and move assignment. Especially useful for move-only structs.
@@ -140,7 +133,8 @@ V8_INLINE Dest bit_cast(Source const& source) {
 #define MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR(TypeName)       \
   TypeName(TypeName&&) V8_NOEXCEPT = default;            \
   TypeName& operator=(TypeName&&) V8_NOEXCEPT = default; \
-  DISALLOW_COPY_AND_ASSIGN(TypeName)
+  TypeName(const TypeName&) = delete;                    \
+  DISALLOW_ASSIGN(TypeName)
 
 // A macro to disallow the dynamic allocation.
 // This should be used in the private: declarations for a class
diff --git a/deps/v8/src/base/memory.h b/deps/v8/src/base/memory.h
index e2676a82e77a0f..8da399114f40ba 100644
--- a/deps/v8/src/base/memory.h
+++ b/deps/v8/src/base/memory.h
@@ -6,6 +6,7 @@
 #define V8_BASE_MEMORY_H_
 
 #include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace base {
@@ -31,14 +32,14 @@ template <typename V>
 static inline V ReadUnalignedValue(Address p) {
   ASSERT_TRIVIALLY_COPYABLE(V);
   V r;
-  memcpy(&r, reinterpret_cast<void*>(p), sizeof(V));
+  base::Memcpy(&r, reinterpret_cast<void*>(p), sizeof(V));
   return r;
 }
 
 template <typename V>
 static inline void WriteUnalignedValue(Address p, V value) {
   ASSERT_TRIVIALLY_COPYABLE(V);
-  memcpy(reinterpret_cast<void*>(p), &value, sizeof(V));
+  base::Memcpy(reinterpret_cast<void*>(p), &value, sizeof(V));
 }
 
 template <typename V>
diff --git a/deps/v8/src/base/page-allocator.cc b/deps/v8/src/base/page-allocator.cc
index 9f48ee79fe5424..1dac872449b995 100644
--- a/deps/v8/src/base/page-allocator.cc
+++ b/deps/v8/src/base/page-allocator.cc
@@ -5,6 +5,7 @@
 #include "src/base/page-allocator.h"
 
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 
 #if V8_OS_MACOSX
 #include <sys/mman.h>  // For MAP_JIT.
@@ -108,7 +109,7 @@ PageAllocator::AllocateSharedPages(size_t size, const void* original_address) {
   void* ptr =
       base::OS::AllocateShared(size, base::OS::MemoryPermission::kReadWrite);
   CHECK_NOT_NULL(ptr);
-  memcpy(ptr, original_address, size);
+  base::Memcpy(ptr, original_address, size);
   bool success = base::OS::SetPermissions(
       ptr, size, base::OS::MemoryPermission::kReadWrite);
   CHECK(success);
diff --git a/deps/v8/src/base/platform/mutex.cc b/deps/v8/src/base/platform/mutex.cc
index 40702f493ea445..5a347246a95538 100644
--- a/deps/v8/src/base/platform/mutex.cc
+++ b/deps/v8/src/base/platform/mutex.cc
@@ -6,9 +6,72 @@
 
 #include <errno.h>
 
+#if DEBUG
+#include <unordered_set>
+#endif  // DEBUG
+
 namespace v8 {
 namespace base {
 
+#if DEBUG
+namespace {
+// Used for asserts to guarantee we are not re-locking a mutex on the same
+// thread. If this thread has only one held shared mutex (common case), we use
+// {single_held_shared_mutex}. If it has more than one we allocate a set for it.
+// Said set has to manually be constructed and destroyed.
+thread_local base::SharedMutex* single_held_shared_mutex = nullptr;
+using TSet = std::unordered_set<base::SharedMutex*>;
+thread_local TSet* held_shared_mutexes = nullptr;
+
+// Returns true iff {shared_mutex} is not a held mutex.
+bool SharedMutexNotHeld(SharedMutex* shared_mutex) {
+  DCHECK_NOT_NULL(shared_mutex);
+  return single_held_shared_mutex != shared_mutex &&
+         (!held_shared_mutexes ||
+          held_shared_mutexes->count(shared_mutex) == 0);
+}
+
+// Tries to hold {shared_mutex}. Returns true iff it hadn't been held prior to
+// this function call.
+bool TryHoldSharedMutex(SharedMutex* shared_mutex) {
+  DCHECK_NOT_NULL(shared_mutex);
+  if (single_held_shared_mutex) {
+    if (shared_mutex == single_held_shared_mutex) {
+      return false;
+    }
+    DCHECK_NULL(held_shared_mutexes);
+    held_shared_mutexes = new TSet({single_held_shared_mutex, shared_mutex});
+    single_held_shared_mutex = nullptr;
+    return true;
+  } else if (held_shared_mutexes) {
+    return held_shared_mutexes->insert(shared_mutex).second;
+  } else {
+    DCHECK_NULL(single_held_shared_mutex);
+    single_held_shared_mutex = shared_mutex;
+    return true;
+  }
+}
+
+// Tries to release {shared_mutex}. Returns true iff it had been held prior to
+// this function call.
+bool TryReleaseSharedMutex(SharedMutex* shared_mutex) {
+  DCHECK_NOT_NULL(shared_mutex);
+  if (single_held_shared_mutex == shared_mutex) {
+    single_held_shared_mutex = nullptr;
+    return true;
+  }
+  if (held_shared_mutexes && held_shared_mutexes->erase(shared_mutex)) {
+    if (held_shared_mutexes->empty()) {
+      delete held_shared_mutexes;
+      held_shared_mutexes = nullptr;
+    }
+    return true;
+  }
+  return false;
+}
+}  // namespace
+#endif  // DEBUG
+
 #if V8_OS_POSIX
 
 static V8_INLINE void InitializeNativeHandle(pthread_mutex_t* mutex) {
@@ -164,18 +227,21 @@ SharedMutex::~SharedMutex() {
 }
 
 void SharedMutex::LockShared() {
+  DCHECK(TryHoldSharedMutex(this));
   int result = pthread_rwlock_rdlock(&native_handle_);
   DCHECK_EQ(0, result);
   USE(result);
 }
 
 void SharedMutex::LockExclusive() {
+  DCHECK(TryHoldSharedMutex(this));
   int result = pthread_rwlock_wrlock(&native_handle_);
   DCHECK_EQ(0, result);
   USE(result);
 }
 
 void SharedMutex::UnlockShared() {
+  DCHECK(TryReleaseSharedMutex(this));
   int result = pthread_rwlock_unlock(&native_handle_);
   DCHECK_EQ(0, result);
   USE(result);
@@ -187,11 +253,17 @@ void SharedMutex::UnlockExclusive() {
 }
 
 bool SharedMutex::TryLockShared() {
-  return pthread_rwlock_tryrdlock(&native_handle_) == 0;
+  DCHECK(SharedMutexNotHeld(this));
+  bool result = pthread_rwlock_tryrdlock(&native_handle_) == 0;
+  if (result) DCHECK(TryHoldSharedMutex(this));
+  return result;
 }
 
 bool SharedMutex::TryLockExclusive() {
-  return pthread_rwlock_trywrlock(&native_handle_) == 0;
+  DCHECK(SharedMutexNotHeld(this));
+  bool result = pthread_rwlock_trywrlock(&native_handle_) == 0;
+  if (result) DCHECK(TryHoldSharedMutex(this));
+  return result;
 }
 
 #elif V8_OS_WIN
@@ -276,22 +348,38 @@ SharedMutex::SharedMutex() : native_handle_(SRWLOCK_INIT) {}
 
 SharedMutex::~SharedMutex() {}
 
-void SharedMutex::LockShared() { AcquireSRWLockShared(&native_handle_); }
+void SharedMutex::LockShared() {
+  DCHECK(TryHoldSharedMutex(this));
+  AcquireSRWLockShared(&native_handle_);
+}
 
-void SharedMutex::LockExclusive() { AcquireSRWLockExclusive(&native_handle_); }
+void SharedMutex::LockExclusive() {
+  DCHECK(TryHoldSharedMutex(this));
+  AcquireSRWLockExclusive(&native_handle_);
+}
 
-void SharedMutex::UnlockShared() { ReleaseSRWLockShared(&native_handle_); }
+void SharedMutex::UnlockShared() {
+  DCHECK(TryReleaseSharedMutex(this));
+  ReleaseSRWLockShared(&native_handle_);
+}
 
 void SharedMutex::UnlockExclusive() {
+  DCHECK(TryReleaseSharedMutex(this));
   ReleaseSRWLockExclusive(&native_handle_);
 }
 
 bool SharedMutex::TryLockShared() {
-  return TryAcquireSRWLockShared(&native_handle_);
+  DCHECK(SharedMutexNotHeld(this));
+  bool result = TryAcquireSRWLockShared(&native_handle_);
+  if (result) DCHECK(TryHoldSharedMutex(this));
+  return result;
 }
 
 bool SharedMutex::TryLockExclusive() {
-  return TryAcquireSRWLockExclusive(&native_handle_);
+  DCHECK(SharedMutexNotHeld(this));
+  bool result = TryAcquireSRWLockExclusive(&native_handle_);
+  if (result) DCHECK(TryHoldSharedMutex(this));
+  return result;
 }
 
 #elif V8_OS_STARBOARD
@@ -318,17 +406,35 @@ SharedMutex::SharedMutex() = default;
 
 SharedMutex::~SharedMutex() = default;
 
-void SharedMutex::LockShared() { native_handle_.AcquireReadLock(); }
+void SharedMutex::LockShared() {
+  DCHECK(TryHoldSharedMutex(this));
+  native_handle_.AcquireReadLock();
+}
 
-void SharedMutex::LockExclusive() { native_handle_.AcquireWriteLock(); }
+void SharedMutex::LockExclusive() {
+  DCHECK(TryHoldSharedMutex(this));
+  native_handle_.AcquireWriteLock();
+}
 
-void SharedMutex::UnlockShared() { native_handle_.ReleaseReadLock(); }
+void SharedMutex::UnlockShared() {
+  DCHECK(TryReleaseSharedMutex(this));
+  native_handle_.ReleaseReadLock();
+}
 
-void SharedMutex::UnlockExclusive() { native_handle_.ReleaseWriteLock(); }
+void SharedMutex::UnlockExclusive() {
+  DCHECK(TryReleaseSharedMutex(this));
+  native_handle_.ReleaseWriteLock();
+}
 
-bool SharedMutex::TryLockShared() { return false; }
+bool SharedMutex::TryLockShared() {
+  DCHECK(SharedMutexNotHeld(this));
+  return false;
+}
 
-bool SharedMutex::TryLockExclusive() { return false; }
+bool SharedMutex::TryLockExclusive() {
+  DCHECK(SharedMutexNotHeld(this));
+  return false;
+}
 #endif  // V8_OS_STARBOARD
 
 }  // namespace base
diff --git a/deps/v8/src/base/platform/mutex.h b/deps/v8/src/base/platform/mutex.h
index 1b950c61ad7c03..5685797f4ee9aa 100644
--- a/deps/v8/src/base/platform/mutex.h
+++ b/deps/v8/src/base/platform/mutex.h
@@ -7,6 +7,7 @@
 
 #include "src/base/base-export.h"
 #include "src/base/lazy-instance.h"
+#include "src/base/optional.h"
 #if V8_OS_WIN
 #include "src/base/win32-headers.h"
 #endif
@@ -221,36 +222,43 @@ class V8_BASE_EXPORT SharedMutex final {
   // holding the mutex in exclusive ownership, a call to {LockShared()} will
   // block execution until shared ownership can be acquired.
   // If {LockShared()} is called by a thread that already owns the mutex in any
-  // mode (exclusive or shared), the behavior is undefined.
+  // mode (exclusive or shared), the behavior is undefined and outright fails
+  // with dchecks on.
   void LockShared();
 
   // Locks the SharedMutex. If another thread has already locked the mutex, a
   // call to {LockExclusive()} will block execution until the lock is acquired.
   // If {LockExclusive()} is called by a thread that already owns the mutex in
-  // any mode (shared or exclusive), the behavior is undefined.
+  // any mode (shared or exclusive), the behavior is undefined and outright
+  // fails with dchecks on.
   void LockExclusive();
 
   // Releases the {SharedMutex} from shared ownership by the calling thread.
   // The mutex must be locked by the current thread of execution in shared mode,
-  // otherwise, the behavior is undefined.
+  // otherwise, the behavior is undefined and outright fails with dchecks on.
   void UnlockShared();
 
   // Unlocks the {SharedMutex}. It must be locked by the current thread of
-  // execution, otherwise, the behavior is undefined.
+  // execution, otherwise, the behavior is undefined and outright fails with
+  // dchecks on.
   void UnlockExclusive();
 
   // Tries to lock the {SharedMutex} in shared mode. Returns immediately. On
   // successful lock acquisition returns true, otherwise returns false.
   // This function is allowed to fail spuriously and return false even if the
   // mutex is not currenly exclusively locked by any other thread.
+  // If it is called by a thread that already owns the mutex in any mode
+  // (shared or exclusive), the behavior is undefined, and outright fails with
+  // dchecks on.
   bool TryLockShared() V8_WARN_UNUSED_RESULT;
 
   // Tries to lock the {SharedMutex}. Returns immediately. On successful lock
   // acquisition returns true, otherwise returns false.
   // This function is allowed to fail spuriously and return false even if the
   // mutex is not currently locked by any other thread.
-  // If try_lock is called by a thread that already owns the mutex in any mode
-  // (shared or exclusive), the behavior is undefined.
+  // If it is called by a thread that already owns the mutex in any mode
+  // (shared or exclusive), the behavior is undefined, and outright fails with
+  // dchecks on.
   bool TryLockExclusive() V8_WARN_UNUSED_RESULT;
 
  private:
@@ -281,7 +289,7 @@ class V8_BASE_EXPORT SharedMutex final {
 enum class NullBehavior { kRequireNotNull, kIgnoreIfNull };
 
 template <typename Mutex, NullBehavior Behavior = NullBehavior::kRequireNotNull>
-class LockGuard final {
+class V8_NODISCARD LockGuard final {
  public:
   explicit LockGuard(Mutex* mutex) : mutex_(mutex) {
     if (has_mutex()) mutex_->Lock();
@@ -309,7 +317,7 @@ enum MutexSharedType : bool { kShared = true, kExclusive = false };
 
 template <MutexSharedType kIsShared,
           NullBehavior Behavior = NullBehavior::kRequireNotNull>
-class SharedMutexGuard final {
+class V8_NODISCARD SharedMutexGuard final {
  public:
   explicit SharedMutexGuard(SharedMutex* mutex) : mutex_(mutex) {
     if (!has_mutex()) return;
@@ -340,6 +348,20 @@ class SharedMutexGuard final {
   }
 };
 
+template <MutexSharedType kIsShared,
+          NullBehavior Behavior = NullBehavior::kRequireNotNull>
+class V8_NODISCARD SharedMutexGuardIf final {
+ public:
+  SharedMutexGuardIf(SharedMutex* mutex, bool enable_mutex) {
+    if (enable_mutex) mutex_.emplace(mutex);
+  }
+  SharedMutexGuardIf(const SharedMutexGuardIf&) = delete;
+  SharedMutexGuardIf& operator=(const SharedMutexGuardIf&) = delete;
+
+ private:
+  base::Optional<SharedMutexGuard<kIsShared, Behavior>> mutex_;
+};
+
 }  // namespace base
 }  // namespace v8
 
diff --git a/deps/v8/src/base/platform/platform-fuchsia.cc b/deps/v8/src/base/platform/platform-fuchsia.cc
index 381b59a904b588..dd34d69f573837 100644
--- a/deps/v8/src/base/platform/platform-fuchsia.cc
+++ b/deps/v8/src/base/platform/platform-fuchsia.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <zircon/process.h>
-#include <zircon/syscalls.h>
-#include <zircon/threads.h>
+#include <lib/zx/resource.h>
+#include <lib/zx/thread.h>
+#include <lib/zx/vmar.h>
+#include <lib/zx/vmo.h>
 
 #include "src/base/macros.h"
 #include "src/base/platform/platform-posix-time.h"
@@ -49,30 +50,26 @@ void* OS::Allocate(void* address, size_t size, size_t alignment,
   // Add the maximum misalignment so we are guaranteed an aligned base address.
   size_t request_size = size + (alignment - page_size);
 
-  zx_handle_t vmo;
-  if (zx_vmo_create(request_size, 0, &vmo) != ZX_OK) {
+  zx::vmo vmo;
+  if (zx::vmo::create(request_size, 0, &vmo) != ZX_OK) {
     return nullptr;
   }
   static const char kVirtualMemoryName[] = "v8-virtualmem";
-  zx_object_set_property(vmo, ZX_PROP_NAME, kVirtualMemoryName,
-                         strlen(kVirtualMemoryName));
+  vmo.set_property(ZX_PROP_NAME, kVirtualMemoryName,
+                   strlen(kVirtualMemoryName));
 
   // Always call zx_vmo_replace_as_executable() in case the memory will need
   // to be marked as executable in the future.
   // TOOD(https://crbug.com/v8/8899): Only call this when we know that the
   // region will need to be marked as executable in the future.
-  if (zx_vmo_replace_as_executable(vmo, ZX_HANDLE_INVALID, &vmo) != ZX_OK) {
+  if (vmo.replace_as_executable(zx::resource(), &vmo) != ZX_OK) {
     return nullptr;
   }
 
-  uintptr_t reservation;
+  zx_vaddr_t reservation;
   uint32_t prot = GetProtectionFromMemoryPermission(access);
-  zx_status_t status = zx_vmar_map(zx_vmar_root_self(), prot, 0, vmo, 0,
-                                   request_size, &reservation);
-  // Either the vmo is now referenced by the vmar, or we failed and are bailing,
-  // so close the vmo either way.
-  zx_handle_close(vmo);
-  if (status != ZX_OK) {
+  if (zx::vmar::root_self()->map(prot, 0, vmo, 0, request_size, &reservation) !=
+      ZX_OK) {
     return nullptr;
   }
 
@@ -84,8 +81,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment,
   if (aligned_base != base) {
     DCHECK_LT(base, aligned_base);
     size_t prefix_size = static_cast<size_t>(aligned_base - base);
-    zx_vmar_unmap(zx_vmar_root_self(), reinterpret_cast<uintptr_t>(base),
-                  prefix_size);
+    zx::vmar::root_self()->unmap(reinterpret_cast<uintptr_t>(base),
+                                 prefix_size);
     request_size -= prefix_size;
   }
 
@@ -94,9 +91,8 @@ void* OS::Allocate(void* address, size_t size, size_t alignment,
   if (aligned_size != request_size) {
     DCHECK_LT(aligned_size, request_size);
     size_t suffix_size = request_size - aligned_size;
-    zx_vmar_unmap(zx_vmar_root_self(),
-                  reinterpret_cast<uintptr_t>(aligned_base + aligned_size),
-                  suffix_size);
+    zx::vmar::root_self()->unmap(
+        reinterpret_cast<uintptr_t>(aligned_base + aligned_size), suffix_size);
     request_size -= suffix_size;
   }
 
@@ -108,16 +104,16 @@ void* OS::Allocate(void* address, size_t size, size_t alignment,
 bool OS::Free(void* address, const size_t size) {
   DCHECK_EQ(0, reinterpret_cast<uintptr_t>(address) % AllocatePageSize());
   DCHECK_EQ(0, size % AllocatePageSize());
-  return zx_vmar_unmap(zx_vmar_root_self(),
-                       reinterpret_cast<uintptr_t>(address), size) == ZX_OK;
+  return zx::vmar::root_self()->unmap(reinterpret_cast<uintptr_t>(address),
+                                      size) == ZX_OK;
 }
 
 // static
 bool OS::Release(void* address, size_t size) {
   DCHECK_EQ(0, reinterpret_cast<uintptr_t>(address) % CommitPageSize());
   DCHECK_EQ(0, size % CommitPageSize());
-  return zx_vmar_unmap(zx_vmar_root_self(),
-                       reinterpret_cast<uintptr_t>(address), size) == ZX_OK;
+  return zx::vmar::root_self()->unmap(reinterpret_cast<uintptr_t>(address),
+                                      size) == ZX_OK;
 }
 
 // static
@@ -125,8 +121,8 @@ bool OS::SetPermissions(void* address, size_t size, MemoryPermission access) {
   DCHECK_EQ(0, reinterpret_cast<uintptr_t>(address) % CommitPageSize());
   DCHECK_EQ(0, size % CommitPageSize());
   uint32_t prot = GetProtectionFromMemoryPermission(access);
-  return zx_vmar_protect(zx_vmar_root_self(), prot,
-                         reinterpret_cast<uintptr_t>(address), size) == ZX_OK;
+  return zx::vmar::root_self()->protect2(
+             prot, reinterpret_cast<uintptr_t>(address), size) == ZX_OK;
 }
 
 // static
@@ -154,10 +150,8 @@ int OS::GetUserTime(uint32_t* secs, uint32_t* usecs) {
   const auto kMicrosPerSecond = 1000000ULL;
 
   zx_info_thread_stats_t info = {};
-  zx_status_t status = zx_object_get_info(thrd_get_zx_handle(thrd_current()),
-                                          ZX_INFO_THREAD_STATS, &info,
-                                          sizeof(info), nullptr, nullptr);
-  if (status != ZX_OK) {
+  if (zx::thread::self()->get_info(ZX_INFO_THREAD_STATS, &info, sizeof(info),
+                                   nullptr, nullptr) != ZX_OK) {
     return -1;
   }
 
diff --git a/deps/v8/src/base/platform/platform-macos.cc b/deps/v8/src/base/platform/platform-macos.cc
index 1b1f4c4ce8a2c3..3f1638ec0d50d6 100644
--- a/deps/v8/src/base/platform/platform-macos.cc
+++ b/deps/v8/src/base/platform/platform-macos.cc
@@ -49,14 +49,14 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLibraryAddresses() {
   for (unsigned int i = 0; i < images_count; ++i) {
     const mach_header* header = _dyld_get_image_header(i);
     if (header == nullptr) continue;
-#if V8_HOST_ARCH_I32
-    unsigned int size;
-    char* code_ptr = getsectdatafromheader(header, SEG_TEXT, SECT_TEXT, &size);
-#else
+#if V8_HOST_ARCH_X64
     uint64_t size;
     char* code_ptr = getsectdatafromheader_64(
         reinterpret_cast<const mach_header_64*>(header), SEG_TEXT, SECT_TEXT,
         &size);
+#else
+    unsigned int size;
+    char* code_ptr = getsectdatafromheader(header, SEG_TEXT, SECT_TEXT, &size);
 #endif
     if (code_ptr == nullptr) continue;
     const intptr_t slide = _dyld_get_image_vmaddr_slide(i);
diff --git a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platform/platform-posix.cc
index 67746173d582c5..ab0d7839a453d8 100644
--- a/deps/v8/src/base/platform/platform-posix.cc
+++ b/deps/v8/src/base/platform/platform-posix.cc
@@ -415,16 +415,6 @@ bool OS::SetPermissions(void* address, size_t size, MemoryPermission access) {
 
   int prot = GetProtectionFromMemoryPermission(access);
   int ret = mprotect(address, size, prot);
-
-  // MacOS 11.2 on Apple Silicon refuses to switch permissions from
-  // rwx to none. Just use madvise instead.
-#if defined(V8_OS_MACOSX)
-  if (ret != 0 && access == OS::MemoryPermission::kNoAccess) {
-    ret = madvise(address, size, MADV_FREE_REUSABLE);
-    return ret == 0;
-  }
-#endif
-
   if (ret == 0 && access == OS::MemoryPermission::kNoAccess) {
     // This is advisory; ignore errors and continue execution.
     USE(DiscardSystemPages(address, size));
diff --git a/deps/v8/src/base/platform/platform-win32.cc b/deps/v8/src/base/platform/platform-win32.cc
index cee24e987674cc..7f6c0e97d2fea8 100644
--- a/deps/v8/src/base/platform/platform-win32.cc
+++ b/deps/v8/src/base/platform/platform-win32.cc
@@ -502,11 +502,15 @@ int OS::GetCurrentThreadId() {
 }
 
 void OS::ExitProcess(int exit_code) {
-  // Use TerminateProcess avoid races between isolate threads and
+  // Use TerminateProcess to avoid races between isolate threads and
   // static destructors.
   fflush(stdout);
   fflush(stderr);
   TerminateProcess(GetCurrentProcess(), exit_code);
+  // Termination the current process does not return. {TerminateProcess} is not
+  // marked [[noreturn]] though, since it can also be used to terminate another
+  // process.
+  UNREACHABLE();
 }
 
 // ----------------------------------------------------------------------------
diff --git a/deps/v8/src/base/platform/platform.h b/deps/v8/src/base/platform/platform.h
index 042e4428cd31cc..7beefbe572c3c8 100644
--- a/deps/v8/src/base/platform/platform.h
+++ b/deps/v8/src/base/platform/platform.h
@@ -263,7 +263,7 @@ class V8_BASE_EXPORT OS {
 
   static void AdjustSchedulingParams();
 
-  static void ExitProcess(int exit_code);
+  [[noreturn]] static void ExitProcess(int exit_code);
 
  private:
   // These classes use the private memory management API below.
@@ -385,13 +385,7 @@ class V8_BASE_EXPORT Thread {
   static LocalStorageKey CreateThreadLocalKey();
   static void DeleteThreadLocalKey(LocalStorageKey key);
   static void* GetThreadLocal(LocalStorageKey key);
-  static int GetThreadLocalInt(LocalStorageKey key) {
-    return static_cast<int>(reinterpret_cast<intptr_t>(GetThreadLocal(key)));
-  }
   static void SetThreadLocal(LocalStorageKey key, void* value);
-  static void SetThreadLocalInt(LocalStorageKey key, int value) {
-    SetThreadLocal(key, reinterpret_cast<void*>(static_cast<intptr_t>(value)));
-  }
   static bool HasThreadLocal(LocalStorageKey key) {
     return GetThreadLocal(key) != nullptr;
   }
diff --git a/deps/v8/src/base/platform/time.cc b/deps/v8/src/base/platform/time.cc
index 78574b776d3fa2..c399c52cb2d90d 100644
--- a/deps/v8/src/base/platform/time.cc
+++ b/deps/v8/src/base/platform/time.cc
@@ -760,6 +760,9 @@ bool ThreadTicks::IsSupported() {
 #else
   return false;
 #endif
+#elif defined(__PASE__)
+  // Thread CPU time accounting is unavailable in PASE
+  return false;
 #elif(defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \
     defined(V8_OS_MACOSX) || defined(V8_OS_ANDROID) || defined(V8_OS_SOLARIS)
   return true;
diff --git a/deps/v8/src/base/platform/wrappers.h b/deps/v8/src/base/platform/wrappers.h
index 521b06ebe12a99..5d07cec2084435 100644
--- a/deps/v8/src/base/platform/wrappers.h
+++ b/deps/v8/src/base/platform/wrappers.h
@@ -7,23 +7,65 @@
 
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "src/base/base-export.h"
+
+#if defined(V8_OS_STARBOARD)
+#include "starboard/memory.h"
+#endif
 
 namespace v8 {
 namespace base {
 
-void* Malloc(size_t size);
+#if !defined(V8_OS_STARBOARD)
+
+// Common libstd implementations.
+// inline implementations are preferred here due to performance concerns.
+inline void* Malloc(size_t size) { return malloc(size); }
+
+inline void* Realloc(void* memory, size_t size) {
+  return realloc(memory, size);
+}
+
+inline void Free(void* memory) { return free(memory); }
+
+inline void* Calloc(size_t count, size_t size) { return calloc(count, size); }
+
+inline void* Memcpy(void* dest, const void* source, size_t count) {
+  return memcpy(dest, source, count);
+}
+
+inline FILE* Fopen(const char* filename, const char* mode) {
+  return fopen(filename, mode);
+}
+
+inline int Fclose(FILE* stream) { return fclose(stream); }
+
+#else  // V8_OS_STARBOARD
+
+inline void* Malloc(size_t size) { return SbMemoryAlloc(size); }
+
+inline void* Realloc(void* memory, size_t size) {
+  return SbMemoryReallocate(memory, size);
+}
 
-void* Realloc(void* memory, size_t size);
+inline void Free(void* memory) { return SbMemoryDeallocate(memory); }
 
-void Free(void* memory);
+inline void* Calloc(size_t count, size_t size) {
+  return SbMemoryCalloc(count, size);
+}
 
-void* Calloc(size_t count, size_t size);
+inline void* Memcpy(void* dest, const void* source, size_t count) {
+  return SbMemoryCopy(dest, source, count);
+}
 
-void* Memcpy(void* dest, const void* source, size_t count);
+inline FILE* Fopen(const char* filename, const char* mode) { return NULL; }
 
-FILE* Fopen(const char* filename, const char* mode);
+inline int Fclose(FILE* stream) { return -1; }
 
-int Fclose(FILE* stream);
+#endif  // V8_OS_STARBOARD
 
 }  // namespace base
 }  // namespace v8
diff --git a/deps/v8/src/base/platform/wrappers_starboard.cc b/deps/v8/src/base/platform/wrappers_starboard.cc
deleted file mode 100644
index 199e75340909bb..00000000000000
--- a/deps/v8/src/base/platform/wrappers_starboard.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "starboard/memory.h"
-
-#include "src/base/platform/wrappers.h"
-
-namespace v8 {
-namespace base {
-
-void* Malloc(size_t size) { return SbMemoryAlloc(size); }
-
-void* Realloc(void* memory, size_t size) {
-  return SbMemoryReallocate(memory, size);
-}
-
-void Free(void* memory) { return SbMemoryDeallocate(memory); }
-
-void* Calloc(size_t count, size_t size) { return SbMemoryCalloc(count, size); }
-
-void* Memcpy(void* dest, const void* source, size_t count) {
-  return SbMemoryCopy(dest, source, count);
-}
-
-FILE* Fopen(const char* filename, const char* mode) { return NULL; }
-
-int Fclose(FILE* stream) { return -1; }
-
-}  // namespace base
-}  // namespace v8
diff --git a/deps/v8/src/base/platform/wrappers_std.cc b/deps/v8/src/base/platform/wrappers_std.cc
deleted file mode 100644
index 6b38b18e37a85f..00000000000000
--- a/deps/v8/src/base/platform/wrappers_std.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "src/base/platform/wrappers.h"
-
-namespace v8 {
-namespace base {
-
-void* Malloc(size_t size) { return malloc(size); }
-
-void* Realloc(void* memory, size_t size) { return realloc(memory, size); }
-
-void Free(void* memory) { return free(memory); }
-
-void* Calloc(size_t count, size_t size) { return calloc(count, size); }
-
-void* Memcpy(void* dest, const void* source, size_t count) {
-  return memcpy(dest, source, count);
-}
-
-FILE* Fopen(const char* filename, const char* mode) {
-  return fopen(filename, mode);
-}
-
-int Fclose(FILE* stream) { return fclose(stream); }
-
-}  // namespace base
-}  // namespace v8
diff --git a/deps/v8/src/base/small-vector.h b/deps/v8/src/base/small-vector.h
index b11dfb86b446dc..c337b9052d488a 100644
--- a/deps/v8/src/base/small-vector.h
+++ b/deps/v8/src/base/small-vector.h
@@ -11,6 +11,7 @@
 
 #include "src/base/bits.h"
 #include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace base {
@@ -33,11 +34,11 @@ class SmallVector {
   SmallVector(SmallVector&& other) V8_NOEXCEPT { *this = std::move(other); }
   SmallVector(std::initializer_list<T> init) {
     resize_no_init(init.size());
-    memcpy(begin_, init.begin(), sizeof(T) * init.size());
+    base::Memcpy(begin_, init.begin(), sizeof(T) * init.size());
   }
 
   ~SmallVector() {
-    if (is_big()) free(begin_);
+    if (is_big()) base::Free(begin_);
   }
 
   SmallVector& operator=(const SmallVector& other) V8_NOEXCEPT {
@@ -45,11 +46,11 @@ class SmallVector {
     size_t other_size = other.size();
     if (capacity() < other_size) {
       // Create large-enough heap-allocated storage.
-      if (is_big()) free(begin_);
-      begin_ = reinterpret_cast<T*>(malloc(sizeof(T) * other_size));
+      if (is_big()) base::Free(begin_);
+      begin_ = reinterpret_cast<T*>(base::Malloc(sizeof(T) * other_size));
       end_of_storage_ = begin_ + other_size;
     }
-    memcpy(begin_, other.begin_, sizeof(T) * other_size);
+    base::Memcpy(begin_, other.begin_, sizeof(T) * other_size);
     end_ = begin_ + other_size;
     return *this;
   }
@@ -57,7 +58,7 @@ class SmallVector {
   SmallVector& operator=(SmallVector&& other) V8_NOEXCEPT {
     if (this == &other) return *this;
     if (other.is_big()) {
-      if (is_big()) free(begin_);
+      if (is_big()) base::Free(begin_);
       begin_ = other.begin_;
       end_ = other.end_;
       end_of_storage_ = other.end_of_storage_;
@@ -65,7 +66,7 @@ class SmallVector {
     } else {
       DCHECK_GE(capacity(), other.size());  // Sanity check.
       size_t other_size = other.size();
-      memcpy(begin_, other.begin_, sizeof(T) * other_size);
+      base::Memcpy(begin_, other.begin_, sizeof(T) * other_size);
       end_ = begin_ + other_size;
     }
     return *this;
@@ -151,9 +152,10 @@ class SmallVector {
     size_t in_use = end_ - begin_;
     size_t new_capacity =
         base::bits::RoundUpToPowerOfTwo(std::max(min_capacity, 2 * capacity()));
-    T* new_storage = reinterpret_cast<T*>(malloc(sizeof(T) * new_capacity));
-    memcpy(new_storage, begin_, sizeof(T) * in_use);
-    if (is_big()) free(begin_);
+    T* new_storage =
+        reinterpret_cast<T*>(base::Malloc(sizeof(T) * new_capacity));
+    base::Memcpy(new_storage, begin_, sizeof(T) * in_use);
+    if (is_big()) base::Free(begin_);
     begin_ = new_storage;
     end_ = new_storage + in_use;
     end_of_storage_ = new_storage + new_capacity;
diff --git a/deps/v8/src/base/utils/random-number-generator.cc b/deps/v8/src/base/utils/random-number-generator.cc
index 61b78f1bdff20c..e3078a03c94933 100644
--- a/deps/v8/src/base/utils/random-number-generator.cc
+++ b/deps/v8/src/base/utils/random-number-generator.cc
@@ -14,6 +14,7 @@
 #include "src/base/macros.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/time.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace base {
@@ -60,11 +61,11 @@ RandomNumberGenerator::RandomNumberGenerator() {
   SetSeed(seed);
 #else
   // Gather entropy from /dev/urandom if available.
-  FILE* fp = fopen("/dev/urandom", "rb");
+  FILE* fp = base::Fopen("/dev/urandom", "rb");
   if (fp != nullptr) {
     int64_t seed;
     size_t n = fread(&seed, sizeof(seed), 1, fp);
-    fclose(fp);
+    base::Fclose(fp);
     if (n == 1) {
       SetSeed(seed);
       return;
diff --git a/deps/v8/src/builtins/accessors.cc b/deps/v8/src/builtins/accessors.cc
index eea53bca09bccc..197a2de86070bd 100644
--- a/deps/v8/src/builtins/accessors.cc
+++ b/deps/v8/src/builtins/accessors.cc
@@ -131,7 +131,7 @@ void Accessors::ReconfigureToDataProperty(
 void Accessors::ArgumentsIteratorGetter(
     v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   HandleScope scope(isolate);
   Object result = isolate->native_context()->array_values_iterator();
   info.GetReturnValue().Set(Utils::ToLocal(Handle<Object>(result, isolate)));
@@ -151,7 +151,7 @@ void Accessors::ArrayLengthGetter(
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   RuntimeCallTimerScope timer(isolate,
                               RuntimeCallCounterId::kArrayLengthGetter);
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   HandleScope scope(isolate);
   JSArray holder = JSArray::cast(*Utils::OpenHandle(*info.Holder()));
   Object result = holder.length();
@@ -278,7 +278,7 @@ void Accessors::StringLengthGetter(
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   RuntimeCallTimerScope timer(isolate,
                               RuntimeCallCounterId::kStringLengthGetter);
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   HandleScope scope(isolate);
 
   // We have a slight impedance mismatch between the external API and the way we
@@ -309,6 +309,12 @@ Handle<AccessorInfo> Accessors::MakeStringLengthInfo(Isolate* isolate) {
 static Handle<Object> GetFunctionPrototype(Isolate* isolate,
                                            Handle<JSFunction> function) {
   if (!function->has_prototype()) {
+    // We lazily allocate .prototype for functions, which confuses debug
+    // evaluate which assumes we can write to temporary objects we allocated
+    // during evaluation. We err on the side of caution here and prevent the
+    // newly allocated prototype from going into the temporary objects set,
+    // which means writes to it will be considered a side effect.
+    DisableTemporaryObjectTracking no_temp_tracking(isolate->debug());
     Handle<JSObject> proto = isolate->factory()->NewFunctionPrototype(function);
     JSFunction::SetPrototype(function, proto);
   }
diff --git a/deps/v8/src/builtins/arm/builtins-arm.cc b/deps/v8/src/builtins/arm/builtins-arm.cc
index 5a0a59d87924c7..f7630a4753c207 100644
--- a/deps/v8/src/builtins/arm/builtins-arm.cc
+++ b/deps/v8/src/builtins/arm/builtins-arm.cc
@@ -3385,6 +3385,63 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kCallerSaved;
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+  __ ldr(handler_arg, MemOperand(fp, CommonFrameConstants::kCallerPCOffset));
+  __ ldr(slot_arg, MemOperand(handler_arg,
+                              Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ ldr(
+      handler_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ cmp_raw_immediate(r0, static_cast<int>(DynamicCheckMapsStatus::kSuccess));
+  __ b(ne, &deopt);
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ bind(&deopt);
+  __ cmp_raw_immediate(r0, static_cast<int>(DynamicCheckMapsStatus::kBailout));
+  __ b(eq, &bailout);
+
+  if (FLAG_debug_code) {
+    __ cmp_raw_immediate(r0, static_cast<int>(DynamicCheckMapsStatus::kDeopt));
+    __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus);
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/arm64/builtins-arm64.cc b/deps/v8/src/builtins/arm64/builtins-arm64.cc
index 92c1fefa0a906a..e4db765adaa00b 100644
--- a/deps/v8/src/builtins/arm64/builtins-arm64.cc
+++ b/deps/v8/src/builtins/arm64/builtins-arm64.cc
@@ -3924,6 +3924,77 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kCallerSaved.list();
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+
+#ifdef V8_ENABLE_CONTROL_FLOW_INTEGRITY
+  // Make sure we can use x16 and x17, and add slot_arg as a temp reg if needed.
+  UseScratchRegisterScope temps(masm);
+  temps.Exclude(x16, x17);
+  temps.Include(slot_arg);
+  // Load return address into x17 and decode into handler_arg.
+  __ Add(x16, fp, CommonFrameConstants::kCallerSPOffset);
+  __ Ldr(x17, MemOperand(fp, CommonFrameConstants::kCallerPCOffset));
+  __ Autib1716();
+  __ Mov(handler_arg, x17);
+#else
+  __ Ldr(handler_arg, MemOperand(fp, CommonFrameConstants::kCallerPCOffset));
+#endif
+
+  __ Ldr(slot_arg, MemOperand(handler_arg,
+                              Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ Ldr(
+      handler_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ CompareAndBranch(
+      x0, static_cast<int32_t>(DynamicCheckMapsStatus::kSuccess), ne, &deopt);
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ Bind(&deopt);
+  __ CompareAndBranch(
+      x0, static_cast<int32_t>(DynamicCheckMapsStatus::kBailout), eq, &bailout);
+
+  if (FLAG_debug_code) {
+    __ Cmp(x0, Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
+    __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus);
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ Bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/array-at.tq b/deps/v8/src/builtins/array-at.tq
new file mode 100644
index 00000000000000..b1707745e86b73
--- /dev/null
+++ b/deps/v8/src/builtins/array-at.tq
@@ -0,0 +1,27 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace array {
+// https://tc39.es/proposal-item-method/#sec-array.prototype.at
+transitioning javascript builtin ArrayPrototypeAt(
+    js-implicit context: NativeContext, receiver: JSAny)(index: JSAny): JSAny {
+  // 1. Let O be ? ToObject(this value).
+  const o = ToObject_Inline(context, receiver);
+  // 2. Let len be ? LengthOfArrayLike(O).
+  const len = GetLengthProperty(o);
+  // 3. Let relativeIndex be ? ToInteger(index).
+  const relativeIndex = ToInteger_Inline(index);
+  // 4. If relativeIndex ≥ 0, then
+  //   a. Let k be relativeIndex.
+  // 5. Else,
+  //   a. Let k be len + relativeIndex.
+  const k = relativeIndex >= 0 ? relativeIndex : len + relativeIndex;
+  // 6. If k < 0 or k ≥ len, then return undefined.
+  if (k < 0 || k >= len) {
+    return Undefined;
+  }
+  // 7. Return ? Get(O, ! ToString(k)).
+  return GetProperty(o, k);
+}
+}
diff --git a/deps/v8/src/builtins/array-from.tq b/deps/v8/src/builtins/array-from.tq
index e51d37fef2ccdb..e139e58de62af6 100644
--- a/deps/v8/src/builtins/array-from.tq
+++ b/deps/v8/src/builtins/array-from.tq
@@ -8,10 +8,12 @@ namespace array {
 transitioning javascript builtin
 ArrayFrom(js-implicit context: NativeContext, receiver: JSAny)(...arguments):
     JSReceiver {
+  const c = HasBuiltinSubclassingFlag() ? receiver : GetArrayFunction();
+
   // Use fast path if:
   // * |items| is the only argument, and
   // * the receiver is the Array function.
-  if (arguments.length == 1 && receiver == GetArrayFunction()) {
+  if (arguments.length == 1 && c == GetArrayFunction()) {
     try {
       return iterator::FastIterableToList(arguments[0]) otherwise Slow;
     } label Slow {
@@ -24,7 +26,7 @@ ArrayFrom(js-implicit context: NativeContext, receiver: JSAny)(...arguments):
   const thisArg = arguments[2];
 
   // 1. Let C be the this value.
-  const c = receiver;
+  // (Done above.)
 
   let mapping: bool;
   // 2. If mapfn is undefined, let mapping be false.
diff --git a/deps/v8/src/builtins/array-of.tq b/deps/v8/src/builtins/array-of.tq
index 49c67bd8231dcc..44c2cdca27665f 100644
--- a/deps/v8/src/builtins/array-of.tq
+++ b/deps/v8/src/builtins/array-of.tq
@@ -14,7 +14,7 @@ ArrayOf(
   const items: Arguments = arguments;
 
   // 3. Let C be the this value.
-  const c: JSAny = receiver;
+  const c: JSAny = HasBuiltinSubclassingFlag() ? receiver : GetArrayFunction();
 
   let a: JSReceiver;
 
diff --git a/deps/v8/src/builtins/base.tq b/deps/v8/src/builtins/base.tq
index e068cfa9d18b66..c8499caf6fd81b 100644
--- a/deps/v8/src/builtins/base.tq
+++ b/deps/v8/src/builtins/base.tq
@@ -45,6 +45,8 @@ type PositiveSmi extends Smi;
 
 // The Smi value zero, which is often used as null for HeapObject types.
 type Zero extends PositiveSmi;
+// A tagged value represented by an all-zero bitpattern.
+type TaggedZeroPattern extends TaggedIndex;
 
 // A value with the size of Tagged which may contain arbitrary data.
 type Uninitialized extends Tagged;
@@ -99,7 +101,7 @@ type uint16 extends uint31
 type int8 extends int16 generates 'TNode<Int8T>' constexpr 'int8_t';
 type uint8 extends uint16
     generates 'TNode<Uint8T>' constexpr 'uint8_t';
-type char8 extends int8 constexpr 'char';
+type char8 extends uint8 constexpr 'char';
 type char16 extends uint16 constexpr 'char16_t';
 type int64 generates 'TNode<Int64T>' constexpr 'int64_t';
 type intptr generates 'TNode<IntPtrT>' constexpr 'intptr_t';
@@ -134,6 +136,40 @@ struct float64_or_hole {
 }
 const kDoubleHole: float64_or_hole = float64_or_hole{is_hole: true, value: 0};
 
+@doNotGenerateCast
+@abstract
+extern class JSPrototype extends JSObject generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSObjectPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSRegExpPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSPromisePrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSTypedArrayPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSSetPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSIteratorPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSArrayIteratorPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSMapIteratorPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSSetIteratorPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+@doNotGenerateCast
+extern class JSStringIteratorPrototype extends JSPrototype
+    generates 'TNode<JSObject>';
+
 // The HashTable inheritance hierarchy doesn't actually look like this in C++
 // because it uses some class templates that we can't yet (and may never)
 // express in Torque, but this is the expected organization of instance types.
@@ -151,6 +187,7 @@ type ObjectHashTable extends HashTable
 extern class NumberDictionary extends HashTable;
 
 type RawPtr generates 'TNode<RawPtrT>' constexpr 'Address';
+type RawPtr<To: type> extends RawPtr;
 type ExternalPointer
     generates 'TNode<ExternalPointerT>' constexpr 'ExternalPointer_t';
 extern class Code extends HeapObject;
@@ -329,7 +366,6 @@ extern enum MessageTemplate {
   kWasmTrapDataSegmentDropped,
   kWasmTrapElemSegmentDropped,
   kWasmTrapTableOutOfBounds,
-  kWasmTrapBrOnExnNull,
   kWasmTrapRethrowNull,
   kWasmTrapNullDereference,
   kWasmTrapIllegalCast,
@@ -392,6 +428,14 @@ extern enum PrimitiveType { kString, kBoolean, kSymbol, kNumber }
 
 const kNameDictionaryInitialCapacity:
     constexpr int32 generates 'NameDictionary::kInitialCapacity';
+const kOrderedNameDictionaryInitialCapacity:
+    constexpr int32 generates 'OrderedNameDictionary::kInitialCapacity';
+
+const kWasmArrayHeaderSize:
+    constexpr int32 generates 'WasmArray::kHeaderSize';
+
+const kDictModePrototypes:
+    constexpr bool generates 'V8_DICT_MODE_PROTOTYPES_BOOL';
 
 type TheHole extends Oddball;
 type Null extends Oddball;
@@ -440,6 +484,8 @@ const kReturnString: String = ReturnStringConstant();
 
 const kNaN: NaN = NanConstant();
 const kZero: Zero = %RawDownCast<Zero>(SmiConstant(0));
+const kZeroBitPattern: TaggedZeroPattern = %RawDownCast<TaggedZeroPattern>(
+    Convert<Tagged>(BitcastWordToTaggedSigned(Convert<intptr>(0))));
 
 const true: constexpr bool generates 'true';
 const false: constexpr bool generates 'false';
@@ -609,13 +655,14 @@ extern macro SpeciesConstructor(implicit context: Context)(
 extern macro ConstructorBuiltinsAssembler::IsDictionaryMap(Map): bool;
 extern macro CodeStubAssembler::AllocateNameDictionary(constexpr int32):
     NameDictionary;
+extern macro CodeStubAssembler::AllocateOrderedNameDictionary(constexpr int32):
+    OrderedNameDictionary;
 
 extern builtin ToObject(Context, JSAny): JSReceiver;
 extern macro ToObject_Inline(Context, JSAny): JSReceiver;
 extern macro IsUndefined(Object): bool;
 extern macro IsNullOrUndefined(Object): bool;
 extern macro IsString(HeapObject): bool;
-extern macro IsSeqOneByteString(HeapObject): bool;
 extern transitioning builtin NonPrimitiveToPrimitive_String(
     Context, JSAny): JSPrimitive;
 extern transitioning builtin NonPrimitiveToPrimitive_Default(
@@ -644,9 +691,9 @@ extern macro LoadBufferIntptr(RawPtr, constexpr int32): intptr;
 
 extern runtime StringEqual(Context, String, String): Oddball;
 extern builtin StringLessThan(Context, String, String): Boolean;
-extern macro StringCharCodeAt(String, uintptr): int32;
-extern runtime StringCompareSequence(Context, String, String, Number): Boolean;
-extern macro StringFromSingleCharCode(int32): String;
+extern macro StringCharCodeAt(String, uintptr): char16;
+extern macro StringFromSingleCharCode(char8): String;
+extern macro StringFromSingleCharCode(char16): String;
 
 extern macro NumberToString(Number): String;
 extern macro StringToNumber(String): Number;
@@ -1060,6 +1107,7 @@ extern macro IsArraySpeciesProtectorCellInvalid(): bool;
 extern macro IsTypedArraySpeciesProtectorCellInvalid(): bool;
 extern macro IsPromiseSpeciesProtectorCellInvalid(): bool;
 extern macro IsMockArrayBufferAllocatorFlag(): bool;
+extern macro HasBuiltinSubclassingFlag(): bool;
 extern macro IsPrototypeTypedArrayPrototype(implicit context: Context)(Map):
     bool;
 
@@ -1712,8 +1760,7 @@ macro ConstantIterator<T: type>(value: T): ConstantIterator<T> {
   return ConstantIterator{value};
 }
 
-extern macro FeedbackIteratorSizeFor(constexpr int32): intptr;
-extern macro FeedbackIteratorMapIndexForEntry(constexpr int32): intptr;
-extern macro FeedbackIteratorHandlerIndexForEntry(constexpr int32): intptr;
+extern macro FeedbackIteratorEntrySize(): intptr;
+extern macro FeedbackIteratorHandlerOffset(): intptr;
 extern operator '[]' macro LoadWeakFixedArrayElement(
     WeakFixedArray, intptr): MaybeObject;
diff --git a/deps/v8/src/builtins/builtins-api.cc b/deps/v8/src/builtins/builtins-api.cc
index e42760d4d2cc02..35e6cc393cb2de 100644
--- a/deps/v8/src/builtins/builtins-api.cc
+++ b/deps/v8/src/builtins/builtins-api.cc
@@ -23,6 +23,8 @@ namespace {
 // TODO(dcarney): CallOptimization duplicates this logic, merge.
 JSReceiver GetCompatibleReceiver(Isolate* isolate, FunctionTemplateInfo info,
                                  JSReceiver receiver) {
+  RuntimeCallTimerScope timer(isolate,
+                              RuntimeCallCounterId::kGetCompatibleReceiver);
   Object recv_type = info.signature();
   // No signature, return holder.
   if (!recv_type.IsFunctionTemplateInfo()) return receiver;
@@ -151,14 +153,14 @@ class RelocatableArguments : public BuiltinArguments, public Relocatable {
   RelocatableArguments(Isolate* isolate, int length, Address* arguments)
       : BuiltinArguments(length, arguments), Relocatable(isolate) {}
 
+  RelocatableArguments(const RelocatableArguments&) = delete;
+  RelocatableArguments& operator=(const RelocatableArguments&) = delete;
+
   inline void IterateInstance(RootVisitor* v) override {
     if (length() == 0) return;
     v->VisitRootPointers(Root::kRelocatable, nullptr, first_slot(),
                          last_slot() + 1);
   }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(RelocatableArguments);
 };
 
 }  // namespace
diff --git a/deps/v8/src/builtins/builtins-array-gen.cc b/deps/v8/src/builtins/builtins-array-gen.cc
index 7a8ee5c4155f14..20277acbbc3b3b 100644
--- a/deps/v8/src/builtins/builtins-array-gen.cc
+++ b/deps/v8/src/builtins/builtins-array-gen.cc
@@ -99,9 +99,8 @@ void ArrayBuiltinsAssembler::ReturnFromBuiltin(TNode<Object> value) {
   if (argc_ == nullptr) {
     Return(value);
   } else {
-    // argc_ doesn't include the receiver, so it has to be added back in
-    // manually.
-    PopAndReturn(IntPtrAdd(argc_, IntPtrConstant(1)), value);
+    CodeStubArguments args(this, argc());
+    PopAndReturn(args.GetLengthWithReceiver(), value);
   }
 }
 
@@ -621,7 +620,9 @@ void ArrayIncludesIndexofAssembler::Generate(SearchVariant variant,
     Label is_smi(this), is_nonsmi(this), done(this);
 
     // If no fromIndex was passed, default to 0.
-    GotoIf(IntPtrLessThanOrEqual(argc, IntPtrConstant(kFromIndexArg)), &done);
+    GotoIf(
+        IntPtrLessThanOrEqual(args.GetLength(), IntPtrConstant(kFromIndexArg)),
+        &done);
 
     TNode<Object> start_from = args.AtIndex(kFromIndexArg);
     // Handle Smis and undefined here and everything else in runtime.
@@ -1629,9 +1630,9 @@ TF_BUILTIN(ArrayConstructor, ArrayBuiltinsAssembler) {
       SelectConstant<Object>(IsUndefined(new_target), function, new_target);
 
   // Run the native code for the Array function called as a normal function.
-  TNode<Oddball> no_allocation_site = UndefinedConstant();
+  TNode<Oddball> no_gc_site = UndefinedConstant();
   TailCallBuiltin(Builtins::kArrayConstructorImpl, context, function,
-                  new_target, argc, no_allocation_site);
+                  new_target, argc, no_gc_site);
 }
 
 void ArrayBuiltinsAssembler::TailCallArrayConstructorStub(
@@ -1769,12 +1770,13 @@ void ArrayBuiltinsAssembler::GenerateDispatchToArrayStub(
     TNode<Context> context, TNode<JSFunction> target, TNode<Int32T> argc,
     AllocationSiteOverrideMode mode,
     base::Optional<TNode<AllocationSite>> allocation_site) {
+  CodeStubArguments args(this, argc);
   Label check_one_case(this), fallthrough(this);
-  GotoIfNot(Word32Equal(argc, Int32Constant(0)), &check_one_case);
+  GotoIfNot(IntPtrEqual(args.GetLength(), IntPtrConstant(0)), &check_one_case);
   CreateArrayDispatchNoArgument(context, target, argc, mode, allocation_site);
 
   BIND(&check_one_case);
-  GotoIfNot(Word32Equal(argc, Int32Constant(1)), &fallthrough);
+  GotoIfNot(IntPtrEqual(args.GetLength(), IntPtrConstant(1)), &fallthrough);
   CreateArrayDispatchSingleArgument(context, target, argc, mode,
                                     allocation_site);
 
@@ -1920,9 +1922,10 @@ void ArrayBuiltinsAssembler::GenerateArrayNArgumentsConstructor(
   CodeStubArguments args(this, argc);
   args.SetReceiver(target);
 
-  // Adjust arguments count for the runtime call: +1 for implicit receiver
-  // and +2 for new_target and maybe_allocation_site.
-  argc = Int32Add(argc, Int32Constant(3));
+  // Adjust arguments count for the runtime call:
+  // +2 for new_target and maybe_allocation_site.
+  argc = Int32Add(TruncateIntPtrToInt32(args.GetLengthWithReceiver()),
+                  Int32Constant(2));
   TailCallRuntime(Runtime::kNewArray, argc, context, new_target,
                   maybe_allocation_site);
 }
diff --git a/deps/v8/src/builtins/builtins-array.cc b/deps/v8/src/builtins/builtins-array.cc
index 5467cf7c85ffa5..3270ccbcf8d845 100644
--- a/deps/v8/src/builtins/builtins-array.cc
+++ b/deps/v8/src/builtins/builtins-array.cc
@@ -6,6 +6,7 @@
 #include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
 #include "src/codegen/code-factory.h"
+#include "src/common/assert-scope.h"
 #include "src/debug/debug.h"
 #include "src/execution/isolate.h"
 #include "src/execution/protectors-inl.h"
@@ -42,7 +43,7 @@ inline bool HasOnlySimpleReceiverElements(Isolate* isolate, JSObject receiver) {
 }
 
 inline bool HasOnlySimpleElements(Isolate* isolate, JSReceiver receiver) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   PrototypeIterator iter(isolate, receiver, kStartAtReceiver);
   for (; !iter.IsAtEnd(); iter.Advance()) {
     if (iter.GetCurrent().IsJSProxy()) return false;
@@ -68,7 +69,7 @@ void MatchArrayElementsKindToArguments(Isolate* isolate, Handle<JSArray> array,
 
   ElementsKind target_kind = origin_kind;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     int last_arg_index = std::min(first_arg_index + num_arguments, args_length);
     for (int i = first_arg_index; i < last_arg_index; i++) {
       Object arg = (*args)[i];
@@ -818,7 +819,7 @@ class ArrayConcatVisitor {
 };
 
 uint32_t EstimateElementCount(Isolate* isolate, Handle<JSArray> array) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   uint32_t length = static_cast<uint32_t>(array->length().Number());
   int element_count = 0;
   switch (array->GetElementsKind()) {
@@ -902,7 +903,7 @@ void CollectElementIndices(Isolate* isolate, Handle<JSObject> object,
     case HOLEY_SEALED_ELEMENTS:
     case HOLEY_NONEXTENSIBLE_ELEMENTS:
     case HOLEY_ELEMENTS: {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       FixedArray elements = FixedArray::cast(object->elements());
       uint32_t length = static_cast<uint32_t>(elements.length());
       if (range < length) length = range;
@@ -931,7 +932,7 @@ void CollectElementIndices(Isolate* isolate, Handle<JSObject> object,
       break;
     }
     case DICTIONARY_ELEMENTS: {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       NumberDictionary dict = NumberDictionary::cast(object->elements());
       uint32_t capacity = dict.Capacity();
       ReadOnlyRoots roots(isolate);
@@ -968,7 +969,8 @@ void CollectElementIndices(Isolate* isolate, Handle<JSObject> object,
       }
     case FAST_SLOPPY_ARGUMENTS_ELEMENTS:
     case SLOW_SLOPPY_ARGUMENTS_ELEMENTS: {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
+      DisableGCMole no_gc_mole;
       FixedArrayBase elements = object->elements();
       JSObject raw_object = *object;
       ElementsAccessor* accessor = object->GetElementsAccessor();
@@ -1284,7 +1286,7 @@ Object Slow_ArrayConcat(BuiltinArguments* args, Handle<Object> species,
           double_storage->set(j, obj->Number());
           j++;
         } else {
-          DisallowHeapAllocation no_gc;
+          DisallowGarbageCollection no_gc;
           JSArray array = JSArray::cast(*obj);
           uint32_t length = static_cast<uint32_t>(array.length().Number());
           switch (array.GetElementsKind()) {
@@ -1399,7 +1401,7 @@ Object Slow_ArrayConcat(BuiltinArguments* args, Handle<Object> species,
 }
 
 bool IsSimpleArray(Isolate* isolate, Handle<JSArray> obj) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Map map = obj->map();
   // If there is only the 'length' property we are fine.
   if (map.prototype() == isolate->native_context()->initial_array_prototype() &&
@@ -1425,7 +1427,7 @@ MaybeHandle<JSArray> Fast_ArrayConcat(Isolate* isolate,
   int n_arguments = args->length();
   int result_len = 0;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     // Iterate through all the arguments performing checks
     // and calculating total length.
     for (int i = 0; i < n_arguments; i++) {
@@ -1449,7 +1451,7 @@ MaybeHandle<JSArray> Fast_ArrayConcat(Isolate* isolate,
       // Throw an Error if we overflow the FixedArray limits
       if (FixedDoubleArray::kMaxLength < result_len ||
           FixedArray::kMaxLength < result_len) {
-        AllowHeapAllocation gc;
+        AllowGarbageCollection gc;
         THROW_NEW_ERROR(isolate,
                         NewRangeError(MessageTemplate::kInvalidArrayLength),
                         JSArray);
diff --git a/deps/v8/src/builtins/builtins-collections-gen.cc b/deps/v8/src/builtins/builtins-collections-gen.cc
index 9046c7d008a691..0d548b48b9a391 100644
--- a/deps/v8/src/builtins/builtins-collections-gen.cc
+++ b/deps/v8/src/builtins/builtins-collections-gen.cc
@@ -843,9 +843,9 @@ TNode<HeapObject> CollectionsBuiltinsAssembler::AllocateJSCollectionIterator(
 TNode<HeapObject> CollectionsBuiltinsAssembler::AllocateTable(
     Variant variant, TNode<IntPtrT> at_least_space_for) {
   if (variant == kMap || variant == kWeakMap) {
-    return AllocateOrderedHashTable<OrderedHashMap>();
+    return AllocateOrderedHashMap();
   } else {
-    return AllocateOrderedHashTable<OrderedHashSet>();
+    return AllocateOrderedHashSet();
   }
 }
 
diff --git a/deps/v8/src/builtins/builtins-console.cc b/deps/v8/src/builtins/builtins-console.cc
index bc743b6e70a8d2..c15f2f4393c110 100644
--- a/deps/v8/src/builtins/builtins-console.cc
+++ b/deps/v8/src/builtins/builtins-console.cc
@@ -123,17 +123,24 @@ BUILTIN(ConsoleTimeStamp) {
 }
 
 namespace {
+
 void InstallContextFunction(Isolate* isolate, Handle<JSObject> target,
                             const char* name, Builtins::Name builtin_id,
                             int context_id, Handle<Object> context_name) {
   Factory* const factory = isolate->factory();
 
+  Handle<NativeContext> context(isolate->native_context());
+  Handle<Map> map = isolate->sloppy_function_without_prototype_map();
+
   Handle<String> name_string =
       Name::ToFunctionName(isolate, factory->InternalizeUtf8String(name))
           .ToHandleChecked();
-  NewFunctionArgs args = NewFunctionArgs::ForBuiltinWithoutPrototype(
-      name_string, builtin_id, i::LanguageMode::kSloppy);
-  Handle<JSFunction> fun = factory->NewFunction(args);
+  Handle<SharedFunctionInfo> info =
+      factory->NewSharedFunctionInfoForBuiltin(name_string, builtin_id);
+  info->set_language_mode(LanguageMode::kSloppy);
+
+  Handle<JSFunction> fun =
+      Factory::JSFunctionBuilder{isolate, info, context}.set_map(map).Build();
 
   fun->shared().set_native(true);
   fun->shared().DontAdaptArguments();
@@ -147,6 +154,7 @@ void InstallContextFunction(Isolate* isolate, Handle<JSObject> target,
   }
   JSObject::AddProperty(isolate, target, name_string, fun, NONE);
 }
+
 }  // namespace
 
 BUILTIN(ConsoleContext) {
@@ -154,9 +162,13 @@ BUILTIN(ConsoleContext) {
 
   Factory* const factory = isolate->factory();
   Handle<String> name = factory->InternalizeUtf8String("Context");
-  NewFunctionArgs arguments = NewFunctionArgs::ForFunctionWithoutCode(
-      name, isolate->sloppy_function_map(), LanguageMode::kSloppy);
-  Handle<JSFunction> cons = factory->NewFunction(arguments);
+  Handle<SharedFunctionInfo> info =
+      factory->NewSharedFunctionInfoForBuiltin(name, Builtins::kIllegal);
+  info->set_language_mode(LanguageMode::kSloppy);
+
+  Handle<JSFunction> cons =
+      Factory::JSFunctionBuilder{isolate, info, isolate->native_context()}
+          .Build();
 
   Handle<JSObject> prototype = factory->NewJSObject(isolate->object_function());
   JSFunction::SetPrototype(cons, prototype);
diff --git a/deps/v8/src/builtins/builtins-constructor-gen.cc b/deps/v8/src/builtins/builtins-constructor-gen.cc
index 3cd4503471cdb7..e75514d7866349 100644
--- a/deps/v8/src/builtins/builtins-constructor-gen.cc
+++ b/deps/v8/src/builtins/builtins-constructor-gen.cc
@@ -13,6 +13,7 @@
 #include "src/codegen/code-stub-assembler.h"
 #include "src/codegen/interface-descriptors.h"
 #include "src/codegen/macro-assembler.h"
+#include "src/common/globals.h"
 #include "src/logging/counters.h"
 #include "src/objects/objects-inl.h"
 
@@ -281,7 +282,12 @@ TNode<JSObject> ConstructorBuiltinsAssembler::FastNewObject(
   }
   BIND(&allocate_properties);
   {
-    properties = AllocateNameDictionary(NameDictionary::kInitialCapacity);
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      properties = AllocateOrderedNameDictionary(
+          OrderedNameDictionary::kInitialCapacity);
+    } else {
+      properties = AllocateNameDictionary(NameDictionary::kInitialCapacity);
+    }
     Goto(&instantiate_map);
   }
 
@@ -462,6 +468,11 @@ TNode<HeapObject> ConstructorBuiltinsAssembler::CreateShallowObjectLiteral(
            &if_dictionary, &if_fast);
     BIND(&if_dictionary);
     {
+      if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+        // TODO(v8:11167) remove once OrderedNameDictionary supported.
+        GotoIf(Int32TrueConstant(), call_runtime);
+      }
+
       Comment("Copy dictionary properties");
       var_properties = CopyNameDictionary(CAST(LoadSlowProperties(boilerplate)),
                                           call_runtime);
diff --git a/deps/v8/src/builtins/builtins-date.cc b/deps/v8/src/builtins/builtins-date.cc
index 258b1022da3c60..dd97472276de27 100644
--- a/deps/v8/src/builtins/builtins-date.cc
+++ b/deps/v8/src/builtins/builtins-date.cc
@@ -112,7 +112,7 @@ const char* kShortMonths[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 double ParseDateTimeString(Isolate* isolate, Handle<String> str) {
   str = String::Flatten(isolate, str);
   double out[DateParser::OUTPUT_SIZE];
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   String::FlatContent str_content = str->GetFlatContent(no_gc);
   bool result;
   if (str_content.IsOneByte()) {
diff --git a/deps/v8/src/builtins/builtins-definitions.h b/deps/v8/src/builtins/builtins-definitions.h
index 30fd5a3944baeb..6c97ac96ce7a3c 100644
--- a/deps/v8/src/builtins/builtins-definitions.h
+++ b/deps/v8/src/builtins/builtins-definitions.h
@@ -232,6 +232,10 @@ namespace internal {
   TFH(KeyedHasIC_SloppyArguments, LoadWithVector)                              \
   TFH(HasIndexedInterceptorIC, LoadWithVector)                                 \
                                                                                \
+  /* Dynamic check maps */                                                     \
+  ASM(DynamicCheckMapsTrampoline, DynamicCheckMaps)                            \
+  TFC(DynamicCheckMaps, DynamicCheckMaps)                                      \
+                                                                               \
   /* Microtask helpers */                                                      \
   TFS(EnqueueMicrotask, kMicrotask)                                            \
   ASM(RunMicrotasksTrampoline, RunMicrotasksEntry)                             \
@@ -810,7 +814,6 @@ namespace internal {
   ASM(WasmDebugBreak, Dummy)                                                   \
   TFC(WasmFloat32ToNumber, WasmFloat32ToNumber)                                \
   TFC(WasmFloat64ToNumber, WasmFloat64ToNumber)                                \
-  TFS(WasmAllocateArrayWithRtt, kMap, kLength, kElementSize)                   \
   TFC(WasmI32AtomicWait32, WasmI32AtomicWait32)                                \
   TFC(WasmI64AtomicWait32, WasmI64AtomicWait32)                                \
   TFS(WasmAllocatePair, kValue1, kValue2)                                      \
diff --git a/deps/v8/src/builtins/builtins-function.cc b/deps/v8/src/builtins/builtins-function.cc
index 23ee4da8c179be..dfcfffa382907a 100644
--- a/deps/v8/src/builtins/builtins-function.cc
+++ b/deps/v8/src/builtins/builtins-function.cc
@@ -127,8 +127,10 @@ MaybeHandle<Object> CreateDynamicFunction(Isolate* isolate,
     Handle<Map> map = Map::AsLanguageMode(isolate, initial_map, shared_info);
 
     Handle<Context> context(function->context(), isolate);
-    function = isolate->factory()->NewFunctionFromSharedFunctionInfo(
-        map, shared_info, context, AllocationType::kYoung);
+    function = Factory::JSFunctionBuilder{isolate, shared_info, context}
+                   .set_map(map)
+                   .set_allocation_type(AllocationType::kYoung)
+                   .Build();
   }
   return function;
 }
diff --git a/deps/v8/src/builtins/builtins-ic-gen.cc b/deps/v8/src/builtins/builtins-ic-gen.cc
index c4de83929cddb3..fc6b21e0bd7bab 100644
--- a/deps/v8/src/builtins/builtins-ic-gen.cc
+++ b/deps/v8/src/builtins/builtins-ic-gen.cc
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
+#include "src/codegen/code-stub-assembler.h"
 #include "src/ic/accessor-assembler.h"
 
 namespace v8 {
@@ -53,5 +55,13 @@ IC_BUILTIN_PARAM(LoadGlobalICTrampoline, LoadGlobalICTrampoline,
 IC_BUILTIN_PARAM(LoadGlobalICInsideTypeofTrampoline, LoadGlobalICTrampoline,
                  INSIDE_TYPEOF)
 
+TF_BUILTIN(DynamicCheckMaps, CodeStubAssembler) {
+  auto map = Parameter<Map>(Descriptor::kMap);
+  auto slot = UncheckedParameter<IntPtrT>(Descriptor::kSlot);
+  auto handler = Parameter<Object>(Descriptor::kHandler);
+  TNode<Int32T> status = DynamicCheckMaps(map, slot, handler);
+  Return(status);
+}
+
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/builtins/builtins-internal-gen.cc b/deps/v8/src/builtins/builtins-internal-gen.cc
index 4108d897f68985..4e315e5ef584c6 100644
--- a/deps/v8/src/builtins/builtins-internal-gen.cc
+++ b/deps/v8/src/builtins/builtins-internal-gen.cc
@@ -486,6 +486,11 @@ TF_BUILTIN(DeleteProperty, DeletePropertyBaseAssembler) {
   Label if_index(this, &var_index), if_unique_name(this), if_notunique(this),
       if_notfound(this), slow(this), if_proxy(this);
 
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // TODO(v8:11167) remove once OrderedNameDictionary supported.
+    GotoIf(Int32TrueConstant(), &slow);
+  }
+
   GotoIf(TaggedIsSmi(receiver), &slow);
   TNode<Map> receiver_map = LoadMap(CAST(receiver));
   TNode<Uint16T> instance_type = LoadMapInstanceType(receiver_map);
@@ -660,6 +665,7 @@ TF_BUILTIN(SetDataProperties, SetOrCopyDataPropertiesAssembler) {
   auto context = Parameter<Context>(Descriptor::kContext);
 
   Label if_runtime(this, Label::kDeferred);
+  GotoIfForceSlowPath(&if_runtime);
   Return(SetOrCopyDataProperties(context, target, source, &if_runtime, true));
 
   BIND(&if_runtime);
@@ -915,6 +921,11 @@ TF_BUILTIN(GetProperty, CodeStubAssembler) {
   Label if_notfound(this), if_proxy(this, Label::kDeferred),
       if_slow(this, Label::kDeferred);
 
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // TODO(v8:11167) remove once OrderedNameDictionary supported.
+    GotoIf(Int32TrueConstant(), &if_slow);
+  }
+
   CodeStubAssembler::LookupPropertyInHolder lookup_property_in_holder =
       [=](TNode<HeapObject> receiver, TNode<HeapObject> holder,
           TNode<Map> holder_map, TNode<Int32T> holder_instance_type,
@@ -970,6 +981,11 @@ TF_BUILTIN(GetPropertyWithReceiver, CodeStubAssembler) {
   Label if_notfound(this), if_proxy(this, Label::kDeferred),
       if_slow(this, Label::kDeferred);
 
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // TODO(v8:11167) remove once OrderedNameDictionary supported.
+    GotoIf(Int32TrueConstant(), &if_slow);
+  }
+
   CodeStubAssembler::LookupPropertyInHolder lookup_property_in_holder =
       [=](TNode<HeapObject> receiver, TNode<HeapObject> holder,
           TNode<Map> holder_map, TNode<Int32T> holder_instance_type,
@@ -1081,8 +1097,8 @@ TF_BUILTIN(InstantiateAsmJs, CodeStubAssembler) {
   // pushed is the maximum of actual arguments count and formal parameters
   // count.
   Label argc_lt_param_count(this), argc_ge_param_count(this);
-  Branch(Int32LessThan(arg_count, parameter_count), &argc_lt_param_count,
-         &argc_ge_param_count);
+  Branch(IntPtrLessThan(args.GetLength(), ChangeInt32ToIntPtr(parameter_count)),
+         &argc_lt_param_count, &argc_ge_param_count);
   BIND(&argc_lt_param_count);
   PopAndReturn(Int32Add(parameter_count, Int32Constant(1)),
                maybe_result_or_smi_zero);
diff --git a/deps/v8/src/builtins/builtins-intl.cc b/deps/v8/src/builtins/builtins-intl.cc
index 58b09aeaee33ad..fe0cd9756a0227 100644
--- a/deps/v8/src/builtins/builtins-intl.cc
+++ b/deps/v8/src/builtins/builtins-intl.cc
@@ -220,6 +220,7 @@ BUILTIN(DateTimeFormatPrototypeFormatRangeToParts) {
 }
 
 namespace {
+
 Handle<JSFunction> CreateBoundFunction(Isolate* isolate,
                                        Handle<JSObject> object,
                                        Builtins::Name builtin_id, int len) {
@@ -238,11 +239,9 @@ Handle<JSFunction> CreateBoundFunction(Isolate* isolate,
   info->set_internal_formal_parameter_count(len);
   info->set_length(len);
 
-  Handle<Map> map = isolate->strict_function_without_prototype_map();
-
-  Handle<JSFunction> new_bound_function =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(map, info, context);
-  return new_bound_function;
+  return Factory::JSFunctionBuilder{isolate, info, context}
+      .set_map(isolate->strict_function_without_prototype_map())
+      .Build();
 }
 
 /**
@@ -381,6 +380,7 @@ Object CallOrConstructConstructor(BuiltinArguments args, Isolate* isolate,
   RETURN_RESULT_OR_FAILURE(isolate,
                            T::New(isolate, map, locales, options, method));
 }
+
 }  // namespace
 
 // Intl.DisplayNames
diff --git a/deps/v8/src/builtins/builtins-lazy-gen.cc b/deps/v8/src/builtins/builtins-lazy-gen.cc
index bd28cbc160b62c..30701bdc157f1a 100644
--- a/deps/v8/src/builtins/builtins-lazy-gen.cc
+++ b/deps/v8/src/builtins/builtins-lazy-gen.cc
@@ -123,24 +123,43 @@ void LazyBuiltinsAssembler::CompileLazy(TNode<JSFunction> function) {
   // If feedback cell isn't initialized, compile function
   GotoIf(IsUndefined(feedback_cell_value), &compile_function);
 
-  Label use_sfi_code(this);
+  Label maybe_use_sfi_code(this);
   // If there is no feedback, don't check for optimized code.
   GotoIf(HasInstanceType(feedback_cell_value, CLOSURE_FEEDBACK_CELL_ARRAY_TYPE),
-         &use_sfi_code);
+         &maybe_use_sfi_code);
 
   // If it isn't undefined or fixed array it must be a feedback vector.
   CSA_ASSERT(this, IsFeedbackVector(feedback_cell_value));
 
   // Is there an optimization marker or optimized code in the feedback vector?
   MaybeTailCallOptimizedCodeSlot(function, CAST(feedback_cell_value));
-  Goto(&use_sfi_code);
+  Goto(&maybe_use_sfi_code);
 
-  BIND(&use_sfi_code);
-  // If not, install the SFI's code entry and jump to that.
+  // At this point we have a candidate Code object. It's *not* a cached
+  // optimized Code object (we'd have tail-called it above). A usual case would
+  // be the InterpreterEntryTrampoline to start executing existing bytecode.
+  BIND(&maybe_use_sfi_code);
   CSA_ASSERT(this, TaggedNotEqual(sfi_code, HeapConstant(BUILTIN_CODE(
                                                 isolate(), CompileLazy))));
   StoreObjectField(function, JSFunction::kCodeOffset, sfi_code);
-  GenerateTailCallToJSCode(sfi_code, function);
+
+  // Finally, check for presence of an NCI cached Code object - if an entry
+  // possibly exists, call into runtime to query the cache.
+  TNode<Uint8T> flags2 =
+      LoadObjectField<Uint8T>(shared, SharedFunctionInfo::kFlags2Offset);
+  TNode<BoolT> may_have_cached_code =
+      IsSetWord32<SharedFunctionInfo::MayHaveCachedCodeBit>(flags2);
+  TNode<Code> code = Select<Code>(
+      may_have_cached_code,
+      [=]() {
+        return CAST(CallRuntime(Runtime::kTryInstallNCICode,
+                                Parameter<Context>(Descriptor::kContext),
+                                function));
+      },
+      [=]() { return sfi_code; });
+
+  // Jump to the selected code entry.
+  GenerateTailCallToJSCode(code, function);
 
   BIND(&compile_function);
   GenerateTailCallToReturnedCode(Runtime::kCompileLazy, function);
diff --git a/deps/v8/src/builtins/builtins-object-gen.cc b/deps/v8/src/builtins/builtins-object-gen.cc
index 7d133a61987eb7..ad1b6d23302f1c 100644
--- a/deps/v8/src/builtins/builtins-object-gen.cc
+++ b/deps/v8/src/builtins/builtins-object-gen.cc
@@ -5,6 +5,7 @@
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
 #include "src/codegen/code-stub-assembler.h"
+#include "src/common/globals.h"
 #include "src/heap/factory-inl.h"
 #include "src/ic/accessor-assembler.h"
 #include "src/ic/keyed-store-generic.h"
@@ -27,10 +28,13 @@ class ObjectBuiltinsAssembler : public CodeStubAssembler {
 
  protected:
   void ReturnToStringFormat(TNode<Context> context, TNode<String> string);
-  void AddToDictionaryIf(TNode<BoolT> condition,
-                         TNode<NameDictionary> name_dictionary,
-                         Handle<Name> name, TNode<Object> value,
-                         Label* bailout);
+
+  // TODO(v8:11167) remove |context| and |object| once OrderedNameDictionary
+  // supported.
+  void AddToDictionaryIf(TNode<BoolT> condition, TNode<Context> context,
+                         TNode<Object> object,
+                         TNode<HeapObject> name_dictionary, Handle<Name> name,
+                         TNode<Object> value, Label* bailout);
   TNode<JSObject> FromPropertyDescriptor(TNode<Context> context,
                                          TNode<PropertyDescriptorObject> desc);
   TNode<JSObject> FromPropertyDetails(TNode<Context> context,
@@ -432,7 +436,7 @@ TF_BUILTIN(ObjectAssign, ObjectBuiltinsAssembler) {
 
   Label done(this);
   // 2. If only one argument was passed, return to.
-  GotoIf(UintPtrLessThanOrEqual(argc, IntPtrConstant(1)), &done);
+  GotoIf(UintPtrLessThanOrEqual(args.GetLength(), IntPtrConstant(1)), &done);
 
   // 3. Let sources be the List of argument values starting with the
   //    second argument.
@@ -1029,6 +1033,12 @@ TF_BUILTIN(ObjectCreate, ObjectBuiltinsAssembler) {
 
   Label call_runtime(this, Label::kDeferred), prototype_valid(this),
       no_properties(this);
+
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // TODO(v8:11167) remove once OrderedNameDictionary supported.
+    GotoIf(Int32TrueConstant(), &call_runtime);
+  }
+
   {
     Comment("Argument 1 check: prototype");
     GotoIf(IsNull(prototype), &prototype_valid);
@@ -1068,7 +1078,12 @@ TF_BUILTIN(ObjectCreate, ObjectBuiltinsAssembler) {
     BIND(&null_proto);
     {
       map = LoadSlowObjectWithNullPrototypeMap(native_context);
-      properties = AllocateNameDictionary(NameDictionary::kInitialCapacity);
+      if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+        properties = AllocateOrderedNameDictionary(
+            OrderedNameDictionary::kInitialCapacity);
+      } else {
+        properties = AllocateNameDictionary(NameDictionary::kInitialCapacity);
+      }
       Goto(&instantiate_map);
     }
 
@@ -1260,6 +1275,12 @@ TF_BUILTIN(ObjectGetOwnPropertyDescriptor, ObjectBuiltinsAssembler) {
   Label if_keyisindex(this), if_iskeyunique(this),
       call_runtime(this, Label::kDeferred),
       return_undefined(this, Label::kDeferred), if_notunique_name(this);
+
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // TODO(v8:11167) remove once OrderedNameDictionary supported.
+    GotoIf(Int32TrueConstant(), &call_runtime);
+  }
+
   TNode<Map> map = LoadMap(object);
   TNode<Uint16T> instance_type = LoadMapInstanceType(map);
   GotoIf(IsSpecialReceiverInstanceType(instance_type), &call_runtime);
@@ -1333,13 +1354,23 @@ TF_BUILTIN(ObjectGetOwnPropertyDescriptor, ObjectBuiltinsAssembler) {
   args.PopAndReturn(UndefinedConstant());
 }
 
+// TODO(v8:11167) remove remove |context| and |object| parameters once
+// OrderedNameDictionary supported.
 void ObjectBuiltinsAssembler::AddToDictionaryIf(
-    TNode<BoolT> condition, TNode<NameDictionary> name_dictionary,
-    Handle<Name> name, TNode<Object> value, Label* bailout) {
+    TNode<BoolT> condition, TNode<Context> context, TNode<Object> object,
+    TNode<HeapObject> name_dictionary, Handle<Name> name, TNode<Object> value,
+    Label* bailout) {
   Label done(this);
   GotoIfNot(condition, &done);
 
-  Add<NameDictionary>(name_dictionary, HeapConstant(name), value, bailout);
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // TODO(v8:11167) remove once OrderedNameDictionary supported.
+    CallRuntime(Runtime::kAddDictionaryProperty, context, object,
+                HeapConstant(name), value);
+  } else {
+    Add<NameDictionary>(CAST(name_dictionary), HeapConstant(name), value,
+                        bailout);
+  }
   Goto(&done);
 
   BIND(&done);
@@ -1395,7 +1426,10 @@ TNode<JSObject> ObjectBuiltinsAssembler::FromPropertyDescriptor(
         native_context, Context::SLOW_OBJECT_WITH_OBJECT_PROTOTYPE_MAP));
     // We want to preallocate the slots for value, writable, get, set,
     // enumerable and configurable - a total of 6
-    TNode<NameDictionary> properties = AllocateNameDictionary(6);
+    TNode<HeapObject> properties =
+        V8_DICT_MODE_PROTOTYPES_BOOL
+            ? TNode<HeapObject>(AllocateOrderedNameDictionary(6))
+            : AllocateNameDictionary(6);
     TNode<JSObject> js_desc = AllocateJSObjectFromMap(map, properties);
 
     Label bailout(this, Label::kDeferred);
@@ -1403,33 +1437,33 @@ TNode<JSObject> ObjectBuiltinsAssembler::FromPropertyDescriptor(
     Factory* factory = isolate()->factory();
     TNode<Object> value =
         LoadObjectField(desc, PropertyDescriptorObject::kValueOffset);
-    AddToDictionaryIf(IsNotTheHole(value), properties, factory->value_string(),
-                      value, &bailout);
+    AddToDictionaryIf(IsNotTheHole(value), context, js_desc, properties,
+                      factory->value_string(), value, &bailout);
     AddToDictionaryIf(
-        IsSetWord32<PropertyDescriptorObject::HasWritableBit>(flags),
-        properties, factory->writable_string(),
+        IsSetWord32<PropertyDescriptorObject::HasWritableBit>(flags), context,
+        js_desc, properties, factory->writable_string(),
         SelectBooleanConstant(
             IsSetWord32<PropertyDescriptorObject::IsWritableBit>(flags)),
         &bailout);
 
     TNode<Object> get =
         LoadObjectField(desc, PropertyDescriptorObject::kGetOffset);
-    AddToDictionaryIf(IsNotTheHole(get), properties, factory->get_string(), get,
-                      &bailout);
+    AddToDictionaryIf(IsNotTheHole(get), context, js_desc, properties,
+                      factory->get_string(), get, &bailout);
     TNode<Object> set =
         LoadObjectField(desc, PropertyDescriptorObject::kSetOffset);
-    AddToDictionaryIf(IsNotTheHole(set), properties, factory->set_string(), set,
-                      &bailout);
+    AddToDictionaryIf(IsNotTheHole(set), context, js_desc, properties,
+                      factory->set_string(), set, &bailout);
 
     AddToDictionaryIf(
-        IsSetWord32<PropertyDescriptorObject::HasEnumerableBit>(flags),
-        properties, factory->enumerable_string(),
+        IsSetWord32<PropertyDescriptorObject::HasEnumerableBit>(flags), context,
+        js_desc, properties, factory->enumerable_string(),
         SelectBooleanConstant(
             IsSetWord32<PropertyDescriptorObject::IsEnumerableBit>(flags)),
         &bailout);
     AddToDictionaryIf(
         IsSetWord32<PropertyDescriptorObject::HasConfigurableBit>(flags),
-        properties, factory->configurable_string(),
+        context, js_desc, properties, factory->configurable_string(),
         SelectBooleanConstant(
             IsSetWord32<PropertyDescriptorObject::IsConfigurableBit>(flags)),
         &bailout);
@@ -1437,9 +1471,12 @@ TNode<JSObject> ObjectBuiltinsAssembler::FromPropertyDescriptor(
     js_descriptor = js_desc;
     Goto(&return_desc);
 
-    BIND(&bailout);
-    CSA_ASSERT(this, Int32Constant(0));
-    Unreachable();
+    if (!V8_DICT_MODE_PROTOTYPES_BOOL) {
+      // TODO(v8:11167) make unconditional once OrderedNameDictionary supported.
+      BIND(&bailout);
+      CSA_ASSERT(this, Int32Constant(0));
+      Unreachable();
+    }
   }
 
   BIND(&return_desc);
diff --git a/deps/v8/src/builtins/builtins-proxy-gen.cc b/deps/v8/src/builtins/builtins-proxy-gen.cc
index 74ac2b6681761a..367bc549403942 100644
--- a/deps/v8/src/builtins/builtins-proxy-gen.cc
+++ b/deps/v8/src/builtins/builtins-proxy-gen.cc
@@ -7,6 +7,7 @@
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins-utils.h"
 #include "src/builtins/builtins.h"
+#include "src/common/globals.h"
 #include "src/logging/counters.h"
 #include "src/objects/js-proxy.h"
 #include "src/objects/objects-inl.h"
@@ -51,8 +52,10 @@ TNode<JSProxy> ProxiesCodeStubAssembler::AllocateProxy(
   BIND(&create_proxy);
   TNode<HeapObject> proxy = Allocate(JSProxy::kSize);
   StoreMapNoWriteBarrier(proxy, map.value());
-  StoreObjectFieldRoot(proxy, JSProxy::kPropertiesOrHashOffset,
-                       RootIndex::kEmptyPropertyDictionary);
+  RootIndex empty_dict = V8_DICT_MODE_PROTOTYPES_BOOL
+                             ? RootIndex::kEmptyOrderedPropertyDictionary
+                             : RootIndex::kEmptyPropertyDictionary;
+  StoreObjectFieldRoot(proxy, JSProxy::kPropertiesOrHashOffset, empty_dict);
   StoreObjectFieldNoWriteBarrier(proxy, JSProxy::kTargetOffset, target);
   StoreObjectFieldNoWriteBarrier(proxy, JSProxy::kHandlerOffset, handler);
 
diff --git a/deps/v8/src/builtins/builtins-regexp-gen.cc b/deps/v8/src/builtins/builtins-regexp-gen.cc
index fa0f45e8318658..4cf3ae143740d8 100644
--- a/deps/v8/src/builtins/builtins-regexp-gen.cc
+++ b/deps/v8/src/builtins/builtins-regexp-gen.cc
@@ -11,6 +11,7 @@
 #include "src/codegen/code-factory.h"
 #include "src/codegen/code-stub-assembler.h"
 #include "src/codegen/macro-assembler.h"
+#include "src/common/globals.h"
 #include "src/execution/protectors.h"
 #include "src/heap/factory-inl.h"
 #include "src/logging/counters.h"
@@ -97,7 +98,7 @@ TNode<JSRegExpResult> RegExpBuiltinsAssembler::AllocateRegExpResult(
   const ElementsKind elements_kind = PACKED_ELEMENTS;
   TNode<Map> map = CAST(LoadContextElement(LoadNativeContext(context),
                                            Context::REGEXP_RESULT_MAP_INDEX));
-  base::Optional<TNode<AllocationSite>> no_allocation_site = base::nullopt;
+  base::Optional<TNode<AllocationSite>> no_gc_site = base::nullopt;
   TNode<IntPtrT> length_intptr = SmiUntag(length);
 
   // Note: The returned `elements` may be in young large object space, but
@@ -106,7 +107,7 @@ TNode<JSRegExpResult> RegExpBuiltinsAssembler::AllocateRegExpResult(
   TNode<JSArray> array;
   TNode<FixedArrayBase> elements;
   std::tie(array, elements) = AllocateUninitializedJSArrayWithElements(
-      elements_kind, map, length, no_allocation_site, length_intptr,
+      elements_kind, map, length, no_gc_site, length_intptr,
       kAllowLargeObjectAllocation, JSRegExpResult::kSize);
 
   // Finish result initialization.
@@ -289,8 +290,14 @@ TNode<JSRegExpResult> RegExpBuiltinsAssembler::ConstructNewResultFromMatchInfo(
     TNode<IntPtrT> num_properties = WordSar(names_length, 1);
     TNode<NativeContext> native_context = LoadNativeContext(context);
     TNode<Map> map = LoadSlowObjectWithNullPrototypeMap(native_context);
-    TNode<NameDictionary> properties =
-        AllocateNameDictionary(num_properties, kAllowLargeObjectAllocation);
+    TNode<HeapObject> properties;
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      // AllocateOrderedNameDictionary always uses kAllowLargeObjectAllocation.
+      properties = AllocateOrderedNameDictionary(num_properties);
+    } else {
+      properties =
+          AllocateNameDictionary(num_properties, kAllowLargeObjectAllocation);
+    }
 
     TNode<JSObject> group_object = AllocateJSObjectFromMap(map, properties);
     StoreObjectField(result, JSRegExpResult::kGroupsOffset, group_object);
@@ -325,18 +332,28 @@ TNode<JSRegExpResult> RegExpBuiltinsAssembler::ConstructNewResultFromMatchInfo(
       // - Receiver is extensible
       // - Receiver has no interceptors
       Label add_dictionary_property_slow(this, Label::kDeferred);
-      Add<NameDictionary>(properties, name, capture,
-                          &add_dictionary_property_slow);
+      if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+        // TODO(v8:11167) remove once OrderedNameDictionary supported.
+        CallRuntime(Runtime::kAddDictionaryProperty, context, group_object,
+                    name, capture);
+      } else {
+        Add<NameDictionary>(CAST(properties), name, capture,
+                            &add_dictionary_property_slow);
+      }
 
       var_i = i_plus_2;
       Branch(IntPtrGreaterThanOrEqual(var_i.value(), names_length), &out,
              &loop);
 
-      BIND(&add_dictionary_property_slow);
-      // If the dictionary needs resizing, the above Add call will jump here
-      // before making any changes. This shouldn't happen because we allocated
-      // the dictionary with enough space above.
-      Unreachable();
+      if (!V8_DICT_MODE_PROTOTYPES_BOOL) {
+        // TODO(v8:11167) make unconditional  once OrderedNameDictionary
+        // supported.
+        BIND(&add_dictionary_property_slow);
+        // If the dictionary needs resizing, the above Add call will jump here
+        // before making any changes. This shouldn't happen because we allocated
+        // the dictionary with enough space above.
+        Unreachable();
+      }
     }
   }
 
diff --git a/deps/v8/src/builtins/builtins-sharedarraybuffer-gen.cc b/deps/v8/src/builtins/builtins-sharedarraybuffer-gen.cc
index 1a004c493992a1..e82e0516304c0e 100644
--- a/deps/v8/src/builtins/builtins-sharedarraybuffer-gen.cc
+++ b/deps/v8/src/builtins/builtins-sharedarraybuffer-gen.cc
@@ -10,8 +10,6 @@
 namespace v8 {
 namespace internal {
 
-using compiler::Node;
-
 class SharedArrayBufferBuiltinsAssembler : public CodeStubAssembler {
  public:
   explicit SharedArrayBufferBuiltinsAssembler(
@@ -19,10 +17,13 @@ class SharedArrayBufferBuiltinsAssembler : public CodeStubAssembler {
       : CodeStubAssembler(state) {}
 
  protected:
-  using AssemblerFunction =
-      Node* (CodeAssembler::*)(MachineType type, TNode<RawPtrT> base,
-                               TNode<UintPtrT> offset, Node* value,
-                               base::Optional<TNode<UintPtrT>> value_high);
+  using AssemblerFunction = TNode<Word32T> (CodeAssembler::*)(
+      MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset,
+      TNode<Word32T> value);
+  template <class Type>
+  using AssemblerFunction64 = TNode<Type> (CodeAssembler::*)(
+      TNode<RawPtrT> base, TNode<UintPtrT> offset, TNode<UintPtrT> value,
+      TNode<UintPtrT> value_high);
   TNode<JSArrayBuffer> ValidateIntegerTypedArray(
       TNode<Object> maybe_array, TNode<Context> context,
       TNode<Int32T>* out_elements_kind, TNode<RawPtrT>* out_backing_store,
@@ -35,16 +36,17 @@ class SharedArrayBufferBuiltinsAssembler : public CodeStubAssembler {
   inline void DebugCheckAtomicIndex(TNode<JSTypedArray> array,
                                     TNode<UintPtrT> index);
 
-  void AtomicBinopBuiltinCommon(TNode<Object> maybe_array, TNode<Object> index,
-                                TNode<Object> value, TNode<Context> context,
-                                AssemblerFunction function,
-                                Runtime::FunctionId runtime_function,
-                                const char* method_name);
+  void AtomicBinopBuiltinCommon(
+      TNode<Object> maybe_array, TNode<Object> index, TNode<Object> value,
+      TNode<Context> context, AssemblerFunction function,
+      AssemblerFunction64<AtomicInt64> function_int_64,
+      AssemblerFunction64<AtomicUint64> function_uint_64,
+      Runtime::FunctionId runtime_function, const char* method_name);
 
   // Create a BigInt from the result of a 64-bit atomic operation, using
   // projections on 32-bit platforms.
-  TNode<BigInt> BigIntFromSigned64(Node* signed64);
-  TNode<BigInt> BigIntFromUnsigned64(Node* unsigned64);
+  TNode<BigInt> BigIntFromSigned64(TNode<AtomicInt64> signed64);
+  TNode<BigInt> BigIntFromUnsigned64(TNode<AtomicUint64> unsigned64);
 };
 
 // https://tc39.es/ecma262/#sec-validateintegertypedarray
@@ -142,25 +144,25 @@ void SharedArrayBufferBuiltinsAssembler::DebugCheckAtomicIndex(
 }
 
 TNode<BigInt> SharedArrayBufferBuiltinsAssembler::BigIntFromSigned64(
-    Node* signed64) {
-  if (Is64()) {
-    return BigIntFromInt64(UncheckedCast<IntPtrT>(signed64));
-  } else {
-    TNode<IntPtrT> low = UncheckedCast<IntPtrT>(Projection(0, signed64));
-    TNode<IntPtrT> high = UncheckedCast<IntPtrT>(Projection(1, signed64));
-    return BigIntFromInt32Pair(low, high);
-  }
+    TNode<AtomicInt64> signed64) {
+#if defined(V8_HOST_ARCH_32_BIT)
+  TNode<IntPtrT> low = Projection<0>(signed64);
+  TNode<IntPtrT> high = Projection<1>(signed64);
+  return BigIntFromInt32Pair(low, high);
+#else
+  return BigIntFromInt64(signed64);
+#endif
 }
 
 TNode<BigInt> SharedArrayBufferBuiltinsAssembler::BigIntFromUnsigned64(
-    Node* unsigned64) {
-  if (Is64()) {
-    return BigIntFromUint64(UncheckedCast<UintPtrT>(unsigned64));
-  } else {
-    TNode<UintPtrT> low = UncheckedCast<UintPtrT>(Projection(0, unsigned64));
-    TNode<UintPtrT> high = UncheckedCast<UintPtrT>(Projection(1, unsigned64));
-    return BigIntFromUint32Pair(low, high);
-  }
+    TNode<AtomicUint64> unsigned64) {
+#if defined(V8_HOST_ARCH_32_BIT)
+  TNode<UintPtrT> low = Projection<0>(unsigned64);
+  TNode<UintPtrT> high = Projection<1>(unsigned64);
+  return BigIntFromUint32Pair(low, high);
+#else
+  return BigIntFromUint64(unsigned64);
+#endif
 }
 
 // https://tc39.es/ecma262/#sec-atomicload
@@ -201,28 +203,26 @@ TF_BUILTIN(AtomicsLoad, SharedArrayBufferBuiltinsAssembler) {
          arraysize(case_labels));
 
   BIND(&i8);
-  Return(
-      SmiFromInt32(AtomicLoad(MachineType::Int8(), backing_store, index_word)));
+  Return(SmiFromInt32(AtomicLoad<Int8T>(backing_store, index_word)));
 
   BIND(&u8);
-  Return(SmiFromInt32(
-      AtomicLoad(MachineType::Uint8(), backing_store, index_word)));
+  Return(SmiFromInt32(AtomicLoad<Uint8T>(backing_store, index_word)));
 
   BIND(&i16);
-  Return(SmiFromInt32(
-      AtomicLoad(MachineType::Int16(), backing_store, WordShl(index_word, 1))));
+  Return(
+      SmiFromInt32(AtomicLoad<Int16T>(backing_store, WordShl(index_word, 1))));
 
   BIND(&u16);
-  Return(SmiFromInt32(AtomicLoad(MachineType::Uint16(), backing_store,
-                                 WordShl(index_word, 1))));
+  Return(
+      SmiFromInt32(AtomicLoad<Uint16T>(backing_store, WordShl(index_word, 1))));
 
   BIND(&i32);
   Return(ChangeInt32ToTagged(
-      AtomicLoad(MachineType::Int32(), backing_store, WordShl(index_word, 2))));
+      AtomicLoad<Int32T>(backing_store, WordShl(index_word, 2))));
 
   BIND(&u32);
-  Return(ChangeUint32ToTagged(AtomicLoad(MachineType::Uint32(), backing_store,
-                                         WordShl(index_word, 2))));
+  Return(ChangeUint32ToTagged(
+      AtomicLoad<Uint32T>(backing_store, WordShl(index_word, 2))));
 #if V8_TARGET_ARCH_MIPS && !_MIPS_ARCH_MIPS32R6
   BIND(&i64);
   Goto(&u64);
@@ -234,15 +234,12 @@ TF_BUILTIN(AtomicsLoad, SharedArrayBufferBuiltinsAssembler) {
   }
 #else
   BIND(&i64);
-  // This uses Uint64() intentionally: AtomicLoad is not implemented for
-  // Int64(), which is fine because the machine instruction only cares
-  // about words.
-  Return(BigIntFromSigned64(AtomicLoad(MachineType::Uint64(), backing_store,
-                                       WordShl(index_word, 3))));
+  Return(BigIntFromSigned64(
+      AtomicLoad64<AtomicInt64>(backing_store, WordShl(index_word, 3))));
 
   BIND(&u64);
-  Return(BigIntFromUnsigned64(AtomicLoad(MachineType::Uint64(), backing_store,
-                                         WordShl(index_word, 3))));
+  Return(BigIntFromUnsigned64(
+      AtomicLoad64<AtomicUint64>(backing_store, WordShl(index_word, 3))));
 #endif
 
   // This shouldn't happen, we've already validated the type.
@@ -342,8 +339,7 @@ TF_BUILTIN(AtomicsStore, SharedArrayBufferBuiltinsAssembler) {
   TVARIABLE(UintPtrT, var_high);
   BigIntToRawBytes(value_bigint, &var_low, &var_high);
   TNode<UintPtrT> high = Is64() ? TNode<UintPtrT>() : var_high.value();
-  AtomicStore(MachineRepresentation::kWord64, backing_store,
-              WordShl(index_word, 3), var_low.value(), high);
+  AtomicStore64(backing_store, WordShl(index_word, 3), var_low.value(), high);
   Return(value_bigint);
 #endif
 
@@ -423,32 +419,32 @@ TF_BUILTIN(AtomicsExchange, SharedArrayBufferBuiltinsAssembler) {
          arraysize(case_labels));
 
   BIND(&i8);
-  Return(SmiFromInt32(AtomicExchange(MachineType::Int8(), backing_store,
-                                     index_word, value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed(AtomicExchange(MachineType::Int8(), backing_store,
+                                            index_word, value_word32))));
 
   BIND(&u8);
-  Return(SmiFromInt32(AtomicExchange(MachineType::Uint8(), backing_store,
-                                     index_word, value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed(AtomicExchange(MachineType::Uint8(), backing_store,
+                                            index_word, value_word32))));
 
   BIND(&i16);
-  Return(SmiFromInt32(AtomicExchange(MachineType::Int16(), backing_store,
-                                     WordShl(index_word, UintPtrConstant(1)),
-                                     value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed(
+      AtomicExchange(MachineType::Int16(), backing_store,
+                     WordShl(index_word, UintPtrConstant(1)), value_word32))));
 
   BIND(&u16);
-  Return(SmiFromInt32(AtomicExchange(MachineType::Uint16(), backing_store,
-                                     WordShl(index_word, UintPtrConstant(1)),
-                                     value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed(
+      AtomicExchange(MachineType::Uint16(), backing_store,
+                     WordShl(index_word, UintPtrConstant(1)), value_word32))));
 
   BIND(&i32);
-  Return(ChangeInt32ToTagged(AtomicExchange(
-      MachineType::Int32(), backing_store,
-      WordShl(index_word, UintPtrConstant(2)), value_word32, base::nullopt)));
+  Return(ChangeInt32ToTagged(Signed(
+      AtomicExchange(MachineType::Int32(), backing_store,
+                     WordShl(index_word, UintPtrConstant(2)), value_word32))));
 
   BIND(&u32);
-  Return(ChangeUint32ToTagged(AtomicExchange(
-      MachineType::Uint32(), backing_store,
-      WordShl(index_word, UintPtrConstant(2)), value_word32, base::nullopt)));
+  Return(ChangeUint32ToTagged(Unsigned(
+      AtomicExchange(MachineType::Uint32(), backing_store,
+                     WordShl(index_word, UintPtrConstant(2)), value_word32))));
 
   BIND(&big);
   // 4. If typedArray.[[ContentType]] is BigInt, let v be ? ToBigInt(value).
@@ -468,17 +464,14 @@ TF_BUILTIN(AtomicsExchange, SharedArrayBufferBuiltinsAssembler) {
   Unreachable();
 
   BIND(&i64);
-  // This uses Uint64() intentionally: AtomicExchange is not implemented for
-  // Int64(), which is fine because the machine instruction only cares
-  // about words.
-  Return(BigIntFromSigned64(AtomicExchange(
-      MachineType::Uint64(), backing_store,
-      WordShl(index_word, UintPtrConstant(3)), var_low.value(), high)));
+  Return(BigIntFromSigned64(AtomicExchange64<AtomicInt64>(
+      backing_store, WordShl(index_word, UintPtrConstant(3)), var_low.value(),
+      high)));
 
   BIND(&u64);
-  Return(BigIntFromUnsigned64(AtomicExchange(
-      MachineType::Uint64(), backing_store,
-      WordShl(index_word, UintPtrConstant(3)), var_low.value(), high)));
+  Return(BigIntFromUnsigned64(AtomicExchange64<AtomicUint64>(
+      backing_store, WordShl(index_word, UintPtrConstant(3)), var_low.value(),
+      high)));
 
   // This shouldn't happen, we've already validated the type.
   BIND(&other);
@@ -563,34 +556,34 @@ TF_BUILTIN(AtomicsCompareExchange, SharedArrayBufferBuiltinsAssembler) {
          arraysize(case_labels));
 
   BIND(&i8);
-  Return(SmiFromInt32(AtomicCompareExchange(MachineType::Int8(), backing_store,
-                                            index_word, old_value_word32,
-                                            new_value_word32)));
+  Return(SmiFromInt32(Signed(
+      AtomicCompareExchange(MachineType::Int8(), backing_store, index_word,
+                            old_value_word32, new_value_word32))));
 
   BIND(&u8);
-  Return(SmiFromInt32(AtomicCompareExchange(MachineType::Uint8(), backing_store,
-                                            index_word, old_value_word32,
-                                            new_value_word32)));
+  Return(SmiFromInt32(Signed(
+      AtomicCompareExchange(MachineType::Uint8(), backing_store, index_word,
+                            old_value_word32, new_value_word32))));
 
   BIND(&i16);
-  Return(SmiFromInt32(AtomicCompareExchange(
+  Return(SmiFromInt32(Signed(AtomicCompareExchange(
       MachineType::Int16(), backing_store, WordShl(index_word, 1),
-      old_value_word32, new_value_word32)));
+      old_value_word32, new_value_word32))));
 
   BIND(&u16);
-  Return(SmiFromInt32(AtomicCompareExchange(
+  Return(SmiFromInt32(Signed(AtomicCompareExchange(
       MachineType::Uint16(), backing_store, WordShl(index_word, 1),
-      old_value_word32, new_value_word32)));
+      old_value_word32, new_value_word32))));
 
   BIND(&i32);
-  Return(ChangeInt32ToTagged(AtomicCompareExchange(
+  Return(ChangeInt32ToTagged(Signed(AtomicCompareExchange(
       MachineType::Int32(), backing_store, WordShl(index_word, 2),
-      old_value_word32, new_value_word32)));
+      old_value_word32, new_value_word32))));
 
   BIND(&u32);
-  Return(ChangeUint32ToTagged(AtomicCompareExchange(
+  Return(ChangeUint32ToTagged(Unsigned(AtomicCompareExchange(
       MachineType::Uint32(), backing_store, WordShl(index_word, 2),
-      old_value_word32, new_value_word32)));
+      old_value_word32, new_value_word32))));
 
   BIND(&big);
   // 4. If typedArray.[[ContentType]] is BigInt, then
@@ -620,14 +613,14 @@ TF_BUILTIN(AtomicsCompareExchange, SharedArrayBufferBuiltinsAssembler) {
   // This uses Uint64() intentionally: AtomicCompareExchange is not implemented
   // for Int64(), which is fine because the machine instruction only cares
   // about words.
-  Return(BigIntFromSigned64(AtomicCompareExchange(
-      MachineType::Uint64(), backing_store, WordShl(index_word, 3),
-      var_old_low.value(), var_new_low.value(), old_high, new_high)));
+  Return(BigIntFromSigned64(AtomicCompareExchange64<AtomicInt64>(
+      backing_store, WordShl(index_word, 3), var_old_low.value(),
+      var_new_low.value(), old_high, new_high)));
 
   BIND(&u64);
-  Return(BigIntFromUnsigned64(AtomicCompareExchange(
-      MachineType::Uint64(), backing_store, WordShl(index_word, 3),
-      var_old_low.value(), var_new_low.value(), old_high, new_high)));
+  Return(BigIntFromUnsigned64(AtomicCompareExchange64<AtomicUint64>(
+      backing_store, WordShl(index_word, 3), var_old_low.value(),
+      var_new_low.value(), old_high, new_high)));
 
   // This shouldn't happen, we've already validated the type.
   BIND(&other);
@@ -642,15 +635,17 @@ TF_BUILTIN(AtomicsCompareExchange, SharedArrayBufferBuiltinsAssembler) {
   }
 }
 
-#define BINOP_BUILTIN(op, method_name)                            \
-  TF_BUILTIN(Atomics##op, SharedArrayBufferBuiltinsAssembler) {   \
-    auto array = Parameter<Object>(Descriptor::kArray);           \
-    auto index = Parameter<Object>(Descriptor::kIndex);           \
-    auto value = Parameter<Object>(Descriptor::kValue);           \
-    auto context = Parameter<Context>(Descriptor::kContext);      \
-    AtomicBinopBuiltinCommon(array, index, value, context,        \
-                             &CodeAssembler::Atomic##op,          \
-                             Runtime::kAtomics##op, method_name); \
+#define BINOP_BUILTIN(op, method_name)                                        \
+  TF_BUILTIN(Atomics##op, SharedArrayBufferBuiltinsAssembler) {               \
+    auto array = Parameter<Object>(Descriptor::kArray);                       \
+    auto index = Parameter<Object>(Descriptor::kIndex);                       \
+    auto value = Parameter<Object>(Descriptor::kValue);                       \
+    auto context = Parameter<Context>(Descriptor::kContext);                  \
+    AtomicBinopBuiltinCommon(array, index, value, context,                    \
+                             &CodeAssembler::Atomic##op,                      \
+                             &CodeAssembler::Atomic##op##64 < AtomicInt64 >,  \
+                             &CodeAssembler::Atomic##op##64 < AtomicUint64 >, \
+                             Runtime::kAtomics##op, method_name);             \
   }
 // https://tc39.es/ecma262/#sec-atomics.add
 BINOP_BUILTIN(Add, "Atomics.add")
@@ -668,6 +663,8 @@ BINOP_BUILTIN(Xor, "Atomics.xor")
 void SharedArrayBufferBuiltinsAssembler::AtomicBinopBuiltinCommon(
     TNode<Object> maybe_array, TNode<Object> index, TNode<Object> value,
     TNode<Context> context, AssemblerFunction function,
+    AssemblerFunction64<AtomicInt64> function_int_64,
+    AssemblerFunction64<AtomicUint64> function_uint_64,
     Runtime::FunctionId runtime_function, const char* method_name) {
   // 1. Let buffer be ? ValidateIntegerTypedArray(typedArray).
   Label detached(this);
@@ -723,29 +720,27 @@ void SharedArrayBufferBuiltinsAssembler::AtomicBinopBuiltinCommon(
          arraysize(case_labels));
 
   BIND(&i8);
-  Return(
-      SmiFromInt32((this->*function)(MachineType::Int8(), backing_store,
-                                     index_word, value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed((this->*function)(
+      MachineType::Int8(), backing_store, index_word, value_word32))));
   BIND(&u8);
-  Return(
-      SmiFromInt32((this->*function)(MachineType::Uint8(), backing_store,
-                                     index_word, value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed((this->*function)(
+      MachineType::Uint8(), backing_store, index_word, value_word32))));
   BIND(&i16);
-  Return(SmiFromInt32((this->*function)(MachineType::Int16(), backing_store,
-                                        WordShl(index_word, UintPtrConstant(1)),
-                                        value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed((this->*function)(
+      MachineType::Int16(), backing_store,
+      WordShl(index_word, UintPtrConstant(1)), value_word32))));
   BIND(&u16);
-  Return(SmiFromInt32((this->*function)(MachineType::Uint16(), backing_store,
-                                        WordShl(index_word, UintPtrConstant(1)),
-                                        value_word32, base::nullopt)));
+  Return(SmiFromInt32(Signed((this->*function)(
+      MachineType::Uint16(), backing_store,
+      WordShl(index_word, UintPtrConstant(1)), value_word32))));
   BIND(&i32);
-  Return(ChangeInt32ToTagged((this->*function)(
+  Return(ChangeInt32ToTagged(Signed((this->*function)(
       MachineType::Int32(), backing_store,
-      WordShl(index_word, UintPtrConstant(2)), value_word32, base::nullopt)));
+      WordShl(index_word, UintPtrConstant(2)), value_word32))));
   BIND(&u32);
-  Return(ChangeUint32ToTagged((this->*function)(
+  Return(ChangeUint32ToTagged(Unsigned((this->*function)(
       MachineType::Uint32(), backing_store,
-      WordShl(index_word, UintPtrConstant(2)), value_word32, base::nullopt)));
+      WordShl(index_word, UintPtrConstant(2)), value_word32))));
   BIND(&big);
   // 4. If typedArray.[[ContentType]] is BigInt, let v be ? ToBigInt(value).
   TNode<BigInt> value_bigint = ToBigInt(context, value);
@@ -764,17 +759,14 @@ void SharedArrayBufferBuiltinsAssembler::AtomicBinopBuiltinCommon(
   Unreachable();
 
   BIND(&i64);
-  // This uses Uint64() intentionally: Atomic* ops are not implemented for
-  // Int64(), which is fine because the machine instructions only care
-  // about words.
-  Return(BigIntFromSigned64((this->*function)(
-      MachineType::Uint64(), backing_store,
-      WordShl(index_word, UintPtrConstant(3)), var_low.value(), high)));
+  Return(BigIntFromSigned64((this->*function_int_64)(
+      backing_store, WordShl(index_word, UintPtrConstant(3)), var_low.value(),
+      high)));
   BIND(&u64);
-  Return(BigIntFromUnsigned64((this->*function)(
-      MachineType::Uint64(), backing_store,
-      WordShl(index_word, UintPtrConstant(3)), var_low.value(), high)));
-  // This shouldn't happen, we've already validated the type.
+  Return(BigIntFromUnsigned64((this->*function_uint_64)(
+      backing_store, WordShl(index_word, UintPtrConstant(3)), var_low.value(),
+      high)));
+  // // This shouldn't happen, we've already validated the type.
   BIND(&other);
   Unreachable();
 #endif  // V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64 || V8_TARGET_ARCH_PPC64
diff --git a/deps/v8/src/builtins/builtins-string-gen.cc b/deps/v8/src/builtins/builtins-string-gen.cc
index aa982a3c1bd717..0b08f8a7432011 100644
--- a/deps/v8/src/builtins/builtins-string-gen.cc
+++ b/deps/v8/src/builtins/builtins-string-gen.cc
@@ -40,12 +40,6 @@ TNode<RawPtrT> StringBuiltinsAssembler::DirectStringData(
 
   BIND(&if_external);
   {
-    // This is only valid for ExternalStrings where the resource data
-    // pointer is cached (i.e. no uncached external strings).
-    CSA_ASSERT(this, Word32NotEqual(
-                         Word32And(string_instance_type,
-                                   Int32Constant(kUncachedExternalStringMask)),
-                         Int32Constant(kUncachedExternalStringTag)));
     var_data = LoadExternalStringResourceDataPtr(CAST(string));
     Goto(&if_join);
   }
@@ -336,7 +330,7 @@ TNode<String> StringBuiltinsAssembler::AllocateConsString(TNode<Uint32T> length,
   TNode<HeapObject> result = AllocateInNewSpace(ConsString::kSize);
   StoreMapNoWriteBarrier(result, result_map);
   StoreObjectFieldNoWriteBarrier(result, ConsString::kLengthOffset, length);
-  StoreObjectFieldNoWriteBarrier(result, ConsString::kHashFieldOffset,
+  StoreObjectFieldNoWriteBarrier(result, ConsString::kRawHashFieldOffset,
                                  Int32Constant(String::kEmptyHashField));
   StoreObjectFieldNoWriteBarrier(result, ConsString::kFirstOffset, left);
   StoreObjectFieldNoWriteBarrier(result, ConsString::kSecondOffset, right);
@@ -796,10 +790,12 @@ TF_BUILTIN(StringFromCharCode, StringBuiltinsAssembler) {
   auto context = Parameter<Context>(Descriptor::kContext);
 
   CodeStubArguments arguments(this, argc);
+  TNode<Uint32T> unsigned_argc =
+      Unsigned(TruncateIntPtrToInt32(arguments.GetLength()));
   // Check if we have exactly one argument (plus the implicit receiver), i.e.
   // if the parent frame is not an arguments adaptor frame.
   Label if_oneargument(this), if_notoneargument(this);
-  Branch(Word32Equal(argc, Int32Constant(1)), &if_oneargument,
+  Branch(IntPtrEqual(arguments.GetLength(), IntPtrConstant(1)), &if_oneargument,
          &if_notoneargument);
 
   BIND(&if_oneargument);
@@ -820,7 +816,7 @@ TF_BUILTIN(StringFromCharCode, StringBuiltinsAssembler) {
   {
     Label two_byte(this);
     // Assume that the resulting string contains only one-byte characters.
-    TNode<String> one_byte_result = AllocateSeqOneByteString(Unsigned(argc));
+    TNode<String> one_byte_result = AllocateSeqOneByteString(unsigned_argc);
 
     TVARIABLE(IntPtrT, var_max_index, IntPtrConstant(0));
 
@@ -851,7 +847,7 @@ TF_BUILTIN(StringFromCharCode, StringBuiltinsAssembler) {
     // At least one of the characters in the string requires a 16-bit
     // representation.  Allocate a SeqTwoByteString to hold the resulting
     // string.
-    TNode<String> two_byte_result = AllocateSeqTwoByteString(Unsigned(argc));
+    TNode<String> two_byte_result = AllocateSeqTwoByteString(unsigned_argc);
 
     // Copy the characters that have already been put in the 8-bit string into
     // their corresponding positions in the new 16-bit string.
@@ -1100,11 +1096,11 @@ void StringIncludesIndexOfAssembler::Generate(SearchVariant variant,
   Label argc_1(this), argc_2(this), call_runtime(this, Label::kDeferred),
       fast_path(this);
 
-  GotoIf(IntPtrEqual(argc, IntPtrConstant(1)), &argc_1);
-  GotoIf(IntPtrGreaterThan(argc, IntPtrConstant(1)), &argc_2);
+  GotoIf(IntPtrEqual(arguments.GetLength(), IntPtrConstant(1)), &argc_1);
+  GotoIf(IntPtrGreaterThan(arguments.GetLength(), IntPtrConstant(1)), &argc_2);
   {
     Comment("0 Argument case");
-    CSA_ASSERT(this, IntPtrEqual(argc, IntPtrConstant(0)));
+    CSA_ASSERT(this, IntPtrEqual(arguments.GetLength(), IntPtrConstant(0)));
     TNode<Oddball> undefined = UndefinedConstant();
     var_search_string = undefined;
     var_position = undefined;
@@ -1656,8 +1652,9 @@ TNode<JSArray> StringBuiltinsAssembler::StringToArray(
     BuildFastLoop<IntPtrT>(
         IntPtrConstant(0), length,
         [&](TNode<IntPtrT> index) {
-          // TODO(jkummerow): Implement a CSA version of DisallowHeapAllocation
-          // and use that to guard ToDirectStringAssembler.PointerToData().
+          // TODO(jkummerow): Implement a CSA version of
+          // DisallowGarbageCollection and use that to guard
+          // ToDirectStringAssembler.PointerToData().
           CSA_ASSERT(this, WordEqual(to_direct.PointerToData(&call_runtime),
                                      string_data));
           TNode<Int32T> char_code =
@@ -1942,8 +1939,8 @@ void StringBuiltinsAssembler::CopyStringCharacters(
   int to_index_constant = 0, from_index_constant = 0;
   bool index_same = (from_encoding == to_encoding) &&
                     (from_index == to_index ||
-                     (ToInt32Constant(from_index, &from_index_constant) &&
-                      ToInt32Constant(to_index, &to_index_constant) &&
+                     (TryToInt32Constant(from_index, &from_index_constant) &&
+                      TryToInt32Constant(to_index, &to_index_constant) &&
                       from_index_constant == to_index_constant));
   BuildFastLoop<IntPtrT>(
       vars, from_offset, limit_offset,
diff --git a/deps/v8/src/builtins/builtins-string.cc b/deps/v8/src/builtins/builtins-string.cc
index 89942117566fde..7fd1c76381aac8 100644
--- a/deps/v8/src/builtins/builtins-string.cc
+++ b/deps/v8/src/builtins/builtins-string.cc
@@ -112,7 +112,7 @@ BUILTIN(StringFromCodePoint) {
       isolate->factory()->NewRawTwoByteString(
           static_cast<int>(one_byte_buffer.size() + two_byte_buffer.size())));
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CopyChars(result->GetChars(no_gc), one_byte_buffer.data(),
             one_byte_buffer.size());
   CopyChars(result->GetChars(no_gc) + one_byte_buffer.size(),
@@ -180,7 +180,7 @@ BUILTIN(StringPrototypeLocaleCompare) {
   str1 = String::Flatten(isolate, str1);
   str2 = String::Flatten(isolate, str2);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   String::FlatContent flat1 = str1->GetFlatContent(no_gc);
   String::FlatContent flat2 = str2->GetFlatContent(no_gc);
 
@@ -242,7 +242,7 @@ template <class Converter>
 V8_WARN_UNUSED_RESULT static Object ConvertCaseHelper(
     Isolate* isolate, String string, SeqString result, int result_length,
     unibrow::Mapping<Converter, 128>* mapping) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // We try this twice, once with the assumption that the result is no longer
   // than the input and, if that assumption breaks, again with the exact
   // length.  This may not be pretty, but it is nicer than what was here before
@@ -306,7 +306,7 @@ V8_WARN_UNUSED_RESULT static Object ConvertCaseHelper(
         if (char_length == 0) char_length = 1;
         current_length += char_length;
         if (current_length > String::kMaxLength) {
-          AllowHeapAllocation allocate_error_and_return;
+          AllowGarbageCollection allocate_error_and_return;
           THROW_NEW_ERROR_RETURN_FAILURE(isolate,
                                          NewInvalidStringLengthError());
         }
@@ -354,7 +354,7 @@ V8_WARN_UNUSED_RESULT static Object ConvertCase(
     // Same length as input.
     Handle<SeqOneByteString> result =
         isolate->factory()->NewRawOneByteString(length).ToHandleChecked();
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent flat_content = s->GetFlatContent(no_gc);
     DCHECK(flat_content.IsFlat());
     bool has_changed_character = false;
diff --git a/deps/v8/src/builtins/builtins-string.tq b/deps/v8/src/builtins/builtins-string.tq
index 6c1eec1b2d68a5..b7f8a671c2822a 100644
--- a/deps/v8/src/builtins/builtins-string.tq
+++ b/deps/v8/src/builtins/builtins-string.tq
@@ -139,7 +139,7 @@ transitioning javascript builtin StringPrototypeCharAt(
     GenerateStringAt(receiver, position, 'String.prototype.charAt')
         otherwise IfInBounds, IfOutOfBounds;
   } label IfInBounds(string: String, index: uintptr, _length: uintptr) {
-    const code: int32 = StringCharCodeAt(string, index);
+    const code: char16 = StringCharCodeAt(string, index);
     return StringFromSingleCharCode(code);
   } label IfOutOfBounds {
     return kEmptyString;
@@ -154,7 +154,7 @@ transitioning javascript builtin StringPrototypeCharCodeAt(
     GenerateStringAt(receiver, position, 'String.prototype.charCodeAt')
         otherwise IfInBounds, IfOutOfBounds;
   } label IfInBounds(string: String, index: uintptr, _length: uintptr) {
-    const code: int32 = StringCharCodeAt(string, index);
+    const code: uint32 = StringCharCodeAt(string, index);
     return Convert<Smi>(code);
   } label IfOutOfBounds {
     return kNaN;
@@ -250,7 +250,7 @@ transitioning builtin StringAddConvertRight(implicit context: Context)(
 builtin StringCharAt(implicit context: Context)(
     receiver: String, position: uintptr): String {
   // Load the character code at the {position} from the {receiver}.
-  const code: int32 = StringCharCodeAt(receiver, position);
+  const code: char16 = StringCharCodeAt(receiver, position);
   // And return the single character string with only that {code}
   return StringFromSingleCharCode(code);
 }
diff --git a/deps/v8/src/builtins/builtins-symbol.cc b/deps/v8/src/builtins/builtins-symbol.cc
index 54db6b79b4ea9a..682563ddcf417c 100644
--- a/deps/v8/src/builtins/builtins-symbol.cc
+++ b/deps/v8/src/builtins/builtins-symbol.cc
@@ -52,7 +52,7 @@ BUILTIN(SymbolKeyFor) {
         isolate, NewTypeError(MessageTemplate::kSymbolKeyFor, obj));
   }
   Handle<Symbol> symbol = Handle<Symbol>::cast(obj);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object result;
   if (symbol->is_in_public_symbol_table()) {
     result = symbol->description();
diff --git a/deps/v8/src/builtins/builtins-trace.cc b/deps/v8/src/builtins/builtins-trace.cc
index e98b38d1a5d157..cf85ce9948b547 100644
--- a/deps/v8/src/builtins/builtins-trace.cc
+++ b/deps/v8/src/builtins/builtins-trace.cc
@@ -12,6 +12,7 @@
 
 #if defined(V8_USE_PERFETTO)
 #include "protos/perfetto/trace/track_event/debug_annotation.pbzero.h"
+#include "src/base/platform/wrappers.h"
 #endif
 
 namespace v8 {
@@ -39,9 +40,9 @@ class MaybeUtf8 {
         // Why copy? Well, the trace event mechanism requires null-terminated
         // strings, the bytes we get from SeqOneByteString are not. buf_ is
         // guaranteed to be null terminated.
-        DisallowHeapAllocation no_gc;
-        memcpy(buf_, Handle<SeqOneByteString>::cast(string)->GetChars(no_gc),
-               len);
+        DisallowGarbageCollection no_gc;
+        base::Memcpy(
+            buf_, Handle<SeqOneByteString>::cast(string)->GetChars(no_gc), len);
       }
     } else {
       Local<v8::String> local = Utils::ToLocal(string);
diff --git a/deps/v8/src/builtins/builtins-typed-array-gen.cc b/deps/v8/src/builtins/builtins-typed-array-gen.cc
index 3bf0c6e73ec246..dea43fcc5d8825 100644
--- a/deps/v8/src/builtins/builtins-typed-array-gen.cc
+++ b/deps/v8/src/builtins/builtins-typed-array-gen.cc
@@ -429,14 +429,14 @@ void TypedArrayBuiltinsAssembler::StoreJSTypedArrayElementFromNumeric(
   }
 }
 
-void TypedArrayBuiltinsAssembler::StoreJSTypedArrayElementFromTagged(
+template <typename TValue>
+void TypedArrayBuiltinsAssembler::StoreJSTypedArrayElementFromPreparedValue(
     TNode<Context> context, TNode<JSTypedArray> typed_array,
-    TNode<UintPtrT> index, TNode<Object> value, ElementsKind elements_kind,
-    Label* if_detached) {
-  // |prepared_value| is Word32T or Float64T or Float32T or BigInt.
-  Node* prepared_value =
-      PrepareValueForWriteToTypedArray(value, elements_kind, context);
-
+    TNode<UintPtrT> index, TNode<TValue> prepared_value,
+    ElementsKind elements_kind, Label* if_detached) {
+  static_assert(std::is_same<TValue, UntaggedT>::value ||
+                    std::is_same<TValue, BigInt>::value,
+                "Only UntaggedT or BigInt values are allowed");
   // ToNumber/ToBigInt may execute JavaScript code, which could detach
   // the array's buffer.
   TNode<JSArrayBuffer> buffer = LoadJSArrayBufferViewBuffer(typed_array);
@@ -446,6 +446,27 @@ void TypedArrayBuiltinsAssembler::StoreJSTypedArrayElementFromTagged(
   StoreElement(data_ptr, elements_kind, index, prepared_value);
 }
 
+void TypedArrayBuiltinsAssembler::StoreJSTypedArrayElementFromTagged(
+    TNode<Context> context, TNode<JSTypedArray> typed_array,
+    TNode<UintPtrT> index, TNode<Object> value, ElementsKind elements_kind,
+    Label* if_detached) {
+  if (elements_kind == BIGINT64_ELEMENTS ||
+      elements_kind == BIGUINT64_ELEMENTS) {
+    TNode<BigInt> prepared_value =
+        PrepareValueForWriteToTypedArray<BigInt>(value, elements_kind, context);
+    StoreJSTypedArrayElementFromPreparedValue(context, typed_array, index,
+                                              prepared_value, elements_kind,
+                                              if_detached);
+  } else {
+    TNode<UntaggedT> prepared_value =
+        PrepareValueForWriteToTypedArray<UntaggedT>(value, elements_kind,
+                                                    context);
+    StoreJSTypedArrayElementFromPreparedValue(context, typed_array, index,
+                                              prepared_value, elements_kind,
+                                              if_detached);
+  }
+}
+
 // ES #sec-get-%typedarray%.prototype-@@tostringtag
 TF_BUILTIN(TypedArrayPrototypeToStringTag, TypedArrayBuiltinsAssembler) {
   auto receiver = Parameter<Object>(Descriptor::kReceiver);
diff --git a/deps/v8/src/builtins/builtins-typed-array-gen.h b/deps/v8/src/builtins/builtins-typed-array-gen.h
index fcaa2f2a650613..f7cfefdc8137c7 100644
--- a/deps/v8/src/builtins/builtins-typed-array-gen.h
+++ b/deps/v8/src/builtins/builtins-typed-array-gen.h
@@ -95,6 +95,11 @@ class TypedArrayBuiltinsAssembler : public CodeStubAssembler {
                                           TNode<Object> value,
                                           ElementsKind elements_kind,
                                           Label* if_detached);
+  template <typename TValue>
+  void StoreJSTypedArrayElementFromPreparedValue(
+      TNode<Context> context, TNode<JSTypedArray> typed_array,
+      TNode<UintPtrT> index_node, TNode<TValue> value,
+      ElementsKind elements_kind, Label* if_detached);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/builtins-wasm-gen.cc b/deps/v8/src/builtins/builtins-wasm-gen.cc
index a996161e2f778d..9bf6f416c28cee 100644
--- a/deps/v8/src/builtins/builtins-wasm-gen.cc
+++ b/deps/v8/src/builtins/builtins-wasm-gen.cc
@@ -107,26 +107,6 @@ TF_BUILTIN(WasmI64AtomicWait32, WasmBuiltinsAssembler) {
   Return(Unsigned(SmiToInt32(result_smi)));
 }
 
-TF_BUILTIN(WasmAllocateArrayWithRtt, WasmBuiltinsAssembler) {
-  auto map = Parameter<Map>(Descriptor::kMap);
-  auto length = Parameter<Smi>(Descriptor::kLength);
-  auto element_size = Parameter<Smi>(Descriptor::kElementSize);
-  TNode<IntPtrT> untagged_length = SmiUntag(length);
-  // instance_size = WasmArray::kHeaderSize
-  //               + RoundUp(element_size * length, kObjectAlignment)
-  TNode<IntPtrT> raw_size = IntPtrMul(SmiUntag(element_size), untagged_length);
-  TNode<IntPtrT> rounded_size =
-      WordAnd(IntPtrAdd(raw_size, IntPtrConstant(kObjectAlignmentMask)),
-              IntPtrConstant(~kObjectAlignmentMask));
-  TNode<IntPtrT> instance_size =
-      IntPtrAdd(IntPtrConstant(WasmArray::kHeaderSize), rounded_size);
-  TNode<WasmArray> result = UncheckedCast<WasmArray>(Allocate(instance_size));
-  StoreMap(result, map);
-  StoreObjectFieldNoWriteBarrier(result, WasmArray::kLengthOffset,
-                                 TruncateIntPtrToInt32(untagged_length));
-  Return(result);
-}
-
 TF_BUILTIN(WasmAllocatePair, WasmBuiltinsAssembler) {
   TNode<WasmInstanceObject> instance = LoadInstanceFromFrame();
   TNode<HeapObject> value1 = Parameter<HeapObject>(Descriptor::kValue1);
diff --git a/deps/v8/src/builtins/builtins.h b/deps/v8/src/builtins/builtins.h
index e391cccfb5c824..f16ce84b0ddd1c 100644
--- a/deps/v8/src/builtins/builtins.h
+++ b/deps/v8/src/builtins/builtins.h
@@ -40,6 +40,9 @@ class Builtins {
  public:
   explicit Builtins(Isolate* isolate) : isolate_(isolate) {}
 
+  Builtins(const Builtins&) = delete;
+  Builtins& operator=(const Builtins&) = delete;
+
   void TearDown();
 
   // Disassembler support.
@@ -250,8 +253,6 @@ class Builtins {
   int js_entry_handler_offset_ = 0;
 
   friend class SetupIsolateDelegate;
-
-  DISALLOW_COPY_AND_ASSIGN(Builtins);
 };
 
 Builtins::Name ExampleBuiltinForTorqueFunctionPointerType(
diff --git a/deps/v8/src/builtins/cast.tq b/deps/v8/src/builtins/cast.tq
index 362086f8796444..056cf8bc748136 100644
--- a/deps/v8/src/builtins/cast.tq
+++ b/deps/v8/src/builtins/cast.tq
@@ -404,7 +404,7 @@ Cast<PrivateSymbol>(o: HeapObject): PrivateSymbol labels CastError {
   return Cast<PrivateSymbol>(s) otherwise CastError;
 }
 
-Cast<DirectString>(o: HeapObject): DirectString
+Cast<DirectString>(o: String): DirectString
     labels CastError {
   return TaggedToDirectString(o) otherwise CastError;
 }
@@ -538,11 +538,112 @@ Cast<FastJSArrayForReadWithNoCustomIteration>(implicit context: Context)(
   return %RawDownCast<FastJSArrayForReadWithNoCustomIteration>(a);
 }
 
+macro Cast<T: type>(o: String): T labels CastError;
+
 Cast<SeqOneByteString>(o: HeapObject): SeqOneByteString labels CastError {
-  if (!IsSeqOneByteString(o)) goto CastError;
+  return Cast<SeqOneByteString>(Cast<String>(o) otherwise CastError)
+      otherwise CastError;
+}
+
+Cast<SeqOneByteString>(o: String): SeqOneByteString labels CastError {
+  const instanceType = o.StringInstanceType();
+  // Using & instead of && enables Turbofan to merge the two checks into one.
+  if (!(instanceType.representation == StringRepresentationTag::kSeqStringTag &
+        instanceType.is_one_byte)) {
+    goto CastError;
+  }
   return %RawDownCast<SeqOneByteString>(o);
 }
 
+Cast<SeqTwoByteString>(o: HeapObject): SeqTwoByteString labels CastError {
+  return Cast<SeqTwoByteString>(Cast<String>(o) otherwise CastError)
+      otherwise CastError;
+}
+
+Cast<SeqTwoByteString>(o: String): SeqTwoByteString labels CastError {
+  const instanceType = o.StringInstanceType();
+  // Using & instead of && enables Turbofan to merge the two checks into one.
+  if (!(instanceType.representation == StringRepresentationTag::kSeqStringTag &
+        !instanceType.is_one_byte)) {
+    goto CastError;
+  }
+  return %RawDownCast<SeqTwoByteString>(o);
+}
+
+Cast<ThinString>(o: HeapObject): ThinString labels CastError {
+  return Cast<ThinString>(Cast<String>(o) otherwise CastError)
+      otherwise CastError;
+}
+
+Cast<ThinString>(o: String): ThinString labels CastError {
+  const instanceType = o.StringInstanceType();
+  if (instanceType.representation != StringRepresentationTag::kThinStringTag) {
+    goto CastError;
+  }
+  return %RawDownCast<ThinString>(o);
+}
+
+Cast<ConsString>(o: HeapObject): ConsString labels CastError {
+  return Cast<ConsString>(Cast<String>(o) otherwise CastError)
+      otherwise CastError;
+}
+
+Cast<ConsString>(o: String): ConsString labels CastError {
+  const instanceType = o.StringInstanceType();
+  if (instanceType.representation != StringRepresentationTag::kConsStringTag) {
+    goto CastError;
+  }
+  return %RawDownCast<ConsString>(o);
+}
+
+Cast<SlicedString>(o: HeapObject): SlicedString labels CastError {
+  return Cast<SlicedString>(Cast<String>(o) otherwise CastError)
+      otherwise CastError;
+}
+
+Cast<SlicedString>(o: String): SlicedString labels CastError {
+  const instanceType = o.StringInstanceType();
+  if (instanceType.representation !=
+      StringRepresentationTag::kSlicedStringTag) {
+    goto CastError;
+  }
+  return %RawDownCast<SlicedString>(o);
+}
+
+Cast<ExternalOneByteString>(o: HeapObject):
+    ExternalOneByteString labels CastError {
+  return Cast<ExternalOneByteString>(Cast<String>(o) otherwise CastError)
+      otherwise CastError;
+}
+
+Cast<ExternalOneByteString>(o: String): ExternalOneByteString labels CastError {
+  const instanceType = o.StringInstanceType();
+  // Using & instead of && enables Turbofan to merge the two checks into one.
+  if (!(instanceType.representation ==
+            StringRepresentationTag::kExternalStringTag &
+        instanceType.is_one_byte)) {
+    goto CastError;
+  }
+  return %RawDownCast<ExternalOneByteString>(o);
+}
+
+Cast<ExternalTwoByteString>(o: HeapObject):
+    ExternalTwoByteString labels CastError {
+  return Cast<ExternalTwoByteString>(Cast<String>(o) otherwise CastError)
+      otherwise CastError;
+}
+
+Cast<ExternalTwoByteString>(o: String): ExternalTwoByteString labels CastError {
+  const instanceType = o.StringInstanceType();
+  // Using & instead of && enables Turbofan to merge the two checks into one.
+  if (!(instanceType.representation ==
+            StringRepresentationTag::kExternalStringTag &
+        !instanceType.is_one_byte)) {
+    goto CastError;
+  }
+  return %RawDownCast<ExternalTwoByteString>(o);
+}
+
 Cast<JSReceiver|Null>(o: HeapObject): JSReceiver|Null
     labels CastError {
   typeswitch (o) {
diff --git a/deps/v8/src/builtins/constants-table-builder.h b/deps/v8/src/builtins/constants-table-builder.h
index fa9d7dee3a3ac8..56547a445eaf6d 100644
--- a/deps/v8/src/builtins/constants-table-builder.h
+++ b/deps/v8/src/builtins/constants-table-builder.h
@@ -24,6 +24,10 @@ class BuiltinsConstantsTableBuilder final {
  public:
   explicit BuiltinsConstantsTableBuilder(Isolate* isolate);
 
+  BuiltinsConstantsTableBuilder(const BuiltinsConstantsTableBuilder&) = delete;
+  BuiltinsConstantsTableBuilder& operator=(
+      const BuiltinsConstantsTableBuilder&) = delete;
+
   // Returns the index within the builtins constants table for the given
   // object, possibly adding the object to the table. Objects are deduplicated.
   uint32_t AddObject(Handle<Object> object);
@@ -49,8 +53,6 @@ class BuiltinsConstantsTableBuilder final {
   // Maps objects to corresponding indices within the constants list.
   using ConstantsMap = IdentityMap<uint32_t, FreeStoreAllocationPolicy>;
   ConstantsMap map_;
-
-  DISALLOW_COPY_AND_ASSIGN(BuiltinsConstantsTableBuilder);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/constructor.tq b/deps/v8/src/builtins/constructor.tq
index ba68e190282138..14304b1d55f3e8 100644
--- a/deps/v8/src/builtins/constructor.tq
+++ b/deps/v8/src/builtins/constructor.tq
@@ -17,7 +17,7 @@ namespace constructor {
 
 extern builtin FastNewObject(Context, JSFunction, JSReceiver): JSObject;
 
-extern enum AllocationSiteMode constexpr 'AllocationSiteMode' {
+extern enum AllocationSiteMode {
   DONT_TRACK_ALLOCATION_SITE,
   TRACK_ALLOCATION_SITE
 }
diff --git a/deps/v8/src/builtins/convert.tq b/deps/v8/src/builtins/convert.tq
index 6f6cbb1f689e59..7e8453b544b14f 100644
--- a/deps/v8/src/builtins/convert.tq
+++ b/deps/v8/src/builtins/convert.tq
@@ -58,10 +58,7 @@ FromConstexpr<int8, constexpr int31>(i: constexpr int31): int8 {
   return %RawDownCast<int8>(i);
 }
 FromConstexpr<char8, constexpr int31>(i: constexpr int31): char8 {
-  const i: int32 = i;
-  static_assert(i <= 255);
-  static_assert(0 <= i);
-  return %RawDownCast<char8>(i);
+  return %RawDownCast<char8>(FromConstexpr<uint8>(i));
 }
 FromConstexpr<Number, constexpr Smi>(s: constexpr Smi): Number {
   return SmiConstant(s);
@@ -177,6 +174,9 @@ Convert<int32, uint8>(i: uint8): int32 {
 Convert<int32, uint16>(i: uint16): int32 {
   return Signed(Convert<uint32>(i));
 }
+Convert<int32, char16|char8>(i: char16|char8): int32 {
+  return Signed(Convert<uint32>(i));
+}
 Convert<int32, uint31>(i: uint31): int32 {
   return Signed(Convert<uint32>(i));
 }
diff --git a/deps/v8/src/builtins/ia32/builtins-ia32.cc b/deps/v8/src/builtins/ia32/builtins-ia32.cc
index d5f82cd3d9e0d3..62c5af2dd6943d 100644
--- a/deps/v8/src/builtins/ia32/builtins-ia32.cc
+++ b/deps/v8/src/builtins/ia32/builtins-ia32.cc
@@ -3987,6 +3987,62 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kJSCallerSaved;
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+  __ mov(handler_arg, Operand(ebp, CommonFrameConstants::kCallerPCOffset));
+  __ mov(slot_arg,
+         Operand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ mov(handler_arg,
+         Operand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ cmp(eax, Immediate(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
+  __ j(not_equal, &deopt);
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ bind(&deopt);
+  __ cmp(eax, Immediate(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
+  __ j(equal, &bailout);
+
+  if (FLAG_debug_code) {
+    __ cmp(eax, Immediate(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
+    __ Assert(equal, AbortReason::kUnexpectedDynamicCheckMapsStatus);
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/ic-dynamic-check-maps.tq b/deps/v8/src/builtins/ic-dynamic-check-maps.tq
new file mode 100644
index 00000000000000..f047bd17f29560
--- /dev/null
+++ b/deps/v8/src/builtins/ic-dynamic-check-maps.tq
@@ -0,0 +1,102 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be:
+// Context found in the LICENSE file.
+
+namespace ic {
+
+const kSuccess: constexpr int32
+    generates 'static_cast<int>(DynamicCheckMapsStatus::kSuccess)';
+const kBailout: constexpr int32
+    generates 'static_cast<int>(DynamicCheckMapsStatus::kBailout)';
+const kDeopt: constexpr int32
+    generates 'static_cast<int>(DynamicCheckMapsStatus::kDeopt)';
+extern macro LoadFeedbackVectorForStubWithTrampoline(): FeedbackVector;
+
+macro PerformPolymorphicCheck(
+    expectedPolymorphicArray: HeapObject, actualMap: Map,
+    actualHandler: Smi|DataHandler): int32 {
+  if (!Is<WeakFixedArray>(expectedPolymorphicArray)) {
+    return kDeopt;
+  }
+
+  const polymorphicArray = UnsafeCast<WeakFixedArray>(expectedPolymorphicArray);
+  const weakActualMap = MakeWeak(actualMap);
+  const length = polymorphicArray.length_intptr;
+  assert(length > 0);
+
+  for (let mapIndex: intptr = 0; mapIndex < length;
+       mapIndex += FeedbackIteratorEntrySize()) {
+    const maybeCachedMap =
+        UnsafeCast<WeakHeapObject>(polymorphicArray[mapIndex]);
+    if (maybeCachedMap == weakActualMap) {
+      const handlerIndex = mapIndex + FeedbackIteratorHandlerOffset();
+      assert(handlerIndex < length);
+      const maybeHandler =
+          Cast<Object>(polymorphicArray[handlerIndex]) otherwise unreachable;
+      if (TaggedEqual(maybeHandler, actualHandler)) {
+        return kSuccess;
+      } else {
+        return kDeopt;
+      }
+    }
+  }
+
+  return kBailout;
+}
+
+macro PerformMonomorphicCheck(
+    feedbackVector: FeedbackVector, slotIndex: intptr, expectedMap: HeapObject,
+    actualMap: Map, actualHandler: Smi|DataHandler): int32 {
+  if (TaggedEqual(expectedMap, actualMap)) {
+    const handlerIndex = slotIndex + 1;
+    assert(handlerIndex < feedbackVector.length_intptr);
+    const maybeHandler =
+        Cast<Object>(feedbackVector[handlerIndex]) otherwise unreachable;
+    if (TaggedEqual(actualHandler, maybeHandler)) {
+      return kSuccess;
+    }
+
+    return kDeopt;
+  }
+
+  return kBailout;
+}
+
+// This builtin performs map checks by dynamically looking at the
+// feedback in the feedback vector.
+//
+// There are two major cases handled by this builtin:
+// (a) Monormorphic check
+// (b) Polymorphic check
+//
+// For the monormophic check, the incoming map is migrated and checked
+// against the map and handler in the feedback vector.
+//
+// For the polymorphic check, the feedback vector is iterated over and
+// each of the maps & handers are compared against the incoming map and
+// handler.
+//
+// If any of the map and associated handler checks pass then we return
+// kSuccess status. If we have never seen the map before, we return kBailout
+// status to bailout to the interpreter and update the feedback. If we have seen
+// the map, but the associated handler check fails then we return kDeopt status.
+@export
+macro DynamicCheckMaps(
+    actualMap: Map, slotIndex: intptr, actualHandler: Smi|DataHandler): int32 {
+  const feedbackVector = LoadFeedbackVectorForStubWithTrampoline();
+  const feedback = feedbackVector[slotIndex];
+  try {
+    const maybePolymorphicArray =
+        GetHeapObjectIfStrong(feedback) otherwise MigrateAndDoMonomorphicCheck;
+    return PerformPolymorphicCheck(
+        maybePolymorphicArray, actualMap, actualHandler);
+  } label MigrateAndDoMonomorphicCheck {
+    const expectedMap = GetHeapObjectAssumeWeak(feedback) otherwise Deopt;
+    return PerformMonomorphicCheck(
+        feedbackVector, slotIndex, expectedMap, actualMap, actualHandler);
+  } label Deopt {
+    return kDeopt;
+  }
+}
+
+}  // namespace ic
diff --git a/deps/v8/src/builtins/ic-dynamic-map-checks.tq b/deps/v8/src/builtins/ic-dynamic-map-checks.tq
deleted file mode 100644
index 745ab711c14e3b..00000000000000
--- a/deps/v8/src/builtins/ic-dynamic-map-checks.tq
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be:
-// Context found in the LICENSE file.
-
-namespace ic {
-
-const kSuccess: constexpr int32
-    generates 'static_cast<int>(DynamicMapChecksStatus::kSuccess)';
-const kBailout: constexpr int32
-    generates 'static_cast<int>(DynamicMapChecksStatus::kBailout)';
-const kDeopt: constexpr int32
-    generates 'static_cast<int>(DynamicMapChecksStatus::kDeopt)';
-extern runtime TryMigrateInstance(implicit context: Context)(Object): Object;
-extern macro LoadFeedbackVectorForStub(): FeedbackVector;
-
-macro PerformMapAndHandlerCheck(
-    entry: constexpr int32, polymorphicArray: WeakFixedArray,
-    weakActualMap: WeakHeapObject,
-    actualHandler: Smi|DataHandler): void labels Next,
-    Deopt {
-  const mapIndex = FeedbackIteratorMapIndexForEntry(entry);
-  assert(mapIndex < polymorphicArray.length_intptr);
-
-  const maybeCachedMap = UnsafeCast<WeakHeapObject>(polymorphicArray[mapIndex]);
-  if (maybeCachedMap != weakActualMap) {
-    goto Next;
-  }
-
-  const handlerIndex = FeedbackIteratorHandlerIndexForEntry(entry);
-  assert(handlerIndex < polymorphicArray.length_intptr);
-  const maybeHandler =
-      Cast<Object>(polymorphicArray[handlerIndex]) otherwise unreachable;
-  if (TaggedNotEqual(maybeHandler, actualHandler)) {
-    goto Deopt;
-  }
-}
-
-macro PerformPolymorphicCheck(
-    expectedPolymorphicArray: HeapObject, actualMap: Map,
-    actualHandler: Smi|DataHandler): int32 {
-  if (!Is<WeakFixedArray>(expectedPolymorphicArray)) {
-    return kDeopt;
-  }
-  try {
-    const polymorphicArray =
-        UnsafeCast<WeakFixedArray>(expectedPolymorphicArray);
-    const weakActualMap = MakeWeak(actualMap);
-    const length = polymorphicArray.length_intptr;
-    assert(length > 0);
-
-    try {
-      if (length >= FeedbackIteratorSizeFor(4)) goto Len4;
-      if (length == FeedbackIteratorSizeFor(3)) goto Len3;
-      if (length == FeedbackIteratorSizeFor(2)) goto Len2;
-      if (length == FeedbackIteratorSizeFor(1)) goto Len1;
-
-      unreachable;
-    } label Len4 {
-      PerformMapAndHandlerCheck(
-          3, polymorphicArray, weakActualMap, actualHandler) otherwise Len3,
-          Deopt;
-      return kSuccess;
-    } label Len3 {
-      PerformMapAndHandlerCheck(
-          2, polymorphicArray, weakActualMap, actualHandler) otherwise Len2,
-          Deopt;
-      return kSuccess;
-    } label Len2 {
-      PerformMapAndHandlerCheck(
-          1, polymorphicArray, weakActualMap, actualHandler) otherwise Len1,
-          Deopt;
-      return kSuccess;
-    } label Len1 {
-      PerformMapAndHandlerCheck(
-          0, polymorphicArray, weakActualMap, actualHandler)
-          otherwise Bailout, Deopt;
-      return kSuccess;
-    }
-  } label Bailout {
-    return kBailout;
-  } label Deopt {
-    return kDeopt;
-  }
-}
-
-macro PerformMonomorphicCheck(
-    feedbackVector: FeedbackVector, slotIndex: intptr, expectedMap: HeapObject,
-    actualMap: Map, actualHandler: Smi|DataHandler): int32 {
-  if (TaggedEqual(expectedMap, actualMap)) {
-    const handlerIndex = slotIndex + 1;
-    assert(handlerIndex < feedbackVector.length_intptr);
-    const maybeHandler =
-        Cast<Object>(feedbackVector[handlerIndex]) otherwise unreachable;
-    if (TaggedEqual(actualHandler, maybeHandler)) {
-      return kSuccess;
-    }
-
-    return kDeopt;
-  }
-
-  return kBailout;
-}
-
-// This builtin performs map checks by dynamically looking at the
-// feedback in the feedback vector.
-//
-// There are two major cases handled by this builtin:
-// (a) Monormorphic check
-// (b) Polymorphic check
-//
-// For the monormophic check, the incoming map is migrated and checked
-// against the map and handler in the feedback vector. Otherwise, we
-// bailout to the runtime.
-//
-// For the polymorphic check, the feedback vector is iterated over and
-// each of the maps & handers are compared against the incoming map and
-// handler.
-//
-// If any of the map and associated handler checks pass then we return
-// kSuccess status.
-//
-// If any of the map check passes but the associated handler check
-// fails then we return kFailure status.
-//
-// For other cases, we bailout to the runtime.
-builtin DynamicMapChecks(implicit context: Context)(
-    slotIndex: intptr, actualValue: HeapObject,
-    actualHandler: Smi|DataHandler): int32 {
-  const feedbackVector = LoadFeedbackVectorForStub();
-  let actualMap = actualValue.map;
-  const feedback = feedbackVector[slotIndex];
-  try {
-    const maybePolymorphicArray =
-        GetHeapObjectIfStrong(feedback) otherwise MigrateAndDoMonomorphicCheck;
-    return PerformPolymorphicCheck(
-        maybePolymorphicArray, actualMap, actualHandler);
-  } label MigrateAndDoMonomorphicCheck {
-    const expectedMap = GetHeapObjectAssumeWeak(feedback) otherwise Deopt;
-    if (IsDeprecatedMap(actualMap)) {
-      // TODO(gsathya): Should this migration happen before the
-      // polymorphic check?
-      const result = TryMigrateInstance(actualValue);
-      if (TaggedIsSmi(result)) {
-        return kDeopt;
-      }
-      actualMap = actualValue.map;
-    }
-    return PerformMonomorphicCheck(
-        feedbackVector, slotIndex, expectedMap, actualMap, actualHandler);
-  } label Deopt {
-    return kDeopt;
-  }
-}
-
-}  // namespace ic
diff --git a/deps/v8/src/builtins/mips/builtins-mips.cc b/deps/v8/src/builtins/mips/builtins-mips.cc
index cba65817a4c491..805e66fe1339f3 100644
--- a/deps/v8/src/builtins/mips/builtins-mips.cc
+++ b/deps/v8/src/builtins/mips/builtins-mips.cc
@@ -128,168 +128,168 @@ void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   // -----------------------------------
 
   // Enter a construct frame.
-  {
-    FrameScope scope(masm, StackFrame::CONSTRUCT);
-    Label post_instantiation_deopt_entry, not_create_implicit_receiver;
+  FrameScope scope(masm, StackFrame::MANUAL);
+  Label post_instantiation_deopt_entry, not_create_implicit_receiver;
+  __ EnterFrame(StackFrame::CONSTRUCT);
 
-    // Preserve the incoming parameters on the stack.
-    __ SmiTag(a0);
-    __ Push(cp, a0, a1);
-    __ PushRoot(RootIndex::kTheHoleValue);
-    __ Push(a3);
+  // Preserve the incoming parameters on the stack.
+  __ SmiTag(a0);
+  __ Push(cp, a0, a1);
+  __ PushRoot(RootIndex::kTheHoleValue);
+  __ Push(a3);
 
-    // ----------- S t a t e -------------
-    //  --        sp[0*kPointerSize]: new target
-    //  --        sp[1*kPointerSize]: padding
-    //  -- a1 and sp[2*kPointerSize]: constructor function
-    //  --        sp[3*kPointerSize]: number of arguments (tagged)
-    //  --        sp[4*kPointerSize]: context
-    // -----------------------------------
+  // ----------- S t a t e -------------
+  //  --        sp[0*kPointerSize]: new target
+  //  --        sp[1*kPointerSize]: padding
+  //  -- a1 and sp[2*kPointerSize]: constructor function
+  //  --        sp[3*kPointerSize]: number of arguments (tagged)
+  //  --        sp[4*kPointerSize]: context
+  // -----------------------------------
 
-    __ lw(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
-    __ lw(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
-    __ DecodeField<SharedFunctionInfo::FunctionKindBits>(t2);
-    __ JumpIfIsInRange(t2, kDefaultDerivedConstructor, kDerivedConstructor,
-                       &not_create_implicit_receiver);
+  __ lw(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
+  __ lw(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
+  __ DecodeField<SharedFunctionInfo::FunctionKindBits>(t2);
+  __ JumpIfIsInRange(t2, kDefaultDerivedConstructor, kDerivedConstructor,
+                     &not_create_implicit_receiver);
 
-    // If not derived class constructor: Allocate the new receiver object.
-    __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1,
-                        t2, t3);
-    __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject),
-            RelocInfo::CODE_TARGET);
-    __ Branch(&post_instantiation_deopt_entry);
+  // If not derived class constructor: Allocate the new receiver object.
+  __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1,
+                      t2, t3);
+  __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject), RelocInfo::CODE_TARGET);
+  __ Branch(&post_instantiation_deopt_entry);
 
-    // Else: use TheHoleValue as receiver for constructor call
-    __ bind(&not_create_implicit_receiver);
-    __ LoadRoot(v0, RootIndex::kTheHoleValue);
+  // Else: use TheHoleValue as receiver for constructor call
+  __ bind(&not_create_implicit_receiver);
+  __ LoadRoot(v0, RootIndex::kTheHoleValue);
 
-    // ----------- S t a t e -------------
-    //  --                          v0: receiver
-    //  -- Slot 4 / sp[0*kPointerSize]: new target
-    //  -- Slot 3 / sp[1*kPointerSize]: padding
-    //  -- Slot 2 / sp[2*kPointerSize]: constructor function
-    //  -- Slot 1 / sp[3*kPointerSize]: number of arguments (tagged)
-    //  -- Slot 0 / sp[4*kPointerSize]: context
-    // -----------------------------------
-    // Deoptimizer enters here.
-    masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
-        masm->pc_offset());
-    __ bind(&post_instantiation_deopt_entry);
-
-    // Restore new target.
-    __ Pop(a3);
-
-    // Push the allocated receiver to the stack.
-    __ Push(v0);
-    // We need two copies because we may have to return the original one
-    // and the calling conventions dictate that the called function pops the
-    // receiver. The second copy is pushed after the arguments, we saved in s0
-    // since v0 will store the return value of callRuntime.
-    __ mov(s0, v0);
-
-    // Set up pointer to last argument.
-    __ Addu(
-        t2, fp,
-        Operand(StandardFrameConstants::kCallerSPOffset + kSystemPointerSize));
+  // ----------- S t a t e -------------
+  //  --                          v0: receiver
+  //  -- Slot 4 / sp[0*kPointerSize]: new target
+  //  -- Slot 3 / sp[1*kPointerSize]: padding
+  //  -- Slot 2 / sp[2*kPointerSize]: constructor function
+  //  -- Slot 1 / sp[3*kPointerSize]: number of arguments (tagged)
+  //  -- Slot 0 / sp[4*kPointerSize]: context
+  // -----------------------------------
+  // Deoptimizer enters here.
+  masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
+      masm->pc_offset());
+  __ bind(&post_instantiation_deopt_entry);
 
-    // ----------- S t a t e -------------
-    //  --                 r3: new target
-    //  -- sp[0*kPointerSize]: implicit receiver
-    //  -- sp[1*kPointerSize]: implicit receiver
-    //  -- sp[2*kPointerSize]: padding
-    //  -- sp[3*kPointerSize]: constructor function
-    //  -- sp[4*kPointerSize]: number of arguments (tagged)
-    //  -- sp[5*kPointerSize]: context
-    // -----------------------------------
+  // Restore new target.
+  __ Pop(a3);
 
-    // Restore constructor function and argument count.
-    __ lw(a1, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
-    __ lw(a0, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    __ SmiUntag(a0);
+  // Push the allocated receiver to the stack.
+  __ Push(v0);
 
-    Label enough_stack_space, stack_overflow;
-    __ StackOverflowCheck(a0, t0, t1, &stack_overflow);
-    __ Branch(&enough_stack_space);
+  // We need two copies because we may have to return the original one
+  // and the calling conventions dictate that the called function pops the
+  // receiver. The second copy is pushed after the arguments, we saved in s0
+  // since v0 will store the return value of callRuntime.
+  __ mov(s0, v0);
 
-    __ bind(&stack_overflow);
-    // Restore the context from the frame.
-    __ lw(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
-    __ CallRuntime(Runtime::kThrowStackOverflow);
-    // Unreachable code.
-    __ break_(0xCC);
+  // Set up pointer to last argument.
+  __ Addu(t2, fp, Operand(StandardFrameConstants::kCallerSPOffset +
+                          kSystemPointerSize));
 
-    __ bind(&enough_stack_space);
+  // ----------- S t a t e -------------
+  //  --                 r3: new target
+  //  -- sp[0*kPointerSize]: implicit receiver
+  //  -- sp[1*kPointerSize]: implicit receiver
+  //  -- sp[2*kPointerSize]: padding
+  //  -- sp[3*kPointerSize]: constructor function
+  //  -- sp[4*kPointerSize]: number of arguments (tagged)
+  //  -- sp[5*kPointerSize]: context
+  // -----------------------------------
 
-    // TODO(victorgomes): When the arguments adaptor is completely removed, we
-    // should get the formal parameter count and copy the arguments in its
-    // correct position (including any undefined), instead of delaying this to
-    // InvokeFunction.
+  // Restore constructor function and argument count.
+  __ lw(a1, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
+  __ lw(a0, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  __ SmiUntag(a0);
 
-    // Copy arguments and receiver to the expression stack.
-    __ PushArray(t2, a0, t0, t1);
-    // We need two copies because we may have to return the original one
-    // and the calling conventions dictate that the called function pops the
-    // receiver. The second copy is pushed after the arguments.
-    __ Push(s0);
+  Label stack_overflow;
+  __ StackOverflowCheck(a0, t0, t1, &stack_overflow);
 
-    // Call the function.
-    __ InvokeFunctionWithNewTarget(a1, a3, a0, CALL_FUNCTION);
+  // TODO(victorgomes): When the arguments adaptor is completely removed, we
+  // should get the formal parameter count and copy the arguments in its
+  // correct position (including any undefined), instead of delaying this to
+  // InvokeFunction.
 
-    // ----------- S t a t e -------------
-    //  --                 v0: constructor result
-    //  -- sp[0*kPointerSize]: implicit receiver
-    //  -- sp[1*kPointerSize]: padding
-    //  -- sp[2*kPointerSize]: constructor function
-    //  -- sp[3*kPointerSize]: number of arguments
-    //  -- sp[4*kPointerSize]: context
-    // -----------------------------------
+  // Copy arguments and receiver to the expression stack.
+  __ PushArray(t2, a0, t0, t1);
 
-    // Store offset of return address for deoptimizer.
-    masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
-        masm->pc_offset());
+  // We need two copies because we may have to return the original one
+  // and the calling conventions dictate that the called function pops the
+  // receiver. The second copy is pushed after the arguments.
+  __ Push(s0);
 
-    // Restore the context from the frame.
-    __ lw(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  // Call the function.
+  __ InvokeFunctionWithNewTarget(a1, a3, a0, CALL_FUNCTION);
 
-    // If the result is an object (in the ECMA sense), we should get rid
-    // of the receiver and use the result; see ECMA-262 section 13.2.2-7
-    // on page 74.
-    Label use_receiver, do_throw, leave_frame;
+  // ----------- S t a t e -------------
+  //  --                 v0: constructor result
+  //  -- sp[0*kPointerSize]: implicit receiver
+  //  -- sp[1*kPointerSize]: padding
+  //  -- sp[2*kPointerSize]: constructor function
+  //  -- sp[3*kPointerSize]: number of arguments
+  //  -- sp[4*kPointerSize]: context
+  // -----------------------------------
 
-    // If the result is undefined, we jump out to using the implicit receiver.
-    __ JumpIfRoot(v0, RootIndex::kUndefinedValue, &use_receiver);
+  // Store offset of return address for deoptimizer.
+  masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
+      masm->pc_offset());
 
-    // Otherwise we do a smi check and fall through to check if the return value
-    // is a valid receiver.
+  // If the result is an object (in the ECMA sense), we should get rid
+  // of the receiver and use the result; see ECMA-262 section 13.2.2-7
+  // on page 74.
+  Label use_receiver, do_throw, leave_and_return, check_receiver;
 
-    // If the result is a smi, it is *not* an object in the ECMA sense.
-    __ JumpIfSmi(v0, &use_receiver);
+  // If the result is undefined, we jump out to using the implicit receiver.
+  __ JumpIfNotRoot(v0, RootIndex::kUndefinedValue, &check_receiver);
 
-    // If the type of the result (stored in its map) is less than
-    // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
-    __ GetObjectType(v0, t2, t2);
-    STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
-    __ Branch(&leave_frame, greater_equal, t2, Operand(FIRST_JS_RECEIVER_TYPE));
-    __ Branch(&use_receiver);
+  // Otherwise we do a smi check and fall through to check if the return value
+  // is a valid receiver.
 
-    __ bind(&do_throw);
-    __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  // Throw away the result of the constructor invocation and use the
+  // on-stack receiver as the result.
+  __ bind(&use_receiver);
+  __ lw(v0, MemOperand(sp, 0 * kPointerSize));
+  __ JumpIfRoot(v0, RootIndex::kTheHoleValue, &do_throw);
 
-    // Throw away the result of the constructor invocation and use the
-    // on-stack receiver as the result.
-    __ bind(&use_receiver);
-    __ lw(v0, MemOperand(sp, 0 * kPointerSize));
-    __ JumpIfRoot(v0, RootIndex::kTheHoleValue, &do_throw);
+  __ bind(&leave_and_return);
+  // Restore smi-tagged arguments count from the frame.
+  __ lw(a1, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  // Leave construct frame.
+  __ LeaveFrame(StackFrame::CONSTRUCT);
 
-    __ bind(&leave_frame);
-    // Restore smi-tagged arguments count from the frame.
-    __ lw(a1, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    // Leave construct frame.
-  }
   // Remove caller arguments from the stack and return.
   __ Lsa(sp, sp, a1, kPointerSizeLog2 - kSmiTagSize);
   __ Addu(sp, sp, kPointerSize);
   __ Ret();
+
+  __ bind(&check_receiver);
+  // If the result is a smi, it is *not* an object in the ECMA sense.
+  __ JumpIfSmi(v0, &use_receiver);
+
+  // If the type of the result (stored in its map) is less than
+  // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
+  __ GetObjectType(v0, t2, t2);
+  STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
+  __ Branch(&leave_and_return, greater_equal, t2,
+            Operand(FIRST_JS_RECEIVER_TYPE));
+  __ Branch(&use_receiver);
+
+  __ bind(&do_throw);
+  // Restore the context from the frame.
+  __ lw(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  __ break_(0xCC);
+
+  __ bind(&stack_overflow);
+  // Restore the context from the frame.
+  __ lw(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowStackOverflow);
+  // Unreachable code.
+  __ break_(0xCC);
 }
 
 void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) {
@@ -1061,11 +1061,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
     // If ok, push undefined as the initial value for all register file entries.
     Label loop_header;
     Label loop_check;
-    __ LoadRoot(t1, RootIndex::kUndefinedValue);
+    __ LoadRoot(kInterpreterAccumulatorRegister, RootIndex::kUndefinedValue);
     __ Branch(&loop_check);
     __ bind(&loop_header);
     // TODO(rmcilroy): Consider doing more than one push per loop iteration.
-    __ push(t1);
+    __ push(kInterpreterAccumulatorRegister);
     // Continue loop if not done.
     __ bind(&loop_check);
     __ Subu(t0, t0, Operand(kPointerSize));
@@ -1091,8 +1091,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   __ Branch(&stack_check_interrupt, lo, sp, Operand(a2));
   __ bind(&after_stack_check_interrupt);
 
-  // Load accumulator with undefined.
-  __ LoadRoot(kInterpreterAccumulatorRegister, RootIndex::kUndefinedValue);
+  // The accumulator is already loaded with undefined.
 
   // Load the dispatch table into a register and dispatch to the bytecode
   // handler at the current bytecode offset.
@@ -2665,23 +2664,18 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) {
   // Load double input.
   __ Ldc1(double_scratch, MemOperand(sp, kArgumentOffset));
 
-  // Clear cumulative exception flags and save the FCSR.
-  __ cfc1(scratch2, FCSR);
-  __ ctc1(zero_reg, FCSR);
-
   // Try a conversion to a signed integer.
   __ Trunc_w_d(double_scratch, double_scratch);
   // Move the converted value into the result register.
   __ mfc1(scratch3, double_scratch);
 
-  // Retrieve and restore the FCSR.
+  // Retrieve the FCSR.
   __ cfc1(scratch, FCSR);
-  __ ctc1(scratch2, FCSR);
 
   // Check for overflow and NaNs.
-  __ And(
-      scratch, scratch,
-      kFCSROverflowFlagMask | kFCSRUnderflowFlagMask | kFCSRInvalidOpFlagMask);
+  __ And(scratch, scratch,
+         kFCSROverflowCauseMask | kFCSRUnderflowCauseMask |
+             kFCSRInvalidOpCauseMask);
   // If we had no exceptions then set result_reg and we are done.
   Label error;
   __ Branch(&error, ne, scratch, Operand(zero_reg));
@@ -3848,6 +3842,63 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kJSCallerSaved;
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+  __ Lw(handler_arg, MemOperand(fp, CommonFrameConstants::kCallerPCOffset));
+  __ Lw(slot_arg, MemOperand(handler_arg,
+                             Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ Lw(
+      handler_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ Branch(&deopt, ne, v0,
+            Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ bind(&deopt);
+  __ Branch(&bailout, eq, v0,
+            Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
+
+  if (FLAG_debug_code) {
+    __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus, v0,
+              Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/mips64/builtins-mips64.cc b/deps/v8/src/builtins/mips64/builtins-mips64.cc
index 1027ec35e52733..4c42a2aa0aafef 100644
--- a/deps/v8/src/builtins/mips64/builtins-mips64.cc
+++ b/deps/v8/src/builtins/mips64/builtins-mips64.cc
@@ -129,169 +129,167 @@ void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   // -----------------------------------
 
   // Enter a construct frame.
-  {
-    FrameScope scope(masm, StackFrame::CONSTRUCT);
-    Label post_instantiation_deopt_entry, not_create_implicit_receiver;
-
-    // Preserve the incoming parameters on the stack.
-    __ SmiTag(a0);
-    __ Push(cp, a0, a1);
-    __ PushRoot(RootIndex::kUndefinedValue);
-    __ Push(a3);
-
-    // ----------- S t a t e -------------
-    //  --        sp[0*kPointerSize]: new target
-    //  --        sp[1*kPointerSize]: padding
-    //  -- a1 and sp[2*kPointerSize]: constructor function
-    //  --        sp[3*kPointerSize]: number of arguments (tagged)
-    //  --        sp[4*kPointerSize]: context
-    // -----------------------------------
-
-    __ Ld(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
-    __ lwu(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
-    __ DecodeField<SharedFunctionInfo::FunctionKindBits>(t2);
-    __ JumpIfIsInRange(t2, kDefaultDerivedConstructor, kDerivedConstructor,
-                       &not_create_implicit_receiver);
-
-    // If not derived class constructor: Allocate the new receiver object.
-    __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1,
-                        t2, t3);
-    __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject),
-            RelocInfo::CODE_TARGET);
-    __ Branch(&post_instantiation_deopt_entry);
-
-    // Else: use TheHoleValue as receiver for constructor call
-    __ bind(&not_create_implicit_receiver);
-    __ LoadRoot(v0, RootIndex::kTheHoleValue);
+  FrameScope scope(masm, StackFrame::MANUAL);
+  Label post_instantiation_deopt_entry, not_create_implicit_receiver;
+  __ EnterFrame(StackFrame::CONSTRUCT);
 
-    // ----------- S t a t e -------------
-    //  --                          v0: receiver
-    //  -- Slot 4 / sp[0*kPointerSize]: new target
-    //  -- Slot 3 / sp[1*kPointerSize]: padding
-    //  -- Slot 2 / sp[2*kPointerSize]: constructor function
-    //  -- Slot 1 / sp[3*kPointerSize]: number of arguments (tagged)
-    //  -- Slot 0 / sp[4*kPointerSize]: context
-    // -----------------------------------
-    // Deoptimizer enters here.
-    masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
-        masm->pc_offset());
-    __ bind(&post_instantiation_deopt_entry);
+  // Preserve the incoming parameters on the stack.
+  __ SmiTag(a0);
+  __ Push(cp, a0, a1);
+  __ PushRoot(RootIndex::kUndefinedValue);
+  __ Push(a3);
 
-    // Restore new target.
-    __ Pop(a3);
+  // ----------- S t a t e -------------
+  //  --        sp[0*kPointerSize]: new target
+  //  --        sp[1*kPointerSize]: padding
+  //  -- a1 and sp[2*kPointerSize]: constructor function
+  //  --        sp[3*kPointerSize]: number of arguments (tagged)
+  //  --        sp[4*kPointerSize]: context
+  // -----------------------------------
 
-    // Push the allocated receiver to the stack.
-    __ Push(v0);
+  __ Ld(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
+  __ lwu(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
+  __ DecodeField<SharedFunctionInfo::FunctionKindBits>(t2);
+  __ JumpIfIsInRange(t2, kDefaultDerivedConstructor, kDerivedConstructor,
+                     &not_create_implicit_receiver);
 
-    // We need two copies because we may have to return the original one
-    // and the calling conventions dictate that the called function pops the
-    // receiver. The second copy is pushed after the arguments, we saved in a6
-    // since v0 will store the return value of callRuntime.
-    __ mov(a6, v0);
+  // If not derived class constructor: Allocate the new receiver object.
+  __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1,
+                      t2, t3);
+  __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject),
+          RelocInfo::CODE_TARGET);
+  __ Branch(&post_instantiation_deopt_entry);
 
-    // Set up pointer to last argument.
-    __ Daddu(t2, fp, Operand(StandardFrameConstants::kCallerSPOffset +
-                             kSystemPointerSize));
+  // Else: use TheHoleValue as receiver for constructor call
+  __ bind(&not_create_implicit_receiver);
+  __ LoadRoot(v0, RootIndex::kTheHoleValue);
 
-    // ----------- S t a t e -------------
-    //  --                 r3: new target
-    //  -- sp[0*kPointerSize]: implicit receiver
-    //  -- sp[1*kPointerSize]: implicit receiver
-    //  -- sp[2*kPointerSize]: padding
-    //  -- sp[3*kPointerSize]: constructor function
-    //  -- sp[4*kPointerSize]: number of arguments (tagged)
-    //  -- sp[5*kPointerSize]: context
-    // -----------------------------------
+  // ----------- S t a t e -------------
+  //  --                          v0: receiver
+  //  -- Slot 4 / sp[0*kPointerSize]: new target
+  //  -- Slot 3 / sp[1*kPointerSize]: padding
+  //  -- Slot 2 / sp[2*kPointerSize]: constructor function
+  //  -- Slot 1 / sp[3*kPointerSize]: number of arguments (tagged)
+  //  -- Slot 0 / sp[4*kPointerSize]: context
+  // -----------------------------------
+  // Deoptimizer enters here.
+  masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
+      masm->pc_offset());
+  __ bind(&post_instantiation_deopt_entry);
 
-    // Restore constructor function and argument count.
-    __ Ld(a1, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
-    __ Ld(a0, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    __ SmiUntag(a0);
+  // Restore new target.
+  __ Pop(a3);
 
-    Label enough_stack_space, stack_overflow;
-    __ StackOverflowCheck(a0, t0, t1, &stack_overflow);
-    __ Branch(&enough_stack_space);
+  // Push the allocated receiver to the stack.
+  __ Push(v0);
 
-    __ bind(&stack_overflow);
-    // Restore the context from the frame.
-    __ Ld(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
-    __ CallRuntime(Runtime::kThrowStackOverflow);
-    // Unreachable code.
-    __ break_(0xCC);
+  // We need two copies because we may have to return the original one
+  // and the calling conventions dictate that the called function pops the
+  // receiver. The second copy is pushed after the arguments, we saved in a6
+  // since v0 will store the return value of callRuntime.
+  __ mov(a6, v0);
 
-    __ bind(&enough_stack_space);
+  // Set up pointer to last argument.
+  __ Daddu(t2, fp, Operand(StandardFrameConstants::kCallerSPOffset +
+                           kSystemPointerSize));
 
-    // TODO(victorgomes): When the arguments adaptor is completely removed, we
-    // should get the formal parameter count and copy the arguments in its
-    // correct position (including any undefined), instead of delaying this to
-    // InvokeFunction.
+  // ----------- S t a t e -------------
+  //  --                 r3: new target
+  //  -- sp[0*kPointerSize]: implicit receiver
+  //  -- sp[1*kPointerSize]: implicit receiver
+  //  -- sp[2*kPointerSize]: padding
+  //  -- sp[3*kPointerSize]: constructor function
+  //  -- sp[4*kPointerSize]: number of arguments (tagged)
+  //  -- sp[5*kPointerSize]: context
+  // -----------------------------------
 
-    // Copy arguments and receiver to the expression stack.
-    __ PushArray(t2, a0, t0, t1);
-    // We need two copies because we may have to return the original one
-    // and the calling conventions dictate that the called function pops the
-    // receiver. The second copy is pushed after the arguments,
-    __ Push(a6);
+  // Restore constructor function and argument count.
+  __ Ld(a1, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
+  __ Ld(a0, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  __ SmiUntag(a0);
 
-    // Call the function.
-    __ InvokeFunctionWithNewTarget(a1, a3, a0, CALL_FUNCTION);
+  Label stack_overflow;
+  __ StackOverflowCheck(a0, t0, t1, &stack_overflow);
 
-    // ----------- S t a t e -------------
-    //  --                 v0: constructor result
-    //  -- sp[0*kPointerSize]: implicit receiver
-    //  -- sp[1*kPointerSize]: padding
-    //  -- sp[2*kPointerSize]: constructor function
-    //  -- sp[3*kPointerSize]: number of arguments
-    //  -- sp[4*kPointerSize]: context
-    // -----------------------------------
+  // TODO(victorgomes): When the arguments adaptor is completely removed, we
+  // should get the formal parameter count and copy the arguments in its
+  // correct position (including any undefined), instead of delaying this to
+  // InvokeFunction.
 
-    // Store offset of return address for deoptimizer.
-    masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
-        masm->pc_offset());
+  // Copy arguments and receiver to the expression stack.
+  __ PushArray(t2, a0, t0, t1);
+  // We need two copies because we may have to return the original one
+  // and the calling conventions dictate that the called function pops the
+  // receiver. The second copy is pushed after the arguments,
+  __ Push(a6);
 
-    // Restore the context from the frame.
-    __ Ld(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  // Call the function.
+  __ InvokeFunctionWithNewTarget(a1, a3, a0, CALL_FUNCTION);
 
-    // If the result is an object (in the ECMA sense), we should get rid
-    // of the receiver and use the result; see ECMA-262 section 13.2.2-7
-    // on page 74.
-    Label use_receiver, do_throw, leave_frame;
+  // ----------- S t a t e -------------
+  //  --                 v0: constructor result
+  //  -- sp[0*kPointerSize]: implicit receiver
+  //  -- sp[1*kPointerSize]: padding
+  //  -- sp[2*kPointerSize]: constructor function
+  //  -- sp[3*kPointerSize]: number of arguments
+  //  -- sp[4*kPointerSize]: context
+  // -----------------------------------
 
-    // If the result is undefined, we jump out to using the implicit receiver.
-    __ JumpIfRoot(v0, RootIndex::kUndefinedValue, &use_receiver);
+  // Store offset of return address for deoptimizer.
+  masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
+      masm->pc_offset());
 
-    // Otherwise we do a smi check and fall through to check if the return value
-    // is a valid receiver.
+  // If the result is an object (in the ECMA sense), we should get rid
+  // of the receiver and use the result; see ECMA-262 section 13.2.2-7
+  // on page 74.
+  Label use_receiver, do_throw, leave_and_return, check_receiver;
 
-    // If the result is a smi, it is *not* an object in the ECMA sense.
-    __ JumpIfSmi(v0, &use_receiver);
+  // If the result is undefined, we jump out to using the implicit receiver.
+  __ JumpIfNotRoot(v0, RootIndex::kUndefinedValue, &check_receiver);
 
-    // If the type of the result (stored in its map) is less than
-    // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
-    __ GetObjectType(v0, t2, t2);
-    STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
-    __ Branch(&leave_frame, greater_equal, t2, Operand(FIRST_JS_RECEIVER_TYPE));
-    __ Branch(&use_receiver);
+  // Otherwise we do a smi check and fall through to check if the return value
+  // is a valid receiver.
 
-    __ bind(&do_throw);
-    __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  // Throw away the result of the constructor invocation and use the
+  // on-stack receiver as the result.
+  __ bind(&use_receiver);
+  __ Ld(v0, MemOperand(sp, 0 * kPointerSize));
+  __ JumpIfRoot(v0, RootIndex::kTheHoleValue, &do_throw);
 
-    // Throw away the result of the constructor invocation and use the
-    // on-stack receiver as the result.
-    __ bind(&use_receiver);
-    __ Ld(v0, MemOperand(sp, 0 * kPointerSize));
-    __ JumpIfRoot(v0, RootIndex::kTheHoleValue, &do_throw);
+  __ bind(&leave_and_return);
+  // Restore smi-tagged arguments count from the frame.
+  __ Ld(a1, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  // Leave construct frame.
+  __ LeaveFrame(StackFrame::CONSTRUCT);
 
-    __ bind(&leave_frame);
-    // Restore smi-tagged arguments count from the frame.
-    __ Ld(a1, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    // Leave construct frame.
-  }
   // Remove caller arguments from the stack and return.
   __ SmiScale(a4, a1, kPointerSizeLog2);
   __ Daddu(sp, sp, a4);
   __ Daddu(sp, sp, kPointerSize);
   __ Ret();
+
+  __ bind(&check_receiver);
+  __ JumpIfSmi(v0, &use_receiver);
+
+  // If the type of the result (stored in its map) is less than
+  // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
+  __ GetObjectType(v0, t2, t2);
+  STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
+  __ Branch(&leave_and_return, greater_equal, t2,
+            Operand(FIRST_JS_RECEIVER_TYPE));
+  __ Branch(&use_receiver);
+
+  __ bind(&do_throw);
+  // Restore the context from the frame.
+  __ Ld(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  __ break_(0xCC);
+
+  __ bind(&stack_overflow);
+  // Restore the context from the frame.
+  __ Ld(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowStackOverflow);
+  __ break_(0xCC);
 }
 
 void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) {
@@ -1079,11 +1077,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
     // If ok, push undefined as the initial value for all register file entries.
     Label loop_header;
     Label loop_check;
-    __ LoadRoot(a5, RootIndex::kUndefinedValue);
+    __ LoadRoot(kInterpreterAccumulatorRegister, RootIndex::kUndefinedValue);
     __ Branch(&loop_check);
     __ bind(&loop_header);
     // TODO(rmcilroy): Consider doing more than one push per loop iteration.
-    __ push(a5);
+    __ push(kInterpreterAccumulatorRegister);
     // Continue loop if not done.
     __ bind(&loop_check);
     __ Dsubu(a4, a4, Operand(kPointerSize));
@@ -1109,8 +1107,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   __ Branch(&stack_check_interrupt, lo, sp, Operand(a5));
   __ bind(&after_stack_check_interrupt);
 
-  // Load accumulator as undefined.
-  __ LoadRoot(kInterpreterAccumulatorRegister, RootIndex::kUndefinedValue);
+  // The accumulator is already loaded with undefined.
 
   // Load the dispatch table into a register and dispatch to the bytecode
   // handler at the current bytecode offset.
@@ -2734,23 +2731,18 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) {
   // Load double input.
   __ Ldc1(double_scratch, MemOperand(sp, kArgumentOffset));
 
-  // Clear cumulative exception flags and save the FCSR.
-  __ cfc1(scratch2, FCSR);
-  __ ctc1(zero_reg, FCSR);
-
   // Try a conversion to a signed integer.
   __ Trunc_w_d(double_scratch, double_scratch);
   // Move the converted value into the result register.
   __ mfc1(scratch3, double_scratch);
 
-  // Retrieve and restore the FCSR.
+  // Retrieve the FCSR.
   __ cfc1(scratch, FCSR);
-  __ ctc1(scratch2, FCSR);
 
   // Check for overflow and NaNs.
-  __ And(
-      scratch, scratch,
-      kFCSROverflowFlagMask | kFCSRUnderflowFlagMask | kFCSRInvalidOpFlagMask);
+  __ And(scratch, scratch,
+         kFCSROverflowCauseMask | kFCSRUnderflowCauseMask |
+             kFCSRInvalidOpCauseMask);
   // If we had no exceptions then set result_reg and we are done.
   Label error;
   __ Branch(&error, ne, scratch, Operand(zero_reg));
@@ -3412,6 +3404,62 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kJSCallerSaved;
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+  __ Ld(handler_arg, MemOperand(fp, CommonFrameConstants::kCallerPCOffset));
+  __ Uld(slot_arg, MemOperand(handler_arg,
+                              Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ Uld(
+      handler_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ Branch(&deopt, ne, v0,
+            Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ bind(&deopt);
+  __ Branch(&bailout, eq, v0,
+            Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
+
+  if (FLAG_debug_code) {
+    __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus, v0,
+              Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/number.tq b/deps/v8/src/builtins/number.tq
index f51f5a2c8be3bd..f4bd4cc578d0a1 100644
--- a/deps/v8/src/builtins/number.tq
+++ b/deps/v8/src/builtins/number.tq
@@ -63,8 +63,9 @@ transitioning macro ThisNumberValue(implicit context: Context)(
 
 macro ToCharCode(input: int32): char8 {
   assert(0 <= input && input < 36);
-  return input < 10 ? %RawDownCast<char8>(input + kAsciiZero) :
-                      %RawDownCast<char8>(input - 10 + kAsciiLowerCaseA);
+  return input < 10 ?
+      %RawDownCast<char8>(Unsigned(input + kAsciiZero)) :
+      %RawDownCast<char8>(Unsigned(input - 10 + kAsciiLowerCaseA));
 }
 
 @export
@@ -92,25 +93,25 @@ macro NumberToStringSmi(x: int32, radix: int32): String labels Slow {
     length = length + 1;
   }
   assert(length > 0);
-  const strSeq: SeqOneByteString = AllocateSeqOneByteString(Unsigned(length));
+  const strSeq = AllocateNonEmptySeqOneByteString(Unsigned(length));
   let cursor: intptr = Convert<intptr>(length) - 1;
   while (n > 0) {
     const digit: int32 = n % radix;
     n = n / radix;
-    strSeq.chars[cursor] = ToCharCode(digit);
+    *UnsafeConstCast(&strSeq.chars[cursor]) = ToCharCode(digit);
     cursor = cursor - 1;
   }
   if (isNegative) {
     assert(cursor == 0);
     // Insert '-' to result.
-    strSeq.chars[0] = 45;
+    *UnsafeConstCast(&strSeq.chars[0]) = 45;
   } else {
     assert(cursor == -1);
     // In sync with Factory::SmiToString: If radix = 10 and positive number,
     // update hash for string.
     if (radix == 10) {
-      assert(strSeq.hash_field == kNameEmptyHashField);
-      strSeq.hash_field = MakeArrayIndexHash(Unsigned(x), Unsigned(length));
+      assert(strSeq.raw_hash_field == kNameEmptyHashField);
+      strSeq.raw_hash_field = MakeArrayIndexHash(Unsigned(x), Unsigned(length));
     }
   }
   return strSeq;
@@ -236,7 +237,7 @@ transitioning javascript builtin NumberParseFloat(
     }
   } label String(s: String) {
     // Check if the string is a cached array index.
-    const hash: NameHash = s.hash_field;
+    const hash: NameHash = s.raw_hash_field;
     if (!hash.is_not_integer_index_mask &&
         hash.array_index_length < kMaxCachedArrayIndexLength) {
       const arrayIndex: uint32 = hash.array_index_value;
@@ -287,7 +288,7 @@ transitioning builtin ParseInt(implicit context: Context)(
     return ChangeInt32ToTagged(i);
   } label String(s: String) {
     // Check if the string is a cached array index.
-    const hash: NameHash = s.hash_field;
+    const hash: NameHash = s.raw_hash_field;
     if (!hash.is_not_integer_index_mask &&
         hash.array_index_length < kMaxCachedArrayIndexLength) {
       const arrayIndex: uint32 = hash.array_index_value;
diff --git a/deps/v8/src/builtins/object.tq b/deps/v8/src/builtins/object.tq
index 9dae15c92a786a..f0e9e1fb15d3fe 100644
--- a/deps/v8/src/builtins/object.tq
+++ b/deps/v8/src/builtins/object.tq
@@ -94,12 +94,17 @@ transitioning builtin CreateObjectWithoutProperties(implicit context: Context)(
     prototype: JSAny): JSAny {
   try {
     let map: Map;
-    let properties: NameDictionary|EmptyFixedArray;
+    let properties: NameDictionary|OrderedNameDictionary|EmptyFixedArray;
     typeswitch (prototype) {
       case (Null): {
         map = *NativeContextSlot(
             ContextSlot::SLOW_OBJECT_WITH_NULL_PROTOTYPE_MAP);
-        properties = AllocateNameDictionary(kNameDictionaryInitialCapacity);
+        if (kDictModePrototypes) {
+          properties = AllocateOrderedNameDictionary(
+              kOrderedNameDictionaryInitialCapacity);
+        } else {
+          properties = AllocateNameDictionary(kNameDictionaryInitialCapacity);
+        }
       }
       case (prototype: JSReceiver): {
         properties = kEmptyFixedArray;
diff --git a/deps/v8/src/builtins/ppc/builtins-ppc.cc b/deps/v8/src/builtins/ppc/builtins-ppc.cc
index efd65e2971006d..09b076c1c7a3a9 100644
--- a/deps/v8/src/builtins/ppc/builtins-ppc.cc
+++ b/deps/v8/src/builtins/ppc/builtins-ppc.cc
@@ -65,39 +65,6 @@ static void GenerateTailCallToReturnedCode(MacroAssembler* masm,
 
 namespace {
 
-enum StackLimitKind { kInterruptStackLimit, kRealStackLimit };
-
-void LoadStackLimit(MacroAssembler* masm, Register destination,
-                    StackLimitKind kind) {
-  DCHECK(masm->root_array_available());
-  Isolate* isolate = masm->isolate();
-  ExternalReference limit =
-      kind == StackLimitKind::kRealStackLimit
-          ? ExternalReference::address_of_real_jslimit(isolate)
-          : ExternalReference::address_of_jslimit(isolate);
-  DCHECK(TurboAssembler::IsAddressableThroughRootRegister(isolate, limit));
-
-  intptr_t offset =
-      TurboAssembler::RootRegisterOffsetForExternalReference(isolate, limit);
-  CHECK(is_int32(offset));
-  __ LoadP(destination, MemOperand(kRootRegister, offset), r0);
-}
-
-void Generate_StackOverflowCheck(MacroAssembler* masm, Register num_args,
-                                 Register scratch, Label* stack_overflow) {
-  // Check the stack for overflow. We are not trying to catch
-  // interruptions (e.g. debug break and preemption) here, so the "real stack
-  // limit" is checked.
-  LoadStackLimit(masm, scratch, StackLimitKind::kRealStackLimit);
-  // Make scratch the space we have left. The stack might already be overflowed
-  // here which will cause scratch to become negative.
-  __ sub(scratch, sp, scratch);
-  // Check if the arguments will overflow the stack.
-  __ ShiftLeftImm(r0, num_args, Operand(kSystemPointerSizeLog2));
-  __ cmp(scratch, r0);
-  __ ble(stack_overflow);  // Signed comparison.
-}
-
 void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r3     : number of arguments
@@ -112,7 +79,7 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
 
   Label stack_overflow;
 
-  Generate_StackOverflowCheck(masm, r3, r8, &stack_overflow);
+  __ StackOverflowCheck(r3, scratch, &stack_overflow);
   // Enter a construct frame.
   {
     FrameAndConstantPoolScope scope(masm, StackFrame::CONSTRUCT);
@@ -123,6 +90,11 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
     __ Push(cp, r3);
     __ SmiUntag(r3, SetRC);
 
+    // TODO(victorgomes): When the arguments adaptor is completely removed, we
+    // should get the formal parameter count and copy the arguments in its
+    // correct position (including any undefined), instead of delaying this to
+    // InvokeFunction.
+
     // Set up pointer to last argument (skip receiver).
     __ addi(
         r7, fp,
@@ -177,164 +149,137 @@ void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   //  -- sp[...]: constructor arguments
   // -----------------------------------
 
+  FrameScope scope(masm, StackFrame::MANUAL);
   // Enter a construct frame.
-  {
-    FrameAndConstantPoolScope scope(masm, StackFrame::CONSTRUCT);
-    Label post_instantiation_deopt_entry, not_create_implicit_receiver;
-
-    // Preserve the incoming parameters on the stack.
-    __ SmiTag(r3);
-    __ Push(cp, r3, r4);
-    __ PushRoot(RootIndex::kUndefinedValue);
-    __ Push(r6);
-
-    // ----------- S t a t e -------------
-    //  --        sp[0*kSystemPointerSize]: new target
-    //  --        sp[1*kSystemPointerSize]: padding
-    //  -- r4 and sp[2*kSystemPointerSize]: constructor function
-    //  --        sp[3*kSystemPointerSize]: number of arguments (tagged)
-    //  --        sp[4*kSystemPointerSize]: context
-    // -----------------------------------
-
-    __ LoadTaggedPointerField(
-        r7, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
-    __ lwz(r7, FieldMemOperand(r7, SharedFunctionInfo::kFlagsOffset));
-    __ DecodeField<SharedFunctionInfo::FunctionKindBits>(r7);
-    __ JumpIfIsInRange(r7, kDefaultDerivedConstructor, kDerivedConstructor,
-                       &not_create_implicit_receiver);
-
-    // If not derived class constructor: Allocate the new receiver object.
-    __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1,
-                        r7, r8);
-    __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject),
-            RelocInfo::CODE_TARGET);
-    __ b(&post_instantiation_deopt_entry);
-
-    // Else: use TheHoleValue as receiver for constructor call
-    __ bind(&not_create_implicit_receiver);
-    __ LoadRoot(r3, RootIndex::kTheHoleValue);
-
-    // ----------- S t a t e -------------
-    //  --                          r3: receiver
-    //  -- Slot 4 / sp[0*kSystemPointerSize]: new target
-    //  -- Slot 3 / sp[1*kSystemPointerSize]: padding
-    //  -- Slot 2 / sp[2*kSystemPointerSize]: constructor function
-    //  -- Slot 1 / sp[3*kSystemPointerSize]: number of arguments (tagged)
-    //  -- Slot 0 / sp[4*kSystemPointerSize]: context
-    // -----------------------------------
-    // Deoptimizer enters here.
-    masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
-        masm->pc_offset());
-    __ bind(&post_instantiation_deopt_entry);
-
-    // Restore new target.
-    __ Pop(r6);
+  Label post_instantiation_deopt_entry, not_create_implicit_receiver;
+  __ EnterFrame(StackFrame::CONSTRUCT);
 
-    // Push the allocated receiver to the stack.
-    __ Push(r3);
-    // We need two copies because we may have to return the original one
-    // and the calling conventions dictate that the called function pops the
-    // receiver. The second copy is pushed after the arguments, we saved in r6
-    // since r0 needs to store the number of arguments before
-    // InvokingFunction.
-    __ mr(r9, r3);
-
-    // Set up pointer to first argument (skip receiver).
-    __ addi(
-        r7, fp,
-        Operand(StandardFrameConstants::kCallerSPOffset + kSystemPointerSize));
+  // Preserve the incoming parameters on the stack.
+  __ SmiTag(r3);
+  __ Push(cp, r3, r4);
+  __ PushRoot(RootIndex::kUndefinedValue);
+  __ Push(r6);
 
-    // ----------- S t a t e -------------
-    //  --                 r6: new target
-    //  -- sp[0*kSystemPointerSize]: implicit receiver
-    //  -- sp[1*kSystemPointerSize]: implicit receiver
-    //  -- sp[2*kSystemPointerSize]: padding
-    //  -- sp[3*kSystemPointerSize]: constructor function
-    //  -- sp[4*kSystemPointerSize]: number of arguments (tagged)
-    //  -- sp[5*kSystemPointerSize]: context
-    // -----------------------------------
+  // ----------- S t a t e -------------
+  //  --        sp[0*kSystemPointerSize]: new target
+  //  --        sp[1*kSystemPointerSize]: padding
+  //  -- r4 and sp[2*kSystemPointerSize]: constructor function
+  //  --        sp[3*kSystemPointerSize]: number of arguments (tagged)
+  //  --        sp[4*kSystemPointerSize]: context
+  // -----------------------------------
 
-    // Restore constructor function and argument count.
-    __ LoadP(r4, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
-    __ LoadP(r3, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    __ SmiUntag(r3);
+  __ LoadTaggedPointerField(
+      r7, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
+  __ lwz(r7, FieldMemOperand(r7, SharedFunctionInfo::kFlagsOffset));
+  __ DecodeField<SharedFunctionInfo::FunctionKindBits>(r7);
+  __ JumpIfIsInRange(r7, kDefaultDerivedConstructor, kDerivedConstructor,
+                     &not_create_implicit_receiver);
 
-    Label enough_stack_space, stack_overflow;
-    Generate_StackOverflowCheck(masm, r3, r8, &stack_overflow);
-    __ b(&enough_stack_space);
+  // If not derived class constructor: Allocate the new receiver object.
+  __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1, r7,
+                      r8);
+  __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject), RelocInfo::CODE_TARGET);
+  __ b(&post_instantiation_deopt_entry);
 
-    __ bind(&stack_overflow);
-    // Restore the context from the frame.
-    __ LoadP(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
-    __ CallRuntime(Runtime::kThrowStackOverflow);
-    // Unreachable code.
-    __ bkpt(0);
+  // Else: use TheHoleValue as receiver for constructor call
+  __ bind(&not_create_implicit_receiver);
+  __ LoadRoot(r3, RootIndex::kTheHoleValue);
 
-    __ bind(&enough_stack_space);
+  // ----------- S t a t e -------------
+  //  --                          r3: receiver
+  //  -- Slot 4 / sp[0*kSystemPointerSize]: new target
+  //  -- Slot 3 / sp[1*kSystemPointerSize]: padding
+  //  -- Slot 2 / sp[2*kSystemPointerSize]: constructor function
+  //  -- Slot 1 / sp[3*kSystemPointerSize]: number of arguments (tagged)
+  //  -- Slot 0 / sp[4*kSystemPointerSize]: context
+  // -----------------------------------
+  // Deoptimizer enters here.
+  masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
+      masm->pc_offset());
+  __ bind(&post_instantiation_deopt_entry);
+
+  // Restore new target.
+  __ Pop(r6);
+
+  // Push the allocated receiver to the stack.
+  __ Push(r3);
+  // We need two copies because we may have to return the original one
+  // and the calling conventions dictate that the called function pops the
+  // receiver. The second copy is pushed after the arguments, we saved in r6
+  // since r0 needs to store the number of arguments before
+  // InvokingFunction.
+  __ mr(r9, r3);
+
+  // Set up pointer to first argument (skip receiver).
+  __ addi(
+      r7, fp,
+      Operand(StandardFrameConstants::kCallerSPOffset + kSystemPointerSize));
 
-    // Copy arguments and receiver to the expression stack.
-    __ PushArray(r7, r3, r8, r0);
+  // ----------- S t a t e -------------
+  //  --                 r6: new target
+  //  -- sp[0*kSystemPointerSize]: implicit receiver
+  //  -- sp[1*kSystemPointerSize]: implicit receiver
+  //  -- sp[2*kSystemPointerSize]: padding
+  //  -- sp[3*kSystemPointerSize]: constructor function
+  //  -- sp[4*kSystemPointerSize]: number of arguments (tagged)
+  //  -- sp[5*kSystemPointerSize]: context
+  // -----------------------------------
 
-    // Push implicit receiver.
-    __ Push(r9);
+  // Restore constructor function and argument count.
+  __ LoadP(r4, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
+  __ LoadP(r3, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  __ SmiUntag(r3);
 
-    // Call the function.
-    {
-      ConstantPoolUnavailableScope constant_pool_unavailable(masm);
-      __ InvokeFunctionWithNewTarget(r4, r6, r3, CALL_FUNCTION);
-    }
+  Label stack_overflow;
+  __ StackOverflowCheck(r3, r8, &stack_overflow);
 
-    // ----------- S t a t e -------------
-    //  --                 r0: constructor result
-    //  -- sp[0*kSystemPointerSize]: implicit receiver
-    //  -- sp[1*kSystemPointerSize]: padding
-    //  -- sp[2*kSystemPointerSize]: constructor function
-    //  -- sp[3*kSystemPointerSize]: number of arguments
-    //  -- sp[4*kSystemPointerSize]: context
-    // -----------------------------------
+  // Copy arguments and receiver to the expression stack.
+  __ PushArray(r7, r3, r8, r0);
 
-    // Store offset of return address for deoptimizer.
-    masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
-        masm->pc_offset());
-
-    // Restore the context from the frame.
-    __ LoadP(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  // Push implicit receiver.
+  __ Push(r9);
 
-    // If the result is an object (in the ECMA sense), we should get rid
-    // of the receiver and use the result; see ECMA-262 section 13.2.2-7
-    // on page 74.
-    Label use_receiver, do_throw, leave_frame;
+  // Call the function.
+  {
+    ConstantPoolUnavailableScope constant_pool_unavailable(masm);
+    __ InvokeFunctionWithNewTarget(r4, r6, r3, CALL_FUNCTION);
+  }
 
-    // If the result is undefined, we jump out to using the implicit receiver.
-    __ JumpIfRoot(r3, RootIndex::kUndefinedValue, &use_receiver);
+  // ----------- S t a t e -------------
+  //  --                 r0: constructor result
+  //  -- sp[0*kSystemPointerSize]: implicit receiver
+  //  -- sp[1*kSystemPointerSize]: padding
+  //  -- sp[2*kSystemPointerSize]: constructor function
+  //  -- sp[3*kSystemPointerSize]: number of arguments
+  //  -- sp[4*kSystemPointerSize]: context
+  // -----------------------------------
 
-    // Otherwise we do a smi check and fall through to check if the return value
-    // is a valid receiver.
+  // Store offset of return address for deoptimizer.
+  masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
+      masm->pc_offset());
 
-    // If the result is a smi, it is *not* an object in the ECMA sense.
-    __ JumpIfSmi(r3, &use_receiver);
+  // If the result is an object (in the ECMA sense), we should get rid
+  // of the receiver and use the result; see ECMA-262 section 13.2.2-7
+  // on page 74.
+  Label use_receiver, do_throw, leave_and_return, check_receiver;
 
-    // If the type of the result (stored in its map) is less than
-    // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
-    STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
-    __ CompareObjectType(r3, r7, r7, FIRST_JS_RECEIVER_TYPE);
-    __ bge(&leave_frame);
-    __ b(&use_receiver);
+  // If the result is undefined, we jump out to using the implicit receiver.
+  __ JumpIfNotRoot(r3, RootIndex::kUndefinedValue, &check_receiver);
 
-    __ bind(&do_throw);
-    __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  // Otherwise we do a smi check and fall through to check if the return value
+  // is a valid receiver.
 
-    // Throw away the result of the constructor invocation and use the
-    // on-stack receiver as the result.
-    __ bind(&use_receiver);
-    __ LoadP(r3, MemOperand(sp));
-    __ JumpIfRoot(r3, RootIndex::kTheHoleValue, &do_throw);
+  // Throw away the result of the constructor invocation and use the
+  // on-stack receiver as the result.
+  __ bind(&use_receiver);
+  __ LoadP(r3, MemOperand(sp));
+  __ JumpIfRoot(r3, RootIndex::kTheHoleValue, &do_throw);
 
-    __ bind(&leave_frame);
-    // Restore smi-tagged arguments count from the frame.
-    __ LoadP(r4, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    // Leave construct frame.
-  }
+  __ bind(&leave_and_return);
+  // Restore smi-tagged arguments count from the frame.
+  __ LoadP(r4, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  // Leave construct frame.
+  __ LeaveFrame(StackFrame::CONSTRUCT);
 
   // Remove caller arguments from the stack and return.
   STATIC_ASSERT(kSmiTagSize == 1 && kSmiTag == 0);
@@ -343,6 +288,30 @@ void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   __ add(sp, sp, r4);
   __ addi(sp, sp, Operand(kSystemPointerSize));
   __ blr();
+
+  __ bind(&check_receiver);
+  // If the result is a smi, it is *not* an object in the ECMA sense.
+  __ JumpIfSmi(r3, &use_receiver);
+
+  // If the type of the result (stored in its map) is less than
+  // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
+  STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
+  __ CompareObjectType(r3, r7, r7, FIRST_JS_RECEIVER_TYPE);
+  __ bge(&leave_and_return);
+  __ b(&use_receiver);
+
+  __ bind(&do_throw);
+  // Restore the context from the frame.
+  __ LoadP(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  __ bkpt(0);
+
+  __ bind(&stack_overflow);
+  // Restore the context from the frame.
+  __ LoadP(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowStackOverflow);
+  // Unreachable code.
+  __ bkpt(0);
 }
 
 void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) {
@@ -409,7 +378,7 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) {
   // Check the stack for overflow. We are not trying to catch interruptions
   // (i.e. debug break and preemption) here, so check the "real stack limit".
   Label stack_overflow;
-  LoadStackLimit(masm, scratch, StackLimitKind::kRealStackLimit);
+  __ LoadStackLimit(scratch, StackLimitKind::kRealStackLimit);
   __ cmpl(sp, scratch);
   __ blt(&stack_overflow);
 
@@ -464,7 +433,8 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) {
 
   // Resume (Ignition/TurboFan) generator object.
   {
-    __ LoadP(r3, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset));
+    __ LoadTaggedPointerField(
+        r3, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset));
     __ LoadHalfWord(
         r3,
         FieldMemOperand(r3, SharedFunctionInfo::kFormalParameterCountOffset));
@@ -705,28 +675,6 @@ void Builtins::Generate_JSRunMicrotasksEntry(MacroAssembler* masm) {
                           Builtins::kRunMicrotasksTrampoline);
 }
 
-// Clobbers scratch1 and scratch2; preserves all other registers.
-static void Generate_CheckStackOverflow(MacroAssembler* masm, Register argc,
-                                        Register scratch1, Register scratch2) {
-  // Check the stack for overflow. We are not trying to catch
-  // interruptions (e.g. debug break and preemption) here, so the "real stack
-  // limit" is checked.
-  Label okay;
-  LoadStackLimit(masm, scratch1, StackLimitKind::kRealStackLimit);
-  // Make scratch1 the space we have left. The stack might already be overflowed
-  // here which will cause scratch1 to become negative.
-  __ sub(scratch1, sp, scratch1);
-  // Check if the arguments will overflow the stack.
-  __ ShiftLeftImm(scratch2, argc, Operand(kSystemPointerSizeLog2));
-  __ cmp(scratch1, scratch2);
-  __ bgt(&okay);  // Signed comparison.
-
-  // Out of stack space.
-  __ CallRuntime(Runtime::kThrowStackOverflow);
-
-  __ bind(&okay);
-}
-
 static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
                                              bool is_construct) {
   // Called from Generate_JS_Entry
@@ -751,8 +699,16 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
     __ Push(r5);
 
     // Check if we have enough stack space to push all arguments.
+    Label enough_stack_space, stack_overflow;
     __ addi(r3, r7, Operand(1));
-    Generate_CheckStackOverflow(masm, r3, r9, r0);
+    __ StackOverflowCheck(r3, r9, &stack_overflow);
+    __ b(&enough_stack_space);
+    __ bind(&stack_overflow);
+    __ CallRuntime(Runtime::kThrowStackOverflow);
+    // Unreachable code.
+    __ bkpt(0);
+
+    __ bind(&enough_stack_space);
 
     // Copy arguments to the stack in a loop.
     // r4: function
@@ -838,19 +794,36 @@ static void ReplaceClosureCodeWithOptimizedCode(MacroAssembler* masm,
                       OMIT_SMI_CHECK);
 }
 
-static void LeaveInterpreterFrame(MacroAssembler* masm, Register scratch) {
-  Register args_count = scratch;
-
-  // Get the arguments + receiver count.
-  __ LoadP(args_count,
+static void LeaveInterpreterFrame(MacroAssembler* masm, Register scratch1,
+                                  Register scratch2) {
+  Register params_size = scratch1;
+  // Get the size of the formal parameters + receiver (in bytes).
+  __ LoadP(params_size,
            MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
-  __ lwz(args_count,
-         FieldMemOperand(args_count, BytecodeArray::kParameterSizeOffset));
-
+  __ lwz(params_size,
+         FieldMemOperand(params_size, BytecodeArray::kParameterSizeOffset));
+
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  Register actual_params_size = scratch2;
+  // Compute the size of the actual parameters + receiver (in bytes).
+  __ LoadP(actual_params_size,
+           MemOperand(fp, StandardFrameConstants::kArgCOffset));
+  __ ShiftLeftImm(actual_params_size, actual_params_size,
+                  Operand(kSystemPointerSizeLog2));
+  __ addi(actual_params_size, actual_params_size, Operand(kSystemPointerSize));
+
+  // If actual is bigger than formal, then we should use it to free up the stack
+  // arguments.
+  Label corrected_args_count;
+  __ cmp(params_size, actual_params_size);
+  __ bge(&corrected_args_count);
+  __ mr(params_size, actual_params_size);
+  __ bind(&corrected_args_count);
+#endif
   // Leave the frame (also dropping the register file).
   __ LeaveFrame(StackFrame::INTERPRETED);
 
-  __ add(sp, sp, args_count);
+  __ add(sp, sp, params_size);
 }
 
 // Tail-call |function_id| if |actual_marker| == |expected_marker|
@@ -1141,7 +1114,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
 
     // Do a stack check to ensure we don't go over the limit.
     __ sub(r8, sp, r5);
-    LoadStackLimit(masm, r0, StackLimitKind::kRealStackLimit);
+    __ LoadStackLimit(r0, StackLimitKind::kRealStackLimit);
     __ cmpl(r8, r0);
     __ blt(&stack_overflow);
 
@@ -1174,7 +1147,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   // Perform interrupt stack check.
   // TODO(solanes): Merge with the real stack limit check above.
   Label stack_check_interrupt, after_stack_check_interrupt;
-  LoadStackLimit(masm, r0, StackLimitKind::kInterruptStackLimit);
+  __ LoadStackLimit(r0, StackLimitKind::kInterruptStackLimit);
   __ cmpl(sp, r0);
   __ blt(&stack_check_interrupt);
   __ bind(&after_stack_check_interrupt);
@@ -1218,7 +1191,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
 
   __ bind(&do_return);
   // The return value is in r3.
-  LeaveInterpreterFrame(masm, r5);
+  LeaveInterpreterFrame(masm, r5, r7);
   __ blr();
 
   __ bind(&stack_check_interrupt);
@@ -1310,7 +1283,7 @@ void Builtins::Generate_InterpreterPushArgsThenCallImpl(
 
   // Calculate number of arguments (add one for receiver).
   __ addi(r6, r3, Operand(1));
-  Generate_StackOverflowCheck(masm, r6, ip, &stack_overflow);
+  __ StackOverflowCheck(r6, ip, &stack_overflow);
 
   if (receiver_mode == ConvertReceiverMode::kNullOrUndefined) {
     // Don't copy receiver. Argument count is correct.
@@ -1360,7 +1333,7 @@ void Builtins::Generate_InterpreterPushArgsThenConstructImpl(
   // -----------------------------------
   Label stack_overflow;
   __ addi(r8, r3, Operand(1));
-  Generate_StackOverflowCheck(masm, r8, ip, &stack_overflow);
+  __ StackOverflowCheck(r8, ip, &stack_overflow);
 
   if (mode == InterpreterPushArgsMode::kWithFinalSpread) {
     // The spread argument should not be pushed.
@@ -1925,7 +1898,7 @@ void Builtins::Generate_CallOrConstructVarargs(MacroAssembler* masm,
 
   // Check for stack overflow.
   Label stack_overflow;
-  Generate_StackOverflowCheck(masm, r7, scratch, &stack_overflow);
+  __ StackOverflowCheck(r7, scratch, &stack_overflow);
 
   // Move the arguments already in the stack,
   // including the receiver and the return address.
@@ -2005,6 +1978,12 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
     __ bind(&new_target_constructor);
   }
 
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  // TODO(victorgomes): Remove this copy when all the arguments adaptor frame
+  // code is erased.
+  __ mr(r7, fp);
+  __ LoadP(r8, MemOperand(fp, StandardFrameConstants::kArgCOffset));
+#else
   // Check if we have an arguments adaptor frame below the function frame.
   Label arguments_adaptor, arguments_done;
   __ LoadP(r7, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
@@ -2030,6 +2009,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
     __ SmiUntag(r8);
   }
   __ bind(&arguments_done);
+#endif
 
   Label stack_done, stack_overflow;
   __ sub(r8, r8, r5, LeaveOE, SetRC);
@@ -2046,7 +2026,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
     // -----------------------------------
 
     // Check for stack overflow.
-    Generate_StackOverflowCheck(masm, r8, scratch, &stack_overflow);
+    __ StackOverflowCheck(r8, scratch, &stack_overflow);
 
     // Forward the arguments from the caller frame.
     // Point to the first argument to copy (skipping the receiver).
@@ -2238,7 +2218,7 @@ void Generate_PushBoundArguments(MacroAssembler* masm) {
       // (i.e. debug break and preemption) here, so check the "real stack
       // limit".
       {
-        LoadStackLimit(masm, scratch, StackLimitKind::kRealStackLimit);
+        __ LoadStackLimit(scratch, StackLimitKind::kRealStackLimit);
         __ cmpl(r0, scratch);
       }
       __ bgt(&done);  // Signed comparison.
@@ -2486,7 +2466,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
     __ bind(&over_application);
     {
       EnterArgumentsAdaptorFrame(masm);
-      Generate_StackOverflowCheck(masm, r5, r8, &stack_overflow);
+      __ StackOverflowCheck(r5, r8, &stack_overflow);
 
       // Calculate copy start address into r3 and copy end address into r7.
       // r3: actual number of arguments as a smi
@@ -2522,7 +2502,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
     __ bind(&under_application);
     {
       EnterArgumentsAdaptorFrame(masm);
-      Generate_StackOverflowCheck(masm, r5, r8, &stack_overflow);
+      __ StackOverflowCheck(r5, r8, &stack_overflow);
 
       // Fill the remaining expected arguments with undefined.
       // r0: actual number of arguments as a smi
@@ -3579,6 +3559,65 @@ void Builtins::Generate_DeoptimizationEntry_Bailout(MacroAssembler* masm) {
 void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
+
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kJSCallerSaved;
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+  __ LoadP(handler_arg, MemOperand(fp, CommonFrameConstants::kCallerPCOffset));
+  __ LoadP(
+      slot_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ LoadP(
+      handler_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ cmpi(r3, Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
+  __ bne(&deopt);
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ bind(&deopt);
+  __ cmpi(r3, Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
+  __ beq(&bailout);
+
+  if (FLAG_debug_code) {
+    __ cmpi(r3, Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
+    __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus);
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/builtins/profile-data-reader.cc b/deps/v8/src/builtins/profile-data-reader.cc
index b07c9c21f2b84b..ede84f43a55eb2 100644
--- a/deps/v8/src/builtins/profile-data-reader.cc
+++ b/deps/v8/src/builtins/profile-data-reader.cc
@@ -26,7 +26,7 @@ class ProfileDataFromFileInternal : public ProfileDataFromFile {
     hash_has_value_ = true;
   }
 
-  void AddCountToBlock(size_t block_id, uint32_t count) {
+  void AddCountToBlock(size_t block_id, double count) {
     if (block_counts_by_id_.size() <= block_id) {
       // std::vector initializes new data to zero when resizing.
       block_counts_by_id_.resize(block_id + 1);
@@ -67,7 +67,7 @@ EnsureInitProfileData() {
       CHECK(errno == 0 && end != token.c_str());
       std::getline(line_stream, token, ',');
       CHECK(line_stream.eof());
-      uint32_t count = static_cast<uint32_t>(strtoul(token.c_str(), &end, 0));
+      double count = strtod(token.c_str(), &end);
       CHECK(errno == 0 && end != token.c_str());
       ProfileDataFromFileInternal& counters_and_hash =
           (*data.get())[builtin_name];
diff --git a/deps/v8/src/builtins/profile-data-reader.h b/deps/v8/src/builtins/profile-data-reader.h
index 18490141d16f58..c6001a8ff89c85 100644
--- a/deps/v8/src/builtins/profile-data-reader.h
+++ b/deps/v8/src/builtins/profile-data-reader.h
@@ -20,7 +20,7 @@ class ProfileDataFromFile {
 
   // Returns how many times the block with the given ID was executed during
   // profiling.
-  uint32_t GetCounter(size_t block_id) const {
+  double GetCounter(size_t block_id) const {
     // The profile data is allowed to omit blocks which were never hit, so be
     // careful to avoid out-of-bounds access.
     return block_id < block_counts_by_id_.size() ? block_counts_by_id_[block_id]
@@ -38,7 +38,7 @@ class ProfileDataFromFile {
   // How many times each block was executed, indexed by block ID. This vector
   // may be shorter than the total number of blocks; any omitted block should be
   // treated as a zero.
-  std::vector<uint32_t> block_counts_by_id_;
+  std::vector<double> block_counts_by_id_;
 };
 
 // The following strings can't be static members of ProfileDataFromFile until
diff --git a/deps/v8/src/builtins/regexp.tq b/deps/v8/src/builtins/regexp.tq
index 7c043efa557de7..71ba53698dccb1 100644
--- a/deps/v8/src/builtins/regexp.tq
+++ b/deps/v8/src/builtins/regexp.tq
@@ -352,9 +352,6 @@ transitioning macro StoreLastIndex(implicit context: Context)(
   }
 }
 
-extern builtin
-StringIndexOf(implicit context: Context)(String, String, Smi): Smi;
-
 extern macro RegExpBuiltinsAssembler::AdvanceStringIndex(
     String, Number, bool, constexpr bool): Number;
 extern macro
diff --git a/deps/v8/src/builtins/s390/builtins-s390.cc b/deps/v8/src/builtins/s390/builtins-s390.cc
index 8cc3a949c35b62..d7390f00ed968b 100644
--- a/deps/v8/src/builtins/s390/builtins-s390.cc
+++ b/deps/v8/src/builtins/s390/builtins-s390.cc
@@ -52,7 +52,7 @@ static void GenerateTailCallToReturnedCode(MacroAssembler* masm,
             kJavaScriptCallArgCountRegister, kJavaScriptCallTargetRegister);
 
     __ CallRuntime(function_id, 1);
-    __ LoadRR(r4, r2);
+    __ mov(r4, r2);
 
     // Restore target function, new target and actual argument count.
     __ Pop(kJavaScriptCallTargetRegister, kJavaScriptCallNewTargetRegister,
@@ -65,39 +65,6 @@ static void GenerateTailCallToReturnedCode(MacroAssembler* masm,
 
 namespace {
 
-enum StackLimitKind { kInterruptStackLimit, kRealStackLimit };
-
-MemOperand StackLimitAsMemOperand(MacroAssembler* masm, StackLimitKind kind) {
-  DCHECK(masm->root_array_available());
-  Isolate* isolate = masm->isolate();
-  ExternalReference limit =
-      kind == StackLimitKind::kRealStackLimit
-          ? ExternalReference::address_of_real_jslimit(isolate)
-          : ExternalReference::address_of_jslimit(isolate);
-  DCHECK(TurboAssembler::IsAddressableThroughRootRegister(isolate, limit));
-
-  intptr_t offset =
-      TurboAssembler::RootRegisterOffsetForExternalReference(isolate, limit);
-  CHECK(is_int32(offset));
-  return MemOperand(kRootRegister, offset);
-}
-
-void Generate_StackOverflowCheck(MacroAssembler* masm, Register num_args,
-                                 Register scratch, Label* stack_overflow) {
-  // Check the stack for overflow. We are not trying to catch
-  // interruptions (e.g. debug break and preemption) here, so the "real stack
-  // limit" is checked.
-  __ LoadP(scratch,
-           StackLimitAsMemOperand(masm, StackLimitKind::kRealStackLimit));
-  // Make scratch the space we have left. The stack might already be overflowed
-  // here which will cause scratch to become negative.
-  __ SubP(scratch, sp, scratch);
-  // Check if the arguments will overflow the stack.
-  __ ShiftLeftP(r0, num_args, Operand(kSystemPointerSizeLog2));
-  __ CmpP(scratch, r0);
-  __ ble(stack_overflow);  // Signed comparison.
-}
-
 void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r2     : number of arguments
@@ -111,7 +78,7 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
   Register scratch = r4;
   Label stack_overflow;
 
-  Generate_StackOverflowCheck(masm, r2, r7, &stack_overflow);
+  __ StackOverflowCheck(r2, scratch, &stack_overflow);
 
   // Enter a construct frame.
   {
@@ -122,6 +89,11 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
     __ Push(cp, r2);
     __ SmiUntag(r2);
 
+    // TODO(victorgomes): When the arguments adaptor is completely removed, we
+    // should get the formal parameter count and copy the arguments in its
+    // correct position (including any undefined), instead of delaying this to
+    // InvokeFunction.
+
     // Set up pointer to last argument (skip receiver).
     __ la(r6, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
                                  kSystemPointerSize));
@@ -138,9 +110,9 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
     __ InvokeFunctionWithNewTarget(r3, r5, r2, CALL_FUNCTION);
 
     // Restore context from the frame.
-    __ LoadP(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+    __ LoadU64(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
     // Restore smi-tagged arguments count from the frame.
-    __ LoadP(scratch, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+    __ LoadU64(scratch, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
 
     // Leave construct frame.
   }
@@ -148,8 +120,8 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
   STATIC_ASSERT(kSmiTagSize == 1 && kSmiTag == 0);
 
   __ SmiToPtrArrayOffset(scratch, scratch);
-  __ AddP(sp, sp, scratch);
-  __ AddP(sp, sp, Operand(kSystemPointerSize));
+  __ AddS64(sp, sp, scratch);
+  __ AddS64(sp, sp, Operand(kSystemPointerSize));
   __ Ret();
 
   __ bind(&stack_overflow);
@@ -173,168 +145,165 @@ void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   //  -- sp[...]: constructor arguments
   // -----------------------------------
 
+  FrameScope scope(masm, StackFrame::MANUAL);
   // Enter a construct frame.
-  {
-    FrameAndConstantPoolScope scope(masm, StackFrame::CONSTRUCT);
-    Label post_instantiation_deopt_entry, not_create_implicit_receiver;
-
-    // Preserve the incoming parameters on the stack.
-    __ SmiTag(r2);
-    __ Push(cp, r2, r3);
-    __ PushRoot(RootIndex::kUndefinedValue);
-    __ Push(r5);
-
-    // ----------- S t a t e -------------
-    //  --        sp[0*kSystemPointerSize]: new target
-    //  --        sp[1*kSystemPointerSize]: padding
-    //  -- r3 and sp[2*kSystemPointerSize]: constructor function
-    //  --        sp[3*kSystemPointerSize]: number of arguments (tagged)
-    //  --        sp[4*kSystemPointerSize]: context
-    // -----------------------------------
-
-    __ LoadTaggedPointerField(
-        r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
-    __ LoadlW(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
-    __ DecodeField<SharedFunctionInfo::FunctionKindBits>(r6);
-    __ JumpIfIsInRange(r6, kDefaultDerivedConstructor, kDerivedConstructor,
-                       &not_create_implicit_receiver);
-
-    // If not derived class constructor: Allocate the new receiver object.
-    __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1,
-                        r6, r7);
-    __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject),
-            RelocInfo::CODE_TARGET);
-    __ b(&post_instantiation_deopt_entry);
-
-    // Else: use TheHoleValue as receiver for constructor call
-    __ bind(&not_create_implicit_receiver);
-    __ LoadRoot(r2, RootIndex::kTheHoleValue);
-
-    // ----------- S t a t e -------------
-    //  --                          r2: receiver
-    //  -- Slot 4 / sp[0*kSystemPointerSize]: new target
-    //  -- Slot 3 / sp[1*kSystemPointerSize]: padding
-    //  -- Slot 2 / sp[2*kSystemPointerSize]: constructor function
-    //  -- Slot 1 / sp[3*kSystemPointerSize]: number of arguments (tagged)
-    //  -- Slot 0 / sp[4*kSystemPointerSize]: context
-    // -----------------------------------
-    // Deoptimizer enters here.
-    masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
-        masm->pc_offset());
-    __ bind(&post_instantiation_deopt_entry);
-
-    // Restore new target.
-    __ Pop(r5);
-
-    // Push the allocated receiver to the stack.
-    __ Push(r2);
-    // We need two copies because we may have to return the original one
-    // and the calling conventions dictate that the called function pops the
-    // receiver. The second copy is pushed after the arguments, we saved in r6
-    // since r0 needs to store the number of arguments before
-    // InvokingFunction.
-    __ LoadRR(r8, r2);
+  Label post_instantiation_deopt_entry, not_create_implicit_receiver;
+  __ EnterFrame(StackFrame::CONSTRUCT);
 
-    // Set up pointer to first argument (skip receiver).
-    __ la(r6, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
-                                 kSystemPointerSize));
+  // Preserve the incoming parameters on the stack.
+  __ SmiTag(r2);
+  __ Push(cp, r2, r3);
+  __ PushRoot(RootIndex::kUndefinedValue);
+  __ Push(r5);
 
-    // ----------- S t a t e -------------
-    //  --                 r5: new target
-    //  -- sp[0*kSystemPointerSize]: implicit receiver
-    //  -- sp[1*kSystemPointerSize]: implicit receiver
-    //  -- sp[2*kSystemPointerSize]: padding
-    //  -- sp[3*kSystemPointerSize]: constructor function
-    //  -- sp[4*kSystemPointerSize]: number of arguments (tagged)
-    //  -- sp[5*kSystemPointerSize]: context
-    // -----------------------------------
+  // ----------- S t a t e -------------
+  //  --        sp[0*kSystemPointerSize]: new target
+  //  --        sp[1*kSystemPointerSize]: padding
+  //  -- r3 and sp[2*kSystemPointerSize]: constructor function
+  //  --        sp[3*kSystemPointerSize]: number of arguments (tagged)
+  //  --        sp[4*kSystemPointerSize]: context
+  // -----------------------------------
 
-    // Restore constructor function and argument count.
-    __ LoadP(r3, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
-    __ LoadP(r2, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    __ SmiUntag(r2);
+  __ LoadTaggedPointerField(
+      r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
+  __ LoadU32(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
+  __ DecodeField<SharedFunctionInfo::FunctionKindBits>(r6);
+  __ JumpIfIsInRange(r6, kDefaultDerivedConstructor, kDerivedConstructor,
+                     &not_create_implicit_receiver);
 
-    Label enough_stack_space, stack_overflow;
-    Generate_StackOverflowCheck(masm, r2, r7, &stack_overflow);
-    __ b(&enough_stack_space);
+  // If not derived class constructor: Allocate the new receiver object.
+  __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1, r6,
+                      r7);
+  __ Call(BUILTIN_CODE(masm->isolate(), FastNewObject), RelocInfo::CODE_TARGET);
+  __ b(&post_instantiation_deopt_entry);
 
-    __ bind(&stack_overflow);
-    // Restore the context from the frame.
-    __ LoadP(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
-    __ CallRuntime(Runtime::kThrowStackOverflow);
-    // Unreachable code.
-    __ bkpt(0);
+  // Else: use TheHoleValue as receiver for constructor call
+  __ bind(&not_create_implicit_receiver);
+  __ LoadRoot(r2, RootIndex::kTheHoleValue);
 
-    __ bind(&enough_stack_space);
-
-    // Copy arguments and receiver to the expression stack.
-    __ PushArray(r6, r2, r1, r0);
+  // ----------- S t a t e -------------
+  //  --                          r2: receiver
+  //  -- Slot 4 / sp[0*kSystemPointerSize]: new target
+  //  -- Slot 3 / sp[1*kSystemPointerSize]: padding
+  //  -- Slot 2 / sp[2*kSystemPointerSize]: constructor function
+  //  -- Slot 1 / sp[3*kSystemPointerSize]: number of arguments (tagged)
+  //  -- Slot 0 / sp[4*kSystemPointerSize]: context
+  // -----------------------------------
+  // Deoptimizer enters here.
+  masm->isolate()->heap()->SetConstructStubCreateDeoptPCOffset(
+      masm->pc_offset());
+  __ bind(&post_instantiation_deopt_entry);
+
+  // Restore new target.
+  __ Pop(r5);
+
+  // Push the allocated receiver to the stack.
+  __ Push(r2);
+  // We need two copies because we may have to return the original one
+  // and the calling conventions dictate that the called function pops the
+  // receiver. The second copy is pushed after the arguments, we saved in r6
+  // since r0 needs to store the number of arguments before
+  // InvokingFunction.
+  __ mov(r8, r2);
+
+  // Set up pointer to first argument (skip receiver).
+  __ la(r6, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                               kSystemPointerSize));
 
-    // Push implicit receiver.
-    __ Push(r8);
+  // ----------- S t a t e -------------
+  //  --                 r5: new target
+  //  -- sp[0*kSystemPointerSize]: implicit receiver
+  //  -- sp[1*kSystemPointerSize]: implicit receiver
+  //  -- sp[2*kSystemPointerSize]: padding
+  //  -- sp[3*kSystemPointerSize]: constructor function
+  //  -- sp[4*kSystemPointerSize]: number of arguments (tagged)
+  //  -- sp[5*kSystemPointerSize]: context
+  // -----------------------------------
 
-    // Call the function.
-    __ InvokeFunctionWithNewTarget(r3, r5, r2, CALL_FUNCTION);
+  // Restore constructor function and argument count.
+  __ LoadU64(r3, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
+  __ LoadU64(r2, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  __ SmiUntag(r2);
 
-    // ----------- S t a t e -------------
-    //  --                 r0: constructor result
-    //  -- sp[0*kSystemPointerSize]: implicit receiver
-    //  -- sp[1*kSystemPointerSize]: padding
-    //  -- sp[2*kSystemPointerSize]: constructor function
-    //  -- sp[3*kSystemPointerSize]: number of arguments
-    //  -- sp[4*kSystemPointerSize]: context
-    // -----------------------------------
+  Label stack_overflow;
+  __ StackOverflowCheck(r2, r7, &stack_overflow);
 
-    // Store offset of return address for deoptimizer.
-    masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
-        masm->pc_offset());
+  // Copy arguments and receiver to the expression stack.
+  __ PushArray(r6, r2, r1, r0);
 
-    // Restore the context from the frame.
-    __ LoadP(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  // Push implicit receiver.
+  __ Push(r8);
 
-    // If the result is an object (in the ECMA sense), we should get rid
-    // of the receiver and use the result; see ECMA-262 section 13.2.2-7
-    // on page 74.
-    Label use_receiver, do_throw, leave_frame;
+  // Call the function.
+  __ InvokeFunctionWithNewTarget(r3, r5, r2, CALL_FUNCTION);
 
-    // If the result is undefined, we jump out to using the implicit receiver.
-    __ JumpIfRoot(r2, RootIndex::kUndefinedValue, &use_receiver);
+  // ----------- S t a t e -------------
+  //  --                 r0: constructor result
+  //  -- sp[0*kSystemPointerSize]: implicit receiver
+  //  -- sp[1*kSystemPointerSize]: padding
+  //  -- sp[2*kSystemPointerSize]: constructor function
+  //  -- sp[3*kSystemPointerSize]: number of arguments
+  //  -- sp[4*kSystemPointerSize]: context
+  // -----------------------------------
 
-    // Otherwise we do a smi check and fall through to check if the return value
-    // is a valid receiver.
+  // Store offset of return address for deoptimizer.
+  masm->isolate()->heap()->SetConstructStubInvokeDeoptPCOffset(
+      masm->pc_offset());
 
-    // If the result is a smi, it is *not* an object in the ECMA sense.
-    __ JumpIfSmi(r2, &use_receiver);
+  // If the result is an object (in the ECMA sense), we should get rid
+  // of the receiver and use the result; see ECMA-262 section 13.2.2-7
+  // on page 74.
+  Label use_receiver, do_throw, leave_and_return, check_receiver;
 
-    // If the type of the result (stored in its map) is less than
-    // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
-    STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
-    __ CompareObjectType(r2, r6, r6, FIRST_JS_RECEIVER_TYPE);
-    __ bge(&leave_frame);
-    __ b(&use_receiver);
+  // If the result is undefined, we jump out to using the implicit receiver.
+  __ JumpIfNotRoot(r2, RootIndex::kUndefinedValue, &check_receiver);
 
-    __ bind(&do_throw);
-    __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  // Otherwise we do a smi check and fall through to check if the return value
+  // is a valid receiver.
 
-    // Throw away the result of the constructor invocation and use the
-    // on-stack receiver as the result.
-    __ bind(&use_receiver);
-    __ LoadP(r2, MemOperand(sp));
-    __ JumpIfRoot(r2, RootIndex::kTheHoleValue, &do_throw);
+  // Throw away the result of the constructor invocation and use the
+  // on-stack receiver as the result.
+  __ bind(&use_receiver);
+  __ LoadU64(r2, MemOperand(sp));
+  __ JumpIfRoot(r2, RootIndex::kTheHoleValue, &do_throw);
 
-    __ bind(&leave_frame);
-    // Restore smi-tagged arguments count from the frame.
-    __ LoadP(r3, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
-    // Leave construct frame.
-  }
+  __ bind(&leave_and_return);
+  // Restore smi-tagged arguments count from the frame.
+  __ LoadU64(r3, MemOperand(fp, ConstructFrameConstants::kLengthOffset));
+  // Leave construct frame.
+  __ LeaveFrame(StackFrame::CONSTRUCT);
 
   // Remove caller arguments from the stack and return.
   STATIC_ASSERT(kSmiTagSize == 1 && kSmiTag == 0);
 
   __ SmiToPtrArrayOffset(r3, r3);
-  __ AddP(sp, sp, r3);
-  __ AddP(sp, sp, Operand(kSystemPointerSize));
+  __ AddS64(sp, sp, r3);
+  __ AddS64(sp, sp, Operand(kSystemPointerSize));
   __ Ret();
+
+  __ bind(&check_receiver);
+  // If the result is a smi, it is *not* an object in the ECMA sense.
+  __ JumpIfSmi(r2, &use_receiver);
+
+  // If the type of the result (stored in its map) is less than
+  // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
+  STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
+  __ CompareObjectType(r2, r6, r6, FIRST_JS_RECEIVER_TYPE);
+  __ bge(&leave_and_return);
+  __ b(&use_receiver);
+
+  __ bind(&do_throw);
+  // Restore the context from the frame.
+  __ LoadU64(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
+  __ bkpt(0);
+
+  __ bind(&stack_overflow);
+  // Restore the context from the frame.
+  __ LoadU64(cp, MemOperand(fp, ConstructFrameConstants::kContextOffset));
+  __ CallRuntime(Runtime::kThrowStackOverflow);
+  // Unreachable code.
+  __ bkpt(0);
 }
 
 void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) {
@@ -383,7 +352,7 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) {
   ExternalReference debug_hook =
       ExternalReference::debug_hook_on_function_call_address(masm->isolate());
   __ Move(scratch, debug_hook);
-  __ LoadB(scratch, MemOperand(scratch));
+  __ LoadS8(scratch, MemOperand(scratch));
   __ CmpSmiLiteral(scratch, Smi::zero(), r0);
   __ bne(&prepare_step_in_if_stepping);
 
@@ -393,17 +362,17 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) {
       ExternalReference::debug_suspended_generator_address(masm->isolate());
 
   __ Move(scratch, debug_suspended_generator);
-  __ LoadP(scratch, MemOperand(scratch));
-  __ CmpP(scratch, r3);
+  __ LoadU64(scratch, MemOperand(scratch));
+  __ CmpS64(scratch, r3);
   __ beq(&prepare_step_in_suspended_generator);
   __ bind(&stepping_prepared);
 
   // Check the stack for overflow. We are not trying to catch interruptions
   // (i.e. debug break and preemption) here, so check the "real stack limit".
   Label stack_overflow;
-  __ LoadP(scratch,
-           StackLimitAsMemOperand(masm, StackLimitKind::kRealStackLimit));
-  __ CmpLogicalP(sp, scratch);
+  __ LoadU64(scratch,
+             __ StackLimitAsMemOperand(StackLimitKind::kRealStackLimit));
+  __ CmpU64(sp, scratch);
   __ blt(&stack_overflow);
 
   // ----------- S t a t e -------------
@@ -416,19 +385,19 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) {
   // Copy the function arguments from the generator object's register file.
   __ LoadTaggedPointerField(
       r5, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset));
-  __ LoadLogicalHalfWordP(
+  __ LoadU16(
       r5, FieldMemOperand(r5, SharedFunctionInfo::kFormalParameterCountOffset));
   __ LoadTaggedPointerField(
       r4,
       FieldMemOperand(r3, JSGeneratorObject::kParametersAndRegistersOffset));
   {
     Label done_loop, loop;
-    __ LoadRR(r8, r5);
+    __ mov(r8, r5);
 
     __ bind(&loop);
-    __ SubP(r8, r8, Operand(1));
+    __ SubS64(r8, r8, Operand(1));
     __ blt(&done_loop);
-    __ ShiftLeftP(r1, r8, Operand(kTaggedSizeLog2));
+    __ ShiftLeftU64(r1, r8, Operand(kTaggedSizeLog2));
     __ la(scratch, MemOperand(r4, r1));
     __ LoadAnyTaggedField(scratch,
                           FieldMemOperand(scratch, FixedArray::kHeaderSize));
@@ -456,15 +425,16 @@ void Builtins::Generate_ResumeGeneratorTrampoline(MacroAssembler* masm) {
 
   // Resume (Ignition/TurboFan) generator object.
   {
-    __ LoadP(r2, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset));
-    __ LoadHalfWordP(
+    __ LoadTaggedPointerField(
+        r2, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset));
+    __ LoadS16(
         r2,
         FieldMemOperand(r2, SharedFunctionInfo::kFormalParameterCountOffset));
     // We abuse new.target both to indicate that this is a resume call and to
     // pass in the generator object.  In ordinary calls, new.target is always
     // undefined because generator functions are non-constructable.
-    __ LoadRR(r5, r3);
-    __ LoadRR(r3, r6);
+    __ mov(r5, r3);
+    __ mov(r3, r6);
     static_assert(kJavaScriptCallCodeStartRegister == r4, "ABI mismatch");
     __ LoadTaggedPointerField(r4, FieldMemOperand(r3, JSFunction::kCodeOffset));
     __ JumpCodeObject(r4);
@@ -574,11 +544,11 @@ void Generate_JSEntryVariant(MacroAssembler* masm, StackFrame::Type type,
 
     // Initialize the root register.
     // C calling convention. The first argument is passed in r2.
-    __ LoadRR(kRootRegister, r2);
+    __ mov(kRootRegister, r2);
   }
 
   // save r6 to r1
-  __ LoadRR(r1, r6);
+  __ mov(r1, r6);
 
   // Push a frame with special values setup to mark it as an entry frame.
   //   Bad FP (-1)
@@ -590,14 +560,14 @@ void Generate_JSEntryVariant(MacroAssembler* masm, StackFrame::Type type,
   pushed_stack_space += 5 * kSystemPointerSize;
 
   // Push a bad frame pointer to fail if it is used.
-  __ LoadImmP(r9, Operand(-1));
+  __ mov(r9, Operand(-1));
 
   __ mov(r8, Operand(StackFrame::TypeToMarker(type)));
   __ mov(r7, Operand(StackFrame::TypeToMarker(type)));
   // Save copies of the top frame descriptor on the stack.
   __ Move(r6, ExternalReference::Create(
                  IsolateAddressId::kCEntryFPAddress, masm->isolate()));
-  __ LoadP(r6, MemOperand(r6));
+  __ LoadU64(r6, MemOperand(r6));
   __ StoreMultipleP(r6, r9, MemOperand(sp, kSystemPointerSize));
 
   Register scrach = r8;
@@ -611,7 +581,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, StackFrame::Type type,
       EntryFrameConstants::kCallerFPOffset - kSystemPointerSize;
 
   // restore r6
-  __ LoadRR(r6, r1);
+  __ mov(r6, r1);
 
   // If this is the outermost JS call, set js_entry_sp value.
   Label non_outermost_js;
@@ -621,15 +591,15 @@ void Generate_JSEntryVariant(MacroAssembler* masm, StackFrame::Type type,
   __ Move(r7, js_entry_sp);
   __ LoadAndTestP(scrach, MemOperand(r7));
   __ bne(&non_outermost_js, Label::kNear);
-  __ StoreP(fp, MemOperand(r7));
-  __ Load(scrach, Operand(StackFrame::OUTERMOST_JSENTRY_FRAME));
+  __ StoreU64(fp, MemOperand(r7));
+  __ mov(scrach, Operand(StackFrame::OUTERMOST_JSENTRY_FRAME));
   Label cont;
   __ b(&cont, Label::kNear);
   __ bind(&non_outermost_js);
-  __ Load(scrach, Operand(StackFrame::INNER_JSENTRY_FRAME));
+  __ mov(scrach, Operand(StackFrame::INNER_JSENTRY_FRAME));
 
   __ bind(&cont);
-  __ StoreP(scrach, MemOperand(sp));  // frame-type
+  __ StoreU64(scrach, MemOperand(sp));  // frame-type
 
   // Jump to a faked try block that does the invoke, with a faked catch
   // block that sets the pending exception.
@@ -649,7 +619,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, StackFrame::Type type,
           ExternalReference::Create(IsolateAddressId::kPendingExceptionAddress,
                                     masm->isolate()));
 
-  __ StoreP(r2, MemOperand(scrach));
+  __ StoreU64(r2, MemOperand(scrach));
   __ LoadRoot(r2, RootIndex::kException);
   __ b(&exit, Label::kNear);
 
@@ -680,18 +650,18 @@ void Generate_JSEntryVariant(MacroAssembler* masm, StackFrame::Type type,
   // Check if the current stack frame is marked as the outermost JS frame.
   Label non_outermost_js_2;
   __ pop(r7);
-  __ CmpP(r7, Operand(StackFrame::OUTERMOST_JSENTRY_FRAME));
+  __ CmpS64(r7, Operand(StackFrame::OUTERMOST_JSENTRY_FRAME));
   __ bne(&non_outermost_js_2, Label::kNear);
   __ mov(scrach, Operand::Zero());
   __ Move(r7, js_entry_sp);
-  __ StoreP(scrach, MemOperand(r7));
+  __ StoreU64(scrach, MemOperand(r7));
   __ bind(&non_outermost_js_2);
 
   // Restore the top frame descriptors from the stack.
   __ pop(r5);
   __ Move(scrach, ExternalReference::Create(IsolateAddressId::kCEntryFPAddress,
                                             masm->isolate()));
-  __ StoreP(r5, MemOperand(scrach));
+  __ StoreU64(r5, MemOperand(scrach));
 
   // Reset the stack to the callee saved registers.
   __ lay(sp, MemOperand(sp, -EntryFrameConstants::kCallerFPOffset));
@@ -740,29 +710,6 @@ void Builtins::Generate_JSRunMicrotasksEntry(MacroAssembler* masm) {
                           Builtins::kRunMicrotasksTrampoline);
 }
 
-// Clobbers scratch1 and scratch2; preserves all other registers.
-static void Generate_CheckStackOverflow(MacroAssembler* masm, Register argc,
-                                        Register scratch1, Register scratch2) {
-  // Check the stack for overflow. We are not trying to catch
-  // interruptions (e.g. debug break and preemption) here, so the "real stack
-  // limit" is checked.
-  Label okay;
-  __ LoadP(scratch1,
-           StackLimitAsMemOperand(masm, StackLimitKind::kRealStackLimit));
-  // Make scratch1 the space we have left. The stack might already be overflowed
-  // here which will cause scratch1 to become negative.
-  __ SubP(scratch1, sp, scratch1);
-  // Check if the arguments will overflow the stack.
-  __ ShiftLeftP(scratch2, argc, Operand(kSystemPointerSizeLog2));
-  __ CmpP(scratch1, scratch2);
-  __ bgt(&okay);  // Signed comparison.
-
-  // Out of stack space.
-  __ CallRuntime(Runtime::kThrowStackOverflow);
-
-  __ bind(&okay);
-}
-
 static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
                                              bool is_construct) {
   // Called from Generate_JS_Entry
@@ -773,9 +720,9 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
   // [fp + kPushedStackSpace + 20 * kSystemPointerSize]: argv
   // r0,r2,r7-r9, cp may be clobbered
 
-  __ LoadRR(r2, r6);
+  __ mov(r2, r6);
   // Load argv from the stack.
-  __ LoadP(
+  __ LoadU64(
       r6, MemOperand(fp, kPushedStackSpace + EntryFrameConstants::kArgvOffset));
 
   // r2: argc
@@ -793,14 +740,22 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
     ExternalReference context_address = ExternalReference::Create(
         IsolateAddressId::kContextAddress, masm->isolate());
     __ Move(cp, context_address);
-    __ LoadP(cp, MemOperand(cp));
+    __ LoadU64(cp, MemOperand(cp));
 
     // Push the function
     __ Push(r4);
 
     // Check if we have enough stack space to push all arguments.
-    __ AddP(r7, r2, Operand(1));
-    Generate_CheckStackOverflow(masm, r7, r1, r0);
+    Label enough_stack_space, stack_overflow;
+    __ AddS64(r7, r2, Operand(1));
+    __ StackOverflowCheck(r7, r1, &stack_overflow);
+    __ b(&enough_stack_space);
+    __ bind(&stack_overflow);
+    __ CallRuntime(Runtime::kThrowStackOverflow);
+    // Unreachable code.
+    __ bkpt(0);
+
+    __ bind(&enough_stack_space);
 
     // Copy arguments to the stack in a loop from argv to sp.
     // The arguments are actually placed in reverse order on sp
@@ -814,7 +769,7 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
     // r9: scratch reg to hold index into argv
     Label argLoop, argExit;
 
-    __ ShiftLeftP(r9, r2, Operand(kSystemPointerSizeLog2));
+    __ ShiftLeftU64(r9, r2, Operand(kSystemPointerSizeLog2));
     __ lay(r9, MemOperand(r6, r9, -kSystemPointerSize));  // point to last arg
 
     __ ltgr(r7, r2);
@@ -822,11 +777,11 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
     __ beq(&argExit, Label::kNear);
     __ bind(&argLoop);
 
-    __ LoadP(r8, MemOperand(r9));  // read next parameter
-    __ LoadP(r0, MemOperand(r8));  // dereference handle
+    __ LoadU64(r8, MemOperand(r9));  // read next parameter
+    __ LoadU64(r0, MemOperand(r8));  // dereference handle
     __ Push(r0);
     __ lay(r9, MemOperand(r9, -kSystemPointerSize));  // r9++;
-    __ SubP(r7, r7, Operand(1));
+    __ SubS64(r7, r7, Operand(1));
     __ bgt(&argLoop);
 
     __ bind(&argExit);
@@ -835,8 +790,8 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
     __ Push(r5);
 
     // Setup new.target, argc and function.
-    __ LoadRR(r5, r3);
-    __ LoadRR(r3, r4);
+    __ mov(r5, r3);
+    __ mov(r3, r4);
     // r2: argc
     // r3: function
     // r5: new.target
@@ -844,10 +799,10 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
     // Initialize all JavaScript callee-saved registers, since they will be seen
     // by the garbage collector as part of handlers.
     __ LoadRoot(r4, RootIndex::kUndefinedValue);
-    __ LoadRR(r6, r4);
-    __ LoadRR(r7, r6);
-    __ LoadRR(r8, r6);
-    __ LoadRR(r9, r6);
+    __ mov(r6, r4);
+    __ mov(r7, r6);
+    __ mov(r8, r6);
+    __ mov(r9, r6);
 
     // Invoke the code.
     Handle<Code> builtin = is_construct
@@ -877,7 +832,7 @@ void Builtins::Generate_RunMicrotasksTrampoline(MacroAssembler* masm) {
   //   r2: root_register_value
   //   r3: microtask_queue
 
-  __ LoadRR(RunMicrotasksDescriptor::MicrotaskQueueRegister(), r3);
+  __ mov(RunMicrotasksDescriptor::MicrotaskQueueRegister(), r3);
   __ Jump(BUILTIN_CODE(masm->isolate(), RunMicrotasks), RelocInfo::CODE_TARGET);
 }
 
@@ -889,26 +844,45 @@ static void ReplaceClosureCodeWithOptimizedCode(MacroAssembler* masm,
   // Store code entry in the closure.
   __ StoreTaggedField(optimized_code,
                       FieldMemOperand(closure, JSFunction::kCodeOffset), r0);
-  __ LoadRR(scratch1,
-            optimized_code);  // Write barrier clobbers scratch1 below.
+  __ mov(scratch1,
+         optimized_code);  // Write barrier clobbers scratch1 below.
   __ RecordWriteField(closure, JSFunction::kCodeOffset, scratch1, scratch2,
                       kLRHasNotBeenSaved, kDontSaveFPRegs, OMIT_REMEMBERED_SET,
                       OMIT_SMI_CHECK);
 }
 
-static void LeaveInterpreterFrame(MacroAssembler* masm, Register scratch) {
-  Register args_count = scratch;
-
-  // Get the arguments + receiver count.
-  __ LoadP(args_count,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
-  __ LoadlW(args_count,
-            FieldMemOperand(args_count, BytecodeArray::kParameterSizeOffset));
+static void LeaveInterpreterFrame(MacroAssembler* masm, Register scratch1,
+                                  Register scratch2) {
+  Register params_size = scratch1;
+  // Get the size of the formal parameters + receiver (in bytes).
+  __ LoadU64(params_size,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
+  __ LoadU32(params_size,
+            FieldMemOperand(params_size, BytecodeArray::kParameterSizeOffset));
+
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  Register actual_params_size = scratch2;
+  // Compute the size of the actual parameters + receiver (in bytes).
+  __ LoadU64(actual_params_size,
+             MemOperand(fp, StandardFrameConstants::kArgCOffset));
+  __ ShiftLeftU64(actual_params_size, actual_params_size,
+                  Operand(kSystemPointerSizeLog2));
+  __ AddS64(actual_params_size, actual_params_size,
+            Operand(kSystemPointerSize));
+
+  // If actual is bigger than formal, then we should use it to free up the stack
+  // arguments.
+  Label corrected_args_count;
+  __ CmpS64(params_size, actual_params_size);
+  __ bge(&corrected_args_count);
+  __ mov(params_size, actual_params_size);
+  __ bind(&corrected_args_count);
+#endif
 
   // Leave the frame (also dropping the register file).
   __ LeaveFrame(StackFrame::INTERPRETED);
 
-  __ AddP(sp, sp, args_count);
+  __ AddS64(sp, sp, params_size);
 }
 
 // Tail-call |function_id| if |actual_marker| == |expected_marker|
@@ -917,7 +891,7 @@ static void TailCallRuntimeIfMarkerEquals(MacroAssembler* masm,
                                           OptimizationMarker expected_marker,
                                           Runtime::FunctionId function_id) {
   Label no_match;
-  __ CmpP(actual_marker, Operand(expected_marker));
+  __ CmpS64(actual_marker, Operand(expected_marker));
   __ bne(&no_match);
   GenerateTailCallToReturnedCode(masm, function_id);
   __ bind(&no_match);
@@ -946,7 +920,7 @@ static void TailCallOptimizedCodeSlot(MacroAssembler* masm,
   __ LoadTaggedPointerField(
       scratch,
       FieldMemOperand(optimized_code_entry, Code::kCodeDataContainerOffset));
-  __ LoadW(scratch, FieldMemOperand(
+  __ LoadS32(scratch, FieldMemOperand(
                         scratch, CodeDataContainer::kKindSpecificFlagsOffset));
   __ TestBit(scratch, Code::kMarkedForDeoptimizationBit, r0);
   __ bne(&heal_optimized_code_slot);
@@ -1030,32 +1004,32 @@ static void AdvanceBytecodeOffsetOrReturn(MacroAssembler* masm,
   STATIC_ASSERT(2 == static_cast<int>(interpreter::Bytecode::kDebugBreakWide));
   STATIC_ASSERT(3 ==
                 static_cast<int>(interpreter::Bytecode::kDebugBreakExtraWide));
-  __ CmpP(bytecode, Operand(0x3));
+  __ CmpS64(bytecode, Operand(0x3));
   __ bgt(&process_bytecode);
   __ tmll(bytecode, Operand(0x1));
   __ bne(&extra_wide);
 
   // Load the next bytecode and update table to the wide scaled table.
-  __ AddP(bytecode_offset, bytecode_offset, Operand(1));
-  __ LoadlB(bytecode, MemOperand(bytecode_array, bytecode_offset));
-  __ AddP(bytecode_size_table, bytecode_size_table,
-          Operand(kIntSize * interpreter::Bytecodes::kBytecodeCount));
+  __ AddS64(bytecode_offset, bytecode_offset, Operand(1));
+  __ LoadU8(bytecode, MemOperand(bytecode_array, bytecode_offset));
+  __ AddS64(bytecode_size_table, bytecode_size_table,
+            Operand(kIntSize * interpreter::Bytecodes::kBytecodeCount));
   __ b(&process_bytecode);
 
   __ bind(&extra_wide);
   // Load the next bytecode and update table to the extra wide scaled table.
-  __ AddP(bytecode_offset, bytecode_offset, Operand(1));
-  __ LoadlB(bytecode, MemOperand(bytecode_array, bytecode_offset));
-  __ AddP(bytecode_size_table, bytecode_size_table,
-          Operand(2 * kIntSize * interpreter::Bytecodes::kBytecodeCount));
+  __ AddS64(bytecode_offset, bytecode_offset, Operand(1));
+  __ LoadU8(bytecode, MemOperand(bytecode_array, bytecode_offset));
+  __ AddS64(bytecode_size_table, bytecode_size_table,
+            Operand(2 * kIntSize * interpreter::Bytecodes::kBytecodeCount));
 
   // Load the size of the current bytecode.
   __ bind(&process_bytecode);
 
   // Bailout to the return label if this is a return bytecode.
-#define JUMP_IF_EQUAL(NAME)                                           \
-  __ CmpP(bytecode,                                                   \
-          Operand(static_cast<int>(interpreter::Bytecode::k##NAME))); \
+#define JUMP_IF_EQUAL(NAME)                                             \
+  __ CmpS64(bytecode,                                                   \
+            Operand(static_cast<int>(interpreter::Bytecode::k##NAME))); \
   __ beq(if_return);
   RETURN_BYTECODE_LIST(JUMP_IF_EQUAL)
 #undef JUMP_IF_EQUAL
@@ -1063,8 +1037,8 @@ static void AdvanceBytecodeOffsetOrReturn(MacroAssembler* masm,
   // If this is a JumpLoop, re-execute it to perform the jump to the beginning
   // of the loop.
   Label end, not_jump_loop;
-  __ CmpP(bytecode,
-          Operand(static_cast<int>(interpreter::Bytecode::kJumpLoop)));
+  __ CmpS64(bytecode,
+            Operand(static_cast<int>(interpreter::Bytecode::kJumpLoop)));
   __ bne(&not_jump_loop);
   // We need to restore the original bytecode_offset since we might have
   // increased it to skip the wide / extra-wide prefix bytecode.
@@ -1073,9 +1047,9 @@ static void AdvanceBytecodeOffsetOrReturn(MacroAssembler* masm,
 
   __ bind(&not_jump_loop);
   // Otherwise, load the size of the current bytecode and advance the offset.
-  __ ShiftLeftP(scratch3, bytecode, Operand(2));
-  __ LoadlW(scratch3, MemOperand(bytecode_size_table, scratch3));
-  __ AddP(bytecode_offset, bytecode_offset, scratch3);
+  __ ShiftLeftU64(scratch3, bytecode, Operand(2));
+  __ LoadU32(scratch3, MemOperand(bytecode_size_table, scratch3));
+  __ AddS64(bytecode_offset, bytecode_offset, scratch3);
 
   __ bind(&end);
 }
@@ -1129,14 +1103,14 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   // and update invocation count. Otherwise, setup the stack frame.
   __ LoadTaggedPointerField(
       r6, FieldMemOperand(feedback_vector, HeapObject::kMapOffset));
-  __ LoadLogicalHalfWordP(r6, FieldMemOperand(r6, Map::kInstanceTypeOffset));
-  __ CmpP(r6, Operand(FEEDBACK_VECTOR_TYPE));
+  __ LoadU16(r6, FieldMemOperand(r6, Map::kInstanceTypeOffset));
+  __ CmpS64(r6, Operand(FEEDBACK_VECTOR_TYPE));
   __ bne(&push_stack_frame);
 
   Register optimization_state = r6;
 
   // Read off the optimization state in the feedback vector.
-  __ LoadW(optimization_state,
+  __ LoadS32(optimization_state,
            FieldMemOperand(feedback_vector, FeedbackVector::kFlagsOffset));
 
   // Check if the optimized code slot is not empty or has a optimization marker.
@@ -1150,11 +1124,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   __ bind(&not_optimized);
 
   // Increment invocation count for the function.
-  __ LoadW(r1, FieldMemOperand(feedback_vector,
+  __ LoadS32(r1, FieldMemOperand(feedback_vector,
                                FeedbackVector::kInvocationCountOffset));
-  __ AddP(r1, r1, Operand(1));
-  __ StoreW(r1, FieldMemOperand(feedback_vector,
-                                FeedbackVector::kInvocationCountOffset));
+  __ AddS64(r1, r1, Operand(1));
+  __ StoreU32(r1, FieldMemOperand(feedback_vector,
+                                  FeedbackVector::kInvocationCountOffset));
 
   // Open a frame scope to indicate that there is a frame on the stack.  The
   // MANUAL indicates that the scope shouldn't actually generate code to set up
@@ -1169,11 +1143,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   STATIC_ASSERT(BytecodeArray::kBytecodeAgeOffset ==
                 BytecodeArray::kOsrNestingLevelOffset + kCharSize);
   STATIC_ASSERT(BytecodeArray::kNoAgeBytecodeAge == 0);
-  __ lghi(r1, Operand(0));
-  __ StoreHalfWord(r1,
-                   FieldMemOperand(kInterpreterBytecodeArrayRegister,
-                                   BytecodeArray::kOsrNestingLevelOffset),
-                   r0);
+  __ mov(r1, Operand(0));
+  __ StoreU16(r1,
+              FieldMemOperand(kInterpreterBytecodeArrayRegister,
+                              BytecodeArray::kOsrNestingLevelOffset),
+              r0);
 
   // Load the initial bytecode offset.
   __ mov(kInterpreterBytecodeOffsetRegister,
@@ -1187,26 +1161,25 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   Label stack_overflow;
   {
     // Load frame size (word) from the BytecodeArray object.
-    __ LoadlW(r4, FieldMemOperand(kInterpreterBytecodeArrayRegister,
+    __ LoadU32(r4, FieldMemOperand(kInterpreterBytecodeArrayRegister,
                                   BytecodeArray::kFrameSizeOffset));
 
     // Do a stack check to ensure we don't go over the limit.
-    __ SubP(r8, sp, r4);
-    __ CmpLogicalP(
-        r8, StackLimitAsMemOperand(masm, StackLimitKind::kRealStackLimit));
+    __ SubS64(r8, sp, r4);
+    __ CmpU64(r8, __ StackLimitAsMemOperand(StackLimitKind::kRealStackLimit));
     __ blt(&stack_overflow);
 
     // If ok, push undefined as the initial value for all register file entries.
     // TODO(rmcilroy): Consider doing more than one push per loop iteration.
     Label loop, no_args;
     __ LoadRoot(kInterpreterAccumulatorRegister, RootIndex::kUndefinedValue);
-    __ ShiftRightP(r4, r4, Operand(kSystemPointerSizeLog2));
+    __ ShiftRightU64(r4, r4, Operand(kSystemPointerSizeLog2));
     __ LoadAndTestP(r4, r4);
     __ beq(&no_args);
-    __ LoadRR(r1, r4);
+    __ mov(r1, r4);
     __ bind(&loop);
     __ push(kInterpreterAccumulatorRegister);
-    __ SubP(r1, Operand(1));
+    __ SubS64(r1, Operand(1));
     __ bne(&loop);
     __ bind(&no_args);
   }
@@ -1214,21 +1187,21 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   // If the bytecode array has a valid incoming new target or generator object
   // register, initialize it with incoming value which was passed in r5.
   Label no_incoming_new_target_or_generator_register;
-  __ LoadW(r8, FieldMemOperand(
+  __ LoadS32(r8, FieldMemOperand(
                    kInterpreterBytecodeArrayRegister,
                    BytecodeArray::kIncomingNewTargetOrGeneratorRegisterOffset));
-  __ CmpP(r8, Operand::Zero());
+  __ CmpS64(r8, Operand::Zero());
   __ beq(&no_incoming_new_target_or_generator_register);
-  __ ShiftLeftP(r8, r8, Operand(kSystemPointerSizeLog2));
-  __ StoreP(r5, MemOperand(fp, r8));
+  __ ShiftLeftU64(r8, r8, Operand(kSystemPointerSizeLog2));
+  __ StoreU64(r5, MemOperand(fp, r8));
   __ bind(&no_incoming_new_target_or_generator_register);
 
   // Perform interrupt stack check.
   // TODO(solanes): Merge with the real stack limit check above.
   Label stack_check_interrupt, after_stack_check_interrupt;
-  __ LoadP(r0,
-           StackLimitAsMemOperand(masm, StackLimitKind::kInterruptStackLimit));
-  __ CmpLogicalP(sp, r0);
+  __ LoadU64(r0,
+             __ StackLimitAsMemOperand(StackLimitKind::kInterruptStackLimit));
+  __ CmpU64(sp, r0);
   __ blt(&stack_check_interrupt);
   __ bind(&after_stack_check_interrupt);
 
@@ -1242,11 +1215,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
       kInterpreterDispatchTableRegister,
       ExternalReference::interpreter_dispatch_table_address(masm->isolate()));
 
-  __ LoadlB(r5, MemOperand(kInterpreterBytecodeArrayRegister,
+  __ LoadU8(r5, MemOperand(kInterpreterBytecodeArrayRegister,
                            kInterpreterBytecodeOffsetRegister));
-  __ ShiftLeftP(r5, r5, Operand(kSystemPointerSizeLog2));
-  __ LoadP(kJavaScriptCallCodeStartRegister,
-           MemOperand(kInterpreterDispatchTableRegister, r5));
+  __ ShiftLeftU64(r5, r5, Operand(kSystemPointerSizeLog2));
+  __ LoadU64(kJavaScriptCallCodeStartRegister,
+             MemOperand(kInterpreterDispatchTableRegister, r5));
   __ Call(kJavaScriptCallCodeStartRegister);
 
   masm->isolate()->heap()->SetInterpreterEntryReturnPCOffset(masm->pc_offset());
@@ -1255,15 +1228,15 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   // or the interpreter tail calling a builtin and then a dispatch.
 
   // Get bytecode array and bytecode offset from the stack frame.
-  __ LoadP(kInterpreterBytecodeArrayRegister,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
-  __ LoadP(kInterpreterBytecodeOffsetRegister,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
+  __ LoadU64(kInterpreterBytecodeArrayRegister,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
+  __ LoadU64(kInterpreterBytecodeOffsetRegister,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
   __ SmiUntag(kInterpreterBytecodeOffsetRegister);
 
   // Either return, or advance to the next bytecode and dispatch.
   Label do_return;
-  __ LoadlB(r3, MemOperand(kInterpreterBytecodeArrayRegister,
+  __ LoadU8(r3, MemOperand(kInterpreterBytecodeArrayRegister,
                            kInterpreterBytecodeOffsetRegister));
   AdvanceBytecodeOffsetOrReturn(masm, kInterpreterBytecodeArrayRegister,
                                 kInterpreterBytecodeOffsetRegister, r3, r4, r5,
@@ -1272,7 +1245,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
 
   __ bind(&do_return);
   // The return value is in r2.
-  LeaveInterpreterFrame(masm, r4);
+  LeaveInterpreterFrame(masm, r4, r6);
   __ Ret();
 
   __ bind(&stack_check_interrupt);
@@ -1281,22 +1254,22 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
   __ mov(kInterpreterBytecodeOffsetRegister,
          Operand(Smi::FromInt(BytecodeArray::kHeaderSize - kHeapObjectTag +
                               kFunctionEntryBytecodeOffset)));
-  __ StoreP(kInterpreterBytecodeOffsetRegister,
-            MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
+  __ StoreU64(kInterpreterBytecodeOffsetRegister,
+              MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
   __ CallRuntime(Runtime::kStackGuard);
 
   // After the call, restore the bytecode array, bytecode offset and accumulator
   // registers again. Also, restore the bytecode offset in the stack to its
   // previous value.
-  __ LoadP(kInterpreterBytecodeArrayRegister,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
+  __ LoadU64(kInterpreterBytecodeArrayRegister,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
   __ mov(kInterpreterBytecodeOffsetRegister,
          Operand(BytecodeArray::kHeaderSize - kHeapObjectTag));
   __ LoadRoot(kInterpreterAccumulatorRegister, RootIndex::kUndefinedValue);
 
   __ SmiTag(r0, kInterpreterBytecodeOffsetRegister);
-  __ StoreP(r0,
-            MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
+  __ StoreU64(r0,
+              MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
 
   __ jmp(&after_stack_check_interrupt);
 
@@ -1335,9 +1308,9 @@ static void Generate_InterpreterPushArgs(MacroAssembler* masm,
                                          Register num_args,
                                          Register start_address,
                                          Register scratch) {
-  __ SubP(scratch, num_args, Operand(1));
-  __ ShiftLeftP(scratch, scratch, Operand(kSystemPointerSizeLog2));
-  __ SubP(start_address, start_address, scratch);
+  __ SubS64(scratch, num_args, Operand(1));
+  __ ShiftLeftU64(scratch, scratch, Operand(kSystemPointerSizeLog2));
+  __ SubS64(start_address, start_address, scratch);
   // Push the arguments.
   __ PushArray(start_address, num_args, r1, scratch,
                TurboAssembler::PushArrayOrder::kReverse);
@@ -1358,16 +1331,16 @@ void Builtins::Generate_InterpreterPushArgsThenCallImpl(
   Label stack_overflow;
   if (mode == InterpreterPushArgsMode::kWithFinalSpread) {
     // The spread argument should not be pushed.
-    __ SubP(r2, r2, Operand(1));
+    __ SubS64(r2, r2, Operand(1));
   }
 
-  // Calculate number of arguments (AddP one for receiver).
-  __ AddP(r5, r2, Operand(1));
-  Generate_StackOverflowCheck(masm, r5, ip, &stack_overflow);
+  // Calculate number of arguments (AddS64 one for receiver).
+  __ AddS64(r5, r2, Operand(1));
+  __ StackOverflowCheck(r5, ip, &stack_overflow);
 
   if (receiver_mode == ConvertReceiverMode::kNullOrUndefined) {
     // Don't copy receiver. Argument count is correct.
-    __ LoadRR(r5, r2);
+    __ mov(r5, r2);
   }
 
   // Push the arguments.
@@ -1381,7 +1354,7 @@ void Builtins::Generate_InterpreterPushArgsThenCallImpl(
     // Pass the spread in the register r2.
     // r2 already points to the penultimate argument, the spread
     // lies in the next interpreter register.
-    __ LoadP(r4, MemOperand(r4, -kSystemPointerSize));
+    __ LoadU64(r4, MemOperand(r4, -kSystemPointerSize));
   }
 
   // Call the target.
@@ -1412,12 +1385,12 @@ void Builtins::Generate_InterpreterPushArgsThenConstructImpl(
   // -- r6 : address of the first argument
   // -----------------------------------
   Label stack_overflow;
-  __ AddP(r7, r2, Operand(1));
-  Generate_StackOverflowCheck(masm, r7, ip, &stack_overflow);
+  __ AddS64(r7, r2, Operand(1));
+  __ StackOverflowCheck(r7, ip, &stack_overflow);
 
   if (mode == InterpreterPushArgsMode::kWithFinalSpread) {
     // The spread argument should not be pushed.
-    __ SubP(r2, r2, Operand(1));
+    __ SubS64(r2, r2, Operand(1));
   }
 
   // Push the arguments. r4 and r5 will be modified.
@@ -1432,7 +1405,7 @@ void Builtins::Generate_InterpreterPushArgsThenConstructImpl(
     // r4 already points to the penultimate argument, the spread
     // lies in the next interpreter register.
     __ lay(r6, MemOperand(r6, -kSystemPointerSize));
-    __ LoadP(r4, MemOperand(r6));
+    __ LoadU64(r4, MemOperand(r6));
   } else {
     __ AssertUndefinedOrAllocationSite(r4, r7);
   }
@@ -1474,7 +1447,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
   // custom copy of the interpreter entry trampoline for profiling. If so,
   // get the custom trampoline, otherwise grab the entry address of the global
   // trampoline.
-  __ LoadP(r4, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
+  __ LoadU64(r4, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
   __ LoadTaggedPointerField(
       r4, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
   __ LoadTaggedPointerField(
@@ -1486,17 +1459,17 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
 
   __ LoadTaggedPointerField(
       r4, FieldMemOperand(r4, InterpreterData::kInterpreterTrampolineOffset));
-  __ AddP(r4, r4, Operand(Code::kHeaderSize - kHeapObjectTag));
+  __ AddS64(r4, r4, Operand(Code::kHeaderSize - kHeapObjectTag));
   __ b(&trampoline_loaded);
 
   __ bind(&builtin_trampoline);
   __ Move(r4, ExternalReference::
                   address_of_interpreter_entry_trampoline_instruction_start(
                       masm->isolate()));
-  __ LoadP(r4, MemOperand(r4));
+  __ LoadU64(r4, MemOperand(r4));
 
   __ bind(&trampoline_loaded);
-  __ AddP(r14, r4, Operand(interpreter_entry_return_pc_offset.value()));
+  __ AddS64(r14, r4, Operand(interpreter_entry_return_pc_offset.value()));
 
   // Initialize the dispatch table register.
   __ Move(
@@ -1504,8 +1477,8 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
       ExternalReference::interpreter_dispatch_table_address(masm->isolate()));
 
   // Get the bytecode array pointer from the frame.
-  __ LoadP(kInterpreterBytecodeArrayRegister,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
+  __ LoadU64(kInterpreterBytecodeArrayRegister,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
 
   if (FLAG_debug_code) {
     // Check function data field is actually a BytecodeArray object.
@@ -1519,14 +1492,14 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
   }
 
   // Get the target bytecode offset from the frame.
-  __ LoadP(kInterpreterBytecodeOffsetRegister,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
+  __ LoadU64(kInterpreterBytecodeOffsetRegister,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
   __ SmiUntag(kInterpreterBytecodeOffsetRegister);
 
   if (FLAG_debug_code) {
     Label okay;
-    __ CmpP(kInterpreterBytecodeOffsetRegister,
-            Operand(BytecodeArray::kHeaderSize - kHeapObjectTag));
+    __ CmpS64(kInterpreterBytecodeOffsetRegister,
+              Operand(BytecodeArray::kHeaderSize - kHeapObjectTag));
     __ bge(&okay);
     __ bkpt(0);
     __ bind(&okay);
@@ -1535,30 +1508,30 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
   // Dispatch to the target bytecode.
   UseScratchRegisterScope temps(masm);
   Register scratch = temps.Acquire();
-  __ LoadlB(scratch, MemOperand(kInterpreterBytecodeArrayRegister,
+  __ LoadU8(scratch, MemOperand(kInterpreterBytecodeArrayRegister,
                                 kInterpreterBytecodeOffsetRegister));
-  __ ShiftLeftP(scratch, scratch, Operand(kSystemPointerSizeLog2));
-  __ LoadP(kJavaScriptCallCodeStartRegister,
-           MemOperand(kInterpreterDispatchTableRegister, scratch));
+  __ ShiftLeftU64(scratch, scratch, Operand(kSystemPointerSizeLog2));
+  __ LoadU64(kJavaScriptCallCodeStartRegister,
+             MemOperand(kInterpreterDispatchTableRegister, scratch));
   __ Jump(kJavaScriptCallCodeStartRegister);
 }
 
 void Builtins::Generate_InterpreterEnterBytecodeAdvance(MacroAssembler* masm) {
   // Get bytecode array and bytecode offset from the stack frame.
-  __ LoadP(kInterpreterBytecodeArrayRegister,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
-  __ LoadP(kInterpreterBytecodeOffsetRegister,
-           MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
+  __ LoadU64(kInterpreterBytecodeArrayRegister,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
+  __ LoadU64(kInterpreterBytecodeOffsetRegister,
+             MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
   __ SmiUntag(kInterpreterBytecodeOffsetRegister);
 
   Label enter_bytecode, function_entry_bytecode;
-  __ CmpP(kInterpreterBytecodeOffsetRegister,
-          Operand(BytecodeArray::kHeaderSize - kHeapObjectTag +
-                  kFunctionEntryBytecodeOffset));
+  __ CmpS64(kInterpreterBytecodeOffsetRegister,
+            Operand(BytecodeArray::kHeaderSize - kHeapObjectTag +
+                    kFunctionEntryBytecodeOffset));
   __ beq(&function_entry_bytecode);
 
   // Load the current bytecode.
-  __ LoadlB(r3, MemOperand(kInterpreterBytecodeArrayRegister,
+  __ LoadU8(r3, MemOperand(kInterpreterBytecodeArrayRegister,
                            kInterpreterBytecodeOffsetRegister));
 
   // Advance to the next bytecode.
@@ -1570,8 +1543,8 @@ void Builtins::Generate_InterpreterEnterBytecodeAdvance(MacroAssembler* masm) {
   __ bind(&enter_bytecode);
   // Convert new bytecode offset to a Smi and save in the stackframe.
   __ SmiTag(r4, kInterpreterBytecodeOffsetRegister);
-  __ StoreP(r4,
-            MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
+  __ StoreU64(r4,
+              MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
 
   Generate_InterpreterEnterBytecode(masm);
 
@@ -1602,11 +1575,11 @@ void Generate_ContinueToBuiltinHelper(MacroAssembler* masm,
   Register scratch = ip;
   if (with_result) {
     if (java_script_builtin) {
-      __ LoadRR(scratch, r2);
+      __ mov(scratch, r2);
     } else {
       // Overwrite the hole inserted by the deoptimizer with the return value
       // from the LAZY deopt point.
-      __ StoreP(
+      __ StoreU64(
           r2, MemOperand(
                   sp, config->num_allocatable_general_registers() *
                               kSystemPointerSize +
@@ -1624,15 +1597,15 @@ void Generate_ContinueToBuiltinHelper(MacroAssembler* masm,
     // Overwrite the hole inserted by the deoptimizer with the return value from
     // the LAZY deopt point. r0 contains the arguments count, the return value
     // from LAZY is always the last argument.
-    __ AddP(r2, r2,
-            Operand(BuiltinContinuationFrameConstants::kFixedSlotCount));
-    __ ShiftLeftP(r1, r2, Operand(kSystemPointerSizeLog2));
-    __ StoreP(scratch, MemOperand(sp, r1));
+    __ AddS64(r2, r2,
+              Operand(BuiltinContinuationFrameConstants::kFixedSlotCount));
+    __ ShiftLeftU64(r1, r2, Operand(kSystemPointerSizeLog2));
+    __ StoreU64(scratch, MemOperand(sp, r1));
     // Recover arguments count.
-    __ SubP(r2, r2,
-            Operand(BuiltinContinuationFrameConstants::kFixedSlotCount));
+    __ SubS64(r2, r2,
+              Operand(BuiltinContinuationFrameConstants::kFixedSlotCount));
   }
-  __ LoadP(
+  __ LoadU64(
       fp,
       MemOperand(sp, BuiltinContinuationFrameConstants::kFixedFrameSizeFromFp));
   // Load builtin index (stored as a Smi) and use it to get the builtin start
@@ -1640,10 +1613,10 @@ void Generate_ContinueToBuiltinHelper(MacroAssembler* masm,
   UseScratchRegisterScope temps(masm);
   Register builtin = temps.Acquire();
   __ Pop(builtin);
-  __ AddP(sp, sp,
-          Operand(BuiltinContinuationFrameConstants::kFixedFrameSizeFromFp));
+  __ AddS64(sp, sp,
+            Operand(BuiltinContinuationFrameConstants::kFixedFrameSizeFromFp));
   __ Pop(r0);
-  __ LoadRR(r14, r0);
+  __ mov(r14, r0);
   __ LoadEntryFromBuiltinIndex(builtin);
   __ Jump(builtin);
 }
@@ -1709,9 +1682,9 @@ void Builtins::Generate_InterpreterOnStackReplacement(MacroAssembler* masm) {
 
   // Compute the target address = code_obj + header_size + osr_offset
   // <entry_addr> = <code_obj> + #header_size + <osr_offset>
-  __ AddP(r2, r3);
-  __ AddP(r0, r2, Operand(Code::kHeaderSize - kHeapObjectTag));
-  __ LoadRR(r14, r0);
+  __ AddS64(r2, r3);
+  __ AddS64(r0, r2, Operand(Code::kHeaderSize - kHeapObjectTag));
+  __ mov(r14, r0);
 
   // And "return" to the OSR entry point of the function.
   __ Ret();
@@ -1731,21 +1704,21 @@ void Builtins::Generate_FunctionPrototypeApply(MacroAssembler* masm) {
   // present) instead.
   {
     __ LoadRoot(r7, RootIndex::kUndefinedValue);
-    __ LoadRR(r4, r7);
+    __ mov(r4, r7);
     Label done;
 
-    __ LoadP(r3, MemOperand(sp));  // receiver
+    __ LoadU64(r3, MemOperand(sp));  // receiver
     __ cghi(r2, Operand(1));
     __ blt(&done);
-    __ LoadP(r7, MemOperand(sp, kSystemPointerSize));  // thisArg
+    __ LoadU64(r7, MemOperand(sp, kSystemPointerSize));  // thisArg
     __ cghi(r2, Operand(2));
     __ blt(&done);
-    __ LoadP(r4, MemOperand(sp, 2 * kSystemPointerSize));  // argArray
+    __ LoadU64(r4, MemOperand(sp, 2 * kSystemPointerSize));  // argArray
 
     __ bind(&done);
-    __ ShiftLeftP(r1, r2, Operand(kSystemPointerSizeLog2));
+    __ ShiftLeftU64(r1, r2, Operand(kSystemPointerSizeLog2));
     __ lay(sp, MemOperand(sp, r1));
-    __ StoreP(r7, MemOperand(sp));
+    __ StoreU64(r7, MemOperand(sp));
   }
 
   // ----------- S t a t e -------------
@@ -1771,7 +1744,7 @@ void Builtins::Generate_FunctionPrototypeApply(MacroAssembler* masm) {
   // arguments to the receiver.
   __ bind(&no_arguments);
   {
-    __ LoadImmP(r2, Operand::Zero());
+    __ mov(r2, Operand::Zero());
     __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
   }
 }
@@ -1788,12 +1761,12 @@ void Builtins::Generate_FunctionPrototypeCall(MacroAssembler* masm) {
     __ cghi(r2, Operand::Zero());
     __ b(ne, &done);
     __ PushRoot(RootIndex::kUndefinedValue);
-    __ AddP(r2, r2, Operand(1));
+    __ AddS64(r2, r2, Operand(1));
     __ bind(&done);
   }
 
   // 3. Adjust the actual number of arguments.
-  __ SubP(r2, r2, Operand(1));
+  __ SubS64(r2, r2, Operand(1));
 
   // 4. Call the callable.
   __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
@@ -1813,25 +1786,25 @@ void Builtins::Generate_ReflectApply(MacroAssembler* masm) {
   // thisArgument (if present) instead.
   {
     __ LoadRoot(r3, RootIndex::kUndefinedValue);
-    __ LoadRR(r7, r3);
-    __ LoadRR(r4, r3);
+    __ mov(r7, r3);
+    __ mov(r4, r3);
 
     Label done;
 
     __ cghi(r2, Operand(1));
     __ blt(&done);
-    __ LoadP(r3, MemOperand(sp, kSystemPointerSize));  // thisArg
+    __ LoadU64(r3, MemOperand(sp, kSystemPointerSize));  // thisArg
     __ cghi(r2, Operand(2));
     __ blt(&done);
-    __ LoadP(r7, MemOperand(sp, 2 * kSystemPointerSize));  // argArray
+    __ LoadU64(r7, MemOperand(sp, 2 * kSystemPointerSize));  // argArray
     __ cghi(r2, Operand(3));
     __ blt(&done);
-    __ LoadP(r4, MemOperand(sp, 3 * kSystemPointerSize));  // argArray
+    __ LoadU64(r4, MemOperand(sp, 3 * kSystemPointerSize));  // argArray
 
     __ bind(&done);
-    __ ShiftLeftP(r1, r2, Operand(kSystemPointerSizeLog2));
+    __ ShiftLeftU64(r1, r2, Operand(kSystemPointerSizeLog2));
     __ lay(sp, MemOperand(sp, r1));
-    __ StoreP(r7, MemOperand(sp));
+    __ StoreU64(r7, MemOperand(sp));
   }
 
   // ----------- S t a t e -------------
@@ -1864,25 +1837,25 @@ void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {
   // (if present) instead.
   {
     __ LoadRoot(r3, RootIndex::kUndefinedValue);
-    __ LoadRR(r4, r3);
+    __ mov(r4, r3);
 
     Label done;
 
-    __ LoadRR(r6, r3);
+    __ mov(r6, r3);
     __ cghi(r2, Operand(1));
     __ blt(&done);
-    __ LoadP(r3, MemOperand(sp, kSystemPointerSize));  // thisArg
-    __ LoadRR(r5, r3);
+    __ LoadU64(r3, MemOperand(sp, kSystemPointerSize));  // thisArg
+    __ mov(r5, r3);
     __ cghi(r2, Operand(2));
     __ blt(&done);
-    __ LoadP(r4, MemOperand(sp, 2 * kSystemPointerSize));  // argArray
+    __ LoadU64(r4, MemOperand(sp, 2 * kSystemPointerSize));  // argArray
     __ cghi(r2, Operand(3));
     __ blt(&done);
-    __ LoadP(r5, MemOperand(sp, 3 * kSystemPointerSize));  // argArray
+    __ LoadU64(r5, MemOperand(sp, 3 * kSystemPointerSize));  // argArray
     __ bind(&done);
-    __ ShiftLeftP(r1, r2, Operand(kSystemPointerSizeLog2));
+    __ ShiftLeftU64(r1, r2, Operand(kSystemPointerSizeLog2));
     __ lay(sp, MemOperand(sp, r1));
-    __ StoreP(r6, MemOperand(sp));
+    __ StoreU64(r6, MemOperand(sp));
   }
 
   // ----------- S t a t e -------------
@@ -1907,7 +1880,7 @@ void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {
 
 static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) {
   __ SmiTag(r2);
-  __ Load(r6, Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR)));
+  __ mov(r6, Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR)));
   // Stack updated as such:
   //    old SP --->
   //                 R14 Return Addr
@@ -1920,11 +1893,11 @@ static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) {
 
   // Cleanse the top nibble of 31-bit pointers.
   __ CleanseP(r14);
-  __ StoreP(r14, MemOperand(sp, 4 * kSystemPointerSize));
-  __ StoreP(fp, MemOperand(sp, 3 * kSystemPointerSize));
-  __ StoreP(r6, MemOperand(sp, 2 * kSystemPointerSize));
-  __ StoreP(r3, MemOperand(sp, 1 * kSystemPointerSize));
-  __ StoreP(r2, MemOperand(sp, 0 * kSystemPointerSize));
+  __ StoreU64(r14, MemOperand(sp, 4 * kSystemPointerSize));
+  __ StoreU64(fp, MemOperand(sp, 3 * kSystemPointerSize));
+  __ StoreU64(r6, MemOperand(sp, 2 * kSystemPointerSize));
+  __ StoreU64(r3, MemOperand(sp, 1 * kSystemPointerSize));
+  __ StoreU64(r2, MemOperand(sp, 0 * kSystemPointerSize));
   __ Push(Smi::zero());  // Padding.
   __ la(fp,
         MemOperand(sp, ArgumentsAdaptorFrameConstants::kFixedFrameSizeFromFp));
@@ -1936,7 +1909,7 @@ static void LeaveArgumentsAdaptorFrame(MacroAssembler* masm) {
   // -----------------------------------
   // Get the number of arguments passed (as a smi), tear down the frame and
   // then tear down the parameters.
-  __ LoadP(r3, MemOperand(fp, ArgumentsAdaptorFrameConstants::kLengthOffset));
+  __ LoadU64(r3, MemOperand(fp, ArgumentsAdaptorFrameConstants::kLengthOffset));
   int stack_adjustment = kSystemPointerSize;  // adjust for receiver
   __ LeaveFrame(StackFrame::ARGUMENTS_ADAPTOR, stack_adjustment);
   __ SmiToPtrArrayOffset(r3, r3);
@@ -1962,13 +1935,13 @@ void Builtins::Generate_CallOrConstructVarargs(MacroAssembler* masm,
     __ AssertNotSmi(r4);
     __ LoadTaggedPointerField(scratch,
                               FieldMemOperand(r4, HeapObject::kMapOffset));
-    __ LoadHalfWordP(scratch,
+    __ LoadS16(scratch,
                      FieldMemOperand(scratch, Map::kInstanceTypeOffset));
-    __ CmpP(scratch, Operand(FIXED_ARRAY_TYPE));
+    __ CmpS64(scratch, Operand(FIXED_ARRAY_TYPE));
     __ beq(&ok);
-    __ CmpP(scratch, Operand(FIXED_DOUBLE_ARRAY_TYPE));
+    __ CmpS64(scratch, Operand(FIXED_DOUBLE_ARRAY_TYPE));
     __ bne(&fail);
-    __ CmpP(r6, Operand::Zero());
+    __ CmpS64(r6, Operand::Zero());
     __ beq(&ok);
     // Fall through.
     __ bind(&fail);
@@ -1979,26 +1952,26 @@ void Builtins::Generate_CallOrConstructVarargs(MacroAssembler* masm,
 
   // Check for stack overflow.
   Label stack_overflow;
-  Generate_StackOverflowCheck(masm, r6, scratch, &stack_overflow);
+  __ StackOverflowCheck(r6, scratch, &stack_overflow);
 
   // Move the arguments already in the stack,
   // including the receiver and the return address.
   {
     Label copy, check;
     Register num = ip, src = r8, dest = r7;
-    __ LoadRR(src, sp);
-    __ ShiftLeftP(r1, r6, Operand(kSystemPointerSizeLog2));
-    __ SubP(sp, sp, r1);
+    __ mov(src, sp);
+    __ ShiftLeftU64(r1, r6, Operand(kSystemPointerSizeLog2));
+    __ SubS64(sp, sp, r1);
     // Update stack pointer.
-    __ LoadRR(dest, sp);
+    __ mov(dest, sp);
     __ ltgr(num, r2);
     __ b(&check);
     __ bind(&copy);
-    __ LoadP(r0, MemOperand(src));
+    __ LoadU64(r0, MemOperand(src));
     __ lay(src, MemOperand(src, kSystemPointerSize));
-    __ StoreP(r0, MemOperand(dest));
+    __ StoreU64(r0, MemOperand(dest));
     __ lay(dest, MemOperand(dest, kSystemPointerSize));
-    __ SubP(num, num, Operand(1));
+    __ SubS64(num, num, Operand(1));
     __ bind(&check);
     __ b(ge, &copy);
   }
@@ -2006,11 +1979,11 @@ void Builtins::Generate_CallOrConstructVarargs(MacroAssembler* masm,
   // Push arguments onto the stack (thisArgument is already on the stack).
   {
     Label loop, no_args, skip;
-    __ CmpP(r6, Operand::Zero());
+    __ CmpS64(r6, Operand::Zero());
     __ beq(&no_args);
-    __ AddP(r4, r4,
-            Operand(FixedArray::kHeaderSize - kHeapObjectTag - kTaggedSize));
-    __ LoadRR(r1, r6);
+    __ AddS64(r4, r4,
+              Operand(FixedArray::kHeaderSize - kHeapObjectTag - kTaggedSize));
+    __ mov(r1, r6);
     __ bind(&loop);
     __ LoadAnyTaggedField(scratch, MemOperand(r4, kTaggedSize), r0);
     __ la(r4, MemOperand(r4, kTaggedSize));
@@ -2018,11 +1991,11 @@ void Builtins::Generate_CallOrConstructVarargs(MacroAssembler* masm,
     __ bne(&skip, Label::kNear);
     __ LoadRoot(scratch, RootIndex::kUndefinedValue);
     __ bind(&skip);
-    __ StoreP(scratch, MemOperand(r7));
+    __ StoreU64(scratch, MemOperand(r7));
     __ lay(r7, MemOperand(r7, kSystemPointerSize));
     __ BranchOnCount(r1, &loop);
     __ bind(&no_args);
-    __ AddP(r2, r2, r6);
+    __ AddS64(r2, r2, r6);
   }
 
   // Tail-call to the actual Call or Construct builtin.
@@ -2050,7 +2023,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
     __ JumpIfSmi(r5, &new_target_not_constructor);
     __ LoadTaggedPointerField(scratch,
                               FieldMemOperand(r5, HeapObject::kMapOffset));
-    __ LoadlB(scratch, FieldMemOperand(scratch, Map::kBitFieldOffset));
+    __ LoadU8(scratch, FieldMemOperand(scratch, Map::kBitFieldOffset));
     __ tmll(scratch, Operand(Map::Bits1::IsConstructorBit::kShift));
     __ bne(&new_target_constructor);
     __ bind(&new_target_not_constructor);
@@ -2063,34 +2036,42 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
     __ bind(&new_target_constructor);
   }
 
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  // TODO(victorgomes): Remove this copy when all the arguments adaptor frame
+  // code is erased.
+  __ mov(r6, fp);
+  __ LoadU64(r7, MemOperand(fp, StandardFrameConstants::kArgCOffset));
+#else
   // Check if we have an arguments adaptor frame below the function frame.
   Label arguments_adaptor, arguments_done;
-  __ LoadP(r6, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
-  __ LoadP(scratch,
-           MemOperand(r6, CommonFrameConstants::kContextOrFrameTypeOffset));
-  __ CmpP(scratch,
-          Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR)));
+  __ LoadU64(r6, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
+  __ LoadU64(scratch,
+             MemOperand(r6, CommonFrameConstants::kContextOrFrameTypeOffset));
+  __ CmpS64(scratch,
+            Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR)));
   __ beq(&arguments_adaptor);
   {
-    __ LoadP(r7, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
+    __ LoadU64(r7, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
     __ LoadTaggedPointerField(
         r7, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset));
-    __ LoadLogicalHalfWordP(
+    __ LoadU16(
         r7,
         FieldMemOperand(r7, SharedFunctionInfo::kFormalParameterCountOffset));
-    __ LoadRR(r6, fp);
+    __ mov(r6, fp);
   }
   __ b(&arguments_done);
   __ bind(&arguments_adaptor);
   {
     // Load the length from the ArgumentsAdaptorFrame.
-    __ LoadP(r7, MemOperand(r6, ArgumentsAdaptorFrameConstants::kLengthOffset));
+    __ LoadU64(r7,
+               MemOperand(r6, ArgumentsAdaptorFrameConstants::kLengthOffset));
     __ SmiUntag(r7);
   }
   __ bind(&arguments_done);
+#endif
 
   Label stack_done, stack_overflow;
-  __ SubP(r7, r7, r4);
+  __ SubS64(r7, r7, r4);
   __ ble(&stack_done);
   {
     // ----------- S t a t e -------------
@@ -2104,16 +2085,16 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
     // -----------------------------------
 
     // Check for stack overflow.
-    Generate_StackOverflowCheck(masm, r7, scratch, &stack_overflow);
+    __ StackOverflowCheck(r7, scratch, &stack_overflow);
 
     // Forward the arguments from the caller frame.
-    __ LoadRR(r5, r5);
+    __ mov(r5, r5);
     // Point to the first argument to copy (skipping the receiver).
-    __ AddP(r6, r6,
-           Operand(CommonFrameConstants::kFixedFrameSizeAboveFp +
-                   kSystemPointerSize));
-    __ ShiftLeftP(scratch, r4, Operand(kSystemPointerSizeLog2));
-    __ AddP(r6, r6, scratch);
+    __ AddS64(r6, r6,
+              Operand(CommonFrameConstants::kFixedFrameSizeAboveFp +
+                      kSystemPointerSize));
+    __ ShiftLeftU64(scratch, r4, Operand(kSystemPointerSizeLog2));
+    __ AddS64(r6, r6, scratch);
 
     // Move the arguments already in the stack,
     // including the receiver and the return address.
@@ -2121,19 +2102,19 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
       Label copy, check;
       Register num = r1, src = ip,
                dest = r4;  // r7 and r10 are context and root.
-      __ LoadRR(src, sp);
+      __ mov(src, sp);
       // Update stack pointer.
-      __ ShiftLeftP(scratch, r7, Operand(kSystemPointerSizeLog2));
-      __ SubP(sp, sp, scratch);
-      __ LoadRR(dest, sp);
+      __ ShiftLeftU64(scratch, r7, Operand(kSystemPointerSizeLog2));
+      __ SubS64(sp, sp, scratch);
+      __ mov(dest, sp);
       __ ltgr(num, r2);
       __ b(&check);
       __ bind(&copy);
-      __ LoadP(r0, MemOperand(src));
+      __ LoadU64(r0, MemOperand(src));
       __ lay(src, MemOperand(src, kSystemPointerSize));
-      __ StoreP(r0, MemOperand(dest));
+      __ StoreU64(r0, MemOperand(dest));
       __ lay(dest, MemOperand(dest, kSystemPointerSize));
-      __ SubP(num, num, Operand(1));
+      __ SubS64(num, num, Operand(1));
       __ bind(&check);
       __ b(ge, &copy);
     }
@@ -2143,14 +2124,14 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
     // friendly.
     {
       Label loop;
-      __ AddP(r2, r2, r7);
+      __ AddS64(r2, r2, r7);
       __ bind(&loop);
       {
-        __ SubP(r7, r7, Operand(1));
-        __ ShiftLeftP(r1, r7, Operand(kSystemPointerSizeLog2));
-        __ LoadP(scratch, MemOperand(r6, r1));
-        __ StoreP(scratch, MemOperand(r4, r1));
-        __ CmpP(r7, Operand::Zero());
+        __ SubS64(r7, r7, Operand(1));
+        __ ShiftLeftU64(r1, r7, Operand(kSystemPointerSizeLog2));
+        __ LoadU64(scratch, MemOperand(r6, r1));
+        __ StoreU64(scratch, MemOperand(r4, r1));
+        __ CmpS64(r7, Operand::Zero());
         __ bne(&loop);
       }
     }
@@ -2178,7 +2159,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
   Label class_constructor;
   __ LoadTaggedPointerField(
       r4, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
-  __ LoadlW(r5, FieldMemOperand(r4, SharedFunctionInfo::kFlagsOffset));
+  __ LoadU32(r5, FieldMemOperand(r4, SharedFunctionInfo::kFlagsOffset));
   __ TestBitMask(r5, SharedFunctionInfo::IsClassConstructorBit::kMask, r0);
   __ bne(&class_constructor);
 
@@ -2230,12 +2211,12 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
         FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
         __ SmiTag(r2);
         __ Push(r2, r3);
-        __ LoadRR(r2, r5);
+        __ mov(r2, r5);
         __ Push(cp);
         __ Call(BUILTIN_CODE(masm->isolate(), ToObject),
                 RelocInfo::CODE_TARGET);
         __ Pop(cp);
-        __ LoadRR(r5, r2);
+        __ mov(r5, r2);
         __ Pop(r2, r3);
         __ SmiUntag(r2);
       }
@@ -2254,7 +2235,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
   //  -- cp : the function context.
   // -----------------------------------
 
-  __ LoadLogicalHalfWordP(
+  __ LoadU16(
       r4, FieldMemOperand(r4, SharedFunctionInfo::kFormalParameterCountOffset));
   __ InvokeFunctionCode(r3, no_reg, r4, r2, JUMP_FUNCTION);
 
@@ -2296,13 +2277,12 @@ void Generate_PushBoundArguments(MacroAssembler* masm) {
     // Reserve stack space for the [[BoundArguments]].
     {
       Label done;
-      __ ShiftLeftP(r9, r6, Operand(kSystemPointerSizeLog2));
-      __ SubP(r1, sp, r9);
+      __ ShiftLeftU64(r9, r6, Operand(kSystemPointerSizeLog2));
+      __ SubS64(r1, sp, r9);
       // Check the stack for overflow. We are not trying to catch interruptions
       // (i.e. debug break and preemption) here, so check the "real stack
       // limit".
-      __ CmpLogicalP(
-          r1, StackLimitAsMemOperand(masm, StackLimitKind::kRealStackLimit));
+      __ CmpU64(r1, __ StackLimitAsMemOperand(StackLimitKind::kRealStackLimit));
       __ bgt(&done);  // Signed comparison.
       // Restore the stack pointer.
       {
@@ -2319,15 +2299,15 @@ void Generate_PushBoundArguments(MacroAssembler* masm) {
     // Push [[BoundArguments]].
     {
       Label loop, done;
-      __ AddP(r2, r2, r6);  // Adjust effective number of arguments.
-      __ AddP(r4, r4, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
+      __ AddS64(r2, r2, r6);  // Adjust effective number of arguments.
+      __ AddS64(r4, r4, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
 
       __ bind(&loop);
-      __ SubP(r1, r6, Operand(1));
-      __ ShiftLeftP(r1, r1, Operand(kTaggedSizeLog2));
+      __ SubS64(r1, r6, Operand(1));
+      __ ShiftLeftU64(r1, r1, Operand(kTaggedSizeLog2));
       __ LoadAnyTaggedField(scratch, MemOperand(r4, r1), r0);
       __ Push(scratch);
-      __ SubP(r6, r6, Operand(1));
+      __ SubS64(r6, r6, Operand(1));
       __ bgt(&loop);
       __ bind(&done);
     }
@@ -2376,17 +2356,17 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) {
   __ CompareObjectType(r3, r6, r7, JS_FUNCTION_TYPE);
   __ Jump(masm->isolate()->builtins()->CallFunction(mode),
           RelocInfo::CODE_TARGET, eq);
-  __ CmpP(r7, Operand(JS_BOUND_FUNCTION_TYPE));
+  __ CmpS64(r7, Operand(JS_BOUND_FUNCTION_TYPE));
   __ Jump(BUILTIN_CODE(masm->isolate(), CallBoundFunction),
           RelocInfo::CODE_TARGET, eq);
 
   // Check if target has a [[Call]] internal method.
-  __ LoadlB(r6, FieldMemOperand(r6, Map::kBitFieldOffset));
+  __ LoadU8(r6, FieldMemOperand(r6, Map::kBitFieldOffset));
   __ TestBit(r6, Map::Bits1::IsCallableBit::kShift);
   __ beq(&non_callable);
 
   // Check if target is a proxy and call CallProxy external builtin
-  __ CmpP(r7, Operand(JS_PROXY_TYPE));
+  __ CmpS64(r7, Operand(JS_PROXY_TYPE));
   __ Jump(BUILTIN_CODE(masm->isolate(), CallProxy), RelocInfo::CODE_TARGET, eq);
 
   // 2. Call to something else, which might have a [[Call]] internal method (if
@@ -2427,7 +2407,7 @@ void Builtins::Generate_ConstructFunction(MacroAssembler* masm) {
   // Jump to JSBuiltinsConstructStub or JSConstructStubGeneric.
   __ LoadTaggedPointerField(
       r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
-  __ LoadlW(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
+  __ LoadU32(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
   __ AndP(r6, Operand(SharedFunctionInfo::ConstructAsBuiltinBit::kMask));
   __ beq(&call_generic_stub);
 
@@ -2481,7 +2461,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
 
   // Check if target has a [[Construct]] internal method.
   __ LoadTaggedPointerField(r6, FieldMemOperand(r3, HeapObject::kMapOffset));
-  __ LoadlB(r4, FieldMemOperand(r6, Map::kBitFieldOffset));
+  __ LoadU8(r4, FieldMemOperand(r6, Map::kBitFieldOffset));
   __ TestBit(r4, Map::Bits1::IsConstructorBit::kShift);
   __ beq(&non_constructor);
 
@@ -2492,12 +2472,12 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
 
   // Only dispatch to bound functions after checking whether they are
   // constructors.
-  __ CmpP(r7, Operand(JS_BOUND_FUNCTION_TYPE));
+  __ CmpS64(r7, Operand(JS_BOUND_FUNCTION_TYPE));
   __ Jump(BUILTIN_CODE(masm->isolate(), ConstructBoundFunction),
           RelocInfo::CODE_TARGET, eq);
 
   // Only dispatch to proxies after checking whether they are constructors.
-  __ CmpP(r7, Operand(JS_PROXY_TYPE));
+  __ CmpS64(r7, Operand(JS_PROXY_TYPE));
   __ bne(&non_proxy);
   __ Jump(BUILTIN_CODE(masm->isolate(), ConstructProxy),
           RelocInfo::CODE_TARGET);
@@ -2533,33 +2513,33 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
   __ b(Condition(1), &dont_adapt_arguments);
   __ LoadTaggedPointerField(
       r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
-  __ LoadlW(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
+  __ LoadU32(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
 
   // -------------------------------------------
   // Adapt arguments.
   // -------------------------------------------
   {
     Label under_application, over_application, invoke;
-    __ CmpP(r2, r4);
+    __ CmpS64(r2, r4);
     __ blt(&under_application);
 
     // Enough parameters: actual >= expected
     __ bind(&over_application);
     {
       EnterArgumentsAdaptorFrame(masm);
-      Generate_StackOverflowCheck(masm, r4, r7, &stack_overflow);
+      __ StackOverflowCheck(r4, r7, &stack_overflow);
 
       // Calculate copy start address into r2 and copy end address into r6.
       // r2: actual number of arguments as a smi
       // r3: function
       // r4: expected number of arguments
       // r5: new target (passed through to callee)
-      __ ShiftLeftP(r2, r4, Operand(kSystemPointerSizeLog2));
-      __ AddP(r2, fp);
+      __ ShiftLeftU64(r2, r4, Operand(kSystemPointerSizeLog2));
+      __ AddS64(r2, fp);
       // adjust for return address and receiver
-      __ AddP(r2, r2, Operand(2 * kSystemPointerSize));
-      __ ShiftLeftP(r6, r4, Operand(kSystemPointerSizeLog2));
-      __ SubP(r6, r2, r6);
+      __ AddS64(r2, r2, Operand(2 * kSystemPointerSize));
+      __ ShiftLeftU64(r6, r4, Operand(kSystemPointerSizeLog2));
+      __ SubS64(r6, r2, r6);
 
       // Copy the arguments (including the receiver) to the new stack frame.
       // r2: copy start address
@@ -2570,9 +2550,9 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
 
       Label copy;
       __ bind(&copy);
-      __ LoadP(r0, MemOperand(r2, 0));
+      __ LoadU64(r0, MemOperand(r2, 0));
       __ push(r0);
-      __ CmpP(r2, r6);  // Compare before moving to next argument.
+      __ CmpS64(r2, r6);  // Compare before moving to next argument.
       __ lay(r2, MemOperand(r2, -kSystemPointerSize));
       __ bne(&copy);
 
@@ -2583,7 +2563,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
     __ bind(&under_application);
     {
       EnterArgumentsAdaptorFrame(masm);
-      Generate_StackOverflowCheck(masm, r4, r7, &stack_overflow);
+      __ StackOverflowCheck(r4, r7, &stack_overflow);
 
       // Fill the remaining expected arguments with undefined.
       // r0: actual number of arguments as a smi
@@ -2592,18 +2572,18 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
       // r3: new target (passed through to callee)
       __ LoadRoot(r7, RootIndex::kUndefinedValue);
       __ SmiUntag(r1, r2);
-      __ SubP(r8, r4, r1);
-      __ ShiftLeftP(r1, r8, Operand(kSystemPointerSizeLog2));
-      __ SubP(r6, fp, r1);
+      __ SubS64(r8, r4, r1);
+      __ ShiftLeftU64(r1, r8, Operand(kSystemPointerSizeLog2));
+      __ SubS64(r6, fp, r1);
       // Adjust for frame.
-      __ SubP(r6, r6,
-              Operand(ArgumentsAdaptorFrameConstants::kFixedFrameSizeFromFp +
-                      kSystemPointerSize));
+      __ SubS64(r6, r6,
+                Operand(ArgumentsAdaptorFrameConstants::kFixedFrameSizeFromFp +
+                        kSystemPointerSize));
 
       Label fill;
       __ bind(&fill);
       __ push(r7);
-      __ CmpP(sp, r6);
+      __ CmpS64(sp, r6);
       __ b(ne, &fill);
 
       // Calculate copy start address into r0 and copy end address is fp.
@@ -2623,17 +2603,17 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
       __ bind(&copy);
 
       // Adjust load for return address and receiver.
-      __ LoadP(r7, MemOperand(r2, 2 * kSystemPointerSize));
+      __ LoadU64(r7, MemOperand(r2, 2 * kSystemPointerSize));
       __ push(r7);
 
-      __ CmpP(r2, fp);  // Compare before moving to next argument.
+      __ CmpS64(r2, fp);  // Compare before moving to next argument.
       __ lay(r2, MemOperand(r2, -kSystemPointerSize));
       __ b(ne, &copy);
     }
 
     // Call the entry point.
     __ bind(&invoke);
-    __ LoadRR(r2, r4);
+    __ mov(r2, r4);
     // r2 : expected number of arguments
     // r3 : function (passed through to callee)
     // r5 : new target (passed through to callee)
@@ -2696,7 +2676,7 @@ void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) {
     __ LoadSmiLiteral(cp, Smi::zero());
     __ CallRuntime(Runtime::kWasmCompileLazy, 2);
     // The entrypoint address is the return value.
-    __ LoadRR(ip, r2);
+    __ mov(ip, r2);
 
     // Restore registers.
     __ MultiPopDoubles(fp_regs);
@@ -2741,14 +2721,14 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
   // If argv_mode == kArgvInRegister:
   // r4: pointer to the first argument
 
-  __ LoadRR(r7, r3);
+  __ mov(r7, r3);
 
   if (argv_mode == kArgvInRegister) {
     // Move argv into the correct register.
-    __ LoadRR(r3, r4);
+    __ mov(r3, r4);
   } else {
     // Compute the argv pointer.
-    __ ShiftLeftP(r3, r2, Operand(kSystemPointerSizeLog2));
+    __ ShiftLeftU64(r3, r2, Operand(kSystemPointerSizeLog2));
     __ lay(r3, MemOperand(r3, sp, -kSystemPointerSize));
   }
 
@@ -2775,8 +2755,8 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
       builtin_exit_frame ? StackFrame::BUILTIN_EXIT : StackFrame::EXIT);
 
   // Store a copy of argc, argv in callee-saved registers for later.
-  __ LoadRR(r6, r2);
-  __ LoadRR(r8, r3);
+  __ mov(r6, r2);
+  __ mov(r8, r3);
   // r2, r6: number of arguments including receiver  (C callee-saved)
   // r3, r8: pointer to the first argument
   // r7: pointer to builtin function  (C callee-saved)
@@ -2789,14 +2769,14 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
     // Use frame storage reserved by calling function to pass return
     // buffer as implicit first argument in R2.  Shfit original parameters
     // by one register each.
-    __ LoadRR(r4, r3);
-    __ LoadRR(r3, r2);
+    __ mov(r4, r3);
+    __ mov(r3, r2);
     __ la(r2,
           MemOperand(sp, (kStackFrameExtraParamSlot + 1) * kSystemPointerSize));
     isolate_reg = r5;
     // Clang doesn't preserve r2 (result buffer)
     // write to r8 (preserved) before entry
-    __ LoadRR(r8, r2);
+    __ mov(r8, r2);
   }
   // Call C built-in.
   __ Move(isolate_reg, ExternalReference::isolate_address(masm->isolate()));
@@ -2805,9 +2785,9 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
 
   // If return value is on the stack, pop it to registers.
   if (needs_return_buffer) {
-    __ LoadRR(r2, r8);
-    __ LoadP(r3, MemOperand(r2, kSystemPointerSize));
-    __ LoadP(r2, MemOperand(r2));
+    __ mov(r2, r8);
+    __ LoadU64(r3, MemOperand(r2, kSystemPointerSize));
+    __ LoadU64(r2, MemOperand(r2));
   }
 
   // Check result for exception sentinel.
@@ -2822,7 +2802,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
     ExternalReference pending_exception_address = ExternalReference::Create(
         IsolateAddressId::kPendingExceptionAddress, masm->isolate());
     __ Move(r1, pending_exception_address);
-    __ LoadP(r1, MemOperand(r1));
+    __ LoadU64(r1, MemOperand(r1));
     __ CompareRoot(r1, RootIndex::kTheHoleValue);
     // Cannot use check here as it attempts to generate call into runtime.
     __ beq(&okay, Label::kNear);
@@ -2862,26 +2842,26 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
   {
     FrameScope scope(masm, StackFrame::MANUAL);
     __ PrepareCallCFunction(3, 0, r2);
-    __ LoadImmP(r2, Operand::Zero());
-    __ LoadImmP(r3, Operand::Zero());
+    __ mov(r2, Operand::Zero());
+    __ mov(r3, Operand::Zero());
     __ Move(r4, ExternalReference::isolate_address(masm->isolate()));
     __ CallCFunction(find_handler, 3);
   }
 
   // Retrieve the handler context, SP and FP.
   __ Move(cp, pending_handler_context_address);
-  __ LoadP(cp, MemOperand(cp));
+  __ LoadU64(cp, MemOperand(cp));
   __ Move(sp, pending_handler_sp_address);
-  __ LoadP(sp, MemOperand(sp));
+  __ LoadU64(sp, MemOperand(sp));
   __ Move(fp, pending_handler_fp_address);
-  __ LoadP(fp, MemOperand(fp));
+  __ LoadU64(fp, MemOperand(fp));
 
   // If the handler is a JS frame, restore the context to the frame. Note that
   // the context will be set to (cp == 0) for non-JS frames.
   Label skip;
-  __ CmpP(cp, Operand::Zero());
+  __ CmpS64(cp, Operand::Zero());
   __ beq(&skip, Label::kNear);
-  __ StoreP(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
+  __ StoreU64(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
   __ bind(&skip);
 
   // Reset the masking register. This is done independent of the underlying
@@ -2892,7 +2872,7 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size,
 
   // Compute the handler entry address and jump to it.
   __ Move(r3, pending_handler_entrypoint_address);
-  __ LoadP(r3, MemOperand(r3));
+  __ LoadU64(r3, MemOperand(r3));
   __ Jump(r3);
 }
 
@@ -2914,7 +2894,7 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) {
   int argument_offset = 2 * kSystemPointerSize;
 
   // Load double input.
-  __ LoadDouble(double_scratch, MemOperand(sp, argument_offset));
+  __ LoadF64(double_scratch, MemOperand(sp, argument_offset));
 
   // Do fast-path convert from double to int.
   __ ConvertDoubleToInt64(result_reg, double_scratch);
@@ -2927,21 +2907,21 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) {
   // Account for saved regs.
   argument_offset += 2 * kSystemPointerSize;
 
-  __ LoadlW(scratch_high,
+  __ LoadU32(scratch_high,
             MemOperand(sp, argument_offset + Register::kExponentOffset));
-  __ LoadlW(scratch_low,
+  __ LoadU32(scratch_low,
             MemOperand(sp, argument_offset + Register::kMantissaOffset));
 
   __ ExtractBitMask(scratch, scratch_high, HeapNumber::kExponentMask);
   // Load scratch with exponent - 1. This is faster than loading
   // with exponent because Bias + 1 = 1024 which is a *S390* immediate value.
   STATIC_ASSERT(HeapNumber::kExponentBias + 1 == 1024);
-  __ SubP(scratch, Operand(HeapNumber::kExponentBias + 1));
+  __ SubS64(scratch, Operand(HeapNumber::kExponentBias + 1));
   // If exponent is greater than or equal to 84, the 32 less significant
   // bits are 0s (2^84 = 1, 52 significant bits, 32 uncoded bits),
   // the result is 0.
   // Compare exponent with 84 (compare exponent - 1 with 83).
-  __ CmpP(scratch, Operand(83));
+  __ CmpS64(scratch, Operand(83));
   __ bge(&out_of_range, Label::kNear);
 
   // If we reach this code, 31 <= exponent <= 83.
@@ -2949,25 +2929,25 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) {
   // which we would need to shift right the high part of the mantissa.
   // Scratch contains exponent - 1.
   // Load scratch with 52 - exponent (load with 51 - (exponent - 1)).
-  __ Load(r0, Operand(51));
-  __ SubP(scratch, r0, scratch);
-  __ CmpP(scratch, Operand::Zero());
+  __ mov(r0, Operand(51));
+  __ SubS64(scratch, r0, scratch);
+  __ CmpS64(scratch, Operand::Zero());
   __ ble(&only_low, Label::kNear);
   // 21 <= exponent <= 51, shift scratch_low and scratch_high
   // to generate the result.
-  __ ShiftRight(scratch_low, scratch_low, scratch);
+  __ ShiftRightU32(scratch_low, scratch_low, scratch);
   // Scratch contains: 52 - exponent.
   // We needs: exponent - 20.
   // So we use: 32 - scratch = 32 - 52 + exponent = exponent - 20.
-  __ Load(r0, Operand(32));
-  __ SubP(scratch, r0, scratch);
+  __ mov(r0, Operand(32));
+  __ SubS64(scratch, r0, scratch);
   __ ExtractBitMask(result_reg, scratch_high, HeapNumber::kMantissaMask);
   // Set the implicit 1 before the mantissa part in scratch_high.
   STATIC_ASSERT(HeapNumber::kMantissaBitsInTopWord >= 16);
-  __ Load(r0, Operand(1 << ((HeapNumber::kMantissaBitsInTopWord)-16)));
-  __ ShiftLeftP(r0, r0, Operand(16));
+  __ mov(r0, Operand(1 << ((HeapNumber::kMantissaBitsInTopWord)-16)));
+  __ ShiftLeftU64(r0, r0, Operand(16));
   __ OrP(result_reg, result_reg, r0);
-  __ ShiftLeft(r0, result_reg, scratch);
+  __ ShiftLeftU32(r0, result_reg, scratch);
   __ OrP(result_reg, scratch_low, r0);
   __ b(&negate, Label::kNear);
 
@@ -2978,8 +2958,8 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) {
   __ bind(&only_low);
   // 52 <= exponent <= 83, shift only scratch_low.
   // On entry, scratch contains: 52 - exponent.
-  __ LoadComplementRR(scratch, scratch);
-  __ ShiftLeft(result_reg, scratch_low, scratch);
+  __ lcgr(scratch, scratch);
+  __ ShiftLeftU32(result_reg, scratch_low, scratch);
 
   __ bind(&negate);
   // If input was positive, scratch_high ASR 31 equals 0 and
@@ -2988,21 +2968,21 @@ void Builtins::Generate_DoubleToI(MacroAssembler* masm) {
   // If the input was negative, we have to negate the result.
   // Input_high ASR 31 equals 0xFFFFFFFF and scratch_high LSR 31 equals 1.
   // New result = (result eor 0xFFFFFFFF) + 1 = 0 - result.
-  __ ShiftRightArith(r0, scratch_high, Operand(31));
+  __ ShiftRightS32(r0, scratch_high, Operand(31));
 #if V8_TARGET_ARCH_S390X
   __ lgfr(r0, r0);
-  __ ShiftRightP(r0, r0, Operand(32));
+  __ ShiftRightU64(r0, r0, Operand(32));
 #endif
   __ XorP(result_reg, r0);
-  __ ShiftRight(r0, scratch_high, Operand(31));
-  __ AddP(result_reg, r0);
+  __ ShiftRightU32(r0, scratch_high, Operand(31));
+  __ AddS64(result_reg, r0);
 
   __ bind(&done);
   __ Pop(scratch_high, scratch_low);
   argument_offset -= 2 * kSystemPointerSize;
 
   __ bind(&fastpath_done);
-  __ StoreP(result_reg, MemOperand(sp, argument_offset));
+  __ StoreU64(result_reg, MemOperand(sp, argument_offset));
   __ Pop(result_reg, scratch);
 
   __ Ret();
@@ -3043,18 +3023,18 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
   Register scratch = r5;
 
   __ Move(scratch, ExternalReference::is_profiling_address(isolate));
-  __ LoadlB(scratch, MemOperand(scratch, 0));
-  __ CmpP(scratch, Operand::Zero());
+  __ LoadU8(scratch, MemOperand(scratch, 0));
+  __ CmpS64(scratch, Operand::Zero());
 
   Label profiler_enabled, end_profiler_check;
   __ bne(&profiler_enabled, Label::kNear);
   __ Move(scratch, ExternalReference::address_of_runtime_stats_flag());
-  __ LoadlW(scratch, MemOperand(scratch, 0));
-  __ CmpP(scratch, Operand::Zero());
+  __ LoadU32(scratch, MemOperand(scratch, 0));
+  __ CmpS64(scratch, Operand::Zero());
   __ bne(&profiler_enabled, Label::kNear);
   {
     // Call the api function directly.
-    __ LoadRR(scratch, function_address);
+    __ mov(scratch, function_address);
     __ b(&end_profiler_check, Label::kNear);
   }
   __ bind(&profiler_enabled);
@@ -3070,11 +3050,11 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
   // r7 - next_address->kLimitOffset
   // r8 - next_address->kLevelOffset
   __ Move(r9, next_address);
-  __ LoadP(r6, MemOperand(r9, kNextOffset));
-  __ LoadP(r7, MemOperand(r9, kLimitOffset));
-  __ LoadlW(r8, MemOperand(r9, kLevelOffset));
-  __ AddP(r8, Operand(1));
-  __ StoreW(r8, MemOperand(r9, kLevelOffset));
+  __ LoadU64(r6, MemOperand(r9, kNextOffset));
+  __ LoadU64(r7, MemOperand(r9, kLimitOffset));
+  __ LoadU32(r8, MemOperand(r9, kLevelOffset));
+  __ AddS64(r8, Operand(1));
+  __ StoreU32(r8, MemOperand(r9, kLevelOffset));
 
   __ StoreReturnAddressAndCall(scratch);
 
@@ -3084,19 +3064,19 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
   Label return_value_loaded;
 
   // load value from ReturnValue
-  __ LoadP(r2, return_value_operand);
+  __ LoadU64(r2, return_value_operand);
   __ bind(&return_value_loaded);
   // No more valid handles (the result handle was the last one). Restore
   // previous handle scope.
-  __ StoreP(r6, MemOperand(r9, kNextOffset));
+  __ StoreU64(r6, MemOperand(r9, kNextOffset));
   if (__ emit_debug_code()) {
-    __ LoadlW(r3, MemOperand(r9, kLevelOffset));
-    __ CmpP(r3, r8);
+    __ LoadU32(r3, MemOperand(r9, kLevelOffset));
+    __ CmpS64(r3, r8);
     __ Check(eq, AbortReason::kUnexpectedLevelAfterReturnFromApiCall);
   }
-  __ SubP(r8, Operand(1));
-  __ StoreW(r8, MemOperand(r9, kLevelOffset));
-  __ CmpP(r7, MemOperand(r9, kLimitOffset));
+  __ SubS64(r8, Operand(1));
+  __ StoreU32(r8, MemOperand(r9, kLevelOffset));
+  __ CmpS64(r7, MemOperand(r9, kLimitOffset));
   __ bne(&delete_allocated_handles, Label::kNear);
 
   // Leave the API exit frame.
@@ -3107,13 +3087,13 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
     __ mov(r6, Operand(stack_space));
   } else {
     DCHECK_EQ(stack_space, 0);
-    __ LoadP(r6, *stack_space_operand);
+    __ LoadU64(r6, *stack_space_operand);
   }
   __ LeaveExitFrame(false, r6, stack_space_operand != nullptr);
 
   // Check if the function scheduled an exception.
   __ Move(r7, ExternalReference::scheduled_exception_address(isolate));
-  __ LoadP(r7, MemOperand(r7));
+  __ LoadU64(r7, MemOperand(r7));
   __ CompareRoot(r7, RootIndex::kTheHoleValue);
   __ bne(&promote_scheduled_exception, Label::kNear);
 
@@ -3125,12 +3105,12 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
 
   // HandleScope limit has changed. Delete allocated extensions.
   __ bind(&delete_allocated_handles);
-  __ StoreP(r7, MemOperand(r9, kLimitOffset));
-  __ LoadRR(r6, r2);
+  __ StoreU64(r7, MemOperand(r9, kLimitOffset));
+  __ mov(r6, r2);
   __ PrepareCallCFunction(1, r7);
   __ Move(r2, ExternalReference::isolate_address(isolate));
   __ CallCFunction(ExternalReference::delete_handle_scope_extensions(), 1);
-  __ LoadRR(r2, r6);
+  __ mov(r2, r6);
   __ b(&leave_exit_frame, Label::kNear);
 }
 
@@ -3180,26 +3160,26 @@ void Builtins::Generate_CallApiCallback(MacroAssembler* masm) {
   __ lay(sp, MemOperand(sp, -(FCA::kArgsLength * kSystemPointerSize)));
 
   // kHolder.
-  __ StoreP(holder, MemOperand(sp, 0 * kSystemPointerSize));
+  __ StoreU64(holder, MemOperand(sp, 0 * kSystemPointerSize));
 
   // kIsolate.
   __ Move(scratch, ExternalReference::isolate_address(masm->isolate()));
-  __ StoreP(scratch, MemOperand(sp, 1 * kSystemPointerSize));
+  __ StoreU64(scratch, MemOperand(sp, 1 * kSystemPointerSize));
 
   // kReturnValueDefaultValue and kReturnValue.
   __ LoadRoot(scratch, RootIndex::kUndefinedValue);
-  __ StoreP(scratch, MemOperand(sp, 2 * kSystemPointerSize));
-  __ StoreP(scratch, MemOperand(sp, 3 * kSystemPointerSize));
+  __ StoreU64(scratch, MemOperand(sp, 2 * kSystemPointerSize));
+  __ StoreU64(scratch, MemOperand(sp, 3 * kSystemPointerSize));
 
   // kData.
-  __ StoreP(call_data, MemOperand(sp, 4 * kSystemPointerSize));
+  __ StoreU64(call_data, MemOperand(sp, 4 * kSystemPointerSize));
 
   // kNewTarget.
-  __ StoreP(scratch, MemOperand(sp, 5 * kSystemPointerSize));
+  __ StoreU64(scratch, MemOperand(sp, 5 * kSystemPointerSize));
 
   // Keep a pointer to kHolder (= implicit_args) in a scratch register.
   // We use it below to set up the FunctionCallbackInfo object.
-  __ LoadRR(scratch, sp);
+  __ mov(scratch, sp);
 
   // Allocate the v8::Arguments structure in the arguments' space since
   // it's not controlled by GC.
@@ -3217,28 +3197,28 @@ void Builtins::Generate_CallApiCallback(MacroAssembler* masm) {
 
   // FunctionCallbackInfo::implicit_args_ (points at kHolder as set up above).
   // Arguments are after the return address (pushed by EnterExitFrame()).
-  __ StoreP(scratch, MemOperand(sp, (kStackFrameExtraParamSlot + 1) *
-                                        kSystemPointerSize));
+  __ StoreU64(scratch, MemOperand(sp, (kStackFrameExtraParamSlot + 1) *
+                                          kSystemPointerSize));
 
   // FunctionCallbackInfo::values_ (points at the first varargs argument passed
   // on the stack).
-  __ AddP(scratch, scratch,
-          Operand((FCA::kArgsLength + 1) * kSystemPointerSize));
-  __ StoreP(scratch, MemOperand(sp, (kStackFrameExtraParamSlot + 2) *
-                                        kSystemPointerSize));
+  __ AddS64(scratch, scratch,
+            Operand((FCA::kArgsLength + 1) * kSystemPointerSize));
+  __ StoreU64(scratch, MemOperand(sp, (kStackFrameExtraParamSlot + 2) *
+                                          kSystemPointerSize));
 
   // FunctionCallbackInfo::length_.
-  __ StoreW(argc, MemOperand(sp, (kStackFrameExtraParamSlot + 3) *
-                                     kSystemPointerSize));
+  __ StoreU32(argc, MemOperand(sp, (kStackFrameExtraParamSlot + 3) *
+                                       kSystemPointerSize));
 
   // We also store the number of bytes to drop from the stack after returning
   // from the API function here.
   __ mov(scratch,
          Operand((FCA::kArgsLength + 1 /* receiver */) * kSystemPointerSize));
-  __ ShiftLeftP(r1, argc, Operand(kSystemPointerSizeLog2));
-  __ AddP(scratch, r1);
-  __ StoreP(scratch, MemOperand(sp, (kStackFrameExtraParamSlot + 4) *
-                                        kSystemPointerSize));
+  __ ShiftLeftU64(r1, argc, Operand(kSystemPointerSizeLog2));
+  __ AddS64(scratch, r1);
+  __ StoreU64(scratch, MemOperand(sp, (kStackFrameExtraParamSlot + 4) *
+                                          kSystemPointerSize));
 
   // v8::InvocationCallback's argument.
   __ lay(r2,
@@ -3303,8 +3283,8 @@ void Builtins::Generate_CallApiGetter(MacroAssembler* masm) {
   const int kStackUnwindSpace = PropertyCallbackArguments::kArgsLength + 1;
 
   // Load address of v8::PropertyAccessorInfo::args_ array and name handle.
-  __ LoadRR(r2, sp);                           // r2 = Handle<Name>
-  __ AddP(r3, r2, Operand(1 * kSystemPointerSize));  // r3 = v8::PCI::args_
+  __ mov(r2, sp);                                    // r2 = Handle<Name>
+  __ AddS64(r3, r2, Operand(1 * kSystemPointerSize));  // r3 = v8::PCI::args_
 
   // If ABI passes Handles (pointer-sized struct) in a register:
   //
@@ -3332,14 +3312,14 @@ void Builtins::Generate_CallApiGetter(MacroAssembler* masm) {
 
   if (!ABI_PASSES_HANDLES_IN_REGS) {
     // pass 1st arg by reference
-    __ StoreP(r2, MemOperand(sp, arg0Slot * kSystemPointerSize));
-    __ AddP(r2, sp, Operand(arg0Slot * kSystemPointerSize));
+    __ StoreU64(r2, MemOperand(sp, arg0Slot * kSystemPointerSize));
+    __ AddS64(r2, sp, Operand(arg0Slot * kSystemPointerSize));
   }
 
   // Create v8::PropertyCallbackInfo object on the stack and initialize
   // it's args_ field.
-  __ StoreP(r3, MemOperand(sp, accessorInfoSlot * kSystemPointerSize));
-  __ AddP(r3, sp, Operand(accessorInfoSlot * kSystemPointerSize));
+  __ StoreU64(r3, MemOperand(sp, accessorInfoSlot * kSystemPointerSize));
+  __ AddS64(r3, sp, Operand(accessorInfoSlot * kSystemPointerSize));
   // r3 = v8::PropertyCallbackInfo&
 
   ExternalReference thunk_ref =
@@ -3347,8 +3327,8 @@ void Builtins::Generate_CallApiGetter(MacroAssembler* masm) {
 
   __ LoadTaggedPointerField(
       scratch, FieldMemOperand(callback, AccessorInfo::kJsGetterOffset));
-  __ LoadP(api_function_address,
-           FieldMemOperand(scratch, Foreign::kForeignAddressOffset));
+  __ LoadU64(api_function_address,
+             FieldMemOperand(scratch, Foreign::kForeignAddressOffset));
 
   // +3 is to skip prolog, return address and name handle.
   MemOperand return_value_operand(
@@ -3387,7 +3367,7 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
     int code = config->GetAllocatableDoubleCode(i);
     const DoubleRegister dreg = DoubleRegister::from_code(code);
     int offset = code * kDoubleSize;
-    __ StoreDouble(dreg, MemOperand(sp, offset));
+    __ StoreF64(dreg, MemOperand(sp, offset));
   }
 
   // Push all GPRs onto the stack
@@ -3396,37 +3376,39 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
 
   __ Move(r1, ExternalReference::Create(IsolateAddressId::kCEntryFPAddress,
                                         isolate));
-  __ StoreP(fp, MemOperand(r1));
+  __ StoreU64(fp, MemOperand(r1));
 
   static constexpr int kSavedRegistersAreaSize =
       (kNumberOfRegisters * kSystemPointerSize) + kDoubleRegsSize;
 
-  __ lgfi(r4, Operand(Deoptimizer::kFixedExitSizeMarker));
+  __ mov(r4, Operand(Deoptimizer::kFixedExitSizeMarker));
   // Cleanse the Return address for 31-bit
   __ CleanseP(r14);
   // Get the address of the location in the code object (r5)(return
   // address for lazy deoptimization) and compute the fp-to-sp delta in
   // register r6.
-  __ LoadRR(r5, r14);
+  __ mov(r5, r14);
   __ la(r6, MemOperand(sp, kSavedRegistersAreaSize));
-  __ SubP(r6, fp, r6);
+  __ SubS64(r6, fp, r6);
 
   // Allocate a new deoptimizer object.
   // Pass six arguments in r2 to r7.
   __ PrepareCallCFunction(6, r7);
-  __ LoadImmP(r2, Operand::Zero());
+  __ mov(r2, Operand::Zero());
   Label context_check;
-  __ LoadP(r3, MemOperand(fp, CommonFrameConstants::kContextOrFrameTypeOffset));
+  __ LoadU64(r3,
+             MemOperand(fp, CommonFrameConstants::kContextOrFrameTypeOffset));
   __ JumpIfSmi(r3, &context_check);
-  __ LoadP(r2, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
+  __ LoadU64(r2, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
   __ bind(&context_check);
-  __ LoadImmP(r3, Operand(static_cast<int>(deopt_kind)));
+  __ mov(r3, Operand(static_cast<int>(deopt_kind)));
   // r4: bailout id already loaded.
   // r5: code address or 0 already loaded.
   // r6: Fp-to-sp delta.
   // Parm6: isolate is passed on the stack.
   __ Move(r7, ExternalReference::isolate_address(isolate));
-  __ StoreP(r7, MemOperand(sp, kStackFrameExtraParamSlot * kSystemPointerSize));
+  __ StoreU64(r7,
+              MemOperand(sp, kStackFrameExtraParamSlot * kSystemPointerSize));
 
   // Call Deoptimizer::New().
   {
@@ -3436,7 +3418,7 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
 
   // Preserve "deoptimizer" object in register r2 and get the input
   // frame descriptor pointer to r3 (deoptimizer->input_);
-  __ LoadP(r3, MemOperand(r2, Deoptimizer::input_offset()));
+  __ LoadU64(r3, MemOperand(r2, Deoptimizer::input_offset()));
 
   // Copy core registers into FrameDescription::registers_[kNumRegisters].
   // DCHECK_EQ(Register::kNumRegisters, kNumberOfRegisters);
@@ -3448,8 +3430,8 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
   for (int i = 0; i < kNumberOfRegisters; i++) {
     int offset =
         (i * kSystemPointerSize) + FrameDescription::registers_offset();
-    __ LoadP(r4, MemOperand(sp, i * kSystemPointerSize));
-    __ StoreP(r4, MemOperand(r3, offset));
+    __ LoadU64(r4, MemOperand(sp, i * kSystemPointerSize));
+    __ StoreU64(r4, MemOperand(r3, offset));
   }
 
   int double_regs_offset = FrameDescription::double_registers_offset();
@@ -3461,8 +3443,8 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
     int src_offset =
         code * kDoubleSize + kNumberOfRegisters * kSystemPointerSize;
     // TODO(joransiu): MVC opportunity
-    __ LoadDouble(d0, MemOperand(sp, src_offset));
-    __ StoreDouble(d0, MemOperand(r3, dst_offset));
+    __ LoadF64(d0, MemOperand(sp, src_offset));
+    __ StoreF64(d0, MemOperand(r3, dst_offset));
   }
 
   // Mark the stack as not iterable for the CPU profiler which won't be able to
@@ -3473,7 +3455,7 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
     Register zero = r6;
     __ Move(is_iterable, ExternalReference::stack_is_iterable_address(isolate));
     __ lhi(zero, Operand(0));
-    __ StoreByte(zero, MemOperand(is_iterable));
+    __ StoreU8(zero, MemOperand(is_iterable));
   }
 
   // Remove the saved registers from the stack.
@@ -3481,8 +3463,8 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
 
   // Compute a pointer to the unwinding limit in register r4; that is
   // the first stack slot not part of the input frame.
-  __ LoadP(r4, MemOperand(r3, FrameDescription::frame_size_offset()));
-  __ AddP(r4, sp);
+  __ LoadU64(r4, MemOperand(r3, FrameDescription::frame_size_offset()));
+  __ AddS64(r4, sp);
 
   // Unwind the stack down to - but not including - the unwinding
   // limit and copy the contents of the activation frame to the input
@@ -3493,10 +3475,10 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
   __ b(&pop_loop_header, Label::kNear);
   __ bind(&pop_loop);
   __ pop(r6);
-  __ StoreP(r6, MemOperand(r5, 0));
+  __ StoreU64(r6, MemOperand(r5, 0));
   __ la(r5, MemOperand(r5, kSystemPointerSize));
   __ bind(&pop_loop_header);
-  __ CmpP(r4, sp);
+  __ CmpS64(r4, sp);
   __ bne(&pop_loop);
 
   // Compute the output frame in the deoptimizer.
@@ -3510,40 +3492,41 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
   }
   __ pop(r2);  // Restore deoptimizer object (class Deoptimizer).
 
-  __ LoadP(sp, MemOperand(r2, Deoptimizer::caller_frame_top_offset()));
+  __ LoadU64(sp, MemOperand(r2, Deoptimizer::caller_frame_top_offset()));
 
   // Replace the current (input) frame with the output frames.
   Label outer_push_loop, inner_push_loop, outer_loop_header, inner_loop_header;
   // Outer loop state: r6 = current "FrameDescription** output_",
   // r3 = one past the last FrameDescription**.
-  __ LoadlW(r3, MemOperand(r2, Deoptimizer::output_count_offset()));
-  __ LoadP(r6, MemOperand(r2, Deoptimizer::output_offset()));  // r6 is output_.
-  __ ShiftLeftP(r3, r3, Operand(kSystemPointerSizeLog2));
-  __ AddP(r3, r6, r3);
+  __ LoadU32(r3, MemOperand(r2, Deoptimizer::output_count_offset()));
+  __ LoadU64(r6,
+             MemOperand(r2, Deoptimizer::output_offset()));  // r6 is output_.
+  __ ShiftLeftU64(r3, r3, Operand(kSystemPointerSizeLog2));
+  __ AddS64(r3, r6, r3);
   __ b(&outer_loop_header, Label::kNear);
 
   __ bind(&outer_push_loop);
   // Inner loop state: r4 = current FrameDescription*, r5 = loop index.
-  __ LoadP(r4, MemOperand(r6, 0));  // output_[ix]
-  __ LoadP(r5, MemOperand(r4, FrameDescription::frame_size_offset()));
+  __ LoadU64(r4, MemOperand(r6, 0));  // output_[ix]
+  __ LoadU64(r5, MemOperand(r4, FrameDescription::frame_size_offset()));
   __ b(&inner_loop_header, Label::kNear);
 
   __ bind(&inner_push_loop);
-  __ SubP(r5, Operand(sizeof(intptr_t)));
-  __ AddP(r8, r4, r5);
-  __ LoadP(r8, MemOperand(r8, FrameDescription::frame_content_offset()));
+  __ SubS64(r5, Operand(sizeof(intptr_t)));
+  __ AddS64(r8, r4, r5);
+  __ LoadU64(r8, MemOperand(r8, FrameDescription::frame_content_offset()));
   __ push(r8);
 
   __ bind(&inner_loop_header);
-  __ CmpP(r5, Operand::Zero());
+  __ CmpS64(r5, Operand::Zero());
   __ bne(&inner_push_loop);  // test for gt?
 
-  __ AddP(r6, r6, Operand(kSystemPointerSize));
+  __ AddS64(r6, r6, Operand(kSystemPointerSize));
   __ bind(&outer_loop_header);
-  __ CmpP(r6, r3);
+  __ CmpS64(r6, r3);
   __ blt(&outer_push_loop);
 
-  __ LoadP(r3, MemOperand(r2, Deoptimizer::input_offset()));
+  __ LoadU64(r3, MemOperand(r2, Deoptimizer::input_offset()));
   for (int i = 0; i < config->num_allocatable_double_registers(); ++i) {
     int code = config->GetAllocatableDoubleCode(i);
     const DoubleRegister dreg = DoubleRegister::from_code(code);
@@ -3552,18 +3535,18 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
   }
 
   // Push pc and continuation from the last output frame.
-  __ LoadP(r8, MemOperand(r4, FrameDescription::pc_offset()));
+  __ LoadU64(r8, MemOperand(r4, FrameDescription::pc_offset()));
   __ push(r8);
-  __ LoadP(r8, MemOperand(r4, FrameDescription::continuation_offset()));
+  __ LoadU64(r8, MemOperand(r4, FrameDescription::continuation_offset()));
   __ push(r8);
 
   // Restore the registers from the last output frame.
-  __ LoadRR(r1, r4);
+  __ mov(r1, r4);
   for (int i = kNumberOfRegisters - 1; i > 0; i--) {
     int offset =
         (i * kSystemPointerSize) + FrameDescription::registers_offset();
     if ((restored_regs & (1 << i)) != 0) {
-      __ LoadP(ToRegister(i), MemOperand(r1, offset));
+      __ LoadU64(ToRegister(i), MemOperand(r1, offset));
     }
   }
 
@@ -3573,7 +3556,7 @@ void Generate_DeoptimizationEntry(MacroAssembler* masm,
     Register one = r6;
     __ Move(is_iterable, ExternalReference::stack_is_iterable_address(isolate));
     __ lhi(one, Operand(1));
-    __ StoreByte(one, MemOperand(is_iterable));
+    __ StoreU8(one, MemOperand(is_iterable));
   }
 
   __ pop(ip);  // get continuation, leave pc on stack
@@ -3601,6 +3584,64 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kJSCallerSaved;
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+  __ LoadP(handler_arg, MemOperand(fp, CommonFrameConstants::kCallerPCOffset));
+  __ LoadP(
+      slot_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ LoadP(
+      handler_arg,
+      MemOperand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ CmpS64(r2, Operand(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
+  __ bne(&deopt);
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ bind(&deopt);
+  __ CmpS64(r2, Operand(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
+  __ beq(&bailout);
+
+  if (FLAG_debug_code) {
+    __ CmpS64(r2, Operand(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
+    __ Assert(eq, AbortReason::kUnexpectedDynamicCheckMapsStatus);
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/src/builtins/setup-builtins-internal.cc b/deps/v8/src/builtins/setup-builtins-internal.cc
index baf64f7fa7c41a..348866c9bdeed4 100644
--- a/deps/v8/src/builtins/setup-builtins-internal.cc
+++ b/deps/v8/src/builtins/setup-builtins-internal.cc
@@ -221,7 +221,7 @@ void SetupIsolateDelegate::PopulateWithPlaceholders(Isolate* isolate) {
 void SetupIsolateDelegate::ReplacePlaceholders(Isolate* isolate) {
   // Replace references from all code objects to placeholders.
   Builtins* builtins = isolate->builtins();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CodeSpaceMemoryModificationScope modification_scope(isolate->heap());
   static const int kRelocMask =
       RelocInfo::ModeMask(RelocInfo::CODE_TARGET) |
diff --git a/deps/v8/src/builtins/string-at.tq b/deps/v8/src/builtins/string-at.tq
new file mode 100644
index 00000000000000..a85e4d52901fa4
--- /dev/null
+++ b/deps/v8/src/builtins/string-at.tq
@@ -0,0 +1,29 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace string {
+// https://tc39.es/proposal-item-method/#sec-string.prototype.at
+transitioning javascript builtin StringPrototypeAt(
+    js-implicit context: NativeContext, receiver: JSAny)(index: JSAny): JSAny {
+  // 1. Let O be ? RequireObjectCoercible(this value).
+  // 2. Let S be ? ToString(O).
+  const s = ToThisString(receiver, 'String.prototype.at');
+  // 3. Let len be the length of S.
+  const len = s.length_smi;
+  // 4. Let relativeIndex be ? ToInteger(index).
+  const relativeIndex = ToInteger_Inline(index);
+  // 5. If relativeIndex ≥ 0, then
+  //   a. Let k be relativeIndex.
+  // 6. Else,
+  //   a. Let k be len + relativeIndex.
+  const k = relativeIndex >= 0 ? relativeIndex : len + relativeIndex;
+  // 7. If k < 0 or k ≥ len, then return undefined.
+  if (k < 0 || k >= len) {
+    return Undefined;
+  }
+  // 8. Return the String value consisting of only the code unit at position k
+  // in S.
+  return StringFromSingleCharCode(StringCharCodeAt(s, Convert<uintptr>(k)));
+}
+}
diff --git a/deps/v8/src/builtins/string-endswith.tq b/deps/v8/src/builtins/string-endswith.tq
index b9615b114985fd..390ed2a63a7011 100644
--- a/deps/v8/src/builtins/string-endswith.tq
+++ b/deps/v8/src/builtins/string-endswith.tq
@@ -2,26 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-namespace string {
-macro TryFastStringCompareSequence(
-    string: String, searchStr: String, start: uintptr,
-    searchLength: uintptr): Boolean labels Slow {
-  const directString = Cast<DirectString>(string) otherwise Slow;
-  const directSearchStr = Cast<DirectString>(searchStr) otherwise Slow;
+// TODO(tebbi): This could be replaced with a fast C-call to
+// CompareCharsUnsigned.
+macro IsSubstringAt<A: type, B: type>(
+    string: ConstSlice<A>, searchStr: ConstSlice<B>, start: intptr): bool {
+  const subslice =
+      Subslice(string, start, searchStr.length) otherwise return false;
+  let stringIterator = subslice.Iterator();
+  let searchIterator = searchStr.Iterator();
 
-  let searchIndex: uintptr = 0;
-  let stringIndex: uintptr = start;
-
-  while (searchIndex < searchLength) {
-    if (StringCharCodeAt(directSearchStr, searchIndex) !=
-        StringCharCodeAt(directString, stringIndex)) {
-      return False;
+  while (true) {
+    const searchChar = searchIterator.Next() otherwise return true;
+    const stringChar = stringIterator.Next() otherwise unreachable;
+    if (searchChar != stringChar) {
+      return false;
     }
-
-    searchIndex++;
-    stringIndex++;
   }
-  return True;
+  VerifiedUnreachable();
+}
+
+struct IsSubstringAtFunctor {
+  start: intptr;
+}
+// Ideally, this would be a method of IsSubstringAtFunctor, but currently
+// methods don't support templates.
+macro Call<A: type, B: type>(
+    self: IsSubstringAtFunctor, string: ConstSlice<A>,
+    searchStr: ConstSlice<B>): bool {
+  return IsSubstringAt(string, searchStr, self.start);
+}
+
+macro IsSubstringAt(string: String, searchStr: String, start: intptr): bool {
+  return TwoStringsToSlices<bool>(
+      string, searchStr, IsSubstringAtFunctor{start: start});
 }
 
 // https://tc39.github.io/ecma262/#sec-string.prototype.endswith
@@ -58,23 +71,14 @@ transitioning javascript builtin StringPrototypeEndsWith(
   const searchLength: uintptr = searchStr.length_uintptr;
 
   // 10. Let start be end - searchLength.
-  const start: uintptr = end - searchLength;
+  const start = Signed(end - searchLength);
 
   // 11. If start is less than 0, return false.
-  if (Signed(start) < 0) return False;
+  if (start < 0) return False;
 
   // 12. If the sequence of code units of S starting at start of length
   // searchLength is the same as the full code unit sequence of searchStr,
   // return true.
   // 13. Otherwise, return false.
-  try {
-    // Fast Path: If both strings are direct and relevant indices are Smis.
-    return TryFastStringCompareSequence(string, searchStr, start, searchLength)
-        otherwise Slow;
-  } label Slow {
-    // Slow Path: If either of the string is indirect, bail into runtime.
-    return StringCompareSequence(
-        context, string, searchStr, Convert<Number>(start));
-  }
-}
+  return Convert<Boolean>(IsSubstringAt(string, searchStr, start));
 }
diff --git a/deps/v8/src/builtins/string-replaceall.tq b/deps/v8/src/builtins/string-replaceall.tq
index 9211304b345214..30fa7745ab1cdd 100644
--- a/deps/v8/src/builtins/string-replaceall.tq
+++ b/deps/v8/src/builtins/string-replaceall.tq
@@ -4,7 +4,6 @@
 
 #include 'src/builtins/builtins-string-gen.h'
 
-namespace string {
 extern macro ReplaceSymbolConstant(): Symbol;
 
 extern macro StringBuiltinsAssembler::GetSubstitution(
@@ -13,30 +12,29 @@ extern macro StringBuiltinsAssembler::GetSubstitution(
 extern builtin
 StringIndexOf(implicit context: Context)(String, String, Smi): Smi;
 
-macro TryFastAbstractStringIndexOf(implicit context: Context)(
-    string: String, searchString: String, fromIndex: Smi): Smi labels Slow {
-  const stringLen = string.length_uintptr;
-  const searchLen = searchString.length_uintptr;
-  const directString = Cast<DirectString>(string) otherwise Slow;
-  const directSearchStr = Cast<DirectString>(searchString) otherwise Slow;
-  const fromIndexUint = Unsigned(SmiUntag(fromIndex));
-
-  for (let i: uintptr = fromIndexUint; i < stringLen; i++) {
-    let j = i;
-    let k: uintptr = 0;
-    while (j < stringLen && k < searchLen &&
-           StringCharCodeAt(directString, j) ==
-               StringCharCodeAt(directSearchStr, k)) {
-      j++;
-      k++;
-    }
-    if (k == searchLen) {
-      return SmiTag(Signed(i));
+// TODO(tebbi): This could be replaced with a fast C-call to StringSearchRaw.
+macro AbstractStringIndexOf<A: type, B: type>(
+    string: ConstSlice<A>, searchString: ConstSlice<B>, fromIndex: Smi): Smi {
+  for (let i: intptr = SmiUntag(fromIndex);
+       i <= string.length - searchString.length; i++) {
+    if (IsSubstringAt(string, searchString, i)) {
+      return SmiTag(i);
     }
   }
   return -1;
 }
 
+struct AbstractStringIndexOfFunctor {
+  fromIndex: Smi;
+}
+// Ideally, this would be a method of AbstractStringIndexOfFunctor, but
+// currently methods don't support templates.
+macro Call<A: type, B: type>(
+    self: AbstractStringIndexOfFunctor, string: ConstSlice<A>,
+    searchStr: ConstSlice<B>): Smi {
+  return AbstractStringIndexOf(string, searchStr, self.fromIndex);
+}
+
 macro AbstractStringIndexOf(implicit context: Context)(
     string: String, searchString: String, fromIndex: Smi): Smi {
   // Special case the empty string.
@@ -53,20 +51,8 @@ macro AbstractStringIndexOf(implicit context: Context)(
     return -1;
   }
 
-  try {
-    return TryFastAbstractStringIndexOf(string, searchString, fromIndex)
-        otherwise Slow;
-  } label Slow {
-    for (let i: intptr = SmiUntag(fromIndex);
-         i + searchStringLength <= stringLength; i++) {
-      if (StringCompareSequence(
-              context, string, searchString, Convert<Number>(SmiTag(i))) ==
-          True) {
-        return SmiTag(i);
-      }
-    }
-    return -1;
-  }
+  return TwoStringsToSlices<Smi>(
+      string, searchString, AbstractStringIndexOfFunctor{fromIndex: fromIndex});
 }
 
 transitioning macro
@@ -217,4 +203,3 @@ transitioning javascript builtin StringPrototypeReplaceAll(
   // 16. Return result.
   return result;
 }
-}
diff --git a/deps/v8/src/builtins/string-startswith.tq b/deps/v8/src/builtins/string-startswith.tq
index a1f99df17b70bc..74fec538d9669e 100644
--- a/deps/v8/src/builtins/string-startswith.tq
+++ b/deps/v8/src/builtins/string-startswith.tq
@@ -47,14 +47,6 @@ transitioning javascript builtin StringPrototypeStartsWith(
   // searchLength is the same as the full code unit sequence of searchStr,
   // return true.
   // 13. Otherwise, return false.
-  try {
-    // Fast Path: If both strings are direct and relevant indices are Smis.
-    return TryFastStringCompareSequence(string, searchStr, start, searchLength)
-        otherwise Slow;
-  } label Slow {
-    // Slow Path: If either of the string is indirect, bail into runtime.
-    return StringCompareSequence(
-        context, string, searchStr, Convert<Number>(start));
-  }
+  return Convert<Boolean>(IsSubstringAt(string, searchStr, Signed(start)));
 }
 }
diff --git a/deps/v8/src/builtins/string-trim.tq b/deps/v8/src/builtins/string-trim.tq
index eef0ccd84f9565..daaec9973889f0 100644
--- a/deps/v8/src/builtins/string-trim.tq
+++ b/deps/v8/src/builtins/string-trim.tq
@@ -13,41 +13,41 @@ extern enum TrimMode extends uint31 constexpr 'String::TrimMode' {
 }
 
 @export
-macro IsWhiteSpaceOrLineTerminator(charCode: int32): bool {
+macro IsWhiteSpaceOrLineTerminator(charCode: char16|char8): bool {
   // 0x0020 - SPACE (Intentionally out of order to fast path a commmon case)
-  if (charCode == Int32Constant(0x0020)) {
+  if (charCode == 0x0020) {
     return true;
   }
 
+  // Common Non-whitespace characters from (0x000E, 0x00A0)
+  if (Unsigned(Convert<int32>(charCode) - 0x000E) < 0x0092) {
+    return false;
+  }
+
   // 0x0009 - HORIZONTAL TAB
-  if (charCode < Int32Constant(0x0009)) {
+  if (charCode < 0x0009) {
     return false;
   }
   // 0x000A - LINE FEED OR NEW LINE
   // 0x000B - VERTICAL TAB
   // 0x000C - FORMFEED
   // 0x000D - HORIZONTAL TAB
-  if (charCode <= Int32Constant(0x000D)) {
+  if (charCode <= 0x000D) {
     return true;
   }
 
-  // Common Non-whitespace characters
-  if (charCode < Int32Constant(0x00A0)) {
-    return false;
-  }
-
   // 0x00A0 - NO-BREAK SPACE
-  if (charCode == Int32Constant(0x00A0)) {
+  if (charCode == 0x00A0) {
     return true;
   }
 
   // 0x1680 - Ogham Space Mark
-  if (charCode == Int32Constant(0x1680)) {
+  if (charCode == 0x1680) {
     return true;
   }
 
   // 0x2000 - EN QUAD
-  if (charCode < Int32Constant(0x2000)) {
+  if (charCode < 0x2000) {
     return false;
   }
   // 0x2001 - EM QUAD
@@ -60,81 +60,91 @@ macro IsWhiteSpaceOrLineTerminator(charCode: int32): bool {
   // 0x2008 - PUNCTUATION SPACE
   // 0x2009 - THIN SPACE
   // 0x200A - HAIR SPACE
-  if (charCode <= Int32Constant(0x200A)) {
+  if (charCode <= 0x200A) {
     return true;
   }
 
   // 0x2028 - LINE SEPARATOR
-  if (charCode == Int32Constant(0x2028)) {
+  if (charCode == 0x2028) {
     return true;
   }
   // 0x2029 - PARAGRAPH SEPARATOR
-  if (charCode == Int32Constant(0x2029)) {
+  if (charCode == 0x2029) {
     return true;
   }
   // 0x202F - NARROW NO-BREAK SPACE
-  if (charCode == Int32Constant(0x202F)) {
+  if (charCode == 0x202F) {
     return true;
   }
   // 0x205F - MEDIUM MATHEMATICAL SPACE
-  if (charCode == Int32Constant(0x205F)) {
+  if (charCode == 0x205F) {
     return true;
   }
   // 0xFEFF - BYTE ORDER MARK
-  if (charCode == Int32Constant(0xFEFF)) {
+  if (charCode == 0xFEFF) {
     return true;
   }
   // 0x3000 - IDEOGRAPHIC SPACE
-  if (charCode == Int32Constant(0x3000)) {
+  if (charCode == 0x3000) {
     return true;
   }
 
   return false;
 }
 
-transitioning macro StringTrim(implicit context: Context)(
-    receiver: JSAny, _arguments: Arguments, methodName: constexpr string,
-    variant: constexpr TrimMode): String {
-  const receiverString: String = ToThisString(receiver, methodName);
-  const stringLength: intptr = receiverString.length_intptr;
+transitioning macro StringTrimLoop<T: type>(implicit context: Context)(
+    stringSlice: ConstSlice<T>, startIndex: intptr, endIndex: intptr,
+    increment: intptr): intptr {
+  let index = startIndex;
+  while (true) {
+    if (index == endIndex) {
+      return index;
+    }
+
+    const char: T = *stringSlice.AtIndex(index);
+    if (!IsWhiteSpaceOrLineTerminator(char)) {
+      return index;
+    }
+    index = index + increment;
+  }
+  unreachable;
+}
 
-  const directString = Cast<DirectString>(receiverString)
-      otherwise return runtime::StringTrim(
-      receiverString, SmiTag<TrimMode>(variant));
+transitioning macro StringTrimBody<T: type>(implicit context: Context)(
+    string: String, slice: ConstSlice<T>, variant: constexpr TrimMode): String {
+  const stringLength: intptr = string.length_intptr;
 
   let startIndex: intptr = 0;
   let endIndex: intptr = stringLength - 1;
-
-  // TODO(duongn): It would probably be more efficient to turn StringTrim into a
-  // tempalate for the different string types and specialize the loop for them.
   if (variant == TrimMode::kTrim || variant == TrimMode::kTrimStart) {
-    while (true) {
-      if (startIndex == stringLength) {
-        return EmptyStringConstant();
-      }
-      if (!IsWhiteSpaceOrLineTerminator(
-              StringCharCodeAt(directString, Unsigned(startIndex)))) {
-        break;
-      }
-      startIndex++;
+    startIndex = StringTrimLoop(slice, startIndex, stringLength, 1);
+    if (startIndex == stringLength) {
+      return kEmptyString;
     }
   }
 
   if (variant == TrimMode::kTrim || variant == TrimMode::kTrimEnd) {
-    while (true) {
-      if (endIndex == -1) {
-        return EmptyStringConstant();
-      }
-      if (!IsWhiteSpaceOrLineTerminator(
-              StringCharCodeAt(directString, Unsigned(endIndex)))) {
-        break;
-      }
-      endIndex--;
+    endIndex = StringTrimLoop(slice, endIndex, -1, -1);
+    if (endIndex == -1) {
+      return kEmptyString;
     }
   }
 
-  return SubString(
-      receiverString, Unsigned(startIndex), Unsigned(endIndex + 1));
+  return SubString(string, Unsigned(startIndex), Unsigned(endIndex + 1));
+}
+
+transitioning macro StringTrim(implicit context: Context)(
+    receiver: JSAny, _arguments: Arguments, methodName: constexpr string,
+    variant: constexpr TrimMode): String {
+  const receiverString: String = ToThisString(receiver, methodName);
+
+  try {
+    StringToSlice(receiverString) otherwise OneByte, TwoByte;
+  } label OneByte(slice: ConstSlice<char8>) {
+    return StringTrimBody(receiverString, slice, variant);
+  } label TwoByte(slice: ConstSlice<char16>) {
+    return StringTrimBody(receiverString, slice, variant);
+  }
 }
 
 // ES6 #sec-string.prototype.trim
@@ -161,8 +171,3 @@ StringPrototypeTrimEnd(
   return StringTrim(receiver, arguments, methodName, TrimMode::kTrimEnd);
 }
 }
-
-namespace runtime {
-extern runtime StringTrim(implicit context: Context)(
-    String, SmiTagged<string::TrimMode>): String;
-}
diff --git a/deps/v8/src/builtins/torque-internal.tq b/deps/v8/src/builtins/torque-internal.tq
index 28636bdbfed47c..c3d7ec717a6e78 100644
--- a/deps/v8/src/builtins/torque-internal.tq
+++ b/deps/v8/src/builtins/torque-internal.tq
@@ -2,6 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// Unfortunately, MutableSlice<> is currently not a subtype of ConstSlice.
+// This would require struct subtyping, which is not yet supported.
+type MutableSlice<T: type> extends torque_internal::Slice<T, &T>;
+type ConstSlice<T: type> extends torque_internal::Slice<T, const &T>;
+
+macro Subslice<T: type>(slice: ConstSlice<T>, start: intptr, length: intptr):
+    ConstSlice<T>labels OutOfBounds {
+  if (Unsigned(length) > Unsigned(slice.length)) goto OutOfBounds;
+  if (Unsigned(start) > Unsigned(slice.length - length)) goto OutOfBounds;
+  const offset = slice.offset + torque_internal::TimesSizeOf<T>(start);
+  return torque_internal::unsafe::NewConstSlice<T>(
+      slice.object, offset, length);
+}
+macro Subslice<T: type>(slice: MutableSlice<T>, start: intptr, length: intptr):
+    MutableSlice<T>labels OutOfBounds {
+  if (Unsigned(length) > Unsigned(slice.length)) goto OutOfBounds;
+  if (Unsigned(start) > Unsigned(slice.length - length)) goto OutOfBounds;
+  const offset = slice.offset + torque_internal::TimesSizeOf<T>(start);
+  return torque_internal::unsafe::NewMutableSlice<T>(
+      slice.object, offset, length);
+}
+
 namespace torque_internal {
 // Unsafe is a marker that we require to be passed when calling internal APIs
 // that might lead to unsoundness when used incorrectly. Unsafe markers should
@@ -12,8 +34,12 @@ struct Unsafe {}
 // of the pointer, not of the instance.
 intrinsic %SizeOf<T: type>(): constexpr int31;
 
+macro TimesSizeOf<T: type>(i: intptr): intptr {
+  return i * %SizeOf<T>();
+}
+
 struct Reference<T: type> {
-  const object: HeapObject;
+  const object: HeapObject|TaggedZeroPattern;
   const offset: intptr;
   unsafeMarker: Unsafe;
 }
@@ -21,61 +47,74 @@ type ConstReference<T: type> extends Reference<T>;
 type MutableReference<T: type> extends ConstReference<T>;
 
 namespace unsafe {
-macro NewReference<T: type>(object: HeapObject, offset: intptr):&T {
+macro NewReference<T: type>(
+    object: HeapObject|TaggedZeroPattern, offset: intptr):&T {
   return %RawDownCast<&T>(
       Reference<T>{object: object, offset: offset, unsafeMarker: Unsafe {}});
 }
+macro NewOffHeapReference<T: type>(ptr: RawPtr<T>):&T {
+  return %RawDownCast<&T>(Reference<T>{
+    object: kZeroBitPattern,
+    offset: Convert<intptr>(Convert<RawPtr>(ptr)) + kHeapObjectTag,
+    unsafeMarker: Unsafe {}
+  });
+}
 macro ReferenceCast<T: type, U: type>(ref:&U):&T {
   const ref = NewReference<T>(ref.object, ref.offset);
   UnsafeCast<T>(*ref);
   return ref;
 }
+
+extern macro GCUnsafeReferenceToRawPtr(
+    HeapObject | TaggedZeroPattern, intptr): RawPtr;
+
 }  // namespace unsafe
 
-struct Slice<T: type> {
-  macro TryAtIndex(index: intptr):&T labels OutOfBounds {
+struct Slice<T: type, Reference: type> {
+  macro TryAtIndex(index: intptr): Reference labels OutOfBounds {
     if (Convert<uintptr>(index) < Convert<uintptr>(this.length)) {
       return unsafe::NewReference<T>(
-          this.object, this.offset + index * %SizeOf<T>());
+          this.object, this.offset + TimesSizeOf<T>(index));
     } else {
       goto OutOfBounds;
     }
   }
 
-  macro AtIndex(index: intptr):&T {
+  macro AtIndex(index: intptr): Reference {
     return this.TryAtIndex(index) otherwise unreachable;
   }
 
-  macro AtIndex(index: uintptr):&T {
+  macro AtIndex(index: uintptr): Reference {
     return this.TryAtIndex(Convert<intptr>(index)) otherwise unreachable;
   }
 
-  macro AtIndex(index: constexpr int31):&T {
+  macro AtIndex(index: constexpr int31): Reference {
     const i: intptr = Convert<intptr>(index);
     return this.TryAtIndex(i) otherwise unreachable;
   }
 
-  macro AtIndex(index: Smi):&T {
+  macro AtIndex(index: Smi): Reference {
     const i: intptr = Convert<intptr>(index);
     return this.TryAtIndex(i) otherwise unreachable;
   }
 
-  macro Iterator(): SliceIterator<T> {
-    const end = this.offset + this.length * %SizeOf<T>();
-    return SliceIterator<T>{
+  macro Iterator(): SliceIterator<T, Reference> {
+    const end = this.offset + TimesSizeOf<T>(this.length);
+    return SliceIterator<T, Reference>{
       object: this.object,
       start: this.offset,
       end: end,
       unsafeMarker: Unsafe {}
     };
   }
-  macro Iterator(startIndex: intptr, endIndex: intptr): SliceIterator<T> {
+  macro Iterator(
+      startIndex: intptr, endIndex: intptr): SliceIterator<T, Reference> {
     check(
         Convert<uintptr>(endIndex) <= Convert<uintptr>(this.length) &&
         Convert<uintptr>(startIndex) <= Convert<uintptr>(endIndex));
-    const start = this.offset + startIndex * %SizeOf<T>();
-    const end = this.offset + endIndex * %SizeOf<T>();
-    return SliceIterator<T>{
+    const start = this.offset + TimesSizeOf<T>(startIndex);
+    const end = this.offset + TimesSizeOf<T>(endIndex);
+    return SliceIterator<T, Reference>{
       object: this.object,
       start,
       end,
@@ -83,23 +122,55 @@ struct Slice<T: type> {
     };
   }
 
-  const object: HeapObject;
+  // WARNING: This can return a raw pointer into the heap, which is not GC-safe.
+  macro GCUnsafeStartPointer(): RawPtr<T> {
+    return %RawDownCast<RawPtr<T>>(
+        unsafe::GCUnsafeReferenceToRawPtr(this.object, this.offset));
+  }
+
+  const object: HeapObject|TaggedZeroPattern;
   const offset: intptr;
   const length: intptr;
   unsafeMarker: Unsafe;
 }
 
-macro UnsafeNewSlice<T: type>(
-    object: HeapObject, offset: intptr, length: intptr): Slice<T> {
-  return Slice<T>{
+namespace unsafe {
+
+macro NewMutableSlice<T: type>(
+    object: HeapObject|TaggedZeroPattern, offset: intptr,
+    length: intptr): MutableSlice<T> {
+  return %RawDownCast<MutableSlice<T>>(Slice<T, &T>{
+    object: object,
+    offset: offset,
+    length: length,
+    unsafeMarker: Unsafe {}
+  });
+}
+
+macro NewConstSlice<T: type>(
+    object: HeapObject|TaggedZeroPattern, offset: intptr,
+    length: intptr): ConstSlice<T> {
+  return %RawDownCast<ConstSlice<T>>(Slice<T, const &T>{
     object: object,
     offset: offset,
     length: length,
     unsafeMarker: Unsafe {}
-  };
+  });
 }
 
-struct SliceIterator<T: type> {
+macro NewOffHeapConstSlice<T: type>(
+    startPointer: RawPtr<T>, length: intptr): ConstSlice<T> {
+  return %RawDownCast<ConstSlice<T>>(Slice<T, const &T>{
+    object: kZeroBitPattern,
+    offset: Convert<intptr>(Convert<RawPtr>(startPointer)) + kHeapObjectTag,
+    length: length,
+    unsafeMarker: Unsafe {}
+  });
+}
+
+}  // namespace unsafe
+
+struct SliceIterator<T: type, Reference: type> {
   macro Empty(): bool {
     return this.start == this.end;
   }
@@ -108,7 +179,7 @@ struct SliceIterator<T: type> {
     return *this.NextReference() otherwise NoMore;
   }
 
-  macro NextReference():&T labels NoMore {
+  macro NextReference(): Reference labels NoMore {
     if (this.Empty()) {
       goto NoMore;
     } else {
@@ -118,7 +189,7 @@ struct SliceIterator<T: type> {
     }
   }
 
-  object: HeapObject;
+  object: HeapObject|TaggedZeroPattern;
   start: intptr;
   end: intptr;
   unsafeMarker: Unsafe;
@@ -172,7 +243,7 @@ macro AllocateFromNew(
 }
 
 macro InitializeFieldsFromIterator<T: type, Iterator: type>(
-    target: Slice<T>, originIterator: Iterator) {
+    target: MutableSlice<T>, originIterator: Iterator) {
   let targetIterator = target.Iterator();
   let originIterator = originIterator;
   while (true) {
@@ -182,22 +253,24 @@ macro InitializeFieldsFromIterator<T: type, Iterator: type>(
 }
 // Dummy implementations: do not initialize for UninitializedIterator.
 InitializeFieldsFromIterator<char8, UninitializedIterator>(
-    _target: Slice<char8>, _originIterator: UninitializedIterator) {}
+    _target: MutableSlice<char8>, _originIterator: UninitializedIterator) {}
 InitializeFieldsFromIterator<char16, UninitializedIterator>(
-    _target: Slice<char16>, _originIterator: UninitializedIterator) {}
+    _target: MutableSlice<char16>, _originIterator: UninitializedIterator) {}
 
 extern macro IsDoubleHole(HeapObject, intptr): bool;
 extern macro StoreDoubleHole(HeapObject, intptr);
 
 macro LoadFloat64OrHole(r:&float64_or_hole): float64_or_hole {
   return float64_or_hole{
-    is_hole: IsDoubleHole(r.object, r.offset - kHeapObjectTag),
+    is_hole: IsDoubleHole(
+        %RawDownCast<HeapObject>(r.object), r.offset - kHeapObjectTag),
     value: *unsafe::NewReference<float64>(r.object, r.offset)
   };
 }
 macro StoreFloat64OrHole(r:&float64_or_hole, value: float64_or_hole) {
   if (value.is_hole) {
-    StoreDoubleHole(r.object, r.offset - kHeapObjectTag);
+    StoreDoubleHole(
+        %RawDownCast<HeapObject>(r.object), r.offset - kHeapObjectTag);
   } else {
     *unsafe::NewReference<float64>(r.object, r.offset) = value.value;
   }
diff --git a/deps/v8/src/builtins/typed-array-at.tq b/deps/v8/src/builtins/typed-array-at.tq
new file mode 100644
index 00000000000000..6ec4730d9439c1
--- /dev/null
+++ b/deps/v8/src/builtins/typed-array-at.tq
@@ -0,0 +1,28 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace typed_array {
+// https://tc39.es/proposal-item-method/#sec-%typedarray%.prototype.at
+transitioning javascript builtin TypedArrayPrototypeAt(
+    js-implicit context: NativeContext, receiver: JSAny)(index: JSAny): JSAny {
+  // 1. Let O be the this value.
+  // 2. Perform ? ValidateTypedArray(O).
+  const o = ValidateTypedArray(context, receiver, '%TypedArray%.prototype.at');
+  // 3. Let len be O.[[ArrayLength]].
+  const len = Convert<Number>(o.length);
+  // 4. Let relativeIndex be ? ToInteger(index).
+  const relativeIndex = ToInteger_Inline(index);
+  // 5. If relativeIndex ≥ 0, then
+  //   a. Let k be relativeIndex.
+  // 6. Else,
+  //   a. Let k be len + relativeIndex.
+  const k = relativeIndex >= 0 ? relativeIndex : len + relativeIndex;
+  // 7. If k < 0 or k ≥ len, then return undefined.
+  if (k < 0 || k >= len) {
+    return Undefined;
+  }
+  // 8. Return ? Get(O, ! ToString(k)).
+  return GetProperty(o, k);
+}
+}
diff --git a/deps/v8/src/builtins/wasm.tq b/deps/v8/src/builtins/wasm.tq
index 411bb0c41eb829..b258293a96da61 100644
--- a/deps/v8/src/builtins/wasm.tq
+++ b/deps/v8/src/builtins/wasm.tq
@@ -35,7 +35,7 @@ extern runtime WasmAllocateRtt(Context, Smi, Map): Map;
 
 namespace unsafe {
 extern macro TimesTaggedSize(intptr): intptr;
-extern macro Allocate(intptr): HeapObject;
+extern macro Allocate(intptr, constexpr AllocationFlag): HeapObject;
 }
 
 namespace wasm {
@@ -231,34 +231,33 @@ builtin WasmAllocateJSArray(implicit context: Context)(size: Smi): JSArray {
   return AllocateJSArray(ElementsKind::PACKED_ELEMENTS, map, size, size);
 }
 
-builtin WasmAllocateRtt(implicit context: Context)(
-    typeIndex: Smi, parent: Map): Map {
-  tail runtime::WasmAllocateRtt(context, typeIndex, parent);
+builtin WasmAllocateRtt(typeIndex: intptr, parent: Map): Map {
+  tail runtime::WasmAllocateRtt(
+      LoadContextFromFrame(), SmiTag(typeIndex), parent);
 }
 
-builtin WasmAllocateStructWithRtt(implicit context: Context)(rtt: Map):
-    HeapObject {
+builtin WasmAllocateStructWithRtt(rtt: Map): HeapObject {
   const instanceSize: intptr =
       unsafe::TimesTaggedSize(Convert<intptr>(rtt.instance_size_in_words));
-  const result: HeapObject = unsafe::Allocate(instanceSize);
+  const result: HeapObject = unsafe::Allocate(
+      instanceSize, AllocationFlag::kAllowLargeObjectAllocation);
   *UnsafeConstCast(&result.map) = rtt;
   return result;
 }
 
-builtin WasmIsRttSubtype(implicit context: Context)(sub: Map, super: Map): Smi {
-  let map = sub;
-  while (true) {
-    if (map == super) return SmiConstant(1);  // "true"
-    // This code relies on the fact that we use a non-WasmObject map as the
-    // end of the chain, e.g. for "rtt any", which then doesn't have a
-    // WasmTypeInfo.
-    // TODO(7748): Use a more explicit sentinel mechanism?
-    const maybeTypeInfo = map.constructor_or_back_pointer_or_native_context;
-    if (!Is<WasmTypeInfo>(maybeTypeInfo)) return SmiConstant(0);  // "false"
-    const typeInfo = %RawDownCast<WasmTypeInfo>(maybeTypeInfo);
-    map = typeInfo.parent;
-  }
-  unreachable;
+builtin WasmAllocateArrayWithRtt(
+    rtt: Map, length: uint32, elementSize: uint32): HeapObject {
+  // instanceSize = RoundUp(elementSize * length, kObjectAlignment)
+  //              + WasmArray::kHeaderSize
+  const instanceSize: intptr =
+      torque_internal::AlignTagged(
+          Convert<intptr>(length) * Convert<intptr>(elementSize)) +
+      Convert<intptr>(kWasmArrayHeaderSize);
+  const result: HeapObject = unsafe::Allocate(
+      instanceSize, AllocationFlag::kAllowLargeObjectAllocation);
+  *UnsafeConstCast(&result.map) = rtt;
+  %RawDownCast<WasmArray>(result).length = length;
+  return result;
 }
 
 // Redeclaration with different typing (value is an Object, not JSAny).
@@ -408,10 +407,6 @@ builtin ThrowWasmTrapTableOutOfBounds(): JSAny {
   tail WasmTrap(SmiConstant(MessageTemplate::kWasmTrapTableOutOfBounds));
 }
 
-builtin ThrowWasmTrapBrOnExnNull(): JSAny {
-  tail WasmTrap(SmiConstant(MessageTemplate::kWasmTrapBrOnExnNull));
-}
-
 builtin ThrowWasmTrapRethrowNull(): JSAny {
   tail WasmTrap(SmiConstant(MessageTemplate::kWasmTrapRethrowNull));
 }
diff --git a/deps/v8/src/builtins/x64/builtins-x64.cc b/deps/v8/src/builtins/x64/builtins-x64.cc
index f7eb4658d5bcb0..2ee03f0026a382 100644
--- a/deps/v8/src/builtins/x64/builtins-x64.cc
+++ b/deps/v8/src/builtins/x64/builtins-x64.cc
@@ -2995,7 +2995,11 @@ void Builtins::Generate_GenericJSToWasmWrapper(MacroAssembler* masm) {
   constexpr int kFrameMarkerOffset = -kSystemPointerSize;
   constexpr int kGCScanSlotCountOffset =
       kFrameMarkerOffset - kSystemPointerSize;
-  constexpr int kParamCountOffset = kGCScanSlotCountOffset - kSystemPointerSize;
+  // The number of parameters passed to this function.
+  constexpr int kInParamCountOffset =
+      kGCScanSlotCountOffset - kSystemPointerSize;
+  // The number of parameters according to the signature.
+  constexpr int kParamCountOffset = kInParamCountOffset - kSystemPointerSize;
   constexpr int kReturnCountOffset = kParamCountOffset - kSystemPointerSize;
   constexpr int kValueTypesArrayStartOffset =
       kReturnCountOffset - kSystemPointerSize;
@@ -3004,8 +3008,13 @@ void Builtins::Generate_GenericJSToWasmWrapper(MacroAssembler* masm) {
   constexpr int kFunctionDataOffset =
       kValueTypesArrayStartOffset - kSystemPointerSize;
   constexpr int kLastSpillOffset = kFunctionDataOffset;
-  constexpr int kNumSpillSlots = 5;
+  constexpr int kNumSpillSlots = 6;
   __ subq(rsp, Immediate(kNumSpillSlots * kSystemPointerSize));
+  // Put the in_parameter count on the stack, we only  need it at the very end
+  // when we pop the parameters off the stack.
+  Register in_param_count = rax;
+  __ movq(MemOperand(rbp, kInParamCountOffset), in_param_count);
+  in_param_count = no_reg;
 
   // -------------------------------------------
   // Load the Wasm exported function data and the Wasm instance.
@@ -3032,22 +3041,20 @@ void Builtins::Generate_GenericJSToWasmWrapper(MacroAssembler* masm) {
                  WasmExportedFunctionData::kInstanceOffset - kHeapObjectTag));
 
   // -------------------------------------------
-  // Increment the call count in function data.
+  // Decrement the budget of the generic wrapper in function data.
   // -------------------------------------------
   __ SmiAddConstant(
-      MemOperand(function_data,
-                 WasmExportedFunctionData::kCallCountOffset - kHeapObjectTag),
-      Smi::FromInt(1));
+      MemOperand(function_data, WasmExportedFunctionData::kWrapperBudgetOffset -
+                                    kHeapObjectTag),
+      Smi::FromInt(-1));
 
   // -------------------------------------------
-  // Check if the call count reached the threshold.
+  // Check if the budget of the generic wrapper reached 0 (zero).
   // -------------------------------------------
+  // Instead of a specific comparison, we can directly use the flags set
+  // from the previous addition.
   Label compile_wrapper, compile_wrapper_done;
-  __ SmiCompare(
-      MemOperand(function_data,
-                 WasmExportedFunctionData::kCallCountOffset - kHeapObjectTag),
-      Smi::FromInt(wasm::kGenericWrapperThreshold));
-  __ j(greater_equal, &compile_wrapper);
+  __ j(less_equal, &compile_wrapper);
   __ bind(&compile_wrapper_done);
 
   // -------------------------------------------
@@ -3160,20 +3167,19 @@ void Builtins::Generate_GenericJSToWasmWrapper(MacroAssembler* masm) {
   // We will loop through the params starting with the 1st param.
   // The order of processing the params is important. We have to evaluate them
   // in an increasing order.
-  //      Not reversed                Reversed
-  //   +-----------------+------+-----------------+---------------
-  //   |    receiver     |      |     param n     |
-  //   |- - - - - - - - -|      |- - - - - - - - -|
-  //   |      param 1    |      |    param n-1    |   Caller
-  //   |       ...       |      |       ...       | frame slots
-  //   |    param n-1    |      |     param 1     |
-  //   |- - - - - - - - -|      |- - - - - - - - -|
-  //   |     param n     |      |    receiver     |
-  //  -+-----------------+------+-----------------+---------------
-  //   |  return addr    |      |  return addr    |
-  //   |- - - - - - - - -|<-FP->|- - - - - - - - -|
-  //   |      rbp        |      |      rbp        |   Spill slots
-  //   |- - - - - - - - -|      |- - - - - - - - -|
+  //       +-----------------+---------------
+  //       |     param n     |
+  //       |- - - - - - - - -|
+  //       |    param n-1    |   Caller
+  //       |       ...       | frame slots
+  //       |     param 1     |
+  //       |- - - - - - - - -|
+  //       |    receiver     |
+  //       +-----------------+---------------
+  //       |  return addr    |
+  //   FP->|- - - - - - - - -|
+  //       |      rbp        |   Spill slots
+  //       |- - - - - - - - -|
   //
   // [rbp + current_param] gives us the parameter we are processing.
   // We iterate through half-open interval <1st param, [rbp + param_limit]).
@@ -3458,6 +3464,13 @@ void Builtins::Generate_GenericJSToWasmWrapper(MacroAssembler* masm) {
   __ bind(&return_done);
   __ movq(param_count, MemOperand(rbp, kParamCountOffset));
 
+  // Calculate the number of parameters we have to pop off the stack. This
+  // number is max(in_param_count, param_count).
+  in_param_count = rdx;
+  __ movq(in_param_count, MemOperand(rbp, kInParamCountOffset));
+  __ cmpq(param_count, in_param_count);
+  __ cmovq(less, param_count, in_param_count);
+
   // -------------------------------------------
   // Deconstrunct the stack frame.
   // -------------------------------------------
@@ -3473,6 +3486,9 @@ void Builtins::Generate_GenericJSToWasmWrapper(MacroAssembler* masm) {
   Register return_addr = rbx;
   __ popq(return_addr);
   Register caller_frame_slots_count = param_count;
+  // Add one to also pop the receiver. The receiver is passed to a JSFunction
+  // over the stack but is neither included in the number of parameters passed
+  // to this function nor in the number of parameters expected in this function.
   __ addq(caller_frame_slots_count, Immediate(1));
   __ shlq(caller_frame_slots_count, Immediate(kSystemPointerSizeLog2));
   __ addq(rsp, caller_frame_slots_count);
@@ -4247,6 +4263,63 @@ void Builtins::Generate_DeoptimizationEntry_Lazy(MacroAssembler* masm) {
   Generate_DeoptimizationEntry(masm, DeoptimizeKind::kLazy);
 }
 
+void Builtins::Generate_DynamicCheckMapsTrampoline(MacroAssembler* masm) {
+  FrameScope scope(masm, StackFrame::MANUAL);
+  __ EnterFrame(StackFrame::INTERNAL);
+
+  // Only save the registers that the DynamicCheckMaps builtin can clobber.
+  DynamicCheckMapsDescriptor descriptor;
+  RegList registers = descriptor.allocatable_registers();
+  // FLAG_debug_code is enabled CSA checks will call C function and so we need
+  // to save all CallerSaved registers too.
+  if (FLAG_debug_code) registers |= kCallerSaved;
+  __ SaveRegisters(registers);
+
+  // Load the immediate arguments from the deopt exit to pass to the builtin.
+  Register slot_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kSlot);
+  Register handler_arg =
+      descriptor.GetRegisterParameter(DynamicCheckMapsDescriptor::kHandler);
+  __ movq(handler_arg, Operand(rbp, CommonFrameConstants::kCallerPCOffset));
+  __ movq(slot_arg, Operand(handler_arg,
+                            Deoptimizer::kEagerWithResumeImmedArgs1PcOffset));
+  __ movq(
+      handler_arg,
+      Operand(handler_arg, Deoptimizer::kEagerWithResumeImmedArgs2PcOffset));
+
+  __ Call(BUILTIN_CODE(masm->isolate(), DynamicCheckMaps),
+          RelocInfo::CODE_TARGET);
+
+  Label deopt, bailout;
+  __ cmpq(rax, Immediate(static_cast<int>(DynamicCheckMapsStatus::kSuccess)));
+  __ j(not_equal, &deopt);
+
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  __ Ret();
+
+  __ bind(&deopt);
+  __ cmpq(rax, Immediate(static_cast<int>(DynamicCheckMapsStatus::kBailout)));
+  __ j(equal, &bailout);
+
+  if (FLAG_debug_code) {
+    __ cmpq(rax, Immediate(static_cast<int>(DynamicCheckMapsStatus::kDeopt)));
+    __ Assert(equal, AbortReason::kUnexpectedDynamicCheckMapsStatus);
+  }
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_eager = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kEager));
+  __ Jump(deopt_eager, RelocInfo::CODE_TARGET);
+
+  __ bind(&bailout);
+  __ RestoreRegisters(registers);
+  __ LeaveFrame(StackFrame::INTERNAL);
+  Handle<Code> deopt_bailout = masm->isolate()->builtins()->builtin_handle(
+      Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind::kBailout));
+  __ Jump(deopt_bailout, RelocInfo::CODE_TARGET);
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/arm/assembler-arm-inl.h b/deps/v8/src/codegen/arm/assembler-arm-inl.h
index b5f8b9609b467d..9dadad96ac3ea9 100644
--- a/deps/v8/src/codegen/arm/assembler-arm-inl.h
+++ b/deps/v8/src/codegen/arm/assembler-arm-inl.h
@@ -94,7 +94,11 @@ Address RelocInfo::constant_pool_entry_address() {
 int RelocInfo::target_address_size() { return kPointerSize; }
 
 HeapObject RelocInfo::target_object() {
-  DCHECK(IsCodeTarget(rmode_) || rmode_ == FULL_EMBEDDED_OBJECT);
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
+  if (IsDataEmbeddedObject(rmode_)) {
+    return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
+  }
   return HeapObject::cast(
       Object(Assembler::target_address_at(pc_, constant_pool_)));
 }
@@ -104,9 +108,11 @@ HeapObject RelocInfo::target_object_no_host(Isolate* isolate) {
 }
 
 Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
-  if (IsCodeTarget(rmode_) || rmode_ == FULL_EMBEDDED_OBJECT) {
+  if (IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_)) {
     return Handle<HeapObject>(reinterpret_cast<Address*>(
         Assembler::target_address_at(pc_, constant_pool_)));
+  } else if (IsDataEmbeddedObject(rmode_)) {
+    return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
   }
   DCHECK(IsRelativeCodeTarget(rmode_));
   return origin->relative_code_target_object_handle_at(pc_);
@@ -115,9 +121,15 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
 void RelocInfo::set_target_object(Heap* heap, HeapObject target,
                                   WriteBarrierMode write_barrier_mode,
                                   ICacheFlushMode icache_flush_mode) {
-  DCHECK(IsCodeTarget(rmode_) || rmode_ == FULL_EMBEDDED_OBJECT);
-  Assembler::set_target_address_at(pc_, constant_pool_, target.ptr(),
-                                   icache_flush_mode);
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
+  if (IsDataEmbeddedObject(rmode_)) {
+    WriteUnalignedValue(pc_, target.ptr());
+    // No need to flush icache since no instructions were changed.
+  } else {
+    Assembler::set_target_address_at(pc_, constant_pool_, target.ptr(),
+                                     icache_flush_mode);
+  }
   if (write_barrier_mode == UPDATE_WRITE_BARRIER && !host().is_null() &&
       !FLAG_disable_write_barriers) {
     WriteBarrierForCode(host(), this, target);
diff --git a/deps/v8/src/codegen/arm/assembler-arm.cc b/deps/v8/src/codegen/arm/assembler-arm.cc
index cc5d6299f56060..ef8a4669c5776c 100644
--- a/deps/v8/src/codegen/arm/assembler-arm.cc
+++ b/deps/v8/src/codegen/arm/assembler-arm.cc
@@ -3749,6 +3749,22 @@ void Assembler::vst1(NeonSize size, const NeonListOperand& src,
        src.type() * B8 | size * B6 | dst.align() * B4 | dst.rm().code());
 }
 
+void Assembler::vst1s(NeonSize size, const NeonListOperand& src, uint8_t index,
+                      const NeonMemOperand& dst) {
+  // Instruction details available in ARM DDI 0487F.b F6.1.236.
+  // 1111(31-28) | 01001(27-23) | D(22) | 00(21-20) | Rn(19-16) |
+  // Vd(15-12) | size(11-10) | 00(9-8) | index_align(7-4) | Rm(3-0)
+  DCHECK(IsEnabled(NEON));
+  DCHECK_NE(size, 0x3);
+  DCHECK_GT(1 << (3 - size), index);
+  // Specifying alignment not supported, use standard alignment.
+  uint8_t index_align = index << (size + 1);
+  int vd, d;
+  src.base().split_code(&vd, &d);
+  emit(0xFU * B28 | 9 * B23 | d * B22 | dst.rn().code() * B16 | vd * B12 |
+       size * B10 | index_align * B4 | dst.rm().code());
+}
+
 void Assembler::vmovl(NeonDataType dt, QwNeonRegister dst, DwVfpRegister src) {
   // Instruction details available in ARM DDI 0406C.b, A8.8.346.
   // 1111(31-28) | 001(27-25) | U(24) | 1(23) | D(22) | imm3(21-19) |
@@ -3776,6 +3792,7 @@ void Assembler::vqmovn(NeonDataType dst_dt, NeonDataType src_dt,
   int vm, m;
   src.split_code(&vm, &m);
   int size = NeonSz(dst_dt);
+  DCHECK_NE(3, size);
   int op = NeonU(src_dt) ? 0b11 : NeonU(dst_dt) ? 0b01 : 0b10;
   emit(0x1E7U * B23 | d * B22 | 0x3 * B20 | size * B18 | 0x2 * B16 | vd * B12 |
        0x2 * B8 | op * B6 | m * B5 | vm);
@@ -3826,7 +3843,8 @@ void Assembler::vmov(NeonDataType dt, Register dst, DwVfpRegister src,
   int vn, n;
   src.split_code(&vn, &n);
   int opc1_opc2 = EncodeScalar(dt, index);
-  int u = NeonU(dt);
+  // NeonS32 and NeonU32 both encoded as u = 0.
+  int u = NeonDataTypeToSize(dt) == Neon32 ? 0 : NeonU(dt);
   emit(0xEEu * B24 | u * B23 | B20 | vn * B16 | dst.code() * B12 | 0xB * B8 |
        n * B7 | B4 | opc1_opc2);
 }
@@ -3965,9 +3983,23 @@ enum UnaryOp {
   VRINTM,
   VRINTN,
   VRINTP,
-  VRINTZ
+  VRINTZ,
+  VZIP,
+  VUZP,
+  VREV16,
+  VREV32,
+  VREV64,
+  VTRN,
+  VRECPE,
+  VRSQRTE,
+  VPADDL_S,
+  VPADDL_U,
+  VCLT0,
+  VCNT
 };
 
+// Encoding helper for "Advanced SIMD two registers misc" decode group. See ARM
+// DDI 0487F.b, F4-4228.
 static Instr EncodeNeonUnaryOp(UnaryOp op, NeonRegType reg_type, NeonSize size,
                                int dst_code, int src_code) {
   int op_encoding = 0;
@@ -4006,8 +4038,45 @@ static Instr EncodeNeonUnaryOp(UnaryOp op, NeonRegType reg_type, NeonSize size,
     case VRINTZ:
       op_encoding = B17 | 0xB * B7;
       break;
-    default:
-      UNREACHABLE();
+    case VZIP:
+      op_encoding = 0x2 * B16 | 0x3 * B7;
+      break;
+    case VUZP:
+      op_encoding = 0x2 * B16 | 0x2 * B7;
+      break;
+    case VREV16:
+      op_encoding = 0x2 * B7;
+      break;
+    case VREV32:
+      op_encoding = 0x1 * B7;
+      break;
+    case VREV64:
+      // op_encoding is 0;
+      break;
+    case VTRN:
+      op_encoding = 0x2 * B16 | B7;
+      break;
+    case VRECPE:
+      // Only support floating point.
+      op_encoding = 0x3 * B16 | 0xA * B7;
+      break;
+    case VRSQRTE:
+      // Only support floating point.
+      op_encoding = 0x3 * B16 | 0xB * B7;
+      break;
+    case VPADDL_S:
+      op_encoding = 0x4 * B7;
+      break;
+    case VPADDL_U:
+      op_encoding = 0x5 * B7;
+      break;
+    case VCLT0:
+      // Only support signed integers.
+      op_encoding = 0x1 * B16 | 0x4 * B7;
+      break;
+    case VCNT:
+      op_encoding = 0xA * B7;
+      break;
   }
   int vd, d;
   NeonSplitCode(reg_type, dst_code, &vd, &d, &op_encoding);
@@ -4239,7 +4308,8 @@ enum IntegerBinOp {
   VCEQ,
   VCGE,
   VCGT,
-  VRHADD
+  VRHADD,
+  VQRDMULH
 };
 
 static Instr EncodeNeonBinOp(IntegerBinOp op, NeonDataType dt,
@@ -4283,6 +4353,9 @@ static Instr EncodeNeonBinOp(IntegerBinOp op, NeonDataType dt,
     case VRHADD:
       op_encoding = B8;
       break;
+    case VQRDMULH:
+      op_encoding = B24 | 0xB * B8;
+      break;
     default:
       UNREACHABLE();
   }
@@ -4437,7 +4510,7 @@ void Assembler::vmax(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src1,
   emit(EncodeNeonBinOp(VMAX, dt, dst, src1, src2));
 }
 
-enum NeonShiftOp { VSHL, VSHR, VSLI, VSRI };
+enum NeonShiftOp { VSHL, VSHR, VSLI, VSRI, VSRA };
 
 static Instr EncodeNeonShiftRegisterOp(NeonShiftOp op, NeonDataType dt,
                                        NeonRegType reg_type, int dst_code,
@@ -4487,6 +4560,13 @@ static Instr EncodeNeonShiftOp(NeonShiftOp op, NeonSize size, bool is_unsigned,
       op_encoding = B24 | 0x4 * B8;
       break;
     }
+    case VSRA: {
+      DCHECK(shift > 0 && size_in_bits >= shift);
+      imm6 = 2 * size_in_bits - shift;
+      op_encoding = B8;
+      if (is_unsigned) op_encoding |= B24;
+      break;
+    }
     default:
       UNREACHABLE();
   }
@@ -4521,10 +4601,19 @@ void Assembler::vshl(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src,
                                  shift.code()));
 }
 
+void Assembler::vshr(NeonDataType dt, DwVfpRegister dst, DwVfpRegister src,
+                     int shift) {
+  DCHECK(IsEnabled(NEON));
+  // Dd = vshr(Dm, bits) SIMD shift right immediate.
+  // Instruction details available in ARM DDI 0406C.b, A8-1052.
+  emit(EncodeNeonShiftOp(VSHR, NeonDataTypeToSize(dt), NeonU(dt), NEON_D,
+                         dst.code(), src.code(), shift));
+}
+
 void Assembler::vshr(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src,
                      int shift) {
   DCHECK(IsEnabled(NEON));
-  // Qd = vshl(Qm, bits) SIMD shift right immediate.
+  // Qd = vshr(Qm, bits) SIMD shift right immediate.
   // Instruction details available in ARM DDI 0406C.b, A8-1052.
   emit(EncodeNeonShiftOp(VSHR, NeonDataTypeToSize(dt), NeonU(dt), NEON_Q,
                          dst.code(), src.code(), shift));
@@ -4548,29 +4637,27 @@ void Assembler::vsri(NeonSize size, DwVfpRegister dst, DwVfpRegister src,
                          shift));
 }
 
-static Instr EncodeNeonEstimateOp(bool is_rsqrt, QwNeonRegister dst,
-                                  QwNeonRegister src) {
-  int vd, d;
-  dst.split_code(&vd, &d);
-  int vm, m;
-  src.split_code(&vm, &m);
-  int rsqrt = is_rsqrt ? 1 : 0;
-  return 0x1E7U * B23 | d * B22 | 0x3B * B16 | vd * B12 | 0x5 * B8 |
-         rsqrt * B7 | B6 | m * B5 | vm;
+void Assembler::vsra(NeonDataType dt, DwVfpRegister dst, DwVfpRegister src,
+                     int imm) {
+  DCHECK(IsEnabled(NEON));
+  // Dd = vsra(Dm, imm) SIMD shift right and accumulate.
+  // Instruction details available in ARM DDI 0487F.b, F6-5569.
+  emit(EncodeNeonShiftOp(VSRA, NeonDataTypeToSize(dt), NeonU(dt), NEON_D,
+                         dst.code(), src.code(), imm));
 }
 
 void Assembler::vrecpe(QwNeonRegister dst, QwNeonRegister src) {
   DCHECK(IsEnabled(NEON));
   // Qd = vrecpe(Qm) SIMD reciprocal estimate.
   // Instruction details available in ARM DDI 0406C.b, A8-1024.
-  emit(EncodeNeonEstimateOp(false, dst, src));
+  emit(EncodeNeonUnaryOp(VRECPE, NEON_Q, Neon32, dst.code(), src.code()));
 }
 
 void Assembler::vrsqrte(QwNeonRegister dst, QwNeonRegister src) {
   DCHECK(IsEnabled(NEON));
   // Qd = vrsqrte(Qm) SIMD reciprocal square root estimate.
   // Instruction details available in ARM DDI 0406C.b, A8-1038.
-  emit(EncodeNeonEstimateOp(true, dst, src));
+  emit(EncodeNeonUnaryOp(VRSQRTE, NEON_Q, Neon32, dst.code(), src.code()));
 }
 
 void Assembler::vrecps(QwNeonRegister dst, QwNeonRegister src1,
@@ -4748,6 +4835,15 @@ void Assembler::vcgt(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src1,
   emit(EncodeNeonBinOp(VCGT, dt, dst, src1, src2));
 }
 
+void Assembler::vclt(NeonSize size, QwNeonRegister dst, QwNeonRegister src,
+                     int value) {
+  DCHECK(IsEnabled(NEON));
+  DCHECK_EQ(0, value);
+  // vclt.<size>(Qn, Qm, #0) SIMD Vector Compare Less Than Zero.
+  // Instruction details available in ARM DDI 0487F.b, F6-5072.
+  emit(EncodeNeonUnaryOp(VCLT0, NEON_Q, size, dst.code(), src.code()));
+}
+
 void Assembler::vrhadd(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src1,
                        QwNeonRegister src2) {
   DCHECK(IsEnabled(NEON));
@@ -4772,43 +4868,6 @@ void Assembler::vext(QwNeonRegister dst, QwNeonRegister src1,
        n * B7 | B6 | m * B5 | vm);
 }
 
-enum NeonSizedOp { VZIP, VUZP, VREV16, VREV32, VREV64, VTRN };
-
-static Instr EncodeNeonSizedOp(NeonSizedOp op, NeonRegType reg_type,
-                               NeonSize size, int dst_code, int src_code) {
-  int op_encoding = 0;
-  switch (op) {
-    case VZIP:
-      op_encoding = 0x2 * B16 | 0x3 * B7;
-      break;
-    case VUZP:
-      op_encoding = 0x2 * B16 | 0x2 * B7;
-      break;
-    case VREV16:
-      op_encoding = 0x2 * B7;
-      break;
-    case VREV32:
-      op_encoding = 0x1 * B7;
-      break;
-    case VREV64:
-      // op_encoding is 0;
-      break;
-    case VTRN:
-      op_encoding = 0x2 * B16 | B7;
-      break;
-    default:
-      UNREACHABLE();
-  }
-  int vd, d;
-  NeonSplitCode(reg_type, dst_code, &vd, &d, &op_encoding);
-  int vm, m;
-  NeonSplitCode(reg_type, src_code, &vm, &m, &op_encoding);
-
-  int sz = static_cast<int>(size);
-  return 0x1E7U * B23 | d * B22 | 0x3 * B20 | sz * B18 | vd * B12 | m * B5 |
-         vm | op_encoding;
-}
-
 void Assembler::vzip(NeonSize size, DwVfpRegister src1, DwVfpRegister src2) {
   if (size == Neon32) {  // vzip.32 Dd, Dm is a pseudo-op for vtrn.32 Dd, Dm.
     vtrn(size, src1, src2);
@@ -4816,7 +4875,7 @@ void Assembler::vzip(NeonSize size, DwVfpRegister src1, DwVfpRegister src2) {
     DCHECK(IsEnabled(NEON));
     // vzip.<size>(Dn, Dm) SIMD zip (interleave).
     // Instruction details available in ARM DDI 0406C.b, A8-1102.
-    emit(EncodeNeonSizedOp(VZIP, NEON_D, size, src1.code(), src2.code()));
+    emit(EncodeNeonUnaryOp(VZIP, NEON_D, size, src1.code(), src2.code()));
   }
 }
 
@@ -4824,7 +4883,7 @@ void Assembler::vzip(NeonSize size, QwNeonRegister src1, QwNeonRegister src2) {
   DCHECK(IsEnabled(NEON));
   // vzip.<size>(Qn, Qm) SIMD zip (interleave).
   // Instruction details available in ARM DDI 0406C.b, A8-1102.
-  emit(EncodeNeonSizedOp(VZIP, NEON_Q, size, src1.code(), src2.code()));
+  emit(EncodeNeonUnaryOp(VZIP, NEON_Q, size, src1.code(), src2.code()));
 }
 
 void Assembler::vuzp(NeonSize size, DwVfpRegister src1, DwVfpRegister src2) {
@@ -4834,7 +4893,7 @@ void Assembler::vuzp(NeonSize size, DwVfpRegister src1, DwVfpRegister src2) {
     DCHECK(IsEnabled(NEON));
     // vuzp.<size>(Dn, Dm) SIMD un-zip (de-interleave).
     // Instruction details available in ARM DDI 0406C.b, A8-1100.
-    emit(EncodeNeonSizedOp(VUZP, NEON_D, size, src1.code(), src2.code()));
+    emit(EncodeNeonUnaryOp(VUZP, NEON_D, size, src1.code(), src2.code()));
   }
 }
 
@@ -4842,42 +4901,64 @@ void Assembler::vuzp(NeonSize size, QwNeonRegister src1, QwNeonRegister src2) {
   DCHECK(IsEnabled(NEON));
   // vuzp.<size>(Qn, Qm) SIMD un-zip (de-interleave).
   // Instruction details available in ARM DDI 0406C.b, A8-1100.
-  emit(EncodeNeonSizedOp(VUZP, NEON_Q, size, src1.code(), src2.code()));
+  emit(EncodeNeonUnaryOp(VUZP, NEON_Q, size, src1.code(), src2.code()));
 }
 
 void Assembler::vrev16(NeonSize size, QwNeonRegister dst, QwNeonRegister src) {
   DCHECK(IsEnabled(NEON));
   // Qd = vrev16.<size>(Qm) SIMD element reverse.
   // Instruction details available in ARM DDI 0406C.b, A8-1028.
-  emit(EncodeNeonSizedOp(VREV16, NEON_Q, size, dst.code(), src.code()));
+  emit(EncodeNeonUnaryOp(VREV16, NEON_Q, size, dst.code(), src.code()));
 }
 
 void Assembler::vrev32(NeonSize size, QwNeonRegister dst, QwNeonRegister src) {
   DCHECK(IsEnabled(NEON));
   // Qd = vrev32.<size>(Qm) SIMD element reverse.
   // Instruction details available in ARM DDI 0406C.b, A8-1028.
-  emit(EncodeNeonSizedOp(VREV32, NEON_Q, size, dst.code(), src.code()));
+  emit(EncodeNeonUnaryOp(VREV32, NEON_Q, size, dst.code(), src.code()));
 }
 
 void Assembler::vrev64(NeonSize size, QwNeonRegister dst, QwNeonRegister src) {
   DCHECK(IsEnabled(NEON));
   // Qd = vrev64.<size>(Qm) SIMD element reverse.
   // Instruction details available in ARM DDI 0406C.b, A8-1028.
-  emit(EncodeNeonSizedOp(VREV64, NEON_Q, size, dst.code(), src.code()));
+  emit(EncodeNeonUnaryOp(VREV64, NEON_Q, size, dst.code(), src.code()));
 }
 
 void Assembler::vtrn(NeonSize size, DwVfpRegister src1, DwVfpRegister src2) {
   DCHECK(IsEnabled(NEON));
   // vtrn.<size>(Dn, Dm) SIMD element transpose.
   // Instruction details available in ARM DDI 0406C.b, A8-1096.
-  emit(EncodeNeonSizedOp(VTRN, NEON_D, size, src1.code(), src2.code()));
+  emit(EncodeNeonUnaryOp(VTRN, NEON_D, size, src1.code(), src2.code()));
 }
 
 void Assembler::vtrn(NeonSize size, QwNeonRegister src1, QwNeonRegister src2) {
   DCHECK(IsEnabled(NEON));
   // vtrn.<size>(Qn, Qm) SIMD element transpose.
   // Instruction details available in ARM DDI 0406C.b, A8-1096.
-  emit(EncodeNeonSizedOp(VTRN, NEON_Q, size, src1.code(), src2.code()));
+  emit(EncodeNeonUnaryOp(VTRN, NEON_Q, size, src1.code(), src2.code()));
+}
+
+void Assembler::vpaddl(NeonDataType dt, QwNeonRegister dst,
+                       QwNeonRegister src) {
+  DCHECK(IsEnabled(NEON));
+  // vpaddl.<dt>(Qd, Qm) SIMD Vector Pairwise Add Long.
+  emit(EncodeNeonUnaryOp(NeonU(dt) ? VPADDL_U : VPADDL_S, NEON_Q,
+                         NeonDataTypeToSize(dt), dst.code(), src.code()));
+}
+
+void Assembler::vqrdmulh(NeonDataType dt, QwNeonRegister dst,
+                         QwNeonRegister src1, QwNeonRegister src2) {
+  DCHECK(IsEnabled(NEON));
+  DCHECK(dt == NeonS16 || dt == NeonS32);
+  emit(EncodeNeonBinOp(VQRDMULH, dt, dst, src1, src2));
+}
+
+void Assembler::vcnt(QwNeonRegister dst, QwNeonRegister src) {
+  // Qd = vcnt(Qm) SIMD Vector Count Set Bits.
+  // Instruction details available at ARM DDI 0487F.b, F6-5094.
+  DCHECK(IsEnabled(NEON));
+  emit(EncodeNeonUnaryOp(VCNT, NEON_Q, Neon8, dst.code(), src.code()));
 }
 
 // Encode NEON vtbl / vtbx instruction.
@@ -5047,20 +5128,28 @@ void Assembler::db(uint8_t data) {
   pc_ += sizeof(uint8_t);
 }
 
-void Assembler::dd(uint32_t data) {
+void Assembler::dd(uint32_t data, RelocInfo::Mode rmode) {
   // dd is used to write raw data. The constant pool should be emitted or
   // blocked before using dd.
   DCHECK(is_const_pool_blocked() || pending_32_bit_constants_.empty());
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   base::WriteUnalignedValue(reinterpret_cast<Address>(pc_), data);
   pc_ += sizeof(uint32_t);
 }
 
-void Assembler::dq(uint64_t value) {
+void Assembler::dq(uint64_t value, RelocInfo::Mode rmode) {
   // dq is used to write raw data. The constant pool should be emitted or
   // blocked before using dq.
   DCHECK(is_const_pool_blocked() || pending_32_bit_constants_.empty());
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   base::WriteUnalignedValue(reinterpret_cast<Address>(pc_), value);
   pc_ += sizeof(uint64_t);
 }
diff --git a/deps/v8/src/codegen/arm/assembler-arm.h b/deps/v8/src/codegen/arm/assembler-arm.h
index cb8b7628f53b87..eecb40b0271cb5 100644
--- a/deps/v8/src/codegen/arm/assembler-arm.h
+++ b/deps/v8/src/codegen/arm/assembler-arm.h
@@ -846,6 +846,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
              const NeonMemOperand& src);
   void vst1(NeonSize size, const NeonListOperand& src,
             const NeonMemOperand& dst);
+  // vst1s(single element from one lane).
+  void vst1s(NeonSize size, const NeonListOperand& src, uint8_t index,
+             const NeonMemOperand& dst);
   // dt represents the narrower type
   void vmovl(NeonDataType dt, QwNeonRegister dst, DwVfpRegister src);
   // dst_dt represents the narrower type, src_dt represents the src type.
@@ -913,6 +916,10 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vpmax(NeonDataType dt, DwVfpRegister dst, DwVfpRegister src1,
              DwVfpRegister src2);
 
+  void vpaddl(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src);
+  void vqrdmulh(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src1,
+                QwNeonRegister src2);
+
   // ARMv8 rounding instructions (NEON).
   void vrintm(NeonDataType dt, const QwNeonRegister dst,
               const QwNeonRegister src);
@@ -926,9 +933,12 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vshl(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src, int shift);
   void vshl(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src,
             QwNeonRegister shift);
+  void vshr(NeonDataType dt, DwVfpRegister dst, DwVfpRegister src, int shift);
   void vshr(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src, int shift);
   void vsli(NeonSize size, DwVfpRegister dst, DwVfpRegister src, int shift);
   void vsri(NeonSize size, DwVfpRegister dst, DwVfpRegister src, int shift);
+  void vsra(NeonDataType size, DwVfpRegister dst, DwVfpRegister src, int imm);
+
   // vrecpe and vrsqrte only support floating point lanes.
   void vrecpe(QwNeonRegister dst, QwNeonRegister src);
   void vrsqrte(QwNeonRegister dst, QwNeonRegister src);
@@ -945,6 +955,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vcgt(QwNeonRegister dst, QwNeonRegister src1, QwNeonRegister src2);
   void vcgt(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src1,
             QwNeonRegister src2);
+  void vclt(NeonSize size, QwNeonRegister dst, QwNeonRegister src, int value);
   void vrhadd(NeonDataType dt, QwNeonRegister dst, QwNeonRegister src1,
               QwNeonRegister src2);
   void vext(QwNeonRegister dst, QwNeonRegister src1, QwNeonRegister src2,
@@ -963,6 +974,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vtbx(DwVfpRegister dst, const NeonListOperand& list,
             DwVfpRegister index);
 
+  void vcnt(QwNeonRegister dst, QwNeonRegister src);
+
   // Pseudo instructions
 
   // Different nop operations are used by the code generator to detect certain
@@ -1027,7 +1040,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   bool ImmediateFitsAddrMode2Instruction(int32_t imm32);
 
   // Class for scoping postponing the constant pool generation.
-  class BlockConstPoolScope {
+  class V8_NODISCARD BlockConstPoolScope {
    public:
     explicit BlockConstPoolScope(Assembler* assem) : assem_(assem) {
       assem_->StartBlockConstPool();
@@ -1072,9 +1085,11 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // called before any use of db/dd/dq/dp to ensure that constant pools
   // are not emitted as part of the tables generated.
   void db(uint8_t data);
-  void dd(uint32_t data);
-  void dq(uint64_t data);
-  void dp(uintptr_t data) { dd(data); }
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    dd(data, rmode);
+  }
 
   // Read/patch instructions
   Instr instr_at(int pos) {
@@ -1339,7 +1354,7 @@ class PatchingAssembler : public Assembler {
 // state, even if the list is modified by some other means. Note that this scope
 // can be nested but the destructors need to run in the opposite order as the
 // constructors. We do not have assertions for this.
-class V8_EXPORT_PRIVATE UseScratchRegisterScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD UseScratchRegisterScope {
  public:
   explicit UseScratchRegisterScope(Assembler* assembler);
   ~UseScratchRegisterScope();
diff --git a/deps/v8/src/codegen/arm/interface-descriptors-arm.cc b/deps/v8/src/codegen/arm/interface-descriptors-arm.cc
index 96bf2ae50ce4ea..4363a63552bc70 100644
--- a/deps/v8/src/codegen/arm/interface-descriptors-arm.cc
+++ b/deps/v8/src/codegen/arm/interface-descriptors-arm.cc
@@ -34,6 +34,18 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {r0, r1, r2, r3, cp};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   const Register default_stub_registers[] = {r0, r1, r2, r3, r4};
diff --git a/deps/v8/src/codegen/arm/macro-assembler-arm.cc b/deps/v8/src/codegen/arm/macro-assembler-arm.cc
index b72e385d58d9fd..d2f206e7386508 100644
--- a/deps/v8/src/codegen/arm/macro-assembler-arm.cc
+++ b/deps/v8/src/codegen/arm/macro-assembler-arm.cc
@@ -716,23 +716,22 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Operand offset,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Operand offset, RememberedSetAction remembered_set_action,
     SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, offset, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, offset, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Operand offset, RememberedSetAction remembered_set_action,
     SaveFPRegsMode fp_mode, Address wasm_target) {
   CallRecordWriteStub(object, offset, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Operand offset, RememberedSetAction remembered_set_action,
-    SaveFPRegsMode fp_mode, Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    SaveFPRegsMode fp_mode, int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
   // TODO(albertnetymk): For now we ignore remembered_set_action and fp_mode,
   // i.e. always emit remember set and save FP registers in RecordWriteStub. If
   // large performance regression is observed, we should use these values to
@@ -756,9 +755,13 @@ void TurboAssembler::CallRecordWriteStub(
 
   Move(remembered_set_parameter, Smi::FromEnum(remembered_set_action));
   Move(fp_mode_parameter, Smi::FromEnum(fp_mode));
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     Call(wasm_target, RelocInfo::WASM_STUB_CALL);
+  } else if (options().inline_offheap_trampolines) {
+    CallBuiltin(builtin_index);
   } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
@@ -1162,6 +1165,26 @@ void TurboAssembler::ReplaceLane(QwNeonRegister dst, QwNeonRegister src,
   vmov(double_dst, src_lane);
 }
 
+void TurboAssembler::LoadLane(NeonSize sz, NeonListOperand dst_list,
+                              uint8_t lane, NeonMemOperand src) {
+  if (sz == Neon64) {
+    // vld1s is not valid for Neon64.
+    vld1(Neon64, dst_list, src);
+  } else {
+    vld1s(sz, dst_list, lane, src);
+  }
+}
+
+void TurboAssembler::StoreLane(NeonSize sz, NeonListOperand src_list,
+                               uint8_t lane, NeonMemOperand dst) {
+  if (sz == Neon64) {
+    // vst1s is not valid for Neon64.
+    vst1(Neon64, src_list, dst);
+  } else {
+    vst1s(sz, src_list, lane, dst);
+  }
+}
+
 void TurboAssembler::LslPair(Register dst_low, Register dst_high,
                              Register src_low, Register src_high,
                              Register shift) {
@@ -2044,7 +2067,7 @@ void TurboAssembler::Abort(AbortReason reason) {
   // will not return here
 }
 
-void MacroAssembler::LoadMap(Register destination, Register object) {
+void TurboAssembler::LoadMap(Register destination, Register object) {
   ldr(destination, FieldMemOperand(object, HeapObject::kMapOffset));
 }
 
@@ -2587,7 +2610,7 @@ void TurboAssembler::ResetSpeculationPoisonRegister() {
 
 void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
                                            Label* exit, DeoptimizeKind kind,
-                                           Label*) {
+                                           Label* ret, Label*) {
   BlockConstPoolScope block_const_pool(this);
   ldr(ip, MemOperand(kRootRegister,
                      IsolateData::builtin_entry_slot_offset(target)));
@@ -2596,7 +2619,12 @@ void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    b(ret);
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+  }
 }
 
 void TurboAssembler::Trap() { stop(); }
diff --git a/deps/v8/src/codegen/arm/macro-assembler-arm.h b/deps/v8/src/codegen/arm/macro-assembler-arm.h
index a4d6632a0754e3..55a7baba7ab358 100644
--- a/deps/v8/src/codegen/arm/macro-assembler-arm.h
+++ b/deps/v8/src/codegen/arm/macro-assembler-arm.h
@@ -325,7 +325,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void StoreReturnAddressAndCall(Register target);
 
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   // Emit code to discard a non-negative number of pointer-sized elements
@@ -463,6 +463,11 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void ReplaceLane(QwNeonRegister dst, QwNeonRegister src,
                    DwVfpRegister src_lane, int lane);
 
+  void LoadLane(NeonSize sz, NeonListOperand dst_list, uint8_t lane,
+                NeonMemOperand src);
+  void StoreLane(NeonSize sz, NeonListOperand src_list, uint8_t lane,
+                 NeonMemOperand dst);
+
   // Register move. May do nothing if the registers are identical.
   void Move(Register dst, Smi smi);
   void Move(Register dst, Handle<HeapObject> value);
@@ -518,6 +523,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void JumpIfEqual(Register x, int32_t y, Label* dest);
   void JumpIfLessThan(Register x, int32_t y, Label* dest);
 
+  void LoadMap(Register destination, Register object);
+
   // Performs a truncating conversion of a floating point number as used by
   // the JS bitwise operations. See ECMA-262 9.5: ToInt32. Goes to 'done' if it
   // succeeds, otherwise falls through if result is saturated. On return
@@ -597,7 +604,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallRecordWriteStub(Register object, Operand offset,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 };
 
@@ -648,8 +655,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   void LeaveExitFrame(bool save_doubles, Register argument_count,
                       bool argument_count_is_length = false);
 
-  void LoadMap(Register destination, Register object);
-
   // Load the global proxy from the current context.
   void LoadGlobalProxy(Register dst);
 
diff --git a/deps/v8/src/codegen/arm64/assembler-arm64-inl.h b/deps/v8/src/codegen/arm64/assembler-arm64-inl.h
index c47f8f1aa54baf..1027dccc470eec 100644
--- a/deps/v8/src/codegen/arm64/assembler-arm64-inl.h
+++ b/deps/v8/src/codegen/arm64/assembler-arm64-inl.h
@@ -659,7 +659,9 @@ Address RelocInfo::constant_pool_entry_address() {
 
 HeapObject RelocInfo::target_object() {
   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-  if (IsCompressedEmbeddedObject(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
+  } else if (IsCompressedEmbeddedObject(rmode_)) {
     CHECK(!host_.is_null());
     return HeapObject::cast(Object(DecompressTaggedAny(
         host_.address(),
@@ -681,7 +683,9 @@ HeapObject RelocInfo::target_object_no_host(Isolate* isolate) {
 }
 
 Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
-  if (IsEmbeddedObjectMode(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
+  } else if (IsEmbeddedObjectMode(rmode_)) {
     return origin->target_object_handle_at(pc_);
   } else {
     DCHECK(IsCodeTarget(rmode_));
@@ -693,7 +697,10 @@ void RelocInfo::set_target_object(Heap* heap, HeapObject target,
                                   WriteBarrierMode write_barrier_mode,
                                   ICacheFlushMode icache_flush_mode) {
   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-  if (IsCompressedEmbeddedObject(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    WriteUnalignedValue(pc_, target.ptr());
+    // No need to flush icache since no instructions were changed.
+  } else if (IsCompressedEmbeddedObject(rmode_)) {
     Assembler::set_target_compressed_address_at(
         pc_, constant_pool_, CompressTagged(target.ptr()), icache_flush_mode);
   } else {
diff --git a/deps/v8/src/codegen/arm64/assembler-arm64.cc b/deps/v8/src/codegen/arm64/assembler-arm64.cc
index 4aaa413d2d588d..335419ebf5c810 100644
--- a/deps/v8/src/codegen/arm64/assembler-arm64.cc
+++ b/deps/v8/src/codegen/arm64/assembler-arm64.cc
@@ -1414,6 +1414,37 @@ void Assembler::stlxrh(const Register& rs, const Register& rt,
   Emit(STLXR_h | Rs(rs) | Rt2(x31) | RnSP(rn) | Rt(rt));
 }
 
+void Assembler::prfm(int prfop, const MemOperand& addr) {
+  // Restricted support for prfm, only register offset.
+  // This can probably be merged with Assembler::LoadStore as we expand support.
+  DCHECK(addr.IsRegisterOffset());
+  DCHECK(is_uint5(prfop));
+  Instr memop = PRFM | prfop | RnSP(addr.base());
+
+  Extend ext = addr.extend();
+  Shift shift = addr.shift();
+  unsigned shift_amount = addr.shift_amount();
+
+  // LSL is encoded in the option field as UXTX.
+  if (shift == LSL) {
+    ext = UXTX;
+  }
+
+  // Shifts are encoded in one bit, indicating a left shift by the memory
+  // access size.
+  DCHECK((shift_amount == 0) ||
+         (shift_amount == static_cast<unsigned>(CalcLSDataSize(PRFM))));
+
+  Emit(LoadStoreRegisterOffsetFixed | memop | Rm(addr.regoffset()) |
+       ExtendMode(ext) | ImmShiftLS((shift_amount > 0) ? 1 : 0));
+}
+
+void Assembler::prfm(PrefetchOperation prfop, const MemOperand& addr) {
+  // Restricted support for prfm, only register offset.
+  // This can probably be merged with Assembler::LoadStore as we expand support.
+  prfm(static_cast<int>(prfop), addr);
+}
+
 void Assembler::NEON3DifferentL(const VRegister& vd, const VRegister& vn,
                                 const VRegister& vm, NEON3DifferentOp vop) {
   DCHECK(AreSameFormat(vn, vm));
@@ -4308,6 +4339,7 @@ void Assembler::GrowBuffer() {
 void Assembler::RecordRelocInfo(RelocInfo::Mode rmode, intptr_t data,
                                 ConstantPoolMode constant_pool_mode) {
   if ((rmode == RelocInfo::INTERNAL_REFERENCE) ||
+      (rmode == RelocInfo::DATA_EMBEDDED_OBJECT) ||
       (rmode == RelocInfo::CONST_POOL) || (rmode == RelocInfo::VENEER_POOL) ||
       (rmode == RelocInfo::DEOPT_SCRIPT_OFFSET) ||
       (rmode == RelocInfo::DEOPT_INLINING_ID) ||
@@ -4316,6 +4348,7 @@ void Assembler::RecordRelocInfo(RelocInfo::Mode rmode, intptr_t data,
     DCHECK(RelocInfo::IsDeoptReason(rmode) || RelocInfo::IsDeoptId(rmode) ||
            RelocInfo::IsDeoptPosition(rmode) ||
            RelocInfo::IsInternalReference(rmode) ||
+           RelocInfo::IsDataEmbeddedObject(rmode) ||
            RelocInfo::IsConstPool(rmode) || RelocInfo::IsVeneerPool(rmode));
     // These modes do not need an entry in the constant pool.
   } else if (constant_pool_mode == NEEDS_POOL_ENTRY) {
diff --git a/deps/v8/src/codegen/arm64/assembler-arm64.h b/deps/v8/src/codegen/arm64/assembler-arm64.h
index f787bad464f82d..41bdb03b4f5a57 100644
--- a/deps/v8/src/codegen/arm64/assembler-arm64.h
+++ b/deps/v8/src/codegen/arm64/assembler-arm64.h
@@ -27,6 +27,7 @@
 #endif
 
 #if defined(V8_OS_WIN)
+#include "src/base/platform/wrappers.h"
 #include "src/diagnostics/unwinding-info-win64.h"
 #endif  // V8_OS_WIN
 
@@ -879,6 +880,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // Store-release exclusive half-word.
   void stlxrh(const Register& rs, const Register& rt, const Register& rn);
 
+  void prfm(int prfop, const MemOperand& addr);
+  void prfm(PrefetchOperation prfop, const MemOperand& addr);
+
   // Move instructions. The default shift of -1 indicates that the move
   // instruction will calculate an appropriate 16-bit immediate and left shift
   // that is equal to the 64-bit immediate argument. If an explicit left shift
@@ -2062,10 +2066,31 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void debug(const char* message, uint32_t code, Instr params = BREAK);
 
   // Required by V8.
-  void dd(uint32_t data) { dc32(data); }
   void db(uint8_t data) { dc8(data); }
-  void dq(uint64_t data) { dc64(data); }
-  void dp(uintptr_t data) { dc64(data); }
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    BlockPoolsScope no_pool_scope(this);
+    if (!RelocInfo::IsNone(rmode)) {
+      DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+      RecordRelocInfo(rmode);
+    }
+    dc32(data);
+  }
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    BlockPoolsScope no_pool_scope(this);
+    if (!RelocInfo::IsNone(rmode)) {
+      DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+      RecordRelocInfo(rmode);
+    }
+    dc64(data);
+  }
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    BlockPoolsScope no_pool_scope(this);
+    if (!RelocInfo::IsNone(rmode)) {
+      DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+      RecordRelocInfo(rmode);
+    }
+    dc64(data);
+  }
 
   // Code generation helpers --------------------------------------------------
 
@@ -2394,7 +2419,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
 
   using BlockConstPoolScope = ConstantPool::BlockScope;
 
-  class BlockPoolsScope {
+  class V8_NODISCARD BlockPoolsScope {
    public:
     // Block veneer and constant pool. Emits pools if necessary to ensure that
     // {margin} more bytes can be emitted without triggering pool emission.
@@ -2589,7 +2614,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
     STATIC_ASSERT(sizeof(instruction) == kInstrSize);
     DCHECK_LE(pc_ + sizeof(instruction), buffer_start_ + buffer_->size());
 
-    memcpy(pc_, &instruction, sizeof(instruction));
+    base::Memcpy(pc_, &instruction, sizeof(instruction));
     pc_ += sizeof(instruction);
     CheckBuffer();
   }
@@ -2601,7 +2626,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
 
     // TODO(all): Somehow register we have some data here. Then we can
     // disassemble it correctly.
-    memcpy(pc_, data, size);
+    base::Memcpy(pc_, data, size);
     pc_ += size;
     CheckBuffer();
   }
diff --git a/deps/v8/src/codegen/arm64/constants-arm64.h b/deps/v8/src/codegen/arm64/constants-arm64.h
index 52790b9faf4a87..940216fc9447a3 100644
--- a/deps/v8/src/codegen/arm64/constants-arm64.h
+++ b/deps/v8/src/codegen/arm64/constants-arm64.h
@@ -159,6 +159,9 @@ using float16 = uint16_t;
                         /* store second source.      */ \
   V_(Rs, 20, 16, Bits)  /* Store-exclusive status    */ \
   V_(PrefetchMode, 4, 0, Bits)                          \
+  V_(PrefetchHint, 4, 3, Bits)                          \
+  V_(PrefetchTarget, 2, 1, Bits)                        \
+  V_(PrefetchStream, 0, 0, Bits)                        \
                                                         \
   /* Common bits */                                     \
   V_(SixtyFourBits, 31, 31, Bits)                       \
@@ -216,6 +219,7 @@ using float16 = uint16_t;
   V_(LSOpc, 23, 22, Bits)                               \
   V_(LSVector, 26, 26, Bits)                            \
   V_(LSSize, 31, 30, Bits)                              \
+  V_(ImmPrefetchOperation, 4, 0, Bits)                  \
                                                         \
   /* NEON generic fields */                             \
   V_(NEONQ, 30, 30, Bits)                               \
@@ -443,6 +447,27 @@ enum SystemRegister {
          ImmSystemRegister_offset
 };
 
+enum PrefetchOperation {
+  PLDL1KEEP = 0x00,
+  PLDL1STRM = 0x01,
+  PLDL2KEEP = 0x02,
+  PLDL2STRM = 0x03,
+  PLDL3KEEP = 0x04,
+  PLDL3STRM = 0x05,
+  PLIL1KEEP = 0x08,
+  PLIL1STRM = 0x09,
+  PLIL2KEEP = 0x0a,
+  PLIL2STRM = 0x0b,
+  PLIL3KEEP = 0x0c,
+  PLIL3STRM = 0x0d,
+  PSTL1KEEP = 0x10,
+  PSTL1STRM = 0x11,
+  PSTL2KEEP = 0x12,
+  PSTL2STRM = 0x13,
+  PSTL3KEEP = 0x14,
+  PSTL3STRM = 0x15,
+};
+
 // Instruction enumerations.
 //
 // These are the masks that define a class of instructions, and the list of
diff --git a/deps/v8/src/codegen/arm64/instructions-arm64-constants.cc b/deps/v8/src/codegen/arm64/instructions-arm64-constants.cc
index 5c0d42a8c63373..1a88cebe0fa662 100644
--- a/deps/v8/src/codegen/arm64/instructions-arm64-constants.cc
+++ b/deps/v8/src/codegen/arm64/instructions-arm64-constants.cc
@@ -3,52 +3,79 @@
 // found in the LICENSE file.
 
 #include <cstdint>
+
 #include "include/v8config.h"
 #include "src/base/macros.h"
+#include "src/codegen/arm64/constants-arm64.h"
 
 namespace v8 {
 namespace internal {
 
 // ISA constants. --------------------------------------------------------------
 
-// The following code initializes float/double variables with bit patterns
-// without using static initializers (which is surprisingly difficult in
-// C++).  These variables are used by client code as extern float16,
-// extern float and extern double types, which works because (I think) the
-// linker ignores the types.  This is kept in a separate source file to
-// avoid breaking jumbo builds.
+// The following code initializes float/double variables with bit patterns.
 //
 // TODO(mostynb): replace these with std::numeric_limits constexpr's where
 // possible, and figure out how to replace *DefaultNaN with something clean,
 // then move this code back into instructions-arm64.cc with the same types
 // that client code uses.
 
-#if defined(V8_OS_WIN)
-extern "C" {
-#endif
-
-extern const uint16_t kFP16PositiveInfinity = 0x7C00;
-extern const uint16_t kFP16NegativeInfinity = 0xFC00;
-V8_EXPORT_PRIVATE extern const uint32_t kFP32PositiveInfinity = 0x7F800000;
-V8_EXPORT_PRIVATE extern const uint32_t kFP32NegativeInfinity = 0xFF800000;
-V8_EXPORT_PRIVATE extern const uint64_t kFP64PositiveInfinity =
-    0x7FF0000000000000UL;
-V8_EXPORT_PRIVATE extern const uint64_t kFP64NegativeInfinity =
-    0xFFF0000000000000UL;
+namespace integer_constants {
+constexpr uint16_t kFP16PositiveInfinity = 0x7C00;
+constexpr uint16_t kFP16NegativeInfinity = 0xFC00;
+constexpr uint32_t kFP32PositiveInfinity = 0x7F800000;
+constexpr uint32_t kFP32NegativeInfinity = 0xFF800000;
+constexpr uint64_t kFP64PositiveInfinity = 0x7FF0000000000000UL;
+constexpr uint64_t kFP64NegativeInfinity = 0xFFF0000000000000UL;
 
 // This value is a signalling NaN as both a double and as a float (taking the
 // least-significant word).
-V8_EXPORT_PRIVATE extern const uint64_t kFP64SignallingNaN = 0x7FF000007F800001;
-V8_EXPORT_PRIVATE extern const uint32_t kFP32SignallingNaN = 0x7F800001;
+constexpr uint64_t kFP64SignallingNaN = 0x7FF000007F800001;
+constexpr uint32_t kFP32SignallingNaN = 0x7F800001;
 
 // A similar value, but as a quiet NaN.
-V8_EXPORT_PRIVATE extern const uint64_t kFP64QuietNaN = 0x7FF800007FC00001;
-V8_EXPORT_PRIVATE extern const uint32_t kFP32QuietNaN = 0x7FC00001;
+constexpr uint64_t kFP64QuietNaN = 0x7FF800007FC00001;
+constexpr uint32_t kFP32QuietNaN = 0x7FC00001;
 
 // The default NaN values (for FPCR.DN=1).
-V8_EXPORT_PRIVATE extern const uint64_t kFP64DefaultNaN = 0x7FF8000000000000UL;
-V8_EXPORT_PRIVATE extern const uint32_t kFP32DefaultNaN = 0x7FC00000;
+constexpr uint64_t kFP64DefaultNaN = 0x7FF8000000000000UL;
+constexpr uint32_t kFP32DefaultNaN = 0x7FC00000;
 extern const uint16_t kFP16DefaultNaN = 0x7E00;
+}  // namespace integer_constants
+
+#if defined(V8_OS_WIN)
+extern "C" {
+#endif
+
+extern const float16 kFP16PositiveInfinity =
+    bit_cast<float16>(integer_constants::kFP16PositiveInfinity);
+extern const float16 kFP16NegativeInfinity =
+    bit_cast<float16>(integer_constants::kFP16NegativeInfinity);
+V8_EXPORT_PRIVATE extern const float kFP32PositiveInfinity =
+    bit_cast<float>(integer_constants::kFP32PositiveInfinity);
+V8_EXPORT_PRIVATE extern const float kFP32NegativeInfinity =
+    bit_cast<float>(integer_constants::kFP32NegativeInfinity);
+V8_EXPORT_PRIVATE extern const double kFP64PositiveInfinity =
+    bit_cast<double>(integer_constants::kFP64PositiveInfinity);
+V8_EXPORT_PRIVATE extern const double kFP64NegativeInfinity =
+    bit_cast<double>(integer_constants::kFP64NegativeInfinity);
+
+V8_EXPORT_PRIVATE extern const double kFP64SignallingNaN =
+    bit_cast<double>(integer_constants::kFP64SignallingNaN);
+V8_EXPORT_PRIVATE extern const float kFP32SignallingNaN =
+    bit_cast<float>(integer_constants::kFP32SignallingNaN);
+
+V8_EXPORT_PRIVATE extern const double kFP64QuietNaN =
+    bit_cast<double>(integer_constants::kFP64QuietNaN);
+V8_EXPORT_PRIVATE extern const float kFP32QuietNaN =
+    bit_cast<float>(integer_constants::kFP32QuietNaN);
+
+V8_EXPORT_PRIVATE extern const double kFP64DefaultNaN =
+    bit_cast<double>(integer_constants::kFP64DefaultNaN);
+V8_EXPORT_PRIVATE extern const float kFP32DefaultNaN =
+    bit_cast<float>(integer_constants::kFP32DefaultNaN);
+extern const float16 kFP16DefaultNaN =
+    bit_cast<float16>(integer_constants::kFP16DefaultNaN);
 
 #if defined(V8_OS_WIN)
 }  // end of extern "C"
diff --git a/deps/v8/src/codegen/arm64/interface-descriptors-arm64.cc b/deps/v8/src/codegen/arm64/interface-descriptors-arm64.cc
index f7bccfdbe251e5..fa237701993665 100644
--- a/deps/v8/src/codegen/arm64/interface-descriptors-arm64.cc
+++ b/deps/v8/src/codegen/arm64/interface-descriptors-arm64.cc
@@ -34,6 +34,18 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {x0, x1, x2, x3, cp};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   const Register default_stub_registers[] = {x0, x1, x2, x3, x4};
diff --git a/deps/v8/src/codegen/arm64/macro-assembler-arm64.cc b/deps/v8/src/codegen/arm64/macro-assembler-arm64.cc
index 69242484bc723d..69db6d7c0c324e 100644
--- a/deps/v8/src/codegen/arm64/macro-assembler-arm64.cc
+++ b/deps/v8/src/codegen/arm64/macro-assembler-arm64.cc
@@ -27,6 +27,7 @@
 // Satisfy cpplint check, but don't include platform-specific header. It is
 // included recursively via macro-assembler.h.
 #if 0
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/arm64/macro-assembler-arm64.h"
 #endif
 
@@ -372,7 +373,7 @@ void TurboAssembler::Movi32bitHelper(const VRegister& vd, uint64_t imm) {
   DCHECK(is_uint32(imm));
 
   uint8_t bytes[sizeof(imm)];
-  memcpy(bytes, &imm, sizeof(imm));
+  base::Memcpy(bytes, &imm, sizeof(imm));
 
   // All bytes are either 0x00 or 0xFF.
   {
@@ -2014,14 +2015,19 @@ bool TurboAssembler::IsNearCallOffset(int64_t offset) {
 
 void TurboAssembler::CallForDeoptimization(
     Builtins::Name target, int deopt_id, Label* exit, DeoptimizeKind kind,
-    Label* jump_deoptimization_entry_label) {
+    Label* ret, Label* jump_deoptimization_entry_label) {
   BlockPoolsScope scope(this);
   bl(jump_deoptimization_entry_label);
   DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    b(ret);
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+  }
 }
 
 void TurboAssembler::PrepareForTailCall(Register callee_args_count,
@@ -2663,7 +2669,7 @@ void MacroAssembler::CompareObjectType(Register object, Register map,
   CompareInstanceType(map, type_reg, type);
 }
 
-void MacroAssembler::LoadMap(Register dst, Register object) {
+void TurboAssembler::LoadMap(Register dst, Register object) {
   LoadTaggedPointerField(dst, FieldMemOperand(object, HeapObject::kMapOffset));
 }
 
@@ -2876,23 +2882,22 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Operand offset,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Operand offset, RememberedSetAction remembered_set_action,
     SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, offset, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, offset, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Operand offset, RememberedSetAction remembered_set_action,
     SaveFPRegsMode fp_mode, Address wasm_target) {
   CallRecordWriteStub(object, offset, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Operand offset, RememberedSetAction remembered_set_action,
-    SaveFPRegsMode fp_mode, Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    SaveFPRegsMode fp_mode, int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
   // TODO(albertnetymk): For now we ignore remembered_set_action and fp_mode,
   // i.e. always emit remember set and save FP registers in RecordWriteStub. If
   // large performance regression is observed, we should use these values to
@@ -2916,9 +2921,13 @@ void TurboAssembler::CallRecordWriteStub(
 
   Mov(remembered_set_parameter, Smi::FromEnum(remembered_set_action));
   Mov(fp_mode_parameter, Smi::FromEnum(fp_mode));
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     Call(wasm_target, RelocInfo::WASM_STUB_CALL);
+  } else if (options().inline_offheap_trampolines) {
+    CallBuiltin(builtin_index);
   } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
diff --git a/deps/v8/src/codegen/arm64/macro-assembler-arm64.h b/deps/v8/src/codegen/arm64/macro-assembler-arm64.h
index b453a17394974f..88e1502ef99fc0 100644
--- a/deps/v8/src/codegen/arm64/macro-assembler-arm64.h
+++ b/deps/v8/src/codegen/arm64/macro-assembler-arm64.h
@@ -931,6 +931,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   inline void JumpIfEqual(Register x, int32_t y, Label* dest);
   inline void JumpIfLessThan(Register x, int32_t y, Label* dest);
 
+  void LoadMap(Register dst, Register object);
+
   inline void Fmov(VRegister fd, VRegister fn);
   inline void Fmov(VRegister fd, Register rn);
   // Provide explicit double and float interfaces for FP immediate moves, rather
@@ -987,7 +989,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void StoreReturnAddressAndCall(Register target);
 
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   // Calls a C function.
@@ -1300,6 +1302,10 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
     DCHECK(allow_macro_instructions());
     cmeq(vd, vn, imm);
   }
+  void Cmlt(const VRegister& vd, const VRegister& vn, int imm) {
+    DCHECK(allow_macro_instructions());
+    cmlt(vd, vn, imm);
+  }
 
   inline void Neg(const Register& rd, const Operand& operand);
   inline void Negs(const Register& rd, const Operand& operand);
@@ -1434,7 +1440,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallRecordWriteStub(Register object, Operand offset,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 };
 
@@ -1548,10 +1554,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
     DCHECK(allow_macro_instructions());
     cmle(vd, vn, imm);
   }
-  void Cmlt(const VRegister& vd, const VRegister& vn, int imm) {
-    DCHECK(allow_macro_instructions());
-    cmlt(vd, vn, imm);
-  }
 
   void Ld1(const VRegister& vt, const MemOperand& src) {
     DCHECK(allow_macro_instructions());
@@ -1966,8 +1968,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   void LeaveExitFrame(bool save_doubles, const Register& scratch,
                       const Register& scratch2);
 
-  void LoadMap(Register dst, Register object);
-
   // Load the global proxy from the current context.
   void LoadGlobalProxy(Register dst);
 
@@ -2022,7 +2022,7 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
 // instructions. This scope prevents the MacroAssembler from being called and
 // literal pools from being emitted. It also asserts the number of instructions
 // emitted is what you specified when creating the scope.
-class InstructionAccurateScope {
+class V8_NODISCARD InstructionAccurateScope {
  public:
   explicit InstructionAccurateScope(TurboAssembler* tasm, size_t count = 0)
       : tasm_(tasm),
@@ -2072,7 +2072,7 @@ class InstructionAccurateScope {
 // original state, even if the lists were modified by some other means. Note
 // that this scope can be nested but the destructors need to run in the opposite
 // order as the constructors. We do not have assertions for this.
-class UseScratchRegisterScope {
+class V8_NODISCARD UseScratchRegisterScope {
  public:
   explicit UseScratchRegisterScope(TurboAssembler* tasm)
       : available_(tasm->TmpList()),
diff --git a/deps/v8/src/codegen/arm64/register-arm64.h b/deps/v8/src/codegen/arm64/register-arm64.h
index 31620ae9658f2f..fbbb0a18dadf8f 100644
--- a/deps/v8/src/codegen/arm64/register-arm64.h
+++ b/deps/v8/src/codegen/arm64/register-arm64.h
@@ -524,8 +524,6 @@ using Simd128Register = VRegister;
 // Lists of registers.
 class V8_EXPORT_PRIVATE CPURegList {
  public:
-  CPURegList() = default;
-
   template <typename... CPURegisters>
   explicit CPURegList(CPURegister reg0, CPURegisters... regs)
       : list_(CPURegister::ListOf(reg0, regs...)),
diff --git a/deps/v8/src/codegen/assembler.h b/deps/v8/src/codegen/assembler.h
index 626bd04bc8ba7d..751799127d2534 100644
--- a/deps/v8/src/codegen/assembler.h
+++ b/deps/v8/src/codegen/assembler.h
@@ -388,7 +388,7 @@ class V8_EXPORT_PRIVATE AssemblerBase : public Malloced {
 };
 
 // Avoids emitting debug code during the lifetime of this scope object.
-class DontEmitDebugCodeScope {
+class V8_NODISCARD DontEmitDebugCodeScope {
  public:
   explicit DontEmitDebugCodeScope(AssemblerBase* assembler)
       : assembler_(assembler), old_value_(assembler->emit_debug_code()) {
@@ -402,7 +402,7 @@ class DontEmitDebugCodeScope {
 };
 
 // Enable a specified feature within a scope.
-class V8_EXPORT_PRIVATE CpuFeatureScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD CpuFeatureScope {
  public:
   enum CheckPolicy {
     kCheckSupported,
diff --git a/deps/v8/src/codegen/bailout-reason.h b/deps/v8/src/codegen/bailout-reason.h
index 267beb55e387cb..c26ae026f5a7c3 100644
--- a/deps/v8/src/codegen/bailout-reason.h
+++ b/deps/v8/src/codegen/bailout-reason.h
@@ -10,80 +10,81 @@
 namespace v8 {
 namespace internal {
 
-#define ABORT_MESSAGES_LIST(V)                                                \
-  V(kNoReason, "no reason")                                                   \
-                                                                              \
-  V(k32BitValueInRegisterIsNotZeroExtended,                                   \
-    "32 bit value in register is not zero-extended")                          \
-  V(kAPICallReturnedInvalidObject, "API call returned invalid object")        \
-  V(kAllocatingNonEmptyPackedArray, "Allocating non-empty packed array")      \
-  V(kAllocationIsNotDoubleAligned, "Allocation is not double aligned")        \
-  V(kExpectedOptimizationSentinel,                                            \
-    "Expected optimized code cell or optimization sentinel")                  \
-  V(kExpectedUndefinedOrCell, "Expected undefined or cell in register")       \
-  V(kFunctionDataShouldBeBytecodeArrayOnInterpreterEntry,                     \
-    "The function_data field should be a BytecodeArray on interpreter entry") \
-  V(kInputStringTooLong, "Input string too long")                             \
-  V(kInvalidBytecode, "Invalid bytecode")                                     \
-  V(kInvalidBytecodeAdvance, "Cannot advance current bytecode, ")             \
-  V(kInvalidHandleScopeLevel, "Invalid HandleScope level")                    \
-  V(kInvalidJumpTableIndex, "Invalid jump table index")                       \
-  V(kInvalidParametersAndRegistersInGenerator,                                \
-    "invalid parameters and registers in generator")                          \
-  V(kMissingBytecodeArray, "Missing bytecode array from function")            \
-  V(kObjectNotTagged, "The object is not tagged")                             \
-  V(kObjectTagged, "The object is tagged")                                    \
-  V(kOffsetOutOfRange, "Offset out of range")                                 \
-  V(kOperandIsASmi, "Operand is a smi")                                       \
-  V(kOperandIsASmiAndNotABoundFunction,                                       \
-    "Operand is a smi and not a bound function")                              \
-  V(kOperandIsASmiAndNotAConstructor,                                         \
-    "Operand is a smi and not a constructor")                                 \
-  V(kOperandIsASmiAndNotAFunction, "Operand is a smi and not a function")     \
-  V(kOperandIsASmiAndNotAGeneratorObject,                                     \
-    "Operand is a smi and not a generator object")                            \
-  V(kOperandIsNotABoundFunction, "Operand is not a bound function")           \
-  V(kOperandIsNotAConstructor, "Operand is not a constructor")                \
-  V(kOperandIsNotAFixedArray, "Operand is not a fixed array")                 \
-  V(kOperandIsNotAFunction, "Operand is not a function")                      \
-  V(kOperandIsNotAGeneratorObject, "Operand is not a generator object")       \
-  V(kOperandIsNotASmi, "Operand is not a smi")                                \
-  V(kPromiseAlreadySettled, "Promise already settled")                        \
-  V(kReceivedInvalidReturnAddress, "Received invalid return address")         \
-  V(kRegisterDidNotMatchExpectedRoot, "Register did not match expected root") \
-  V(kReturnAddressNotFoundInFrame, "Return address not found in frame")       \
-  V(kShouldNotDirectlyEnterOsrFunction,                                       \
-    "Should not directly enter OSR-compiled function")                        \
-  V(kStackAccessBelowStackPointer, "Stack access below stack pointer")        \
-  V(kStackFrameTypesMustMatch, "Stack frame types must match")                \
-  V(kUnalignedCellInWriteBarrier, "Unaligned cell in write barrier")          \
-  V(kUnexpectedAdditionalPopValue, "Unexpected additional pop value")         \
-  V(kUnexpectedElementsKindInArrayConstructor,                                \
-    "Unexpected ElementsKind in array constructor")                           \
-  V(kUnexpectedFPCRMode, "Unexpected FPCR mode.")                             \
-  V(kUnexpectedFunctionIDForInvokeIntrinsic,                                  \
-    "Unexpected runtime function id for the InvokeIntrinsic bytecode")        \
-  V(kUnexpectedInitialMapForArrayFunction,                                    \
-    "Unexpected initial map for Array function")                              \
-  V(kUnexpectedLevelAfterReturnFromApiCall,                                   \
-    "Unexpected level after return from api call")                            \
-  V(kUnexpectedNegativeValue, "Unexpected negative value")                    \
-  V(kUnexpectedReturnFromFrameDropper,                                        \
-    "Unexpectedly returned from dropping frames")                             \
-  V(kUnexpectedReturnFromThrow, "Unexpectedly returned from a throw")         \
-  V(kUnexpectedReturnFromWasmTrap,                                            \
-    "Should not return after throwing a wasm trap")                           \
-  V(kUnexpectedStackPointer, "The stack pointer is not the expected value")   \
-  V(kUnexpectedValue, "Unexpected value")                                     \
-  V(kUnsupportedModuleOperation, "Unsupported module operation")              \
-  V(kUnsupportedNonPrimitiveCompare, "Unsupported non-primitive compare")     \
-  V(kWrongAddressOrValuePassedToRecordWrite,                                  \
-    "Wrong address or value passed to RecordWrite")                           \
-  V(kWrongArgumentCountForInvokeIntrinsic,                                    \
-    "Wrong number of arguments for intrinsic")                                \
-  V(kWrongFunctionCodeStart, "Wrong value in code start register passed")     \
-  V(kWrongFunctionContext, "Wrong context passed to function")                \
-  V(kUnexpectedThreadInWasmSet, "thread_in_wasm flag was already set")        \
+#define ABORT_MESSAGES_LIST(V)                                                 \
+  V(kNoReason, "no reason")                                                    \
+                                                                               \
+  V(k32BitValueInRegisterIsNotZeroExtended,                                    \
+    "32 bit value in register is not zero-extended")                           \
+  V(kAPICallReturnedInvalidObject, "API call returned invalid object")         \
+  V(kAllocatingNonEmptyPackedArray, "Allocating non-empty packed array")       \
+  V(kAllocationIsNotDoubleAligned, "Allocation is not double aligned")         \
+  V(kExpectedOptimizationSentinel,                                             \
+    "Expected optimized code cell or optimization sentinel")                   \
+  V(kExpectedUndefinedOrCell, "Expected undefined or cell in register")        \
+  V(kFunctionDataShouldBeBytecodeArrayOnInterpreterEntry,                      \
+    "The function_data field should be a BytecodeArray on interpreter entry")  \
+  V(kInputStringTooLong, "Input string too long")                              \
+  V(kInvalidBytecode, "Invalid bytecode")                                      \
+  V(kInvalidBytecodeAdvance, "Cannot advance current bytecode, ")              \
+  V(kInvalidHandleScopeLevel, "Invalid HandleScope level")                     \
+  V(kInvalidJumpTableIndex, "Invalid jump table index")                        \
+  V(kInvalidParametersAndRegistersInGenerator,                                 \
+    "invalid parameters and registers in generator")                           \
+  V(kMissingBytecodeArray, "Missing bytecode array from function")             \
+  V(kObjectNotTagged, "The object is not tagged")                              \
+  V(kObjectTagged, "The object is tagged")                                     \
+  V(kOffsetOutOfRange, "Offset out of range")                                  \
+  V(kOperandIsASmi, "Operand is a smi")                                        \
+  V(kOperandIsASmiAndNotABoundFunction,                                        \
+    "Operand is a smi and not a bound function")                               \
+  V(kOperandIsASmiAndNotAConstructor,                                          \
+    "Operand is a smi and not a constructor")                                  \
+  V(kOperandIsASmiAndNotAFunction, "Operand is a smi and not a function")      \
+  V(kOperandIsASmiAndNotAGeneratorObject,                                      \
+    "Operand is a smi and not a generator object")                             \
+  V(kOperandIsNotABoundFunction, "Operand is not a bound function")            \
+  V(kOperandIsNotAConstructor, "Operand is not a constructor")                 \
+  V(kOperandIsNotAFixedArray, "Operand is not a fixed array")                  \
+  V(kOperandIsNotAFunction, "Operand is not a function")                       \
+  V(kOperandIsNotAGeneratorObject, "Operand is not a generator object")        \
+  V(kOperandIsNotASmi, "Operand is not a smi")                                 \
+  V(kPromiseAlreadySettled, "Promise already settled")                         \
+  V(kReceivedInvalidReturnAddress, "Received invalid return address")          \
+  V(kRegisterDidNotMatchExpectedRoot, "Register did not match expected root")  \
+  V(kReturnAddressNotFoundInFrame, "Return address not found in frame")        \
+  V(kShouldNotDirectlyEnterOsrFunction,                                        \
+    "Should not directly enter OSR-compiled function")                         \
+  V(kStackAccessBelowStackPointer, "Stack access below stack pointer")         \
+  V(kStackFrameTypesMustMatch, "Stack frame types must match")                 \
+  V(kUnalignedCellInWriteBarrier, "Unaligned cell in write barrier")           \
+  V(kUnexpectedAdditionalPopValue, "Unexpected additional pop value")          \
+  V(kUnexpectedDynamicCheckMapsStatus, "Unexpected dynamic map checks status") \
+  V(kUnexpectedElementsKindInArrayConstructor,                                 \
+    "Unexpected ElementsKind in array constructor")                            \
+  V(kUnexpectedFPCRMode, "Unexpected FPCR mode.")                              \
+  V(kUnexpectedFunctionIDForInvokeIntrinsic,                                   \
+    "Unexpected runtime function id for the InvokeIntrinsic bytecode")         \
+  V(kUnexpectedInitialMapForArrayFunction,                                     \
+    "Unexpected initial map for Array function")                               \
+  V(kUnexpectedLevelAfterReturnFromApiCall,                                    \
+    "Unexpected level after return from api call")                             \
+  V(kUnexpectedNegativeValue, "Unexpected negative value")                     \
+  V(kUnexpectedReturnFromFrameDropper,                                         \
+    "Unexpectedly returned from dropping frames")                              \
+  V(kUnexpectedReturnFromThrow, "Unexpectedly returned from a throw")          \
+  V(kUnexpectedReturnFromWasmTrap,                                             \
+    "Should not return after throwing a wasm trap")                            \
+  V(kUnexpectedStackPointer, "The stack pointer is not the expected value")    \
+  V(kUnexpectedValue, "Unexpected value")                                      \
+  V(kUnsupportedModuleOperation, "Unsupported module operation")               \
+  V(kUnsupportedNonPrimitiveCompare, "Unsupported non-primitive compare")      \
+  V(kWrongAddressOrValuePassedToRecordWrite,                                   \
+    "Wrong address or value passed to RecordWrite")                            \
+  V(kWrongArgumentCountForInvokeIntrinsic,                                     \
+    "Wrong number of arguments for intrinsic")                                 \
+  V(kWrongFunctionCodeStart, "Wrong value in code start register passed")      \
+  V(kWrongFunctionContext, "Wrong context passed to function")                 \
+  V(kUnexpectedThreadInWasmSet, "thread_in_wasm flag was already set")         \
   V(kUnexpectedThreadInWasmUnset, "thread_in_wasm flag was not set")
 
 #define BAILOUT_MESSAGES_LIST(V)                                            \
diff --git a/deps/v8/src/codegen/code-stub-assembler.cc b/deps/v8/src/codegen/code-stub-assembler.cc
index ca340c69c83eae..8957ca3952e20e 100644
--- a/deps/v8/src/codegen/code-stub-assembler.cc
+++ b/deps/v8/src/codegen/code-stub-assembler.cc
@@ -292,7 +292,7 @@ TNode<RawPtrT> CodeStubAssembler::IntPtrOrSmiConstant<RawPtrT>(int value) {
 bool CodeStubAssembler::TryGetIntPtrOrSmiConstantValue(
     TNode<Smi> maybe_constant, int* value) {
   Smi smi_constant;
-  if (ToSmiConstant(maybe_constant, &smi_constant)) {
+  if (TryToSmiConstant(maybe_constant, &smi_constant)) {
     *value = Smi::ToInt(smi_constant);
     return true;
   }
@@ -302,10 +302,10 @@ bool CodeStubAssembler::TryGetIntPtrOrSmiConstantValue(
 bool CodeStubAssembler::TryGetIntPtrOrSmiConstantValue(
     TNode<IntPtrT> maybe_constant, int* value) {
   int32_t int32_constant;
-    if (ToInt32Constant(maybe_constant, &int32_constant)) {
-      *value = int32_constant;
-      return true;
-    }
+  if (TryToInt32Constant(maybe_constant, &int32_constant)) {
+    *value = int32_constant;
+    return true;
+  }
   return false;
 }
 
@@ -322,7 +322,7 @@ TNode<IntPtrT> CodeStubAssembler::IntPtrRoundUpToPowerOfTwo32(
 
 TNode<BoolT> CodeStubAssembler::WordIsPowerOfTwo(SloppyTNode<IntPtrT> value) {
   intptr_t constant;
-  if (ToIntPtrConstant(value, &constant)) {
+  if (TryToIntPtrConstant(value, &constant)) {
     return BoolConstant(base::bits::IsPowerOfTwo(constant));
   }
   // value && !(value & (value - 1))
@@ -628,7 +628,7 @@ TNode<Smi> CodeStubAssembler::SmiFromUint32(TNode<Uint32T> value) {
 
 TNode<BoolT> CodeStubAssembler::IsValidPositiveSmi(TNode<IntPtrT> value) {
   intptr_t constant_value;
-  if (ToIntPtrConstant(value, &constant_value)) {
+  if (TryToIntPtrConstant(value, &constant_value)) {
     return (static_cast<uintptr_t>(constant_value) <=
             static_cast<uintptr_t>(Smi::kMaxValue))
                ? Int32TrueConstant()
@@ -640,7 +640,8 @@ TNode<BoolT> CodeStubAssembler::IsValidPositiveSmi(TNode<IntPtrT> value) {
 
 TNode<Smi> CodeStubAssembler::SmiTag(SloppyTNode<IntPtrT> value) {
   int32_t constant_value;
-  if (ToInt32Constant(value, &constant_value) && Smi::IsValid(constant_value)) {
+  if (TryToInt32Constant(value, &constant_value) &&
+      Smi::IsValid(constant_value)) {
     return SmiConstant(constant_value);
   }
   if (COMPRESS_POINTERS_BOOL) {
@@ -653,7 +654,7 @@ TNode<Smi> CodeStubAssembler::SmiTag(SloppyTNode<IntPtrT> value) {
 
 TNode<IntPtrT> CodeStubAssembler::SmiUntag(SloppyTNode<Smi> value) {
   intptr_t constant_value;
-  if (ToIntPtrConstant(value, &constant_value)) {
+  if (TryToIntPtrConstant(value, &constant_value)) {
     return IntPtrConstant(constant_value >> (kSmiShiftSize + kSmiTagSize));
   }
   TNode<IntPtrT> raw_bits = BitcastTaggedToWordForTagAndSmiBits(value);
@@ -1086,7 +1087,7 @@ TNode<HeapObject> CodeStubAssembler::AllocateRaw(TNode<IntPtrT> size_in_bytes,
 
   intptr_t size_in_bytes_constant;
   bool size_in_bytes_is_constant = false;
-  if (ToIntPtrConstant(size_in_bytes, &size_in_bytes_constant)) {
+  if (TryToIntPtrConstant(size_in_bytes, &size_in_bytes_constant)) {
     size_in_bytes_is_constant = true;
     CHECK(Internals::IsValidSmi(size_in_bytes_constant));
     CHECK_GT(size_in_bytes_constant, 0);
@@ -1243,7 +1244,7 @@ TNode<HeapObject> CodeStubAssembler::Allocate(TNode<IntPtrT> size_in_bytes,
       !new_space || !allow_large_objects || FLAG_young_generation_large_objects;
   if (!allow_large_objects) {
     intptr_t size_constant;
-    if (ToIntPtrConstant(size_in_bytes, &size_constant)) {
+    if (TryToIntPtrConstant(size_in_bytes, &size_constant)) {
       CHECK_LE(size_constant, kMaxRegularHeapObjectSize);
     } else {
       CSA_ASSERT(this, IsRegularHeapObjectSize(size_in_bytes));
@@ -1589,10 +1590,26 @@ TNode<HeapObject> CodeStubAssembler::LoadSlowProperties(
     TNode<JSReceiver> object) {
   CSA_SLOW_ASSERT(this, IsDictionaryMap(LoadMap(object)));
   TNode<Object> properties = LoadJSReceiverPropertiesOrHash(object);
-  return Select<HeapObject>(
-      TaggedIsSmi(properties),
-      [=] { return EmptyPropertyDictionaryConstant(); },
-      [=] { return CAST(properties); });
+  NodeGenerator<HeapObject> make_empty = [=]() -> TNode<HeapObject> {
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      return EmptyOrderedPropertyDictionaryConstant();
+    } else {
+      return EmptyPropertyDictionaryConstant();
+    }
+  };
+  NodeGenerator<HeapObject> cast_properties = [=] {
+    TNode<HeapObject> dict = CAST(properties);
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      CSA_ASSERT(this, Word32Or(IsOrderedNameDictionary(dict),
+                                IsGlobalDictionary(dict)));
+    } else {
+      CSA_ASSERT(this,
+                 Word32Or(IsNameDictionary(dict), IsGlobalDictionary(dict)));
+    }
+    return dict;
+  };
+  return Select<HeapObject>(TaggedIsSmi(properties), make_empty,
+                            cast_properties);
 }
 
 TNode<Object> CodeStubAssembler::LoadJSArgumentsObjectLength(
@@ -1762,7 +1779,8 @@ TNode<IntPtrT> CodeStubAssembler::LoadJSReceiverIdentityHash(
     SloppyTNode<Object> receiver, Label* if_no_hash) {
   TVARIABLE(IntPtrT, var_hash);
   Label done(this), if_smi(this), if_property_array(this),
-      if_property_dictionary(this), if_fixed_array(this);
+      if_ordered_property_dictionary(this), if_property_dictionary(this),
+      if_fixed_array(this);
 
   TNode<Object> properties_or_hash =
       LoadObjectField(TNode<HeapObject>::UncheckedCast(receiver),
@@ -1775,6 +1793,11 @@ TNode<IntPtrT> CodeStubAssembler::LoadJSReceiverIdentityHash(
 
   GotoIf(InstanceTypeEqual(properties_instance_type, PROPERTY_ARRAY_TYPE),
          &if_property_array);
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    GotoIf(InstanceTypeEqual(properties_instance_type,
+                             ORDERED_NAME_DICTIONARY_TYPE),
+           &if_ordered_property_dictionary);
+  }
   Branch(InstanceTypeEqual(properties_instance_type, NAME_DICTIONARY_TYPE),
          &if_property_dictionary, &if_fixed_array);
 
@@ -1798,6 +1821,14 @@ TNode<IntPtrT> CodeStubAssembler::LoadJSReceiverIdentityHash(
         DecodeWord<PropertyArray::HashField>(length_and_hash));
     Goto(&done);
   }
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    BIND(&if_ordered_property_dictionary);
+    {
+      var_hash = SmiUntag(CAST(LoadFixedArrayElement(
+          CAST(properties), OrderedNameDictionary::HashIndex())));
+      Goto(&done);
+    }
+  }
 
   BIND(&if_property_dictionary);
   {
@@ -1816,19 +1847,19 @@ TNode<IntPtrT> CodeStubAssembler::LoadJSReceiverIdentityHash(
 }
 
 TNode<Uint32T> CodeStubAssembler::LoadNameHashAssumeComputed(TNode<Name> name) {
-  TNode<Uint32T> hash_field = LoadNameHashField(name);
+  TNode<Uint32T> hash_field = LoadNameRawHashField(name);
   CSA_ASSERT(this, IsClearWord32(hash_field, Name::kHashNotComputedMask));
   return Unsigned(Word32Shr(hash_field, Int32Constant(Name::kHashShift)));
 }
 
 TNode<Uint32T> CodeStubAssembler::LoadNameHash(TNode<Name> name,
                                                Label* if_hash_not_computed) {
-  TNode<Uint32T> hash_field = LoadNameHashField(name);
+  TNode<Uint32T> raw_hash_field = LoadNameRawHashField(name);
   if (if_hash_not_computed != nullptr) {
-    GotoIf(IsSetWord32(hash_field, Name::kHashNotComputedMask),
+    GotoIf(IsSetWord32(raw_hash_field, Name::kHashNotComputedMask),
            if_hash_not_computed);
   }
-  return Unsigned(Word32Shr(hash_field, Int32Constant(Name::kHashShift)));
+  return Unsigned(Word32Shr(raw_hash_field, Int32Constant(Name::kHashShift)));
 }
 
 TNode<Smi> CodeStubAssembler::LoadStringLengthAsSmi(TNode<String> string) {
@@ -2055,7 +2086,7 @@ void CodeStubAssembler::FixedArrayBoundsCheck(TNode<FixedArrayBase> array,
   DCHECK(IsAligned(additional_offset, kTaggedSize));
   TNode<Smi> effective_index;
   Smi constant_index;
-  bool index_is_constant = ToSmiConstant(index, &constant_index);
+  bool index_is_constant = TryToSmiConstant(index, &constant_index);
   if (index_is_constant) {
     effective_index = SmiConstant(Smi::ToInt(constant_index) +
                                   additional_offset / kTaggedSize);
@@ -2735,7 +2766,7 @@ void CodeStubAssembler::StoreObjectField(TNode<HeapObject> object,
                                          TNode<IntPtrT> offset,
                                          TNode<Object> value) {
   int const_offset;
-  if (ToInt32Constant(offset, &const_offset)) {
+  if (TryToInt32Constant(offset, &const_offset)) {
     StoreObjectField(object, const_offset, value);
   } else {
     Store(object, IntPtrSub(offset, IntPtrConstant(kHeapObjectTag)), value);
@@ -3206,7 +3237,7 @@ TNode<String> CodeStubAssembler::AllocateSeqOneByteString(
   StoreMapNoWriteBarrier(result, RootIndex::kOneByteStringMap);
   StoreObjectFieldNoWriteBarrier(result, SeqOneByteString::kLengthOffset,
                                  Uint32Constant(length));
-  StoreObjectFieldNoWriteBarrier(result, SeqOneByteString::kHashFieldOffset,
+  StoreObjectFieldNoWriteBarrier(result, SeqOneByteString::kRawHashFieldOffset,
                                  Int32Constant(String::kEmptyHashField));
   return CAST(result);
 }
@@ -3228,7 +3259,7 @@ TNode<String> CodeStubAssembler::AllocateSeqTwoByteString(
   StoreMapNoWriteBarrier(result, RootIndex::kStringMap);
   StoreObjectFieldNoWriteBarrier(result, SeqTwoByteString::kLengthOffset,
                                  Uint32Constant(length));
-  StoreObjectFieldNoWriteBarrier(result, SeqTwoByteString::kHashFieldOffset,
+  StoreObjectFieldNoWriteBarrier(result, SeqTwoByteString::kRawHashFieldOffset,
                                  Int32Constant(String::kEmptyHashField));
   return CAST(result);
 }
@@ -3242,7 +3273,7 @@ TNode<String> CodeStubAssembler::AllocateSlicedString(RootIndex map_root_index,
   TNode<HeapObject> result = Allocate(SlicedString::kSize);
   DCHECK(RootsTable::IsImmortalImmovable(map_root_index));
   StoreMapNoWriteBarrier(result, map_root_index);
-  StoreObjectFieldNoWriteBarrier(result, SlicedString::kHashFieldOffset,
+  StoreObjectFieldNoWriteBarrier(result, SlicedString::kRawHashFieldOffset,
                                  Int32Constant(String::kEmptyHashField));
   StoreObjectFieldNoWriteBarrier(result, SlicedString::kLengthOffset, length);
   StoreObjectFieldNoWriteBarrier(result, SlicedString::kParentOffset, parent);
@@ -3350,61 +3381,148 @@ TNode<NameDictionary> CodeStubAssembler::CopyNameDictionary(
 }
 
 template <typename CollectionType>
-TNode<CollectionType> CodeStubAssembler::AllocateOrderedHashTable() {
-  static const int kCapacity = CollectionType::kInitialCapacity;
-  static const int kBucketCount = kCapacity / CollectionType::kLoadFactor;
-  static const int kDataTableLength = kCapacity * CollectionType::kEntrySize;
-  static const int kFixedArrayLength =
-      CollectionType::HashTableStartIndex() + kBucketCount + kDataTableLength;
-  static const int kDataTableStartIndex =
-      CollectionType::HashTableStartIndex() + kBucketCount;
-
-  STATIC_ASSERT(base::bits::IsPowerOfTwo(kCapacity));
-  STATIC_ASSERT(kCapacity <= CollectionType::MaxCapacity());
+TNode<CollectionType> CodeStubAssembler::AllocateOrderedHashTable(
+    TNode<IntPtrT> capacity) {
+  capacity = IntPtrRoundUpToPowerOfTwo32(capacity);
+  capacity =
+      IntPtrMax(capacity, IntPtrConstant(CollectionType::kInitialCapacity));
+  return AllocateOrderedHashTableWithCapacity<CollectionType>(capacity);
+}
+
+template <typename CollectionType>
+TNode<CollectionType> CodeStubAssembler::AllocateOrderedHashTableWithCapacity(
+    TNode<IntPtrT> capacity) {
+  CSA_ASSERT(this, WordIsPowerOfTwo(capacity));
+  CSA_ASSERT(this,
+             IntPtrGreaterThanOrEqual(
+                 capacity, IntPtrConstant(CollectionType::kInitialCapacity)));
+  CSA_ASSERT(this,
+             IntPtrLessThanOrEqual(
+                 capacity, IntPtrConstant(CollectionType::MaxCapacity())));
+
+  STATIC_ASSERT(CollectionType::kLoadFactor == 2);
+  TNode<IntPtrT> bucket_count = Signed(WordShr(capacity, IntPtrConstant(1)));
+  TNode<IntPtrT> data_table_length =
+      IntPtrMul(capacity, IntPtrConstant(CollectionType::kEntrySize));
+
+  TNode<IntPtrT> data_table_start_index = IntPtrAdd(
+      IntPtrConstant(CollectionType::HashTableStartIndex()), bucket_count);
+  TNode<IntPtrT> fixed_array_length =
+      IntPtrAdd(data_table_start_index, data_table_length);
 
   // Allocate the table and add the proper map.
   const ElementsKind elements_kind = HOLEY_ELEMENTS;
-  TNode<IntPtrT> length_intptr = IntPtrConstant(kFixedArrayLength);
   TNode<Map> fixed_array_map =
       HeapConstant(CollectionType::GetMap(ReadOnlyRoots(isolate())));
   TNode<CollectionType> table =
-      CAST(AllocateFixedArray(elements_kind, length_intptr,
+      CAST(AllocateFixedArray(elements_kind, fixed_array_length,
                               kAllowLargeObjectAllocation, fixed_array_map));
 
-  // Initialize the OrderedHashTable fields.
+  Comment("Initialize the OrderedHashTable fields.");
   const WriteBarrierMode barrier_mode = SKIP_WRITE_BARRIER;
-  StoreFixedArrayElement(table, CollectionType::NumberOfElementsIndex(),
-                         SmiConstant(0), barrier_mode);
-  StoreFixedArrayElement(table, CollectionType::NumberOfDeletedElementsIndex(),
-                         SmiConstant(0), barrier_mode);
-  StoreFixedArrayElement(table, CollectionType::NumberOfBucketsIndex(),
-                         SmiConstant(kBucketCount), barrier_mode);
-
-  // Fill the buckets with kNotFound.
-  TNode<Smi> not_found = SmiConstant(CollectionType::kNotFound);
+  UnsafeStoreFixedArrayElement(table, CollectionType::NumberOfElementsIndex(),
+                               SmiConstant(0), barrier_mode);
+  UnsafeStoreFixedArrayElement(table,
+                               CollectionType::NumberOfDeletedElementsIndex(),
+                               SmiConstant(0), barrier_mode);
+  UnsafeStoreFixedArrayElement(table, CollectionType::NumberOfBucketsIndex(),
+                               SmiFromIntPtr(bucket_count), barrier_mode);
+
+  TNode<IntPtrT> object_address = BitcastTaggedToWord(table);
+
   STATIC_ASSERT(CollectionType::HashTableStartIndex() ==
                 CollectionType::NumberOfBucketsIndex() + 1);
-  STATIC_ASSERT((CollectionType::HashTableStartIndex() + kBucketCount) ==
-                kDataTableStartIndex);
-  for (int i = 0; i < kBucketCount; i++) {
-    StoreFixedArrayElement(table, CollectionType::HashTableStartIndex() + i,
-                           not_found, barrier_mode);
-  }
 
-  // Fill the data table with undefined.
-  STATIC_ASSERT(kDataTableStartIndex + kDataTableLength == kFixedArrayLength);
-  for (int i = 0; i < kDataTableLength; i++) {
-    StoreFixedArrayElement(table, kDataTableStartIndex + i, UndefinedConstant(),
-                           barrier_mode);
+  TNode<Smi> not_found_sentinel = SmiConstant(CollectionType::kNotFound);
+
+  intptr_t const_capacity;
+  if (TryToIntPtrConstant(capacity, &const_capacity) &&
+      const_capacity == CollectionType::kInitialCapacity) {
+    int const_bucket_count =
+        static_cast<int>(const_capacity / CollectionType::kLoadFactor);
+    int const_data_table_length =
+        static_cast<int>(const_capacity * CollectionType::kEntrySize);
+    int const_data_table_start_index = static_cast<int>(
+        CollectionType::HashTableStartIndex() + const_bucket_count);
+
+    Comment("Fill the buckets with kNotFound (constant capacity).");
+    for (int i = 0; i < const_bucket_count; i++) {
+      UnsafeStoreFixedArrayElement(table,
+                                   CollectionType::HashTableStartIndex() + i,
+                                   not_found_sentinel, barrier_mode);
+    }
+
+    Comment("Fill the data table with undefined (constant capacity).");
+    for (int i = 0; i < const_data_table_length; i++) {
+      UnsafeStoreFixedArrayElement(table, const_data_table_start_index + i,
+                                   UndefinedConstant(), barrier_mode);
+    }
+  } else {
+    Comment("Fill the buckets with kNotFound.");
+    TNode<IntPtrT> buckets_start_address =
+        IntPtrAdd(object_address,
+                  IntPtrConstant(FixedArray::OffsetOfElementAt(
+                                     CollectionType::HashTableStartIndex()) -
+                                 kHeapObjectTag));
+    TNode<IntPtrT> buckets_end_address =
+        IntPtrAdd(buckets_start_address, TimesTaggedSize(bucket_count));
+
+    StoreFieldsNoWriteBarrier(buckets_start_address, buckets_end_address,
+                              not_found_sentinel);
+
+    Comment("Fill the data table with undefined.");
+    TNode<IntPtrT> data_start_address = buckets_end_address;
+    TNode<IntPtrT> data_end_address = IntPtrAdd(
+        object_address,
+        IntPtrAdd(IntPtrConstant(FixedArray::kHeaderSize - kHeapObjectTag),
+                  TimesTaggedSize(fixed_array_length)));
+
+    StoreFieldsNoWriteBarrier(data_start_address, data_end_address,
+                              UndefinedConstant());
+
+#ifdef DEBUG
+    TNode<IntPtrT> ptr_diff =
+        IntPtrSub(data_end_address, buckets_start_address);
+    TNode<IntPtrT> array_length = LoadAndUntagFixedArrayBaseLength(table);
+    TNode<IntPtrT> array_data_fields = IntPtrSub(
+        array_length, IntPtrConstant(CollectionType::HashTableStartIndex()));
+    TNode<IntPtrT> expected_end =
+        IntPtrAdd(data_start_address,
+                  TimesTaggedSize(IntPtrMul(
+                      capacity, IntPtrConstant(CollectionType::kEntrySize))));
+
+    CSA_ASSERT(this, IntPtrEqual(ptr_diff, TimesTaggedSize(array_data_fields)));
+    CSA_ASSERT(this, IntPtrEqual(expected_end, data_end_address));
+#endif
   }
 
   return table;
 }
 
-template TNode<OrderedHashMap>
-CodeStubAssembler::AllocateOrderedHashTable<OrderedHashMap>();
-template TNode<OrderedHashSet>
-CodeStubAssembler::AllocateOrderedHashTable<OrderedHashSet>();
+TNode<OrderedNameDictionary> CodeStubAssembler::AllocateOrderedNameDictionary(
+    TNode<IntPtrT> capacity) {
+  TNode<OrderedNameDictionary> table =
+      AllocateOrderedHashTable<OrderedNameDictionary>(capacity);
+  StoreFixedArrayElement(table, OrderedNameDictionary::PrefixIndex(),
+                         SmiConstant(PropertyArray::kNoHashSentinel),
+                         SKIP_WRITE_BARRIER);
+  return table;
+}
+
+TNode<OrderedNameDictionary> CodeStubAssembler::AllocateOrderedNameDictionary(
+    int capacity) {
+  return AllocateOrderedNameDictionary(IntPtrConstant(capacity));
+}
+
+TNode<OrderedHashSet> CodeStubAssembler::AllocateOrderedHashSet() {
+  return AllocateOrderedHashTableWithCapacity<OrderedHashSet>(
+      IntPtrConstant(OrderedHashSet::kInitialCapacity));
+}
+
+TNode<OrderedHashMap> CodeStubAssembler::AllocateOrderedHashMap() {
+  return AllocateOrderedHashTableWithCapacity<OrderedHashMap>(
+      IntPtrConstant(OrderedHashMap::kInitialCapacity));
+}
 
 TNode<JSObject> CodeStubAssembler::AllocateJSObjectFromMap(
     TNode<Map> map, base::Optional<TNode<HeapObject>> properties,
@@ -3434,8 +3552,9 @@ void CodeStubAssembler::InitializeJSObjectFromMap(
     StoreObjectFieldRoot(object, JSObject::kPropertiesOrHashOffset,
                          RootIndex::kEmptyFixedArray);
   } else {
-    CSA_ASSERT(this, Word32Or(Word32Or(IsPropertyArray(*properties),
-                                       IsNameDictionary(*properties)),
+    CSA_ASSERT(this, Word32Or(Word32Or(Word32Or(IsPropertyArray(*properties),
+                                                IsNameDictionary(*properties)),
+                                       IsOrderedNameDictionary(*properties)),
                               IsEmptyFixedArray(*properties)));
     StoreObjectFieldNoWriteBarrier(object, JSObject::kPropertiesOrHashOffset,
                                    *properties);
@@ -3593,7 +3712,7 @@ CodeStubAssembler::AllocateUninitializedJSArrayWithElements(
   Label out(this), empty(this), nonempty(this);
 
   int capacity_int;
-  if (ToInt32Constant(capacity, &capacity_int)) {
+  if (TryToInt32Constant(capacity, &capacity_int)) {
     if (capacity_int == 0) {
       TNode<FixedArray> empty_array = EmptyFixedArrayConstant();
       array = AllocateJSArray(array_map, empty_array, length, allocation_site,
@@ -6173,7 +6292,7 @@ TNode<BoolT> CodeStubAssembler::IsUniqueNameNoIndex(TNode<HeapObject> object) {
   return Select<BoolT>(
       IsInternalizedStringInstanceType(instance_type),
       [=] {
-        return IsSetWord32(LoadNameHashField(CAST(object)),
+        return IsSetWord32(LoadNameRawHashField(CAST(object)),
                            Name::kIsNotIntegerIndexMask);
       },
       [=] { return IsSymbolInstanceType(instance_type); });
@@ -6191,7 +6310,7 @@ TNode<BoolT> CodeStubAssembler::IsUniqueNameNoCachedIndex(
   return Select<BoolT>(
       IsInternalizedStringInstanceType(instance_type),
       [=] {
-        return IsSetWord32(LoadNameHashField(CAST(object)),
+        return IsSetWord32(LoadNameRawHashField(CAST(object)),
                            Name::kDoesNotContainCachedArrayIndexMask);
       },
       [=] { return IsSymbolInstanceType(instance_type); });
@@ -6233,6 +6352,10 @@ TNode<BoolT> CodeStubAssembler::IsEphemeronHashTable(TNode<HeapObject> object) {
 TNode<BoolT> CodeStubAssembler::IsNameDictionary(TNode<HeapObject> object) {
   return HasInstanceType(object, NAME_DICTIONARY_TYPE);
 }
+TNode<BoolT> CodeStubAssembler::IsOrderedNameDictionary(
+    TNode<HeapObject> object) {
+  return HasInstanceType(object, ORDERED_NAME_DICTIONARY_TYPE);
+}
 
 TNode<BoolT> CodeStubAssembler::IsGlobalDictionary(TNode<HeapObject> object) {
   return HasInstanceType(object, GLOBAL_DICTIONARY_TYPE);
@@ -6425,11 +6548,11 @@ TNode<BoolT> CodeStubAssembler::FixedArraySizeDoesntFitInNewSpace(
       element_count, IntPtrOrSmiConstant<TIndex>(max_newspace_elements));
 }
 
-TNode<Int32T> CodeStubAssembler::StringCharCodeAt(TNode<String> string,
-                                                  TNode<UintPtrT> index) {
+TNode<Uint16T> CodeStubAssembler::StringCharCodeAt(TNode<String> string,
+                                                   TNode<UintPtrT> index) {
   CSA_ASSERT(this, UintPtrLessThan(index, LoadStringLengthAsWord(string)));
 
-  TVARIABLE(Int32T, var_result);
+  TVARIABLE(Uint16T, var_result);
 
   Label return_result(this), if_runtime(this, Label::kDeferred),
       if_stringistwobyte(this), if_stringisonebyte(this);
@@ -6447,14 +6570,13 @@ TNode<Int32T> CodeStubAssembler::StringCharCodeAt(TNode<String> string,
 
   BIND(&if_stringisonebyte);
   {
-    var_result = UncheckedCast<Int32T>(Load<Uint8T>(string_data, offset));
+    var_result = Load<Uint8T>(string_data, offset);
     Goto(&return_result);
   }
 
   BIND(&if_stringistwobyte);
   {
-    var_result = UncheckedCast<Int32T>(
-        Load<Uint16T>(string_data, WordShl(offset, IntPtrConstant(1))));
+    var_result = Load<Uint16T>(string_data, WordShl(offset, IntPtrConstant(1)));
     Goto(&return_result);
   }
 
@@ -6463,7 +6585,7 @@ TNode<Int32T> CodeStubAssembler::StringCharCodeAt(TNode<String> string,
     TNode<Object> result =
         CallRuntime(Runtime::kStringCharCodeAt, NoContextConstant(), string,
                     ChangeUintPtrToTagged(index));
-    var_result = SmiToInt32(CAST(result));
+    var_result = UncheckedCast<Uint16T>(SmiToInt32(CAST(result)));
     Goto(&return_result);
   }
 
@@ -6672,12 +6794,12 @@ TNode<Number> CodeStubAssembler::StringToNumber(TNode<String> input) {
   TVARIABLE(Number, var_result);
 
   // Check if string has a cached array index.
-  TNode<Uint32T> hash = LoadNameHashField(input);
-  GotoIf(IsSetWord32(hash, Name::kDoesNotContainCachedArrayIndexMask),
+  TNode<Uint32T> raw_hash_field = LoadNameRawHashField(input);
+  GotoIf(IsSetWord32(raw_hash_field, Name::kDoesNotContainCachedArrayIndexMask),
          &runtime);
 
-  var_result =
-      SmiTag(Signed(DecodeWordFromWord32<String::ArrayIndexValueBits>(hash)));
+  var_result = SmiTag(Signed(
+      DecodeWordFromWord32<String::ArrayIndexValueBits>(raw_hash_field)));
   Goto(&end);
 
   BIND(&runtime);
@@ -7439,12 +7561,14 @@ void CodeStubAssembler::TryToName(SloppyTNode<Object> key, Label* if_keyisindex,
     {
       Label if_thinstring(this), if_has_cached_index(this);
 
-      TNode<Uint32T> hash = LoadNameHashField(CAST(key));
-      GotoIf(IsClearWord32(hash, Name::kDoesNotContainCachedArrayIndexMask),
+      TNode<Uint32T> raw_hash_field = LoadNameRawHashField(CAST(key));
+      GotoIf(IsClearWord32(raw_hash_field,
+                           Name::kDoesNotContainCachedArrayIndexMask),
              &if_has_cached_index);
       // No cached array index. If the string knows that it contains an index,
       // then it must be an uncacheable index. Handle this case in the runtime.
-      GotoIf(IsClearWord32(hash, Name::kIsNotIntegerIndexMask), if_bailout);
+      GotoIf(IsClearWord32(raw_hash_field, Name::kIsNotIntegerIndexMask),
+             if_bailout);
 
       GotoIf(InstanceTypeEqual(var_instance_type.value(), THIN_STRING_TYPE),
              &if_thinstring);
@@ -7468,8 +7592,8 @@ void CodeStubAssembler::TryToName(SloppyTNode<Object> key, Label* if_keyisindex,
 
       BIND(&if_has_cached_index);
       {
-        TNode<IntPtrT> index =
-            Signed(DecodeWordFromWord32<String::ArrayIndexValueBits>(hash));
+        TNode<IntPtrT> index = Signed(
+            DecodeWordFromWord32<String::ArrayIndexValueBits>(raw_hash_field));
         CSA_ASSERT(this, IntPtrLessThan(index, IntPtrConstant(INT_MAX)));
         *var_index = index;
         Goto(if_keyisindex);
@@ -7487,6 +7611,50 @@ void CodeStubAssembler::TryToName(SloppyTNode<Object> key, Label* if_keyisindex,
   }
 }
 
+void CodeStubAssembler::StringWriteToFlatOneByte(TNode<String> source,
+                                                 TNode<RawPtrT> sink,
+                                                 TNode<Int32T> from,
+                                                 TNode<Int32T> to) {
+  TNode<ExternalReference> function =
+      ExternalConstant(ExternalReference::string_write_to_flat_one_byte());
+  CallCFunction(function, base::nullopt,
+                std::make_pair(MachineType::AnyTagged(), source),
+                std::make_pair(MachineType::Pointer(), sink),
+                std::make_pair(MachineType::Int32(), from),
+                std::make_pair(MachineType::Int32(), to));
+}
+
+void CodeStubAssembler::StringWriteToFlatTwoByte(TNode<String> source,
+                                                 TNode<RawPtrT> sink,
+                                                 TNode<Int32T> from,
+                                                 TNode<Int32T> to) {
+  TNode<ExternalReference> function =
+      ExternalConstant(ExternalReference::string_write_to_flat_two_byte());
+  CallCFunction(function, base::nullopt,
+                std::make_pair(MachineType::AnyTagged(), source),
+                std::make_pair(MachineType::Pointer(), sink),
+                std::make_pair(MachineType::Int32(), from),
+                std::make_pair(MachineType::Int32(), to));
+}
+
+TNode<RawPtr<Uint8T>> CodeStubAssembler::ExternalOneByteStringGetChars(
+    TNode<ExternalOneByteString> string) {
+  TNode<ExternalReference> function =
+      ExternalConstant(ExternalReference::external_one_byte_string_get_chars());
+  return UncheckedCast<RawPtr<Uint8T>>(
+      CallCFunction(function, MachineType::Pointer(),
+                    std::make_pair(MachineType::AnyTagged(), string)));
+}
+
+TNode<RawPtr<Uint16T>> CodeStubAssembler::ExternalTwoByteStringGetChars(
+    TNode<ExternalTwoByteString> string) {
+  TNode<ExternalReference> function =
+      ExternalConstant(ExternalReference::external_two_byte_string_get_chars());
+  return UncheckedCast<RawPtr<Uint16T>>(
+      CallCFunction(function, MachineType::Pointer(),
+                    std::make_pair(MachineType::AnyTagged(), string)));
+}
+
 void CodeStubAssembler::TryInternalizeString(
     TNode<String> string, Label* if_index, TVariable<IntPtrT>* var_index,
     Label* if_internalized, TVariable<Name>* var_internalized,
@@ -7628,8 +7796,8 @@ TNode<IntPtrT> CodeStubAssembler::IntPtrMax(SloppyTNode<IntPtrT> left,
                                             SloppyTNode<IntPtrT> right) {
   intptr_t left_constant;
   intptr_t right_constant;
-  if (ToIntPtrConstant(left, &left_constant) &&
-      ToIntPtrConstant(right, &right_constant)) {
+  if (TryToIntPtrConstant(left, &left_constant) &&
+      TryToIntPtrConstant(right, &right_constant)) {
     return IntPtrConstant(std::max(left_constant, right_constant));
   }
   return SelectConstant<IntPtrT>(IntPtrGreaterThanOrEqual(left, right), left,
@@ -7640,8 +7808,8 @@ TNode<IntPtrT> CodeStubAssembler::IntPtrMin(SloppyTNode<IntPtrT> left,
                                             SloppyTNode<IntPtrT> right) {
   intptr_t left_constant;
   intptr_t right_constant;
-  if (ToIntPtrConstant(left, &left_constant) &&
-      ToIntPtrConstant(right, &right_constant)) {
+  if (TryToIntPtrConstant(left, &left_constant) &&
+      TryToIntPtrConstant(right, &right_constant)) {
     return IntPtrConstant(std::min(left_constant, right_constant));
   }
   return SelectConstant<IntPtrT>(IntPtrLessThanOrEqual(left, right), left,
@@ -7652,8 +7820,8 @@ TNode<UintPtrT> CodeStubAssembler::UintPtrMin(TNode<UintPtrT> left,
                                               TNode<UintPtrT> right) {
   intptr_t left_constant;
   intptr_t right_constant;
-  if (ToIntPtrConstant(left, &left_constant) &&
-      ToIntPtrConstant(right, &right_constant)) {
+  if (TryToIntPtrConstant(left, &left_constant) &&
+      TryToIntPtrConstant(right, &right_constant)) {
     return UintPtrConstant(std::min(static_cast<uintptr_t>(left_constant),
                                     static_cast<uintptr_t>(right_constant)));
   }
@@ -7942,6 +8110,27 @@ template void CodeStubAssembler::Add<NameDictionary>(TNode<NameDictionary>,
                                                      TNode<Name>, TNode<Object>,
                                                      Label*);
 
+template <class Dictionary>
+TNode<Smi> CodeStubAssembler::GetNumberOfElements(
+    TNode<Dictionary> dictionary) {
+  return CAST(
+      LoadFixedArrayElement(dictionary, Dictionary::kNumberOfElementsIndex));
+}
+
+template <>
+TNode<Smi> CodeStubAssembler::GetNumberOfElements(
+    TNode<OrderedNameDictionary> dictionary) {
+  return CAST(LoadFixedArrayElement(
+      dictionary, OrderedNameDictionary::NumberOfElementsIndex()));
+}
+
+template TNode<Smi> CodeStubAssembler::GetNumberOfElements(
+    TNode<NameDictionary> dictionary);
+template TNode<Smi> CodeStubAssembler::GetNumberOfElements(
+    TNode<NumberDictionary> dictionary);
+template TNode<Smi> CodeStubAssembler::GetNumberOfElements(
+    TNode<GlobalDictionary> dictionary);
+
 template <typename Array>
 void CodeStubAssembler::LookupLinear(TNode<Name> unique_name,
                                      TNode<Array> array,
@@ -8127,7 +8316,7 @@ void CodeStubAssembler::LookupBinary(TNode<Name> unique_name,
 
 void CodeStubAssembler::ForEachEnumerableOwnProperty(
     TNode<Context> context, TNode<Map> map, TNode<JSObject> object,
-    ForEachEnumerationMode mode, const ForEachKeyValueFunction& body,
+    PropertiesEnumerationMode mode, const ForEachKeyValueFunction& body,
     Label* bailout) {
   TNode<Uint16T> type = LoadMapInstanceType(map);
   TNode<Uint32T> bit_field3 = EnsureOnlyHasSimpleProperties(map, type, bailout);
@@ -8225,9 +8414,10 @@ void CodeStubAssembler::ForEachEnumerableOwnProperty(
             // guaranteed that the object has a simple shape, and that the key
             // is a name.
             var_map = LoadMap(object);
-            TryLookupPropertyInSimpleObject(
-                object, var_map.value(), next_key, &if_found_fast,
-                &if_found_dict, &var_meta_storage, &var_entry, &next_iteration);
+            TryLookupPropertyInSimpleObject(object, var_map.value(), next_key,
+                                            &if_found_fast, &if_found_dict,
+                                            &var_meta_storage, &var_entry,
+                                            &next_iteration, bailout);
           }
 
           BIND(&if_found_fast);
@@ -8248,6 +8438,12 @@ void CodeStubAssembler::ForEachEnumerableOwnProperty(
           }
           BIND(&if_found_dict);
           {
+            if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+              // TODO(v8:11167, v8:11177) Only here due to SetDataProperties
+              // workaround.
+              GotoIf(Int32TrueConstant(), bailout);
+            }
+
             TNode<NameDictionary> dictionary = CAST(var_meta_storage.value());
             TNode<IntPtrT> entry = var_entry.value();
 
@@ -8429,7 +8625,7 @@ void CodeStubAssembler::TryLookupPropertyInSimpleObject(
     TNode<JSObject> object, TNode<Map> map, TNode<Name> unique_name,
     Label* if_found_fast, Label* if_found_dict,
     TVariable<HeapObject>* var_meta_storage, TVariable<IntPtrT>* var_name_index,
-    Label* if_not_found) {
+    Label* if_not_found, Label* bailout) {
   CSA_ASSERT(this, IsSimpleObjectMap(map));
   CSA_ASSERT(this, IsUniqueNameNoCachedIndex(unique_name));
 
@@ -8447,6 +8643,11 @@ void CodeStubAssembler::TryLookupPropertyInSimpleObject(
   }
   BIND(&if_isslowmap);
   {
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      // TODO(v8:11167, v8:11177) Only here due to SetDataProperties workaround.
+      GotoIf(Int32TrueConstant(), bailout);
+    }
+
     TNode<NameDictionary> dictionary = CAST(LoadSlowProperties(object));
     *var_meta_storage = dictionary;
 
@@ -8466,7 +8667,7 @@ void CodeStubAssembler::TryLookupProperty(
 
   TryLookupPropertyInSimpleObject(CAST(object), map, unique_name, if_found_fast,
                                   if_found_dict, var_meta_storage,
-                                  var_name_index, if_not_found);
+                                  var_name_index, if_not_found, if_bailout);
 
   BIND(&if_objectisspecial);
   {
@@ -9293,7 +9494,7 @@ TNode<IntPtrT> CodeStubAssembler::ElementOffsetFromIndex(
     int const kSmiShiftBits = kSmiShiftSize + kSmiTagSize;
     element_size_shift -= kSmiShiftBits;
     Smi smi_index;
-    constant_index = ToSmiConstant(smi_index_node, &smi_index);
+    constant_index = TryToSmiConstant(smi_index_node, &smi_index);
     if (constant_index) {
       index = smi_index.value();
     } else {
@@ -9307,10 +9508,10 @@ TNode<IntPtrT> CodeStubAssembler::ElementOffsetFromIndex(
         ReinterpretCast<TaggedIndex>(index_node);
     element_size_shift -= kSmiTagSize;
     intptr_index_node = BitcastTaggedToWordForTagAndSmiBits(tagged_index_node);
-    constant_index = ToIntPtrConstant(intptr_index_node, &index);
+    constant_index = TryToIntPtrConstant(intptr_index_node, &index);
   } else {
     intptr_index_node = ReinterpretCast<IntPtrT>(index_node);
-    constant_index = ToIntPtrConstant(intptr_index_node, &index);
+    constant_index = TryToIntPtrConstant(intptr_index_node, &index);
   }
   if (constant_index) {
     return IntPtrConstant(base_size + element_size * index);
@@ -9403,6 +9604,16 @@ TNode<FeedbackVector> CodeStubAssembler::LoadFeedbackVectorForStub() {
   return CAST(LoadFeedbackVector(function));
 }
 
+TNode<FeedbackVector>
+CodeStubAssembler::LoadFeedbackVectorForStubWithTrampoline() {
+  TNode<RawPtrT> frame_pointer = LoadParentFramePointer();
+  TNode<RawPtrT> parent_frame_pointer = Load<RawPtrT>(frame_pointer);
+  TNode<JSFunction> function = CAST(
+      LoadFullTagged(parent_frame_pointer,
+                     IntPtrConstant(StandardFrameConstants::kFunctionOffset)));
+  return CAST(LoadFeedbackVector(function));
+}
+
 void CodeStubAssembler::UpdateFeedback(TNode<Smi> feedback,
                                        TNode<HeapObject> maybe_vector,
                                        TNode<UintPtrT> slot_id) {
@@ -9841,6 +10052,40 @@ TNode<Float64T> CodeStubAssembler::PrepareValueForWriteToTypedArray<Float64T>(
   return var_result.value();
 }
 
+template <>
+TNode<BigInt> CodeStubAssembler::PrepareValueForWriteToTypedArray<BigInt>(
+    TNode<Object> input, ElementsKind elements_kind, TNode<Context> context) {
+  DCHECK(elements_kind == BIGINT64_ELEMENTS ||
+         elements_kind == BIGUINT64_ELEMENTS);
+  return ToBigInt(context, input);
+}
+
+template <>
+TNode<UntaggedT> CodeStubAssembler::PrepareValueForWriteToTypedArray(
+    TNode<Object> input, ElementsKind elements_kind, TNode<Context> context) {
+  DCHECK(IsTypedArrayElementsKind(elements_kind));
+
+  switch (elements_kind) {
+    case UINT8_ELEMENTS:
+    case INT8_ELEMENTS:
+    case UINT16_ELEMENTS:
+    case INT16_ELEMENTS:
+    case UINT32_ELEMENTS:
+    case INT32_ELEMENTS:
+    case UINT8_CLAMPED_ELEMENTS:
+      return PrepareValueForWriteToTypedArray<Word32T>(input, elements_kind,
+                                                       context);
+    case FLOAT32_ELEMENTS:
+      return PrepareValueForWriteToTypedArray<Float32T>(input, elements_kind,
+                                                        context);
+    case FLOAT64_ELEMENTS:
+      return PrepareValueForWriteToTypedArray<Float64T>(input, elements_kind,
+                                                        context);
+    default:
+      UNREACHABLE();
+  }
+}
+
 Node* CodeStubAssembler::PrepareValueForWriteToTypedArray(
     TNode<Object> input, ElementsKind elements_kind, TNode<Context> context) {
   DCHECK(IsTypedArrayElementsKind(elements_kind));
@@ -9935,7 +10180,7 @@ void CodeStubAssembler::EmitElementStore(
     // There must be no allocations between the buffer load and
     // and the actual store to backing store, because GC may decide that
     // the buffer is not alive or move the elements.
-    // TODO(ishell): introduce DisallowHeapAllocationCode scope here.
+    // TODO(ishell): introduce DisallowGarbageCollectionCode scope here.
 
     // Check if buffer has been detached.
     TNode<JSArrayBuffer> buffer = LoadJSArrayBufferViewBuffer(typed_array);
@@ -10385,7 +10630,7 @@ TNode<TIndex> CodeStubAssembler::BuildFastLoop(const VariableList& vars,
   // loop actually iterates.
   TNode<BoolT> first_check = IntPtrOrSmiEqual(var.value(), end_index);
   int32_t first_check_val;
-  if (ToInt32Constant(first_check, &first_check_val)) {
+  if (TryToInt32Constant(first_check, &first_check_val)) {
     if (first_check_val) return var.value();
     Goto(&loop);
   } else {
@@ -10433,23 +10678,24 @@ void CodeStubAssembler::BuildFastArrayForEach(
   CSA_SLOW_ASSERT(this, Word32Or(IsFixedArrayWithKind(array, kind),
                                  IsPropertyArray(array)));
 
-  int32_t first_val;
-  bool constant_first = ToInt32Constant(first_element_inclusive, &first_val);
-  int32_t last_val;
-  bool constent_last = ToInt32Constant(last_element_exclusive, &last_val);
+  intptr_t first_val;
+  bool constant_first =
+      TryToIntPtrConstant(first_element_inclusive, &first_val);
+  intptr_t last_val;
+  bool constent_last = TryToIntPtrConstant(last_element_exclusive, &last_val);
   if (constant_first && constent_last) {
-    int delta = last_val - first_val;
+    intptr_t delta = last_val - first_val;
     DCHECK_GE(delta, 0);
     if (delta <= kElementLoopUnrollThreshold) {
       if (direction == ForEachDirection::kForward) {
-        for (int i = first_val; i < last_val; ++i) {
+        for (intptr_t i = first_val; i < last_val; ++i) {
           TNode<IntPtrT> index = IntPtrConstant(i);
           TNode<IntPtrT> offset = ElementOffsetFromIndex(
               index, kind, FixedArray::kHeaderSize - kHeapObjectTag);
           body(array, offset);
         }
       } else {
-        for (int i = last_val - 1; i >= first_val; --i) {
+        for (intptr_t i = last_val - 1; i >= first_val; --i) {
           TNode<IntPtrT> index = IntPtrConstant(i);
           TNode<IntPtrT> offset = ElementOffsetFromIndex(
               index, kind, FixedArray::kHeaderSize - kHeapObjectTag);
@@ -12099,6 +12345,11 @@ TNode<Oddball> CodeStubAssembler::HasProperty(TNode<Context> context,
   Label call_runtime(this, Label::kDeferred), return_true(this),
       return_false(this), end(this), if_proxy(this, Label::kDeferred);
 
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // TODO(v8:11167) remove once OrderedNameDictionary supported.
+    GotoIf(Int32TrueConstant(), &call_runtime);
+  }
+
   CodeStubAssembler::LookupPropertyInHolder lookup_property_in_holder =
       [this, &return_true](
           TNode<HeapObject> receiver, TNode<HeapObject> holder,
@@ -12768,6 +13019,7 @@ CodeStubArguments::CodeStubArguments(CodeStubAssembler* assembler,
   TNode<IntPtrT> offset = assembler_->IntPtrConstant(
       (StandardFrameConstants::kFixedSlotCountAboveFp + 1) *
       kSystemPointerSize);
+  DCHECK_NOT_NULL(argc_);
   // base_ points to the first argument, not the receiver
   // whether present or not.
   base_ = assembler_->RawPtrAdd(fp_, offset);
@@ -12800,6 +13052,12 @@ TNode<Object> CodeStubArguments::AtIndex(int index) const {
   return AtIndex(assembler_->IntPtrConstant(index));
 }
 
+TNode<IntPtrT> CodeStubArguments::GetLengthWithReceiver() const {
+  TNode<IntPtrT> argc = GetLength();
+  argc = assembler_->IntPtrAdd(argc, assembler_->IntPtrConstant(1));
+  return argc;
+}
+
 TNode<Object> CodeStubArguments::GetOptionalArgumentValue(
     TNode<IntPtrT> index, TNode<Object> default_value) {
   CodeStubAssembler::TVariable<Object> result(assembler_);
@@ -13168,13 +13426,32 @@ TNode<Map> CodeStubAssembler::CheckEnumCache(TNode<JSReceiver> receiver,
   {
     // Avoid runtime-call for empty dictionary receivers.
     GotoIfNot(IsDictionaryMap(receiver_map), if_runtime);
-    TNode<HashTableBase> properties =
-        UncheckedCast<HashTableBase>(LoadSlowProperties(receiver));
-    CSA_ASSERT(this, Word32Or(IsNameDictionary(properties),
-                              IsGlobalDictionary(properties)));
-    STATIC_ASSERT(static_cast<int>(NameDictionary::kNumberOfElementsIndex) ==
-                  static_cast<int>(GlobalDictionary::kNumberOfElementsIndex));
-    TNode<Smi> length = GetNumberOfElements(properties);
+    TNode<Smi> length;
+    TNode<HeapObject> properties = LoadSlowProperties(receiver);
+
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      CSA_ASSERT(this, Word32Or(IsOrderedNameDictionary(properties),
+                                IsGlobalDictionary(properties)));
+
+      length = Select<Smi>(
+          IsOrderedNameDictionary(properties),
+          [=] {
+            return GetNumberOfElements(
+                UncheckedCast<OrderedNameDictionary>(properties));
+          },
+          [=] {
+            return GetNumberOfElements(
+                UncheckedCast<GlobalDictionary>(properties));
+          });
+
+    } else {
+      CSA_ASSERT(this, Word32Or(IsNameDictionary(properties),
+                                IsGlobalDictionary(properties)));
+      STATIC_ASSERT(static_cast<int>(NameDictionary::kNumberOfElementsIndex) ==
+                    static_cast<int>(GlobalDictionary::kNumberOfElementsIndex));
+      length = GetNumberOfElements(UncheckedCast<HashTableBase>(properties));
+    }
+
     GotoIfNot(TaggedEqual(length, SmiConstant(0)), if_runtime);
     // Check that there are no elements on the {receiver} and its prototype
     // chain. Given that we do not create an EnumCache for dict-mode objects,
diff --git a/deps/v8/src/codegen/code-stub-assembler.h b/deps/v8/src/codegen/code-stub-assembler.h
index 89e9556b9e6618..e1c423cfab69aa 100644
--- a/deps/v8/src/codegen/code-stub-assembler.h
+++ b/deps/v8/src/codegen/code-stub-assembler.h
@@ -132,6 +132,8 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol };
   V(EmptyScopeInfo, empty_scope_info, EmptyScopeInfo)                        \
   V(EmptyPropertyDictionary, empty_property_dictionary,                      \
     EmptyPropertyDictionary)                                                 \
+  V(EmptyOrderedPropertyDictionary, empty_ordered_property_dictionary,       \
+    EmptyOrderedPropertyDictionary)                                          \
   V(EmptySlowElementDictionary, empty_slow_element_dictionary,               \
     EmptySlowElementDictionary)                                              \
   V(empty_string, empty_string, EmptyString)                                 \
@@ -341,9 +343,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   TNode<TIndex> TaggedToParameter(TNode<Smi> value);
 
   bool ToParameterConstant(TNode<Smi> node, intptr_t* out) {
-    Smi constant;
-    if (ToSmiConstant(node, &constant)) {
-      *out = static_cast<intptr_t>(constant.value());
+    if (TryToIntPtrConstant(node, out)) {
       return true;
     }
     return false;
@@ -351,7 +351,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
 
   bool ToParameterConstant(TNode<IntPtrT> node, intptr_t* out) {
     intptr_t constant;
-    if (ToIntPtrConstant(node, &constant)) {
+    if (TryToIntPtrConstant(node, &constant)) {
       *out = constant;
       return true;
     }
@@ -1034,6 +1034,12 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
 
   TNode<RawPtrT> LoadExternalStringResourceDataPtr(
       TNode<ExternalString> object) {
+    // This is only valid for ExternalStrings where the resource data
+    // pointer is cached (i.e. no uncached external strings).
+    CSA_ASSERT(this, Word32NotEqual(
+                         Word32And(LoadInstanceType(object),
+                                   Int32Constant(kUncachedExternalStringMask)),
+                         Int32Constant(kUncachedExternalStringTag)));
     return LoadExternalPointerFromObject(object,
                                          ExternalString::kResourceDataOffset,
                                          kExternalStringResourceDataTag);
@@ -1124,14 +1130,20 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
                            Map::kConstructorOrBackPointerOrNativeContextOffset);
   }
 
-  // Reference is the CSA-equivalent of a Torque reference value,
-  // representing an inner pointer into a HeapObject.
-  // TODO(gsps): Remove in favor of flattened {Load,Store}Reference interface
+  // Reference is the CSA-equivalent of a Torque reference value, representing
+  // an inner pointer into a HeapObject.
+  //
+  // The object can be a HeapObject or an all-zero bitpattern. The latter is
+  // used for off-heap data, in which case the offset holds the actual address
+  // and the data must be untagged (i.e. accessed via the Load-/StoreReference
+  // overloads for TNode<UntaggedT>-convertible types below).
+  //
+  // TODO(gsps): Remove in favor of flattened {Load,Store}Reference interface.
   struct Reference {
-    TNode<HeapObject> object;
+    TNode<Object> object;
     TNode<IntPtrT> offset;
 
-    std::tuple<TNode<HeapObject>, TNode<IntPtrT>> Flatten() const {
+    std::tuple<TNode<Object>, TNode<IntPtrT>> Flatten() const {
       return std::make_tuple(object, offset);
     }
   };
@@ -1142,6 +1154,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   TNode<T> LoadReference(Reference reference) {
     TNode<IntPtrT> offset =
         IntPtrSub(reference.offset, IntPtrConstant(kHeapObjectTag));
+    CSA_ASSERT(this, TaggedIsNotSmi(reference.object));
     return CAST(
         LoadFromObject(MachineTypeOf<T>::value, reference.object, offset));
   }
@@ -1170,6 +1183,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
     }
     TNode<IntPtrT> offset =
         IntPtrSub(reference.offset, IntPtrConstant(kHeapObjectTag));
+    CSA_ASSERT(this, TaggedIsNotSmi(reference.object));
     StoreToObject(rep, reference.object, offset, value, write_barrier);
   }
   template <class T, typename std::enable_if<
@@ -1182,6 +1196,13 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
                   value, StoreToObjectWriteBarrier::kNone);
   }
 
+  TNode<RawPtrT> GCUnsafeReferenceToRawPtr(TNode<Object> object,
+                                           TNode<IntPtrT> offset) {
+    return ReinterpretCast<RawPtrT>(
+        IntPtrAdd(BitcastTaggedToWord(object),
+                  IntPtrSub(offset, IntPtrConstant(kHeapObjectTag))));
+  }
+
   // Load the floating point value of a HeapNumber.
   TNode<Float64T> LoadHeapNumberValue(TNode<HeapObject> object);
   // Load the Map of an HeapObject.
@@ -1508,7 +1529,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
                                       SloppyTNode<IntPtrT> offset,
                                       TNode<T> value) {
     int const_offset;
-    if (ToInt32Constant(offset, &const_offset)) {
+    if (TryToInt32Constant(offset, &const_offset)) {
       return StoreObjectFieldNoWriteBarrier<T>(object, const_offset, value);
     }
     StoreNoWriteBarrier(MachineRepresentationOf<T>::value, object,
@@ -1737,8 +1758,15 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   TNode<NameDictionary> CopyNameDictionary(TNode<NameDictionary> dictionary,
                                            Label* large_object_fallback);
 
-  template <typename CollectionType>
-  TNode<CollectionType> AllocateOrderedHashTable();
+  TNode<OrderedHashSet> AllocateOrderedHashSet();
+
+  TNode<OrderedHashMap> AllocateOrderedHashMap();
+
+  // Allocates an OrderedNameDictionary of the given capacity. This guarantees
+  // that |capacity| entries can be added without reallocating.
+  TNode<OrderedNameDictionary> AllocateOrderedNameDictionary(
+      TNode<IntPtrT> capacity);
+  TNode<OrderedNameDictionary> AllocateOrderedNameDictionary(int capacity);
 
   TNode<JSObject> AllocateJSObjectFromMap(
       TNode<Map> map,
@@ -2319,6 +2347,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   TNode<BoolT> IsConstructor(TNode<HeapObject> object);
   TNode<BoolT> IsDeprecatedMap(TNode<Map> map);
   TNode<BoolT> IsNameDictionary(TNode<HeapObject> object);
+  TNode<BoolT> IsOrderedNameDictionary(TNode<HeapObject> object);
   TNode<BoolT> IsGlobalDictionary(TNode<HeapObject> object);
   TNode<BoolT> IsExtensibleMap(TNode<Map> map);
   TNode<BoolT> IsExtensibleNonPrototypeMap(TNode<Map> map);
@@ -2426,15 +2455,23 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   TNode<BoolT> IsRegExpSpeciesProtectorCellInvalid();
   TNode<BoolT> IsPromiseSpeciesProtectorCellInvalid();
 
-  TNode<BoolT> IsMockArrayBufferAllocatorFlag() {
-    TNode<Word32T> flag_value = UncheckedCast<Word32T>(Load(
-        MachineType::Uint8(),
-        ExternalConstant(
-            ExternalReference::address_of_mock_arraybuffer_allocator_flag())));
+  TNode<BoolT> LoadRuntimeFlag(ExternalReference address_of_flag) {
+    TNode<Word32T> flag_value = UncheckedCast<Word32T>(
+        Load(MachineType::Uint8(), ExternalConstant(address_of_flag)));
     return Word32NotEqual(Word32And(flag_value, Int32Constant(0xFF)),
                           Int32Constant(0));
   }
 
+  TNode<BoolT> IsMockArrayBufferAllocatorFlag() {
+    return LoadRuntimeFlag(
+        ExternalReference::address_of_mock_arraybuffer_allocator_flag());
+  }
+
+  TNode<BoolT> HasBuiltinSubclassingFlag() {
+    return LoadRuntimeFlag(
+        ExternalReference::address_of_builtin_subclassing_flag());
+  }
+
   // True iff |object| is a Smi or a HeapNumber or a BigInt.
   TNode<BoolT> IsNumeric(SloppyTNode<Object> object);
 
@@ -2504,7 +2541,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
 
   // String helpers.
   // Load a character from a String (might flatten a ConsString).
-  TNode<Int32T> StringCharCodeAt(TNode<String> string, TNode<UintPtrT> index);
+  TNode<Uint16T> StringCharCodeAt(TNode<String> string, TNode<UintPtrT> index);
   // Return the single character string with only {code}.
   TNode<String> StringFromSingleCharCode(TNode<Int32T> code);
 
@@ -2750,6 +2787,18 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
                  TVariable<Name>* var_unique, Label* if_bailout,
                  Label* if_notinternalized = nullptr);
 
+  // Call non-allocating runtime String::WriteToFlat using fast C-calls.
+  void StringWriteToFlatOneByte(TNode<String> source, TNode<RawPtrT> sink,
+                                TNode<Int32T> from, TNode<Int32T> to);
+  void StringWriteToFlatTwoByte(TNode<String> source, TNode<RawPtrT> sink,
+                                TNode<Int32T> from, TNode<Int32T> to);
+
+  // Calls External{One,Two}ByteString::GetChars with a fast C-call.
+  TNode<RawPtr<Uint8T>> ExternalOneByteStringGetChars(
+      TNode<ExternalOneByteString> string);
+  TNode<RawPtr<Uint16T>> ExternalTwoByteStringGetChars(
+      TNode<ExternalTwoByteString> string);
+
   // Performs a hash computation and string table lookup for the given string,
   // and jumps to:
   // - |if_index| if the string is an array index like "123"; |var_index|
@@ -2830,10 +2879,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   TNode<IntPtrT> HashTableComputeCapacity(TNode<IntPtrT> at_least_space_for);
 
   template <class Dictionary>
-  TNode<Smi> GetNumberOfElements(TNode<Dictionary> dictionary) {
-    return CAST(
-        LoadFixedArrayElement(dictionary, Dictionary::kNumberOfElementsIndex));
-  }
+  TNode<Smi> GetNumberOfElements(TNode<Dictionary> dictionary);
 
   TNode<Smi> GetNumberDictionaryNumberOfElements(
       TNode<NumberDictionary> dictionary) {
@@ -3033,13 +3079,15 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
 
   // This is a building block for TryLookupProperty() above. Supports only
   // non-special fast and dictionary objects.
+  // TODO(v8:11167, v8:11177) |bailout| only needed for SetDataProperties
+  // workaround.
   void TryLookupPropertyInSimpleObject(TNode<JSObject> object, TNode<Map> map,
                                        TNode<Name> unique_name,
                                        Label* if_found_fast,
                                        Label* if_found_dict,
                                        TVariable<HeapObject>* var_meta_storage,
                                        TVariable<IntPtrT>* var_name_index,
-                                       Label* if_not_found);
+                                       Label* if_not_found, Label* bailout);
 
   // This method jumps to if_found if the element is known to exist. To
   // if_absent if it's known to not exist. To if_not_found if the prototype
@@ -3100,6 +3148,9 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
 
   // Load type feedback vector from the stub caller's frame.
   TNode<FeedbackVector> LoadFeedbackVectorForStub();
+  // Load type feedback vector from the stub caller's frame, skipping an
+  // intermediate trampoline frame.
+  TNode<FeedbackVector> LoadFeedbackVectorForStubWithTrampoline();
 
   // Load the value from closure's feedback cell.
   TNode<HeapObject> LoadFeedbackCellValue(TNode<JSFunction> closure);
@@ -3592,20 +3643,12 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
   using ForEachKeyValueFunction =
       std::function<void(TNode<Name> key, TNode<Object> value)>;
 
-  enum ForEachEnumerationMode {
-    // String and then Symbol properties according to the spec
-    // ES#sec-object.assign
-    kEnumerationOrder,
-    // Order of property addition
-    kPropertyAdditionOrder,
-  };
-
   // For each JSObject property (in DescriptorArray order), check if the key is
   // enumerable, and if so, load the value from the receiver and evaluate the
   // closure.
   void ForEachEnumerableOwnProperty(TNode<Context> context, TNode<Map> map,
                                     TNode<JSObject> object,
-                                    ForEachEnumerationMode mode,
+                                    PropertiesEnumerationMode mode,
                                     const ForEachKeyValueFunction& body,
                                     Label* bailout);
 
@@ -3631,16 +3674,12 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
       TNode<JSFinalizationRegistry> finalization_registry,
       TNode<WeakCell> weak_cell);
 
-  TNode<IntPtrT> FeedbackIteratorSizeFor(int number_of_entries) {
-    return IntPtrConstant(FeedbackIterator::SizeFor(number_of_entries));
+  TNode<IntPtrT> FeedbackIteratorEntrySize() {
+    return IntPtrConstant(FeedbackIterator::kEntrySize);
   }
 
-  TNode<IntPtrT> FeedbackIteratorMapIndexForEntry(int entry) {
-    return IntPtrConstant(FeedbackIterator::MapIndexForEntry(entry));
-  }
-
-  TNode<IntPtrT> FeedbackIteratorHandlerIndexForEntry(int entry) {
-    return IntPtrConstant(FeedbackIterator::HandlerIndexForEntry(entry));
+  TNode<IntPtrT> FeedbackIteratorHandlerOffset() {
+    return IntPtrConstant(FeedbackIterator::kHandlerOffset);
   }
 
  private:
@@ -3668,6 +3707,15 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
       base::Optional<TNode<AllocationSite>> allocation_site,
       TNode<IntPtrT> size_in_bytes);
 
+  // Increases the provided capacity to the next valid value, if necessary.
+  template <typename CollectionType>
+  TNode<CollectionType> AllocateOrderedHashTable(TNode<IntPtrT> capacity);
+
+  // Uses the provided capacity (which must be valid) in verbatim.
+  template <typename CollectionType>
+  TNode<CollectionType> AllocateOrderedHashTableWithCapacity(
+      TNode<IntPtrT> capacity);
+
   TNode<IntPtrT> SmiShiftBitsConstant() {
     return IntPtrConstant(kSmiShiftSize + kSmiTagSize);
   }
@@ -3789,7 +3837,10 @@ class V8_EXPORT_PRIVATE CodeStubArguments {
   TNode<Object> AtIndex(TNode<IntPtrT> index) const;
   TNode<Object> AtIndex(int index) const;
 
+  // Return the number of arguments (excluding the receiver).
   TNode<IntPtrT> GetLength() const { return argc_; }
+  // Return the number of arguments (including the receiver).
+  TNode<IntPtrT> GetLengthWithReceiver() const;
 
   TorqueStructArguments GetTorqueArguments() const {
     return TorqueStructArguments{fp_, base_, argc_};
diff --git a/deps/v8/src/codegen/compilation-cache.cc b/deps/v8/src/codegen/compilation-cache.cc
index f5e9bb89886d33..01af6df644c7dc 100644
--- a/deps/v8/src/codegen/compilation-cache.cc
+++ b/deps/v8/src/codegen/compilation-cache.cc
@@ -69,7 +69,7 @@ void CompilationSubCache::AgeByGeneration(CompilationSubCache* c) {
 void CompilationSubCache::AgeCustom(CompilationSubCache* c) {
   DCHECK_EQ(c->generations(), 1);
   if (c->tables_[0].IsUndefined(c->isolate())) return;
-  CompilationCacheTable::cast(c->tables_[0]).Age();
+  CompilationCacheTable::cast(c->tables_[0]).Age(c->isolate());
 }
 
 void CompilationCacheScript::Age() {
diff --git a/deps/v8/src/codegen/compilation-cache.h b/deps/v8/src/codegen/compilation-cache.h
index 56d90a37dad2a5..58e4e0f75fe617 100644
--- a/deps/v8/src/codegen/compilation-cache.h
+++ b/deps/v8/src/codegen/compilation-cache.h
@@ -184,6 +184,9 @@ class CompilationCacheCode : public CompilationSubCache {
 // compilation data is cached.
 class V8_EXPORT_PRIVATE CompilationCache {
  public:
+  CompilationCache(const CompilationCache&) = delete;
+  CompilationCache& operator=(const CompilationCache&) = delete;
+
   // Finds the script shared function info for a source
   // string. Returns an empty handle if the cache doesn't contain a
   // script for the given source string with the right origin.
@@ -278,8 +281,6 @@ class V8_EXPORT_PRIVATE CompilationCache {
   bool enabled_script_and_eval_;
 
   friend class Isolate;
-
-  DISALLOW_COPY_AND_ASSIGN(CompilationCache);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/compiler.cc b/deps/v8/src/codegen/compiler.cc
index bb51b3be1ee40f..b8d9c25677a676 100644
--- a/deps/v8/src/codegen/compiler.cc
+++ b/deps/v8/src/codegen/compiler.cc
@@ -37,6 +37,7 @@
 #include "src/heap/local-factory-inl.h"
 #include "src/heap/local-heap-inl.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "src/init/bootstrapper.h"
 #include "src/interpreter/interpreter.h"
 #include "src/logging/log-inl.h"
@@ -229,8 +230,6 @@ void LogFunctionCompilation(CodeEventListener::LogEventsAndTags tag,
                                    line_num, column_num));
   if (!FLAG_log_function_events) return;
 
-  DisallowHeapAllocation no_gc;
-
   std::string name = optimizing ? "optimize" : "compile";
   switch (tag) {
     case CodeEventListener::EVAL_TAG:
@@ -247,9 +246,11 @@ void LogFunctionCompilation(CodeEventListener::LogEventsAndTags tag,
       UNREACHABLE();
   }
 
+  Handle<String> debug_name = SharedFunctionInfo::DebugName(shared);
+  DisallowGarbageCollection no_gc;
   LOG(isolate, FunctionEvent(name.c_str(), script->id(), time_taken_ms,
                              shared->StartPosition(), shared->EndPosition(),
-                             shared->DebugName()));
+                             *debug_name));
 }
 
 ScriptOriginOptions OriginOptionsForEval(Object script) {
@@ -299,7 +300,7 @@ void RecordUnoptimizedCompilationStats(Isolate* isolate,
                                        Handle<SharedFunctionInfo> shared_info) {
   int code_size;
   if (shared_info->HasBytecodeArray()) {
-    code_size = shared_info->GetBytecodeArray().SizeIncludingMetadata();
+    code_size = shared_info->GetBytecodeArray(isolate).SizeIncludingMetadata();
   } else {
     code_size = shared_info->asm_wasm_data().Size();
   }
@@ -320,7 +321,7 @@ void RecordUnoptimizedFunctionCompilation(
   Handle<AbstractCode> abstract_code;
   if (shared->HasBytecodeArray()) {
     abstract_code =
-        handle(AbstractCode::cast(shared->GetBytecodeArray()), isolate);
+        handle(AbstractCode::cast(shared->GetBytecodeArray(isolate)), isolate);
   } else {
     DCHECK(shared->HasAsmWasmData());
     abstract_code =
@@ -353,7 +354,7 @@ CompilationJob::Status OptimizedCompilationJob::PrepareJob(Isolate* isolate) {
 
 CompilationJob::Status OptimizedCompilationJob::ExecuteJob(
     RuntimeCallStats* stats, LocalIsolate* local_isolate) {
-  DisallowHeapAccess no_heap_access;
+  DCHECK_IMPLIES(local_isolate, local_isolate->heap()->IsParked());
   // Delegate to the underlying implementation.
   DCHECK_EQ(state(), State::kReadyToExecute);
   ScopedTimer t(&time_taken_to_execute_);
@@ -497,7 +498,7 @@ void InstallInterpreterTrampolineCopy(Isolate* isolate,
     DCHECK(!shared_info->HasBytecodeArray());
     return;
   }
-  Handle<BytecodeArray> bytecode_array(shared_info->GetBytecodeArray(),
+  Handle<BytecodeArray> bytecode_array(shared_info->GetBytecodeArray(isolate),
                                        isolate);
 
   Handle<Code> code = isolate->factory()->CopyCode(Handle<Code>::cast(
@@ -839,7 +840,7 @@ V8_WARN_UNUSED_RESULT MaybeHandle<Code> GetCodeFromOptimizedCodeCache(
       RuntimeCallCounterId::kCompileGetFromOptimizedCodeMap);
   Handle<SharedFunctionInfo> shared(function->shared(), function->GetIsolate());
   Isolate* isolate = function->GetIsolate();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Code code;
   if (osr_offset.IsNone() && function->has_feedback_vector()) {
     FeedbackVector feedback_vector = function->feedback_vector();
@@ -958,9 +959,11 @@ bool GetOptimizedCodeNow(OptimizedCompilationJob* job, Isolate* isolate,
   }
 
   {
-    LocalIsolate local_isolate(isolate, ThreadKind::kMain);
+    // Park main thread here to be in the same state as background threads.
+    ParkedScope parked_scope(isolate->main_thread_local_isolate());
     if (job->ExecuteJob(isolate->counters()->runtime_call_stats(),
-                        &local_isolate)) {
+                        isolate->main_thread_local_isolate())) {
+      UnparkedScope unparked_scope(isolate->main_thread_local_isolate());
       CompilerTracer::TraceAbortedJob(isolate, compilation_info);
       return false;
     }
@@ -1446,10 +1449,10 @@ DeferredFinalizationJobData::DeferredFinalizationJobData(
       job_(std::move(job)) {}
 
 BackgroundCompileTask::BackgroundCompileTask(ScriptStreamingData* streamed_data,
-                                             Isolate* isolate)
+                                             Isolate* isolate, ScriptType type)
     : flags_(UnoptimizedCompileFlags::ForToplevelCompile(
           isolate, true, construct_language_mode(FLAG_use_strict),
-          REPLMode::kNo)),
+          REPLMode::kNo, type)),
       compile_state_(isolate),
       info_(std::make_unique<ParseInfo>(isolate, flags_, &compile_state_)),
       isolate_for_local_isolate_(isolate),
@@ -1519,7 +1522,7 @@ namespace {
 // A scope object that ensures a parse info's runtime call stats and stack limit
 // are set correctly during worker-thread compile, and restores it after going
 // out of scope.
-class OffThreadParseInfoScope {
+class V8_NODISCARD OffThreadParseInfoScope {
  public:
   OffThreadParseInfoScope(
       ParseInfo* parse_info,
@@ -1532,6 +1535,9 @@ class OffThreadParseInfoScope {
                                    worker_thread_scope_.Get());
   }
 
+  OffThreadParseInfoScope(const OffThreadParseInfoScope&) = delete;
+  OffThreadParseInfoScope& operator=(const OffThreadParseInfoScope&) = delete;
+
   ~OffThreadParseInfoScope() {
     DCHECK_NOT_NULL(parse_info_);
     parse_info_->SetPerThreadState(original_stack_limit_,
@@ -1543,8 +1549,6 @@ class OffThreadParseInfoScope {
   RuntimeCallStats* original_runtime_call_stats_;
   uintptr_t original_stack_limit_;
   WorkerThreadRuntimeCallStatsScope worker_thread_scope_;
-
-  DISALLOW_COPY_AND_ASSIGN(OffThreadParseInfoScope);
 };
 
 }  // namespace
@@ -1575,7 +1579,7 @@ void BackgroundCompileTask::Run() {
   // Save the language mode.
   language_mode_ = info_->language_mode();
 
-  if (!FLAG_finalize_streaming_on_background) {
+  if (!FLAG_finalize_streaming_on_background || info_->flags().is_module()) {
     if (info_->literal() != nullptr) {
       CompileOnBackgroundThread(info_.get(), compile_state_.allocator(),
                                 &compilation_jobs_);
@@ -1591,9 +1595,9 @@ void BackgroundCompileTask::Run() {
 
     // We don't have the script source, origin, or details yet, so use default
     // values for them. These will be fixed up during the main-thread merge.
-    Handle<Script> script =
-        info_->CreateScript(&isolate, isolate.factory()->empty_string(),
-                            kNullMaybeHandle, ScriptOriginOptions());
+    Handle<Script> script = info_->CreateScript(
+        &isolate, isolate.factory()->empty_string(), kNullMaybeHandle,
+        ScriptOriginOptions(false, false, false, info_->flags().is_module()));
 
     parser_->HandleSourceURLComments(&isolate, script);
 
@@ -1652,7 +1656,7 @@ bool Compiler::CollectSourcePositions(Isolate* isolate,
                                       Handle<SharedFunctionInfo> shared_info) {
   DCHECK(shared_info->is_compiled());
   DCHECK(shared_info->HasBytecodeArray());
-  DCHECK(!shared_info->GetBytecodeArray().HasSourcePositionTable());
+  DCHECK(!shared_info->GetBytecodeArray(isolate).HasSourcePositionTable());
 
   // Source position collection should be context independent.
   NullContextScope null_context_scope(isolate);
@@ -1660,10 +1664,9 @@ bool Compiler::CollectSourcePositions(Isolate* isolate,
   // Collecting source positions requires allocating a new source position
   // table.
   DCHECK(AllowHeapAllocation::IsAllowed());
-  DCHECK(AllowGarbageCollection::IsAllowed());
 
   Handle<BytecodeArray> bytecode =
-      handle(shared_info->GetBytecodeArray(), isolate);
+      handle(shared_info->GetBytecodeArray(isolate), isolate);
 
   // TODO(v8:8510): Push the CLEAR_EXCEPTION flag or something like it down into
   // the parser so it aborts without setting a pending exception, which then
@@ -1732,7 +1735,7 @@ bool Compiler::CollectSourcePositions(Isolate* isolate,
       shared_info->GetDebugInfo().HasInstrumentedBytecodeArray()) {
     ByteArray source_position_table =
         job->compilation_info()->bytecode_array()->SourcePositionTable();
-    shared_info->GetDebugBytecodeArray().set_source_position_table(
+    shared_info->GetActiveBytecodeArray().set_source_position_table(
         source_position_table, kReleaseStore);
   }
 
@@ -1915,9 +1918,6 @@ bool Compiler::CompileOptimized(Handle<JSFunction> function,
                                 ConcurrencyMode mode, CodeKind code_kind) {
   DCHECK(CodeKindIsOptimizedJSFunction(code_kind));
 
-  // If the requested code kind is already available, do nothing.
-  if (function->HasAvailableCodeKind(code_kind)) return true;
-
   Isolate* isolate = function->GetIsolate();
   DCHECK(AllowCompilation::IsAllowed(isolate));
 
@@ -1938,7 +1938,8 @@ bool Compiler::CompileOptimized(Handle<JSFunction> function,
   // Check postconditions on success.
   DCHECK(!isolate->has_pending_exception());
   DCHECK(function->shared().is_compiled());
-  DCHECK(function->is_compiled());
+  DCHECK(IsForNativeContextIndependentCachingOnly(code_kind) ||
+         function->is_compiled());
   if (UsesOptimizationMarker(code_kind)) {
     DCHECK_IMPLIES(function->HasOptimizationMarker(),
                    function->IsInOptimizationQueue());
@@ -2004,12 +2005,12 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
     UnoptimizedCompileFlags flags = UnoptimizedCompileFlags::ForToplevelCompile(
         isolate, true, language_mode, REPLMode::kNo);
     flags.set_is_eval(true);
+    DCHECK(!flags.is_module());
     flags.set_parse_restriction(restriction);
 
     UnoptimizedCompileState compile_state(isolate);
     ParseInfo parse_info(isolate, flags, &compile_state);
     parse_info.set_parameters_end_pos(parameters_end_pos);
-    DCHECK(!parse_info.flags().is_module());
 
     MaybeHandle<ScopeInfo> maybe_outer_scope_info;
     if (!context->IsNativeContext()) {
@@ -2050,11 +2051,14 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
   Handle<JSFunction> result;
   if (eval_result.has_shared()) {
     if (eval_result.has_feedback_cell()) {
-      result = isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          shared_info, context, feedback_cell, AllocationType::kYoung);
+      result = Factory::JSFunctionBuilder{isolate, shared_info, context}
+                   .set_feedback_cell(feedback_cell)
+                   .set_allocation_type(AllocationType::kYoung)
+                   .Build();
     } else {
-      result = isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          shared_info, context, AllocationType::kYoung);
+      result = Factory::JSFunctionBuilder{isolate, shared_info, context}
+                   .set_allocation_type(AllocationType::kYoung)
+                   .Build();
       JSFunction::InitializeFeedbackCell(result, &is_compiled_scope);
       if (allow_eval_cache) {
         // Make sure to cache this result.
@@ -2065,8 +2069,9 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
       }
     }
   } else {
-    result = isolate->factory()->NewFunctionFromSharedFunctionInfo(
-        shared_info, context, AllocationType::kYoung);
+    result = Factory::JSFunctionBuilder{isolate, shared_info, context}
+                 .set_allocation_type(AllocationType::kYoung)
+                 .Build();
     JSFunction::InitializeFeedbackCell(result, &is_compiled_scope);
     if (allow_eval_cache) {
       // Add the SharedFunctionInfo and the LiteralsArray to the eval cache if
@@ -2449,7 +2454,7 @@ struct ScriptCompileTimerScope {
 
 void SetScriptFieldsFromDetails(Isolate* isolate, Script script,
                                 Compiler::ScriptDetails script_details,
-                                DisallowHeapAllocation* no_gc) {
+                                DisallowGarbageCollection* no_gc) {
   Handle<Object> script_name;
   if (script_details.name_obj.ToHandle(&script_name)) {
     script.set_name(*script_name);
@@ -2479,7 +2484,7 @@ Handle<Script> NewScript(
   // Create a script object describing the script to be compiled.
   Handle<Script> script = parse_info->CreateScript(
       isolate, source, maybe_wrapped_arguments, origin_options, natives);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   SetScriptFieldsFromDetails(isolate, *script, script_details, &no_gc);
   LOG(isolate, ScriptDetails(*script));
   return script;
@@ -2506,13 +2511,15 @@ MaybeHandle<SharedFunctionInfo> CompileScriptOnMainThread(
 
 class StressBackgroundCompileThread : public base::Thread {
  public:
-  StressBackgroundCompileThread(Isolate* isolate, Handle<String> source)
+  StressBackgroundCompileThread(Isolate* isolate, Handle<String> source,
+                                ScriptType type)
       : base::Thread(
             base::Thread::Options("StressBackgroundCompileThread", 2 * i::MB)),
         source_(source),
         streamed_source_(std::make_unique<SourceStream>(source, isolate),
                          v8::ScriptCompiler::StreamedSource::UTF8) {
-    data()->task = std::make_unique<i::BackgroundCompileTask>(data(), isolate);
+    data()->task =
+        std::make_unique<i::BackgroundCompileTask>(data(), isolate, type);
   }
 
   void Run() override { data()->task->Run(); }
@@ -2577,7 +2584,9 @@ MaybeHandle<SharedFunctionInfo> CompileScriptOnBothBackgroundAndMainThread(
     ScriptOriginOptions origin_options, Isolate* isolate,
     IsCompiledScope* is_compiled_scope) {
   // Start a background thread compiling the script.
-  StressBackgroundCompileThread background_compile_thread(isolate, source);
+  StressBackgroundCompileThread background_compile_thread(
+      isolate, source,
+      origin_options.IsModule() ? ScriptType::kModule : ScriptType::kClassic);
 
   UnoptimizedCompileFlags flags_copy =
       background_compile_thread.data()->task->flags();
@@ -2719,10 +2728,11 @@ MaybeHandle<SharedFunctionInfo> Compiler::GetSharedFunctionInfoForScript(
       UnoptimizedCompileFlags flags =
           UnoptimizedCompileFlags::ForToplevelCompile(
               isolate, natives == NOT_NATIVES_CODE, language_mode,
-              script_details.repl_mode);
+              script_details.repl_mode,
+              origin_options.IsModule() ? ScriptType::kModule
+                                        : ScriptType::kClassic);
 
       flags.set_is_eager(compile_options == ScriptCompiler::kEagerCompile);
-      flags.set_is_module(origin_options.IsModule());
 
       maybe_result = CompileScriptOnMainThread(
           flags, source, script_details, origin_options, natives, extension,
@@ -2831,8 +2841,9 @@ MaybeHandle<JSFunction> Compiler::GetWrappedFunction(
   }
   DCHECK(is_compiled_scope.is_compiled());
 
-  return isolate->factory()->NewFunctionFromSharedFunctionInfo(
-      wrapped, context, AllocationType::kYoung);
+  return Factory::JSFunctionBuilder{isolate, wrapped, context}
+      .set_allocation_type(AllocationType::kYoung)
+      .Build();
 }
 
 // static
@@ -2841,7 +2852,6 @@ Compiler::GetSharedFunctionInfoForStreamedScript(
     Isolate* isolate, Handle<String> source,
     const ScriptDetails& script_details, ScriptOriginOptions origin_options,
     ScriptStreamingData* streaming_data) {
-  DCHECK(!origin_options.IsModule());
   DCHECK(!origin_options.IsWasm());
 
   ScriptCompileTimerScope compile_timer(
@@ -2875,7 +2885,7 @@ Compiler::GetSharedFunctionInfoForStreamedScript(
     // the isolate cache.
 
     Handle<Script> script;
-    if (FLAG_finalize_streaming_on_background) {
+    if (FLAG_finalize_streaming_on_background && !origin_options.IsModule()) {
       RuntimeCallTimerScope runtimeTimerScope(
           isolate, RuntimeCallCounterId::kCompilePublishBackgroundFinalization);
       TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"),
@@ -2904,6 +2914,7 @@ Compiler::GetSharedFunctionInfoForStreamedScript(
     } else {
       ParseInfo* parse_info = task->info();
       DCHECK(parse_info->flags().is_toplevel());
+      DCHECK_EQ(parse_info->flags().is_module(), origin_options.IsModule());
 
       script = parse_info->CreateScript(isolate, source, kNullMaybeHandle,
                                         origin_options);
@@ -2936,7 +2947,7 @@ Compiler::GetSharedFunctionInfoForStreamedScript(
     // Set the script fields after finalization, to keep this path the same
     // between main-thread and off-thread finalization.
     {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       SetScriptFieldsFromDetails(isolate, *script, script_details, &no_gc);
       LOG(isolate, ScriptDetails(*script));
     }
@@ -3097,14 +3108,20 @@ void Compiler::PostInstantiation(Handle<JSFunction> function) {
   if (is_compiled_scope.is_compiled() && shared->HasBytecodeArray()) {
     JSFunction::InitializeFeedbackCell(function, &is_compiled_scope);
 
-    Code code = function->has_feedback_vector()
-                    ? function->feedback_vector().optimized_code()
-                    : Code();
-    if (!code.is_null()) {
-      // Caching of optimized code enabled and optimized code found.
-      DCHECK(!code.marked_for_deoptimization());
-      DCHECK(function->shared().is_compiled());
-      function->set_code(code);
+    if (function->has_feedback_vector()) {
+      // Evict any deoptimized code on feedback vector. We need to do this after
+      // creating the closure, since any heap allocations could trigger a GC and
+      // deoptimized the code on the feedback vector. So check for any
+      // deoptimized code just before installing it on the funciton.
+      function->feedback_vector().EvictOptimizedCodeMarkedForDeoptimization(
+          *shared, "new function from shared function info");
+      Code code = function->feedback_vector().optimized_code();
+      if (!code.is_null()) {
+        // Caching of optimized code enabled and optimized code found.
+        DCHECK(!code.marked_for_deoptimization());
+        DCHECK(function->shared().is_compiled());
+        function->set_code(code);
+      }
     }
 
     if (FLAG_always_opt && shared->allows_lazy_compilation() &&
diff --git a/deps/v8/src/codegen/compiler.h b/deps/v8/src/codegen/compiler.h
index c599841a019751..cc06e36effde84 100644
--- a/deps/v8/src/codegen/compiler.h
+++ b/deps/v8/src/codegen/compiler.h
@@ -330,15 +330,15 @@ class OptimizedCompilationJob : public CompilationJob {
         compiler_name_(compiler_name) {}
 
   // Prepare the compile job. Must be called on the main thread.
-  V8_WARN_UNUSED_RESULT Status PrepareJob(Isolate* isolate);
+  V8_EXPORT_PRIVATE V8_WARN_UNUSED_RESULT Status PrepareJob(Isolate* isolate);
 
   // Executes the compile job. Can be called on a background thread if
   // can_execute_on_background_thread() returns true.
-  V8_WARN_UNUSED_RESULT Status
+  V8_EXPORT_PRIVATE V8_WARN_UNUSED_RESULT Status
   ExecuteJob(RuntimeCallStats* stats, LocalIsolate* local_isolate = nullptr);
 
   // Finalizes the compile job. Must be called on the main thread.
-  V8_WARN_UNUSED_RESULT Status FinalizeJob(Isolate* isolate);
+  V8_EXPORT_PRIVATE V8_WARN_UNUSED_RESULT Status FinalizeJob(Isolate* isolate);
 
   // Report a transient failure, try again next time. Should only be called on
   // optimization compilation jobs.
@@ -438,12 +438,12 @@ class DeferredFinalizationJobData {
 // A wrapper around a OptimizedCompilationInfo that detaches the Handles from
 // the underlying PersistentHandlesScope and stores them in info_ on
 // destruction.
-class CompilationHandleScope final {
+class V8_NODISCARD CompilationHandleScope final {
  public:
   explicit CompilationHandleScope(Isolate* isolate,
                                   OptimizedCompilationInfo* info)
       : persistent_(isolate), info_(info) {}
-  ~CompilationHandleScope();
+  V8_EXPORT_PRIVATE ~CompilationHandleScope();
 
  private:
   PersistentHandlesScope persistent_;
@@ -459,7 +459,10 @@ class V8_EXPORT_PRIVATE BackgroundCompileTask {
   // script associated with |data| and can be finalized with
   // Compiler::GetSharedFunctionInfoForStreamedScript.
   // Note: does not take ownership of |data|.
-  BackgroundCompileTask(ScriptStreamingData* data, Isolate* isolate);
+  BackgroundCompileTask(ScriptStreamingData* data, Isolate* isolate,
+                        v8::ScriptType type);
+  BackgroundCompileTask(const BackgroundCompileTask&) = delete;
+  BackgroundCompileTask& operator=(const BackgroundCompileTask&) = delete;
   ~BackgroundCompileTask();
 
   // Creates a new task that when run will parse and compile the
@@ -533,8 +536,6 @@ class V8_EXPORT_PRIVATE BackgroundCompileTask {
   WorkerThreadRuntimeCallStats* worker_thread_runtime_call_stats_;
   TimedHistogram* timer_;
   LanguageMode language_mode_;
-
-  DISALLOW_COPY_AND_ASSIGN(BackgroundCompileTask);
 };
 
 // Contains all data which needs to be transmitted between threads for
@@ -543,6 +544,8 @@ struct ScriptStreamingData {
   ScriptStreamingData(
       std::unique_ptr<ScriptCompiler::ExternalSourceStream> source_stream,
       ScriptCompiler::StreamedSource::Encoding encoding);
+  ScriptStreamingData(const ScriptStreamingData&) = delete;
+  ScriptStreamingData& operator=(const ScriptStreamingData&) = delete;
   ~ScriptStreamingData();
 
   void Release();
@@ -553,8 +556,6 @@ struct ScriptStreamingData {
 
   // Task that performs background parsing and compilation.
   std::unique_ptr<BackgroundCompileTask> task;
-
-  DISALLOW_COPY_AND_ASSIGN(ScriptStreamingData);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/constant-pool.h b/deps/v8/src/codegen/constant-pool.h
index 581644b917025a..122561bbd57fba 100644
--- a/deps/v8/src/codegen/constant-pool.h
+++ b/deps/v8/src/codegen/constant-pool.h
@@ -282,7 +282,7 @@ class ConstantPool {
   void SetNextCheckIn(size_t instructions);
 
   // Class for scoping postponing the constant pool generation.
-  class V8_EXPORT_PRIVATE BlockScope {
+  class V8_EXPORT_PRIVATE V8_NODISCARD BlockScope {
    public:
     // BlockScope immediatelly emits the pool if necessary to ensure that
     // during the block scope at least {margin} bytes can be emitted without
diff --git a/deps/v8/src/codegen/cpu-features.h b/deps/v8/src/codegen/cpu-features.h
index eef98f77e781fc..7e0951ba92dee0 100644
--- a/deps/v8/src/codegen/cpu-features.h
+++ b/deps/v8/src/codegen/cpu-features.h
@@ -20,6 +20,7 @@ enum CpuFeature {
   SSE3,
   SAHF,
   AVX,
+  AVX2,
   FMA3,
   BMI1,
   BMI2,
@@ -83,6 +84,9 @@ enum CpuFeature {
 //   }
 class V8_EXPORT_PRIVATE CpuFeatures : public AllStatic {
  public:
+  CpuFeatures(const CpuFeatures&) = delete;
+  CpuFeatures& operator=(const CpuFeatures&) = delete;
+
   static void Probe(bool cross_compile) {
     STATIC_ASSERT(NUMBER_OF_CPU_FEATURES <= kBitsPerInt);
     if (initialized_) return;
@@ -129,7 +133,6 @@ class V8_EXPORT_PRIVATE CpuFeatures : public AllStatic {
   static unsigned icache_line_size_;
   static unsigned dcache_line_size_;
   static bool initialized_;
-  DISALLOW_COPY_AND_ASSIGN(CpuFeatures);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/external-reference-encoder.h b/deps/v8/src/codegen/external-reference-encoder.h
index 7c41206f07f0d4..86b91e69373e23 100644
--- a/deps/v8/src/codegen/external-reference-encoder.h
+++ b/deps/v8/src/codegen/external-reference-encoder.h
@@ -34,6 +34,8 @@ class ExternalReferenceEncoder {
   };
 
   explicit ExternalReferenceEncoder(Isolate* isolate);
+  ExternalReferenceEncoder(const ExternalReferenceEncoder&) = delete;
+  ExternalReferenceEncoder& operator=(const ExternalReferenceEncoder&) = delete;
 #ifdef DEBUG
   ~ExternalReferenceEncoder();
 #endif  // DEBUG
@@ -50,8 +52,6 @@ class ExternalReferenceEncoder {
   std::vector<int> count_;
   const intptr_t* api_references_;
 #endif  // DEBUG
-
-  DISALLOW_COPY_AND_ASSIGN(ExternalReferenceEncoder);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/external-reference-table.cc b/deps/v8/src/codegen/external-reference-table.cc
index b43f1a2405f4d6..2741bd8ec2a442 100644
--- a/deps/v8/src/codegen/external-reference-table.cc
+++ b/deps/v8/src/codegen/external-reference-table.cc
@@ -12,7 +12,10 @@
 #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
 #define SYMBOLIZE_FUNCTION
 #include <execinfo.h>
+
 #include <vector>
+
+#include "src/base/platform/wrappers.h"
 #endif  // DEBUG && V8_OS_LINUX && !V8_OS_ANDROID
 
 namespace v8 {
@@ -98,7 +101,7 @@ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
   const char* name = names[0];
   // The array of names is malloc'ed. However, each name string is static
   // and do not need to be freed.
-  free(names);
+  base::Free(names);
   return name;
 #else
   return "<unresolved>";
diff --git a/deps/v8/src/codegen/external-reference-table.h b/deps/v8/src/codegen/external-reference-table.h
index 798859b185b470..9f75d0fa74185f 100644
--- a/deps/v8/src/codegen/external-reference-table.h
+++ b/deps/v8/src/codegen/external-reference-table.h
@@ -71,6 +71,8 @@ class ExternalReferenceTable {
   }
 
   ExternalReferenceTable() = default;
+  ExternalReferenceTable(const ExternalReferenceTable&) = delete;
+  ExternalReferenceTable& operator=(const ExternalReferenceTable&) = delete;
   void Init(Isolate* isolate);
 
  private:
@@ -99,8 +101,6 @@ class ExternalReferenceTable {
   // This field is uint32_t since the MacroAssembler and CodeStubAssembler
   // accesses this field as a uint32_t.
   uint32_t dummy_stats_counter_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(ExternalReferenceTable);
 };
 
 STATIC_ASSERT(ExternalReferenceTable::kSizeInBytes ==
diff --git a/deps/v8/src/codegen/external-reference.cc b/deps/v8/src/codegen/external-reference.cc
index 499e5c5f3759a5..1c2d227aa23e0b 100644
--- a/deps/v8/src/codegen/external-reference.cc
+++ b/deps/v8/src/codegen/external-reference.cc
@@ -33,6 +33,7 @@
 #include "src/wasm/wasm-external-refs.h"
 
 #ifdef V8_INTL_SUPPORT
+#include "src/base/platform/wrappers.h"
 #include "src/objects/intl-objects.h"
 #endif  // V8_INTL_SUPPORT
 
@@ -427,6 +428,10 @@ ExternalReference::address_of_mock_arraybuffer_allocator_flag() {
   return ExternalReference(&FLAG_mock_arraybuffer_allocator);
 }
 
+ExternalReference ExternalReference::address_of_builtin_subclassing_flag() {
+  return ExternalReference(&FLAG_builtin_subclassing);
+}
+
 ExternalReference ExternalReference::address_of_runtime_stats_flag() {
   return ExternalReference(&TracingFlags::runtime_stats);
 }
@@ -610,7 +615,7 @@ void* libc_memchr(void* string, int character, size_t search_length) {
 FUNCTION_REFERENCE(libc_memchr_function, libc_memchr)
 
 void* libc_memcpy(void* dest, const void* src, size_t n) {
-  return memcpy(dest, src, n);
+  return base::Memcpy(dest, src, n);
 }
 
 FUNCTION_REFERENCE(libc_memcpy_function, libc_memcpy)
@@ -659,10 +664,53 @@ ExternalReference ExternalReference::search_string_raw_two_two() {
   return search_string_raw<const uc16, const uc16>();
 }
 
+namespace {
+
+void StringWriteToFlatOneByte(Address source, uint8_t* sink, int32_t from,
+                              int32_t to) {
+  return String::WriteToFlat<uint8_t>(String::cast(Object(source)), sink, from,
+                                      to);
+}
+
+void StringWriteToFlatTwoByte(Address source, uint16_t* sink, int32_t from,
+                              int32_t to) {
+  return String::WriteToFlat<uint16_t>(String::cast(Object(source)), sink, from,
+                                       to);
+}
+
+const uint8_t* ExternalOneByteStringGetChars(Address string) {
+  // The following CHECK is a workaround to prevent a CFI bug where
+  // ExternalOneByteStringGetChars() and ExternalTwoByteStringGetChars() are
+  // merged by the linker, resulting in one of the input type's vtable address
+  // failing the address range check.
+  // TODO(chromium:1160961): Consider removing the CHECK when CFI is fixed.
+  CHECK(Object(string).IsExternalOneByteString());
+  return ExternalOneByteString::cast(Object(string)).GetChars();
+}
+const uint16_t* ExternalTwoByteStringGetChars(Address string) {
+  // The following CHECK is a workaround to prevent a CFI bug where
+  // ExternalOneByteStringGetChars() and ExternalTwoByteStringGetChars() are
+  // merged by the linker, resulting in one of the input type's vtable address
+  // failing the address range check.
+  // TODO(chromium:1160961): Consider removing the CHECK when CFI is fixed.
+  CHECK(Object(string).IsExternalTwoByteString());
+  return ExternalTwoByteString::cast(Object(string)).GetChars();
+}
+
+}  // namespace
+
+FUNCTION_REFERENCE(string_write_to_flat_one_byte, StringWriteToFlatOneByte)
+FUNCTION_REFERENCE(string_write_to_flat_two_byte, StringWriteToFlatTwoByte)
+
+FUNCTION_REFERENCE(external_one_byte_string_get_chars,
+                   ExternalOneByteStringGetChars)
+FUNCTION_REFERENCE(external_two_byte_string_get_chars,
+                   ExternalTwoByteStringGetChars)
+
 FUNCTION_REFERENCE(orderedhashmap_gethash_raw, OrderedHashMap::GetHash)
 
 Address GetOrCreateHash(Isolate* isolate, Address raw_key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return Object(raw_key).GetOrCreateHash(isolate).ptr();
 }
 
@@ -677,7 +725,7 @@ FUNCTION_REFERENCE(jsreceiver_create_identity_hash,
                    JSReceiverCreateIdentityHash)
 
 static uint32_t ComputeSeededIntegerHash(Isolate* isolate, int32_t key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return ComputeSeededHash(static_cast<uint32_t>(key), HashSeed(isolate));
 }
 
@@ -825,6 +873,12 @@ ExternalReference ExternalReference::fast_c_call_caller_pc_address(
       isolate->isolate_data()->fast_c_call_caller_pc_address());
 }
 
+ExternalReference ExternalReference::fast_api_call_target_address(
+    Isolate* isolate) {
+  return ExternalReference(
+      isolate->isolate_data()->fast_api_call_target_address());
+}
+
 ExternalReference ExternalReference::stack_is_iterable_address(
     Isolate* isolate) {
   return ExternalReference(
diff --git a/deps/v8/src/codegen/external-reference.h b/deps/v8/src/codegen/external-reference.h
index 72a3397007c1e3..cef36a5d27e084 100644
--- a/deps/v8/src/codegen/external-reference.h
+++ b/deps/v8/src/codegen/external-reference.h
@@ -71,6 +71,7 @@ class StatsCounter;
     "IsolateData::fast_c_call_caller_fp_address")                              \
   V(fast_c_call_caller_pc_address,                                             \
     "IsolateData::fast_c_call_caller_pc_address")                              \
+  V(fast_api_call_target_address, "IsolateData::fast_api_call_target_address") \
   V(stack_is_iterable_address, "IsolateData::stack_is_iterable_address")       \
   V(address_of_regexp_stack_limit_address,                                     \
     "RegExpStack::limit_address_address()")                                    \
@@ -107,6 +108,7 @@ class StatsCounter;
   V(address_of_min_int, "LDoubleConstant::min_int")                            \
   V(address_of_mock_arraybuffer_allocator_flag,                                \
     "FLAG_mock_arraybuffer_allocator")                                         \
+  V(address_of_builtin_subclassing_flag, "FLAG_builtin_subclassing")           \
   V(address_of_one_half, "LDoubleConstant::one_half")                          \
   V(address_of_runtime_stats_flag, "TracingFlags::runtime_stats")              \
   V(address_of_the_hole_nan, "the_hole_nan")                                   \
@@ -177,6 +179,10 @@ class StatsCounter;
   V(search_string_raw_one_two, "search_string_raw_one_two")                    \
   V(search_string_raw_two_one, "search_string_raw_two_one")                    \
   V(search_string_raw_two_two, "search_string_raw_two_two")                    \
+  V(string_write_to_flat_one_byte, "string_write_to_flat_one_byte")            \
+  V(string_write_to_flat_two_byte, "string_write_to_flat_two_byte")            \
+  V(external_one_byte_string_get_chars, "external_one_byte_string_get_chars")  \
+  V(external_two_byte_string_get_chars, "external_two_byte_string_get_chars")  \
   V(smi_lexicographic_compare_function, "smi_lexicographic_compare_function")  \
   V(string_to_array_index_function, "String::ToArrayIndex")                    \
   V(try_string_to_index_or_lookup_existing,                                    \
diff --git a/deps/v8/src/codegen/handler-table.h b/deps/v8/src/codegen/handler-table.h
index 0445b68da94b1d..d2ed80a0e05cd4 100644
--- a/deps/v8/src/codegen/handler-table.h
+++ b/deps/v8/src/codegen/handler-table.h
@@ -123,7 +123,7 @@ class V8_EXPORT_PRIVATE HandlerTable {
   // objects on the GC heap (either {ByteArray} or {Code}) and could become
   // stale during a collection. Hence we disallow any allocation.
   const Address raw_encoded_data_;
-  DISALLOW_HEAP_ALLOCATION(no_gc_)
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 
   // Layout description for handler table based on ranges.
   static const int kRangeStartIndex = 0;
diff --git a/deps/v8/src/codegen/ia32/assembler-ia32-inl.h b/deps/v8/src/codegen/ia32/assembler-ia32-inl.h
index 174a4838683df8..74c3168d49ebbd 100644
--- a/deps/v8/src/codegen/ia32/assembler-ia32-inl.h
+++ b/deps/v8/src/codegen/ia32/assembler-ia32-inl.h
@@ -83,7 +83,8 @@ Address RelocInfo::constant_pool_entry_address() { UNREACHABLE(); }
 int RelocInfo::target_address_size() { return Assembler::kSpecialTargetSize; }
 
 HeapObject RelocInfo::target_object() {
-  DCHECK(IsCodeTarget(rmode_) || rmode_ == FULL_EMBEDDED_OBJECT);
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
   return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
 }
 
@@ -92,14 +93,16 @@ HeapObject RelocInfo::target_object_no_host(Isolate* isolate) {
 }
 
 Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
-  DCHECK(IsCodeTarget(rmode_) || rmode_ == FULL_EMBEDDED_OBJECT);
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
   return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
 }
 
 void RelocInfo::set_target_object(Heap* heap, HeapObject target,
                                   WriteBarrierMode write_barrier_mode,
                                   ICacheFlushMode icache_flush_mode) {
-  DCHECK(IsCodeTarget(rmode_) || rmode_ == FULL_EMBEDDED_OBJECT);
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
   WriteUnalignedValue(pc_, target.ptr());
   if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
     FlushInstructionCache(pc_, sizeof(Address));
diff --git a/deps/v8/src/codegen/ia32/assembler-ia32.cc b/deps/v8/src/codegen/ia32/assembler-ia32.cc
index f19c8dd1cdf9d3..7135bf01d1c267 100644
--- a/deps/v8/src/codegen/ia32/assembler-ia32.cc
+++ b/deps/v8/src/codegen/ia32/assembler-ia32.cc
@@ -81,9 +81,10 @@ Immediate Immediate::EmbeddedStringConstant(const StringConstantBase* str) {
 
 namespace {
 
-#if !V8_LIBC_MSVCRT
-
-V8_INLINE uint64_t _xgetbv(unsigned int xcr) {
+V8_INLINE uint64_t xgetbv(unsigned int xcr) {
+#if V8_LIBC_MSVCRT
+  return _xgetbv(xcr);
+#else
   unsigned eax, edx;
   // Check xgetbv; this uses a .byte sequence instead of the instruction
   // directly because older assemblers do not include support for xgetbv and
@@ -91,12 +92,9 @@ V8_INLINE uint64_t _xgetbv(unsigned int xcr) {
   // used.
   __asm__ volatile(".byte 0x0F, 0x01, 0xD0" : "=a"(eax), "=d"(edx) : "c"(xcr));
   return static_cast<uint64_t>(eax) | (static_cast<uint64_t>(edx) << 32);
+#endif
 }
 
-#define _XCR_XFEATURE_ENABLED_MASK 0
-
-#endif  // !V8_LIBC_MSVCRT
-
 bool OSHasAVXSupport() {
 #if V8_OS_MACOSX
   // Mac OS X up to 10.9 has a bug where AVX transitions were indeed being
@@ -116,7 +114,7 @@ bool OSHasAVXSupport() {
   if (kernel_version_major <= 13) return false;
 #endif  // V8_OS_MACOSX
   // Check whether OS claims to support AVX.
-  uint64_t feature_mask = _xgetbv(_XCR_XFEATURE_ENABLED_MASK);
+  uint64_t feature_mask = xgetbv(0);  // XCR_XFEATURE_ENABLED_MASK
   return (feature_mask & 0x6) == 0x6;
 }
 
@@ -139,6 +137,9 @@ void CpuFeatures::ProbeImpl(bool cross_compile) {
       OSHasAVXSupport()) {
     supported_ |= 1u << AVX;
   }
+  if (cpu.has_avx2() && FLAG_enable_avx2 && IsSupported(AVX)) {
+    supported_ |= 1u << AVX2;
+  }
   if (cpu.has_fma3() && FLAG_enable_fma3 && cpu.has_osxsave() &&
       OSHasAVXSupport()) {
     supported_ |= 1u << FMA3;
@@ -157,13 +158,15 @@ void CpuFeatures::ProbeImpl(bool cross_compile) {
 void CpuFeatures::PrintTarget() {}
 void CpuFeatures::PrintFeatures() {
   printf(
-      "SSE3=%d SSSE3=%d SSE4_1=%d AVX=%d FMA3=%d BMI1=%d BMI2=%d LZCNT=%d "
+      "SSE3=%d SSSE3=%d SSE4_1=%d AVX=%d AVX2=%d FMA3=%d BMI1=%d BMI2=%d "
+      "LZCNT=%d "
       "POPCNT=%d ATOM=%d\n",
       CpuFeatures::IsSupported(SSE3), CpuFeatures::IsSupported(SSSE3),
       CpuFeatures::IsSupported(SSE4_1), CpuFeatures::IsSupported(AVX),
-      CpuFeatures::IsSupported(FMA3), CpuFeatures::IsSupported(BMI1),
-      CpuFeatures::IsSupported(BMI2), CpuFeatures::IsSupported(LZCNT),
-      CpuFeatures::IsSupported(POPCNT), CpuFeatures::IsSupported(ATOM));
+      CpuFeatures::IsSupported(AVX2), CpuFeatures::IsSupported(FMA3),
+      CpuFeatures::IsSupported(BMI1), CpuFeatures::IsSupported(BMI2),
+      CpuFeatures::IsSupported(LZCNT), CpuFeatures::IsSupported(POPCNT),
+      CpuFeatures::IsSupported(ATOM));
 }
 
 // -----------------------------------------------------------------------------
@@ -1630,7 +1633,7 @@ void Assembler::jmp_rel(int offset) {
   EnsureSpace ensure_space(this);
   const int short_size = 2;
   const int long_size = 5;
-  if (is_int8(offset - short_size)) {
+  if (is_int8(offset - short_size) && !predictable_code_size()) {
     // 1110 1011 #8-bit disp.
     EMIT(0xEB);
     EMIT((offset - short_size) & 0xFF);
@@ -2397,6 +2400,15 @@ void Assembler::movddup(XMMRegister dst, Operand src) {
   emit_sse_operand(dst, src);
 }
 
+void Assembler::movshdup(XMMRegister dst, XMMRegister src) {
+  DCHECK(IsEnabled(SSE3));
+  EnsureSpace ensure_space(this);
+  EMIT(0xF3);
+  EMIT(0x0F);
+  EMIT(0x16);
+  emit_sse_operand(dst, src);
+}
+
 void Assembler::shufps(XMMRegister dst, XMMRegister src, byte imm8) {
   DCHECK(is_uint8(imm8));
   EnsureSpace ensure_space(this);
@@ -2416,6 +2428,41 @@ void Assembler::shufpd(XMMRegister dst, XMMRegister src, byte imm8) {
   EMIT(imm8);
 }
 
+void Assembler::movhlps(XMMRegister dst, XMMRegister src) {
+  EnsureSpace ensure_space(this);
+  EMIT(0x0F);
+  EMIT(0x12);
+  emit_sse_operand(dst, src);
+}
+
+void Assembler::movlps(XMMRegister dst, Operand src) {
+  EnsureSpace ensure_space(this);
+  EMIT(0x0F);
+  EMIT(0x12);
+  emit_sse_operand(dst, src);
+}
+
+void Assembler::movlps(Operand dst, XMMRegister src) {
+  EnsureSpace ensure_space(this);
+  EMIT(0x0F);
+  EMIT(0x13);
+  emit_sse_operand(src, dst);
+}
+
+void Assembler::movhps(XMMRegister dst, Operand src) {
+  EnsureSpace ensure_space(this);
+  EMIT(0x0F);
+  EMIT(0x16);
+  emit_sse_operand(dst, src);
+}
+
+void Assembler::movhps(Operand dst, XMMRegister src) {
+  EnsureSpace ensure_space(this);
+  EMIT(0x0F);
+  EMIT(0x17);
+  emit_sse_operand(src, dst);
+}
+
 void Assembler::movdqa(Operand dst, XMMRegister src) {
   EnsureSpace ensure_space(this);
   EMIT(0x66);
@@ -2448,6 +2495,14 @@ void Assembler::movdqu(XMMRegister dst, Operand src) {
   emit_sse_operand(dst, src);
 }
 
+void Assembler::movdqu(XMMRegister dst, XMMRegister src) {
+  EnsureSpace ensure_space(this);
+  EMIT(0xF3);
+  EMIT(0x0F);
+  EMIT(0x7F);
+  emit_sse_operand(src, dst);
+}
+
 void Assembler::prefetch(Operand src, int level) {
   DCHECK(is_uint2(level));
   EnsureSpace ensure_space(this);
@@ -2506,6 +2561,18 @@ void Assembler::movd(Operand dst, XMMRegister src) {
   emit_sse_operand(src, dst);
 }
 
+void Assembler::extractps(Operand dst, XMMRegister src, byte imm8) {
+  DCHECK(IsEnabled(SSE4_1));
+  DCHECK(is_uint8(imm8));
+  EnsureSpace ensure_space(this);
+  EMIT(0x66);
+  EMIT(0x0F);
+  EMIT(0x3A);
+  EMIT(0x17);
+  emit_sse_operand(src, dst);
+  EMIT(imm8);
+}
+
 void Assembler::extractps(Register dst, XMMRegister src, byte imm8) {
   DCHECK(IsEnabled(SSE4_1));
   DCHECK(is_uint8(imm8));
@@ -2837,6 +2904,26 @@ void Assembler::vshufpd(XMMRegister dst, XMMRegister src1, Operand src2,
   EMIT(imm8);
 }
 
+void Assembler::vmovhlps(XMMRegister dst, XMMRegister src1, XMMRegister src2) {
+  vinstr(0x12, dst, src1, src2, kNone, k0F, kWIG);
+}
+
+void Assembler::vmovlps(XMMRegister dst, XMMRegister src1, Operand src2) {
+  vinstr(0x12, dst, src1, src2, kNone, k0F, kWIG);
+}
+
+void Assembler::vmovlps(Operand dst, XMMRegister src) {
+  vinstr(0x13, src, xmm0, dst, kNone, k0F, kWIG);
+}
+
+void Assembler::vmovhps(XMMRegister dst, XMMRegister src1, Operand src2) {
+  vinstr(0x16, dst, src1, src2, kNone, k0F, kWIG);
+}
+
+void Assembler::vmovhps(Operand dst, XMMRegister src) {
+  vinstr(0x17, src, xmm0, dst, kNone, k0F, kWIG);
+}
+
 void Assembler::vcmpps(XMMRegister dst, XMMRegister src1, Operand src2,
                        uint8_t cmp) {
   vps(0xC2, dst, src1, src2);
@@ -2919,6 +3006,24 @@ void Assembler::vpshufd(XMMRegister dst, Operand src, uint8_t shuffle) {
   EMIT(shuffle);
 }
 
+void Assembler::vblendvps(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                          XMMRegister mask) {
+  vinstr(0x4A, dst, src1, src2, k66, k0F3A, kW0);
+  EMIT(mask.code() << 4);
+}
+
+void Assembler::vblendvpd(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                          XMMRegister mask) {
+  vinstr(0x4B, dst, src1, src2, k66, k0F3A, kW0);
+  EMIT(mask.code() << 4);
+}
+
+void Assembler::vpblendvb(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                          XMMRegister mask) {
+  vinstr(0x4C, dst, src1, src2, k66, k0F3A, kW0);
+  EMIT(mask.code() << 4);
+}
+
 void Assembler::vpblendw(XMMRegister dst, XMMRegister src1, Operand src2,
                          uint8_t mask) {
   vinstr(0x0E, dst, src1, src2, k66, k0F3A, kWIG);
@@ -2979,6 +3084,14 @@ void Assembler::vroundpd(XMMRegister dst, XMMRegister src, RoundingMode mode) {
   EMIT(static_cast<byte>(mode) | 0x8);  // Mask precision exception.
 }
 
+void Assembler::vmovmskpd(Register dst, XMMRegister src) {
+  DCHECK(IsEnabled(AVX));
+  EnsureSpace ensure_space(this);
+  emit_vex_prefix(xmm0, kL128, k66, k0F, kWIG);
+  EMIT(0x50);
+  emit_sse_operand(dst, src);
+}
+
 void Assembler::vmovmskps(Register dst, XMMRegister src) {
   DCHECK(IsEnabled(AVX));
   EnsureSpace ensure_space(this);
@@ -2995,6 +3108,11 @@ void Assembler::vpmovmskb(Register dst, XMMRegister src) {
   emit_sse_operand(dst, src);
 }
 
+void Assembler::vextractps(Operand dst, XMMRegister src, byte imm8) {
+  vinstr(0x17, src, xmm0, dst, k66, k0F3A, VexW::kWIG);
+  EMIT(imm8);
+}
+
 void Assembler::bmi1(byte op, Register reg, Register vreg, Operand rm) {
   DCHECK(IsEnabled(BMI1));
   EnsureSpace ensure_space(this);
@@ -3081,6 +3199,16 @@ void Assembler::sse4_instr(XMMRegister dst, Operand src, byte prefix,
   emit_sse_operand(dst, src);
 }
 
+void Assembler::vinstr(byte op, XMMRegister dst, XMMRegister src1,
+                       XMMRegister src2, SIMDPrefix pp, LeadingOpcode m,
+                       VexW w) {
+  DCHECK(IsEnabled(AVX));
+  EnsureSpace ensure_space(this);
+  emit_vex_prefix(src1, kL128, pp, m, w);
+  EMIT(op);
+  emit_sse_operand(dst, src2);
+}
+
 void Assembler::vinstr(byte op, XMMRegister dst, XMMRegister src1, Operand src2,
                        SIMDPrefix pp, LeadingOpcode m, VexW w) {
   DCHECK(IsEnabled(AVX));
@@ -3265,13 +3393,21 @@ void Assembler::db(uint8_t data) {
   EMIT(data);
 }
 
-void Assembler::dd(uint32_t data) {
+void Assembler::dd(uint32_t data, RelocInfo::Mode rmode) {
   EnsureSpace ensure_space(this);
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   emit(data);
 }
 
-void Assembler::dq(uint64_t data) {
+void Assembler::dq(uint64_t data, RelocInfo::Mode rmode) {
   EnsureSpace ensure_space(this);
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   emit_q(data);
 }
 
diff --git a/deps/v8/src/codegen/ia32/assembler-ia32.h b/deps/v8/src/codegen/ia32/assembler-ia32.h
index 333daf6da361d5..874bbf7d874ecb 100644
--- a/deps/v8/src/codegen/ia32/assembler-ia32.h
+++ b/deps/v8/src/codegen/ia32/assembler-ia32.h
@@ -861,6 +861,12 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void shufps(XMMRegister dst, XMMRegister src, byte imm8);
   void shufpd(XMMRegister dst, XMMRegister src, byte imm8);
 
+  void movhlps(XMMRegister dst, XMMRegister src);
+  void movlps(XMMRegister dst, Operand src);
+  void movlps(Operand dst, XMMRegister src);
+  void movhps(XMMRegister dst, Operand src);
+  void movhps(Operand dst, XMMRegister src);
+
   void maxss(XMMRegister dst, XMMRegister src) { maxss(dst, Operand(src)); }
   void maxss(XMMRegister dst, Operand src);
   void minss(XMMRegister dst, XMMRegister src) { minss(dst, Operand(src)); }
@@ -982,6 +988,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void movdqa(Operand dst, XMMRegister src);
   void movdqu(XMMRegister dst, Operand src);
   void movdqu(Operand dst, XMMRegister src);
+  void movdqu(XMMRegister dst, XMMRegister src);
   void movdq(bool aligned, XMMRegister dst, Operand src) {
     if (aligned) {
       movdqa(dst, src);
@@ -1001,6 +1008,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void movss(XMMRegister dst, Operand src);
   void movss(Operand dst, XMMRegister src);
   void movss(XMMRegister dst, XMMRegister src) { movss(dst, Operand(src)); }
+
+  void extractps(Operand dst, XMMRegister src, byte imm8);
   void extractps(Register dst, XMMRegister src, byte imm8);
 
   void psllw(XMMRegister reg, uint8_t shift);
@@ -1042,6 +1051,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // SSE3 instructions
   void movddup(XMMRegister dst, Operand src);
   void movddup(XMMRegister dst, XMMRegister src) { movddup(dst, Operand(src)); }
+  void movshdup(XMMRegister dst, XMMRegister src);
 
   // Use SSE4_1 encoding for pextrw reg, xmm, imm8 for consistency
   void pextrw(Register dst, XMMRegister src, uint8_t offset) {
@@ -1334,10 +1344,32 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vsqrtpd(XMMRegister dst, Operand src) {
     vinstr(0x51, dst, xmm0, src, k66, k0F, kWIG);
   }
+  void vmovss(Operand dst, XMMRegister src) {
+    vinstr(0x11, src, xmm0, dst, kF3, k0F, kWIG);
+  }
+  void vmovss(XMMRegister dst, XMMRegister src1, XMMRegister src2) {
+    vinstr(0x10, dst, src1, src2, kF3, k0F, kWIG);
+  }
+  void vmovss(XMMRegister dst, Operand src) {
+    vinstr(0x10, dst, xmm0, src, kF3, k0F, kWIG);
+  }
+  void vmovsd(Operand dst, XMMRegister src) {
+    vinstr(0x11, src, xmm0, dst, kF2, k0F, kWIG);
+  }
+  void vmovsd(XMMRegister dst, XMMRegister src1, XMMRegister src2) {
+    vinstr(0x10, dst, src1, src2, kF2, k0F, kWIG);
+  }
+  void vmovsd(XMMRegister dst, Operand src) {
+    vinstr(0x10, dst, xmm0, src, kF2, k0F, kWIG);
+  }
+
+  void vextractps(Operand dst, XMMRegister src, byte imm8);
+
   void vmovaps(XMMRegister dst, XMMRegister src) { vmovaps(dst, Operand(src)); }
   void vmovaps(XMMRegister dst, Operand src) { vps(0x28, dst, xmm0, src); }
   void vmovapd(XMMRegister dst, XMMRegister src) { vmovapd(dst, Operand(src)); }
   void vmovapd(XMMRegister dst, Operand src) { vpd(0x28, dst, xmm0, src); }
+  void vmovups(Operand dst, XMMRegister src) { vps(0x11, src, xmm0, dst); }
   void vmovups(XMMRegister dst, XMMRegister src) { vmovups(dst, Operand(src)); }
   void vmovups(XMMRegister dst, Operand src) { vps(0x10, dst, xmm0, src); }
   void vmovupd(XMMRegister dst, Operand src) { vpd(0x10, dst, xmm0, src); }
@@ -1350,6 +1382,12 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   }
   void vshufpd(XMMRegister dst, XMMRegister src1, Operand src2, byte imm8);
 
+  void vmovhlps(XMMRegister dst, XMMRegister src1, XMMRegister src2);
+  void vmovlps(XMMRegister dst, XMMRegister src1, Operand src2);
+  void vmovlps(Operand dst, XMMRegister src);
+  void vmovhps(XMMRegister dst, XMMRegister src1, Operand src2);
+  void vmovhps(Operand dst, XMMRegister src);
+
   void vpsllw(XMMRegister dst, XMMRegister src, uint8_t imm8);
   void vpslld(XMMRegister dst, XMMRegister src, uint8_t imm8);
   void vpsllq(XMMRegister dst, XMMRegister src, uint8_t imm8);
@@ -1372,6 +1410,13 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   }
   void vpshufd(XMMRegister dst, Operand src, uint8_t shuffle);
 
+  void vblendvps(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                 XMMRegister mask);
+  void vblendvpd(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                 XMMRegister mask);
+  void vpblendvb(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                 XMMRegister mask);
+
   void vpblendw(XMMRegister dst, XMMRegister src1, XMMRegister src2,
                 uint8_t mask) {
     vpblendw(dst, src1, Operand(src2), mask);
@@ -1441,6 +1486,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vmovddup(XMMRegister dst, XMMRegister src) {
     vmovddup(dst, Operand(src));
   }
+  void vmovshdup(XMMRegister dst, XMMRegister src) {
+    vinstr(0x16, dst, xmm0, src, kF3, k0F, kWIG);
+  }
   void vbroadcastss(XMMRegister dst, Operand src) {
     vinstr(0x18, dst, xmm0, src, k66, k0F38, kW0);
   }
@@ -1459,6 +1507,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
     vinstr(0x7E, src, xmm0, dst, k66, k0F, kWIG);
   }
 
+  void vmovmskpd(Register dst, XMMRegister src);
   void vmovmskps(Register dst, XMMRegister src);
 
   void vpmovmskb(Register dst, XMMRegister src);
@@ -1657,6 +1706,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
 
   SSE4_INSTRUCTION_LIST(DECLARE_SSE4_INSTRUCTION)
   SSE4_RM_INSTRUCTION_LIST(DECLARE_SSE4_INSTRUCTION)
+  DECLARE_SSE4_INSTRUCTION(blendvps, 66, 0F, 38, 14)
+  DECLARE_SSE4_INSTRUCTION(blendvpd, 66, 0F, 38, 15)
+  DECLARE_SSE4_INSTRUCTION(pblendvb, 66, 0F, 38, 10)
 #undef DECLARE_SSE4_INSTRUCTION
 
 #define DECLARE_SSE34_AVX_INSTRUCTION(instruction, prefix, escape1, escape2,  \
@@ -1704,9 +1756,11 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // Writes a single byte or word of data in the code stream.  Used for
   // inline tables, e.g., jump-tables.
   void db(uint8_t data);
-  void dd(uint32_t data);
-  void dq(uint64_t data);
-  void dp(uintptr_t data) { dd(data); }
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    dd(data, rmode);
+  }
   void dd(Label* label);
 
   // Check if there is less than kGap bytes available in the buffer.
@@ -1806,6 +1860,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
                    byte escape2, byte opcode);
   void sse4_instr(XMMRegister dst, Operand src, byte prefix, byte escape1,
                   byte escape2, byte opcode);
+  void vinstr(byte op, XMMRegister dst, XMMRegister src1, XMMRegister src2,
+              SIMDPrefix pp, LeadingOpcode m, VexW w);
   void vinstr(byte op, XMMRegister dst, XMMRegister src1, Operand src2,
               SIMDPrefix pp, LeadingOpcode m, VexW w);
   // Most BMI instructions are similar.
diff --git a/deps/v8/src/codegen/ia32/interface-descriptors-ia32.cc b/deps/v8/src/codegen/ia32/interface-descriptors-ia32.cc
index ee9c3aac1cbc7c..24f4f5df088aed 100644
--- a/deps/v8/src/codegen/ia32/interface-descriptors-ia32.cc
+++ b/deps/v8/src/codegen/ia32/interface-descriptors-ia32.cc
@@ -36,6 +36,18 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {eax, ecx, edx, edi, esi};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   static const Register default_stub_registers[] = {ecx, edx, esi, edi,
diff --git a/deps/v8/src/codegen/ia32/macro-assembler-ia32.cc b/deps/v8/src/codegen/ia32/macro-assembler-ia32.cc
index b615c591852983..36a5a6888d6270 100644
--- a/deps/v8/src/codegen/ia32/macro-assembler-ia32.cc
+++ b/deps/v8/src/codegen/ia32/macro-assembler-ia32.cc
@@ -4,23 +4,58 @@
 
 #if V8_TARGET_ARCH_IA32
 
+#include <stdint.h>
+
+#include "include/v8-internal.h"
 #include "src/base/bits.h"
-#include "src/base/division-by-constant.h"
-#include "src/base/utils/random-number-generator.h"
-#include "src/codegen/callable.h"
+#include "src/base/logging.h"
+#include "src/base/macros.h"
+#include "src/base/platform/platform.h"
+#include "src/builtins/builtins.h"
+#include "src/codegen/assembler.h"
+#include "src/codegen/bailout-reason.h"
 #include "src/codegen/code-factory.h"
-#include "src/codegen/external-reference-table.h"
-#include "src/codegen/ia32/assembler-ia32-inl.h"
+#include "src/codegen/cpu-features.h"
+#include "src/codegen/external-reference.h"
+#include "src/codegen/ia32/assembler-ia32.h"
+#include "src/codegen/ia32/register-ia32.h"
+#include "src/codegen/interface-descriptors.h"
+#include "src/codegen/label.h"
 #include "src/codegen/macro-assembler.h"
-#include "src/debug/debug.h"
+#include "src/codegen/register.h"
+#include "src/codegen/reglist.h"
+#include "src/codegen/reloc-info.h"
+#include "src/codegen/turbo-assembler.h"
+#include "src/common/globals.h"
+#include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/frame-constants.h"
-#include "src/execution/frames-inl.h"
+#include "src/execution/frames.h"
+#include "src/execution/isolate-data.h"
+#include "src/execution/isolate.h"
+#include "src/flags/flags.h"
+#include "src/handles/handles-inl.h"
+#include "src/handles/handles.h"
+#include "src/heap/basic-memory-chunk.h"
+#include "src/heap/factory-inl.h"
+#include "src/heap/factory.h"
 #include "src/heap/memory-chunk.h"
-#include "src/init/bootstrapper.h"
 #include "src/logging/counters.h"
+#include "src/objects/code.h"
+#include "src/objects/contexts.h"
+#include "src/objects/fixed-array.h"
+#include "src/objects/heap-object.h"
+#include "src/objects/js-function.h"
+#include "src/objects/map.h"
+#include "src/objects/objects.h"
+#include "src/objects/oddball.h"
+#include "src/objects/shared-function-info.h"
+#include "src/objects/slots-inl.h"
+#include "src/objects/smi.h"
+#include "src/roots/roots-inl.h"
+#include "src/roots/roots.h"
 #include "src/runtime/runtime.h"
 #include "src/snapshot/embedded/embedded-data.h"
-#include "src/snapshot/snapshot.h"
+#include "src/utils/utils.h"
 
 // Satisfy cpplint check, but don't include platform-specific header. It is
 // included recursively via macro-assembler.h.
@@ -408,10 +443,8 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Register address,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, address, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
@@ -419,14 +452,15 @@ void TurboAssembler::CallRecordWriteStub(
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
     Address wasm_target) {
   CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
-    Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
   // TODO(albertnetymk): For now we ignore remembered_set_action and fp_mode,
   // i.e. always emit remember set and save FP registers in RecordWriteStub. If
   // large performance regression is observed, we should use these values to
@@ -454,10 +488,14 @@ void TurboAssembler::CallRecordWriteStub(
 
   Move(remembered_set_parameter, Smi::FromEnum(remembered_set_action));
   Move(fp_mode_parameter, Smi::FromEnum(fp_mode));
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     // Use {wasm_call} for direct Wasm call within a module.
     wasm_call(wasm_target, RelocInfo::WASM_STUB_CALL);
+  } else if (options().inline_offheap_trampolines) {
+    CallBuiltin(builtin_index);
   } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
@@ -612,6 +650,94 @@ void TurboAssembler::Roundpd(XMMRegister dst, XMMRegister src,
   }
 }
 
+// 1. Unpack src0, src1 into even-number elements of scratch.
+// 2. Unpack src1, src0 into even-number elements of dst.
+// 3. Multiply 1. with 2.
+// For non-AVX, use non-destructive pshufd instead of punpckldq/punpckhdq.
+void TurboAssembler::I64x2ExtMul(XMMRegister dst, XMMRegister src1,
+                                 XMMRegister src2, XMMRegister scratch,
+                                 bool low, bool is_signed) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    if (low) {
+      vpunpckldq(scratch, src1, src1);
+      vpunpckldq(dst, src2, src2);
+    } else {
+      vpunpckhdq(scratch, src1, src1);
+      vpunpckhdq(dst, src2, src2);
+    }
+    if (is_signed) {
+      vpmuldq(dst, scratch, dst);
+    } else {
+      vpmuludq(dst, scratch, dst);
+    }
+  } else {
+    uint8_t mask = low ? 0x50 : 0xFA;
+    pshufd(scratch, src1, mask);
+    pshufd(dst, src2, mask);
+    if (is_signed) {
+      CpuFeatureScope sse4_scope(this, SSE4_1);
+      pmuldq(dst, scratch);
+    } else {
+      pmuludq(dst, scratch);
+    }
+  }
+}
+
+// 1. Multiply low word into scratch.
+// 2. Multiply high word (can be signed or unsigned) into dst.
+// 3. Unpack and interleave scratch and dst into dst.
+void TurboAssembler::I32x4ExtMul(XMMRegister dst, XMMRegister src1,
+                                 XMMRegister src2, XMMRegister scratch,
+                                 bool low, bool is_signed) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vpmullw(scratch, src1, src2);
+    is_signed ? vpmulhw(dst, src1, src2) : vpmulhuw(dst, src1, src2);
+    low ? vpunpcklwd(dst, scratch, dst) : vpunpckhwd(dst, scratch, dst);
+  } else {
+    DCHECK_EQ(dst, src1);
+    movdqu(scratch, src1);
+    pmullw(dst, src2);
+    is_signed ? pmulhw(scratch, src2) : pmulhuw(scratch, src2);
+    low ? punpcklwd(dst, scratch) : punpckhwd(dst, scratch);
+  }
+}
+
+void TurboAssembler::I16x8ExtMul(XMMRegister dst, XMMRegister src1,
+                                 XMMRegister src2, XMMRegister scratch,
+                                 bool low, bool is_signed) {
+  if (low) {
+    is_signed ? Pmovsxbw(scratch, src1) : Pmovzxbw(scratch, src1);
+    is_signed ? Pmovsxbw(dst, src2) : Pmovzxbw(dst, src2);
+    Pmullw(dst, scratch);
+  } else {
+    Palignr(scratch, src1, uint8_t{8});
+    is_signed ? Pmovsxbw(scratch, scratch) : Pmovzxbw(scratch, scratch);
+    Palignr(dst, src2, uint8_t{8});
+    is_signed ? Pmovsxbw(dst, dst) : Pmovzxbw(dst, dst);
+    Pmullw(dst, scratch);
+  }
+}
+
+void TurboAssembler::S128Select(XMMRegister dst, XMMRegister mask,
+                                XMMRegister src1, XMMRegister src2,
+                                XMMRegister scratch) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope scope(this, AVX);
+    vpandn(scratch, mask, src2);
+    vpand(dst, src1, mask);
+    vpor(dst, dst, scratch);
+  } else {
+    DCHECK_EQ(dst, mask);
+    // Use float ops as they are 1 byte shorter than int ops.
+    movaps(scratch, dst);
+    andnps(scratch, src2);
+    andps(dst, src1);
+    orps(dst, scratch);
+  }
+}
+
 void TurboAssembler::ShlPair(Register high, Register low, uint8_t shift) {
   DCHECK_GE(63, shift);
   if (shift >= 32) {
@@ -1505,6 +1631,17 @@ void TurboAssembler::Move(XMMRegister dst, uint64_t src) {
   }
 }
 
+void TurboAssembler::Cmpeqps(XMMRegister dst, XMMRegister src1,
+                             XMMRegister src2) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vcmpeqps(dst, src1, src2);
+  } else {
+    movaps(dst, src1);
+    cmpeqps(dst, src2);
+  }
+}
+
 void TurboAssembler::Pshufhw(XMMRegister dst, Operand src, uint8_t shuffle) {
   if (CpuFeatures::IsSupported(AVX)) {
     CpuFeatureScope scope(this, AVX);
@@ -1601,23 +1738,45 @@ void TurboAssembler::Psignd(XMMRegister dst, Operand src) {
   FATAL("no AVX or SSE3 support");
 }
 
+void TurboAssembler::Haddps(XMMRegister dst, XMMRegister src1, Operand src2) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope scope(this, AVX);
+    vhaddps(dst, src1, src2);
+  } else {
+    CpuFeatureScope scope(this, SSE3);
+    DCHECK_EQ(dst, src1);
+    haddps(dst, src2);
+  }
+}
+
+void TurboAssembler::Pcmpeqq(XMMRegister dst, XMMRegister src1,
+                             XMMRegister src2) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope scope(this, AVX);
+    vpcmpeqq(dst, src1, src2);
+  } else {
+    // pcmpeqq is only used by Wasm SIMD, which requires SSE4_1.
+    DCHECK(CpuFeatures::IsSupported(SSE4_1));
+    CpuFeatureScope scope(this, SSE4_1);
+    DCHECK_EQ(dst, src1);
+    pcmpeqq(dst, src2);
+  }
+}
+
 void TurboAssembler::Pshufb(XMMRegister dst, XMMRegister src, Operand mask) {
   if (CpuFeatures::IsSupported(AVX)) {
     CpuFeatureScope scope(this, AVX);
     vpshufb(dst, src, mask);
     return;
   }
-  if (CpuFeatures::IsSupported(SSSE3)) {
-    // Make sure these are different so that we won't overwrite mask.
-    DCHECK(!mask.is_reg(dst));
-    CpuFeatureScope sse_scope(this, SSSE3);
-    if (dst != src) {
-      movapd(dst, src);
-    }
-    pshufb(dst, mask);
-    return;
+
+  // Make sure these are different so that we won't overwrite mask.
+  DCHECK(!mask.is_reg(dst));
+  CpuFeatureScope sse_scope(this, SSSE3);
+  if (dst != src) {
+    movaps(dst, src);
   }
-  FATAL("no AVX or SSE3 support");
+  pshufb(dst, mask);
 }
 
 void TurboAssembler::Pblendw(XMMRegister dst, Operand src, uint8_t imm8) {
@@ -1648,6 +1807,18 @@ void TurboAssembler::Palignr(XMMRegister dst, Operand src, uint8_t imm8) {
   FATAL("no AVX or SSE3 support");
 }
 
+void TurboAssembler::Pextrb(Operand dst, XMMRegister src, uint8_t imm8) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope scope(this, AVX);
+    vpextrb(dst, src, imm8);
+    return;
+  }
+  DCHECK(CpuFeatures::IsSupported(SSE4_1));
+  CpuFeatureScope sse_scope(this, SSE4_1);
+  pextrb(dst, src, imm8);
+  return;
+}
+
 void TurboAssembler::Pextrb(Register dst, XMMRegister src, uint8_t imm8) {
   if (CpuFeatures::IsSupported(AVX)) {
     CpuFeatureScope scope(this, AVX);
@@ -1662,6 +1833,18 @@ void TurboAssembler::Pextrb(Register dst, XMMRegister src, uint8_t imm8) {
   FATAL("no AVX or SSE4.1 support");
 }
 
+void TurboAssembler::Pextrw(Operand dst, XMMRegister src, uint8_t imm8) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope scope(this, AVX);
+    vpextrw(dst, src, imm8);
+    return;
+  }
+  DCHECK(CpuFeatures::IsSupported(SSE4_1));
+  CpuFeatureScope sse_scope(this, SSE4_1);
+  pextrw(dst, src, imm8);
+  return;
+}
+
 void TurboAssembler::Pextrw(Register dst, XMMRegister src, uint8_t imm8) {
   if (CpuFeatures::IsSupported(AVX)) {
     CpuFeatureScope scope(this, AVX);
@@ -1766,6 +1949,30 @@ void TurboAssembler::Vbroadcastss(XMMRegister dst, Operand src) {
   shufps(dst, dst, static_cast<byte>(0));
 }
 
+void TurboAssembler::Extractps(Operand dst, XMMRegister src, uint8_t imm8) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vextractps(dst, src, imm8);
+  }
+
+  DCHECK(CpuFeatures::IsSupported(SSE4_1));
+  CpuFeatureScope avx_scope(this, SSE4_1);
+  extractps(dst, src, imm8);
+}
+
+void TurboAssembler::Shufps(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                            uint8_t imm8) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vshufps(dst, src1, src2, imm8);
+  } else {
+    if (dst != src1) {
+      movaps(dst, src1);
+    }
+    shufps(dst, src2, imm8);
+  }
+}
+
 void TurboAssembler::Lzcnt(Register dst, Operand src) {
   if (CpuFeatures::IsSupported(LZCNT)) {
     CpuFeatureScope scope(this, LZCNT);
@@ -2194,13 +2401,22 @@ void TurboAssembler::ComputeCodeStartAddress(Register dst) {
 
 void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
                                            Label* exit, DeoptimizeKind kind,
-                                           Label*) {
+                                           Label* ret, Label*) {
   CallBuiltin(target);
   DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    bool old_predictable_code_size = predictable_code_size();
+    set_predictable_code_size(true);
+
+    jmp(ret);
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    set_predictable_code_size(old_predictable_code_size);
+  }
 }
 
 void TurboAssembler::Trap() { int3(); }
diff --git a/deps/v8/src/codegen/ia32/macro-assembler-ia32.h b/deps/v8/src/codegen/ia32/macro-assembler-ia32.h
index 33635b09c5597c..fde150458e87f4 100644
--- a/deps/v8/src/codegen/ia32/macro-assembler-ia32.h
+++ b/deps/v8/src/codegen/ia32/macro-assembler-ia32.h
@@ -9,14 +9,36 @@
 #ifndef V8_CODEGEN_IA32_MACRO_ASSEMBLER_IA32_H_
 #define V8_CODEGEN_IA32_MACRO_ASSEMBLER_IA32_H_
 
+#include <stdint.h>
+
+#include "include/v8-internal.h"
+#include "src/base/logging.h"
+#include "src/base/macros.h"
+#include "src/builtins/builtins.h"
 #include "src/codegen/assembler.h"
 #include "src/codegen/bailout-reason.h"
+#include "src/codegen/cpu-features.h"
 #include "src/codegen/ia32/assembler-ia32.h"
+#include "src/codegen/ia32/register-ia32.h"
+#include "src/codegen/label.h"
+#include "src/codegen/reglist.h"
+#include "src/codegen/reloc-info.h"
+#include "src/codegen/turbo-assembler.h"
 #include "src/common/globals.h"
+#include "src/execution/frames.h"
+#include "src/handles/handles.h"
+#include "src/objects/heap-object.h"
+#include "src/objects/smi.h"
+#include "src/roots/roots.h"
+#include "src/runtime/runtime.h"
 
 namespace v8 {
 namespace internal {
 
+class Code;
+class ExternalReference;
+class StatsCounter;
+
 // Convenience for platform-independent signatures.  We do not normally
 // distinguish memory operands from other operands on ia32.
 using MemOperand = Operand;
@@ -135,7 +157,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void DebugBreak() override;
 
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   // Jump the register contains a smi.
@@ -258,6 +280,9 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   // may be bigger than 2^16 - 1.  Requires a scratch register.
   void Ret(int bytes_dropped, Register scratch);
 
+  // Three-operand cmpeqps that moves src1 to dst if AVX is not supported.
+  void Cmpeqps(XMMRegister dst, XMMRegister src1, XMMRegister src2);
+
   void Pshufhw(XMMRegister dst, XMMRegister src, uint8_t shuffle) {
     Pshufhw(dst, Operand(src), shuffle);
   }
@@ -285,6 +310,10 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
     }                                                           \
   }
 
+  AVX_OP2_WITH_TYPE(Movss, movss, Operand, XMMRegister)
+  AVX_OP2_WITH_TYPE(Movss, movss, XMMRegister, Operand)
+  AVX_OP2_WITH_TYPE(Movsd, movsd, Operand, XMMRegister)
+  AVX_OP2_WITH_TYPE(Movsd, movsd, XMMRegister, Operand)
   AVX_OP2_WITH_TYPE(Rcpps, rcpps, XMMRegister, const Operand&)
   AVX_OP2_WITH_TYPE(Rsqrtps, rsqrtps, XMMRegister, const Operand&)
   AVX_OP2_WITH_TYPE(Movdqu, movdqu, XMMRegister, Operand)
@@ -300,11 +329,17 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_OP2_WITH_TYPE(Sqrtpd, sqrtpd, XMMRegister, XMMRegister)
   AVX_OP2_WITH_TYPE(Sqrtpd, sqrtpd, XMMRegister, const Operand&)
   AVX_OP2_WITH_TYPE(Movaps, movaps, XMMRegister, XMMRegister)
+  AVX_OP2_WITH_TYPE(Movups, movups, XMMRegister, Operand)
+  AVX_OP2_WITH_TYPE(Movups, movups, XMMRegister, XMMRegister)
+  AVX_OP2_WITH_TYPE(Movups, movups, Operand, XMMRegister)
   AVX_OP2_WITH_TYPE(Movapd, movapd, XMMRegister, XMMRegister)
   AVX_OP2_WITH_TYPE(Movapd, movapd, XMMRegister, const Operand&)
   AVX_OP2_WITH_TYPE(Movupd, movupd, XMMRegister, const Operand&)
   AVX_OP2_WITH_TYPE(Pmovmskb, pmovmskb, Register, XMMRegister)
+  AVX_OP2_WITH_TYPE(Movmskpd, movmskpd, Register, XMMRegister)
   AVX_OP2_WITH_TYPE(Movmskps, movmskps, Register, XMMRegister)
+  AVX_OP2_WITH_TYPE(Movlps, movlps, Operand, XMMRegister)
+  AVX_OP2_WITH_TYPE(Movhps, movlps, Operand, XMMRegister)
 
 #undef AVX_OP2_WITH_TYPE
 
@@ -350,6 +385,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_OP3_XO(Orps, orps)
   AVX_OP3_XO(Orpd, orpd)
   AVX_OP3_XO(Andnpd, andnpd)
+  AVX_OP3_XO(Pmullw, pmullw)
+  AVX_OP3_WITH_TYPE(Movhlps, movhlps, XMMRegister, XMMRegister)
 
 #undef AVX_OP3_XO
 #undef AVX_OP3_WITH_TYPE
@@ -373,7 +410,9 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_PACKED_OP3(Addpd, addpd)
   AVX_PACKED_OP3(Subps, subps)
   AVX_PACKED_OP3(Subpd, subpd)
+  AVX_PACKED_OP3(Mulps, mulps)
   AVX_PACKED_OP3(Mulpd, mulpd)
+  AVX_PACKED_OP3(Divps, divps)
   AVX_PACKED_OP3(Divpd, divpd)
   AVX_PACKED_OP3(Cmpeqpd, cmpeqpd)
   AVX_PACKED_OP3(Cmpneqpd, cmpneqpd)
@@ -397,10 +436,12 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_PACKED_OP3(Pmaddwd, pmaddwd)
   AVX_PACKED_OP3(Paddd, paddd)
   AVX_PACKED_OP3(Paddq, paddq)
+  AVX_PACKED_OP3(Psubd, psubd)
   AVX_PACKED_OP3(Psubq, psubq)
   AVX_PACKED_OP3(Pmuludq, pmuludq)
   AVX_PACKED_OP3(Pavgb, pavgb)
   AVX_PACKED_OP3(Pavgw, pavgw)
+  AVX_PACKED_OP3(Pand, pand)
 #undef AVX_PACKED_OP3
 
   AVX_PACKED_OP3_WITH_TYPE(Psllw, psllw, XMMRegister, uint8_t)
@@ -411,6 +452,9 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_PACKED_OP3_WITH_TYPE(Psrlq, psrlq, XMMRegister, uint8_t)
   AVX_PACKED_OP3_WITH_TYPE(Psraw, psraw, XMMRegister, uint8_t)
   AVX_PACKED_OP3_WITH_TYPE(Psrad, psrad, XMMRegister, uint8_t)
+
+  AVX_PACKED_OP3_WITH_TYPE(Movlps, movlps, XMMRegister, Operand)
+  AVX_PACKED_OP3_WITH_TYPE(Movhps, movhps, XMMRegister, Operand)
 #undef AVX_PACKED_OP3_WITH_TYPE
 
 // Non-SSE2 instructions.
@@ -433,6 +477,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_OP2_WITH_TYPE_SCOPE(macro_name, name, XMMRegister, XMMRegister, SSE3) \
   AVX_OP2_WITH_TYPE_SCOPE(macro_name, name, XMMRegister, Operand, SSE3)
   AVX_OP2_XO_SSE3(Movddup, movddup)
+  AVX_OP2_WITH_TYPE_SCOPE(Movshdup, movshdup, XMMRegister, XMMRegister, SSE3)
 
 #undef AVX_OP2_XO_SSE3
 
@@ -462,15 +507,16 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
 #define AVX_OP3_WITH_TYPE_SCOPE(macro_name, name, dst_type, src_type, \
                                 sse_scope)                            \
-  void macro_name(dst_type dst, src_type src) {                       \
+  void macro_name(dst_type dst, dst_type src1, src_type src2) {       \
     if (CpuFeatures::IsSupported(AVX)) {                              \
       CpuFeatureScope scope(this, AVX);                               \
-      v##name(dst, dst, src);                                         \
+      v##name(dst, src1, src2);                                       \
       return;                                                         \
     }                                                                 \
     if (CpuFeatures::IsSupported(sse_scope)) {                        \
       CpuFeatureScope scope(this, sse_scope);                         \
-      name(dst, src);                                                 \
+      DCHECK_EQ(dst, src1);                                           \
+      name(dst, src2);                                                \
       return;                                                         \
     }                                                                 \
     UNREACHABLE();                                                    \
@@ -480,10 +526,14 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_OP3_WITH_TYPE_SCOPE(macro_name, name, XMMRegister, Operand, SSE4_1)
 
   AVX_OP3_XO_SSE4(Pmaxsd, pmaxsd)
+  AVX_OP3_WITH_TYPE_SCOPE(Pmaddubsw, pmaddubsw, XMMRegister, XMMRegister, SSSE3)
+  AVX_OP3_WITH_TYPE_SCOPE(Pmulhrsw, pmulhrsw, XMMRegister, XMMRegister, SSSE3)
 
 #undef AVX_OP3_XO_SSE4
 #undef AVX_OP3_WITH_TYPE_SCOPE
 
+  void Haddps(XMMRegister dst, XMMRegister src1, Operand src2);
+  void Pcmpeqq(XMMRegister dst, XMMRegister src1, XMMRegister src2);
   void Pshufb(XMMRegister dst, XMMRegister src) { Pshufb(dst, dst, src); }
   void Pshufb(XMMRegister dst, Operand src) { Pshufb(dst, dst, src); }
   // Handles SSE and AVX. On SSE, moves src to dst if they are not equal.
@@ -491,6 +541,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
     Pshufb(dst, src, Operand(mask));
   }
   void Pshufb(XMMRegister dst, XMMRegister src, Operand mask);
+
   void Pblendw(XMMRegister dst, XMMRegister src, uint8_t imm8) {
     Pblendw(dst, Operand(src), imm8);
   }
@@ -508,7 +559,9 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   }
   void Palignr(XMMRegister dst, Operand src, uint8_t imm8);
 
+  void Pextrb(Operand dst, XMMRegister src, uint8_t imm8);
   void Pextrb(Register dst, XMMRegister src, uint8_t imm8);
+  void Pextrw(Operand dst, XMMRegister src, uint8_t imm8);
   void Pextrw(Register dst, XMMRegister src, uint8_t imm8);
   void Pextrd(Register dst, XMMRegister src, uint8_t imm8);
   void Pinsrb(XMMRegister dst, Register src, int8_t imm8) {
@@ -524,6 +577,11 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   }
   void Pinsrw(XMMRegister dst, Operand src, int8_t imm8);
   void Vbroadcastss(XMMRegister dst, Operand src);
+  void Extractps(Operand dst, XMMRegister src, uint8_t imm8);
+
+  // Shufps that will mov src1 into dst if AVX is not supported.
+  void Shufps(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+              uint8_t imm8);
 
   // Expression support
   // cvtsi2sd instruction only writes to the low 64-bit of dst register, which
@@ -554,6 +612,20 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void Roundps(XMMRegister dst, XMMRegister src, RoundingMode mode);
   void Roundpd(XMMRegister dst, XMMRegister src, RoundingMode mode);
 
+  // These Wasm SIMD ops do not have direct lowerings on IA32. These
+  // helpers are optimized to produce the fastest and smallest codegen.
+  // Defined here to allow usage on both TurboFan and Liftoff.
+  void I64x2ExtMul(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                   XMMRegister scratch, bool low, bool is_signed);
+  // Requires that dst == src1 if AVX is not supported.
+  void I32x4ExtMul(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                   XMMRegister scratch, bool low, bool is_signed);
+  void I16x8ExtMul(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                   XMMRegister scratch, bool low, bool is_signed);
+  // Requires dst == mask when AVX is not supported.
+  void S128Select(XMMRegister dst, XMMRegister mask, XMMRegister src1,
+                  XMMRegister src2, XMMRegister scratch);
+
   void Push(Register src) { push(src); }
   void Push(Operand src) { push(src); }
   void Push(Immediate value);
@@ -614,7 +686,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallRecordWriteStub(Register object, Register address,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 };
 
diff --git a/deps/v8/src/codegen/ia32/sse-instr.h b/deps/v8/src/codegen/ia32/sse-instr.h
index a56dc13361cc9c..d775dfdd7744b0 100644
--- a/deps/v8/src/codegen/ia32/sse-instr.h
+++ b/deps/v8/src/codegen/ia32/sse-instr.h
@@ -19,6 +19,7 @@
   V(paddusb, 66, 0F, DC)         \
   V(paddusw, 66, 0F, DD)         \
   V(pand, 66, 0F, DB)            \
+  V(pandn, 66, 0F, DF)           \
   V(pcmpeqb, 66, 0F, 74)         \
   V(pcmpeqw, 66, 0F, 75)         \
   V(pcmpeqd, 66, 0F, 76)         \
@@ -39,6 +40,8 @@
   V(psraw, 66, 0F, E1)           \
   V(psrad, 66, 0F, E2)           \
   V(pavgw, 66, 0F, E3)           \
+  V(pmulhuw, 66, 0F, E4)         \
+  V(pmulhw, 66, 0F, E5)          \
   V(psrlw, 66, 0F, D1)           \
   V(psrld, 66, 0F, D2)           \
   V(psrlq, 66, 0F, D3)           \
@@ -61,12 +64,14 @@
   V(pxor, 66, 0F, EF)
 
 #define SSSE3_INSTRUCTION_LIST(V) \
-  V(phaddd, 66, 0F, 38, 02)       \
-  V(phaddw, 66, 0F, 38, 01)       \
   V(pshufb, 66, 0F, 38, 00)       \
+  V(phaddw, 66, 0F, 38, 01)       \
+  V(phaddd, 66, 0F, 38, 02)       \
+  V(pmaddubsw, 66, 0F, 38, 04)    \
   V(psignb, 66, 0F, 38, 08)       \
   V(psignw, 66, 0F, 38, 09)       \
-  V(psignd, 66, 0F, 38, 0A)
+  V(psignd, 66, 0F, 38, 0A)       \
+  V(pmulhrsw, 66, 0F, 38, 0B)
 
 // SSSE3 instructions whose AVX version has two operands.
 #define SSSE3_UNOP_INSTRUCTION_LIST(V) \
@@ -75,6 +80,8 @@
   V(pabsd, 66, 0F, 38, 1E)
 
 #define SSE4_INSTRUCTION_LIST(V) \
+  V(pmuldq, 66, 0F, 38, 28)      \
+  V(pcmpeqq, 66, 0F, 38, 29)     \
   V(packusdw, 66, 0F, 38, 2B)    \
   V(pminsb, 66, 0F, 38, 38)      \
   V(pminsd, 66, 0F, 38, 39)      \
diff --git a/deps/v8/src/codegen/interface-descriptors.h b/deps/v8/src/codegen/interface-descriptors.h
index f086f239600d9e..ae9351302191ab 100644
--- a/deps/v8/src/codegen/interface-descriptors.h
+++ b/deps/v8/src/codegen/interface-descriptors.h
@@ -58,6 +58,7 @@ namespace internal {
   V(ConstructWithSpread_WithFeedback)    \
   V(ContextOnly)                         \
   V(CppBuiltinAdaptor)                   \
+  V(DynamicCheckMaps)                    \
   V(EphemeronKeyBarrier)                 \
   V(FastNewObject)                       \
   V(FrameDropperTrampoline)              \
@@ -132,6 +133,10 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData {
 
   CallInterfaceDescriptorData() = default;
 
+  CallInterfaceDescriptorData(const CallInterfaceDescriptorData&) = delete;
+  CallInterfaceDescriptorData& operator=(const CallInterfaceDescriptorData&) =
+      delete;
+
   // A copy of the passed in registers and param_representations is made
   // and owned by the CallInterfaceDescriptorData.
 
@@ -222,8 +227,6 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData {
   // runtime static initializers which we don't want.
   Register* register_params_ = nullptr;
   MachineType* machine_types_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(CallInterfaceDescriptorData);
 };
 
 class V8_EXPORT_PRIVATE CallDescriptors : public AllStatic {
@@ -293,6 +296,7 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptor {
   }
 
   Register GetRegisterParameter(int index) const {
+    DCHECK_LT(index, data()->register_param_count());
     return data()->register_param(index);
   }
 
@@ -873,6 +877,17 @@ class LoadGlobalWithVectorDescriptor : public LoadGlobalDescriptor {
 #endif
 };
 
+class DynamicCheckMapsDescriptor final : public CallInterfaceDescriptor {
+ public:
+  DEFINE_PARAMETERS(kMap, kSlot, kHandler)
+  DEFINE_RESULT_AND_PARAMETER_TYPES(MachineType::Int32(),          // return val
+                                    MachineType::TaggedPointer(),  // kMap
+                                    MachineType::IntPtr(),         // kSlot
+                                    MachineType::TaggedSigned())   // kHandler
+
+  DECLARE_DESCRIPTOR(DynamicCheckMapsDescriptor, CallInterfaceDescriptor)
+};
+
 class FastNewObjectDescriptor : public CallInterfaceDescriptor {
  public:
   DEFINE_PARAMETERS(kTarget, kNewTarget)
diff --git a/deps/v8/src/codegen/label.h b/deps/v8/src/codegen/label.h
index f45f1e62d74a2d..cdc4099749a2a6 100644
--- a/deps/v8/src/codegen/label.h
+++ b/deps/v8/src/codegen/label.h
@@ -25,6 +25,11 @@ class Label {
 
   Label() = default;
 
+  // Disallow copy construction and assignment, but allow move construction and
+  // move assignment on selected platforms (see below).
+  Label(const Label&) = delete;
+  Label& operator=(const Label&) = delete;
+
 // On ARM64, the Assembler keeps track of pointers to Labels to resolve
 // branches to distant targets. Copying labels would confuse the Assembler.
 // On other platforms, allow move construction.
@@ -100,10 +105,6 @@ class Label {
   friend class Assembler;
   friend class Displacement;
   friend class RegExpBytecodeGenerator;
-
-  // Disallow copy construction and assignment, but allow move construction and
-  // move assignment on selected platforms (see above).
-  DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/macro-assembler.h b/deps/v8/src/codegen/macro-assembler.h
index a213fc504e1d23..1769dc834a04d9 100644
--- a/deps/v8/src/codegen/macro-assembler.h
+++ b/deps/v8/src/codegen/macro-assembler.h
@@ -69,7 +69,7 @@ static constexpr int kMaxCParameters = 10;
 static constexpr int kMaxCParameters = 256;
 #endif
 
-class FrameScope {
+class V8_NODISCARD FrameScope {
  public:
   explicit FrameScope(TurboAssembler* tasm, StackFrame::Type type)
       : tasm_(tasm), type_(type), old_has_frame_(tasm->has_frame()) {
@@ -92,7 +92,7 @@ class FrameScope {
   bool old_has_frame_;
 };
 
-class FrameAndConstantPoolScope {
+class V8_NODISCARD FrameAndConstantPoolScope {
  public:
   FrameAndConstantPoolScope(MacroAssembler* masm, StackFrame::Type type)
       : masm_(masm),
@@ -127,7 +127,7 @@ class FrameAndConstantPoolScope {
 };
 
 // Class for scoping the the unavailability of constant pool access.
-class ConstantPoolUnavailableScope {
+class V8_NODISCARD ConstantPoolUnavailableScope {
  public:
   explicit ConstantPoolUnavailableScope(Assembler* assembler)
       : assembler_(assembler),
@@ -150,7 +150,7 @@ class ConstantPoolUnavailableScope {
   DISALLOW_IMPLICIT_CONSTRUCTORS(ConstantPoolUnavailableScope);
 };
 
-class AllowExternalCallThatCantCauseGC : public FrameScope {
+class V8_NODISCARD AllowExternalCallThatCantCauseGC : public FrameScope {
  public:
   explicit AllowExternalCallThatCantCauseGC(MacroAssembler* masm)
       : FrameScope(masm, StackFrame::NONE) {}
@@ -158,7 +158,7 @@ class AllowExternalCallThatCantCauseGC : public FrameScope {
 
 // Prevent the use of the RootArray during the lifetime of this
 // scope object.
-class NoRootArrayScope {
+class V8_NODISCARD NoRootArrayScope {
  public:
   explicit NoRootArrayScope(TurboAssembler* masm)
       : masm_(masm), old_value_(masm->root_array_available()) {
diff --git a/deps/v8/src/codegen/mips/assembler-mips-inl.h b/deps/v8/src/codegen/mips/assembler-mips-inl.h
index 53e6f93411b700..8ffc46003f5cd2 100644
--- a/deps/v8/src/codegen/mips/assembler-mips-inl.h
+++ b/deps/v8/src/codegen/mips/assembler-mips-inl.h
@@ -159,7 +159,11 @@ void Assembler::deserialization_set_target_internal_reference_at(
 }
 
 HeapObject RelocInfo::target_object() {
-  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_));
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
+  if (IsDataEmbeddedObject(rmode_)) {
+    return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
+  }
   return HeapObject::cast(
       Object(Assembler::target_address_at(pc_, constant_pool_)));
 }
@@ -172,6 +176,8 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
   if (IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_)) {
     return Handle<HeapObject>(reinterpret_cast<Address*>(
         Assembler::target_address_at(pc_, constant_pool_)));
+  } else if (IsDataEmbeddedObject(rmode_)) {
+    return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
   }
   DCHECK(IsRelativeCodeTarget(rmode_));
   return origin->relative_code_target_object_handle_at(pc_);
@@ -180,9 +186,15 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
 void RelocInfo::set_target_object(Heap* heap, HeapObject target,
                                   WriteBarrierMode write_barrier_mode,
                                   ICacheFlushMode icache_flush_mode) {
-  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_));
-  Assembler::set_target_address_at(pc_, constant_pool_, target.ptr(),
-                                   icache_flush_mode);
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
+  if (IsDataEmbeddedObject(rmode_)) {
+    WriteUnalignedValue(pc_, target.ptr());
+    // No need to flush icache since no instructions were changed.
+  } else {
+    Assembler::set_target_address_at(pc_, constant_pool_, target.ptr(),
+                                     icache_flush_mode);
+  }
   if (write_barrier_mode == UPDATE_WRITE_BARRIER && !host().is_null() &&
       !FLAG_disable_write_barriers) {
     WriteBarrierForCode(host(), this, target);
diff --git a/deps/v8/src/codegen/mips/assembler-mips.cc b/deps/v8/src/codegen/mips/assembler-mips.cc
index df46577db77eb4..476362685e001e 100644
--- a/deps/v8/src/codegen/mips/assembler-mips.cc
+++ b/deps/v8/src/codegen/mips/assembler-mips.cc
@@ -3582,14 +3582,22 @@ void Assembler::db(uint8_t data) {
   pc_ += sizeof(uint8_t);
 }
 
-void Assembler::dd(uint32_t data) {
+void Assembler::dd(uint32_t data, RelocInfo::Mode rmode) {
   CheckForEmitInForbiddenSlot();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint32_t*>(pc_) = data;
   pc_ += sizeof(uint32_t);
 }
 
-void Assembler::dq(uint64_t data) {
+void Assembler::dq(uint64_t data, RelocInfo::Mode rmode) {
   CheckForEmitInForbiddenSlot();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint64_t*>(pc_) = data;
   pc_ += sizeof(uint64_t);
 }
diff --git a/deps/v8/src/codegen/mips/assembler-mips.h b/deps/v8/src/codegen/mips/assembler-mips.h
index 248bd1ac751ec2..ccdea03a79c9ec 100644
--- a/deps/v8/src/codegen/mips/assembler-mips.h
+++ b/deps/v8/src/codegen/mips/assembler-mips.h
@@ -1372,7 +1372,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   }
 
   // Class for scoping postponing the trampoline pool generation.
-  class BlockTrampolinePoolScope {
+  class V8_NODISCARD BlockTrampolinePoolScope {
    public:
     explicit BlockTrampolinePoolScope(Assembler* assem) : assem_(assem) {
       assem_->StartBlockTrampolinePool();
@@ -1389,7 +1389,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // sequences of instructions that must be emitted as a unit, before
   // buffer growth (and relocation) can occur.
   // This blocking scope is not nestable.
-  class BlockGrowBufferScope {
+  class V8_NODISCARD BlockGrowBufferScope {
    public:
     explicit BlockGrowBufferScope(Assembler* assem) : assem_(assem) {
       assem_->StartBlockGrowBuffer();
@@ -1416,9 +1416,11 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // Writes a single byte or word of data in the code stream.  Used for
   // inline tables, e.g., jump-tables.
   void db(uint8_t data);
-  void dd(uint32_t data);
-  void dq(uint64_t data);
-  void dp(uintptr_t data) { dd(data); }
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    dd(data, rmode);
+  }
   void dd(Label* label);
 
   // Postpone the generation of the trampoline pool for the specified number of
@@ -1908,7 +1910,7 @@ class EnsureSpace {
   explicit inline EnsureSpace(Assembler* assembler);
 };
 
-class V8_EXPORT_PRIVATE UseScratchRegisterScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD UseScratchRegisterScope {
  public:
   explicit UseScratchRegisterScope(Assembler* assembler);
   ~UseScratchRegisterScope();
diff --git a/deps/v8/src/codegen/mips/constants-mips.h b/deps/v8/src/codegen/mips/constants-mips.h
index 67d12155a31c4b..5ed338e3e02d37 100644
--- a/deps/v8/src/codegen/mips/constants-mips.h
+++ b/deps/v8/src/codegen/mips/constants-mips.h
@@ -203,6 +203,26 @@ const uint32_t kFCSRFlagMask =
 
 const uint32_t kFCSRExceptionFlagMask = kFCSRFlagMask ^ kFCSRInexactFlagMask;
 
+const uint32_t kFCSRInexactCauseBit = 12;
+const uint32_t kFCSRUnderflowCauseBit = 13;
+const uint32_t kFCSROverflowCauseBit = 14;
+const uint32_t kFCSRDivideByZeroCauseBit = 15;
+const uint32_t kFCSRInvalidOpCauseBit = 16;
+const uint32_t kFCSRUnimplementedOpCauseBit = 17;
+
+const uint32_t kFCSRInexactCauseMask = 1 << kFCSRInexactCauseBit;
+const uint32_t kFCSRUnderflowCauseMask = 1 << kFCSRUnderflowCauseBit;
+const uint32_t kFCSROverflowCauseMask = 1 << kFCSROverflowCauseBit;
+const uint32_t kFCSRDivideByZeroCauseMask = 1 << kFCSRDivideByZeroCauseBit;
+const uint32_t kFCSRInvalidOpCauseMask = 1 << kFCSRInvalidOpCauseBit;
+const uint32_t kFCSRUnimplementedOpCauseMask = 1
+                                               << kFCSRUnimplementedOpCauseBit;
+
+const uint32_t kFCSRCauseMask =
+    kFCSRInexactCauseMask | kFCSRUnderflowCauseMask | kFCSROverflowCauseMask |
+    kFCSRDivideByZeroCauseMask | kFCSRInvalidOpCauseMask |
+    kFCSRUnimplementedOpCauseBit;
+
 // 'pref' instruction hints
 const int32_t kPrefHintLoad = 0;
 const int32_t kPrefHintStore = 1;
diff --git a/deps/v8/src/codegen/mips/interface-descriptors-mips.cc b/deps/v8/src/codegen/mips/interface-descriptors-mips.cc
index 75835e607c8f78..7affb8fad2ea4b 100644
--- a/deps/v8/src/codegen/mips/interface-descriptors-mips.cc
+++ b/deps/v8/src/codegen/mips/interface-descriptors-mips.cc
@@ -60,6 +60,18 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   const Register default_stub_registers[] = {a0, a1, a2, a3, kReturnRegister0};
diff --git a/deps/v8/src/codegen/mips/macro-assembler-mips.cc b/deps/v8/src/codegen/mips/macro-assembler-mips.cc
index 37a6acadfe9062..7e82bb0e213d9d 100644
--- a/deps/v8/src/codegen/mips/macro-assembler-mips.cc
+++ b/deps/v8/src/codegen/mips/macro-assembler-mips.cc
@@ -258,10 +258,8 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Register address,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, address, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
@@ -269,14 +267,15 @@ void TurboAssembler::CallRecordWriteStub(
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
     Address wasm_target) {
   CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
-    Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
   // TODO(albertnetymk): For now we ignore remembered_set_action and fp_mode,
   // i.e. always emit remember set and save FP registers in RecordWriteStub. If
   // large performance regression is observed, we should use these values to
@@ -303,9 +302,20 @@ void TurboAssembler::CallRecordWriteStub(
 
   Move(remembered_set_parameter, Smi::FromEnum(remembered_set_action));
   Move(fp_mode_parameter, Smi::FromEnum(fp_mode));
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     Call(wasm_target, RelocInfo::WASM_STUB_CALL);
+  } else if (options().inline_offheap_trampolines) {
+    // Inline the trampoline.
+    DCHECK(Builtins::IsBuiltinId(builtin_index));
+    RecordCommentForOffHeapTrampoline(builtin_index);
+    CHECK_NE(builtin_index, Builtins::kNoBuiltinId);
+    EmbeddedData d = EmbeddedData::FromBlob();
+    Address entry = d.InstructionStartOfBuiltin(builtin_index);
+    li(t9, Operand(entry, RelocInfo::OFF_HEAP_TARGET));
+    Call(t9);
   } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
@@ -2698,88 +2708,22 @@ void TurboAssembler::Popcnt(Register rd, Register rs) {
   srl(rd, rd, shift);
 }
 
-void MacroAssembler::EmitFPUTruncate(
-    FPURoundingMode rounding_mode, Register result, DoubleRegister double_input,
-    Register scratch, DoubleRegister double_scratch, Register except_flag,
-    CheckForInexactConversion check_inexact) {
-  DCHECK(result != scratch);
-  DCHECK(double_input != double_scratch);
-  DCHECK(except_flag != scratch);
-
-  Label done;
-
-  // Clear the except flag (0 = no exception)
-  mov(except_flag, zero_reg);
-
-  // Test for values that can be exactly represented as a signed 32-bit integer.
-  cvt_w_d(double_scratch, double_input);
-  mfc1(result, double_scratch);
-  cvt_d_w(double_scratch, double_scratch);
-  CompareF64(EQ, double_input, double_scratch);
-  BranchTrueShortF(&done);
-
-  int32_t except_mask = kFCSRFlagMask;  // Assume interested in all exceptions.
-
-  if (check_inexact == kDontCheckForInexactConversion) {
-    // Ignore inexact exceptions.
-    except_mask &= ~kFCSRInexactFlagMask;
-  }
-
-  // Save FCSR.
-  cfc1(scratch, FCSR);
-  // Disable FPU exceptions.
-  ctc1(zero_reg, FCSR);
-
-  // Do operation based on rounding mode.
-  switch (rounding_mode) {
-    case kRoundToNearest:
-      Round_w_d(double_scratch, double_input);
-      break;
-    case kRoundToZero:
-      Trunc_w_d(double_scratch, double_input);
-      break;
-    case kRoundToPlusInf:
-      Ceil_w_d(double_scratch, double_input);
-      break;
-    case kRoundToMinusInf:
-      Floor_w_d(double_scratch, double_input);
-      break;
-  }  // End of switch-statement.
-
-  // Retrieve FCSR.
-  cfc1(except_flag, FCSR);
-  // Restore FCSR.
-  ctc1(scratch, FCSR);
-  // Move the converted value into the result register.
-  mfc1(result, double_scratch);
-
-  // Check for fpu exceptions.
-  And(except_flag, except_flag, Operand(except_mask));
-
-  bind(&done);
-}
-
 void TurboAssembler::TryInlineTruncateDoubleToI(Register result,
                                                 DoubleRegister double_input,
                                                 Label* done) {
   BlockTrampolinePoolScope block_trampoline_pool(this);
   DoubleRegister single_scratch = kScratchDoubleReg.low();
-  UseScratchRegisterScope temps(this);
-  Register scratch = temps.Acquire();
-  Register scratch2 = t9;
+  Register scratch = t9;
 
-  // Clear cumulative exception flags and save the FCSR.
-  cfc1(scratch2, FCSR);
-  ctc1(zero_reg, FCSR);
   // Try a conversion to a signed integer.
   trunc_w_d(single_scratch, double_input);
   mfc1(result, single_scratch);
-  // Retrieve and restore the FCSR.
+  // Retrieve the FCSR.
   cfc1(scratch, FCSR);
-  ctc1(scratch2, FCSR);
   // Check for overflow and NaNs.
   And(scratch, scratch,
-      kFCSROverflowFlagMask | kFCSRUnderflowFlagMask | kFCSRInvalidOpFlagMask);
+      kFCSROverflowCauseMask | kFCSRUnderflowCauseMask |
+          kFCSRInvalidOpCauseMask);
   // If we had no exceptions we are done.
   Branch(done, eq, scratch, Operand(zero_reg));
 }
@@ -4864,7 +4808,7 @@ void TurboAssembler::Abort(AbortReason reason) {
   }
 }
 
-void MacroAssembler::LoadMap(Register destination, Register object) {
+void TurboAssembler::LoadMap(Register destination, Register object) {
   Lw(destination, FieldMemOperand(object, HeapObject::kMapOffset));
 }
 
@@ -5608,7 +5552,7 @@ void TurboAssembler::ResetSpeculationPoisonRegister() {
 
 void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
                                            Label* exit, DeoptimizeKind kind,
-                                           Label*) {
+                                           Label* ret, Label*) {
   BlockTrampolinePoolScope block_trampoline_pool(this);
   Lw(t9,
      MemOperand(kRootRegister, IsolateData::builtin_entry_slot_offset(target)));
@@ -5617,7 +5561,11 @@ void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    Branch(ret);
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+  }
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/mips/macro-assembler-mips.h b/deps/v8/src/codegen/mips/macro-assembler-mips.h
index d91a4a7bb8bdfb..46429caaca77da 100644
--- a/deps/v8/src/codegen/mips/macro-assembler-mips.h
+++ b/deps/v8/src/codegen/mips/macro-assembler-mips.h
@@ -238,7 +238,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void StoreReturnAddressAndCall(Register target);
 
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   void Ret(COND_ARGS);
@@ -780,6 +780,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void LoadRoot(Register destination, RootIndex index, Condition cond,
                 Register src1, const Operand& src2);
 
+  void LoadMap(Register destination, Register object);
+
   // If the value is a NaN, canonicalize the value else, do nothing.
   void FPUCanonicalizeNaN(const DoubleRegister dst, const DoubleRegister src);
 
@@ -900,7 +902,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallRecordWriteStub(Register object, Register address,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 };
 
@@ -978,17 +980,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
 
   void Pref(int32_t hint, const MemOperand& rs);
 
-  // Truncates a double using a specific rounding mode, and writes the value
-  // to the result register.
-  // The except_flag will contain any exceptions caused by the instruction.
-  // If check_inexact is kDontCheckForInexactConversion, then the inexact
-  // exception is masked.
-  void EmitFPUTruncate(
-      FPURoundingMode rounding_mode, Register result,
-      DoubleRegister double_input, Register scratch,
-      DoubleRegister double_scratch, Register except_flag,
-      CheckForInexactConversion check_inexact = kDontCheckForInexactConversion);
-
   // Enter exit frame.
   // argc - argument count to be dropped by LeaveExitFrame.
   // save_doubles - saves FPU registers on stack, currently disabled.
@@ -1001,8 +992,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
                       bool do_return = NO_EMIT_RETURN,
                       bool argument_count_is_length = false);
 
-  void LoadMap(Register destination, Register object);
-
   // Make sure the stack is aligned. Only emits code in debug mode.
   void AssertStackIsAligned();
 
diff --git a/deps/v8/src/codegen/mips64/assembler-mips64-inl.h b/deps/v8/src/codegen/mips64/assembler-mips64-inl.h
index cacdbd8f8bbb32..e5ac8d209c7715 100644
--- a/deps/v8/src/codegen/mips64/assembler-mips64-inl.h
+++ b/deps/v8/src/codegen/mips64/assembler-mips64-inl.h
@@ -138,7 +138,11 @@ void Assembler::deserialization_set_target_internal_reference_at(
 }
 
 HeapObject RelocInfo::target_object() {
-  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_));
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
+  if (IsDataEmbeddedObject(rmode_)) {
+    return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
+  }
   return HeapObject::cast(
       Object(Assembler::target_address_at(pc_, constant_pool_)));
 }
@@ -148,17 +152,27 @@ HeapObject RelocInfo::target_object_no_host(Isolate* isolate) {
 }
 
 Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
-  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_));
-  return Handle<HeapObject>(reinterpret_cast<Address*>(
-      Assembler::target_address_at(pc_, constant_pool_)));
+  if (IsDataEmbeddedObject(rmode_)) {
+    return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
+  } else {
+    DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_));
+    return Handle<HeapObject>(reinterpret_cast<Address*>(
+        Assembler::target_address_at(pc_, constant_pool_)));
+  }
 }
 
 void RelocInfo::set_target_object(Heap* heap, HeapObject target,
                                   WriteBarrierMode write_barrier_mode,
                                   ICacheFlushMode icache_flush_mode) {
-  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_));
-  Assembler::set_target_address_at(pc_, constant_pool_, target.ptr(),
-                                   icache_flush_mode);
+  DCHECK(IsCodeTarget(rmode_) || IsFullEmbeddedObject(rmode_) ||
+         IsDataEmbeddedObject(rmode_));
+  if (IsDataEmbeddedObject(rmode_)) {
+    WriteUnalignedValue(pc_, target.ptr());
+    // No need to flush icache since no instructions were changed.
+  } else {
+    Assembler::set_target_address_at(pc_, constant_pool_, target.ptr(),
+                                     icache_flush_mode);
+  }
   if (write_barrier_mode == UPDATE_WRITE_BARRIER && !host().is_null() &&
       !FLAG_disable_write_barriers) {
     WriteBarrierForCode(host(), this, target);
diff --git a/deps/v8/src/codegen/mips64/assembler-mips64.cc b/deps/v8/src/codegen/mips64/assembler-mips64.cc
index 3b16805f53407e..8b522eb173b0ce 100644
--- a/deps/v8/src/codegen/mips64/assembler-mips64.cc
+++ b/deps/v8/src/codegen/mips64/assembler-mips64.cc
@@ -3779,14 +3779,22 @@ void Assembler::db(uint8_t data) {
   pc_ += sizeof(uint8_t);
 }
 
-void Assembler::dd(uint32_t data) {
+void Assembler::dd(uint32_t data, RelocInfo::Mode rmode) {
   CheckForEmitInForbiddenSlot();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint32_t*>(pc_) = data;
   pc_ += sizeof(uint32_t);
 }
 
-void Assembler::dq(uint64_t data) {
+void Assembler::dq(uint64_t data, RelocInfo::Mode rmode) {
   CheckForEmitInForbiddenSlot();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint64_t*>(pc_) = data;
   pc_ += sizeof(uint64_t);
 }
diff --git a/deps/v8/src/codegen/mips64/assembler-mips64.h b/deps/v8/src/codegen/mips64/assembler-mips64.h
index b5edc75676ff7a..26205ccefdfd9b 100644
--- a/deps/v8/src/codegen/mips64/assembler-mips64.h
+++ b/deps/v8/src/codegen/mips64/assembler-mips64.h
@@ -1433,7 +1433,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   }
 
   // Class for scoping postponing the trampoline pool generation.
-  class BlockTrampolinePoolScope {
+  class V8_NODISCARD BlockTrampolinePoolScope {
    public:
     explicit BlockTrampolinePoolScope(Assembler* assem) : assem_(assem) {
       assem_->StartBlockTrampolinePool();
@@ -1450,7 +1450,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // sequences of instructions that must be emitted as a unit, before
   // buffer growth (and relocation) can occur.
   // This blocking scope is not nestable.
-  class BlockGrowBufferScope {
+  class V8_NODISCARD BlockGrowBufferScope {
    public:
     explicit BlockGrowBufferScope(Assembler* assem) : assem_(assem) {
       assem_->StartBlockGrowBuffer();
@@ -1474,9 +1474,11 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // Writes a single byte or word of data in the code stream.  Used for
   // inline tables, e.g., jump-tables.
   void db(uint8_t data);
-  void dd(uint32_t data);
-  void dq(uint64_t data);
-  void dp(uintptr_t data) { dq(data); }
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    dq(data, rmode);
+  }
   void dd(Label* label);
 
   // Postpone the generation of the trampoline pool for the specified number of
@@ -1936,7 +1938,7 @@ class EnsureSpace {
   explicit inline EnsureSpace(Assembler* assembler);
 };
 
-class V8_EXPORT_PRIVATE UseScratchRegisterScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD UseScratchRegisterScope {
  public:
   explicit UseScratchRegisterScope(Assembler* assembler);
   ~UseScratchRegisterScope();
diff --git a/deps/v8/src/codegen/mips64/constants-mips64.h b/deps/v8/src/codegen/mips64/constants-mips64.h
index 751fa3c35eda08..e1c4ec9fc90aea 100644
--- a/deps/v8/src/codegen/mips64/constants-mips64.h
+++ b/deps/v8/src/codegen/mips64/constants-mips64.h
@@ -165,6 +165,26 @@ const uint32_t kFCSRFlagMask =
 
 const uint32_t kFCSRExceptionFlagMask = kFCSRFlagMask ^ kFCSRInexactFlagMask;
 
+const uint32_t kFCSRInexactCauseBit = 12;
+const uint32_t kFCSRUnderflowCauseBit = 13;
+const uint32_t kFCSROverflowCauseBit = 14;
+const uint32_t kFCSRDivideByZeroCauseBit = 15;
+const uint32_t kFCSRInvalidOpCauseBit = 16;
+const uint32_t kFCSRUnimplementedOpCauseBit = 17;
+
+const uint32_t kFCSRInexactCauseMask = 1 << kFCSRInexactCauseBit;
+const uint32_t kFCSRUnderflowCauseMask = 1 << kFCSRUnderflowCauseBit;
+const uint32_t kFCSROverflowCauseMask = 1 << kFCSROverflowCauseBit;
+const uint32_t kFCSRDivideByZeroCauseMask = 1 << kFCSRDivideByZeroCauseBit;
+const uint32_t kFCSRInvalidOpCauseMask = 1 << kFCSRInvalidOpCauseBit;
+const uint32_t kFCSRUnimplementedOpCauseMask = 1
+                                               << kFCSRUnimplementedOpCauseBit;
+
+const uint32_t kFCSRCauseMask =
+    kFCSRInexactCauseMask | kFCSRUnderflowCauseMask | kFCSROverflowCauseMask |
+    kFCSRDivideByZeroCauseMask | kFCSRInvalidOpCauseMask |
+    kFCSRUnimplementedOpCauseBit;
+
 // 'pref' instruction hints
 const int32_t kPrefHintLoad = 0;
 const int32_t kPrefHintStore = 1;
@@ -240,6 +260,21 @@ class MSARegisters {
   static const RegisterAlias aliases_[];
 };
 
+// MSA sizes.
+enum MSASize { MSA_B = 0x0, MSA_H = 0x1, MSA_W = 0x2, MSA_D = 0x3 };
+
+// MSA data type, top bit set for unsigned data types.
+enum MSADataType {
+  MSAS8 = 0,
+  MSAS16 = 1,
+  MSAS32 = 2,
+  MSAS64 = 3,
+  MSAU8 = 4,
+  MSAU16 = 5,
+  MSAU32 = 6,
+  MSAU64 = 7
+};
+
 // -----------------------------------------------------------------------------
 // Instructions encoding constants.
 
diff --git a/deps/v8/src/codegen/mips64/interface-descriptors-mips64.cc b/deps/v8/src/codegen/mips64/interface-descriptors-mips64.cc
index f77d8d4130faa2..38ba0c35099544 100644
--- a/deps/v8/src/codegen/mips64/interface-descriptors-mips64.cc
+++ b/deps/v8/src/codegen/mips64/interface-descriptors-mips64.cc
@@ -60,6 +60,18 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {kReturnRegister0, a0, a1, a2, cp};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   const Register default_stub_registers[] = {a0, a1, a2, a3, kReturnRegister0};
diff --git a/deps/v8/src/codegen/mips64/macro-assembler-mips64.cc b/deps/v8/src/codegen/mips64/macro-assembler-mips64.cc
index 249fc9126b54d7..7d6d125aeb7a0f 100644
--- a/deps/v8/src/codegen/mips64/macro-assembler-mips64.cc
+++ b/deps/v8/src/codegen/mips64/macro-assembler-mips64.cc
@@ -256,10 +256,8 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Register address,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, address, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
@@ -267,14 +265,15 @@ void TurboAssembler::CallRecordWriteStub(
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
     Address wasm_target) {
   CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
-    Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
   // TODO(albertnetymk): For now we ignore remembered_set_action and fp_mode,
   // i.e. always emit remember set and save FP registers in RecordWriteStub. If
   // large performance regression is observed, we should use these values to
@@ -301,9 +300,20 @@ void TurboAssembler::CallRecordWriteStub(
 
   Move(remembered_set_parameter, Smi::FromEnum(remembered_set_action));
   Move(fp_mode_parameter, Smi::FromEnum(fp_mode));
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     Call(wasm_target, RelocInfo::WASM_STUB_CALL);
-  } else {
+  } else if (options().inline_offheap_trampolines) {
+    // Inline the trampoline.
+    DCHECK(Builtins::IsBuiltinId(builtin_index));
+    RecordCommentForOffHeapTrampoline(builtin_index);
+    CHECK_NE(builtin_index, Builtins::kNoBuiltinId);
+    EmbeddedData d = EmbeddedData::FromBlob();
+    Address entry = d.InstructionStartOfBuiltin(builtin_index);
+    li(t9, Operand(entry, RelocInfo::OFF_HEAP_TARGET));
+    Call(t9);
+  } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
@@ -2621,6 +2631,101 @@ void TurboAssembler::Round_s_s(FPURegister dst, FPURegister src) {
              });
 }
 
+void TurboAssembler::LoadLane(MSASize sz, MSARegister dst, uint8_t laneidx,
+                              MemOperand src) {
+  switch (sz) {
+    case MSA_B:
+      Lbu(kScratchReg, src);
+      insert_b(dst, laneidx, kScratchReg);
+      break;
+    case MSA_H:
+      Lhu(kScratchReg, src);
+      insert_h(dst, laneidx, kScratchReg);
+      break;
+    case MSA_W:
+      Lwu(kScratchReg, src);
+      insert_w(dst, laneidx, kScratchReg);
+      break;
+    case MSA_D:
+      Ld(kScratchReg, src);
+      insert_d(dst, laneidx, kScratchReg);
+      break;
+    default:
+      UNREACHABLE();
+  }
+}
+
+void TurboAssembler::StoreLane(MSASize sz, MSARegister src, uint8_t laneidx,
+                               MemOperand dst) {
+  switch (sz) {
+    case MSA_B:
+      copy_u_b(kScratchReg, src, laneidx);
+      Sb(kScratchReg, dst);
+      break;
+    case MSA_H:
+      copy_u_h(kScratchReg, src, laneidx);
+      Sh(kScratchReg, dst);
+      break;
+    case MSA_W:
+      if (laneidx == 0) {
+        FPURegister src_reg = FPURegister::from_code(src.code());
+        Swc1(src_reg, dst);
+      } else {
+        copy_u_w(kScratchReg, src, laneidx);
+        Sw(kScratchReg, dst);
+      }
+      break;
+    case MSA_D:
+      if (laneidx == 0) {
+        FPURegister src_reg = FPURegister::from_code(src.code());
+        Sdc1(src_reg, dst);
+      } else {
+        copy_s_d(kScratchReg, src, laneidx);
+        Sd(kScratchReg, dst);
+      }
+      break;
+    default:
+      UNREACHABLE();
+  }
+}
+
+#define EXT_MUL_BINOP(type, ilv_instr, dotp_instr)            \
+  case type:                                                  \
+    xor_v(kSimd128RegZero, kSimd128RegZero, kSimd128RegZero); \
+    ilv_instr(kSimd128ScratchReg, kSimd128RegZero, src1);     \
+    ilv_instr(kSimd128RegZero, kSimd128RegZero, src2);        \
+    dotp_instr(dst, kSimd128ScratchReg, kSimd128RegZero);     \
+    break;
+
+void TurboAssembler::ExtMulLow(MSADataType type, MSARegister dst,
+                               MSARegister src1, MSARegister src2) {
+  switch (type) {
+    EXT_MUL_BINOP(MSAS8, ilvr_b, dotp_s_h)
+    EXT_MUL_BINOP(MSAS16, ilvr_h, dotp_s_w)
+    EXT_MUL_BINOP(MSAS32, ilvr_w, dotp_s_d)
+    EXT_MUL_BINOP(MSAU8, ilvr_b, dotp_u_h)
+    EXT_MUL_BINOP(MSAU16, ilvr_h, dotp_u_w)
+    EXT_MUL_BINOP(MSAU32, ilvr_w, dotp_u_d)
+    default:
+      UNREACHABLE();
+  }
+}
+
+void TurboAssembler::ExtMulHigh(MSADataType type, MSARegister dst,
+                                MSARegister src1, MSARegister src2) {
+  switch (type) {
+    EXT_MUL_BINOP(MSAS8, ilvl_b, dotp_s_h)
+    EXT_MUL_BINOP(MSAS16, ilvl_h, dotp_s_w)
+    EXT_MUL_BINOP(MSAS32, ilvl_w, dotp_s_d)
+    EXT_MUL_BINOP(MSAU8, ilvl_b, dotp_u_h)
+    EXT_MUL_BINOP(MSAU16, ilvl_h, dotp_u_w)
+    EXT_MUL_BINOP(MSAU32, ilvl_w, dotp_u_d)
+    default:
+      UNREACHABLE();
+  }
+}
+#undef EXT_MUL_BINOP
+
 void TurboAssembler::MSARoundW(MSARegister dst, MSARegister src,
                                FPURoundingMode mode) {
   BlockTrampolinePoolScope block_trampoline_pool(this);
@@ -3167,88 +3272,22 @@ void TurboAssembler::Dpopcnt(Register rd, Register rs) {
   dsrl32(rd, rd, shift);
 }
 
-void MacroAssembler::EmitFPUTruncate(
-    FPURoundingMode rounding_mode, Register result, DoubleRegister double_input,
-    Register scratch, DoubleRegister double_scratch, Register except_flag,
-    CheckForInexactConversion check_inexact) {
-  DCHECK(result != scratch);
-  DCHECK(double_input != double_scratch);
-  DCHECK(except_flag != scratch);
-
-  Label done;
-
-  // Clear the except flag (0 = no exception)
-  mov(except_flag, zero_reg);
-
-  // Test for values that can be exactly represented as a signed 32-bit integer.
-  cvt_w_d(double_scratch, double_input);
-  mfc1(result, double_scratch);
-  cvt_d_w(double_scratch, double_scratch);
-  CompareF64(EQ, double_input, double_scratch);
-  BranchTrueShortF(&done);
-
-  int32_t except_mask = kFCSRFlagMask;  // Assume interested in all exceptions.
-
-  if (check_inexact == kDontCheckForInexactConversion) {
-    // Ignore inexact exceptions.
-    except_mask &= ~kFCSRInexactFlagMask;
-  }
-
-  // Save FCSR.
-  cfc1(scratch, FCSR);
-  // Disable FPU exceptions.
-  ctc1(zero_reg, FCSR);
-
-  // Do operation based on rounding mode.
-  switch (rounding_mode) {
-    case kRoundToNearest:
-      Round_w_d(double_scratch, double_input);
-      break;
-    case kRoundToZero:
-      Trunc_w_d(double_scratch, double_input);
-      break;
-    case kRoundToPlusInf:
-      Ceil_w_d(double_scratch, double_input);
-      break;
-    case kRoundToMinusInf:
-      Floor_w_d(double_scratch, double_input);
-      break;
-  }  // End of switch-statement.
-
-  // Retrieve FCSR.
-  cfc1(except_flag, FCSR);
-  // Restore FCSR.
-  ctc1(scratch, FCSR);
-  // Move the converted value into the result register.
-  mfc1(result, double_scratch);
-
-  // Check for fpu exceptions.
-  And(except_flag, except_flag, Operand(except_mask));
-
-  bind(&done);
-}
-
 void TurboAssembler::TryInlineTruncateDoubleToI(Register result,
                                                 DoubleRegister double_input,
                                                 Label* done) {
   DoubleRegister single_scratch = kScratchDoubleReg.low();
-  UseScratchRegisterScope temps(this);
   BlockTrampolinePoolScope block_trampoline_pool(this);
-  Register scratch = temps.Acquire();
-  Register scratch2 = t9;
+  Register scratch = t9;
 
-  // Clear cumulative exception flags and save the FCSR.
-  cfc1(scratch2, FCSR);
-  ctc1(zero_reg, FCSR);
   // Try a conversion to a signed integer.
   trunc_w_d(single_scratch, double_input);
   mfc1(result, single_scratch);
-  // Retrieve and restore the FCSR.
+  // Retrieve the FCSR.
   cfc1(scratch, FCSR);
-  ctc1(scratch2, FCSR);
   // Check for overflow and NaNs.
   And(scratch, scratch,
-      kFCSROverflowFlagMask | kFCSRUnderflowFlagMask | kFCSRInvalidOpFlagMask);
+      kFCSROverflowCauseMask | kFCSRUnderflowCauseMask |
+          kFCSRInvalidOpCauseMask);
   // If we had no exceptions we are done.
   Branch(done, eq, scratch, Operand(zero_reg));
 }
@@ -5217,7 +5256,7 @@ void TurboAssembler::Abort(AbortReason reason) {
   }
 }
 
-void MacroAssembler::LoadMap(Register destination, Register object) {
+void TurboAssembler::LoadMap(Register destination, Register object) {
   Ld(destination, FieldMemOperand(object, HeapObject::kMapOffset));
 }
 
@@ -5969,7 +6008,7 @@ void TurboAssembler::ResetSpeculationPoisonRegister() {
 
 void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
                                            Label* exit, DeoptimizeKind kind,
-                                           Label*) {
+                                           Label* ret, Label*) {
   BlockTrampolinePoolScope block_trampoline_pool(this);
   Ld(t9,
      MemOperand(kRootRegister, IsolateData::builtin_entry_slot_offset(target)));
@@ -5978,7 +6017,12 @@ void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    Branch(ret);
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+  }
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/mips64/macro-assembler-mips64.h b/deps/v8/src/codegen/mips64/macro-assembler-mips64.h
index a0d5e59bf0b93c..af5dc103e17af1 100644
--- a/deps/v8/src/codegen/mips64/macro-assembler-mips64.h
+++ b/deps/v8/src/codegen/mips64/macro-assembler-mips64.h
@@ -261,7 +261,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void StoreReturnAddressAndCall(Register target);
 
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   void Ret(COND_ARGS);
@@ -741,6 +741,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void LoadRoot(Register destination, RootIndex index, Condition cond,
                 Register src1, const Operand& src2);
 
+  void LoadMap(Register destination, Register object);
+
   // If the value is a NaN, canonicalize the value else, do nothing.
   void FPUCanonicalizeNaN(const DoubleRegister dst, const DoubleRegister src);
 
@@ -791,6 +793,12 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void Floor_s_s(FPURegister fd, FPURegister fs);
   void Ceil_s_s(FPURegister fd, FPURegister fs);
 
+  void LoadLane(MSASize sz, MSARegister dst, uint8_t laneidx, MemOperand src);
+  void StoreLane(MSASize sz, MSARegister src, uint8_t laneidx, MemOperand dst);
+  void ExtMulLow(MSADataType type, MSARegister dst, MSARegister src1,
+                 MSARegister src2);
+  void ExtMulHigh(MSADataType type, MSARegister dst, MSARegister src1,
+                  MSARegister src2);
   void MSARoundW(MSARegister dst, MSARegister src, FPURoundingMode mode);
   void MSARoundD(MSARegister dst, MSARegister src, FPURoundingMode mode);
 
@@ -907,7 +915,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallRecordWriteStub(Register object, Register address,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 };
 
@@ -1018,17 +1026,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   void BranchShortMSA(MSABranchDF df, Label* target, MSABranchCondition cond,
                       MSARegister wt, BranchDelaySlot bd = PROTECT);
 
-  // Truncates a double using a specific rounding mode, and writes the value
-  // to the result register.
-  // The except_flag will contain any exceptions caused by the instruction.
-  // If check_inexact is kDontCheckForInexactConversion, then the inexact
-  // exception is masked.
-  void EmitFPUTruncate(
-      FPURoundingMode rounding_mode, Register result,
-      DoubleRegister double_input, Register scratch,
-      DoubleRegister double_scratch, Register except_flag,
-      CheckForInexactConversion check_inexact = kDontCheckForInexactConversion);
-
   // Enter exit frame.
   // argc - argument count to be dropped by LeaveExitFrame.
   // save_doubles - saves FPU registers on stack, currently disabled.
@@ -1041,8 +1038,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
                       bool do_return = NO_EMIT_RETURN,
                       bool argument_count_is_length = false);
 
-  void LoadMap(Register destination, Register object);
-
   // Make sure the stack is aligned. Only emits code in debug mode.
   void AssertStackIsAligned();
 
diff --git a/deps/v8/src/codegen/optimized-compilation-info.cc b/deps/v8/src/codegen/optimized-compilation-info.cc
index bf45a5f38be7e4..6e8ce93aaa027e 100644
--- a/deps/v8/src/codegen/optimized-compilation-info.cc
+++ b/deps/v8/src/codegen/optimized-compilation-info.cc
@@ -5,6 +5,7 @@
 #include "src/codegen/optimized-compilation-info.h"
 
 #include "src/api/api.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/source-position.h"
 #include "src/debug/debug.h"
 #include "src/execution/isolate.h"
@@ -25,7 +26,7 @@ OptimizedCompilationInfo::OptimizedCompilationInfo(
       optimization_id_(isolate->NextOptimizationId()) {
   DCHECK_EQ(*shared, closure->shared());
   DCHECK(shared->is_compiled());
-  bytecode_array_ = handle(shared->GetBytecodeArray(), isolate);
+  bytecode_array_ = handle(shared->GetBytecodeArray(isolate), isolate);
   shared_info_ = shared;
   closure_ = closure;
 
@@ -149,12 +150,12 @@ void OptimizedCompilationInfo::RetryOptimization(BailoutReason reason) {
 
 std::unique_ptr<char[]> OptimizedCompilationInfo::GetDebugName() const {
   if (!shared_info().is_null()) {
-    return shared_info()->DebugName().ToCString();
+    return shared_info()->DebugNameCStr();
   }
   Vector<const char> name_vec = debug_name_;
   if (name_vec.empty()) name_vec = ArrayVector("unknown");
   std::unique_ptr<char[]> name(new char[name_vec.length() + 1]);
-  memcpy(name.get(), name_vec.begin(), name_vec.length());
+  base::Memcpy(name.get(), name_vec.begin(), name_vec.length());
   name[name_vec.length()] = '\0';
   return name;
 }
diff --git a/deps/v8/src/codegen/optimized-compilation-info.h b/deps/v8/src/codegen/optimized-compilation-info.h
index 6e238d62398c5e..42dc87f3927ba9 100644
--- a/deps/v8/src/codegen/optimized-compilation-info.h
+++ b/deps/v8/src/codegen/optimized-compilation-info.h
@@ -103,6 +103,9 @@ class V8_EXPORT_PRIVATE OptimizedCompilationInfo final {
   OptimizedCompilationInfo(Vector<const char> debug_name, Zone* zone,
                            CodeKind code_kind);
 
+  OptimizedCompilationInfo(const OptimizedCompilationInfo&) = delete;
+  OptimizedCompilationInfo& operator=(const OptimizedCompilationInfo&) = delete;
+
   ~OptimizedCompilationInfo();
 
   Zone* zone() { return zone_; }
@@ -312,8 +315,6 @@ class V8_EXPORT_PRIVATE OptimizedCompilationInfo final {
   // handles above. The only difference is that is created in the
   // CanonicalHandleScope(i.e step 1) is different).
   std::unique_ptr<CanonicalHandlesMap> canonical_handles_;
-
-  DISALLOW_COPY_AND_ASSIGN(OptimizedCompilationInfo);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/pending-optimization-table.cc b/deps/v8/src/codegen/pending-optimization-table.cc
index 84e36fc8438d08..6f51cc43afe235 100644
--- a/deps/v8/src/codegen/pending-optimization-table.cc
+++ b/deps/v8/src/codegen/pending-optimization-table.cc
@@ -38,7 +38,7 @@ void PendingOptimizationTable::PreparedForOptimization(
                        isolate->heap()->pending_optimize_for_test_bytecode()),
                    isolate);
   Handle<Tuple2> tuple = isolate->factory()->NewTuple2(
-      handle(function->shared().GetBytecodeArray(), isolate),
+      handle(function->shared().GetBytecodeArray(isolate), isolate),
       handle(Smi::FromInt(status), isolate), AllocationType::kYoung);
   table =
       ObjectHashTable::Put(table, handle(function->shared(), isolate), tuple);
diff --git a/deps/v8/src/codegen/ppc/assembler-ppc-inl.h b/deps/v8/src/codegen/ppc/assembler-ppc-inl.h
index f6a2f7849d8193..a638ba975938cb 100644
--- a/deps/v8/src/codegen/ppc/assembler-ppc-inl.h
+++ b/deps/v8/src/codegen/ppc/assembler-ppc-inl.h
@@ -149,7 +149,9 @@ Handle<Object> Assembler::code_target_object_handle_at(Address pc,
 
 HeapObject RelocInfo::target_object() {
   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-  if (IsCompressedEmbeddedObject(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
+  } else if (IsCompressedEmbeddedObject(rmode_)) {
     return HeapObject::cast(Object(DecompressTaggedAny(
         host_.address(),
         Assembler::target_compressed_address_at(pc_, constant_pool_))));
@@ -176,7 +178,9 @@ Handle<HeapObject> Assembler::compressed_embedded_object_handle_at(
 
 Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-  if (IsCodeTarget(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
+  } else if (IsCodeTarget(rmode_)) {
     return Handle<HeapObject>::cast(
         origin->code_target_object_handle_at(pc_, constant_pool_));
   } else {
@@ -192,7 +196,10 @@ void RelocInfo::set_target_object(Heap* heap, HeapObject target,
                                   WriteBarrierMode write_barrier_mode,
                                   ICacheFlushMode icache_flush_mode) {
   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-  if (IsCompressedEmbeddedObject(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    WriteUnalignedValue(pc_, target.ptr());
+    // No need to flush icache since no instructions were changed.
+  } else if (IsCompressedEmbeddedObject(rmode_)) {
     Assembler::set_target_compressed_address_at(
         pc_, constant_pool_, CompressTagged(target.ptr()), icache_flush_mode);
   } else {
diff --git a/deps/v8/src/codegen/ppc/assembler-ppc.cc b/deps/v8/src/codegen/ppc/assembler-ppc.cc
index 54136a9f2b3815..ff1835f435e765 100644
--- a/deps/v8/src/codegen/ppc/assembler-ppc.cc
+++ b/deps/v8/src/codegen/ppc/assembler-ppc.cc
@@ -71,17 +71,20 @@ void CpuFeatures::ProbeImpl(bool cross_compile) {
     supported_ |= (1u << MODULO);
   }
 #if V8_TARGET_ARCH_PPC64
-  if (cpu.part() == base::CPU::PPC_POWER8) {
+  if (cpu.part() == base::CPU::PPC_POWER8 ||
+      cpu.part() == base::CPU::PPC_POWER9) {
     supported_ |= (1u << FPR_GPR_MOV);
   }
 #endif
   if (cpu.part() == base::CPU::PPC_POWER6 ||
       cpu.part() == base::CPU::PPC_POWER7 ||
-      cpu.part() == base::CPU::PPC_POWER8) {
+      cpu.part() == base::CPU::PPC_POWER8 ||
+      cpu.part() == base::CPU::PPC_POWER9) {
     supported_ |= (1u << LWSYNC);
   }
   if (cpu.part() == base::CPU::PPC_POWER7 ||
-      cpu.part() == base::CPU::PPC_POWER8) {
+      cpu.part() == base::CPU::PPC_POWER8 ||
+      cpu.part() == base::CPU::PPC_POWER9) {
     supported_ |= (1u << ISELECT);
     supported_ |= (1u << VSX);
   }
@@ -1466,6 +1469,9 @@ void Assembler::mcrfs(CRegister cr, FPSCRBit bit) {
 
 void Assembler::mfcr(Register dst) { emit(EXT2 | MFCR | dst.code() * B21); }
 
+void Assembler::mtcrf(unsigned char FXM, Register src) {
+  emit(MTCRF | src.code() * B21 | FXM * B12);
+}
 #if V8_TARGET_ARCH_PPC64
 void Assembler::mffprd(Register dst, DoubleRegister src) {
   emit(EXT2 | MFVSRD | src.code() * B21 | dst.code() * B16);
@@ -1798,6 +1804,54 @@ void Assembler::lxvd(const Simd128Register rt, const MemOperand& src) {
        TX);
 }
 
+void Assembler::lxsdx(const Simd128Register rt, const MemOperand& src) {
+  int TX = 1;
+  emit(LXSDX | rt.code() * B21 | src.ra().code() * B16 | src.rb().code() * B11 |
+       TX);
+}
+
+void Assembler::lxsibzx(const Simd128Register rt, const MemOperand& src) {
+  int TX = 1;
+  emit(LXSIBZX | rt.code() * B21 | src.ra().code() * B16 |
+       src.rb().code() * B11 | TX);
+}
+
+void Assembler::lxsihzx(const Simd128Register rt, const MemOperand& src) {
+  int TX = 1;
+  emit(LXSIHZX | rt.code() * B21 | src.ra().code() * B16 |
+       src.rb().code() * B11 | TX);
+}
+
+void Assembler::lxsiwzx(const Simd128Register rt, const MemOperand& src) {
+  int TX = 1;
+  emit(LXSIWZX | rt.code() * B21 | src.ra().code() * B16 |
+       src.rb().code() * B11 | TX);
+}
+
+void Assembler::stxsdx(const Simd128Register rs, const MemOperand& src) {
+  int SX = 1;
+  emit(STXSDX | rs.code() * B21 | src.ra().code() * B16 |
+       src.rb().code() * B11 | SX);
+}
+
+void Assembler::stxsibx(const Simd128Register rs, const MemOperand& src) {
+  int SX = 1;
+  emit(STXSIBX | rs.code() * B21 | src.ra().code() * B16 |
+       src.rb().code() * B11 | SX);
+}
+
+void Assembler::stxsihx(const Simd128Register rs, const MemOperand& src) {
+  int SX = 1;
+  emit(STXSIHX | rs.code() * B21 | src.ra().code() * B16 |
+       src.rb().code() * B11 | SX);
+}
+
+void Assembler::stxsiwx(const Simd128Register rs, const MemOperand& src) {
+  int SX = 1;
+  emit(STXSIWX | rs.code() * B21 | src.ra().code() * B16 |
+       src.rb().code() * B11 | SX);
+}
+
 void Assembler::stxvd(const Simd128Register rt, const MemOperand& dst) {
   int SX = 1;
   emit(STXVD | rt.code() * B21 | dst.ra().code() * B16 | dst.rb().code() * B11 |
@@ -1806,6 +1860,7 @@ void Assembler::stxvd(const Simd128Register rt, const MemOperand& dst) {
 
 void Assembler::xxspltib(const Simd128Register rt, const Operand& imm) {
   int TX = 1;
+  CHECK(is_uint8(imm.immediate()));
   emit(XXSPLTIB | rt.code() * B21 | imm.immediate() * B11 | TX);
 }
 
@@ -1893,20 +1948,32 @@ void Assembler::db(uint8_t data) {
   pc_ += sizeof(uint8_t);
 }
 
-void Assembler::dd(uint32_t data) {
+void Assembler::dd(uint32_t data, RelocInfo::Mode rmode) {
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint32_t*>(pc_) = data;
   pc_ += sizeof(uint32_t);
 }
 
-void Assembler::dq(uint64_t value) {
+void Assembler::dq(uint64_t value, RelocInfo::Mode rmode) {
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint64_t*>(pc_) = value;
   pc_ += sizeof(uint64_t);
 }
 
-void Assembler::dp(uintptr_t data) {
+void Assembler::dp(uintptr_t data, RelocInfo::Mode rmode) {
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uintptr_t*>(pc_) = data;
   pc_ += sizeof(uintptr_t);
 }
diff --git a/deps/v8/src/codegen/ppc/assembler-ppc.h b/deps/v8/src/codegen/ppc/assembler-ppc.h
index 11497c90ce1585..a7c729c43b1d7c 100644
--- a/deps/v8/src/codegen/ppc/assembler-ppc.h
+++ b/deps/v8/src/codegen/ppc/assembler-ppc.h
@@ -444,14 +444,14 @@ class Assembler : public AssemblerBase {
   PPC_XX2_OPCODE_A_FORM_LIST(DECLARE_PPC_XX2_INSTRUCTIONS)
 #undef DECLARE_PPC_XX2_INSTRUCTIONS
 
-#define DECLARE_PPC_XX3_INSTRUCTIONS(name, instr_name, instr_value)  \
-  inline void name(const DoubleRegister rt, const DoubleRegister ra, \
-                   const DoubleRegister rb) {                        \
-    xx3_form(instr_name, rt, ra, rb);                                \
+#define DECLARE_PPC_XX3_INSTRUCTIONS(name, instr_name, instr_value)    \
+  inline void name(const Simd128Register rt, const Simd128Register ra, \
+                   const Simd128Register rb) {                         \
+    xx3_form(instr_name, rt, ra, rb);                                  \
   }
 
-  inline void xx3_form(Instr instr, DoubleRegister t, DoubleRegister a,
-                       DoubleRegister b) {
+  inline void xx3_form(Instr instr, Simd128Register t, Simd128Register a,
+                       Simd128Register b) {
     // Using VR (high VSR) registers.
     int AX = 1;
     int BX = 1;
@@ -922,6 +922,7 @@ class Assembler : public AssemblerBase {
   void mtxer(Register src);
   void mcrfs(CRegister cr, FPSCRBit bit);
   void mfcr(Register dst);
+  void mtcrf(unsigned char FXM, Register src);
 #if V8_TARGET_ARCH_PPC64
   void mffprd(Register dst, DoubleRegister src);
   void mffprwz(Register dst, DoubleRegister src);
@@ -1021,6 +1022,14 @@ class Assembler : public AssemblerBase {
   void mtvsrd(const Simd128Register rt, const Register ra);
   void mtvsrdd(const Simd128Register rt, const Register ra, const Register rb);
   void lxvd(const Simd128Register rt, const MemOperand& src);
+  void lxsdx(const Simd128Register rt, const MemOperand& src);
+  void lxsibzx(const Simd128Register rt, const MemOperand& src);
+  void lxsihzx(const Simd128Register rt, const MemOperand& src);
+  void lxsiwzx(const Simd128Register rt, const MemOperand& src);
+  void stxsdx(const Simd128Register rs, const MemOperand& src);
+  void stxsibx(const Simd128Register rs, const MemOperand& src);
+  void stxsihx(const Simd128Register rs, const MemOperand& src);
+  void stxsiwx(const Simd128Register rs, const MemOperand& src);
   void stxvd(const Simd128Register rt, const MemOperand& src);
   void xxspltib(const Simd128Register rt, const Operand& imm);
 
@@ -1076,7 +1085,7 @@ class Assembler : public AssemblerBase {
   }
 
   // Class for scoping postponing the trampoline pool generation.
-  class BlockTrampolinePoolScope {
+  class V8_NODISCARD BlockTrampolinePoolScope {
    public:
     explicit BlockTrampolinePoolScope(Assembler* assem) : assem_(assem) {
       assem_->StartBlockTrampolinePool();
@@ -1090,7 +1099,7 @@ class Assembler : public AssemblerBase {
   };
 
   // Class for scoping disabling constant pool entry merging
-  class BlockConstantPoolEntrySharingScope {
+  class V8_NODISCARD BlockConstantPoolEntrySharingScope {
    public:
     explicit BlockConstantPoolEntrySharingScope(Assembler* assem)
         : assem_(assem) {
@@ -1114,9 +1123,9 @@ class Assembler : public AssemblerBase {
   // Writes a single byte or word of data in the code stream.  Used
   // for inline tables, e.g., jump-tables.
   void db(uint8_t data);
-  void dd(uint32_t data);
-  void dq(uint64_t data);
-  void dp(uintptr_t data);
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
 
   // Read/patch instructions
   Instr instr_at(int pos) {
@@ -1416,7 +1425,7 @@ class PatchingAssembler : public Assembler {
   ~PatchingAssembler();
 };
 
-class V8_EXPORT_PRIVATE UseScratchRegisterScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD UseScratchRegisterScope {
  public:
   explicit UseScratchRegisterScope(Assembler* assembler);
   ~UseScratchRegisterScope();
diff --git a/deps/v8/src/codegen/ppc/constants-ppc.h b/deps/v8/src/codegen/ppc/constants-ppc.h
index f71d1beae35f7c..d26b686861208b 100644
--- a/deps/v8/src/codegen/ppc/constants-ppc.h
+++ b/deps/v8/src/codegen/ppc/constants-ppc.h
@@ -526,7 +526,9 @@ using Instr = uint32_t;
   /* VSX Vector Test for software Square Root Double-Precision */            \
   V(xvtsqrtdp, XVTSQRTDP, 0xF00003A8)                                        \
   /* VSX Vector Test for software Square Root Single-Precision */            \
-  V(xvtsqrtsp, XVTSQRTSP, 0xF00002A8)
+  V(xvtsqrtsp, XVTSQRTSP, 0xF00002A8)                                        \
+  /* Vector Splat Immediate Byte */                                          \
+  V(xxspltib, XXSPLTIB, 0xF00002D0)
 
 #define PPC_XX2_OPCODE_LIST(V)  \
   PPC_XX2_OPCODE_A_FORM_LIST(V) \
@@ -1926,15 +1928,17 @@ using Instr = uint32_t;
   /* Floating Reciprocal Square Root Estimate Single */ \
   V(frsqrtes, FRSQRTES, 0xEC000034)
 
-#define PPC_VA_OPCODE_A_FORM_LIST(V)                     \
-  /* Vector Permute */                                   \
-  V(vperm, VPERM, 0x1000002B)                            \
-  /* Vector Multiply-Low-Add Unsigned Halfword Modulo */ \
-  V(vmladduhm, VMLADDUHM, 0x10000022)                    \
-  /* Vector Select */                                    \
-  V(vsel, VSEL, 0x1000002A)                              \
-  /* Vector Multiply-Sum Signed Halfword Modulo */       \
-  V(vmsumshm, VMSUMSHM, 0x10000028)
+#define PPC_VA_OPCODE_A_FORM_LIST(V)                            \
+  /* Vector Permute */                                          \
+  V(vperm, VPERM, 0x1000002B)                                   \
+  /* Vector Multiply-Low-Add Unsigned Halfword Modulo */        \
+  V(vmladduhm, VMLADDUHM, 0x10000022)                           \
+  /* Vector Select */                                           \
+  V(vsel, VSEL, 0x1000002A)                                     \
+  /* Vector Multiply-Sum Signed Halfword Modulo */              \
+  V(vmsumshm, VMSUMSHM, 0x10000028)                             \
+  /* Vector Multiply-High-Round-Add Signed Halfword Saturate */ \
+  V(vmhraddshs, VMHRADDSHS, 0x10000021)
 
 #define PPC_VA_OPCODE_UNUSED_LIST(V)                             \
   /* Vector Add Extended & write Carry Unsigned Quadword */      \
@@ -1945,8 +1949,6 @@ using Instr = uint32_t;
   V(vmaddfp, VMADDFP, 0x1000002E)                                \
   /* Vector Multiply-High-Add Signed Halfword Saturate */        \
   V(vmhaddshs, VMHADDSHS, 0x10000020)                            \
-  /* Vector Multiply-High-Round-Add Signed Halfword Saturate */  \
-  V(vmhraddshs, VMHRADDSHS, 0x10000021)                          \
   /* Vector Multiply-Sum Mixed Byte Modulo */                    \
   V(vmsummbm, VMSUMMBM, 0x10000025)                              \
   /* Vector Multiply-Sum Signed Halfword Saturate */             \
@@ -1972,37 +1974,43 @@ using Instr = uint32_t;
   PPC_VA_OPCODE_A_FORM_LIST(V) \
   PPC_VA_OPCODE_UNUSED_LIST(V)
 
-#define PPC_XX1_OPCODE_LIST(V)                            \
-  /* Load VSR Scalar Doubleword Indexed */                \
-  V(lxsdx, LXSDX, 0x7C000498)                             \
-  /* Load VSX Scalar as Integer Word Algebraic Indexed */ \
-  V(lxsiwax, LXSIWAX, 0x7C000098)                         \
-  /* Load VSX Scalar as Integer Word and Zero Indexed */  \
-  V(lxsiwzx, LXSIWZX, 0x7C000018)                         \
-  /* Load VSX Scalar Single-Precision Indexed */          \
-  V(lxsspx, LXSSPX, 0x7C000418)                           \
-  /* Load VSR Vector Doubleword*2 Indexed */              \
-  V(lxvd, LXVD, 0x7C000698)                               \
-  /* Load VSR Vector Doubleword & Splat Indexed */        \
-  V(lxvdsx, LXVDSX, 0x7C000298)                           \
-  /* Load VSR Vector Word*4 Indexed */                    \
-  V(lxvw, LXVW, 0x7C000618)                               \
-  /* Move From VSR Doubleword */                          \
-  V(mfvsrd, MFVSRD, 0x7C000066)                           \
-  /* Move From VSR Word and Zero */                       \
-  V(mfvsrwz, MFVSRWZ, 0x7C0000E6)                         \
-  /* Store VSR Scalar Doubleword Indexed */               \
-  V(stxsdx, STXSDX, 0x7C000598)                           \
-  /* Store VSX Scalar as Integer Word Indexed */          \
-  V(stxsiwx, STXSIWX, 0x7C000118)                         \
-  /* Store VSR Scalar Word Indexed */                     \
-  V(stxsspx, STXSSPX, 0x7C000518)                         \
-  /* Store VSR Vector Doubleword*2 Indexed */             \
-  V(stxvd, STXVD, 0x7C000798)                             \
-  /* Store VSR Vector Word*4 Indexed */                   \
-  V(stxvw, STXVW, 0x7C000718)                             \
-  /* Vector Splat Immediate Byte */                       \
-  V(xxspltib, XXSPLTIB, 0xF00002D1)
+#define PPC_XX1_OPCODE_LIST(V)                             \
+  /* Load VSR Scalar Doubleword Indexed */                 \
+  V(lxsdx, LXSDX, 0x7C000498)                              \
+  /* Load VSX Scalar as Integer Word Algebraic Indexed */  \
+  V(lxsiwax, LXSIWAX, 0x7C000098)                          \
+  /* Load VSX Scalar as Integer Byte & Zero Indexed */     \
+  V(lxsibzx, LXSIBZX, 0x7C00061A)                          \
+  /* Load VSX Scalar as Integer Halfword & Zero Indexed */ \
+  V(lxsihzx, LXSIHZX, 0x7C00065A)                          \
+  /* Load VSX Scalar as Integer Word and Zero Indexed */   \
+  V(lxsiwzx, LXSIWZX, 0x7C000018)                          \
+  /* Load VSX Scalar Single-Precision Indexed */           \
+  V(lxsspx, LXSSPX, 0x7C000418)                            \
+  /* Load VSR Vector Doubleword*2 Indexed */               \
+  V(lxvd, LXVD, 0x7C000698)                                \
+  /* Load VSR Vector Doubleword & Splat Indexed */         \
+  V(lxvdsx, LXVDSX, 0x7C000298)                            \
+  /* Load VSR Vector Word*4 Indexed */                     \
+  V(lxvw, LXVW, 0x7C000618)                                \
+  /* Move From VSR Doubleword */                           \
+  V(mfvsrd, MFVSRD, 0x7C000066)                            \
+  /* Move From VSR Word and Zero */                        \
+  V(mfvsrwz, MFVSRWZ, 0x7C0000E6)                          \
+  /* Store VSR Scalar Doubleword Indexed */                \
+  V(stxsdx, STXSDX, 0x7C000598)                            \
+  /* Store VSX Scalar as Integer Word Indexed */           \
+  V(stxsiwx, STXSIWX, 0x7C000118)                          \
+  /* Store VSX Scalar as Integer Halfword Indexed */       \
+  V(stxsihx, STXSIHX, 0x7C00075A)                          \
+  /* Store VSX Scalar as Integer Byte Indexed */           \
+  V(stxsibx, STXSIBX, 0x7C00071A)                          \
+  /* Store VSR Scalar Word Indexed */                      \
+  V(stxsspx, STXSSPX, 0x7C000518)                          \
+  /* Store VSR Vector Doubleword*2 Indexed */              \
+  V(stxvd, STXVD, 0x7C000798)                              \
+  /* Store VSR Vector Word*4 Indexed */                    \
+  V(stxvw, STXVW, 0x7C000718)
 
 #define PPC_B_OPCODE_LIST(V) \
   /* Branch Conditional */   \
@@ -2265,10 +2273,22 @@ using Instr = uint32_t;
   V(vmuluwm, VMULUWM, 0x10000089)                          \
   /* Vector Pack Unsigned Halfword Unsigned Modulo */      \
   V(vpkuhum, VPKUHUM, 0x1000000E)                          \
+  /* Vector Multiply Even Signed Byte */                   \
+  V(vmulesb, VMULESB, 0x10000308)                          \
   /* Vector Multiply Even Unsigned Byte */                 \
   V(vmuleub, VMULEUB, 0x10000208)                          \
+  /* Vector Multiply Odd Signed Byte */                    \
+  V(vmulosb, VMULOSB, 0x10000108)                          \
   /* Vector Multiply Odd Unsigned Byte */                  \
   V(vmuloub, VMULOUB, 0x10000008)                          \
+  /* Vector Multiply Even Unsigned Halfword */             \
+  V(vmuleuh, VMULEUH, 0x10000248)                          \
+  /* Vector Multiply Even Signed Halfword */               \
+  V(vmulesh, VMULESH, 0x10000348)                          \
+  /* Vector Multiply Odd Unsigned Halfword */              \
+  V(vmulouh, VMULOUH, 0x10000048)                          \
+  /* Vector Multiply Odd Signed Halfword */                \
+  V(vmulosh, VMULOSH, 0x10000148)                          \
   /* Vector Sum across Quarter Signed Halfword Saturate */ \
   V(vsum4shs, VSUM4SHS, 0x10000648)                        \
   /* Vector Pack Unsigned Word Unsigned Saturate */        \
@@ -2373,6 +2393,8 @@ using Instr = uint32_t;
   V(vbpermq, VBPERMQ, 0x1000054C)
 
 #define PPC_VX_OPCODE_C_FORM_LIST(V)       \
+  /* Vector Unpack High Signed Word */     \
+  V(vupkhsw, VUPKHSW, 0x1000064E)          \
   /* Vector Unpack Low Signed Halfword */  \
   V(vupklsh, VUPKLSH, 0x100002CE)          \
   /* Vector Unpack High Signed Halfword */ \
@@ -2447,24 +2469,12 @@ using Instr = uint32_t;
   V(vmrglh, VMRGLH, 0x1000014C)                                           \
   /* Vector Merge Low Word */                                             \
   V(vmrglw, VMRGLW, 0x1000018C)                                           \
-  /* Vector Multiply Even Signed Byte */                                  \
-  V(vmulesb, VMULESB, 0x10000308)                                         \
-  /* Vector Multiply Even Signed Halfword */                              \
-  V(vmulesh, VMULESH, 0x10000348)                                         \
   /* Vector Multiply Even Signed Word */                                  \
   V(vmulesw, VMULESW, 0x10000388)                                         \
-  /* Vector Multiply Even Unsigned Halfword */                            \
-  V(vmuleuh, VMULEUH, 0x10000248)                                         \
   /* Vector Multiply Even Unsigned Word */                                \
   V(vmuleuw, VMULEUW, 0x10000288)                                         \
-  /* Vector Multiply Odd Signed Byte */                                   \
-  V(vmulosb, VMULOSB, 0x10000108)                                         \
-  /* Vector Multiply Odd Signed Halfword */                               \
-  V(vmulosh, VMULOSH, 0x10000148)                                         \
   /* Vector Multiply Odd Signed Word */                                   \
   V(vmulosw, VMULOSW, 0x10000188)                                         \
-  /* Vector Multiply Odd Unsigned Halfword */                             \
-  V(vmulouh, VMULOUH, 0x10000048)                                         \
   /* Vector Multiply Odd Unsigned Word */                                 \
   V(vmulouw, VMULOUW, 0x10000088)                                         \
   /* Vector NAND */                                                       \
@@ -2547,8 +2557,6 @@ using Instr = uint32_t;
   V(vsumsws, VSUMSWS, 0x10000788)                                         \
   /* Vector Unpack High Pixel */                                          \
   V(vupkhpx, VUPKHPX, 0x1000034E)                                         \
-  /* Vector Unpack High Signed Word */                                    \
-  V(vupkhsw, VUPKHSW, 0x1000064E)                                         \
   /* Vector Unpack Low Pixel */                                           \
   V(vupklpx, VUPKLPX, 0x100003CE)                                         \
   /* Vector Unpack Low Signed Word */                                     \
diff --git a/deps/v8/src/codegen/ppc/interface-descriptors-ppc.cc b/deps/v8/src/codegen/ppc/interface-descriptors-ppc.cc
index 3c2d92237dda06..ba8da6e0a8640b 100644
--- a/deps/v8/src/codegen/ppc/interface-descriptors-ppc.cc
+++ b/deps/v8/src/codegen/ppc/interface-descriptors-ppc.cc
@@ -34,6 +34,18 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {r3, r4, r5, r6, cp};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   const Register default_stub_registers[] = {r3, r4, r5, r6, r7};
diff --git a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc
index 08955805e654c4..c5d52e0444103b 100644
--- a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc
+++ b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc
@@ -647,10 +647,8 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Register address,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, address, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
@@ -658,14 +656,15 @@ void TurboAssembler::CallRecordWriteStub(
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
     Address wasm_target) {
   CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
-    Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
   // TODO(albertnetymk): For now we ignore remembered_set_action and fp_mode,
   // i.e. always emit remember set and save FP registers in RecordWriteStub. If
   // large performance regression is observed, we should use these values to
@@ -693,9 +692,19 @@ void TurboAssembler::CallRecordWriteStub(
 
   Move(remembered_set_parameter, Smi::FromEnum(remembered_set_action));
   Move(fp_mode_parameter, Smi::FromEnum(fp_mode));
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     Call(wasm_target, RelocInfo::WASM_STUB_CALL);
+  } else if (options().inline_offheap_trampolines) {
+    RecordCommentForOffHeapTrampoline(builtin_index);
+    EmbeddedData d = EmbeddedData::FromBlob();
+    Address entry = d.InstructionStartOfBuiltin(builtin_index);
+    // Use ip directly instead of using UseScratchRegisterScope, as we do
+    // not preserve scratch registers across calls.
+    mov(ip, Operand(entry, RelocInfo::OFF_HEAP_TARGET));
+    Call(ip);
   } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
@@ -1340,27 +1349,105 @@ void TurboAssembler::PrepareForTailCall(Register callee_args_count,
   mr(sp, dst_reg);
 }
 
+void MacroAssembler::LoadStackLimit(Register destination, StackLimitKind kind) {
+  DCHECK(root_array_available());
+  Isolate* isolate = this->isolate();
+  ExternalReference limit =
+      kind == StackLimitKind::kRealStackLimit
+          ? ExternalReference::address_of_real_jslimit(isolate)
+          : ExternalReference::address_of_jslimit(isolate);
+  DCHECK(TurboAssembler::IsAddressableThroughRootRegister(isolate, limit));
+
+  intptr_t offset =
+      TurboAssembler::RootRegisterOffsetForExternalReference(isolate, limit);
+  CHECK(is_int32(offset));
+  LoadP(destination, MemOperand(kRootRegister, offset), r0);
+}
+
+void MacroAssembler::StackOverflowCheck(Register num_args, Register scratch,
+                                        Label* stack_overflow) {
+  // Check the stack for overflow. We are not trying to catch
+  // interruptions (e.g. debug break and preemption) here, so the "real stack
+  // limit" is checked.
+  LoadStackLimit(scratch, StackLimitKind::kRealStackLimit);
+  // Make scratch the space we have left. The stack might already be overflowed
+  // here which will cause scratch to become negative.
+  sub(scratch, sp, scratch);
+  // Check if the arguments will overflow the stack.
+  ShiftLeftImm(r0, num_args, Operand(kSystemPointerSizeLog2));
+  cmp(scratch, r0);
+  ble(stack_overflow);  // Signed comparison.
+}
+
 void MacroAssembler::InvokePrologue(Register expected_parameter_count,
                                     Register actual_parameter_count,
                                     Label* done, InvokeFlag flag) {
   Label regular_invoke;
 
-  // Check whether the expected and actual arguments count match. If not,
-  // setup registers according to contract with ArgumentsAdaptorTrampoline:
   //  r3: actual arguments count
   //  r4: function (passed through to callee)
   //  r5: expected arguments count
 
-  // The code below is made a lot easier because the calling code already sets
-  // up actual and expected registers according to the contract if values are
-  // passed in registers.
+  DCHECK_EQ(actual_parameter_count, r3);
+  DCHECK_EQ(expected_parameter_count, r5);
+
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  // If the expected parameter count is equal to the adaptor sentinel, no need
+  // to push undefined value as arguments.
+  mov(r0, Operand(kDontAdaptArgumentsSentinel));
+  cmp(expected_parameter_count, r0);
+  beq(&regular_invoke);
+
+  // If overapplication or if the actual argument count is equal to the
+  // formal parameter count, no need to push extra undefined values.
+  sub(expected_parameter_count, expected_parameter_count,
+      actual_parameter_count, LeaveOE, SetRC);
+  ble(&regular_invoke, cr0);
 
-  // The code below is made a lot easier because the calling code already sets
-  // up actual and expected registers according to the contract.
-  // ARM has some checks as per below, considering add them for PPC
-  // DCHECK_EQ(actual_parameter_count, r3);
-  // DCHECK_EQ(expected_parameter_count, r5);
+  Label stack_overflow;
+  Register scratch = r7;
+  StackOverflowCheck(expected_parameter_count, scratch, &stack_overflow);
 
+  // Underapplication. Move the arguments already in the stack, including the
+  // receiver and the return address.
+  {
+    Label copy;
+    Register src = r9, dest = r8;
+    addi(src, sp, Operand(-kSystemPointerSize));
+    ShiftLeftImm(r0, expected_parameter_count, Operand(kSystemPointerSizeLog2));
+    sub(sp, sp, r0);
+    // Update stack pointer.
+    addi(dest, sp, Operand(-kSystemPointerSize));
+    addi(r0, actual_parameter_count, Operand(1));
+    mtctr(r0);
+
+    bind(&copy);
+    LoadPU(r0, MemOperand(src, kSystemPointerSize));
+    StorePU(r0, MemOperand(dest, kSystemPointerSize));
+    bdnz(&copy);
+  }
+
+  // Fill remaining expected arguments with undefined values.
+  LoadRoot(scratch, RootIndex::kUndefinedValue);
+  {
+    mtctr(expected_parameter_count);
+
+    Label loop;
+    bind(&loop);
+    StorePU(scratch, MemOperand(r8, kSystemPointerSize));
+    bdnz(&loop);
+  }
+  b(&regular_invoke);
+
+  bind(&stack_overflow);
+  {
+    FrameScope frame(this, StackFrame::MANUAL);
+    CallRuntime(Runtime::kThrowStackOverflow);
+    bkpt(0);
+  }
+#else
+  // Check whether the expected and actual arguments count match. If not,
+  // setup registers according to contract with ArgumentsAdaptorTrampoline.
   cmp(expected_parameter_count, actual_parameter_count);
   beq(&regular_invoke);
 
@@ -1371,7 +1458,8 @@ void MacroAssembler::InvokePrologue(Register expected_parameter_count,
   } else {
     Jump(adaptor, RelocInfo::CODE_TARGET);
   }
-    bind(&regular_invoke);
+#endif
+  bind(&regular_invoke);
 }
 
 void MacroAssembler::CheckDebugHook(Register fun, Register new_target,
@@ -1846,7 +1934,7 @@ void TurboAssembler::Abort(AbortReason reason) {
   // will not return here
 }
 
-void MacroAssembler::LoadMap(Register destination, Register object) {
+void TurboAssembler::LoadMap(Register destination, Register object) {
   LoadTaggedPointerField(destination,
                          FieldMemOperand(object, HeapObject::kMapOffset));
 }
@@ -2878,7 +2966,7 @@ void TurboAssembler::LoadSimd128(Simd128Register dst, const MemOperand& mem,
       sp, sp,
       Operand(base::bits::WhichPowerOfTwo(16)));  // equivalent to &= -16
   addi(sp, sp, Operand(-16));
-  stxvd(kScratchDoubleReg, MemOperand(r0, sp));
+  stxvd(ScratchDoubleReg, MemOperand(r0, sp));
   // Load it with correct lane ordering.
   lvx(dst, MemOperand(r0, sp));
   mr(sp, ScratchReg);
@@ -3089,40 +3177,40 @@ void TurboAssembler::SwapSimd128(Simd128Register src, Simd128Register dst,
 
 void TurboAssembler::SwapSimd128(Simd128Register src, MemOperand dst,
                                  Simd128Register scratch) {
-  DCHECK(!AreAliased(src, scratch));
-  // push d0, to be used as scratch
+  DCHECK(src != scratch);
+  // push v0, to be used as scratch
   addi(sp, sp, Operand(-kSimd128Size));
-  StoreSimd128(d0, MemOperand(r0, sp), r0, scratch);
+  StoreSimd128(v0, MemOperand(r0, sp), r0, scratch);
   mov(ip, Operand(dst.offset()));
-  LoadSimd128(d0, MemOperand(dst.ra(), ip), r0, scratch);
+  LoadSimd128(v0, MemOperand(dst.ra(), ip), r0, scratch);
   StoreSimd128(src, MemOperand(dst.ra(), ip), r0, scratch);
-  vor(src, d0, d0);
-  // restore d0
-  LoadSimd128(d0, MemOperand(r0, sp), ip, scratch);
+  vor(src, v0, v0);
+  // restore v0
+  LoadSimd128(v0, MemOperand(r0, sp), ip, scratch);
   addi(sp, sp, Operand(kSimd128Size));
 }
 
 void TurboAssembler::SwapSimd128(MemOperand src, MemOperand dst,
                                  Simd128Register scratch) {
-  // push d0 and d1, to be used as scratch
+  // push v0 and v1, to be used as scratch
   addi(sp, sp, Operand(2 * -kSimd128Size));
-  StoreSimd128(d0, MemOperand(r0, sp), ip, scratch);
+  StoreSimd128(v0, MemOperand(r0, sp), ip, scratch);
   li(ip, Operand(kSimd128Size));
-  StoreSimd128(d1, MemOperand(ip, sp), r0, scratch);
+  StoreSimd128(v1, MemOperand(ip, sp), r0, scratch);
 
   mov(ip, Operand(src.offset()));
-  LoadSimd128(d0, MemOperand(src.ra(), ip), r0, scratch);
+  LoadSimd128(v0, MemOperand(src.ra(), ip), r0, scratch);
   mov(ip, Operand(dst.offset()));
-  LoadSimd128(d1, MemOperand(dst.ra(), ip), r0, scratch);
+  LoadSimd128(v1, MemOperand(dst.ra(), ip), r0, scratch);
 
-  StoreSimd128(d0, MemOperand(dst.ra(), ip), r0, scratch);
+  StoreSimd128(v0, MemOperand(dst.ra(), ip), r0, scratch);
   mov(ip, Operand(src.offset()));
-  StoreSimd128(d1, MemOperand(src.ra(), ip), r0, scratch);
+  StoreSimd128(v1, MemOperand(src.ra(), ip), r0, scratch);
 
-  // restore d0 and d1
-  LoadSimd128(d0, MemOperand(r0, sp), ip, scratch);
+  // restore v0 and v1
+  LoadSimd128(v0, MemOperand(r0, sp), ip, scratch);
   li(ip, Operand(kSimd128Size));
-  LoadSimd128(d1, MemOperand(ip, sp), r0, scratch);
+  LoadSimd128(v1, MemOperand(ip, sp), r0, scratch);
   addi(sp, sp, Operand(2 * kSimd128Size));
 }
 
@@ -3259,7 +3347,8 @@ void TurboAssembler::StoreReturnAddressAndCall(Register target) {
 
 void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
                                            Label* exit, DeoptimizeKind kind,
-                                           Label*) {
+                                           Label* ret, Label*) {
+  BlockTrampolinePoolScope block_trampoline_pool(this);
   LoadP(ip, MemOperand(kRootRegister,
                        IsolateData::builtin_entry_slot_offset(target)));
   Call(ip);
@@ -3267,7 +3356,11 @@ void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    b(ret);
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+  }
 }
 
 void TurboAssembler::ZeroExtByte(Register dst, Register src) {
diff --git a/deps/v8/src/codegen/ppc/macro-assembler-ppc.h b/deps/v8/src/codegen/ppc/macro-assembler-ppc.h
index db0d6857ac99a1..1b97c2312829c3 100644
--- a/deps/v8/src/codegen/ppc/macro-assembler-ppc.h
+++ b/deps/v8/src/codegen/ppc/macro-assembler-ppc.h
@@ -18,6 +18,8 @@
 namespace v8 {
 namespace internal {
 
+enum class StackLimitKind { kInterruptStackLimit, kRealStackLimit };
+
 // ----------------------------------------------------------------------------
 // Static helper functions
 
@@ -442,7 +444,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallBuiltinByIndex(Register builtin_index) override;
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   // Emit code to discard a non-negative number of pointer-sized elements
@@ -598,6 +600,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void JumpIfEqual(Register x, int32_t y, Label* dest);
   void JumpIfLessThan(Register x, int32_t y, Label* dest);
 
+  void LoadMap(Register destination, Register object);
+
 #if V8_TARGET_ARCH_PPC64
   inline void TestIfInt32(Register value, Register scratch,
                           CRegister cr = cr7) {
@@ -715,7 +719,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
                            bool has_function_descriptor);
   void CallRecordWriteStub(Register object, Register address,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 };
 
@@ -771,8 +775,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   void LeaveExitFrame(bool save_doubles, Register argument_count,
                       bool argument_count_is_length = false);
 
-  void LoadMap(Register destination, Register object);
-
   // Load the global proxy from the current context.
   void LoadGlobalProxy(Register dst) {
     LoadNativeContextSlot(Context::GLOBAL_PROXY_INDEX, dst);
@@ -947,6 +949,13 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   void DecrementCounter(StatsCounter* counter, int value, Register scratch1,
                         Register scratch2);
 
+  // ---------------------------------------------------------------------------
+  // Stack limit utilities
+
+  void StackOverflowCheck(Register num_args, Register scratch,
+                          Label* stack_overflow);
+  void LoadStackLimit(Register destination, StackLimitKind kind);
+
   // ---------------------------------------------------------------------------
   // Smi utilities
 
diff --git a/deps/v8/src/codegen/ppc/register-ppc.h b/deps/v8/src/codegen/ppc/register-ppc.h
index 925dc355a73680..bbbee603de028f 100644
--- a/deps/v8/src/codegen/ppc/register-ppc.h
+++ b/deps/v8/src/codegen/ppc/register-ppc.h
@@ -44,7 +44,11 @@ namespace internal {
   LOW_DOUBLE_REGISTERS(V) NON_LOW_DOUBLE_REGISTERS(V)
 
 #define FLOAT_REGISTERS DOUBLE_REGISTERS
-#define SIMD128_REGISTERS DOUBLE_REGISTERS
+#define SIMD128_REGISTERS(V)                              \
+  V(v0)  V(v1)  V(v2)  V(v3)  V(v4)  V(v5)  V(v6)  V(v7)  \
+  V(v8)  V(v9)  V(v10) V(v11) V(v12) V(v13) V(v14) V(v15) \
+  V(v16) V(v17) V(v18) V(v19) V(v20) V(v21) V(v22) V(v23) \
+  V(v24) V(v25) V(v26) V(v27) V(v28) V(v29) V(v30) V(v31)
 
 #define ALLOCATABLE_DOUBLE_REGISTERS(V)                   \
   V(d1)  V(d2)  V(d3)  V(d4)  V(d5)  V(d6)  V(d7)         \
@@ -245,8 +249,29 @@ static_assert(sizeof(DoubleRegister) == sizeof(int),
 
 using FloatRegister = DoubleRegister;
 
-// TODO(ppc) Define SIMD registers.
-using Simd128Register = DoubleRegister;
+enum Simd128RegisterCode {
+#define REGISTER_CODE(R) kSimd128Code_##R,
+  SIMD128_REGISTERS(REGISTER_CODE)
+#undef REGISTER_CODE
+      kSimd128AfterLast
+};
+
+// Simd128 register.
+class Simd128Register
+    : public RegisterBase<Simd128Register, kSimd128AfterLast> {
+ private:
+  friend class RegisterBase;
+  explicit constexpr Simd128Register(int code) : RegisterBase(code) {}
+};
+ASSERT_TRIVIALLY_COPYABLE(Simd128Register);
+static_assert(sizeof(Simd128Register) == sizeof(int),
+              "Simd128Register can efficiently be passed by value");
+
+#define DECLARE_SIMD128_REGISTER(R) \
+  constexpr Simd128Register R = Simd128Register::from_code(kSimd128Code_##R);
+SIMD128_REGISTERS(DECLARE_SIMD128_REGISTER)
+#undef DECLARE_SIMD128_REGISTER
+const Simd128Register no_simdreg = Simd128Register::no_reg();
 
 #define DEFINE_REGISTER(R) \
   constexpr DoubleRegister R = DoubleRegister::from_code(kDoubleCode_##R);
@@ -258,6 +283,10 @@ constexpr DoubleRegister kFirstCalleeSavedDoubleReg = d14;
 constexpr DoubleRegister kLastCalleeSavedDoubleReg = d31;
 constexpr DoubleRegister kDoubleRegZero = d14;
 constexpr DoubleRegister kScratchDoubleReg = d13;
+// Simd128 zero and scratch regs must have the same numbers as Double zero and
+// scratch
+constexpr Simd128Register kSimd128RegZero = v14;
+constexpr Simd128Register kScratchSimd128Reg = v13;
 
 Register ToRegister(int num);
 
@@ -283,6 +312,7 @@ C_REGISTERS(DECLARE_C_REGISTER)
 // Define {RegisterName} methods for the register types.
 DEFINE_REGISTER_NAMES(Register, GENERAL_REGISTERS)
 DEFINE_REGISTER_NAMES(DoubleRegister, DOUBLE_REGISTERS)
+DEFINE_REGISTER_NAMES(Simd128Register, SIMD128_REGISTERS)
 
 // Give alias names to registers for calling conventions.
 constexpr Register kReturnRegister0 = r3;
diff --git a/deps/v8/src/codegen/reloc-info.cc b/deps/v8/src/codegen/reloc-info.cc
index 7fdc2f374a847e..eb7750f941a723 100644
--- a/deps/v8/src/codegen/reloc-info.cc
+++ b/deps/v8/src/codegen/reloc-info.cc
@@ -410,6 +410,8 @@ const char* RelocInfo::RelocModeName(RelocInfo::Mode rmode) {
       return "compressed embedded object";
     case FULL_EMBEDDED_OBJECT:
       return "full embedded object";
+    case DATA_EMBEDDED_OBJECT:
+      return "data embedded object";
     case CODE_TARGET:
       return "code target";
     case RELATIVE_CODE_TARGET:
@@ -496,6 +498,7 @@ void RelocInfo::Verify(Isolate* isolate) {
   switch (rmode_) {
     case COMPRESSED_EMBEDDED_OBJECT:
     case FULL_EMBEDDED_OBJECT:
+    case DATA_EMBEDDED_OBJECT:
       Object::VerifyPointer(isolate, target_object());
       break;
     case CODE_TARGET:
diff --git a/deps/v8/src/codegen/reloc-info.h b/deps/v8/src/codegen/reloc-info.h
index e6d7dfd01c1610..3230e5f022fc7b 100644
--- a/deps/v8/src/codegen/reloc-info.h
+++ b/deps/v8/src/codegen/reloc-info.h
@@ -59,7 +59,8 @@ class RelocInfo {
     CODE_TARGET,
     RELATIVE_CODE_TARGET,  // LAST_CODE_TARGET_MODE
     COMPRESSED_EMBEDDED_OBJECT,
-    FULL_EMBEDDED_OBJECT,  // LAST_GCED_ENUM
+    FULL_EMBEDDED_OBJECT,
+    DATA_EMBEDDED_OBJECT,  // LAST_GCED_ENUM
 
     WASM_CALL,  // FIRST_SHAREABLE_RELOC_MODE
     WASM_STUB_CALL,
@@ -96,7 +97,7 @@ class RelocInfo {
     FIRST_REAL_RELOC_MODE = CODE_TARGET,
     LAST_REAL_RELOC_MODE = VENEER_POOL,
     FIRST_EMBEDDED_OBJECT_RELOC_MODE = COMPRESSED_EMBEDDED_OBJECT,
-    LAST_EMBEDDED_OBJECT_RELOC_MODE = FULL_EMBEDDED_OBJECT,
+    LAST_EMBEDDED_OBJECT_RELOC_MODE = DATA_EMBEDDED_OBJECT,
     LAST_GCED_ENUM = LAST_EMBEDDED_OBJECT_RELOC_MODE,
     FIRST_SHAREABLE_RELOC_MODE = WASM_CALL,
   };
@@ -140,6 +141,9 @@ class RelocInfo {
   static constexpr bool IsCompressedEmbeddedObject(Mode mode) {
     return COMPRESS_POINTERS_BOOL && mode == COMPRESSED_EMBEDDED_OBJECT;
   }
+  static constexpr bool IsDataEmbeddedObject(Mode mode) {
+    return mode == DATA_EMBEDDED_OBJECT;
+  }
   static constexpr bool IsEmbeddedObjectMode(Mode mode) {
     return base::IsInRange(mode, FIRST_EMBEDDED_OBJECT_RELOC_MODE,
                            LAST_EMBEDDED_OBJECT_RELOC_MODE);
@@ -337,7 +341,8 @@ class RelocInfo {
 
   static int EmbeddedObjectModeMask() {
     return ModeMask(RelocInfo::FULL_EMBEDDED_OBJECT) |
-           ModeMask(RelocInfo::COMPRESSED_EMBEDDED_OBJECT);
+           ModeMask(RelocInfo::COMPRESSED_EMBEDDED_OBJECT) |
+           ModeMask(RelocInfo::DATA_EMBEDDED_OBJECT);
   }
 
   // In addition to modes covered by the apply mask (which is applied at GC
@@ -347,6 +352,7 @@ class RelocInfo {
     return ModeMask(RelocInfo::CODE_TARGET) |
            ModeMask(RelocInfo::COMPRESSED_EMBEDDED_OBJECT) |
            ModeMask(RelocInfo::FULL_EMBEDDED_OBJECT) |
+           ModeMask(RelocInfo::DATA_EMBEDDED_OBJECT) |
            ModeMask(RelocInfo::RUNTIME_ENTRY) |
            ModeMask(RelocInfo::RELATIVE_CODE_TARGET) | kApplyMask;
   }
@@ -368,6 +374,9 @@ class RelocInfoWriter {
  public:
   RelocInfoWriter() : pos_(nullptr), last_pc_(nullptr) {}
 
+  RelocInfoWriter(const RelocInfoWriter&) = delete;
+  RelocInfoWriter& operator=(const RelocInfoWriter&) = delete;
+
   byte* pos() const { return pos_; }
   byte* last_pc() const { return last_pc_; }
 
@@ -397,8 +406,6 @@ class RelocInfoWriter {
 
   byte* pos_;
   byte* last_pc_;
-
-  DISALLOW_COPY_AND_ASSIGN(RelocInfoWriter);
 };
 
 // A RelocIterator iterates over relocation information.
@@ -426,6 +433,9 @@ class V8_EXPORT_PRIVATE RelocIterator : public Malloced {
                          int mode_mask = -1);
   RelocIterator(RelocIterator&&) V8_NOEXCEPT = default;
 
+  RelocIterator(const RelocIterator&) = delete;
+  RelocIterator& operator=(const RelocIterator&) = delete;
+
   // Iteration
   bool done() const { return done_; }
   void next();
@@ -467,8 +477,6 @@ class V8_EXPORT_PRIVATE RelocIterator : public Malloced {
   RelocInfo rinfo_;
   bool done_ = false;
   const int mode_mask_;
-
-  DISALLOW_COPY_AND_ASSIGN(RelocIterator);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/s390/assembler-s390-inl.h b/deps/v8/src/codegen/s390/assembler-s390-inl.h
index e34cfa0cbd88bb..f58e891a900e21 100644
--- a/deps/v8/src/codegen/s390/assembler-s390-inl.h
+++ b/deps/v8/src/codegen/s390/assembler-s390-inl.h
@@ -145,7 +145,9 @@ Handle<Object> Assembler::code_target_object_handle_at(Address pc) {
 
 HeapObject RelocInfo::target_object() {
   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-  if (IsCompressedEmbeddedObject(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
+  } else if (IsCompressedEmbeddedObject(rmode_)) {
     return HeapObject::cast(Object(DecompressTaggedAny(
         host_.address(),
         Assembler::target_compressed_address_at(pc_, constant_pool_))));
@@ -173,7 +175,9 @@ Handle<HeapObject> Assembler::compressed_embedded_object_handle_at(
 Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
   DCHECK(IsRelativeCodeTarget(rmode_) || IsCodeTarget(rmode_) ||
          IsEmbeddedObjectMode(rmode_));
-  if (IsCodeTarget(rmode_) || IsRelativeCodeTarget(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
+  } else if (IsCodeTarget(rmode_) || IsRelativeCodeTarget(rmode_)) {
     return Handle<HeapObject>::cast(origin->code_target_object_handle_at(pc_));
   } else {
     if (IsCompressedEmbeddedObject(rmode_)) {
@@ -188,7 +192,10 @@ void RelocInfo::set_target_object(Heap* heap, HeapObject target,
                                   WriteBarrierMode write_barrier_mode,
                                   ICacheFlushMode icache_flush_mode) {
   DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_));
-  if (IsCompressedEmbeddedObject(rmode_)) {
+  if (IsDataEmbeddedObject(rmode_)) {
+    WriteUnalignedValue(pc_, target.ptr());
+    // No need to flush icache since no instructions were changed.
+  } else if (IsCompressedEmbeddedObject(rmode_)) {
     Assembler::set_target_compressed_address_at(
         pc_, constant_pool_, CompressTagged(target.ptr()), icache_flush_mode);
   } else {
diff --git a/deps/v8/src/codegen/s390/assembler-s390.cc b/deps/v8/src/codegen/s390/assembler-s390.cc
index 2e74f029d25a82..3dd0c73e0f2429 100644
--- a/deps/v8/src/codegen/s390/assembler-s390.cc
+++ b/deps/v8/src/codegen/s390/assembler-s390.cc
@@ -633,9 +633,10 @@ void Assembler::load_label_offset(Register r1, Label* L) {
 }
 
 // Pseudo op - branch on condition
-void Assembler::branchOnCond(Condition c, int branch_offset, bool is_bound) {
+void Assembler::branchOnCond(Condition c, int branch_offset, bool is_bound,
+                             bool force_long_branch) {
   int offset_in_halfwords = branch_offset / 2;
-  if (is_bound && is_int16(offset_in_halfwords)) {
+  if (is_bound && is_int16(offset_in_halfwords) && !force_long_branch) {
     brc(c, Operand(offset_in_halfwords));  // short jump
   } else {
     brcl(c, Operand(offset_in_halfwords));  // long jump
@@ -780,20 +781,32 @@ void Assembler::db(uint8_t data) {
   pc_ += sizeof(uint8_t);
 }
 
-void Assembler::dd(uint32_t data) {
+void Assembler::dd(uint32_t data, RelocInfo::Mode rmode) {
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint32_t*>(pc_) = data;
   pc_ += sizeof(uint32_t);
 }
 
-void Assembler::dq(uint64_t value) {
+void Assembler::dq(uint64_t value, RelocInfo::Mode rmode) {
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uint64_t*>(pc_) = value;
   pc_ += sizeof(uint64_t);
 }
 
-void Assembler::dp(uintptr_t data) {
+void Assembler::dp(uintptr_t data, RelocInfo::Mode rmode) {
   CheckBuffer();
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   *reinterpret_cast<uintptr_t*>(pc_) = data;
   pc_ += sizeof(uintptr_t);
 }
diff --git a/deps/v8/src/codegen/s390/assembler-s390.h b/deps/v8/src/codegen/s390/assembler-s390.h
index bf746df27fc376..7cd0d4677888a1 100644
--- a/deps/v8/src/codegen/s390/assembler-s390.h
+++ b/deps/v8/src/codegen/s390/assembler-s390.h
@@ -402,6 +402,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   S390_RRE_OPCODE_LIST(DECLARE_S390_RRE_INSTRUCTIONS)
   // Special format
   void lzdr(DoubleRegister r1) { rre_format(LZDR, r1.code(), 0); }
+  void lzer(DoubleRegister r1) { rre_format(LZER, r1.code(), 0); }
 #undef DECLARE_S390_RRE_INSTRUCTIONS
 
 #define DECLARE_S390_RX_INSTRUCTIONS(name, op_name, op_value)            \
@@ -532,7 +533,6 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
 
 #define DECLARE_S390_RS_SHIFT_FORMAT(name, opcode)                             \
   void name(Register r1, Register r2, const Operand& opnd = Operand::Zero()) { \
-    DCHECK(r2 != r0);                                                          \
     rs_format(opcode, r1.code(), r0.code(), r2.code(), opnd.immediate());      \
   }                                                                            \
   void name(Register r1, const Operand& opnd) {                                \
@@ -677,15 +677,6 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   S390_RRF_E_OPCODE_LIST(DECLARE_S390_RRF_E_INSTRUCTIONS)
 #undef DECLARE_S390_RRF_E_INSTRUCTIONS
 
-  enum FIDBRA_FLAGS {
-    FIDBRA_CURRENT_ROUNDING_MODE = 0,
-    FIDBRA_ROUND_TO_NEAREST_AWAY_FROM_0 = 1,
-    // ...
-    FIDBRA_ROUND_TOWARD_0 = 5,
-    FIDBRA_ROUND_TOWARD_POS_INF = 6,
-    FIDBRA_ROUND_TOWARD_NEG_INF = 7
-  };
-
   inline void rsi_format(Opcode op, int f1, int f2, int f3) {
     DCHECK(is_uint8(op));
     DCHECK(is_uint16(f3) || is_int16(f3));
@@ -956,17 +947,20 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   }
 
   // Conditional Branch Instruction - Generates either BRC / BRCL
-  void branchOnCond(Condition c, int branch_offset, bool is_bound = false);
+  void branchOnCond(Condition c, int branch_offset, bool is_bound = false,
+                    bool force_long_branch = false);
 
   // Helpers for conditional branch to Label
-  void b(Condition cond, Label* l, Label::Distance dist = Label::kFar) {
+  void b(Condition cond, Label* l, Label::Distance dist = Label::kFar,
+         bool force_long_branch = false) {
     branchOnCond(cond, branch_offset(l),
-                 l->is_bound() || (dist == Label::kNear));
+                 l->is_bound() || (dist == Label::kNear), force_long_branch);
   }
 
   void bc_short(Condition cond, Label* l, Label::Distance dist = Label::kFar) {
     b(cond, l, Label::kNear);
   }
+  void bc_long(Condition cond, Label* l) { b(cond, l, Label::kFar, true); }
   // Helpers for conditional branch to Label
   void beq(Label* l, Label::Distance dist = Label::kFar) { b(eq, l, dist); }
   void bne(Label* l, Label::Distance dist = Label::kFar) { b(ne, l, dist); }
@@ -1316,9 +1310,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // Writes a single byte or word of data in the code stream.  Used
   // for inline tables, e.g., jump-tables.
   void db(uint8_t data);
-  void dd(uint32_t data);
-  void dq(uint64_t data);
-  void dp(uintptr_t data);
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
 
   // Read/patch instructions
   SixByteInstr instr_at(int pos) {
@@ -1364,6 +1358,15 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
  public:
   byte* buffer_pos() const { return buffer_start_; }
 
+
+  // Code generation
+  // The relocation writer's position is at least kGap bytes below the end of
+  // the generated instructions. This is so that multi-instruction sequences do
+  // not have to check for overflow. The same is true for writes of large
+  // relocation info entries.
+  static constexpr int kGap = 32;
+  STATIC_ASSERT(AssemblerBase::kMinimalBufferSize >= 2 * kGap);
+
  protected:
   int buffer_space() const { return reloc_info_writer.pos() - pc_; }
 
@@ -1381,14 +1384,6 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // Avoid overflows for displacements etc.
   static const int kMaximalBufferSize = 512 * MB;
 
-  // Code generation
-  // The relocation writer's position is at least kGap bytes below the end of
-  // the generated instructions. This is so that multi-instruction sequences do
-  // not have to check for overflow. The same is true for writes of large
-  // relocation info entries.
-  static constexpr int kGap = 32;
-  STATIC_ASSERT(AssemblerBase::kMinimalBufferSize >= 2 * kGap);
-
   // Relocation info generation
   // Each relocation is encoded as a variable size value
   static constexpr int kMaxRelocSize = RelocInfoWriter::kMaxSize;
@@ -1485,7 +1480,7 @@ class EnsureSpace {
   explicit EnsureSpace(Assembler* assembler) { assembler->CheckBuffer(); }
 };
 
-class V8_EXPORT_PRIVATE UseScratchRegisterScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD UseScratchRegisterScope {
  public:
   explicit UseScratchRegisterScope(Assembler* assembler);
   ~UseScratchRegisterScope();
diff --git a/deps/v8/src/codegen/s390/constants-s390.h b/deps/v8/src/codegen/s390/constants-s390.h
index 5c524350518bac..b16963e52a2106 100644
--- a/deps/v8/src/codegen/s390/constants-s390.h
+++ b/deps/v8/src/codegen/s390/constants-s390.h
@@ -101,16 +101,7 @@ enum Condition {
   mask0xC = 12,
   mask0xD = 13,
   mask0xE = 14,
-  mask0xF = 15,
-
-  // Rounding modes for floating poing facility
-  CURRENT_ROUNDING_MODE = 0,
-  ROUND_TO_NEAREST_WITH_TIES_AWAY_FROM_0 = 1,
-  ROUND_TO_PREPARE_FOR_SHORTER_PRECISION = 3,
-  ROUND_TO_NEAREST_WITH_TIES_TO_EVEN = 4,
-  ROUND_TOWARD_0 = 5,
-  ROUND_TOWARD_PLUS_INFINITE = 6,
-  ROUND_TOWARD_MINUS_INFINITE = 7
+  mask0xF = 15
 };
 
 inline Condition NegateCondition(Condition cond) {
@@ -1787,16 +1778,18 @@ const int32_t kDefaultStopCode = -1;
 
 // FP rounding modes.
 enum FPRoundingMode {
-  RN = 0,  // Round to Nearest.
-  RZ = 1,  // Round towards zero.
-  RP = 2,  // Round towards Plus Infinity.
-  RM = 3,  // Round towards Minus Infinity.
+  CURRENT_ROUNDING_MODE = 0,
+  ROUND_TO_NEAREST_AWAY_FROM_0 = 1,
+  ROUND_TO_NEAREST_TO_EVEN = 4,
+  ROUND_TOWARD_0 = 5,
+  ROUND_TOWARD_POS_INF = 6,
+  ROUND_TOWARD_NEG_INF = 7,
 
   // Aliases.
-  kRoundToNearest = RN,
-  kRoundToZero = RZ,
-  kRoundToPlusInf = RP,
-  kRoundToMinusInf = RM
+  kRoundToNearest = ROUND_TO_NEAREST_TO_EVEN,
+  kRoundToZero = ROUND_TOWARD_0,
+  kRoundToPlusInf = ROUND_TOWARD_POS_INF,
+  kRoundToMinusInf = ROUND_TOWARD_NEG_INF
 };
 
 const uint32_t kFPRoundingModeMask = 3;
diff --git a/deps/v8/src/codegen/s390/interface-descriptors-s390.cc b/deps/v8/src/codegen/s390/interface-descriptors-s390.cc
index a848cdf27aa69d..6ea6265b8f95d6 100644
--- a/deps/v8/src/codegen/s390/interface-descriptors-s390.cc
+++ b/deps/v8/src/codegen/s390/interface-descriptors-s390.cc
@@ -34,6 +34,18 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {r2, r3, r4, r5, cp};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   const Register default_stub_registers[] = {r2, r3, r4, r5, r6};
diff --git a/deps/v8/src/codegen/s390/macro-assembler-s390.cc b/deps/v8/src/codegen/s390/macro-assembler-s390.cc
index 4f63543ad78d40..066facfceb5982 100644
--- a/deps/v8/src/codegen/s390/macro-assembler-s390.cc
+++ b/deps/v8/src/codegen/s390/macro-assembler-s390.cc
@@ -34,6 +34,177 @@
 namespace v8 {
 namespace internal {
 
+void TurboAssembler::DoubleMax(DoubleRegister result_reg,
+                               DoubleRegister left_reg,
+                               DoubleRegister right_reg) {
+  Label check_zero, return_left, return_right, return_nan, done;
+  cdbr(left_reg, right_reg);
+  bunordered(&return_nan, Label::kNear);
+  beq(&check_zero);
+  bge(&return_left, Label::kNear);
+  b(&return_right, Label::kNear);
+
+  bind(&check_zero);
+  lzdr(kDoubleRegZero);
+  cdbr(left_reg, kDoubleRegZero);
+  /* left == right != 0. */
+  bne(&return_left, Label::kNear);
+  /* At this point, both left and right are either 0 or -0. */
+  /* N.B. The following works because +0 + -0 == +0 */
+  /* For max we want logical-and of sign bit: (L + R) */
+  ldr(result_reg, left_reg);
+  adbr(result_reg, right_reg);
+  b(&done, Label::kNear);
+
+  bind(&return_nan);
+  /* If left or right are NaN, adbr propagates the appropriate one.*/
+  adbr(left_reg, right_reg);
+  b(&return_left, Label::kNear);
+
+  bind(&return_right);
+  if (right_reg != result_reg) {
+    ldr(result_reg, right_reg);
+  }
+  b(&done, Label::kNear);
+
+  bind(&return_left);
+  if (left_reg != result_reg) {
+    ldr(result_reg, left_reg);
+  }
+  bind(&done);
+}
+
+void TurboAssembler::DoubleMin(DoubleRegister result_reg,
+                               DoubleRegister left_reg,
+                               DoubleRegister right_reg) {
+  Label check_zero, return_left, return_right, return_nan, done;
+  cdbr(left_reg, right_reg);
+  bunordered(&return_nan, Label::kNear);
+  beq(&check_zero);
+  ble(&return_left, Label::kNear);
+  b(&return_right, Label::kNear);
+
+  bind(&check_zero);
+  lzdr(kDoubleRegZero);
+  cdbr(left_reg, kDoubleRegZero);
+  /* left == right != 0. */
+  bne(&return_left, Label::kNear);
+  /* At this point, both left and right are either 0 or -0. */
+  /* N.B. The following works because +0 + -0 == +0 */
+  /* For min we want logical-or of sign bit: -(-L + -R) */
+  lcdbr(left_reg, left_reg);
+  ldr(result_reg, left_reg);
+  if (left_reg == right_reg) {
+    adbr(result_reg, right_reg);
+  } else {
+    sdbr(result_reg, right_reg);
+  }
+  lcdbr(result_reg, result_reg);
+  b(&done, Label::kNear);
+
+  bind(&return_nan);
+  /* If left or right are NaN, adbr propagates the appropriate one.*/
+  adbr(left_reg, right_reg);
+  b(&return_left, Label::kNear);
+
+  bind(&return_right);
+  if (right_reg != result_reg) {
+    ldr(result_reg, right_reg);
+  }
+  b(&done, Label::kNear);
+
+  bind(&return_left);
+  if (left_reg != result_reg) {
+    ldr(result_reg, left_reg);
+  }
+  bind(&done);
+}
+
+void TurboAssembler::FloatMax(DoubleRegister result_reg,
+                              DoubleRegister left_reg,
+                              DoubleRegister right_reg) {
+  Label check_zero, return_left, return_right, return_nan, done;
+  cebr(left_reg, right_reg);
+  bunordered(&return_nan, Label::kNear);
+  beq(&check_zero);
+  bge(&return_left, Label::kNear);
+  b(&return_right, Label::kNear);
+
+  bind(&check_zero);
+  lzdr(kDoubleRegZero);
+  cebr(left_reg, kDoubleRegZero);
+  /* left == right != 0. */
+  bne(&return_left, Label::kNear);
+  /* At this point, both left and right are either 0 or -0. */
+  /* N.B. The following works because +0 + -0 == +0 */
+  /* For max we want logical-and of sign bit: (L + R) */
+  ldr(result_reg, left_reg);
+  aebr(result_reg, right_reg);
+  b(&done, Label::kNear);
+
+  bind(&return_nan);
+  /* If left or right are NaN, aebr propagates the appropriate one.*/
+  aebr(left_reg, right_reg);
+  b(&return_left, Label::kNear);
+
+  bind(&return_right);
+  if (right_reg != result_reg) {
+    ldr(result_reg, right_reg);
+  }
+  b(&done, Label::kNear);
+
+  bind(&return_left);
+  if (left_reg != result_reg) {
+    ldr(result_reg, left_reg);
+  }
+  bind(&done);
+}
+
+void TurboAssembler::FloatMin(DoubleRegister result_reg,
+                              DoubleRegister left_reg,
+                              DoubleRegister right_reg) {
+  Label check_zero, return_left, return_right, return_nan, done;
+  cebr(left_reg, right_reg);
+  bunordered(&return_nan, Label::kNear);
+  beq(&check_zero);
+  ble(&return_left, Label::kNear);
+  b(&return_right, Label::kNear);
+
+  bind(&check_zero);
+  lzdr(kDoubleRegZero);
+  cebr(left_reg, kDoubleRegZero);
+  /* left == right != 0. */
+  bne(&return_left, Label::kNear);
+  /* At this point, both left and right are either 0 or -0. */
+  /* N.B. The following works because +0 + -0 == +0 */
+  /* For min we want logical-or of sign bit: -(-L + -R) */
+  lcebr(left_reg, left_reg);
+  ldr(result_reg, left_reg);
+  if (left_reg == right_reg) {
+    aebr(result_reg, right_reg);
+  } else {
+    sebr(result_reg, right_reg);
+  }
+  lcebr(result_reg, result_reg);
+  b(&done, Label::kNear);
+
+  bind(&return_nan);
+  /* If left or right are NaN, aebr propagates the appropriate one.*/
+  aebr(left_reg, right_reg);
+  b(&return_left, Label::kNear);
+
+  bind(&return_right);
+  if (right_reg != result_reg) {
+    ldr(result_reg, right_reg);
+  }
+  b(&done, Label::kNear);
+
+  bind(&return_left);
+  if (left_reg != result_reg) {
+    ldr(result_reg, left_reg);
+  }
+  bind(&done);
+}
 int TurboAssembler::RequiredStackSizeForCallerSaved(SaveFPRegsMode fp_mode,
                                                     Register exclusion1,
                                                     Register exclusion2,
@@ -130,13 +301,13 @@ void TurboAssembler::LoadFromConstantsTable(Register destination,
 }
 
 void TurboAssembler::LoadRootRelative(Register destination, int32_t offset) {
-  LoadP(destination, MemOperand(kRootRegister, offset));
+  LoadU64(destination, MemOperand(kRootRegister, offset));
 }
 
 void TurboAssembler::LoadRootRegisterOffset(Register destination,
                                             intptr_t offset) {
   if (offset == 0) {
-    LoadRR(destination, kRootRegister);
+    mov(destination, kRootRegister);
   } else if (is_uint12(offset)) {
     la(destination, MemOperand(kRootRegister, offset));
   } else {
@@ -260,14 +431,14 @@ void TurboAssembler::Drop(int count) {
     } else if (is_int20(total)) {
       lay(sp, MemOperand(sp, total));
     } else {
-      AddP(sp, Operand(total));
+      AddS64(sp, Operand(total));
     }
   }
 }
 
 void TurboAssembler::Drop(Register count, Register scratch) {
-  ShiftLeftP(scratch, count, Operand(kSystemPointerSizeLog2));
-  AddP(sp, sp, scratch);
+  ShiftLeftU64(scratch, count, Operand(kSystemPointerSizeLog2));
+  AddS64(sp, sp, scratch);
 }
 
 void TurboAssembler::Call(Label* target) { b(r14, target); }
@@ -314,7 +485,7 @@ void TurboAssembler::Move(Register dst, ExternalReference reference) {
 void TurboAssembler::Move(Register dst, Register src, Condition cond) {
   if (dst != src) {
     if (cond == al) {
-      LoadRR(dst, src);
+      mov(dst, src);
     } else {
       LoadOnConditionP(cond, dst, src);
     }
@@ -375,10 +546,10 @@ void TurboAssembler::PushArray(Register array, Register size, Register scratch,
   Label loop, done;
 
   if (order == kNormal) {
-    ShiftLeftP(scratch, size, Operand(kSystemPointerSizeLog2));
+    ShiftLeftU64(scratch, size, Operand(kSystemPointerSizeLog2));
     lay(scratch, MemOperand(array, scratch));
     bind(&loop);
-    CmpP(array, scratch);
+    CmpS64(array, scratch);
     bge(&done);
     lay(scratch, MemOperand(scratch, -kSystemPointerSize));
     lay(sp, MemOperand(sp, -kSystemPointerSize));
@@ -387,11 +558,11 @@ void TurboAssembler::PushArray(Register array, Register size, Register scratch,
     bind(&done);
   } else {
     DCHECK_NE(scratch2, r0);
-    ShiftLeftP(scratch, size, Operand(kSystemPointerSizeLog2));
+    ShiftLeftU64(scratch, size, Operand(kSystemPointerSizeLog2));
     lay(scratch, MemOperand(array, scratch));
-    LoadRR(scratch2, array);
+    mov(scratch2, array);
     bind(&loop);
-    CmpP(scratch2, scratch);
+    CmpS64(scratch2, scratch);
     bge(&done);
     lay(sp, MemOperand(sp, -kSystemPointerSize));
     MoveChar(MemOperand(sp), MemOperand(scratch2), Operand(kSystemPointerSize));
@@ -405,11 +576,11 @@ void TurboAssembler::MultiPush(RegList regs, Register location) {
   int16_t num_to_push = base::bits::CountPopulation(regs);
   int16_t stack_offset = num_to_push * kSystemPointerSize;
 
-  SubP(location, location, Operand(stack_offset));
+  SubS64(location, location, Operand(stack_offset));
   for (int16_t i = Register::kNumRegisters - 1; i >= 0; i--) {
     if ((regs & (1 << i)) != 0) {
       stack_offset -= kSystemPointerSize;
-      StoreP(ToRegister(i), MemOperand(location, stack_offset));
+      StoreU64(ToRegister(i), MemOperand(location, stack_offset));
     }
   }
 }
@@ -419,23 +590,23 @@ void TurboAssembler::MultiPop(RegList regs, Register location) {
 
   for (int16_t i = 0; i < Register::kNumRegisters; i++) {
     if ((regs & (1 << i)) != 0) {
-      LoadP(ToRegister(i), MemOperand(location, stack_offset));
+      LoadU64(ToRegister(i), MemOperand(location, stack_offset));
       stack_offset += kSystemPointerSize;
     }
   }
-  AddP(location, location, Operand(stack_offset));
+  AddS64(location, location, Operand(stack_offset));
 }
 
 void TurboAssembler::MultiPushDoubles(RegList dregs, Register location) {
   int16_t num_to_push = base::bits::CountPopulation(dregs);
   int16_t stack_offset = num_to_push * kDoubleSize;
 
-  SubP(location, location, Operand(stack_offset));
+  SubS64(location, location, Operand(stack_offset));
   for (int16_t i = DoubleRegister::kNumRegisters - 1; i >= 0; i--) {
     if ((dregs & (1 << i)) != 0) {
       DoubleRegister dreg = DoubleRegister::from_code(i);
       stack_offset -= kDoubleSize;
-      StoreDouble(dreg, MemOperand(location, stack_offset));
+      StoreF64(dreg, MemOperand(location, stack_offset));
     }
   }
 }
@@ -446,17 +617,17 @@ void TurboAssembler::MultiPopDoubles(RegList dregs, Register location) {
   for (int16_t i = 0; i < DoubleRegister::kNumRegisters; i++) {
     if ((dregs & (1 << i)) != 0) {
       DoubleRegister dreg = DoubleRegister::from_code(i);
-      LoadDouble(dreg, MemOperand(location, stack_offset));
+      LoadF64(dreg, MemOperand(location, stack_offset));
       stack_offset += kDoubleSize;
     }
   }
-  AddP(location, location, Operand(stack_offset));
+  AddS64(location, location, Operand(stack_offset));
 }
 
 void TurboAssembler::LoadRoot(Register destination, RootIndex index,
                               Condition) {
-  LoadP(destination,
-        MemOperand(kRootRegister, RootRegisterOffsetForRootIndex(index)), r0);
+  LoadU64(destination,
+          MemOperand(kRootRegister, RootRegisterOffsetForRootIndex(index)), r0);
 }
 
 void TurboAssembler::LoadTaggedPointerField(const Register& destination,
@@ -465,7 +636,7 @@ void TurboAssembler::LoadTaggedPointerField(const Register& destination,
   if (COMPRESS_POINTERS_BOOL) {
     DecompressTaggedPointer(destination, field_operand);
   } else {
-    LoadP(destination, field_operand, scratch);
+    LoadU64(destination, field_operand, scratch);
   }
 }
 
@@ -475,15 +646,15 @@ void TurboAssembler::LoadAnyTaggedField(const Register& destination,
   if (COMPRESS_POINTERS_BOOL) {
     DecompressAnyTagged(destination, field_operand);
   } else {
-    LoadP(destination, field_operand, scratch);
+    LoadU64(destination, field_operand, scratch);
   }
 }
 
 void TurboAssembler::SmiUntag(Register dst, const MemOperand& src) {
   if (SmiValuesAre31Bits()) {
-    LoadW(dst, src);
+    LoadS32(dst, src);
   } else {
-    LoadP(dst, src);
+    LoadU64(dst, src);
   }
   SmiUntag(dst);
 }
@@ -497,10 +668,10 @@ void TurboAssembler::StoreTaggedField(const Register& value,
                                       const Register& scratch) {
   if (COMPRESS_POINTERS_BOOL) {
     RecordComment("[ StoreTagged");
-    StoreW(value, dst_field_operand);
+    StoreU32(value, dst_field_operand);
     RecordComment("]");
   } else {
-    StoreP(value, dst_field_operand, scratch);
+    StoreU64(value, dst_field_operand, scratch);
   }
 }
 
@@ -641,10 +812,8 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Register address,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, address, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
@@ -652,14 +821,15 @@ void TurboAssembler::CallRecordWriteStub(
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
     Address wasm_target) {
   CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
-    Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
   // TODO(albertnetymk): For now we ignore remembered_set_action and fp_mode,
   // i.e. always emit remember set and save FP registers in RecordWriteStub. If
   // large performance regression is observed, we should use these values to
@@ -686,9 +856,18 @@ void TurboAssembler::CallRecordWriteStub(
 
   Move(remembered_set_parameter, Smi::FromEnum(remembered_set_action));
   Move(fp_mode_parameter, Smi::FromEnum(fp_mode));
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     Call(wasm_target, RelocInfo::WASM_STUB_CALL);
+  } else if (options().inline_offheap_trampolines) {
+    RecordCommentForOffHeapTrampoline(builtin_index);
+    CHECK_NE(builtin_index, Builtins::kNoBuiltinId);
+    EmbeddedData d = EmbeddedData::FromBlob();
+    Address entry = d.InstructionStartOfBuiltin(builtin_index);
+    mov(ip, Operand(entry, RelocInfo::OFF_HEAP_TARGET));
+    Call(ip);
   } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
@@ -706,7 +885,7 @@ void MacroAssembler::RecordWrite(Register object, Register address,
   DCHECK(object != value);
   if (emit_debug_code()) {
     LoadTaggedPointerField(r0, MemOperand(address));
-    CmpP(value, r0);
+    CmpS64(value, r0);
     Check(eq, AbortReason::kWrongAddressOrValuePassedToRecordWrite);
   }
 
@@ -786,13 +965,13 @@ void TurboAssembler::PushStandardFrame(Register function_reg) {
 
 void TurboAssembler::RestoreFrameStateForTailCall() {
   // if (FLAG_enable_embedded_constant_pool) {
-  //   LoadP(kConstantPoolRegister,
+  //   LoadU64(kConstantPoolRegister,
   //         MemOperand(fp, StandardFrameConstants::kConstantPoolOffset));
   //   set_constant_pool_available(false);
   // }
   DCHECK(!FLAG_enable_embedded_constant_pool);
-  LoadP(r14, MemOperand(fp, StandardFrameConstants::kCallerPCOffset));
-  LoadP(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
+  LoadU64(r14, MemOperand(fp, StandardFrameConstants::kCallerPCOffset));
+  LoadU64(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
 }
 
 void TurboAssembler::CanonicalizeNaN(const DoubleRegister dst,
@@ -1052,68 +1231,6 @@ void TurboAssembler::ConvertDoubleToUnsignedInt32(
   clfdbr(m, Condition(0), dst, double_input);
 }
 
-#if !V8_TARGET_ARCH_S390X
-void TurboAssembler::ShiftLeftPair(Register dst_low, Register dst_high,
-                                   Register src_low, Register src_high,
-                                   Register scratch, Register shift) {
-  LoadRR(r0, src_high);
-  LoadRR(r1, src_low);
-  sldl(r0, shift, Operand::Zero());
-  LoadRR(dst_high, r0);
-  LoadRR(dst_low, r1);
-}
-
-void TurboAssembler::ShiftLeftPair(Register dst_low, Register dst_high,
-                                   Register src_low, Register src_high,
-                                   uint32_t shift) {
-  LoadRR(r0, src_high);
-  LoadRR(r1, src_low);
-  sldl(r0, r0, Operand(shift));
-  LoadRR(dst_high, r0);
-  LoadRR(dst_low, r1);
-}
-
-void TurboAssembler::ShiftRightPair(Register dst_low, Register dst_high,
-                                    Register src_low, Register src_high,
-                                    Register scratch, Register shift) {
-  LoadRR(r0, src_high);
-  LoadRR(r1, src_low);
-  srdl(r0, shift, Operand::Zero());
-  LoadRR(dst_high, r0);
-  LoadRR(dst_low, r1);
-}
-
-void TurboAssembler::ShiftRightPair(Register dst_low, Register dst_high,
-                                    Register src_low, Register src_high,
-                                    uint32_t shift) {
-  LoadRR(r0, src_high);
-  LoadRR(r1, src_low);
-  srdl(r0, Operand(shift));
-  LoadRR(dst_high, r0);
-  LoadRR(dst_low, r1);
-}
-
-void TurboAssembler::ShiftRightArithPair(Register dst_low, Register dst_high,
-                                         Register src_low, Register src_high,
-                                         Register scratch, Register shift) {
-  LoadRR(r0, src_high);
-  LoadRR(r1, src_low);
-  srda(r0, shift, Operand::Zero());
-  LoadRR(dst_high, r0);
-  LoadRR(dst_low, r1);
-}
-
-void TurboAssembler::ShiftRightArithPair(Register dst_low, Register dst_high,
-                                         Register src_low, Register src_high,
-                                         uint32_t shift) {
-  LoadRR(r0, src_high);
-  LoadRR(r1, src_low);
-  srda(r0, r0, Operand(shift));
-  LoadRR(dst_high, r0);
-  LoadRR(dst_low, r1);
-}
-#endif
-
 void TurboAssembler::MovDoubleToInt64(Register dst, DoubleRegister src) {
   lgdr(dst, src);
 }
@@ -1126,7 +1243,7 @@ void TurboAssembler::StubPrologue(StackFrame::Type type, Register base,
                                   int prologue_offset) {
   {
     ConstantPoolUnavailableScope constant_pool_unavailable(this);
-    Load(r1, Operand(StackFrame::TypeToMarker(type)));
+    mov(r1, Operand(StackFrame::TypeToMarker(type)));
     PushCommonFrame(r1);
   }
 }
@@ -1145,23 +1262,23 @@ void TurboAssembler::EnterFrame(StackFrame::Type type,
   //    type
   //    CodeObject  <-- new sp
 
-  Load(ip, Operand(StackFrame::TypeToMarker(type)));
+  mov(ip, Operand(StackFrame::TypeToMarker(type)));
   PushCommonFrame(ip);
 }
 
 int TurboAssembler::LeaveFrame(StackFrame::Type type, int stack_adjustment) {
   // Drop the execution stack down to the frame pointer and restore
   // the caller frame pointer, return address and constant pool pointer.
-  LoadP(r14, MemOperand(fp, StandardFrameConstants::kCallerPCOffset));
+  LoadU64(r14, MemOperand(fp, StandardFrameConstants::kCallerPCOffset));
   if (is_int20(StandardFrameConstants::kCallerSPOffset + stack_adjustment)) {
     lay(r1, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
                                stack_adjustment));
   } else {
-    AddP(r1, fp,
-         Operand(StandardFrameConstants::kCallerSPOffset + stack_adjustment));
+    AddS64(r1, fp,
+           Operand(StandardFrameConstants::kCallerSPOffset + stack_adjustment));
   }
-  LoadP(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
-  LoadRR(sp, r1);
+  LoadU64(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
+  mov(sp, r1);
   int frame_ends = pc_offset();
   return frame_ends;
 }
@@ -1202,22 +1319,23 @@ void MacroAssembler::EnterExitFrame(bool save_doubles, int stack_space,
   // all of the pushes that have happened inside of V8
   // since we were called from C code
   CleanseP(r14);
-  Load(r1, Operand(StackFrame::TypeToMarker(frame_type)));
+  mov(r1, Operand(StackFrame::TypeToMarker(frame_type)));
   PushCommonFrame(r1);
   // Reserve room for saved entry sp.
   lay(sp, MemOperand(fp, -ExitFrameConstants::kFixedFrameSizeFromFp));
 
   if (emit_debug_code()) {
-    StoreP(MemOperand(fp, ExitFrameConstants::kSPOffset), Operand::Zero(), r1);
+    StoreU64(MemOperand(fp, ExitFrameConstants::kSPOffset), Operand::Zero(),
+             r1);
   }
 
   // Save the frame pointer and the context in top.
   Move(r1, ExternalReference::Create(IsolateAddressId::kCEntryFPAddress,
                                      isolate()));
-  StoreP(fp, MemOperand(r1));
+  StoreU64(fp, MemOperand(r1));
   Move(r1,
        ExternalReference::Create(IsolateAddressId::kContextAddress, isolate()));
-  StoreP(cp, MemOperand(r1));
+  StoreU64(cp, MemOperand(r1));
 
   // Optionally save all volatile double registers.
   if (save_doubles) {
@@ -1239,11 +1357,11 @@ void MacroAssembler::EnterExitFrame(bool save_doubles, int stack_space,
   }
 
   lay(sp, MemOperand(sp, -kNumRequiredStackFrameSlots * kSystemPointerSize));
-  StoreP(MemOperand(sp), Operand::Zero(), r0);
+  StoreU64(MemOperand(sp), Operand::Zero(), r0);
   // Set the exit frame sp value to point just before the return address
   // location.
   lay(r1, MemOperand(sp, kStackFrameSPSlot * kSystemPointerSize));
-  StoreP(r1, MemOperand(fp, ExitFrameConstants::kSPOffset));
+  StoreU64(r1, MemOperand(fp, ExitFrameConstants::kSPOffset));
 }
 
 int TurboAssembler::ActivationFrameAlignment() {
@@ -1276,18 +1394,18 @@ void MacroAssembler::LeaveExitFrame(bool save_doubles, Register argument_count,
   // Clear top frame.
   Move(ip, ExternalReference::Create(IsolateAddressId::kCEntryFPAddress,
                                      isolate()));
-  StoreP(MemOperand(ip), Operand(0, RelocInfo::NONE), r0);
+  StoreU64(MemOperand(ip), Operand(0, RelocInfo::NONE), r0);
 
   // Restore current context from top and clear it in debug mode.
   Move(ip,
        ExternalReference::Create(IsolateAddressId::kContextAddress, isolate()));
-  LoadP(cp, MemOperand(ip));
+  LoadU64(cp, MemOperand(ip));
 
 #ifdef DEBUG
   mov(r1, Operand(Context::kInvalidContext));
   Move(ip,
        ExternalReference::Create(IsolateAddressId::kContextAddress, isolate()));
-  StoreP(r1, MemOperand(ip));
+  StoreU64(r1, MemOperand(ip));
 #endif
 
   // Tear down the exit frame, pop the arguments, and return.
@@ -1295,8 +1413,8 @@ void MacroAssembler::LeaveExitFrame(bool save_doubles, Register argument_count,
 
   if (argument_count.is_valid()) {
     if (!argument_count_is_length) {
-      ShiftLeftP(argument_count, argument_count,
-                 Operand(kSystemPointerSizeLog2));
+      ShiftLeftU64(argument_count, argument_count,
+                   Operand(kSystemPointerSizeLog2));
     }
     la(sp, MemOperand(sp, argument_count));
   }
@@ -1316,22 +1434,22 @@ void TurboAssembler::PrepareForTailCall(Register callee_args_count,
   DCHECK(!AreAliased(callee_args_count, caller_args_count, scratch0, scratch1));
 
   // Calculate the end of destination area where we will put the arguments
-  // after we drop current frame. We AddP kSystemPointerSize to count the
+  // after we drop current frame. We AddS64 kSystemPointerSize to count the
   // receiver argument which is not included into formal parameters count.
   Register dst_reg = scratch0;
-  ShiftLeftP(dst_reg, caller_args_count, Operand(kSystemPointerSizeLog2));
-  AddP(dst_reg, fp, dst_reg);
-  AddP(dst_reg, dst_reg,
-       Operand(StandardFrameConstants::kCallerSPOffset + kSystemPointerSize));
+  ShiftLeftU64(dst_reg, caller_args_count, Operand(kSystemPointerSizeLog2));
+  AddS64(dst_reg, fp, dst_reg);
+  AddS64(dst_reg, dst_reg,
+         Operand(StandardFrameConstants::kCallerSPOffset + kSystemPointerSize));
 
   Register src_reg = caller_args_count;
   // Calculate the end of source area. +kSystemPointerSize is for the receiver.
-  ShiftLeftP(src_reg, callee_args_count, Operand(kSystemPointerSizeLog2));
-  AddP(src_reg, sp, src_reg);
-  AddP(src_reg, src_reg, Operand(kSystemPointerSize));
+  ShiftLeftU64(src_reg, callee_args_count, Operand(kSystemPointerSizeLog2));
+  AddS64(src_reg, sp, src_reg);
+  AddS64(src_reg, src_reg, Operand(kSystemPointerSize));
 
   if (FLAG_debug_code) {
-    CmpLogicalP(src_reg, dst_reg);
+    CmpU64(src_reg, dst_reg);
     Check(lt, AbortReason::kStackAccessBelowStackPointer);
   }
 
@@ -1346,17 +1464,47 @@ void TurboAssembler::PrepareForTailCall(Register callee_args_count,
   // so they must be pre-decremented in the loop.
   Register tmp_reg = scratch1;
   Label loop;
-  AddP(tmp_reg, callee_args_count, Operand(1));  // +1 for receiver
-  LoadRR(r1, tmp_reg);
+  AddS64(tmp_reg, callee_args_count, Operand(1));  // +1 for receiver
+  mov(r1, tmp_reg);
   bind(&loop);
-  LoadP(tmp_reg, MemOperand(src_reg, -kSystemPointerSize));
-  StoreP(tmp_reg, MemOperand(dst_reg, -kSystemPointerSize));
+  LoadU64(tmp_reg, MemOperand(src_reg, -kSystemPointerSize));
+  StoreU64(tmp_reg, MemOperand(dst_reg, -kSystemPointerSize));
   lay(src_reg, MemOperand(src_reg, -kSystemPointerSize));
   lay(dst_reg, MemOperand(dst_reg, -kSystemPointerSize));
   BranchOnCount(r1, &loop);
 
   // Leave current frame.
-  LoadRR(sp, dst_reg);
+  mov(sp, dst_reg);
+}
+
+MemOperand MacroAssembler::StackLimitAsMemOperand(StackLimitKind kind) {
+  DCHECK(root_array_available());
+  Isolate* isolate = this->isolate();
+  ExternalReference limit =
+      kind == StackLimitKind::kRealStackLimit
+          ? ExternalReference::address_of_real_jslimit(isolate)
+          : ExternalReference::address_of_jslimit(isolate);
+  DCHECK(TurboAssembler::IsAddressableThroughRootRegister(isolate, limit));
+
+  intptr_t offset =
+      TurboAssembler::RootRegisterOffsetForExternalReference(isolate, limit);
+  CHECK(is_int32(offset));
+  return MemOperand(kRootRegister, offset);
+}
+
+void MacroAssembler::StackOverflowCheck(Register num_args, Register scratch,
+                                        Label* stack_overflow) {
+  // Check the stack for overflow. We are not trying to catch
+  // interruptions (e.g. debug break and preemption) here, so the "real stack
+  // limit" is checked.
+  LoadU64(scratch, StackLimitAsMemOperand(StackLimitKind::kRealStackLimit));
+  // Make scratch the space we have left. The stack might already be overflowed
+  // here which will cause scratch to become negative.
+  SubS64(scratch, sp, scratch);
+  // Check if the arguments will overflow the stack.
+  ShiftLeftU64(r0, num_args, Operand(kSystemPointerSizeLog2));
+  CmpS64(scratch, r0);
+  ble(stack_overflow);  // Signed comparison.
 }
 
 void MacroAssembler::InvokePrologue(Register expected_parameter_count,
@@ -1364,19 +1512,74 @@ void MacroAssembler::InvokePrologue(Register expected_parameter_count,
                                     Label* done, InvokeFlag flag) {
   Label regular_invoke;
 
-  // Check whether the expected and actual arguments count match. If not,
-  // setup registers according to contract with ArgumentsAdaptorTrampoline:
   //  r2: actual arguments count
   //  r3: function (passed through to callee)
   //  r4: expected arguments count
 
-  // The code below is made a lot easier because the calling code already sets
-  // up actual and expected registers according to the contract.
-  // ARM has some checks as per below, considering add them for S390
   DCHECK_EQ(actual_parameter_count, r2);
   DCHECK_EQ(expected_parameter_count, r4);
 
-  CmpP(expected_parameter_count, actual_parameter_count);
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  // If the expected parameter count is equal to the adaptor sentinel, no need
+  // to push undefined value as arguments.
+  CmpS64(expected_parameter_count, Operand(kDontAdaptArgumentsSentinel));
+  beq(&regular_invoke);
+
+  // If overapplication or if the actual argument count is equal to the
+  // formal parameter count, no need to push extra undefined values.
+  SubS64(expected_parameter_count, expected_parameter_count,
+         actual_parameter_count);
+  ble(&regular_invoke);
+
+  Label stack_overflow;
+  Register scratch = r6;
+  StackOverflowCheck(expected_parameter_count, scratch, &stack_overflow);
+
+  // Underapplication. Move the arguments already in the stack, including the
+  // receiver and the return address.
+  {
+    Label copy, check;
+    Register num = r7, src = r8, dest = ip;  // r7 and r8 are context and root.
+    mov(src, sp);
+    // Update stack pointer.
+    ShiftLeftU64(scratch, expected_parameter_count,
+                 Operand(kSystemPointerSizeLog2));
+    SubS64(sp, sp, scratch);
+    mov(dest, sp);
+    ltgr(num, actual_parameter_count);
+    b(&check);
+    bind(&copy);
+    LoadU64(r0, MemOperand(src));
+    lay(src, MemOperand(src, kSystemPointerSize));
+    StoreU64(r0, MemOperand(dest));
+    lay(dest, MemOperand(dest, kSystemPointerSize));
+    SubS64(num, num, Operand(1));
+    bind(&check);
+    b(ge, &copy);
+  }
+
+  // Fill remaining expected arguments with undefined values.
+  LoadRoot(scratch, RootIndex::kUndefinedValue);
+  {
+    Label loop;
+    bind(&loop);
+    StoreU64(scratch, MemOperand(ip));
+    lay(ip, MemOperand(ip, kSystemPointerSize));
+    SubS64(expected_parameter_count, expected_parameter_count, Operand(1));
+    bgt(&loop);
+  }
+  b(&regular_invoke);
+
+  bind(&stack_overflow);
+  {
+    FrameScope frame(this, StackFrame::MANUAL);
+    CallRuntime(Runtime::kThrowStackOverflow);
+    bkpt(0);
+  }
+#else
+  // Check whether the expected and actual arguments count match. If not,
+  // setup registers according to contract with ArgumentsAdaptorTrampoline.
+  CmpS64(expected_parameter_count, actual_parameter_count);
   beq(&regular_invoke);
 
   Handle<Code> adaptor = BUILTIN_CODE(isolate(), ArgumentsAdaptorTrampoline);
@@ -1386,7 +1589,8 @@ void MacroAssembler::InvokePrologue(Register expected_parameter_count,
   } else {
     Jump(adaptor, RelocInfo::CODE_TARGET);
   }
-    bind(&regular_invoke);
+#endif
+  bind(&regular_invoke);
 }
 
 void MacroAssembler::CheckDebugHook(Register fun, Register new_target,
@@ -1482,7 +1686,7 @@ void MacroAssembler::InvokeFunctionWithNewTarget(
   LoadTaggedPointerField(cp, FieldMemOperand(fun, JSFunction::kContextOffset));
   LoadTaggedPointerField(
       temp_reg, FieldMemOperand(fun, JSFunction::kSharedFunctionInfoOffset));
-  LoadLogicalHalfWordP(
+  LoadU16(
       expected_reg,
       FieldMemOperand(temp_reg,
                       SharedFunctionInfo::kFormalParameterCountOffset));
@@ -1514,8 +1718,8 @@ void MacroAssembler::MaybeDropFrames() {
   ExternalReference restart_fp =
       ExternalReference::debug_restart_fp_address(isolate());
   Move(r3, restart_fp);
-  LoadP(r3, MemOperand(r3));
-  CmpP(r3, Operand::Zero());
+  LoadU64(r3, MemOperand(r3));
+  CmpS64(r3, Operand::Zero());
   Jump(BUILTIN_CODE(isolate(), FrameDropperTrampoline), RelocInfo::CODE_TARGET,
        ne);
 }
@@ -1534,13 +1738,13 @@ void MacroAssembler::PushStackHandler() {
 
   // Store padding.
   lghi(r0, Operand::Zero());
-  StoreP(r0, MemOperand(sp));  // Padding.
+  StoreU64(r0, MemOperand(sp));  // Padding.
 
   // Copy the old handler into the next handler slot.
   MoveChar(MemOperand(sp, StackHandlerConstants::kNextOffset), MemOperand(r7),
            Operand(kSystemPointerSize));
   // Set this new handler as the current one.
-  StoreP(sp, MemOperand(r7));
+  StoreU64(sp, MemOperand(r7));
 }
 
 void MacroAssembler::PopStackHandler() {
@@ -1551,7 +1755,7 @@ void MacroAssembler::PopStackHandler() {
   Pop(r3);
   Move(ip,
        ExternalReference::Create(IsolateAddressId::kHandlerAddress, isolate()));
-  StoreP(r3, MemOperand(ip));
+  StoreU64(r3, MemOperand(ip));
 
   Drop(1);  // Drop padding.
 }
@@ -1568,8 +1772,8 @@ void MacroAssembler::CompareInstanceType(Register map, Register type_reg,
                                          InstanceType type) {
   STATIC_ASSERT(Map::kInstanceTypeOffset < 4096);
   STATIC_ASSERT(LAST_TYPE <= 0xFFFF);
-  LoadHalfWordP(type_reg, FieldMemOperand(map, Map::kInstanceTypeOffset));
-  CmpP(type_reg, Operand(type));
+  LoadS16(type_reg, FieldMemOperand(map, Map::kInstanceTypeOffset));
+  CmpS64(type_reg, Operand(type));
 }
 
 void MacroAssembler::CompareRoot(Register obj, RootIndex index) {
@@ -1585,11 +1789,11 @@ void MacroAssembler::JumpIfIsInRange(Register value, unsigned lower_limit,
                                      Label* on_in_range) {
   if (lower_limit != 0) {
     Register scratch = r0;
-    LoadRR(scratch, value);
+    mov(scratch, value);
     slgfi(scratch, Operand(lower_limit));
-    CmpLogicalP(scratch, Operand(higher_limit - lower_limit));
+    CmpU64(scratch, Operand(higher_limit - lower_limit));
   } else {
-    CmpLogicalP(value, Operand(higher_limit));
+    CmpU64(value, Operand(higher_limit));
   }
   ble(on_in_range);
 }
@@ -1606,7 +1810,7 @@ void TurboAssembler::TruncateDoubleToI(Isolate* isolate, Zone* zone,
   push(r14);
   // Put input on stack.
   lay(sp, MemOperand(sp, -kDoubleSize));
-  StoreDouble(double_input, MemOperand(sp));
+  StoreF64(double_input, MemOperand(sp));
 
   if (stub_mode == StubCallMode::kCallWasmRuntimeStub) {
     Call(wasm::WasmCode::kDoubleToI, RelocInfo::WASM_STUB_CALL);
@@ -1614,7 +1818,7 @@ void TurboAssembler::TruncateDoubleToI(Isolate* isolate, Zone* zone,
     Call(BUILTIN_CODE(isolate, DoubleToI), RelocInfo::CODE_TARGET);
   }
 
-  LoadP(result, MemOperand(sp, 0));
+  LoadU64(result, MemOperand(sp, 0));
   la(sp, MemOperand(sp, kDoubleSize));
   pop(r14);
 
@@ -1680,7 +1884,7 @@ void MacroAssembler::JumpToInstructionStream(Address entry) {
 
 void MacroAssembler::LoadWeakValue(Register out, Register in,
                                    Label* target_if_cleared) {
-  Cmp32(in, Operand(kClearedWeakHeapObjectLower32));
+  CmpS32(in, Operand(kClearedWeakHeapObjectLower32));
   beq(target_if_cleared);
 
   AndP(out, in, Operand(~kWeakHeapObjectMask));
@@ -1692,9 +1896,9 @@ void MacroAssembler::IncrementCounter(StatsCounter* counter, int value,
   if (FLAG_native_code_counters && counter->Enabled()) {
     Move(scratch2, ExternalReference::Create(counter));
     // @TODO(john.yan): can be optimized by asi()
-    LoadW(scratch1, MemOperand(scratch2));
-    AddP(scratch1, Operand(value));
-    StoreW(scratch1, MemOperand(scratch2));
+    LoadS32(scratch1, MemOperand(scratch2));
+    AddS64(scratch1, Operand(value));
+    StoreU32(scratch1, MemOperand(scratch2));
   }
 }
 
@@ -1704,9 +1908,9 @@ void MacroAssembler::DecrementCounter(StatsCounter* counter, int value,
   if (FLAG_native_code_counters && counter->Enabled()) {
     Move(scratch2, ExternalReference::Create(counter));
     // @TODO(john.yan): can be optimized by asi()
-    LoadW(scratch1, MemOperand(scratch2));
-    AddP(scratch1, Operand(-value));
-    StoreW(scratch1, MemOperand(scratch2));
+    LoadS32(scratch1, MemOperand(scratch2));
+    AddS64(scratch1, Operand(-value));
+    StoreU32(scratch1, MemOperand(scratch2));
   }
 }
 
@@ -1714,6 +1918,10 @@ void TurboAssembler::Assert(Condition cond, AbortReason reason, CRegister cr) {
   if (emit_debug_code()) Check(cond, reason, cr);
 }
 
+void TurboAssembler::AssertUnreachable(AbortReason reason) {
+  if (emit_debug_code()) Abort(reason);
+}
+
 void TurboAssembler::Check(Condition cond, AbortReason reason, CRegister cr) {
   Label L;
   b(cond, &L);
@@ -1763,7 +1971,7 @@ void TurboAssembler::Abort(AbortReason reason) {
   // will not return here
 }
 
-void MacroAssembler::LoadMap(Register destination, Register object) {
+void TurboAssembler::LoadMap(Register destination, Register object) {
   LoadTaggedPointerField(destination,
                          FieldMemOperand(object, HeapObject::kMapOffset));
 }
@@ -1845,11 +2053,11 @@ void MacroAssembler::AssertGeneratorObject(Register object) {
   beq(&do_check);
 
   // Check if JSAsyncFunctionObject (See MacroAssembler::CompareInstanceType)
-  CmpP(instance_type, Operand(JS_ASYNC_FUNCTION_OBJECT_TYPE));
+  CmpS64(instance_type, Operand(JS_ASYNC_FUNCTION_OBJECT_TYPE));
   beq(&do_check);
 
   // Check if JSAsyncGeneratorObject (See MacroAssembler::CompareInstanceType)
-  CmpP(instance_type, Operand(JS_ASYNC_GENERATOR_OBJECT_TYPE));
+  CmpS64(instance_type, Operand(JS_ASYNC_GENERATOR_OBJECT_TYPE));
 
   bind(&do_check);
   // Restore generator object to register and perform assertion
@@ -1897,13 +2105,13 @@ void TurboAssembler::PrepareCallCFunction(int num_reg_arguments,
   if (frame_alignment > kSystemPointerSize) {
     // Make stack end at alignment and make room for stack arguments
     // -- preserving original value of sp.
-    LoadRR(scratch, sp);
+    mov(scratch, sp);
     lay(sp, MemOperand(sp, -(stack_passed_arguments + 1) * kSystemPointerSize));
     DCHECK(base::bits::IsPowerOfTwo(frame_alignment));
     ClearRightImm(sp, sp,
                   Operand(base::bits::WhichPowerOfTwo(frame_alignment)));
-    StoreP(scratch,
-           MemOperand(sp, (stack_passed_arguments)*kSystemPointerSize));
+    StoreU64(scratch,
+             MemOperand(sp, (stack_passed_arguments)*kSystemPointerSize));
   } else {
     stack_space += stack_passed_arguments;
   }
@@ -1964,20 +2172,20 @@ void TurboAssembler::CallCFunctionHelper(Register function,
   // See x64 code for reasoning about how to address the isolate data fields.
   if (root_array_available()) {
     LoadPC(r0);
-    StoreP(r0, MemOperand(kRootRegister,
-                          IsolateData::fast_c_call_caller_pc_offset()));
-    StoreP(fp, MemOperand(kRootRegister,
-                          IsolateData::fast_c_call_caller_fp_offset()));
+    StoreU64(r0, MemOperand(kRootRegister,
+                            IsolateData::fast_c_call_caller_pc_offset()));
+    StoreU64(fp, MemOperand(kRootRegister,
+                            IsolateData::fast_c_call_caller_fp_offset()));
   } else {
     DCHECK_NOT_NULL(isolate());
 
     Move(addr_scratch,
          ExternalReference::fast_c_call_caller_pc_address(isolate()));
     LoadPC(r0);
-    StoreP(r0, MemOperand(addr_scratch));
+    StoreU64(r0, MemOperand(addr_scratch));
     Move(addr_scratch,
          ExternalReference::fast_c_call_caller_fp_address(isolate()));
-    StoreP(fp, MemOperand(addr_scratch));
+    StoreU64(fp, MemOperand(addr_scratch));
   }
 
   // Just call directly. The function called cannot cause a GC, or
@@ -1996,14 +2204,14 @@ void TurboAssembler::CallCFunctionHelper(Register function,
   lghi(zero_scratch, Operand::Zero());
 
   if (root_array_available()) {
-    StoreP(
+    StoreU64(
         zero_scratch,
         MemOperand(kRootRegister, IsolateData::fast_c_call_caller_fp_offset()));
   } else {
     DCHECK_NOT_NULL(isolate());
     Move(addr_scratch,
          ExternalReference::fast_c_call_caller_fp_address(isolate()));
-    StoreP(zero_scratch, MemOperand(addr_scratch));
+    StoreU64(zero_scratch, MemOperand(addr_scratch));
   }
 
   int stack_passed_arguments =
@@ -2011,7 +2219,7 @@ void TurboAssembler::CallCFunctionHelper(Register function,
   int stack_space = kNumRequiredStackFrameSlots + stack_passed_arguments;
   if (ActivationFrameAlignment() > kSystemPointerSize) {
     // Load the original stack pointer (pre-alignment) from the stack
-    LoadP(sp, MemOperand(sp, stack_space * kSystemPointerSize));
+    LoadU64(sp, MemOperand(sp, stack_space * kSystemPointerSize));
   } else {
     la(sp, MemOperand(sp, stack_space * kSystemPointerSize));
   }
@@ -2049,7 +2257,7 @@ void TurboAssembler::CheckPageFlag(
     tm(MemOperand(scratch, BasicMemoryChunk::kFlagsOffset + byte_offset),
        Operand(shifted_mask));
   } else {
-    LoadP(scratch, MemOperand(scratch, BasicMemoryChunk::kFlagsOffset));
+    LoadU64(scratch, MemOperand(scratch, BasicMemoryChunk::kFlagsOffset));
     AndP(r0, scratch, Operand(mask));
   }
   // Should be okay to remove rc
@@ -2083,15 +2291,13 @@ Register GetRegisterThatIsNotOneOf(Register reg1, Register reg2, Register reg3,
   UNREACHABLE();
 }
 
+void TurboAssembler::mov(Register dst, Register src) { lgr(dst, src); }
+
 void TurboAssembler::mov(Register dst, const Operand& src) {
-#if V8_TARGET_ARCH_S390X
-  int64_t value;
-#else
-  int value;
-#endif
+  int64_t value = 0;
+
   if (src.is_heap_object_request()) {
     RequestHeapObject(src.heap_object_request());
-    value = 0;
   } else {
     value = src.immediate();
   }
@@ -2101,18 +2307,38 @@ void TurboAssembler::mov(Register dst, const Operand& src) {
     RecordRelocInfo(src.rmode(), value);
   }
 
-#if V8_TARGET_ARCH_S390X
-  int32_t hi_32 = static_cast<int64_t>(value) >> 32;
+  int32_t hi_32 = static_cast<int32_t>(value >> 32);
   int32_t lo_32 = static_cast<int32_t>(value);
 
+  if (src.rmode() == RelocInfo::NONE) {
+    if (hi_32 == 0) {
+      if (is_uint16(lo_32)) {
+        llill(dst, Operand(lo_32));
+        return;
+      }
+      llilf(dst, Operand(lo_32));
+      return;
+    } else if (lo_32 == 0) {
+      if (is_uint16(hi_32)) {
+        llihl(dst, Operand(hi_32));
+        return;
+      }
+      llihf(dst, Operand(hi_32));
+      return;
+    } else if (is_int16(value)) {
+      lghi(dst, Operand(value));
+      return;
+    } else if (is_int32(value)) {
+      lgfi(dst, Operand(value));
+      return;
+    }
+  }
+
   iihf(dst, Operand(hi_32));
   iilf(dst, Operand(lo_32));
-#else
-  iilf(dst, Operand(value));
-#endif
 }
 
-void TurboAssembler::Mul32(Register dst, const MemOperand& src1) {
+void TurboAssembler::MulS32(Register dst, const MemOperand& src1) {
   if (is_uint12(src1.offset())) {
     ms(dst, src1);
   } else if (is_int20(src1.offset())) {
@@ -2122,9 +2348,9 @@ void TurboAssembler::Mul32(Register dst, const MemOperand& src1) {
   }
 }
 
-void TurboAssembler::Mul32(Register dst, Register src1) { msr(dst, src1); }
+void TurboAssembler::MulS32(Register dst, Register src1) { msr(dst, src1); }
 
-void TurboAssembler::Mul32(Register dst, const Operand& src1) {
+void TurboAssembler::MulS32(Register dst, const Operand& src1) {
   msfi(dst, src1);
 }
 
@@ -2135,20 +2361,20 @@ void TurboAssembler::Mul32(Register dst, const Operand& src1) {
     srlg(dst, dst, Operand(32));  \
   }
 
-void TurboAssembler::MulHigh32(Register dst, Register src1,
-                               const MemOperand& src2) {
+void TurboAssembler::MulHighS32(Register dst, Register src1,
+                                const MemOperand& src2) {
   Generate_MulHigh32(msgf);
 }
 
-void TurboAssembler::MulHigh32(Register dst, Register src1, Register src2) {
+void TurboAssembler::MulHighS32(Register dst, Register src1, Register src2) {
   if (dst == src2) {
     std::swap(src1, src2);
   }
   Generate_MulHigh32(msgfr);
 }
 
-void TurboAssembler::MulHigh32(Register dst, Register src1,
-                               const Operand& src2) {
+void TurboAssembler::MulHighS32(Register dst, Register src1,
+                                const Operand& src2) {
   Generate_MulHigh32(msgfi);
 }
 
@@ -2158,7 +2384,7 @@ void TurboAssembler::MulHigh32(Register dst, Register src1,
   {                                \
     lr(r1, src1);                  \
     instr(r0, src2);               \
-    LoadlW(dst, r0);               \
+    LoadU32(dst, r0);               \
   }
 
 void TurboAssembler::MulHighU32(Register dst, Register src1,
@@ -2210,58 +2436,19 @@ void TurboAssembler::Mul32WithOverflowIfCCUnequal(Register dst, Register src1,
 
 #undef Generate_Mul32WithOverflowIfCCUnequal
 
-void TurboAssembler::Mul64(Register dst, const MemOperand& src1) {
-  if (is_int20(src1.offset())) {
-    msg(dst, src1);
-  } else {
-    UNIMPLEMENTED();
-  }
-}
-
-void TurboAssembler::Mul64(Register dst, Register src1) { msgr(dst, src1); }
-
-void TurboAssembler::Mul64(Register dst, const Operand& src1) {
-  msgfi(dst, src1);
-}
-
-void TurboAssembler::Mul(Register dst, Register src1, Register src2) {
-  if (CpuFeatures::IsSupported(MISC_INSTR_EXT2)) {
-    MulPWithCondition(dst, src1, src2);
-  } else {
-    if (dst == src2) {
-      MulP(dst, src1);
-    } else if (dst == src1) {
-      MulP(dst, src2);
-    } else {
-      Move(dst, src1);
-      MulP(dst, src2);
-    }
-  }
-}
-
-void TurboAssembler::DivP(Register dividend, Register divider) {
-  // have to make sure the src and dst are reg pairs
-  DCHECK_EQ(dividend.code() % 2, 0);
-#if V8_TARGET_ARCH_S390X
-  dsgr(dividend, divider);
-#else
-  dr(dividend, divider);
-#endif
-}
-
 #define Generate_Div32(instr) \
   {                           \
     lgfr(r1, src1);           \
     instr(r0, src2);          \
-    LoadlW(dst, r1);          \
+    LoadU32(dst, r1);          \
   }
 
-void TurboAssembler::Div32(Register dst, Register src1,
-                           const MemOperand& src2) {
+void TurboAssembler::DivS32(Register dst, Register src1,
+                            const MemOperand& src2) {
   Generate_Div32(dsgf);
 }
 
-void TurboAssembler::Div32(Register dst, Register src1, Register src2) {
+void TurboAssembler::DivS32(Register dst, Register src1, Register src2) {
   Generate_Div32(dsgfr);
 }
 
@@ -2272,7 +2459,7 @@ void TurboAssembler::Div32(Register dst, Register src1, Register src2) {
     lr(r0, src1);              \
     srdl(r0, Operand(32));     \
     instr(r0, src2);           \
-    LoadlW(dst, r1);           \
+    LoadU32(dst, r1);           \
   }
 
 void TurboAssembler::DivU32(Register dst, Register src1,
@@ -2293,12 +2480,12 @@ void TurboAssembler::DivU32(Register dst, Register src1, Register src2) {
     lgr(dst, r1);             \
   }
 
-void TurboAssembler::Div64(Register dst, Register src1,
-                           const MemOperand& src2) {
+void TurboAssembler::DivS64(Register dst, Register src1,
+                            const MemOperand& src2) {
   Generate_Div64(dsg);
 }
 
-void TurboAssembler::Div64(Register dst, Register src1, Register src2) {
+void TurboAssembler::DivS64(Register dst, Register src1, Register src2) {
   Generate_Div64(dsgr);
 }
 
@@ -2327,15 +2514,15 @@ void TurboAssembler::DivU64(Register dst, Register src1, Register src2) {
   {                           \
     lgfr(r1, src1);           \
     instr(r0, src2);          \
-    LoadlW(dst, r0);          \
+    LoadU32(dst, r0);          \
   }
 
-void TurboAssembler::Mod32(Register dst, Register src1,
-                           const MemOperand& src2) {
+void TurboAssembler::ModS32(Register dst, Register src1,
+                            const MemOperand& src2) {
   Generate_Mod32(dsgf);
 }
 
-void TurboAssembler::Mod32(Register dst, Register src1, Register src2) {
+void TurboAssembler::ModS32(Register dst, Register src1, Register src2) {
   Generate_Mod32(dsgfr);
 }
 
@@ -2346,7 +2533,7 @@ void TurboAssembler::Mod32(Register dst, Register src1, Register src2) {
     lr(r0, src1);              \
     srdl(r0, Operand(32));     \
     instr(r0, src2);           \
-    LoadlW(dst, r0);           \
+    LoadU32(dst, r0);           \
   }
 
 void TurboAssembler::ModU32(Register dst, Register src1,
@@ -2367,12 +2554,12 @@ void TurboAssembler::ModU32(Register dst, Register src1, Register src2) {
     lgr(dst, r0);             \
   }
 
-void TurboAssembler::Mod64(Register dst, Register src1,
-                           const MemOperand& src2) {
+void TurboAssembler::ModS64(Register dst, Register src1,
+                            const MemOperand& src2) {
   Generate_Mod64(dsg);
 }
 
-void TurboAssembler::Mod64(Register dst, Register src1, Register src2) {
+void TurboAssembler::ModS64(Register dst, Register src1, Register src2) {
   Generate_Mod64(dsgr);
 }
 
@@ -2397,48 +2584,14 @@ void TurboAssembler::ModU64(Register dst, Register src1, Register src2) {
 
 #undef Generate_ModU64
 
-void TurboAssembler::MulP(Register dst, const Operand& opnd) {
-#if V8_TARGET_ARCH_S390X
+void TurboAssembler::MulS64(Register dst, const Operand& opnd) {
   msgfi(dst, opnd);
-#else
-  msfi(dst, opnd);
-#endif
 }
 
-void TurboAssembler::MulP(Register dst, Register src) {
-#if V8_TARGET_ARCH_S390X
-  msgr(dst, src);
-#else
-  msr(dst, src);
-#endif
-}
+void TurboAssembler::MulS64(Register dst, Register src) { msgr(dst, src); }
 
-void TurboAssembler::MulPWithCondition(Register dst, Register src1,
-                                       Register src2) {
-  CHECK(CpuFeatures::IsSupported(MISC_INSTR_EXT2));
-#if V8_TARGET_ARCH_S390X
-  msgrkc(dst, src1, src2);
-#else
-  msrkc(dst, src1, src2);
-#endif
-}
-
-void TurboAssembler::MulP(Register dst, const MemOperand& opnd) {
-#if V8_TARGET_ARCH_S390X
-  if (is_uint16(opnd.offset())) {
-    ms(dst, opnd);
-  } else if (is_int20(opnd.offset())) {
-    msy(dst, opnd);
-  } else {
-    UNIMPLEMENTED();
-  }
-#else
-  if (is_int20(opnd.offset())) {
-    msg(dst, opnd);
-  } else {
-    UNIMPLEMENTED();
-  }
-#endif
+void TurboAssembler::MulS64(Register dst, const MemOperand& opnd) {
+  msg(dst, opnd);
 }
 
 void TurboAssembler::Sqrt(DoubleRegister result, DoubleRegister input) {
@@ -2457,33 +2610,23 @@ void TurboAssembler::Sqrt(DoubleRegister result, const MemOperand& input) {
 //----------------------------------------------------------------------------
 
 // Add 32-bit (Register dst = Register dst + Immediate opnd)
-void TurboAssembler::Add32(Register dst, const Operand& opnd) {
+void TurboAssembler::AddS32(Register dst, const Operand& opnd) {
   if (is_int16(opnd.immediate()))
     ahi(dst, opnd);
   else
     afi(dst, opnd);
 }
 
-// Add 32-bit (Register dst = Register dst + Immediate opnd)
-void TurboAssembler::Add32_RI(Register dst, const Operand& opnd) {
-  // Just a wrapper for above
-  Add32(dst, opnd);
-}
-
 // Add Pointer Size (Register dst = Register dst + Immediate opnd)
-void TurboAssembler::AddP(Register dst, const Operand& opnd) {
-#if V8_TARGET_ARCH_S390X
+void TurboAssembler::AddS64(Register dst, const Operand& opnd) {
   if (is_int16(opnd.immediate()))
     aghi(dst, opnd);
   else
     agfi(dst, opnd);
-#else
-  Add32(dst, opnd);
-#endif
 }
 
 // Add 32-bit (Register dst = Register src + Immediate opnd)
-void TurboAssembler::Add32(Register dst, Register src, const Operand& opnd) {
+void TurboAssembler::AddS32(Register dst, Register src, const Operand& opnd) {
   if (dst != src) {
     if (CpuFeatures::IsSupported(DISTINCT_OPS) && is_int16(opnd.immediate())) {
       ahik(dst, src, opnd);
@@ -2491,48 +2634,29 @@ void TurboAssembler::Add32(Register dst, Register src, const Operand& opnd) {
     }
     lr(dst, src);
   }
-  Add32(dst, opnd);
-}
-
-// Add 32-bit (Register dst = Register src + Immediate opnd)
-void TurboAssembler::Add32_RRI(Register dst, Register src,
-                               const Operand& opnd) {
-  // Just a wrapper for above
-  Add32(dst, src, opnd);
+  AddS32(dst, opnd);
 }
 
 // Add Pointer Size (Register dst = Register src + Immediate opnd)
-void TurboAssembler::AddP(Register dst, Register src, const Operand& opnd) {
+void TurboAssembler::AddS64(Register dst, Register src, const Operand& opnd) {
   if (dst != src) {
     if (CpuFeatures::IsSupported(DISTINCT_OPS) && is_int16(opnd.immediate())) {
-      AddPImm_RRI(dst, src, opnd);
+      aghik(dst, src, opnd);
       return;
     }
-    LoadRR(dst, src);
+    mov(dst, src);
   }
-  AddP(dst, opnd);
+  AddS64(dst, opnd);
 }
 
 // Add 32-bit (Register dst = Register dst + Register src)
-void TurboAssembler::Add32(Register dst, Register src) { ar(dst, src); }
+void TurboAssembler::AddS32(Register dst, Register src) { ar(dst, src); }
 
 // Add Pointer Size (Register dst = Register dst + Register src)
-void TurboAssembler::AddP(Register dst, Register src) { AddRR(dst, src); }
-
-// Add Pointer Size with src extension
-//     (Register dst(ptr) = Register dst (ptr) + Register src (32 | 32->64))
-// src is treated as a 32-bit signed integer, which is sign extended to
-// 64-bit if necessary.
-void TurboAssembler::AddP_ExtendSrc(Register dst, Register src) {
-#if V8_TARGET_ARCH_S390X
-  agfr(dst, src);
-#else
-  ar(dst, src);
-#endif
-}
+void TurboAssembler::AddS64(Register dst, Register src) { agr(dst, src); }
 
 // Add 32-bit (Register dst = Register src1 + Register src2)
-void TurboAssembler::Add32(Register dst, Register src1, Register src2) {
+void TurboAssembler::AddS32(Register dst, Register src1, Register src2) {
   if (dst != src1 && dst != src2) {
     // We prefer to generate AR/AGR, over the non clobbering ARK/AGRK
     // as AR is a smaller instruction
@@ -2549,45 +2673,24 @@ void TurboAssembler::Add32(Register dst, Register src1, Register src2) {
 }
 
 // Add Pointer Size (Register dst = Register src1 + Register src2)
-void TurboAssembler::AddP(Register dst, Register src1, Register src2) {
+void TurboAssembler::AddS64(Register dst, Register src1, Register src2) {
   if (dst != src1 && dst != src2) {
     // We prefer to generate AR/AGR, over the non clobbering ARK/AGRK
     // as AR is a smaller instruction
     if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-      AddP_RRR(dst, src1, src2);
+      agrk(dst, src1, src2);
       return;
     } else {
-      LoadRR(dst, src1);
+      mov(dst, src1);
     }
   } else if (dst == src2) {
     src2 = src1;
   }
-  AddRR(dst, src2);
-}
-
-// Add Pointer Size with src extension
-//      (Register dst (ptr) = Register dst (ptr) + Register src1 (ptr) +
-//                            Register src2 (32 | 32->64))
-// src is treated as a 32-bit signed integer, which is sign extended to
-// 64-bit if necessary.
-void TurboAssembler::AddP_ExtendSrc(Register dst, Register src1,
-                                    Register src2) {
-#if V8_TARGET_ARCH_S390X
-  if (dst == src2) {
-    // The source we need to sign extend is the same as result.
-    lgfr(dst, src2);
-    agr(dst, src1);
-  } else {
-    if (dst != src1) LoadRR(dst, src1);
-    agfr(dst, src2);
-  }
-#else
-  AddP(dst, src1, src2);
-#endif
+  agr(dst, src2);
 }
 
 // Add 32-bit (Register-Memory)
-void TurboAssembler::Add32(Register dst, const MemOperand& opnd) {
+void TurboAssembler::AddS32(Register dst, const MemOperand& opnd) {
   DCHECK(is_int20(opnd.offset()));
   if (is_uint12(opnd.offset()))
     a(dst, opnd);
@@ -2596,30 +2699,13 @@ void TurboAssembler::Add32(Register dst, const MemOperand& opnd) {
 }
 
 // Add Pointer Size (Register-Memory)
-void TurboAssembler::AddP(Register dst, const MemOperand& opnd) {
-#if V8_TARGET_ARCH_S390X
+void TurboAssembler::AddS64(Register dst, const MemOperand& opnd) {
   DCHECK(is_int20(opnd.offset()));
   ag(dst, opnd);
-#else
-  Add32(dst, opnd);
-#endif
-}
-
-// Add Pointer Size with src extension
-//      (Register dst (ptr) = Register dst (ptr) + Mem opnd (32 | 32->64))
-// src is treated as a 32-bit signed integer, which is sign extended to
-// 64-bit if necessary.
-void TurboAssembler::AddP_ExtendSrc(Register dst, const MemOperand& opnd) {
-#if V8_TARGET_ARCH_S390X
-  DCHECK(is_int20(opnd.offset()));
-  agf(dst, opnd);
-#else
-  Add32(dst, opnd);
-#endif
 }
 
 // Add 32-bit (Memory - Immediate)
-void TurboAssembler::Add32(const MemOperand& opnd, const Operand& imm) {
+void TurboAssembler::AddS32(const MemOperand& opnd, const Operand& imm) {
   DCHECK(is_int8(imm.immediate()));
   DCHECK(is_int20(opnd.offset()));
   DCHECK(CpuFeatures::IsSupported(GENERAL_INSTR_EXT));
@@ -2627,40 +2713,19 @@ void TurboAssembler::Add32(const MemOperand& opnd, const Operand& imm) {
 }
 
 // Add Pointer-sized (Memory - Immediate)
-void TurboAssembler::AddP(const MemOperand& opnd, const Operand& imm) {
+void TurboAssembler::AddS64(const MemOperand& opnd, const Operand& imm) {
   DCHECK(is_int8(imm.immediate()));
   DCHECK(is_int20(opnd.offset()));
   DCHECK(CpuFeatures::IsSupported(GENERAL_INSTR_EXT));
-#if V8_TARGET_ARCH_S390X
   agsi(opnd, imm);
-#else
-  asi(opnd, imm);
-#endif
 }
 
 //----------------------------------------------------------------------------
 //  Add Logical Instructions
 //----------------------------------------------------------------------------
 
-// Add Logical With Carry 32-bit (Register dst = Register src1 + Register src2)
-void TurboAssembler::AddLogicalWithCarry32(Register dst, Register src1,
-                                           Register src2) {
-  if (dst != src2 && dst != src1) {
-    lr(dst, src1);
-    alcr(dst, src2);
-  } else if (dst != src2) {
-    // dst == src1
-    DCHECK(dst == src1);
-    alcr(dst, src2);
-  } else {
-    // dst == src2
-    DCHECK(dst == src2);
-    alcr(dst, src1);
-  }
-}
-
 // Add Logical 32-bit (Register dst = Register src1 + Register src2)
-void TurboAssembler::AddLogical32(Register dst, Register src1, Register src2) {
+void TurboAssembler::AddU32(Register dst, Register src1, Register src2) {
   if (dst != src2 && dst != src1) {
     lr(dst, src1);
     alr(dst, src2);
@@ -2676,21 +2741,17 @@ void TurboAssembler::AddLogical32(Register dst, Register src1, Register src2) {
 }
 
 // Add Logical 32-bit (Register dst = Register dst + Immediate opnd)
-void TurboAssembler::AddLogical(Register dst, const Operand& imm) {
+void TurboAssembler::AddU32(Register dst, const Operand& imm) {
   alfi(dst, imm);
 }
 
 // Add Logical Pointer Size (Register dst = Register dst + Immediate opnd)
-void TurboAssembler::AddLogicalP(Register dst, const Operand& imm) {
-#ifdef V8_TARGET_ARCH_S390X
+void TurboAssembler::AddU64(Register dst, const Operand& imm) {
   algfi(dst, imm);
-#else
-  AddLogical(dst, imm);
-#endif
 }
 
 // Add Logical 32-bit (Register-Memory)
-void TurboAssembler::AddLogical(Register dst, const MemOperand& opnd) {
+void TurboAssembler::AddU32(Register dst, const MemOperand& opnd) {
   DCHECK(is_int20(opnd.offset()));
   if (is_uint12(opnd.offset()))
     al_z(dst, opnd);
@@ -2699,40 +2760,17 @@ void TurboAssembler::AddLogical(Register dst, const MemOperand& opnd) {
 }
 
 // Add Logical Pointer Size (Register-Memory)
-void TurboAssembler::AddLogicalP(Register dst, const MemOperand& opnd) {
-#if V8_TARGET_ARCH_S390X
+void TurboAssembler::AddU64(Register dst, const MemOperand& opnd) {
   DCHECK(is_int20(opnd.offset()));
   alg(dst, opnd);
-#else
-  AddLogical(dst, opnd);
-#endif
 }
 
 //----------------------------------------------------------------------------
 //  Subtract Instructions
 //----------------------------------------------------------------------------
 
-// Subtract Logical With Carry 32-bit (Register dst = Register src1 - Register
-// src2)
-void TurboAssembler::SubLogicalWithBorrow32(Register dst, Register src1,
-                                            Register src2) {
-  if (dst != src2 && dst != src1) {
-    lr(dst, src1);
-    slbr(dst, src2);
-  } else if (dst != src2) {
-    // dst == src1
-    DCHECK(dst == src1);
-    slbr(dst, src2);
-  } else {
-    // dst == src2
-    DCHECK(dst == src2);
-    lr(r0, dst);
-    SubLogicalWithBorrow32(dst, src1, r0);
-  }
-}
-
 // Subtract Logical 32-bit (Register dst = Register src1 - Register src2)
-void TurboAssembler::SubLogical32(Register dst, Register src1, Register src2) {
+void TurboAssembler::SubU32(Register dst, Register src1, Register src2) {
   if (dst != src2 && dst != src1) {
     lr(dst, src1);
     slr(dst, src2);
@@ -2744,50 +2782,38 @@ void TurboAssembler::SubLogical32(Register dst, Register src1, Register src2) {
     // dst == src2
     DCHECK(dst == src2);
     lr(r0, dst);
-    SubLogical32(dst, src1, r0);
+    SubU32(dst, src1, r0);
   }
 }
 
 // Subtract 32-bit (Register dst = Register dst - Immediate opnd)
-void TurboAssembler::Sub32(Register dst, const Operand& imm) {
-  Add32(dst, Operand(-(imm.immediate())));
+void TurboAssembler::SubS32(Register dst, const Operand& imm) {
+  AddS32(dst, Operand(-(imm.immediate())));
 }
 
 // Subtract Pointer Size (Register dst = Register dst - Immediate opnd)
-void TurboAssembler::SubP(Register dst, const Operand& imm) {
-  AddP(dst, Operand(-(imm.immediate())));
+void TurboAssembler::SubS64(Register dst, const Operand& imm) {
+  AddS64(dst, Operand(-(imm.immediate())));
 }
 
 // Subtract 32-bit (Register dst = Register src - Immediate opnd)
-void TurboAssembler::Sub32(Register dst, Register src, const Operand& imm) {
-  Add32(dst, src, Operand(-(imm.immediate())));
+void TurboAssembler::SubS32(Register dst, Register src, const Operand& imm) {
+  AddS32(dst, src, Operand(-(imm.immediate())));
 }
 
 // Subtract Pointer Sized (Register dst = Register src - Immediate opnd)
-void TurboAssembler::SubP(Register dst, Register src, const Operand& imm) {
-  AddP(dst, src, Operand(-(imm.immediate())));
+void TurboAssembler::SubS64(Register dst, Register src, const Operand& imm) {
+  AddS64(dst, src, Operand(-(imm.immediate())));
 }
 
 // Subtract 32-bit (Register dst = Register dst - Register src)
-void TurboAssembler::Sub32(Register dst, Register src) { sr(dst, src); }
+void TurboAssembler::SubS32(Register dst, Register src) { sr(dst, src); }
 
 // Subtract Pointer Size (Register dst = Register dst - Register src)
-void TurboAssembler::SubP(Register dst, Register src) { SubRR(dst, src); }
-
-// Subtract Pointer Size with src extension
-//     (Register dst(ptr) = Register dst (ptr) - Register src (32 | 32->64))
-// src is treated as a 32-bit signed integer, which is sign extended to
-// 64-bit if necessary.
-void TurboAssembler::SubP_ExtendSrc(Register dst, Register src) {
-#if V8_TARGET_ARCH_S390X
-  sgfr(dst, src);
-#else
-  sr(dst, src);
-#endif
-}
+void TurboAssembler::SubS64(Register dst, Register src) { sgr(dst, src); }
 
 // Subtract 32-bit (Register = Register - Register)
-void TurboAssembler::Sub32(Register dst, Register src1, Register src2) {
+void TurboAssembler::SubS32(Register dst, Register src1, Register src2) {
   // Use non-clobbering version if possible
   if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
     srk(dst, src1, src2);
@@ -2807,49 +2833,27 @@ void TurboAssembler::Sub32(Register dst, Register src1, Register src2) {
 }
 
 // Subtract Pointer Sized (Register = Register - Register)
-void TurboAssembler::SubP(Register dst, Register src1, Register src2) {
+void TurboAssembler::SubS64(Register dst, Register src1, Register src2) {
   // Use non-clobbering version if possible
   if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    SubP_RRR(dst, src1, src2);
+    sgrk(dst, src1, src2);
     return;
   }
-  if (dst != src1 && dst != src2) LoadRR(dst, src1);
+  if (dst != src1 && dst != src2) mov(dst, src1);
   // In scenario where we have dst = src - dst, we need to swap and negate
   if (dst != src1 && dst == src2) {
     Label done;
-    LoadComplementRR(dst, dst);  // dst = -dst
+    lcgr(dst, dst);  // dst = -dst
     b(overflow, &done);
-    AddP(dst, src1);  // dst = dst + src
+    AddS64(dst, src1);  // dst = dst + src
     bind(&done);
   } else {
-    SubP(dst, src2);
+    SubS64(dst, src2);
   }
 }
 
-// Subtract Pointer Size with src extension
-//     (Register dst(ptr) = Register dst (ptr) - Register src (32 | 32->64))
-// src is treated as a 32-bit signed integer, which is sign extended to
-// 64-bit if necessary.
-void TurboAssembler::SubP_ExtendSrc(Register dst, Register src1,
-                                    Register src2) {
-#if V8_TARGET_ARCH_S390X
-  if (dst != src1 && dst != src2) LoadRR(dst, src1);
-
-  // In scenario where we have dst = src - dst, we need to swap and negate
-  if (dst != src1 && dst == src2) {
-    lgfr(dst, dst);              // Sign extend this operand first.
-    LoadComplementRR(dst, dst);  // dst = -dst
-    AddP(dst, src1);             // dst = -dst + src
-  } else {
-    sgfr(dst, src2);
-  }
-#else
-  SubP(dst, src1, src2);
-#endif
-}
-
 // Subtract 32-bit (Register-Memory)
-void TurboAssembler::Sub32(Register dst, const MemOperand& opnd) {
+void TurboAssembler::SubS32(Register dst, const MemOperand& opnd) {
   DCHECK(is_int20(opnd.offset()));
   if (is_uint12(opnd.offset()))
     s(dst, opnd);
@@ -2858,11 +2862,11 @@ void TurboAssembler::Sub32(Register dst, const MemOperand& opnd) {
 }
 
 // Subtract Pointer Sized (Register - Memory)
-void TurboAssembler::SubP(Register dst, const MemOperand& opnd) {
+void TurboAssembler::SubS64(Register dst, const MemOperand& opnd) {
 #if V8_TARGET_ARCH_S390X
   sg(dst, opnd);
 #else
-  Sub32(dst, opnd);
+  SubS32(dst, opnd);
 #endif
 }
 
@@ -2876,15 +2880,6 @@ void TurboAssembler::MovFloatToInt(Register dst, DoubleRegister src) {
   srlg(dst, dst, Operand(32));
 }
 
-void TurboAssembler::SubP_ExtendSrc(Register dst, const MemOperand& opnd) {
-#if V8_TARGET_ARCH_S390X
-  DCHECK(is_int20(opnd.offset()));
-  sgf(dst, opnd);
-#else
-  Sub32(dst, opnd);
-#endif
-}
-
 // Load And Subtract 32-bit (similar to laa/lan/lao/lax)
 void TurboAssembler::LoadAndSub32(Register dst, Register src,
                                   const MemOperand& opnd) {
@@ -2903,7 +2898,7 @@ void TurboAssembler::LoadAndSub64(Register dst, Register src,
 //----------------------------------------------------------------------------
 
 // Subtract Logical 32-bit (Register - Memory)
-void TurboAssembler::SubLogical(Register dst, const MemOperand& opnd) {
+void TurboAssembler::SubU32(Register dst, const MemOperand& opnd) {
   DCHECK(is_int20(opnd.offset()));
   if (is_uint12(opnd.offset()))
     sl(dst, opnd);
@@ -2912,26 +2907,12 @@ void TurboAssembler::SubLogical(Register dst, const MemOperand& opnd) {
 }
 
 // Subtract Logical Pointer Sized (Register - Memory)
-void TurboAssembler::SubLogicalP(Register dst, const MemOperand& opnd) {
+void TurboAssembler::SubU64(Register dst, const MemOperand& opnd) {
   DCHECK(is_int20(opnd.offset()));
 #if V8_TARGET_ARCH_S390X
   slgf(dst, opnd);
 #else
-  SubLogical(dst, opnd);
-#endif
-}
-
-// Subtract Logical Pointer Size with src extension
-//      (Register dst (ptr) = Register dst (ptr) - Mem opnd (32 | 32->64))
-// src is treated as a 32-bit signed integer, which is sign extended to
-// 64-bit if necessary.
-void TurboAssembler::SubLogicalP_ExtendSrc(Register dst,
-                                           const MemOperand& opnd) {
-#if V8_TARGET_ARCH_S390X
-  DCHECK(is_int20(opnd.offset()));
-  slgf(dst, opnd);
-#else
-  SubLogical(dst, opnd);
+  SubU32(dst, opnd);
 #endif
 }
 
@@ -2943,7 +2924,7 @@ void TurboAssembler::SubLogicalP_ExtendSrc(Register dst,
 void TurboAssembler::And(Register dst, Register src) { nr(dst, src); }
 
 // AND Pointer Size - dst = dst & src
-void TurboAssembler::AndP(Register dst, Register src) { AndRR(dst, src); }
+void TurboAssembler::AndP(Register dst, Register src) { ngr(dst, src); }
 
 // Non-clobbering AND 32-bit - dst = src1 & src1
 void TurboAssembler::And(Register dst, Register src1, Register src2) {
@@ -2968,10 +2949,10 @@ void TurboAssembler::AndP(Register dst, Register src1, Register src2) {
     // We prefer to generate XR/XGR, over the non clobbering XRK/XRK
     // as XR is a smaller instruction
     if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-      AndP_RRR(dst, src1, src2);
+      ngrk(dst, src1, src2);
       return;
     } else {
-      LoadRR(dst, src1);
+      mov(dst, src1);
     }
   } else if (dst == src2) {
     src2 = src1;
@@ -3058,7 +3039,7 @@ void TurboAssembler::AndP(Register dst, Register src, const Operand& opnd) {
   }
 
   // If we are &'ing zero, we can just whack the dst register and skip copy
-  if (dst != src && (0 != value)) LoadRR(dst, src);
+  if (dst != src && (0 != value)) mov(dst, src);
   AndP(dst, opnd);
 }
 
@@ -3066,7 +3047,7 @@ void TurboAssembler::AndP(Register dst, Register src, const Operand& opnd) {
 void TurboAssembler::Or(Register dst, Register src) { or_z(dst, src); }
 
 // OR Pointer Size - dst = dst & src
-void TurboAssembler::OrP(Register dst, Register src) { OrRR(dst, src); }
+void TurboAssembler::OrP(Register dst, Register src) { ogr(dst, src); }
 
 // Non-clobbering OR 32-bit - dst = src1 & src1
 void TurboAssembler::Or(Register dst, Register src1, Register src2) {
@@ -3091,10 +3072,10 @@ void TurboAssembler::OrP(Register dst, Register src1, Register src2) {
     // We prefer to generate XR/XGR, over the non clobbering XRK/XRK
     // as XR is a smaller instruction
     if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-      OrP_RRR(dst, src1, src2);
+      ogrk(dst, src1, src2);
       return;
     } else {
-      LoadRR(dst, src1);
+      mov(dst, src1);
     }
   } else if (dst == src2) {
     src2 = src1;
@@ -3146,7 +3127,7 @@ void TurboAssembler::Or(Register dst, Register src, const Operand& opnd) {
 
 // OR Pointer Size - dst = src & imm
 void TurboAssembler::OrP(Register dst, Register src, const Operand& opnd) {
-  if (dst != src) LoadRR(dst, src);
+  if (dst != src) mov(dst, src);
   OrP(dst, opnd);
 }
 
@@ -3154,7 +3135,7 @@ void TurboAssembler::OrP(Register dst, Register src, const Operand& opnd) {
 void TurboAssembler::Xor(Register dst, Register src) { xr(dst, src); }
 
 // XOR Pointer Size - dst = dst & src
-void TurboAssembler::XorP(Register dst, Register src) { XorRR(dst, src); }
+void TurboAssembler::XorP(Register dst, Register src) { xgr(dst, src); }
 
 // Non-clobbering XOR 32-bit - dst = src1 & src1
 void TurboAssembler::Xor(Register dst, Register src1, Register src2) {
@@ -3179,10 +3160,10 @@ void TurboAssembler::XorP(Register dst, Register src1, Register src2) {
     // We prefer to generate XR/XGR, over the non clobbering XRK/XRK
     // as XR is a smaller instruction
     if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-      XorP_RRR(dst, src1, src2);
+      xgrk(dst, src1, src2);
       return;
     } else {
-      LoadRR(dst, src1);
+      mov(dst, src1);
     }
   } else if (dst == src2) {
     src2 = src1;
@@ -3231,7 +3212,7 @@ void TurboAssembler::Xor(Register dst, Register src, const Operand& opnd) {
 
 // XOR Pointer Size - dst = src & imm
 void TurboAssembler::XorP(Register dst, Register src, const Operand& opnd) {
-  if (dst != src) LoadRR(dst, src);
+  if (dst != src) mov(dst, src);
   XorP(dst, opnd);
 }
 
@@ -3254,49 +3235,6 @@ void TurboAssembler::NotP(Register dst, Register src) {
 #endif
 }
 
-// works the same as mov
-void TurboAssembler::Load(Register dst, const Operand& opnd) {
-  intptr_t value = opnd.immediate();
-  if (is_int16(value)) {
-#if V8_TARGET_ARCH_S390X
-    lghi(dst, opnd);
-#else
-    lhi(dst, opnd);
-#endif
-  } else if (is_int32(value)) {
-#if V8_TARGET_ARCH_S390X
-    lgfi(dst, opnd);
-#else
-    iilf(dst, opnd);
-#endif
-  } else if (is_uint32(value)) {
-#if V8_TARGET_ARCH_S390X
-    llilf(dst, opnd);
-#else
-    iilf(dst, opnd);
-#endif
-  } else {
-    int32_t hi_32 = static_cast<int64_t>(value) >> 32;
-    int32_t lo_32 = static_cast<int32_t>(value);
-
-    iihf(dst, Operand(hi_32));
-    iilf(dst, Operand(lo_32));
-  }
-}
-
-void TurboAssembler::Load(Register dst, const MemOperand& opnd) {
-  DCHECK(is_int20(opnd.offset()));
-#if V8_TARGET_ARCH_S390X
-  lgf(dst, opnd);  // 64<-32
-#else
-  if (is_uint12(opnd.offset())) {
-    l(dst, opnd);
-  } else {
-    ly(dst, opnd);
-  }
-#endif
-}
-
 void TurboAssembler::LoadPositiveP(Register result, Register input) {
 #if V8_TARGET_ARCH_S390X
   lpgr(result, input);
@@ -3315,20 +3253,14 @@ void TurboAssembler::LoadPositive32(Register result, Register input) {
 //-----------------------------------------------------------------------------
 
 // Compare 32-bit Register vs Register
-void TurboAssembler::Cmp32(Register src1, Register src2) { cr_z(src1, src2); }
+void TurboAssembler::CmpS32(Register src1, Register src2) { cr_z(src1, src2); }
 
 // Compare Pointer Sized Register vs Register
-void TurboAssembler::CmpP(Register src1, Register src2) {
-#if V8_TARGET_ARCH_S390X
-  cgr(src1, src2);
-#else
-  Cmp32(src1, src2);
-#endif
-}
+void TurboAssembler::CmpS64(Register src1, Register src2) { cgr(src1, src2); }
 
 // Compare 32-bit Register vs Immediate
 // This helper will set up proper relocation entries if required.
-void TurboAssembler::Cmp32(Register dst, const Operand& opnd) {
+void TurboAssembler::CmpS32(Register dst, const Operand& opnd) {
   if (opnd.rmode() == RelocInfo::NONE) {
     intptr_t value = opnd.immediate();
     if (is_int16(value))
@@ -3344,21 +3276,17 @@ void TurboAssembler::Cmp32(Register dst, const Operand& opnd) {
 
 // Compare Pointer Sized  Register vs Immediate
 // This helper will set up proper relocation entries if required.
-void TurboAssembler::CmpP(Register dst, const Operand& opnd) {
-#if V8_TARGET_ARCH_S390X
+void TurboAssembler::CmpS64(Register dst, const Operand& opnd) {
   if (opnd.rmode() == RelocInfo::NONE) {
     cgfi(dst, opnd);
   } else {
     mov(r0, opnd);  // Need to generate 64-bit relocation
     cgr(dst, r0);
   }
-#else
-  Cmp32(dst, opnd);
-#endif
 }
 
 // Compare 32-bit Register vs Memory
-void TurboAssembler::Cmp32(Register dst, const MemOperand& opnd) {
+void TurboAssembler::CmpS32(Register dst, const MemOperand& opnd) {
   // make sure offset is within 20 bit range
   DCHECK(is_int20(opnd.offset()));
   if (is_uint12(opnd.offset()))
@@ -3368,14 +3296,10 @@ void TurboAssembler::Cmp32(Register dst, const MemOperand& opnd) {
 }
 
 // Compare Pointer Size Register vs Memory
-void TurboAssembler::CmpP(Register dst, const MemOperand& opnd) {
+void TurboAssembler::CmpS64(Register dst, const MemOperand& opnd) {
   // make sure offset is within 20 bit range
   DCHECK(is_int20(opnd.offset()));
-#if V8_TARGET_ARCH_S390X
   cg(dst, opnd);
-#else
-  Cmp32(dst, opnd);
-#endif
 }
 
 // Using cs or scy based on the offset
@@ -3399,34 +3323,34 @@ void TurboAssembler::CmpAndSwap64(Register old_val, Register new_val,
 //-----------------------------------------------------------------------------
 
 // Compare Logical 32-bit Register vs Register
-void TurboAssembler::CmpLogical32(Register dst, Register src) { clr(dst, src); }
+void TurboAssembler::CmpU32(Register dst, Register src) { clr(dst, src); }
 
 // Compare Logical Pointer Sized Register vs Register
-void TurboAssembler::CmpLogicalP(Register dst, Register src) {
+void TurboAssembler::CmpU64(Register dst, Register src) {
 #ifdef V8_TARGET_ARCH_S390X
   clgr(dst, src);
 #else
-  CmpLogical32(dst, src);
+  CmpU32(dst, src);
 #endif
 }
 
 // Compare Logical 32-bit Register vs Immediate
-void TurboAssembler::CmpLogical32(Register dst, const Operand& opnd) {
+void TurboAssembler::CmpU32(Register dst, const Operand& opnd) {
   clfi(dst, opnd);
 }
 
 // Compare Logical Pointer Sized Register vs Immediate
-void TurboAssembler::CmpLogicalP(Register dst, const Operand& opnd) {
+void TurboAssembler::CmpU64(Register dst, const Operand& opnd) {
 #if V8_TARGET_ARCH_S390X
   DCHECK_EQ(static_cast<uint32_t>(opnd.immediate() >> 32), 0);
   clgfi(dst, opnd);
 #else
-  CmpLogical32(dst, opnd);
+  CmpU32(dst, opnd);
 #endif
 }
 
 // Compare Logical 32-bit Register vs Memory
-void TurboAssembler::CmpLogical32(Register dst, const MemOperand& opnd) {
+void TurboAssembler::CmpU32(Register dst, const MemOperand& opnd) {
   // make sure offset is within 20 bit range
   DCHECK(is_int20(opnd.offset()));
   if (is_uint12(opnd.offset()))
@@ -3436,25 +3360,16 @@ void TurboAssembler::CmpLogical32(Register dst, const MemOperand& opnd) {
 }
 
 // Compare Logical Pointer Sized Register vs Memory
-void TurboAssembler::CmpLogicalP(Register dst, const MemOperand& opnd) {
+void TurboAssembler::CmpU64(Register dst, const MemOperand& opnd) {
   // make sure offset is within 20 bit range
   DCHECK(is_int20(opnd.offset()));
 #if V8_TARGET_ARCH_S390X
   clg(dst, opnd);
 #else
-  CmpLogical32(dst, opnd);
+  CmpU32(dst, opnd);
 #endif
 }
 
-// Compare Logical Byte (Mem - Imm)
-void TurboAssembler::CmpLogicalByte(const MemOperand& mem, const Operand& imm) {
-  DCHECK(is_uint8(imm.immediate()));
-  if (is_uint12(mem.offset()))
-    cli(mem, imm);
-  else
-    cliy(mem, imm);
-}
-
 void TurboAssembler::Branch(Condition c, const Operand& opnd) {
   intptr_t value = opnd.immediate();
   if (is_int16(value))
@@ -3473,15 +3388,11 @@ void TurboAssembler::BranchOnCount(Register r1, Label* l) {
     brct(r1, Operand(offset));
 #endif
   } else {
-    AddP(r1, Operand(-1));
+    AddS64(r1, Operand(-1));
     Branch(ne, Operand(offset));
   }
 }
 
-void TurboAssembler::LoadIntLiteral(Register dst, int value) {
-  Load(dst, Operand(value));
-}
-
 void TurboAssembler::LoadSmiLiteral(Register dst, Smi smi) {
   intptr_t value = static_cast<intptr_t>(smi.ptr());
 #if defined(V8_COMPRESS_POINTERS) || defined(V8_31BIT_SMIS_ON_64BIT_ARCH)
@@ -3493,37 +3404,6 @@ void TurboAssembler::LoadSmiLiteral(Register dst, Smi smi) {
 #endif
 }
 
-void TurboAssembler::LoadDoubleLiteral(DoubleRegister result, uint64_t value,
-                                       Register scratch) {
-  uint32_t hi_32 = value >> 32;
-  uint32_t lo_32 = static_cast<uint32_t>(value);
-
-  // Load the 64-bit value into a GPR, then transfer it to FPR via LDGR
-  if (value == 0) {
-    lzdr(result);
-  } else if (lo_32 == 0) {
-    llihf(scratch, Operand(hi_32));
-    ldgr(result, scratch);
-  } else {
-    iihf(scratch, Operand(hi_32));
-    iilf(scratch, Operand(lo_32));
-    ldgr(result, scratch);
-  }
-}
-
-void TurboAssembler::LoadDoubleLiteral(DoubleRegister result, double value,
-                                       Register scratch) {
-  uint64_t int_val = bit_cast<uint64_t, double>(value);
-  LoadDoubleLiteral(result, int_val, scratch);
-}
-
-void TurboAssembler::LoadFloat32Literal(DoubleRegister result, float value,
-                                        Register scratch) {
-  uint64_t int_val = static_cast<uint64_t>(bit_cast<uint32_t, float>(value))
-                     << 32;
-  LoadDoubleLiteral(result, int_val, scratch);
-}
-
 void TurboAssembler::CmpSmiLiteral(Register src1, Smi smi, Register scratch) {
 #if defined(V8_COMPRESS_POINTERS) || defined(V8_31BIT_SMIS_ON_64BIT_ARCH)
   // CFI takes 32-bit immediate.
@@ -3538,41 +3418,27 @@ void TurboAssembler::CmpSmiLiteral(Register src1, Smi smi, Register scratch) {
 #endif
 }
 
-// Load a "pointer" sized value from the memory location
-void TurboAssembler::LoadP(Register dst, const MemOperand& mem,
-                           Register scratch) {
+void TurboAssembler::LoadU64(Register dst, const MemOperand& mem,
+                             Register scratch) {
   int offset = mem.offset();
 
-#if V8_TARGET_ARCH_S390X
   MemOperand src = mem;
   if (!is_int20(offset)) {
     DCHECK(scratch != no_reg && scratch != r0 && mem.rx() == r0);
     DCHECK(scratch != mem.rb());
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
     src = MemOperand(mem.rb(), scratch);
   }
   lg(dst, src);
-#else
-  if (is_uint12(offset)) {
-    l(dst, mem);
-  } else if (is_int20(offset)) {
-    ly(dst, mem);
-  } else {
-    DCHECK(scratch != no_reg && scratch != r0 && mem.rx() == r0);
-    DCHECK(scratch != mem.rb());
-    LoadIntLiteral(scratch, offset);
-    l(dst, MemOperand(mem.rb(), scratch));
-  }
-#endif
 }
 
 // Store a "pointer" sized value to the memory location
-void TurboAssembler::StoreP(Register src, const MemOperand& mem,
-                            Register scratch) {
+void TurboAssembler::StoreU64(Register src, const MemOperand& mem,
+                              Register scratch) {
   if (!is_int20(mem.offset())) {
     DCHECK(scratch != no_reg);
     DCHECK(scratch != r0);
-    LoadIntLiteral(scratch, mem.offset());
+    mov(scratch, Operand(mem.offset()));
 #if V8_TARGET_ARCH_S390X
     stg(src, MemOperand(mem.rb(), scratch));
 #else
@@ -3582,16 +3448,16 @@ void TurboAssembler::StoreP(Register src, const MemOperand& mem,
 #if V8_TARGET_ARCH_S390X
     stg(src, mem);
 #else
-    // StoreW will try to generate ST if offset fits, otherwise
+    // StoreU32 will try to generate ST if offset fits, otherwise
     // it'll generate STY.
-    StoreW(src, mem);
+    StoreU32(src, mem);
 #endif
   }
 }
 
 // Store a "pointer" sized constant to the memory location
-void TurboAssembler::StoreP(const MemOperand& mem, const Operand& opnd,
-                            Register scratch) {
+void TurboAssembler::StoreU64(const MemOperand& mem, const Operand& opnd,
+                              Register scratch) {
   // Relocations not supported
   DCHECK_EQ(opnd.rmode(), RelocInfo::NONE);
 
@@ -3604,8 +3470,8 @@ void TurboAssembler::StoreP(const MemOperand& mem, const Operand& opnd,
     mvhi(mem, opnd);
 #endif
   } else {
-    LoadImmP(scratch, opnd);
-    StoreP(scratch, mem);
+    mov(scratch, opnd);
+    StoreU64(scratch, mem);
   }
 }
 
@@ -3660,7 +3526,7 @@ void TurboAssembler::StoreMultipleW(Register src1, Register src2,
 }
 
 // Load 32-bits and sign extend if necessary.
-void TurboAssembler::LoadW(Register dst, Register src) {
+void TurboAssembler::LoadS32(Register dst, Register src) {
 #if V8_TARGET_ARCH_S390X
   lgfr(dst, src);
 #else
@@ -3669,13 +3535,13 @@ void TurboAssembler::LoadW(Register dst, Register src) {
 }
 
 // Load 32-bits and sign extend if necessary.
-void TurboAssembler::LoadW(Register dst, const MemOperand& mem,
+void TurboAssembler::LoadS32(Register dst, const MemOperand& mem,
                            Register scratch) {
   int offset = mem.offset();
 
   if (!is_int20(offset)) {
     DCHECK(scratch != no_reg);
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
 #if V8_TARGET_ARCH_S390X
     lgf(dst, MemOperand(mem.rb(), scratch));
 #else
@@ -3695,7 +3561,7 @@ void TurboAssembler::LoadW(Register dst, const MemOperand& mem,
 }
 
 // Load 32-bits and zero extend if necessary.
-void TurboAssembler::LoadlW(Register dst, Register src) {
+void TurboAssembler::LoadU32(Register dst, Register src) {
 #if V8_TARGET_ARCH_S390X
   llgfr(dst, src);
 #else
@@ -3705,7 +3571,7 @@ void TurboAssembler::LoadlW(Register dst, Register src) {
 
 // Variable length depending on whether offset fits into immediate field
 // MemOperand of RX or RXY format
-void TurboAssembler::LoadlW(Register dst, const MemOperand& mem,
+void TurboAssembler::LoadU32(Register dst, const MemOperand& mem,
                             Register scratch) {
   Register base = mem.rb();
   int offset = mem.offset();
@@ -3715,7 +3581,7 @@ void TurboAssembler::LoadlW(Register dst, const MemOperand& mem,
     llgf(dst, mem);
   } else if (scratch != no_reg) {
     // Materialize offset into scratch register.
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
     llgf(dst, MemOperand(base, scratch));
   } else {
     DCHECK(false);
@@ -3731,7 +3597,7 @@ void TurboAssembler::LoadlW(Register dst, const MemOperand& mem,
     use_RXYform = true;
   } else if (scratch != no_reg) {
     // Materialize offset into scratch register.
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
   } else {
     DCHECK(false);
   }
@@ -3746,7 +3612,7 @@ void TurboAssembler::LoadlW(Register dst, const MemOperand& mem,
 #endif
 }
 
-void TurboAssembler::LoadLogicalHalfWordP(Register dst, const MemOperand& mem) {
+void TurboAssembler::LoadU16(Register dst, const MemOperand& mem) {
 #if V8_TARGET_ARCH_S390X
   llgh(dst, mem);
 #else
@@ -3754,7 +3620,7 @@ void TurboAssembler::LoadLogicalHalfWordP(Register dst, const MemOperand& mem) {
 #endif
 }
 
-void TurboAssembler::LoadLogicalHalfWordP(Register dst, Register src) {
+void TurboAssembler::LoadU16(Register dst, Register src) {
 #if V8_TARGET_ARCH_S390X
   llghr(dst, src);
 #else
@@ -3762,7 +3628,7 @@ void TurboAssembler::LoadLogicalHalfWordP(Register dst, Register src) {
 #endif
 }
 
-void TurboAssembler::LoadB(Register dst, const MemOperand& mem) {
+void TurboAssembler::LoadS8(Register dst, const MemOperand& mem) {
 #if V8_TARGET_ARCH_S390X
   lgb(dst, mem);
 #else
@@ -3770,7 +3636,7 @@ void TurboAssembler::LoadB(Register dst, const MemOperand& mem) {
 #endif
 }
 
-void TurboAssembler::LoadB(Register dst, Register src) {
+void TurboAssembler::LoadS8(Register dst, Register src) {
 #if V8_TARGET_ARCH_S390X
   lgbr(dst, src);
 #else
@@ -3778,7 +3644,7 @@ void TurboAssembler::LoadB(Register dst, Register src) {
 #endif
 }
 
-void TurboAssembler::LoadlB(Register dst, const MemOperand& mem) {
+void TurboAssembler::LoadU8(Register dst, const MemOperand& mem) {
 #if V8_TARGET_ARCH_S390X
   llgc(dst, mem);
 #else
@@ -3786,7 +3652,7 @@ void TurboAssembler::LoadlB(Register dst, const MemOperand& mem) {
 #endif
 }
 
-void TurboAssembler::LoadlB(Register dst, Register src) {
+void TurboAssembler::LoadU8(Register dst, Register src) {
 #if V8_TARGET_ARCH_S390X
   llgcr(dst, src);
 #else
@@ -3797,13 +3663,13 @@ void TurboAssembler::LoadlB(Register dst, Register src) {
 void TurboAssembler::LoadLogicalReversedWordP(Register dst,
                                               const MemOperand& mem) {
   lrv(dst, mem);
-  LoadlW(dst, dst);
+  LoadU32(dst, dst);
 }
 
 void TurboAssembler::LoadLogicalReversedHalfWordP(Register dst,
                                                   const MemOperand& mem) {
   lrvh(dst, mem);
-  LoadLogicalHalfWordP(dst, dst);
+  LoadU16(dst, dst);
 }
 
 // Load And Test (Reg <- Reg)
@@ -3811,18 +3677,6 @@ void TurboAssembler::LoadAndTest32(Register dst, Register src) {
   ltr(dst, src);
 }
 
-// Load And Test
-//     (Register dst(ptr) = Register src (32 | 32->64))
-// src is treated as a 32-bit signed integer, which is sign extended to
-// 64-bit if necessary.
-void TurboAssembler::LoadAndTestP_ExtendSrc(Register dst, Register src) {
-#if V8_TARGET_ARCH_S390X
-  ltgfr(dst, src);
-#else
-  ltr(dst, src);
-#endif
-}
-
 // Load And Test Pointer Sized (Reg <- Reg)
 void TurboAssembler::LoadAndTestP(Register dst, Register src) {
 #if V8_TARGET_ARCH_S390X
@@ -3857,7 +3711,7 @@ void TurboAssembler::LoadOnConditionP(Condition cond, Register dst,
 }
 
 // Load Double Precision (64-bit) Floating Point number from memory
-void TurboAssembler::LoadDouble(DoubleRegister dst, const MemOperand& mem) {
+void TurboAssembler::LoadF64(DoubleRegister dst, const MemOperand& mem) {
   // for 32bit and 64bit we all use 64bit floating point regs
   if (is_uint12(mem.offset())) {
     ld(dst, mem);
@@ -3867,7 +3721,7 @@ void TurboAssembler::LoadDouble(DoubleRegister dst, const MemOperand& mem) {
 }
 
 // Load Single Precision (32-bit) Floating Point number from memory
-void TurboAssembler::LoadFloat32(DoubleRegister dst, const MemOperand& mem) {
+void TurboAssembler::LoadF32(DoubleRegister dst, const MemOperand& mem) {
   if (is_uint12(mem.offset())) {
     le_z(dst, mem);
   } else {
@@ -3876,16 +3730,8 @@ void TurboAssembler::LoadFloat32(DoubleRegister dst, const MemOperand& mem) {
   }
 }
 
-// Load Single Precision (32-bit) Floating Point number from memory,
-// and convert to Double Precision (64-bit)
-void TurboAssembler::LoadFloat32ConvertToDouble(DoubleRegister dst,
-                                                const MemOperand& mem) {
-  LoadFloat32(dst, mem);
-  ldebr(dst, dst);
-}
-
-void TurboAssembler::LoadSimd128(Simd128Register dst, const MemOperand& mem,
-                                 Register scratch) {
+void TurboAssembler::LoadV128(Simd128Register dst, const MemOperand& mem,
+                              Register scratch) {
   if (is_uint12(mem.offset())) {
     vl(dst, mem, Condition(0));
   } else {
@@ -3896,7 +3742,7 @@ void TurboAssembler::LoadSimd128(Simd128Register dst, const MemOperand& mem,
 }
 
 // Store Double Precision (64-bit) Floating Point number to memory
-void TurboAssembler::StoreDouble(DoubleRegister dst, const MemOperand& mem) {
+void TurboAssembler::StoreF64(DoubleRegister dst, const MemOperand& mem) {
   if (is_uint12(mem.offset())) {
     std(dst, mem);
   } else {
@@ -3905,7 +3751,7 @@ void TurboAssembler::StoreDouble(DoubleRegister dst, const MemOperand& mem) {
 }
 
 // Store Single Precision (32-bit) Floating Point number to memory
-void TurboAssembler::StoreFloat32(DoubleRegister src, const MemOperand& mem) {
+void TurboAssembler::StoreF32(DoubleRegister src, const MemOperand& mem) {
   if (is_uint12(mem.offset())) {
     ste(src, mem);
   } else {
@@ -3913,17 +3759,8 @@ void TurboAssembler::StoreFloat32(DoubleRegister src, const MemOperand& mem) {
   }
 }
 
-// Convert Double precision (64-bit) to Single Precision (32-bit)
-// and store resulting Float32 to memory
-void TurboAssembler::StoreDoubleAsFloat32(DoubleRegister src,
-                                          const MemOperand& mem,
-                                          DoubleRegister scratch) {
-  ledbr(scratch, src);
-  StoreFloat32(scratch, mem);
-}
-
-void TurboAssembler::StoreSimd128(Simd128Register src, const MemOperand& mem,
-                                  Register scratch) {
+void TurboAssembler::StoreV128(Simd128Register src, const MemOperand& mem,
+                               Register scratch) {
   if (is_uint12(mem.offset())) {
     vst(src, mem, Condition(0));
   } else {
@@ -4013,9 +3850,8 @@ void TurboAssembler::DivFloat64(DoubleRegister dst, const MemOperand& opnd,
   }
 }
 
-void TurboAssembler::LoadFloat32ToDouble(DoubleRegister dst,
-                                         const MemOperand& opnd,
-                                         DoubleRegister scratch) {
+void TurboAssembler::LoadF32AsF64(DoubleRegister dst, const MemOperand& opnd,
+                                  DoubleRegister scratch) {
   if (is_uint12(opnd.offset())) {
     ldeb(dst, opnd);
   } else {
@@ -4026,8 +3862,8 @@ void TurboAssembler::LoadFloat32ToDouble(DoubleRegister dst,
 
 // Variable length depending on whether offset fits into immediate field
 // MemOperand of RX or RXY format
-void TurboAssembler::StoreW(Register src, const MemOperand& mem,
-                            Register scratch) {
+void TurboAssembler::StoreU32(Register src, const MemOperand& mem,
+                              Register scratch) {
   Register base = mem.rb();
   int offset = mem.offset();
 
@@ -4042,7 +3878,7 @@ void TurboAssembler::StoreW(Register src, const MemOperand& mem,
     use_RXYform = true;
   } else if (scratch != no_reg) {
     // Materialize offset into scratch register.
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
   } else {
     // scratch is no_reg
     DCHECK(false);
@@ -4053,11 +3889,11 @@ void TurboAssembler::StoreW(Register src, const MemOperand& mem,
   } else if (use_RXYform) {
     sty(src, mem);
   } else {
-    StoreW(src, MemOperand(base, scratch));
+    StoreU32(src, MemOperand(base, scratch));
   }
 }
 
-void TurboAssembler::LoadHalfWordP(Register dst, Register src) {
+void TurboAssembler::LoadS16(Register dst, Register src) {
 #if V8_TARGET_ARCH_S390X
   lghr(dst, src);
 #else
@@ -4067,14 +3903,14 @@ void TurboAssembler::LoadHalfWordP(Register dst, Register src) {
 
 // Loads 16-bits half-word value from memory and sign extends to pointer
 // sized register
-void TurboAssembler::LoadHalfWordP(Register dst, const MemOperand& mem,
+void TurboAssembler::LoadS16(Register dst, const MemOperand& mem,
                                    Register scratch) {
   Register base = mem.rb();
   int offset = mem.offset();
 
   if (!is_int20(offset)) {
     DCHECK(scratch != no_reg);
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
 #if V8_TARGET_ARCH_S390X
     lgh(dst, MemOperand(base, scratch));
 #else
@@ -4095,8 +3931,8 @@ void TurboAssembler::LoadHalfWordP(Register dst, const MemOperand& mem,
 
 // Variable length depending on whether offset fits into immediate field
 // MemOperand current only supports d-form
-void TurboAssembler::StoreHalfWord(Register src, const MemOperand& mem,
-                                   Register scratch) {
+void TurboAssembler::StoreU16(Register src, const MemOperand& mem,
+                              Register scratch) {
   Register base = mem.rb();
   int offset = mem.offset();
 
@@ -4106,15 +3942,15 @@ void TurboAssembler::StoreHalfWord(Register src, const MemOperand& mem,
     sthy(src, mem);
   } else {
     DCHECK(scratch != no_reg);
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
     sth(src, MemOperand(base, scratch));
   }
 }
 
 // Variable length depending on whether offset fits into immediate field
 // MemOperand current only supports d-form
-void TurboAssembler::StoreByte(Register src, const MemOperand& mem,
-                               Register scratch) {
+void TurboAssembler::StoreU8(Register src, const MemOperand& mem,
+                             Register scratch) {
   Register base = mem.rb();
   int offset = mem.offset();
 
@@ -4124,114 +3960,106 @@ void TurboAssembler::StoreByte(Register src, const MemOperand& mem,
     stcy(src, mem);
   } else {
     DCHECK(scratch != no_reg);
-    LoadIntLiteral(scratch, offset);
+    mov(scratch, Operand(offset));
     stc(src, MemOperand(base, scratch));
   }
 }
 
 // Shift left logical for 32-bit integer types.
-void TurboAssembler::ShiftLeft(Register dst, Register src, const Operand& val) {
-  if (dst == src) {
-    sll(dst, val);
-  } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    sllk(dst, src, val);
-  } else {
-    lr(dst, src);
-    sll(dst, val);
-  }
+void TurboAssembler::ShiftLeftU32(Register dst, Register src,
+                                  const Operand& val) {
+  ShiftLeftU32(dst, src, r0, val);
 }
 
 // Shift left logical for 32-bit integer types.
-void TurboAssembler::ShiftLeft(Register dst, Register src, Register val) {
+void TurboAssembler::ShiftLeftU32(Register dst, Register src, Register val,
+                                  const Operand& val2) {
   if (dst == src) {
-    sll(dst, val);
+    sll(dst, val, val2);
   } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    sllk(dst, src, val);
+    sllk(dst, src, val, val2);
   } else {
-    DCHECK(dst != val);  // The lr/sll path clobbers val.
+    DCHECK(dst != val || val == r0);  // The lr/sll path clobbers val.
     lr(dst, src);
-    sll(dst, val);
+    sll(dst, val, val2);
   }
 }
 
+// Shift left logical for 32-bit integer types.
+void TurboAssembler::ShiftLeftU64(Register dst, Register src,
+                                  const Operand& val) {
+  ShiftLeftU64(dst, src, r0, val);
+}
+
+// Shift left logical for 32-bit integer types.
+void TurboAssembler::ShiftLeftU64(Register dst, Register src, Register val,
+                                  const Operand& val2) {
+  sllg(dst, src, val, val2);
+}
+
 // Shift right logical for 32-bit integer types.
-void TurboAssembler::ShiftRight(Register dst, Register src,
-                                const Operand& val) {
-  if (dst == src) {
-    srl(dst, val);
-  } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    srlk(dst, src, val);
-  } else {
-    lr(dst, src);
-    srl(dst, val);
-  }
+void TurboAssembler::ShiftRightU32(Register dst, Register src,
+                                   const Operand& val) {
+  ShiftRightU32(dst, src, r0, val);
 }
 
 // Shift right logical for 32-bit integer types.
-void TurboAssembler::ShiftRight(Register dst, Register src, Register val) {
+void TurboAssembler::ShiftRightU32(Register dst, Register src, Register val,
+                                   const Operand& val2) {
   if (dst == src) {
-    srl(dst, val);
+    srl(dst, val, val2);
   } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    srlk(dst, src, val);
+    srlk(dst, src, val, val2);
   } else {
-    DCHECK(dst != val);  // The lr/srl path clobbers val.
+    DCHECK(dst != val || val == r0);  // The lr/srl path clobbers val.
     lr(dst, src);
-    srl(dst, val);
+    srl(dst, val, val2);
   }
 }
 
-// Shift left arithmetic for 32-bit integer types.
-void TurboAssembler::ShiftLeftArith(Register dst, Register src,
-                                    const Operand& val) {
-  if (dst == src) {
-    sla(dst, val);
-  } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    slak(dst, src, val);
-  } else {
-    lr(dst, src);
-    sla(dst, val);
-  }
+void TurboAssembler::ShiftRightU64(Register dst, Register src, Register val,
+                                   const Operand& val2) {
+  srlg(dst, src, val, val2);
 }
 
-// Shift left arithmetic for 32-bit integer types.
-void TurboAssembler::ShiftLeftArith(Register dst, Register src, Register val) {
-  if (dst == src) {
-    sla(dst, val);
-  } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    slak(dst, src, val);
-  } else {
-    DCHECK(dst != val);  // The lr/sla path clobbers val.
-    lr(dst, src);
-    sla(dst, val);
-  }
+// Shift right logical for 64-bit integer types.
+void TurboAssembler::ShiftRightU64(Register dst, Register src,
+                                   const Operand& val) {
+  ShiftRightU64(dst, src, r0, val);
 }
 
 // Shift right arithmetic for 32-bit integer types.
-void TurboAssembler::ShiftRightArith(Register dst, Register src,
-                                     const Operand& val) {
-  if (dst == src) {
-    sra(dst, val);
-  } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    srak(dst, src, val);
-  } else {
-    lr(dst, src);
-    sra(dst, val);
-  }
+void TurboAssembler::ShiftRightS32(Register dst, Register src,
+                                   const Operand& val) {
+  ShiftRightS32(dst, src, r0, val);
 }
 
 // Shift right arithmetic for 32-bit integer types.
-void TurboAssembler::ShiftRightArith(Register dst, Register src, Register val) {
+void TurboAssembler::ShiftRightS32(Register dst, Register src, Register val,
+                                   const Operand& val2) {
   if (dst == src) {
-    sra(dst, val);
+    sra(dst, val, val2);
   } else if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-    srak(dst, src, val);
+    srak(dst, src, val, val2);
   } else {
-    DCHECK(dst != val);  // The lr/sra path clobbers val.
+    DCHECK(dst != val || val == r0);  // The lr/sra path clobbers val.
     lr(dst, src);
-    sra(dst, val);
+    sra(dst, val, val2);
   }
 }
 
+// Shift right arithmetic for 64-bit integer types.
+void TurboAssembler::ShiftRightS64(Register dst, Register src,
+                                   const Operand& val) {
+  ShiftRightS64(dst, src, r0, val);
+}
+
+// Shift right arithmetic for 64-bit integer types.
+void TurboAssembler::ShiftRightS64(Register dst, Register src, Register val,
+                                   const Operand& val2) {
+  srag(dst, src, val, val2);
+}
+
 // Clear right most # of bits
 void TurboAssembler::ClearRightImm(Register dst, Register src,
                                    const Operand& val) {
@@ -4248,7 +4076,7 @@ void TurboAssembler::ClearRightImm(Register dst, Register src,
   uint64_t hexMask = ~((1L << numBitsToClear) - 1);
 
   // S390 AND instr clobbers source.  Make a copy if necessary
-  if (dst != src) LoadRR(dst, src);
+  if (dst != src) mov(dst, src);
 
   if (numBitsToClear <= 16) {
     nill(dst, Operand(static_cast<uint16_t>(hexMask)));
@@ -4265,9 +4093,9 @@ void TurboAssembler::Popcnt32(Register dst, Register src) {
   DCHECK(dst != r0);
 
   popcnt(dst, src);
-  ShiftRight(r0, dst, Operand(16));
+  ShiftRightU32(r0, dst, Operand(16));
   ar(dst, r0);
-  ShiftRight(r0, dst, Operand(8));
+  ShiftRightU32(r0, dst, Operand(8));
   ar(dst, r0);
   llgcr(dst, dst);
 }
@@ -4278,31 +4106,31 @@ void TurboAssembler::Popcnt64(Register dst, Register src) {
   DCHECK(dst != r0);
 
   popcnt(dst, src);
-  ShiftRightP(r0, dst, Operand(32));
-  AddP(dst, r0);
-  ShiftRightP(r0, dst, Operand(16));
-  AddP(dst, r0);
-  ShiftRightP(r0, dst, Operand(8));
-  AddP(dst, r0);
-  LoadlB(dst, dst);
+  ShiftRightU64(r0, dst, Operand(32));
+  AddS64(dst, r0);
+  ShiftRightU64(r0, dst, Operand(16));
+  AddS64(dst, r0);
+  ShiftRightU64(r0, dst, Operand(8));
+  AddS64(dst, r0);
+  LoadU8(dst, dst);
 }
 #endif
 
 void TurboAssembler::SwapP(Register src, Register dst, Register scratch) {
   if (src == dst) return;
   DCHECK(!AreAliased(src, dst, scratch));
-  LoadRR(scratch, src);
-  LoadRR(src, dst);
-  LoadRR(dst, scratch);
+  mov(scratch, src);
+  mov(src, dst);
+  mov(dst, scratch);
 }
 
 void TurboAssembler::SwapP(Register src, MemOperand dst, Register scratch) {
   if (dst.rx() != r0) DCHECK(!AreAliased(src, dst.rx(), scratch));
   if (dst.rb() != r0) DCHECK(!AreAliased(src, dst.rb(), scratch));
   DCHECK(!AreAliased(src, scratch));
-  LoadRR(scratch, src);
-  LoadP(src, dst);
-  StoreP(scratch, dst);
+  mov(scratch, src);
+  LoadU64(src, dst);
+  StoreU64(scratch, dst);
 }
 
 void TurboAssembler::SwapP(MemOperand src, MemOperand dst, Register scratch_0,
@@ -4312,10 +4140,10 @@ void TurboAssembler::SwapP(MemOperand src, MemOperand dst, Register scratch_0,
   if (dst.rx() != r0) DCHECK(!AreAliased(dst.rx(), scratch_0, scratch_1));
   if (dst.rb() != r0) DCHECK(!AreAliased(dst.rb(), scratch_0, scratch_1));
   DCHECK(!AreAliased(scratch_0, scratch_1));
-  LoadP(scratch_0, src);
-  LoadP(scratch_1, dst);
-  StoreP(scratch_0, dst);
-  StoreP(scratch_1, src);
+  LoadU64(scratch_0, src);
+  LoadU64(scratch_1, dst);
+  StoreU64(scratch_0, dst);
+  StoreU64(scratch_1, src);
 }
 
 void TurboAssembler::SwapFloat32(DoubleRegister src, DoubleRegister dst,
@@ -4331,21 +4159,21 @@ void TurboAssembler::SwapFloat32(DoubleRegister src, MemOperand dst,
                                  DoubleRegister scratch) {
   DCHECK(!AreAliased(src, scratch));
   ldr(scratch, src);
-  LoadFloat32(src, dst);
-  StoreFloat32(scratch, dst);
+  LoadF32(src, dst);
+  StoreF32(scratch, dst);
 }
 
 void TurboAssembler::SwapFloat32(MemOperand src, MemOperand dst,
                                  DoubleRegister scratch) {
   // push d0, to be used as scratch
   lay(sp, MemOperand(sp, -kDoubleSize));
-  StoreDouble(d0, MemOperand(sp));
-  LoadFloat32(scratch, src);
-  LoadFloat32(d0, dst);
-  StoreFloat32(scratch, dst);
-  StoreFloat32(d0, src);
+  StoreF64(d0, MemOperand(sp));
+  LoadF32(scratch, src);
+  LoadF32(d0, dst);
+  StoreF32(scratch, dst);
+  StoreF32(d0, src);
   // restore d0
-  LoadDouble(d0, MemOperand(sp));
+  LoadF64(d0, MemOperand(sp));
   lay(sp, MemOperand(sp, kDoubleSize));
 }
 
@@ -4362,21 +4190,21 @@ void TurboAssembler::SwapDouble(DoubleRegister src, MemOperand dst,
                                 DoubleRegister scratch) {
   DCHECK(!AreAliased(src, scratch));
   ldr(scratch, src);
-  LoadDouble(src, dst);
-  StoreDouble(scratch, dst);
+  LoadF64(src, dst);
+  StoreF64(scratch, dst);
 }
 
 void TurboAssembler::SwapDouble(MemOperand src, MemOperand dst,
                                 DoubleRegister scratch) {
   // push d0, to be used as scratch
   lay(sp, MemOperand(sp, -kDoubleSize));
-  StoreDouble(d0, MemOperand(sp));
-  LoadDouble(scratch, src);
-  LoadDouble(d0, dst);
-  StoreDouble(scratch, dst);
-  StoreDouble(d0, src);
+  StoreF64(d0, MemOperand(sp));
+  LoadF64(scratch, src);
+  LoadF64(d0, dst);
+  StoreF64(scratch, dst);
+  StoreF64(d0, src);
   // restore d0
-  LoadDouble(d0, MemOperand(sp));
+  LoadF64(d0, MemOperand(sp));
   lay(sp, MemOperand(sp, kDoubleSize));
 }
 
@@ -4392,21 +4220,21 @@ void TurboAssembler::SwapSimd128(Simd128Register src, MemOperand dst,
                                  Simd128Register scratch) {
   DCHECK(!AreAliased(src, scratch));
   vlr(scratch, src, Condition(0), Condition(0), Condition(0));
-  LoadSimd128(src, dst, ip);
-  StoreSimd128(scratch, dst, ip);
+  LoadV128(src, dst, ip);
+  StoreV128(scratch, dst, ip);
 }
 
 void TurboAssembler::SwapSimd128(MemOperand src, MemOperand dst,
                                  Simd128Register scratch) {
   // push d0, to be used as scratch
   lay(sp, MemOperand(sp, -kSimd128Size));
-  StoreSimd128(d0, MemOperand(sp), ip);
-  LoadSimd128(scratch, src, ip);
-  LoadSimd128(d0, dst, ip);
-  StoreSimd128(scratch, dst, ip);
-  StoreSimd128(d0, src, ip);
+  StoreV128(d0, MemOperand(sp), ip);
+  LoadV128(scratch, src, ip);
+  LoadV128(d0, dst, ip);
+  StoreV128(scratch, dst, ip);
+  StoreV128(d0, src, ip);
   // restore d0
-  LoadSimd128(d0, MemOperand(sp), ip);
+  LoadV128(d0, MemOperand(sp), ip);
   lay(sp, MemOperand(sp, kSimd128Size));
 }
 
@@ -4425,12 +4253,12 @@ void TurboAssembler::LoadPC(Register dst) {
 }
 
 void TurboAssembler::JumpIfEqual(Register x, int32_t y, Label* dest) {
-  Cmp32(x, Operand(y));
+  CmpS32(x, Operand(y));
   beq(dest);
 }
 
 void TurboAssembler::JumpIfLessThan(Register x, int32_t y, Label* dest) {
-  Cmp32(x, Operand(y));
+  CmpS32(x, Operand(y));
   blt(dest);
 }
 
@@ -4440,15 +4268,15 @@ void TurboAssembler::LoadEntryFromBuiltinIndex(Register builtin_index) {
   STATIC_ASSERT(kSmiTag == 0);
   // The builtin_index register contains the builtin index as a Smi.
   if (SmiValuesAre32Bits()) {
-    ShiftRightArithP(builtin_index, builtin_index,
-                     Operand(kSmiShift - kSystemPointerSizeLog2));
+    ShiftRightS64(builtin_index, builtin_index,
+                  Operand(kSmiShift - kSystemPointerSizeLog2));
   } else {
     DCHECK(SmiValuesAre31Bits());
-    ShiftLeftP(builtin_index, builtin_index,
-               Operand(kSystemPointerSizeLog2 - kSmiShift));
+    ShiftLeftU64(builtin_index, builtin_index,
+                 Operand(kSystemPointerSizeLog2 - kSmiShift));
   }
-  LoadP(builtin_index, MemOperand(kRootRegister, builtin_index,
-                                  IsolateData::builtin_entry_table_offset()));
+  LoadU64(builtin_index, MemOperand(kRootRegister, builtin_index,
+                                    IsolateData::builtin_entry_table_offset()));
 }
 
 void TurboAssembler::CallBuiltinByIndex(Register builtin_index) {
@@ -4479,27 +4307,29 @@ void TurboAssembler::LoadCodeObjectEntry(Register destination,
     // Check whether the Code object is an off-heap trampoline. If so, call its
     // (off-heap) entry point directly without going through the (on-heap)
     // trampoline.  Otherwise, just call the Code object as always.
-    LoadW(scratch, FieldMemOperand(code_object, Code::kFlagsOffset));
+    LoadS32(scratch, FieldMemOperand(code_object, Code::kFlagsOffset));
     tmlh(scratch, Operand(Code::IsOffHeapTrampoline::kMask >> 16));
     bne(&if_code_is_off_heap);
 
     // Not an off-heap trampoline, the entry point is at
     // Code::raw_instruction_start().
-    AddP(destination, code_object, Operand(Code::kHeaderSize - kHeapObjectTag));
+    AddS64(destination, code_object,
+           Operand(Code::kHeaderSize - kHeapObjectTag));
     b(&out);
 
     // An off-heap trampoline, the entry point is loaded from the builtin entry
     // table.
     bind(&if_code_is_off_heap);
-    LoadW(scratch, FieldMemOperand(code_object, Code::kBuiltinIndexOffset));
-    ShiftLeftP(destination, scratch, Operand(kSystemPointerSizeLog2));
-    AddP(destination, destination, kRootRegister);
-    LoadP(destination,
-          MemOperand(destination, IsolateData::builtin_entry_table_offset()));
+    LoadS32(scratch, FieldMemOperand(code_object, Code::kBuiltinIndexOffset));
+    ShiftLeftU64(destination, scratch, Operand(kSystemPointerSizeLog2));
+    AddS64(destination, destination, kRootRegister);
+    LoadU64(destination,
+            MemOperand(destination, IsolateData::builtin_entry_table_offset()));
 
     bind(&out);
   } else {
-    AddP(destination, code_object, Operand(Code::kHeaderSize - kHeapObjectTag));
+    AddS64(destination, code_object,
+           Operand(Code::kHeaderSize - kHeapObjectTag));
   }
 }
 
@@ -4523,7 +4353,7 @@ void TurboAssembler::StoreReturnAddressAndCall(Register target) {
 
   Label return_label;
   larl(r14, &return_label);  // Generate the return addr of call later.
-  StoreP(r14, MemOperand(sp, kStackFrameRASlot * kSystemPointerSize));
+  StoreU64(r14, MemOperand(sp, kStackFrameRASlot * kSystemPointerSize));
 
   // zLinux ABI requires caller's frame to have sufficient space for callee
   // preserved regsiter save area.
@@ -4533,15 +4363,19 @@ void TurboAssembler::StoreReturnAddressAndCall(Register target) {
 
 void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
                                            Label* exit, DeoptimizeKind kind,
-                                           Label*) {
-  LoadP(ip, MemOperand(kRootRegister,
-                       IsolateData::builtin_entry_slot_offset(target)));
+                                           Label* ret, Label*) {
+  LoadU64(ip, MemOperand(kRootRegister,
+                         IsolateData::builtin_entry_slot_offset(target)));
   Call(ip);
   DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    bc_long(Condition::al, ret);
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+  }
 }
 
 void TurboAssembler::Trap() { stop(); }
diff --git a/deps/v8/src/codegen/s390/macro-assembler-s390.h b/deps/v8/src/codegen/s390/macro-assembler-s390.h
index f81dfb503b17a3..c71f072795164d 100644
--- a/deps/v8/src/codegen/s390/macro-assembler-s390.h
+++ b/deps/v8/src/codegen/s390/macro-assembler-s390.h
@@ -17,6 +17,8 @@
 namespace v8 {
 namespace internal {
 
+enum class StackLimitKind { kInterruptStackLimit, kRealStackLimit };
+
 // ----------------------------------------------------------------------------
 // Static helper functions
 
@@ -40,94 +42,18 @@ Register GetRegisterThatIsNotOneOf(Register reg1, Register reg2 = no_reg,
                                    Register reg5 = no_reg,
                                    Register reg6 = no_reg);
 
-// These exist to provide portability between 32 and 64bit
-#if V8_TARGET_ARCH_S390X
-
-// The length of the arithmetic operation is the length
-// of the register.
-
-// Length:
-// H = halfword
-// W = word
-
-// arithmetics and bitwise
-#define AddMI agsi
-#define AddRR agr
-#define SubRR sgr
-#define AndRR ngr
-#define OrRR ogr
-#define XorRR xgr
-#define LoadComplementRR lcgr
-#define LoadNegativeRR lngr
-
-// Distinct Operands
-#define AddP_RRR agrk
-#define AddPImm_RRI aghik
-#define AddLogicalP_RRR algrk
-#define SubP_RRR sgrk
-#define SubLogicalP_RRR slgrk
-#define AndP_RRR ngrk
-#define OrP_RRR ogrk
-#define XorP_RRR xgrk
-
-// Load / Store
-#define LoadRR lgr
-#define LoadAndTestRR ltgr
-#define LoadImmP lghi
-
-// Compare
-#define CmpPH cghi
-#define CmpLogicalPW clgfi
-
-// Shifts
-#define ShiftLeftP sllg
-#define ShiftRightP srlg
-#define ShiftLeftArithP slag
-#define ShiftRightArithP srag
-#else
-
-// arithmetics and bitwise
-// Reg2Reg
-#define AddMI asi
-#define AddRR ar
-#define SubRR sr
-#define AndRR nr
-#define OrRR or_z
-#define XorRR xr
-#define LoadComplementRR lcr
-#define LoadNegativeRR lnr
-
-// Distinct Operands
-#define AddP_RRR ark
-#define AddPImm_RRI ahik
-#define AddLogicalP_RRR alrk
-#define SubP_RRR srk
-#define SubLogicalP_RRR slrk
-#define AndP_RRR nrk
-#define OrP_RRR ork
-#define XorP_RRR xrk
-
-// Load / Store
-#define LoadRR lr
-#define LoadAndTestRR ltr
-#define LoadImmP lhi
-
-// Compare
-#define CmpPH chi
-#define CmpLogicalPW clfi
-
-// Shifts
-#define ShiftLeftP ShiftLeft
-#define ShiftRightP ShiftRight
-#define ShiftLeftArithP ShiftLeftArith
-#define ShiftRightArithP ShiftRightArith
-
-#endif
-
 class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
  public:
   using TurboAssemblerBase::TurboAssemblerBase;
 
+  void DoubleMax(DoubleRegister result_reg, DoubleRegister left_reg,
+                 DoubleRegister right_reg);
+  void DoubleMin(DoubleRegister result_reg, DoubleRegister left_reg,
+                 DoubleRegister right_reg);
+  void FloatMax(DoubleRegister result_reg, DoubleRegister left_reg,
+                DoubleRegister right_reg);
+  void FloatMin(DoubleRegister result_reg, DoubleRegister left_reg,
+                DoubleRegister right_reg);
   void LoadFromConstantsTable(Register destination,
                               int constant_index) override;
   void LoadRootRegisterOffset(Register destination, intptr_t offset) override;
@@ -146,6 +72,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void JumpIfEqual(Register x, int32_t y, Label* dest);
   void JumpIfLessThan(Register x, int32_t y, Label* dest);
 
+  void LoadMap(Register destination, Register object);
+
   void Call(Register target);
   void Call(Address target, RelocInfo::Mode rmode, Condition cond = al);
   void Call(Handle<Code> code, RelocInfo::Mode rmode = RelocInfo::CODE_TARGET,
@@ -154,7 +82,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void Ret(Condition cond) { b(cond, r14); }
 
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   // Emit code to discard a non-negative number of pointer-sized elements
@@ -249,89 +177,100 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   // Arithmetic Operations
 
   // Add (Register - Immediate)
-  void Add32(Register dst, const Operand& imm);
-  void Add32_RI(Register dst, const Operand& imm);
-  void AddP(Register dst, const Operand& imm);
-  void Add32(Register dst, Register src, const Operand& imm);
-  void Add32_RRI(Register dst, Register src, const Operand& imm);
-  void AddP(Register dst, Register src, const Operand& imm);
+  void AddS32(Register dst, const Operand& imm);
+  void AddS64(Register dst, const Operand& imm);
+  void AddS32(Register dst, Register src, const Operand& imm);
+  void AddS64(Register dst, Register src, const Operand& imm);
 
   // Add (Register - Register)
-  void Add32(Register dst, Register src);
-  void AddP(Register dst, Register src);
-  void AddP_ExtendSrc(Register dst, Register src);
-  void Add32(Register dst, Register src1, Register src2);
-  void AddP(Register dst, Register src1, Register src2);
-  void AddP_ExtendSrc(Register dst, Register src1, Register src2);
+  void AddS32(Register dst, Register src);
+  void AddS64(Register dst, Register src);
+  void AddS32(Register dst, Register src1, Register src2);
+  void AddS64(Register dst, Register src1, Register src2);
 
   // Add (Register - Mem)
-  void Add32(Register dst, const MemOperand& opnd);
-  void AddP(Register dst, const MemOperand& opnd);
-  void AddP_ExtendSrc(Register dst, const MemOperand& opnd);
+  void AddS32(Register dst, const MemOperand& opnd);
+  void AddS64(Register dst, const MemOperand& opnd);
 
   // Add (Mem - Immediate)
-  void Add32(const MemOperand& opnd, const Operand& imm);
-  void AddP(const MemOperand& opnd, const Operand& imm);
+  void AddS32(const MemOperand& opnd, const Operand& imm);
+  void AddS64(const MemOperand& opnd, const Operand& imm);
 
   // Add Logical (Register - Register)
-  void AddLogical32(Register dst, Register src1, Register src2);
-
-  // Add Logical With Carry (Register - Register)
-  void AddLogicalWithCarry32(Register dst, Register src1, Register src2);
+  void AddU32(Register dst, Register src1, Register src2);
 
   // Add Logical (Register - Immediate)
-  void AddLogical(Register dst, const Operand& imm);
-  void AddLogicalP(Register dst, const Operand& imm);
+  void AddU32(Register dst, const Operand& imm);
+  void AddU64(Register dst, const Operand& imm);
 
   // Add Logical (Register - Mem)
-  void AddLogical(Register dst, const MemOperand& opnd);
-  void AddLogicalP(Register dst, const MemOperand& opnd);
+  void AddU32(Register dst, const MemOperand& opnd);
+  void AddU64(Register dst, const MemOperand& opnd);
 
   // Subtract (Register - Immediate)
-  void Sub32(Register dst, const Operand& imm);
-  void Sub32_RI(Register dst, const Operand& imm) { Sub32(dst, imm); }
-  void SubP(Register dst, const Operand& imm);
-  void Sub32(Register dst, Register src, const Operand& imm);
-  void Sub32_RRI(Register dst, Register src, const Operand& imm) {
-    Sub32(dst, src, imm);
-  }
-  void SubP(Register dst, Register src, const Operand& imm);
+  void SubS32(Register dst, const Operand& imm);
+  void SubS64(Register dst, const Operand& imm);
+  void SubS32(Register dst, Register src, const Operand& imm);
+  void SubS64(Register dst, Register src, const Operand& imm);
 
   // Subtract (Register - Register)
-  void Sub32(Register dst, Register src);
-  void SubP(Register dst, Register src);
-  void SubP_ExtendSrc(Register dst, Register src);
-  void Sub32(Register dst, Register src1, Register src2);
-  void SubP(Register dst, Register src1, Register src2);
-  void SubP_ExtendSrc(Register dst, Register src1, Register src2);
+  void SubS32(Register dst, Register src);
+  void SubS64(Register dst, Register src);
+  void SubS32(Register dst, Register src1, Register src2);
+  void SubS64(Register dst, Register src1, Register src2);
 
   // Subtract (Register - Mem)
-  void Sub32(Register dst, const MemOperand& opnd);
-  void SubP(Register dst, const MemOperand& opnd);
-  void SubP_ExtendSrc(Register dst, const MemOperand& opnd);
+  void SubS32(Register dst, const MemOperand& opnd);
+  void SubS64(Register dst, const MemOperand& opnd);
   void LoadAndSub32(Register dst, Register src, const MemOperand& opnd);
   void LoadAndSub64(Register dst, Register src, const MemOperand& opnd);
 
   // Subtract Logical (Register - Mem)
-  void SubLogical(Register dst, const MemOperand& opnd);
-  void SubLogicalP(Register dst, const MemOperand& opnd);
-  void SubLogicalP_ExtendSrc(Register dst, const MemOperand& opnd);
+  void SubU32(Register dst, const MemOperand& opnd);
+  void SubU64(Register dst, const MemOperand& opnd);
   // Subtract Logical 32-bit
-  void SubLogical32(Register dst, Register src1, Register src2);
-  // Subtract Logical With Borrow 32-bit
-  void SubLogicalWithBorrow32(Register dst, Register src1, Register src2);
+  void SubU32(Register dst, Register src1, Register src2);
 
   // Multiply
-  void MulP(Register dst, const Operand& opnd);
-  void MulP(Register dst, Register src);
-  void MulP(Register dst, const MemOperand& opnd);
-  void Mul(Register dst, Register src1, Register src2);
-  void Mul32(Register dst, const MemOperand& src1);
-  void Mul32(Register dst, Register src1);
-  void Mul32(Register dst, const Operand& src1);
-  void MulHigh32(Register dst, Register src1, const MemOperand& src2);
-  void MulHigh32(Register dst, Register src1, Register src2);
-  void MulHigh32(Register dst, Register src1, const Operand& src2);
+  void MulS64(Register dst, const Operand& opnd);
+  void MulS64(Register dst, Register src);
+  void MulS64(Register dst, const MemOperand& opnd);
+  void MulS64(Register dst, Register src1, Register src2) {
+    if (CpuFeatures::IsSupported(MISC_INSTR_EXT2)) {
+      msgrkc(dst, src1, src2);
+    } else {
+      if (dst == src2) {
+        MulS64(dst, src1);
+      } else if (dst == src1) {
+        MulS64(dst, src2);
+      } else {
+        mov(dst, src1);
+        MulS64(dst, src2);
+      }
+    }
+  }
+
+  void MulS32(Register dst, const MemOperand& src1);
+  void MulS32(Register dst, Register src1);
+  void MulS32(Register dst, const Operand& src1);
+  void MulS32(Register dst, Register src1, Register src2) {
+    if (CpuFeatures::IsSupported(MISC_INSTR_EXT2)) {
+      msrkc(dst, src1, src2);
+    } else {
+      if (dst == src2) {
+        MulS32(dst, src1);
+      } else if (dst == src1) {
+        MulS32(dst, src2);
+      } else {
+        mov(dst, src1);
+        MulS32(dst, src2);
+      }
+    }
+  }
+
+  void MulHighS32(Register dst, Register src1, const MemOperand& src2);
+  void MulHighS32(Register dst, Register src1, Register src2);
+  void MulHighS32(Register dst, Register src1, const Operand& src2);
   void MulHighU32(Register dst, Register src1, const MemOperand& src2);
   void MulHighU32(Register dst, Register src1, Register src2);
   void MulHighU32(Register dst, Register src1, const Operand& src2);
@@ -340,29 +279,23 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void Mul32WithOverflowIfCCUnequal(Register dst, Register src1, Register src2);
   void Mul32WithOverflowIfCCUnequal(Register dst, Register src1,
                                     const Operand& src2);
-  void Mul64(Register dst, const MemOperand& src1);
-  void Mul64(Register dst, Register src1);
-  void Mul64(Register dst, const Operand& src1);
-  void MulPWithCondition(Register dst, Register src1, Register src2);
-
   // Divide
-  void DivP(Register dividend, Register divider);
-  void Div32(Register dst, Register src1, const MemOperand& src2);
-  void Div32(Register dst, Register src1, Register src2);
+  void DivS32(Register dst, Register src1, const MemOperand& src2);
+  void DivS32(Register dst, Register src1, Register src2);
   void DivU32(Register dst, Register src1, const MemOperand& src2);
   void DivU32(Register dst, Register src1, Register src2);
-  void Div64(Register dst, Register src1, const MemOperand& src2);
-  void Div64(Register dst, Register src1, Register src2);
+  void DivS64(Register dst, Register src1, const MemOperand& src2);
+  void DivS64(Register dst, Register src1, Register src2);
   void DivU64(Register dst, Register src1, const MemOperand& src2);
   void DivU64(Register dst, Register src1, Register src2);
 
   // Mod
-  void Mod32(Register dst, Register src1, const MemOperand& src2);
-  void Mod32(Register dst, Register src1, Register src2);
+  void ModS32(Register dst, Register src1, const MemOperand& src2);
+  void ModS32(Register dst, Register src1, Register src2);
   void ModU32(Register dst, Register src1, const MemOperand& src2);
   void ModU32(Register dst, Register src1, Register src2);
-  void Mod64(Register dst, Register src1, const MemOperand& src2);
-  void Mod64(Register dst, Register src1, Register src2);
+  void ModS64(Register dst, Register src1, const MemOperand& src2);
+  void ModS64(Register dst, Register src1, Register src2);
   void ModU64(Register dst, Register src1, const MemOperand& src2);
   void ModU64(Register dst, Register src1, Register src2);
 
@@ -371,57 +304,54 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void Sqrt(DoubleRegister result, const MemOperand& input);
 
   // Compare
-  void Cmp32(Register src1, Register src2);
-  void CmpP(Register src1, Register src2);
-  void Cmp32(Register dst, const Operand& opnd);
-  void CmpP(Register dst, const Operand& opnd);
-  void Cmp32(Register dst, const MemOperand& opnd);
-  void CmpP(Register dst, const MemOperand& opnd);
+  void CmpS32(Register src1, Register src2);
+  void CmpS64(Register src1, Register src2);
+  void CmpS32(Register dst, const Operand& opnd);
+  void CmpS64(Register dst, const Operand& opnd);
+  void CmpS32(Register dst, const MemOperand& opnd);
+  void CmpS64(Register dst, const MemOperand& opnd);
   void CmpAndSwap(Register old_val, Register new_val, const MemOperand& opnd);
   void CmpAndSwap64(Register old_val, Register new_val, const MemOperand& opnd);
+  // TODO(john.yan): remove this
+  template <class T>
+  void CmpP(Register src1, T src2) {
+    CmpS64(src1, src2);
+  }
 
   // Compare Logical
-  void CmpLogical32(Register src1, Register src2);
-  void CmpLogicalP(Register src1, Register src2);
-  void CmpLogical32(Register src1, const Operand& opnd);
-  void CmpLogicalP(Register src1, const Operand& opnd);
-  void CmpLogical32(Register dst, const MemOperand& opnd);
-  void CmpLogicalP(Register dst, const MemOperand& opnd);
-
-  // Compare Logical Byte (CLI/CLIY)
-  void CmpLogicalByte(const MemOperand& mem, const Operand& imm);
+  void CmpU32(Register src1, Register src2);
+  void CmpU64(Register src1, Register src2);
+  void CmpU32(Register src1, const Operand& opnd);
+  void CmpU64(Register src1, const Operand& opnd);
+  void CmpU32(Register dst, const MemOperand& opnd);
+  void CmpU64(Register dst, const MemOperand& opnd);
 
   // Load 32bit
-  void Load(Register dst, const MemOperand& opnd);
-  void Load(Register dst, const Operand& opnd);
-  void LoadW(Register dst, const MemOperand& opnd, Register scratch = no_reg);
-  void LoadW(Register dst, Register src);
-  void LoadlW(Register dst, const MemOperand& opnd, Register scratch = no_reg);
-  void LoadlW(Register dst, Register src);
-  void LoadLogicalHalfWordP(Register dst, const MemOperand& opnd);
-  void LoadLogicalHalfWordP(Register dst, Register src);
-  void LoadB(Register dst, const MemOperand& opnd);
-  void LoadB(Register dst, Register src);
-  void LoadlB(Register dst, const MemOperand& opnd);
-  void LoadlB(Register dst, Register src);
+  void LoadS32(Register dst, const MemOperand& opnd, Register scratch = no_reg);
+  void LoadS32(Register dst, Register src);
+  void LoadU32(Register dst, const MemOperand& opnd, Register scratch = no_reg);
+  void LoadU32(Register dst, Register src);
+  void LoadU16(Register dst, const MemOperand& opnd);
+  void LoadU16(Register dst, Register src);
+  void LoadS8(Register dst, const MemOperand& opnd);
+  void LoadS8(Register dst, Register src);
+  void LoadU8(Register dst, const MemOperand& opnd);
+  void LoadU8(Register dst, Register src);
 
   void LoadLogicalReversedWordP(Register dst, const MemOperand& opnd);
   void LoadLogicalReversedHalfWordP(Register dst, const MemOperand& opnd);
 
   // Load And Test
   void LoadAndTest32(Register dst, Register src);
-  void LoadAndTestP_ExtendSrc(Register dst, Register src);
   void LoadAndTestP(Register dst, Register src);
 
   void LoadAndTest32(Register dst, const MemOperand& opnd);
   void LoadAndTestP(Register dst, const MemOperand& opnd);
 
   // Load Floating Point
-  void LoadDouble(DoubleRegister dst, const MemOperand& opnd);
-  void LoadFloat32(DoubleRegister dst, const MemOperand& opnd);
-  void LoadFloat32ConvertToDouble(DoubleRegister dst, const MemOperand& mem);
-  void LoadSimd128(Simd128Register dst, const MemOperand& mem,
-                   Register scratch);
+  void LoadF64(DoubleRegister dst, const MemOperand& opnd);
+  void LoadF32(DoubleRegister dst, const MemOperand& opnd);
+  void LoadV128(Simd128Register dst, const MemOperand& mem, Register scratch);
 
   void AddFloat32(DoubleRegister dst, const MemOperand& opnd,
                   DoubleRegister scratch);
@@ -439,8 +369,8 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
                   DoubleRegister scratch);
   void DivFloat64(DoubleRegister dst, const MemOperand& opnd,
                   DoubleRegister scratch);
-  void LoadFloat32ToDouble(DoubleRegister dst, const MemOperand& opnd,
-                           DoubleRegister scratch);
+  void LoadF32AsF64(DoubleRegister dst, const MemOperand& opnd,
+                    DoubleRegister scratch);
 
   // Load On Condition
   void LoadOnConditionP(Condition cond, Register dst, Register src);
@@ -449,25 +379,32 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void LoadPositive32(Register result, Register input);
 
   // Store Floating Point
-  void StoreDouble(DoubleRegister dst, const MemOperand& opnd);
-  void StoreFloat32(DoubleRegister dst, const MemOperand& opnd);
-  void StoreDoubleAsFloat32(DoubleRegister src, const MemOperand& mem,
-                            DoubleRegister scratch);
-  void StoreSimd128(Simd128Register src, const MemOperand& mem,
-                    Register scratch);
+  void StoreF64(DoubleRegister dst, const MemOperand& opnd);
+  void StoreF32(DoubleRegister dst, const MemOperand& opnd);
+  void StoreV128(Simd128Register src, const MemOperand& mem, Register scratch);
 
   void Branch(Condition c, const Operand& opnd);
   void BranchOnCount(Register r1, Label* l);
 
   // Shifts
-  void ShiftLeft(Register dst, Register src, Register val);
-  void ShiftLeft(Register dst, Register src, const Operand& val);
-  void ShiftRight(Register dst, Register src, Register val);
-  void ShiftRight(Register dst, Register src, const Operand& val);
-  void ShiftLeftArith(Register dst, Register src, Register shift);
-  void ShiftLeftArith(Register dst, Register src, const Operand& val);
-  void ShiftRightArith(Register dst, Register src, Register shift);
-  void ShiftRightArith(Register dst, Register src, const Operand& val);
+  void ShiftLeftU32(Register dst, Register src, Register val,
+                    const Operand& val2 = Operand::Zero());
+  void ShiftLeftU32(Register dst, Register src, const Operand& val);
+  void ShiftLeftU64(Register dst, Register src, Register val,
+                    const Operand& val2 = Operand::Zero());
+  void ShiftLeftU64(Register dst, Register src, const Operand& val);
+  void ShiftRightU32(Register dst, Register src, Register val,
+                     const Operand& val2 = Operand::Zero());
+  void ShiftRightU32(Register dst, Register src, const Operand& val);
+  void ShiftRightU64(Register dst, Register src, Register val,
+                     const Operand& val2 = Operand::Zero());
+  void ShiftRightU64(Register dst, Register src, const Operand& val);
+  void ShiftRightS32(Register dst, Register src, Register shift,
+                     const Operand& val2 = Operand::Zero());
+  void ShiftRightS32(Register dst, Register src, const Operand& val);
+  void ShiftRightS64(Register dst, Register src, Register shift,
+                     const Operand& val2 = Operand::Zero());
+  void ShiftRightS64(Register dst, Register src, const Operand& val);
 
   void ClearRightImm(Register dst, Register src, const Operand& val);
 
@@ -512,6 +449,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 #endif
 
   void mov(Register dst, const Operand& src);
+  void mov(Register dst, Register src);
 
   void CleanUInt32(Register x) {
 #ifdef V8_TARGET_ARCH_S390X
@@ -521,21 +459,21 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void push(DoubleRegister src) {
     lay(sp, MemOperand(sp, -kSystemPointerSize));
-    StoreDouble(src, MemOperand(sp));
+    StoreF64(src, MemOperand(sp));
   }
 
   void push(Register src) {
     lay(sp, MemOperand(sp, -kSystemPointerSize));
-    StoreP(src, MemOperand(sp));
+    StoreU64(src, MemOperand(sp));
   }
 
   void pop(DoubleRegister dst) {
-    LoadDouble(dst, MemOperand(sp));
+    LoadF64(dst, MemOperand(sp));
     la(sp, MemOperand(sp, kSystemPointerSize));
   }
 
   void pop(Register dst) {
-    LoadP(dst, MemOperand(sp));
+    LoadU64(dst, MemOperand(sp));
     la(sp, MemOperand(sp, kSystemPointerSize));
   }
 
@@ -550,25 +488,25 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   // Push two registers.  Pushes leftmost register first (to highest address).
   void Push(Register src1, Register src2) {
     lay(sp, MemOperand(sp, -kSystemPointerSize * 2));
-    StoreP(src1, MemOperand(sp, kSystemPointerSize));
-    StoreP(src2, MemOperand(sp, 0));
+    StoreU64(src1, MemOperand(sp, kSystemPointerSize));
+    StoreU64(src2, MemOperand(sp, 0));
   }
 
   // Push three registers.  Pushes leftmost register first (to highest address).
   void Push(Register src1, Register src2, Register src3) {
     lay(sp, MemOperand(sp, -kSystemPointerSize * 3));
-    StoreP(src1, MemOperand(sp, kSystemPointerSize * 2));
-    StoreP(src2, MemOperand(sp, kSystemPointerSize));
-    StoreP(src3, MemOperand(sp, 0));
+    StoreU64(src1, MemOperand(sp, kSystemPointerSize * 2));
+    StoreU64(src2, MemOperand(sp, kSystemPointerSize));
+    StoreU64(src3, MemOperand(sp, 0));
   }
 
   // Push four registers.  Pushes leftmost register first (to highest address).
   void Push(Register src1, Register src2, Register src3, Register src4) {
     lay(sp, MemOperand(sp, -kSystemPointerSize * 4));
-    StoreP(src1, MemOperand(sp, kSystemPointerSize * 3));
-    StoreP(src2, MemOperand(sp, kSystemPointerSize * 2));
-    StoreP(src3, MemOperand(sp, kSystemPointerSize));
-    StoreP(src4, MemOperand(sp, 0));
+    StoreU64(src1, MemOperand(sp, kSystemPointerSize * 3));
+    StoreU64(src2, MemOperand(sp, kSystemPointerSize * 2));
+    StoreU64(src3, MemOperand(sp, kSystemPointerSize));
+    StoreU64(src4, MemOperand(sp, 0));
   }
 
   // Push five registers.  Pushes leftmost register first (to highest address).
@@ -586,11 +524,11 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
     DCHECK(src4 != src5);
 
     lay(sp, MemOperand(sp, -kSystemPointerSize * 5));
-    StoreP(src1, MemOperand(sp, kSystemPointerSize * 4));
-    StoreP(src2, MemOperand(sp, kSystemPointerSize * 3));
-    StoreP(src3, MemOperand(sp, kSystemPointerSize * 2));
-    StoreP(src4, MemOperand(sp, kSystemPointerSize));
-    StoreP(src5, MemOperand(sp, 0));
+    StoreU64(src1, MemOperand(sp, kSystemPointerSize * 4));
+    StoreU64(src2, MemOperand(sp, kSystemPointerSize * 3));
+    StoreU64(src3, MemOperand(sp, kSystemPointerSize * 2));
+    StoreU64(src4, MemOperand(sp, kSystemPointerSize));
+    StoreU64(src5, MemOperand(sp, 0));
   }
 
   enum PushArrayOrder { kNormal, kReverse };
@@ -601,36 +539,36 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   // Pop two registers. Pops rightmost register first (from lower address).
   void Pop(Register src1, Register src2) {
-    LoadP(src2, MemOperand(sp, 0));
-    LoadP(src1, MemOperand(sp, kSystemPointerSize));
+    LoadU64(src2, MemOperand(sp, 0));
+    LoadU64(src1, MemOperand(sp, kSystemPointerSize));
     la(sp, MemOperand(sp, 2 * kSystemPointerSize));
   }
 
   // Pop three registers.  Pops rightmost register first (from lower address).
   void Pop(Register src1, Register src2, Register src3) {
-    LoadP(src3, MemOperand(sp, 0));
-    LoadP(src2, MemOperand(sp, kSystemPointerSize));
-    LoadP(src1, MemOperand(sp, 2 * kSystemPointerSize));
+    LoadU64(src3, MemOperand(sp, 0));
+    LoadU64(src2, MemOperand(sp, kSystemPointerSize));
+    LoadU64(src1, MemOperand(sp, 2 * kSystemPointerSize));
     la(sp, MemOperand(sp, 3 * kSystemPointerSize));
   }
 
   // Pop four registers.  Pops rightmost register first (from lower address).
   void Pop(Register src1, Register src2, Register src3, Register src4) {
-    LoadP(src4, MemOperand(sp, 0));
-    LoadP(src3, MemOperand(sp, kSystemPointerSize));
-    LoadP(src2, MemOperand(sp, 2 * kSystemPointerSize));
-    LoadP(src1, MemOperand(sp, 3 * kSystemPointerSize));
+    LoadU64(src4, MemOperand(sp, 0));
+    LoadU64(src3, MemOperand(sp, kSystemPointerSize));
+    LoadU64(src2, MemOperand(sp, 2 * kSystemPointerSize));
+    LoadU64(src1, MemOperand(sp, 3 * kSystemPointerSize));
     la(sp, MemOperand(sp, 4 * kSystemPointerSize));
   }
 
   // Pop five registers.  Pops rightmost register first (from lower address).
   void Pop(Register src1, Register src2, Register src3, Register src4,
            Register src5) {
-    LoadP(src5, MemOperand(sp, 0));
-    LoadP(src4, MemOperand(sp, kSystemPointerSize));
-    LoadP(src3, MemOperand(sp, 2 * kSystemPointerSize));
-    LoadP(src2, MemOperand(sp, 3 * kSystemPointerSize));
-    LoadP(src1, MemOperand(sp, 4 * kSystemPointerSize));
+    LoadU64(src5, MemOperand(sp, 0));
+    LoadU64(src4, MemOperand(sp, kSystemPointerSize));
+    LoadU64(src3, MemOperand(sp, 2 * kSystemPointerSize));
+    LoadU64(src2, MemOperand(sp, 3 * kSystemPointerSize));
+    LoadU64(src1, MemOperand(sp, 4 * kSystemPointerSize));
     la(sp, MemOperand(sp, 5 * kSystemPointerSize));
   }
 
@@ -716,22 +654,6 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
       const Register result, const DoubleRegister double_input,
       FPRoundingMode rounding_mode = kRoundToZero);
 
-#if !V8_TARGET_ARCH_S390X
-  void ShiftLeftPair(Register dst_low, Register dst_high, Register src_low,
-                     Register src_high, Register scratch, Register shift);
-  void ShiftLeftPair(Register dst_low, Register dst_high, Register src_low,
-                     Register src_high, uint32_t shift);
-  void ShiftRightPair(Register dst_low, Register dst_high, Register src_low,
-                      Register src_high, Register scratch, Register shift);
-  void ShiftRightPair(Register dst_low, Register dst_high, Register src_low,
-                      Register src_high, uint32_t shift);
-  void ShiftRightArithPair(Register dst_low, Register dst_high,
-                           Register src_low, Register src_high,
-                           Register scratch, Register shift);
-  void ShiftRightArithPair(Register dst_low, Register dst_high,
-                           Register src_low, Register src_high, uint32_t shift);
-#endif
-
   // Generates function and stub prologue code.
   void StubPrologue(StackFrame::Type type, Register base = no_reg,
                     int prologue_offset = 0);
@@ -743,29 +665,52 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   // new S390 macro-assembler interfaces that are slightly higher level
   // than assembler-s390 and may generate variable length sequences
 
-  // load a literal signed int value <value> to GPR <dst>
-  void LoadIntLiteral(Register dst, int value);
-
   // load an SMI value <value> to GPR <dst>
   void LoadSmiLiteral(Register dst, Smi smi);
 
   // load a literal double value <value> to FPR <result>
-  void LoadDoubleLiteral(DoubleRegister result, double value, Register scratch);
-  void LoadDoubleLiteral(DoubleRegister result, uint64_t value,
-                         Register scratch);
+  template <class T>
+  void LoadF64(DoubleRegister result, T value, Register scratch) {
+    static_assert(sizeof(T) == kDoubleSize, "Expect input size to be 8");
+    uint64_t int_val = bit_cast<uint64_t, T>(value);
+    // Load the 64-bit value into a GPR, then transfer it to FPR via LDGR
+    uint32_t hi_32 = int_val >> 32;
+    uint32_t lo_32 = static_cast<uint32_t>(int_val);
+
+    if (int_val == 0) {
+      lzdr(result);
+    } else if (lo_32 == 0) {
+      llihf(scratch, Operand(hi_32));
+      ldgr(result, scratch);
+    } else {
+      iihf(scratch, Operand(hi_32));
+      iilf(scratch, Operand(lo_32));
+      ldgr(result, scratch);
+    }
+  }
 
-  void LoadFloat32Literal(DoubleRegister result, float value, Register scratch);
+  template <class T>
+  void LoadF32(DoubleRegister result, T value, Register scratch) {
+    static_assert(sizeof(T) == kFloatSize, "Expect input size to be 4");
+    uint32_t int_val = bit_cast<uint32_t, T>(value);
+    LoadF64(result, static_cast<uint64_t>(int_val) << 32, scratch);
+  }
 
-  void StoreW(Register src, const MemOperand& mem, Register scratch = no_reg);
+  // void LoadF64(DoubleRegister result, double value, Register scratch);
+  // void LoadF64(DoubleRegister result, uint64_t value,
+  //                        Register scratch);
 
-  void LoadHalfWordP(Register dst, Register src);
+  // void LoadF32(DoubleRegister result, float value, Register scratch);
 
-  void LoadHalfWordP(Register dst, const MemOperand& mem,
+  void StoreU32(Register src, const MemOperand& mem, Register scratch = no_reg);
+
+  void LoadS16(Register dst, Register src);
+
+  void LoadS16(Register dst, const MemOperand& mem,
                      Register scratch = no_reg);
 
-  void StoreHalfWord(Register src, const MemOperand& mem,
-                     Register scratch = r0);
-  void StoreByte(Register src, const MemOperand& mem, Register scratch = r0);
+  void StoreU16(Register src, const MemOperand& mem, Register scratch = r0);
+  void StoreU8(Register src, const MemOperand& mem, Register scratch = r0);
   void CmpSmiLiteral(Register src1, Smi smi, Register scratch);
 
   // Set new rounding mode RN to FPSCR
@@ -775,10 +720,13 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void ResetRoundingMode();
 
   // These exist to provide portability between 32 and 64bit
-  void LoadP(Register dst, const MemOperand& mem, Register scratch = no_reg);
-  void StoreP(Register src, const MemOperand& mem, Register scratch = no_reg);
-  void StoreP(const MemOperand& mem, const Operand& opnd,
-              Register scratch = no_reg);
+  void LoadP(Register dst, const MemOperand& mem, Register scratch = no_reg) {
+    LoadU64(dst, mem, scratch);
+  }
+  void LoadU64(Register dst, const MemOperand& mem, Register scratch = no_reg);
+  void StoreU64(Register src, const MemOperand& mem, Register scratch = no_reg);
+  void StoreU64(const MemOperand& mem, const Operand& opnd,
+                Register scratch = no_reg);
   void LoadMultipleP(Register dst1, Register dst2, const MemOperand& mem);
   void StoreMultipleP(Register dst1, Register dst2, const MemOperand& mem);
   void LoadMultipleW(Register dst1, Register dst2, const MemOperand& mem);
@@ -871,6 +819,10 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   // Use --debug_code to enable.
   void Assert(Condition cond, AbortReason reason, CRegister cr = cr7);
 
+  // Like Assert(), but without condition.
+  // Use --debug-code to enable.
+  void AssertUnreachable(AbortReason reason);
+
   // Like Assert(), but always enabled.
   void Check(Condition cond, AbortReason reason, CRegister cr = cr7);
 
@@ -898,9 +850,9 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
                              Operand(shiftAmount), true);
     } else {
       if (rangeEnd > 0)  // Don't need to shift if rangeEnd is zero.
-        ShiftRightP(dst, src, Operand(rangeEnd));
+        ShiftRightU64(dst, src, Operand(rangeEnd));
       else if (dst != src)  // If we didn't shift, we might need to copy
-        LoadRR(dst, src);
+        mov(dst, src);
       int width = rangeStart - rangeEnd + 1;
 #if V8_TARGET_ARCH_S390X
       uint64_t mask = (static_cast<uint64_t>(1) << width) - 1;
@@ -969,7 +921,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
     } else if (is_int20(value.offset())) {
       tmy(value, Operand(1));
     } else {
-      LoadB(r0, value);
+      LoadS8(r0, value);
       tmll(r0, Operand(1));
     }
   }
@@ -983,9 +935,9 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void SmiUntag(Register dst, const MemOperand& src);
   void SmiUntag(Register dst, Register src) {
     if (SmiValuesAre31Bits()) {
-      ShiftRightArith(dst, src, Operand(kSmiShift));
+      ShiftRightS32(dst, src, Operand(kSmiShift));
     } else {
-      ShiftRightArithP(dst, src, Operand(kSmiShift));
+      ShiftRightS64(dst, src, Operand(kSmiShift));
     }
     lgfr(dst, dst);
   }
@@ -1055,7 +1007,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallRecordWriteStub(Register object, Register address,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 
   void Jump(intptr_t target, RelocInfo::Mode rmode, Condition cond = al);
@@ -1073,11 +1025,11 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   // TODO(victorgomes): Remove this function once we stick with the reversed
   // arguments order.
   void LoadReceiver(Register dest, Register argc) {
-    LoadP(dest, MemOperand(sp, 0));
+    LoadU64(dest, MemOperand(sp, 0));
   }
 
   void StoreReceiver(Register rec, Register argc, Register scratch) {
-    StoreP(rec, MemOperand(sp, 0));
+    StoreU64(rec, MemOperand(sp, 0));
   }
 
   void CallRuntime(const Runtime::Function* f, int num_arguments,
@@ -1133,9 +1085,9 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   template <class T>
   void CompareTagged(Register src1, T src2) {
     if (COMPRESS_POINTERS_BOOL) {
-      Cmp32(src1, src2);
+      CmpS32(src1, src2);
     } else {
-      CmpP(src1, src2);
+      CmpS64(src1, src2);
     }
   }
 
@@ -1174,6 +1126,14 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
                         Register scratch2);
   void DecrementCounter(StatsCounter* counter, int value, Register scratch1,
                         Register scratch2);
+
+  // ---------------------------------------------------------------------------
+  // Stack limit utilities
+
+  MemOperand StackLimitAsMemOperand(StackLimitKind kind);
+  void StackOverflowCheck(Register num_args, Register scratch,
+                          Label* stack_overflow);
+
   // ---------------------------------------------------------------------------
   // JavaScript invokes
 
@@ -1230,8 +1190,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   void LeaveExitFrame(bool save_doubles, Register argument_count,
                       bool argument_count_is_length = false);
 
-  void LoadMap(Register destination, Register object);
-
   // Load the global proxy from the current context.
   void LoadGlobalProxy(Register dst) {
     LoadNativeContextSlot(Context::GLOBAL_PROXY_INDEX, dst);
@@ -1245,16 +1203,16 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   // Shift left by kSmiShift
   void SmiTag(Register reg) { SmiTag(reg, reg); }
   void SmiTag(Register dst, Register src) {
-    ShiftLeftP(dst, src, Operand(kSmiShift));
+    ShiftLeftU64(dst, src, Operand(kSmiShift));
   }
 
   void SmiToPtrArrayOffset(Register dst, Register src) {
 #if defined(V8_COMPRESS_POINTERS) || defined(V8_31BIT_SMIS_ON_64BIT_ARCH)
     STATIC_ASSERT(kSmiTag == 0 && kSmiShift < kSystemPointerSizeLog2);
-    ShiftLeftP(dst, src, Operand(kSystemPointerSizeLog2 - kSmiShift));
+    ShiftLeftU64(dst, src, Operand(kSystemPointerSizeLog2 - kSmiShift));
 #else
     STATIC_ASSERT(kSmiTag == 0 && kSmiShift > kSystemPointerSizeLog2);
-    ShiftRightArithP(dst, src, Operand(kSmiShift - kSystemPointerSizeLog2));
+    ShiftRightS64(dst, src, Operand(kSmiShift - kSystemPointerSizeLog2));
 #endif
   }
 
diff --git a/deps/v8/src/codegen/safepoint-table.h b/deps/v8/src/codegen/safepoint-table.h
index ef6ed2f6db7e1b..a7046b64775091 100644
--- a/deps/v8/src/codegen/safepoint-table.h
+++ b/deps/v8/src/codegen/safepoint-table.h
@@ -21,7 +21,8 @@ class WasmCode;
 
 class SafepointEntry {
  public:
-  SafepointEntry() : deopt_index_(0), bits_(nullptr), trampoline_pc_(-1) {}
+  SafepointEntry()
+      : deopt_index_(0), bits_(nullptr), trampoline_pc_(kNoTrampolinePC) {}
 
   SafepointEntry(unsigned deopt_index, uint8_t* bits, int trampoline_pc)
       : deopt_index_(deopt_index), bits_(bits), trampoline_pc_(trampoline_pc) {
@@ -42,6 +43,7 @@ class SafepointEntry {
   int trampoline_pc() { return trampoline_pc_; }
 
   static const unsigned kNoDeoptIndex = kMaxUInt32;
+  static constexpr int kNoTrampolinePC = -1;
 
   int deoptimization_index() const {
     DCHECK(is_valid() && has_deoptimization_index());
@@ -70,6 +72,9 @@ class SafepointTable {
   explicit SafepointTable(Code code);
   explicit SafepointTable(const wasm::WasmCode* code);
 
+  SafepointTable(const SafepointTable&) = delete;
+  SafepointTable& operator=(const SafepointTable&) = delete;
+
   int size() const {
     return kHeaderSize + (length_ * (kFixedEntrySize + entry_size_));
   }
@@ -93,8 +98,9 @@ class SafepointTable {
     unsigned deopt_index =
         base::Memory<uint32_t>(GetEncodedInfoLocation(index));
     uint8_t* bits = &base::Memory<uint8_t>(entries() + (index * entry_size_));
-    int trampoline_pc =
-        has_deopt_ ? base::Memory<int>(GetTrampolineLocation(index)) : -1;
+    int trampoline_pc = has_deopt_
+                            ? base::Memory<int>(GetTrampolineLocation(index))
+                            : SafepointEntry::kNoTrampolinePC;
     return SafepointEntry(deopt_index, bits, trampoline_pc);
   }
 
@@ -145,7 +151,7 @@ class SafepointTable {
 
   static void PrintBits(std::ostream& os, uint8_t byte, int digits);
 
-  DISALLOW_HEAP_ALLOCATION(no_allocation_)
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 
   const Address instruction_start_;
   const uint32_t stack_slots_;
@@ -158,8 +164,6 @@ class SafepointTable {
 
   friend class SafepointTableBuilder;
   friend class SafepointEntry;
-
-  DISALLOW_COPY_AND_ASSIGN(SafepointTable);
 };
 
 class Safepoint {
@@ -184,6 +188,9 @@ class SafepointTableBuilder {
         emitted_(false),
         zone_(zone) {}
 
+  SafepointTableBuilder(const SafepointTableBuilder&) = delete;
+  SafepointTableBuilder& operator=(const SafepointTableBuilder&) = delete;
+
   // Get the offset of the emitted safepoint table in the code.
   unsigned GetCodeOffset() const;
 
@@ -228,8 +235,6 @@ class SafepointTableBuilder {
   bool emitted_;
 
   Zone* zone_;
-
-  DISALLOW_COPY_AND_ASSIGN(SafepointTableBuilder);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/source-position-table.h b/deps/v8/src/codegen/source-position-table.h
index a42c6a44a3cfa7..72a4c9f45a8989 100644
--- a/deps/v8/src/codegen/source-position-table.h
+++ b/deps/v8/src/codegen/source-position-table.h
@@ -158,7 +158,7 @@ class V8_EXPORT_PRIVATE SourcePositionTableIterator {
   PositionTableEntry current_;
   IterationFilter iteration_filter_;
   FunctionEntryFilter function_entry_filter_;
-  DISALLOW_HEAP_ALLOCATION(no_gc)
+  DISALLOW_GARBAGE_COLLECTION(no_gc)
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/codegen/tnode.h b/deps/v8/src/codegen/tnode.h
index 72f9c6e3aae686..44c26e57819390 100644
--- a/deps/v8/src/codegen/tnode.h
+++ b/deps/v8/src/codegen/tnode.h
@@ -265,6 +265,10 @@ struct is_subtype<UnionT<T1, T2>, UnionT<U1, U2>> {
       (is_subtype<T1, U1>::value || is_subtype<T1, U2>::value) &&
       (is_subtype<T2, U1>::value || is_subtype<T2, U2>::value);
 };
+template <>
+struct is_subtype<ExternalReference, RawPtrT> {
+  static const bool value = true;
+};
 
 template <class T, class U>
 struct types_have_common_values {
diff --git a/deps/v8/src/codegen/turbo-assembler.h b/deps/v8/src/codegen/turbo-assembler.h
index 26cf12d4eb1d81..337ee7465d731a 100644
--- a/deps/v8/src/codegen/turbo-assembler.h
+++ b/deps/v8/src/codegen/turbo-assembler.h
@@ -17,6 +17,12 @@ namespace internal {
 
 // Common base class for platform-specific TurboAssemblers containing
 // platform-independent bits.
+// You will encounter two subclasses, TurboAssembler (derives from
+// TurboAssemblerBase), and MacroAssembler (derives from TurboAssembler). The
+// main difference is that MacroAssembler is allowed to access the isolate, and
+// TurboAssembler accesses the isolate in a very limited way. TurboAssembler
+// contains all the functionality that is used by Turbofan, and does not expect
+// to be running on the main thread.
 class V8_EXPORT_PRIVATE TurboAssemblerBase : public Assembler {
  public:
   // Constructors are declared public to inherit them in derived classes
@@ -139,7 +145,7 @@ class V8_EXPORT_PRIVATE TurboAssemblerBase : public Assembler {
 // Avoids emitting calls to the {Builtins::kAbort} builtin when emitting debug
 // code during the lifetime of this scope object. For disabling debug code
 // entirely use the {DontEmitDebugCodeScope} instead.
-class HardAbortScope {
+class V8_NODISCARD HardAbortScope {
  public:
   explicit HardAbortScope(TurboAssemblerBase* assembler)
       : assembler_(assembler), old_value_(assembler->should_abort_hard()) {
diff --git a/deps/v8/src/codegen/x64/assembler-x64-inl.h b/deps/v8/src/codegen/x64/assembler-x64-inl.h
index fedff2b0f1d0d5..26e558b4f9e4a8 100644
--- a/deps/v8/src/codegen/x64/assembler-x64-inl.h
+++ b/deps/v8/src/codegen/x64/assembler-x64-inl.h
@@ -17,7 +17,11 @@ namespace internal {
 
 bool CpuFeatures::SupportsOptimizer() { return true; }
 
-bool CpuFeatures::SupportsWasmSimd128() { return IsSupported(SSE4_1); }
+bool CpuFeatures::SupportsWasmSimd128() {
+  if (IsSupported(SSE4_1)) return true;
+  if (FLAG_wasm_simd_ssse3_codegen) return true;
+  return false;
+}
 
 // -----------------------------------------------------------------------------
 // Implementation of Assembler
@@ -316,6 +320,7 @@ HeapObject RelocInfo::target_object() {
         host_.ptr(), ReadUnalignedValue<Tagged_t>(pc_)));
     return HeapObject::cast(o);
   }
+  DCHECK(IsFullEmbeddedObject(rmode_) || IsDataEmbeddedObject(rmode_));
   return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
 }
 
@@ -327,6 +332,7 @@ HeapObject RelocInfo::target_object_no_host(Isolate* isolate) {
     Object obj(DecompressTaggedPointer(isolate, compressed));
     return HeapObject::cast(obj);
   }
+  DCHECK(IsFullEmbeddedObject(rmode_) || IsDataEmbeddedObject(rmode_));
   return HeapObject::cast(Object(ReadUnalignedValue<Address>(pc_)));
 }
 
@@ -338,6 +344,7 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) {
     if (IsCompressedEmbeddedObject(rmode_)) {
       return origin->compressed_embedded_object_handle_at(pc_);
     }
+    DCHECK(IsFullEmbeddedObject(rmode_) || IsDataEmbeddedObject(rmode_));
     return Handle<HeapObject>::cast(ReadUnalignedValue<Handle<Object>>(pc_));
   }
 }
@@ -375,6 +382,7 @@ void RelocInfo::set_target_object(Heap* heap, HeapObject target,
     Tagged_t tagged = CompressTagged(target.ptr());
     WriteUnalignedValue(pc_, tagged);
   } else {
+    DCHECK(IsFullEmbeddedObject(rmode_) || IsDataEmbeddedObject(rmode_));
     WriteUnalignedValue(pc_, target.ptr());
   }
   if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
diff --git a/deps/v8/src/codegen/x64/assembler-x64.cc b/deps/v8/src/codegen/x64/assembler-x64.cc
index 5327745a027bd9..e5baf0aa048de0 100644
--- a/deps/v8/src/codegen/x64/assembler-x64.cc
+++ b/deps/v8/src/codegen/x64/assembler-x64.cc
@@ -17,6 +17,7 @@
 
 #include "src/base/bits.h"
 #include "src/base/cpu.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/string-constants.h"
@@ -91,6 +92,9 @@ void CpuFeatures::ProbeImpl(bool cross_compile) {
       OSHasAVXSupport()) {
     supported_ |= 1u << AVX;
   }
+  if (cpu.has_avx2() && FLAG_enable_avx2 && IsSupported(AVX)) {
+    supported_ |= 1u << AVX2;
+  }
   if (cpu.has_fma3() && FLAG_enable_fma3 && cpu.has_osxsave() &&
       OSHasAVXSupport()) {
     supported_ |= 1u << FMA3;
@@ -109,16 +113,18 @@ void CpuFeatures::ProbeImpl(bool cross_compile) {
 void CpuFeatures::PrintTarget() {}
 void CpuFeatures::PrintFeatures() {
   printf(
-      "SSE3=%d SSSE3=%d SSE4_1=%d SSE4_2=%d SAHF=%d AVX=%d FMA3=%d BMI1=%d "
+      "SSE3=%d SSSE3=%d SSE4_1=%d SSE4_2=%d SAHF=%d AVX=%d AVX2=%d FMA3=%d "
+      "BMI1=%d "
       "BMI2=%d "
       "LZCNT=%d "
       "POPCNT=%d ATOM=%d\n",
       CpuFeatures::IsSupported(SSE3), CpuFeatures::IsSupported(SSSE3),
       CpuFeatures::IsSupported(SSE4_1), CpuFeatures::IsSupported(SSE4_2),
       CpuFeatures::IsSupported(SAHF), CpuFeatures::IsSupported(AVX),
-      CpuFeatures::IsSupported(FMA3), CpuFeatures::IsSupported(BMI1),
-      CpuFeatures::IsSupported(BMI2), CpuFeatures::IsSupported(LZCNT),
-      CpuFeatures::IsSupported(POPCNT), CpuFeatures::IsSupported(ATOM));
+      CpuFeatures::IsSupported(AVX2), CpuFeatures::IsSupported(FMA3),
+      CpuFeatures::IsSupported(BMI1), CpuFeatures::IsSupported(BMI2),
+      CpuFeatures::IsSupported(LZCNT), CpuFeatures::IsSupported(POPCNT),
+      CpuFeatures::IsSupported(ATOM));
 }
 
 // -----------------------------------------------------------------------------
@@ -2002,7 +2008,7 @@ void Assembler::Nop(int n) {
     EnsureSpace ensure_space(this);
     int nop_bytes = std::min(n, 9);
     const char* sequence = kNopSequences + kNopOffsets[nop_bytes];
-    memcpy(pc_, sequence, nop_bytes);
+    base::Memcpy(pc_, sequence, nop_bytes);
     pc_ += nop_bytes;
     n -= nop_bytes;
   } while (n);
@@ -2744,6 +2750,15 @@ void Assembler::movdqa(XMMRegister dst, Operand src) {
   emit_sse_operand(dst, src);
 }
 
+void Assembler::movdqa(XMMRegister dst, XMMRegister src) {
+  EnsureSpace ensure_space(this);
+  emit(0x66);
+  emit_rex_64(src, dst);
+  emit(0x0F);
+  emit(0x7F);
+  emit_sse_operand(src, dst);
+}
+
 void Assembler::movdqu(Operand dst, XMMRegister src) {
   EnsureSpace ensure_space(this);
   emit(0xF3);
@@ -3310,26 +3325,6 @@ void Assembler::haddps(XMMRegister dst, Operand src) {
   emit_sse_operand(dst, src);
 }
 
-void Assembler::ucomisd(XMMRegister dst, XMMRegister src) {
-  DCHECK(!IsEnabled(AVX));
-  EnsureSpace ensure_space(this);
-  emit(0x66);
-  emit_optional_rex_32(dst, src);
-  emit(0x0F);
-  emit(0x2E);
-  emit_sse_operand(dst, src);
-}
-
-void Assembler::ucomisd(XMMRegister dst, Operand src) {
-  DCHECK(!IsEnabled(AVX));
-  EnsureSpace ensure_space(this);
-  emit(0x66);
-  emit_optional_rex_32(dst, src);
-  emit(0x0F);
-  emit(0x2E);
-  emit_sse_operand(dst, src);
-}
-
 void Assembler::cmpltsd(XMMRegister dst, XMMRegister src) {
   EnsureSpace ensure_space(this);
   emit(0xF2);
@@ -3412,6 +3407,14 @@ void Assembler::vmovddup(XMMRegister dst, Operand src) {
   emit_sse_operand(dst, src);
 }
 
+void Assembler::vmovshdup(XMMRegister dst, XMMRegister src) {
+  DCHECK(IsEnabled(AVX));
+  EnsureSpace ensure_space(this);
+  emit_vex_prefix(dst, xmm0, src, kL128, kF3, k0F, kWIG);
+  emit(0x16);
+  emit_sse_operand(dst, src);
+}
+
 void Assembler::vbroadcastss(XMMRegister dst, Operand src) {
   DCHECK(IsEnabled(AVX));
   EnsureSpace ensure_space(this);
@@ -3420,6 +3423,14 @@ void Assembler::vbroadcastss(XMMRegister dst, Operand src) {
   emit_sse_operand(dst, src);
 }
 
+void Assembler::vbroadcastss(XMMRegister dst, XMMRegister src) {
+  DCHECK(IsEnabled(AVX2));
+  EnsureSpace ensure_space(this);
+  emit_vex_prefix(dst, xmm0, src, kL128, k66, k0F38, kW0);
+  emit(0x18);
+  emit_sse_operand(dst, src);
+}
+
 void Assembler::fma_instr(byte op, XMMRegister dst, XMMRegister src1,
                           XMMRegister src2, VectorLength l, SIMDPrefix pp,
                           LeadingOpcode m, VexW w) {
@@ -3492,6 +3503,14 @@ void Assembler::vmovq(Register dst, XMMRegister src) {
   emit_sse_operand(src, dst);
 }
 
+void Assembler::vmovdqa(XMMRegister dst, XMMRegister src) {
+  DCHECK(IsEnabled(AVX));
+  EnsureSpace ensure_space(this);
+  emit_vex_prefix(dst, xmm0, src, kL128, k66, k0F, kWIG);
+  emit(0x6F);
+  emit_sse_operand(dst, src);
+}
+
 void Assembler::vmovdqu(XMMRegister dst, Operand src) {
   DCHECK(IsEnabled(AVX));
   EnsureSpace ensure_space(this);
@@ -3508,6 +3527,14 @@ void Assembler::vmovdqu(Operand dst, XMMRegister src) {
   emit_sse_operand(src, dst);
 }
 
+void Assembler::vmovdqu(XMMRegister dst, XMMRegister src) {
+  DCHECK(IsEnabled(AVX));
+  EnsureSpace ensure_space(this);
+  emit_vex_prefix(src, xmm0, dst, kL128, kF3, k0F, kWIG);
+  emit(0x7F);
+  emit_sse_operand(src, dst);
+}
+
 void Assembler::vmovlps(XMMRegister dst, XMMRegister src1, Operand src2) {
   DCHECK(IsEnabled(AVX));
   EnsureSpace ensure_space(this);
@@ -3541,9 +3568,10 @@ void Assembler::vmovhps(Operand dst, XMMRegister src) {
 }
 
 void Assembler::vinstr(byte op, XMMRegister dst, XMMRegister src1,
-                       XMMRegister src2, SIMDPrefix pp, LeadingOpcode m,
-                       VexW w) {
-  DCHECK(IsEnabled(AVX));
+                       XMMRegister src2, SIMDPrefix pp, LeadingOpcode m, VexW w,
+                       CpuFeature feature) {
+  DCHECK(IsEnabled(feature));
+  DCHECK(feature == AVX || feature == AVX2);
   EnsureSpace ensure_space(this);
   emit_vex_prefix(dst, src1, src2, kLIG, pp, m, w);
   emit(op);
@@ -3551,8 +3579,10 @@ void Assembler::vinstr(byte op, XMMRegister dst, XMMRegister src1,
 }
 
 void Assembler::vinstr(byte op, XMMRegister dst, XMMRegister src1, Operand src2,
-                       SIMDPrefix pp, LeadingOpcode m, VexW w) {
-  DCHECK(IsEnabled(AVX));
+                       SIMDPrefix pp, LeadingOpcode m, VexW w,
+                       CpuFeature feature) {
+  DCHECK(IsEnabled(feature));
+  DCHECK(feature == AVX || feature == AVX2);
   EnsureSpace ensure_space(this);
   emit_vex_prefix(dst, src1, src2, kLIG, pp, m, w);
   emit(op);
@@ -4099,6 +4129,16 @@ void Assembler::movddup(XMMRegister dst, Operand src) {
   emit_sse_operand(dst, src);
 }
 
+void Assembler::movshdup(XMMRegister dst, XMMRegister src) {
+  DCHECK(IsEnabled(SSE3));
+  EnsureSpace ensure_space(this);
+  emit(0xF3);
+  emit_optional_rex_32(dst, src);
+  emit(0x0F);
+  emit(0x16);
+  emit_sse_operand(dst, src);
+}
+
 void Assembler::psrldq(XMMRegister dst, uint8_t shift) {
   EnsureSpace ensure_space(this);
   emit(0x66);
@@ -4199,13 +4239,21 @@ void Assembler::db(uint8_t data) {
   emit(data);
 }
 
-void Assembler::dd(uint32_t data) {
+void Assembler::dd(uint32_t data, RelocInfo::Mode rmode) {
   EnsureSpace ensure_space(this);
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   emitl(data);
 }
 
-void Assembler::dq(uint64_t data) {
+void Assembler::dq(uint64_t data, RelocInfo::Mode rmode) {
   EnsureSpace ensure_space(this);
+  if (!RelocInfo::IsNone(rmode)) {
+    DCHECK(RelocInfo::IsDataEmbeddedObject(rmode));
+    RecordRelocInfo(rmode);
+  }
   emitq(data);
 }
 
diff --git a/deps/v8/src/codegen/x64/assembler-x64.h b/deps/v8/src/codegen/x64/assembler-x64.h
index e05eaa9592a65f..a26e98d8a53a8e 100644
--- a/deps/v8/src/codegen/x64/assembler-x64.h
+++ b/deps/v8/src/codegen/x64/assembler-x64.h
@@ -43,6 +43,7 @@
 #include <vector>
 
 #include "src/codegen/assembler.h"
+#include "src/codegen/cpu-features.h"
 #include "src/codegen/label.h"
 #include "src/codegen/x64/constants-x64.h"
 #include "src/codegen/x64/fma-instr.h"
@@ -945,9 +946,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void movmskps(Register dst, XMMRegister src);
 
   void vinstr(byte op, XMMRegister dst, XMMRegister src1, XMMRegister src2,
-              SIMDPrefix pp, LeadingOpcode m, VexW w);
+              SIMDPrefix pp, LeadingOpcode m, VexW w, CpuFeature feature = AVX);
   void vinstr(byte op, XMMRegister dst, XMMRegister src1, Operand src2,
-              SIMDPrefix pp, LeadingOpcode m, VexW w);
+              SIMDPrefix pp, LeadingOpcode m, VexW w, CpuFeature feature = AVX);
 
   // SSE instructions
   void sse_instr(XMMRegister dst, XMMRegister src, byte escape, byte opcode);
@@ -1024,6 +1025,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void lddqu(XMMRegister dst, Operand src);
   void movddup(XMMRegister dst, Operand src);
   void movddup(XMMRegister dst, XMMRegister src);
+  void movshdup(XMMRegister dst, XMMRegister src);
 
   // SSSE3
   void ssse3_instr(XMMRegister dst, XMMRegister src, byte prefix, byte escape1,
@@ -1193,6 +1195,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
 
   void movdqa(Operand dst, XMMRegister src);
   void movdqa(XMMRegister dst, Operand src);
+  void movdqa(XMMRegister dst, XMMRegister src);
 
   void movdqu(Operand dst, XMMRegister src);
   void movdqu(XMMRegister dst, Operand src);
@@ -1229,8 +1232,6 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void haddps(XMMRegister dst, XMMRegister src);
   void haddps(XMMRegister dst, Operand src);
 
-  void ucomisd(XMMRegister dst, XMMRegister src);
-  void ucomisd(XMMRegister dst, Operand src);
   void cmpltsd(XMMRegister dst, XMMRegister src);
 
   void movmskpd(Register dst, XMMRegister src);
@@ -1286,6 +1287,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void pshuflw(XMMRegister dst, XMMRegister src, uint8_t shuffle);
   void pshuflw(XMMRegister dst, Operand src, uint8_t shuffle);
 
+  void movhlps(XMMRegister dst, XMMRegister src) {
+    sse_instr(dst, src, 0x0F, 0x12);
+  }
   void movlhps(XMMRegister dst, XMMRegister src) {
     sse_instr(dst, src, 0x0F, 0x16);
   }
@@ -1293,7 +1297,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // AVX instruction
   void vmovddup(XMMRegister dst, XMMRegister src);
   void vmovddup(XMMRegister dst, Operand src);
+  void vmovshdup(XMMRegister dst, XMMRegister src);
   void vbroadcastss(XMMRegister dst, Operand src);
+  void vbroadcastss(XMMRegister dst, XMMRegister src);
 
   void fma_instr(byte op, XMMRegister dst, XMMRegister src1, XMMRegister src2,
                  VectorLength l, SIMDPrefix pp, LeadingOpcode m, VexW w);
@@ -1324,8 +1330,10 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   }
   void vmovsd(XMMRegister dst, Operand src) { vsd(0x10, dst, xmm0, src); }
   void vmovsd(Operand dst, XMMRegister src) { vsd(0x11, src, xmm0, dst); }
+  void vmovdqa(XMMRegister dst, XMMRegister src);
   void vmovdqu(XMMRegister dst, Operand src);
   void vmovdqu(Operand dst, XMMRegister src);
+  void vmovdqu(XMMRegister dst, XMMRegister src);
 
   void vmovlps(XMMRegister dst, XMMRegister src1, Operand src2);
   void vmovlps(Operand dst, XMMRegister src);
@@ -1388,6 +1396,9 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vmovlhps(XMMRegister dst, XMMRegister src1, XMMRegister src2) {
     vinstr(0x16, dst, src1, src2, kNone, k0F, kWIG);
   }
+  void vmovhlps(XMMRegister dst, XMMRegister src1, XMMRegister src2) {
+    vinstr(0x12, dst, src1, src2, kNone, k0F, kWIG);
+  }
   void vcvtss2sd(XMMRegister dst, XMMRegister src1, XMMRegister src2) {
     vinstr(0x5a, dst, src1, src2, kF3, k0F, kWIG);
   }
@@ -1461,12 +1472,6 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
     XMMRegister idst = XMMRegister::from_code(dst.code());
     vinstr(0x2d, idst, xmm0, src, kF2, k0F, kW0);
   }
-  void vucomisd(XMMRegister dst, XMMRegister src) {
-    vinstr(0x2e, dst, xmm0, src, k66, k0F, kWIG);
-  }
-  void vucomisd(XMMRegister dst, Operand src) {
-    vinstr(0x2e, dst, xmm0, src, k66, k0F, kWIG);
-  }
   void vroundss(XMMRegister dst, XMMRegister src1, XMMRegister src2,
                 RoundingMode mode) {
     vinstr(0x0a, dst, src1, src2, k66, k0F3A, kWIG);
@@ -1669,6 +1674,19 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   void vpd(byte op, XMMRegister dst, XMMRegister src1, XMMRegister src2);
   void vpd(byte op, XMMRegister dst, XMMRegister src1, Operand src2);
 
+  // AVX2 instructions
+#define AVX2_INSTRUCTION(instr, prefix, escape1, escape2, opcode)           \
+  void instr(XMMRegister dst, XMMRegister src) {                            \
+    vinstr(0x##opcode, dst, xmm0, src, k##prefix, k##escape1##escape2, kW0, \
+           AVX2);                                                           \
+  }                                                                         \
+  void instr(XMMRegister dst, Operand src) {                                \
+    vinstr(0x##opcode, dst, xmm0, src, k##prefix, k##escape1##escape2, kW0, \
+           AVX2);                                                           \
+  }
+  AVX2_BROADCAST_LIST(AVX2_INSTRUCTION)
+#undef AVX2_INSTRUCTION
+
   // BMI instruction
   void andnq(Register dst, Register src1, Register src2) {
     bmi1q(0xf2, dst, src1, src2);
@@ -1827,9 +1845,11 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
   // Writes a single word of data in the code stream.
   // Used for inline tables, e.g., jump-tables.
   void db(uint8_t data);
-  void dd(uint32_t data);
-  void dq(uint64_t data);
-  void dp(uintptr_t data) { dq(data); }
+  void dd(uint32_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dq(uint64_t data, RelocInfo::Mode rmode = RelocInfo::NONE);
+  void dp(uintptr_t data, RelocInfo::Mode rmode = RelocInfo::NONE) {
+    dq(data, rmode);
+  }
   void dq(Label* label);
 
   // Patch entries for partial constant pool.
diff --git a/deps/v8/src/codegen/x64/interface-descriptors-x64.cc b/deps/v8/src/codegen/x64/interface-descriptors-x64.cc
index e4d6b92708fbf4..5b35b5817fccfd 100644
--- a/deps/v8/src/codegen/x64/interface-descriptors-x64.cc
+++ b/deps/v8/src/codegen/x64/interface-descriptors-x64.cc
@@ -35,6 +35,23 @@ void RecordWriteDescriptor::InitializePlatformSpecific(
   data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
 }
 
+void DynamicCheckMapsDescriptor::InitializePlatformSpecific(
+    CallInterfaceDescriptorData* data) {
+  Register default_stub_registers[] = {kReturnRegister0,
+                                       arg_reg_1,
+                                       arg_reg_2,
+                                       arg_reg_3,
+                                       kRuntimeCallFunctionRegister,
+                                       kContextRegister};
+
+  data->RestrictAllocatableRegisters(default_stub_registers,
+                                     arraysize(default_stub_registers));
+
+  CHECK_LE(static_cast<size_t>(kParameterCount),
+           arraysize(default_stub_registers));
+  data->InitializePlatformSpecific(kParameterCount, default_stub_registers);
+}
+
 void EphemeronKeyBarrierDescriptor::InitializePlatformSpecific(
     CallInterfaceDescriptorData* data) {
   const Register default_stub_registers[] = {arg_reg_1, arg_reg_2, arg_reg_3,
diff --git a/deps/v8/src/codegen/x64/macro-assembler-x64.cc b/deps/v8/src/codegen/x64/macro-assembler-x64.cc
index 9f5917c23a2891..e696e8b66e7b43 100644
--- a/deps/v8/src/codegen/x64/macro-assembler-x64.cc
+++ b/deps/v8/src/codegen/x64/macro-assembler-x64.cc
@@ -14,6 +14,7 @@
 #include "src/codegen/register-configuration.h"
 #include "src/codegen/string-constants.h"
 #include "src/codegen/x64/assembler-x64.h"
+#include "src/codegen/x64/register-x64.h"
 #include "src/common/external-pointer.h"
 #include "src/common/globals.h"
 #include "src/debug/debug.h"
@@ -389,10 +390,8 @@ void TurboAssembler::CallEphemeronKeyBarrier(Register object, Register address,
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode) {
-  CallRecordWriteStub(
-      object, address, remembered_set_action, fp_mode,
-      isolate()->builtins()->builtin_handle(Builtins::kRecordWrite),
-      kNullAddress);
+  CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
+                      Builtins::kRecordWrite, kNullAddress);
 }
 
 void TurboAssembler::CallRecordWriteStub(
@@ -400,14 +399,15 @@ void TurboAssembler::CallRecordWriteStub(
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
     Address wasm_target) {
   CallRecordWriteStub(object, address, remembered_set_action, fp_mode,
-                      Handle<Code>::null(), wasm_target);
+                      Builtins::kNoBuiltinId, wasm_target);
 }
 
 void TurboAssembler::CallRecordWriteStub(
     Register object, Register address,
     RememberedSetAction remembered_set_action, SaveFPRegsMode fp_mode,
-    Handle<Code> code_target, Address wasm_target) {
-  DCHECK_NE(code_target.is_null(), wasm_target == kNullAddress);
+    int builtin_index, Address wasm_target) {
+  DCHECK_NE(builtin_index == Builtins::kNoBuiltinId,
+            wasm_target == kNullAddress);
 
   RecordWriteDescriptor descriptor;
   RegList registers = descriptor.allocatable_registers();
@@ -436,10 +436,14 @@ void TurboAssembler::CallRecordWriteStub(
   } else {
     movq(fp_mode_parameter, remembered_set_parameter);
   }
-  if (code_target.is_null()) {
+  if (builtin_index == Builtins::kNoBuiltinId) {
     // Use {near_call} for direct Wasm call within a module.
     near_call(wasm_target, RelocInfo::WASM_STUB_CALL);
+  } else if (options().inline_offheap_trampolines) {
+    CallBuiltin(builtin_index);
   } else {
+    Handle<Code> code_target =
+        isolate()->builtins()->builtin_handle(Builtins::kRecordWrite);
     Call(code_target, RelocInfo::CODE_TARGET);
   }
 
@@ -690,6 +694,49 @@ int TurboAssembler::PopCallerSaved(SaveFPRegsMode fp_mode, Register exclusion1,
   return bytes;
 }
 
+void TurboAssembler::Movdqa(XMMRegister dst, XMMRegister src) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    // Many AVX processors have separate integer/floating-point domains. Use the
+    // appropriate instructions.
+    vmovdqa(dst, src);
+  } else {
+    // On SSE, movaps is 1 byte shorter than movdqa, and has the same behavior.
+    // Most SSE processors also don't have the same delay moving between integer
+    // and floating-point domains.
+    movaps(dst, src);
+  }
+}
+
+void TurboAssembler::Movapd(XMMRegister dst, XMMRegister src) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vmovapd(dst, src);
+  } else {
+    // On SSE, movaps is 1 byte shorter than movapd, and has the same behavior.
+    movaps(dst, src);
+  }
+}
+
+template <typename Dst, typename Src>
+void TurboAssembler::Movdqu(Dst dst, Src src) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vmovdqu(dst, src);
+  } else {
+    // movups is 1 byte shorter than movdqu. On most SSE systems, this incurs
+    // no delay moving between integer and floating-point domain.
+    movups(dst, src);
+  }
+}
+
+template void TurboAssembler::Movdqu<XMMRegister, Operand>(XMMRegister dst,
+                                                           Operand src);
+template void TurboAssembler::Movdqu<Operand, XMMRegister>(Operand dst,
+                                                           XMMRegister src);
+template void TurboAssembler::Movdqu<XMMRegister, XMMRegister>(XMMRegister dst,
+                                                               XMMRegister src);
+
 void TurboAssembler::Cvtss2sd(XMMRegister dst, XMMRegister src) {
   if (CpuFeatures::IsSupported(AVX)) {
     CpuFeatureScope scope(this, AVX);
@@ -1293,6 +1340,12 @@ void TurboAssembler::Move(Register dst, Register src) {
   }
 }
 
+void TurboAssembler::Move(XMMRegister dst, XMMRegister src) {
+  if (dst != src) {
+    Movaps(dst, src);
+  }
+}
+
 void TurboAssembler::MovePair(Register dst0, Register src0, Register dst1,
                               Register src1) {
   if (dst0 != src1) {
@@ -1383,16 +1436,6 @@ void MacroAssembler::Negps(XMMRegister dst) {
                  ExternalReference::address_of_float_neg_constant()));
 }
 
-void MacroAssembler::Abspd(XMMRegister dst) {
-  Andps(dst, ExternalReferenceAsOperand(
-                 ExternalReference::address_of_double_abs_constant()));
-}
-
-void MacroAssembler::Negpd(XMMRegister dst) {
-  Xorps(dst, ExternalReferenceAsOperand(
-                 ExternalReference::address_of_double_neg_constant()));
-}
-
 void MacroAssembler::Cmp(Register dst, Handle<Object> source) {
   if (source->IsSmi()) {
     Cmp(dst, Smi::cast(*source));
@@ -1727,15 +1770,39 @@ void TurboAssembler::RetpolineJump(Register reg) {
   ret(0);
 }
 
-void TurboAssembler::Shufps(XMMRegister dst, XMMRegister src, byte imm8) {
+void TurboAssembler::Pmaddwd(XMMRegister dst, XMMRegister src1,
+                             XMMRegister src2) {
   if (CpuFeatures::IsSupported(AVX)) {
     CpuFeatureScope avx_scope(this, AVX);
-    vshufps(dst, src, src, imm8);
+    vpmaddwd(dst, src1, src2);
   } else {
-    if (dst != src) {
-      movss(dst, src);
+    DCHECK_EQ(dst, src1);
+    pmaddwd(dst, src2);
+  }
+}
+
+void TurboAssembler::Pmaddubsw(XMMRegister dst, XMMRegister src1,
+                               XMMRegister src2) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vpmaddubsw(dst, src1, src2);
+  } else {
+    CpuFeatureScope ssse3_scope(this, SSSE3);
+    DCHECK_EQ(dst, src1);
+    pmaddubsw(dst, src2);
+  }
+}
+
+void TurboAssembler::Shufps(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                            byte imm8) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vshufps(dst, src1, src2, imm8);
+  } else {
+    if (dst != src1) {
+      movaps(dst, src1);
     }
-    shufps(dst, src, static_cast<byte>(0));
+    shufps(dst, src2, imm8);
   }
 }
 
@@ -1906,6 +1973,7 @@ void TurboAssembler::Pblendvb(XMMRegister dst, XMMRegister src1,
     CpuFeatureScope avx_scope(this, AVX);
     vpblendvb(dst, src1, src2, mask);
   } else {
+    CpuFeatureScope scope(this, SSE4_1);
     DCHECK_EQ(dst, src1);
     DCHECK_EQ(xmm0, mask);
     pblendvb(dst, src2);
@@ -1918,6 +1986,7 @@ void TurboAssembler::Blendvps(XMMRegister dst, XMMRegister src1,
     CpuFeatureScope avx_scope(this, AVX);
     vblendvps(dst, src1, src2, mask);
   } else {
+    CpuFeatureScope scope(this, SSE4_1);
     DCHECK_EQ(dst, src1);
     DCHECK_EQ(xmm0, mask);
     blendvps(dst, src2);
@@ -1930,6 +1999,7 @@ void TurboAssembler::Blendvpd(XMMRegister dst, XMMRegister src1,
     CpuFeatureScope avx_scope(this, AVX);
     vblendvpd(dst, src1, src2, mask);
   } else {
+    CpuFeatureScope scope(this, SSE4_1);
     DCHECK_EQ(dst, src1);
     DCHECK_EQ(xmm0, mask);
     blendvpd(dst, src2);
@@ -1952,16 +2022,217 @@ void TurboAssembler::Pshufb(XMMRegister dst, XMMRegister src,
   }
 }
 
+void TurboAssembler::Pmulhrsw(XMMRegister dst, XMMRegister src1,
+                              XMMRegister src2) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vpmulhrsw(dst, src1, src2);
+  } else {
+    if (dst != src1) {
+      Movdqa(dst, src1);
+    }
+    CpuFeatureScope sse_scope(this, SSSE3);
+    pmulhrsw(dst, src2);
+  }
+}
+
+void TurboAssembler::I32x4SConvertI16x8High(XMMRegister dst, XMMRegister src) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    // Copy top half (64-bit) of src into both halves of dst.
+    vpunpckhqdq(dst, src, src);
+    vpmovsxwd(dst, dst);
+  } else {
+    if (dst == src) {
+      // 2 bytes shorter than pshufd, but has depdency on dst.
+      movhlps(dst, src);
+      pmovsxwd(dst, dst);
+    } else {
+      // No dependency on dst.
+      pshufd(dst, src, 0xEE);
+      pmovsxwd(dst, dst);
+    }
+  }
+}
+
+void TurboAssembler::I32x4UConvertI16x8High(XMMRegister dst, XMMRegister src) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    // scratch = |0|0|0|0|0|0|0|0|
+    // src     = |a|b|c|d|e|f|g|h|
+    // dst     = |0|a|0|b|0|c|0|d|
+    XMMRegister scratch = dst == src ? kScratchDoubleReg : dst;
+    vpxor(scratch, scratch, scratch);
+    vpunpckhwd(dst, src, scratch);
+  } else {
+    if (dst == src) {
+      // xorps can be executed on more ports than pshufd.
+      xorps(kScratchDoubleReg, kScratchDoubleReg);
+      punpckhwd(dst, kScratchDoubleReg);
+    } else {
+      // No dependency on dst.
+      pshufd(dst, src, 0xEE);
+      pmovzxwd(dst, dst);
+    }
+  }
+}
+
+void TurboAssembler::I16x8SConvertI8x16High(XMMRegister dst, XMMRegister src) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    // Copy top half (64-bit) of src into both halves of dst.
+    vpunpckhqdq(dst, src, src);
+    vpmovsxbw(dst, dst);
+  } else {
+    if (dst == src) {
+      // 2 bytes shorter than pshufd, but has depdency on dst.
+      movhlps(dst, src);
+      pmovsxbw(dst, dst);
+    } else {
+      // No dependency on dst.
+      pshufd(dst, src, 0xEE);
+      pmovsxbw(dst, dst);
+    }
+  }
+}
+
+void TurboAssembler::I16x8UConvertI8x16High(XMMRegister dst, XMMRegister src) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    // scratch = |0|0|0|0|0|0|0|0 | 0|0|0|0|0|0|0|0|
+    // src     = |a|b|c|d|e|f|g|h | i|j|k|l|m|n|o|p|
+    // dst     = |0|a|0|b|0|c|0|d | 0|e|0|f|0|g|0|h|
+    XMMRegister scratch = dst == src ? kScratchDoubleReg : dst;
+    vpxor(scratch, scratch, scratch);
+    vpunpckhbw(dst, src, scratch);
+  } else {
+    if (dst == src) {
+      // xorps can be executed on more ports than pshufd.
+      xorps(kScratchDoubleReg, kScratchDoubleReg);
+      punpckhbw(dst, kScratchDoubleReg);
+    } else {
+      // No dependency on dst.
+      pshufd(dst, src, 0xEE);
+      pmovzxbw(dst, dst);
+    }
+  }
+}
+
+// 1. Unpack src0, src0 into even-number elements of scratch.
+// 2. Unpack src1, src1 into even-number elements of dst.
+// 3. Multiply 1. with 2.
+// For non-AVX, use non-destructive pshufd instead of punpckldq/punpckhdq.
+void TurboAssembler::I64x2ExtMul(XMMRegister dst, XMMRegister src1,
+                                 XMMRegister src2, bool low, bool is_signed) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    if (low) {
+      vpunpckldq(kScratchDoubleReg, src1, src1);
+      vpunpckldq(dst, src2, src2);
+    } else {
+      vpunpckhdq(kScratchDoubleReg, src1, src1);
+      vpunpckhdq(dst, src2, src2);
+    }
+    if (is_signed) {
+      vpmuldq(dst, kScratchDoubleReg, dst);
+    } else {
+      vpmuludq(dst, kScratchDoubleReg, dst);
+    }
+  } else {
+    uint8_t mask = low ? 0x50 : 0xFA;
+    pshufd(kScratchDoubleReg, src1, mask);
+    pshufd(dst, src2, mask);
+    if (is_signed) {
+      CpuFeatureScope avx_scope(this, SSE4_1);
+      pmuldq(dst, kScratchDoubleReg);
+    } else {
+      pmuludq(dst, kScratchDoubleReg);
+    }
+  }
+}
+
+// 1. Multiply low word into scratch.
+// 2. Multiply high word (can be signed or unsigned) into dst.
+// 3. Unpack and interleave scratch and dst into dst.
+void TurboAssembler::I32x4ExtMul(XMMRegister dst, XMMRegister src1,
+                                 XMMRegister src2, bool low, bool is_signed) {
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vpmullw(kScratchDoubleReg, src1, src2);
+    is_signed ? vpmulhw(dst, src1, src2) : vpmulhuw(dst, src1, src2);
+    low ? vpunpcklwd(dst, kScratchDoubleReg, dst)
+        : vpunpckhwd(dst, kScratchDoubleReg, dst);
+  } else {
+    DCHECK_EQ(dst, src1);
+    movdqu(kScratchDoubleReg, src1);
+    pmullw(dst, src2);
+    is_signed ? pmulhw(kScratchDoubleReg, src2)
+              : pmulhuw(kScratchDoubleReg, src2);
+    low ? punpcklwd(dst, kScratchDoubleReg) : punpckhwd(dst, kScratchDoubleReg);
+  }
+}
+
+void TurboAssembler::I16x8ExtMul(XMMRegister dst, XMMRegister src1,
+                                 XMMRegister src2, bool low, bool is_signed) {
+  if (low) {
+    is_signed ? Pmovsxbw(kScratchDoubleReg, src1)
+              : Pmovzxbw(kScratchDoubleReg, src1);
+    is_signed ? Pmovsxbw(dst, src2) : Pmovzxbw(dst, src2);
+    Pmullw(dst, kScratchDoubleReg);
+  } else {
+    Palignr(kScratchDoubleReg, src1, uint8_t{8});
+    is_signed ? Pmovsxbw(kScratchDoubleReg, kScratchDoubleReg)
+              : Pmovzxbw(kScratchDoubleReg, kScratchDoubleReg);
+    Palignr(dst, src2, uint8_t{8});
+    is_signed ? Pmovsxbw(dst, dst) : Pmovzxbw(dst, dst);
+    Pmullw(dst, kScratchDoubleReg);
+  }
+}
+
+void TurboAssembler::Abspd(XMMRegister dst) {
+  Andps(dst, ExternalReferenceAsOperand(
+                 ExternalReference::address_of_double_abs_constant()));
+}
+
+void TurboAssembler::Negpd(XMMRegister dst) {
+  Xorps(dst, ExternalReferenceAsOperand(
+                 ExternalReference::address_of_double_neg_constant()));
+}
+
 void TurboAssembler::Psrld(XMMRegister dst, byte imm8) {
+  Psrld(dst, dst, imm8);
+}
+
+void TurboAssembler::Psrld(XMMRegister dst, XMMRegister src, byte imm8) {
   if (CpuFeatures::IsSupported(AVX)) {
     CpuFeatureScope scope(this, AVX);
-    vpsrld(dst, dst, imm8);
+    vpsrld(dst, src, imm8);
   } else {
     DCHECK(!IsEnabled(AVX));
+    DCHECK_EQ(dst, src);
     psrld(dst, imm8);
   }
 }
 
+void TurboAssembler::S128Select(XMMRegister dst, XMMRegister mask,
+                                XMMRegister src1, XMMRegister src2) {
+  // v128.select = v128.or(v128.and(v1, c), v128.andnot(v2, c)).
+  // pandn(x, y) = !x & y, so we have to flip the mask and input.
+  if (CpuFeatures::IsSupported(AVX)) {
+    CpuFeatureScope avx_scope(this, AVX);
+    vpandn(kScratchDoubleReg, mask, src2);
+    vpand(dst, src1, mask);
+    vpor(dst, dst, kScratchDoubleReg);
+  } else {
+    DCHECK_EQ(dst, mask);
+    // Use float ops as they are 1 byte shorter than int ops.
+    movaps(kScratchDoubleReg, mask);
+    andnps(kScratchDoubleReg, src2);
+    andps(dst, src1);
+    orps(dst, kScratchDoubleReg);
+  }
+}
+
 void TurboAssembler::Lzcntl(Register dst, Register src) {
   if (CpuFeatures::IsSupported(LZCNT)) {
     CpuFeatureScope scope(this, LZCNT);
@@ -2958,7 +3229,7 @@ void TurboAssembler::ResetSpeculationPoisonRegister() {
 
 void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
                                            Label* exit, DeoptimizeKind kind,
-                                           Label*) {
+                                           Label* ret, Label*) {
   // Note: Assembler::call is used here on purpose to guarantee fixed-size
   // exits even on Atom CPUs; see TurboAssembler::Call for Atom-specific
   // performance tuning which emits a different instruction sequence.
@@ -2967,7 +3238,16 @@ void TurboAssembler::CallForDeoptimization(Builtins::Name target, int,
             (kind == DeoptimizeKind::kLazy)
                 ? Deoptimizer::kLazyDeoptExitSize
                 : Deoptimizer::kNonLazyDeoptExitSize);
-  USE(exit, kind);
+
+  if (kind == DeoptimizeKind::kEagerWithResume) {
+    bool old_predictable_code_size = predictable_code_size();
+    set_predictable_code_size(true);
+    jmp(ret);
+
+    DCHECK_EQ(SizeOfCodeGeneratedSince(exit),
+              Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    set_predictable_code_size(old_predictable_code_size);
+  }
 }
 
 void TurboAssembler::Trap() { int3(); }
diff --git a/deps/v8/src/codegen/x64/macro-assembler-x64.h b/deps/v8/src/codegen/x64/macro-assembler-x64.h
index 9fc4d94768a7ca..df87c076384be8 100644
--- a/deps/v8/src/codegen/x64/macro-assembler-x64.h
+++ b/deps/v8/src/codegen/x64/macro-assembler-x64.h
@@ -141,14 +141,13 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_OP(Movd, movd)
   AVX_OP(Movq, movq)
   AVX_OP(Movaps, movaps)
-  AVX_OP(Movapd, movapd)
   AVX_OP(Movups, movups)
   AVX_OP(Movmskps, movmskps)
   AVX_OP(Movmskpd, movmskpd)
   AVX_OP(Pmovmskb, pmovmskb)
   AVX_OP(Movss, movss)
   AVX_OP(Movsd, movsd)
-  AVX_OP(Movdqu, movdqu)
+  AVX_OP(Movhlps, movhlps)
   AVX_OP(Movlps, movlps)
   AVX_OP(Movhps, movhps)
   AVX_OP(Pcmpeqb, pcmpeqb)
@@ -208,7 +207,6 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_OP(Psrlw, psrlw)
   AVX_OP(Psrld, psrld)
   AVX_OP(Psrlq, psrlq)
-  AVX_OP(Pmaddwd, pmaddwd)
   AVX_OP(Paddb, paddb)
   AVX_OP(Paddw, paddw)
   AVX_OP(Paddd, paddd)
@@ -254,6 +252,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   AVX_OP(Movlhps, movlhps)
   AVX_OP_SSE3(Haddps, haddps)
   AVX_OP_SSE3(Movddup, movddup)
+  AVX_OP_SSE3(Movshdup, movshdup)
   AVX_OP_SSSE3(Phaddd, phaddd)
   AVX_OP_SSSE3(Phaddw, phaddw)
   AVX_OP_SSSE3(Pshufb, pshufb)
@@ -354,6 +353,12 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
                      Label* condition_met,
                      Label::Distance condition_met_distance = Label::kFar);
 
+  void Movapd(XMMRegister dst, XMMRegister src);
+  void Movdqa(XMMRegister dst, XMMRegister src);
+
+  template <typename Dst, typename Src>
+  void Movdqu(Dst dst, Src src);
+
   void Cvtss2sd(XMMRegister dst, XMMRegister src);
   void Cvtss2sd(XMMRegister dst, Operand src);
   void Cvtsd2ss(XMMRegister dst, XMMRegister src);
@@ -443,6 +448,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   // Move if the registers are not identical.
   void Move(Register target, Register source);
+  void Move(XMMRegister target, XMMRegister source);
 
   void Move(Register dst, Handle<HeapObject> source,
             RelocInfo::Mode rmode = RelocInfo::FULL_EMBEDDED_OBJECT);
@@ -516,14 +522,18 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void RetpolineJump(Register reg);
 
   void CallForDeoptimization(Builtins::Name target, int deopt_id, Label* exit,
-                             DeoptimizeKind kind,
+                             DeoptimizeKind kind, Label* ret,
                              Label* jump_deoptimization_entry_label);
 
   void Trap() override;
   void DebugBreak() override;
 
-  // Shufps that will mov src into dst if AVX is not supported.
-  void Shufps(XMMRegister dst, XMMRegister src, byte imm8);
+  // Supports both AVX (dst != src1) and SSE (checks that dst == src1).
+  void Pmaddwd(XMMRegister dst, XMMRegister src1, XMMRegister src2);
+  void Pmaddubsw(XMMRegister dst, XMMRegister src1, XMMRegister src2);
+
+  // Shufps that will mov src1 into dst if AVX is not supported.
+  void Shufps(XMMRegister dst, XMMRegister src1, XMMRegister src2, byte imm8);
 
   // Non-SSE2 instructions.
   void Pextrd(Register dst, XMMRegister src, uint8_t imm8);
@@ -546,6 +556,9 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
   void Pslld(XMMRegister dst, byte imm8);
   void Psrld(XMMRegister dst, byte imm8);
 
+  // Supports both AVX (dst != src1) and SSE (checks that dst == src1).
+  void Psrld(XMMRegister dst, XMMRegister src, byte imm8);
+
   void Pblendvb(XMMRegister dst, XMMRegister src1, XMMRegister src2,
                 XMMRegister mask);
   void Blendvps(XMMRegister dst, XMMRegister src1, XMMRegister src2,
@@ -555,6 +568,30 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   // Supports both SSE and AVX. Move src1 to dst if they are not equal on SSE.
   void Pshufb(XMMRegister dst, XMMRegister src1, XMMRegister src2);
+  void Pmulhrsw(XMMRegister dst, XMMRegister src1, XMMRegister src2);
+
+  // These Wasm SIMD ops do not have direct lowerings on x64. These
+  // helpers are optimized to produce the fastest and smallest codegen.
+  // Defined here to allow usage on both TurboFan and Liftoff.
+  void I16x8SConvertI8x16High(XMMRegister dst, XMMRegister src);
+  void I16x8UConvertI8x16High(XMMRegister dst, XMMRegister src);
+  void I32x4SConvertI16x8High(XMMRegister dst, XMMRegister src);
+  void I32x4UConvertI16x8High(XMMRegister dst, XMMRegister src);
+
+  // Requires dst == mask when AVX is not supported.
+  void S128Select(XMMRegister dst, XMMRegister mask, XMMRegister src1,
+                  XMMRegister src2);
+
+  void I64x2ExtMul(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                   bool low, bool is_signed);
+  // Requires that dst == src1 if AVX is not supported.
+  void I32x4ExtMul(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                   bool low, bool is_signed);
+  void I16x8ExtMul(XMMRegister dst, XMMRegister src1, XMMRegister src2,
+                   bool low, bool is_signed);
+
+  void Abspd(XMMRegister dst);
+  void Negpd(XMMRegister dst);
 
   void CompareRoot(Register with, RootIndex index);
   void CompareRoot(Operand with, RootIndex index);
@@ -723,7 +760,7 @@ class V8_EXPORT_PRIVATE TurboAssembler : public TurboAssemblerBase {
 
   void CallRecordWriteStub(Register object, Register address,
                            RememberedSetAction remembered_set_action,
-                           SaveFPRegsMode fp_mode, Handle<Code> code_target,
+                           SaveFPRegsMode fp_mode, int builtin_index,
                            Address wasm_target);
 };
 
@@ -932,8 +969,6 @@ class V8_EXPORT_PRIVATE MacroAssembler : public TurboAssembler {
   // SIMD macros.
   void Absps(XMMRegister dst);
   void Negps(XMMRegister dst);
-  void Abspd(XMMRegister dst);
-  void Negpd(XMMRegister dst);
   // Generates a trampoline to jump to the off-heap instruction stream.
   void JumpToInstructionStream(Address entry);
 
diff --git a/deps/v8/src/codegen/x64/register-x64.h b/deps/v8/src/codegen/x64/register-x64.h
index 7d5aaab6829458..d9ba5a38b3ba60 100644
--- a/deps/v8/src/codegen/x64/register-x64.h
+++ b/deps/v8/src/codegen/x64/register-x64.h
@@ -82,6 +82,13 @@ constexpr RegList kJSCallerSaved =
                      rbx,  // used as a caller-saved register in JavaScript code
                      rdi);  // callee function
 
+constexpr RegList kCallerSaved =
+#ifdef V8_TARGET_OS_WIN
+    Register::ListOf(rax, rcx, rdx, r8, r9, r10, r11);
+#else
+    Register::ListOf(rax, rcx, rdx, rdi, rsi, r8, r9, r10, r11);
+#endif  // V8_TARGET_OS_WIN
+
 constexpr int kNumJSCallerSaved = 5;
 
 // Number of registers for which space is reserved in safepoints.
diff --git a/deps/v8/src/codegen/x64/sse-instr.h b/deps/v8/src/codegen/x64/sse-instr.h
index 52107ed6b93663..717a79df079c5e 100644
--- a/deps/v8/src/codegen/x64/sse-instr.h
+++ b/deps/v8/src/codegen/x64/sse-instr.h
@@ -35,6 +35,7 @@
   V(divss, F3, 0F, 5E)             \
   V(maxss, F3, 0F, 5F)
 
+// Keep sorted by last code.
 #define SSE2_INSTRUCTION_LIST(V) \
   V(andpd, 66, 0F, 54)           \
   V(andnpd, 66, 0F, 55)          \
@@ -44,12 +45,15 @@
   V(mulpd, 66, 0F, 59)           \
   V(subpd, 66, 0F, 5C)           \
   V(minpd, 66, 0F, 5D)           \
-  V(maxpd, 66, 0F, 5F)           \
   V(divpd, 66, 0F, 5E)           \
+  V(maxpd, 66, 0F, 5F)           \
   V(punpcklbw, 66, 0F, 60)       \
   V(punpcklwd, 66, 0F, 61)       \
   V(punpckldq, 66, 0F, 62)       \
   V(packsswb, 66, 0F, 63)        \
+  V(pcmpgtb, 66, 0F, 64)         \
+  V(pcmpgtw, 66, 0F, 65)         \
+  V(pcmpgtd, 66, 0F, 66)         \
   V(packuswb, 66, 0F, 67)        \
   V(punpckhbw, 66, 0F, 68)       \
   V(punpckhwd, 66, 0F, 69)       \
@@ -57,51 +61,52 @@
   V(packssdw, 66, 0F, 6B)        \
   V(punpcklqdq, 66, 0F, 6C)      \
   V(punpckhqdq, 66, 0F, 6D)      \
-  V(pmaddwd, 66, 0F, F5)         \
-  V(paddb, 66, 0F, FC)           \
-  V(paddw, 66, 0F, FD)           \
-  V(paddd, 66, 0F, FE)           \
-  V(paddq, 66, 0F, D4)           \
-  V(paddsb, 66, 0F, EC)          \
-  V(paddsw, 66, 0F, ED)          \
-  V(paddusb, 66, 0F, DC)         \
-  V(paddusw, 66, 0F, DD)         \
   V(pcmpeqb, 66, 0F, 74)         \
   V(pcmpeqw, 66, 0F, 75)         \
   V(pcmpeqd, 66, 0F, 76)         \
-  V(pcmpgtb, 66, 0F, 64)         \
-  V(pcmpgtw, 66, 0F, 65)         \
-  V(pcmpgtd, 66, 0F, 66)         \
-  V(pmaxsw, 66, 0F, EE)          \
-  V(pmaxub, 66, 0F, DE)          \
-  V(pminsw, 66, 0F, EA)          \
-  V(pminub, 66, 0F, DA)          \
+  V(psrlw, 66, 0F, D1)           \
+  V(psrld, 66, 0F, D2)           \
+  V(psrlq, 66, 0F, D3)           \
+  V(paddq, 66, 0F, D4)           \
   V(pmullw, 66, 0F, D5)          \
-  V(pmuludq, 66, 0F, F4)         \
-  V(psllw, 66, 0F, F1)           \
-  V(pslld, 66, 0F, F2)           \
-  V(psllq, 66, 0F, F3)           \
+  V(psubusb, 66, 0F, D8)         \
+  V(psubusw, 66, 0F, D9)         \
+  V(pminub, 66, 0F, DA)          \
+  V(pand, 66, 0F, DB)            \
+  V(paddusb, 66, 0F, DC)         \
+  V(paddusw, 66, 0F, DD)         \
+  V(pmaxub, 66, 0F, DE)          \
+  V(pandn, 66, 0F, DF)           \
   V(pavgb, 66, 0F, E0)           \
   V(psraw, 66, 0F, E1)           \
   V(psrad, 66, 0F, E2)           \
   V(pavgw, 66, 0F, E3)           \
-  V(psrlw, 66, 0F, D1)           \
-  V(psrld, 66, 0F, D2)           \
-  V(psrlq, 66, 0F, D3)           \
+  V(pmulhuw, 66, 0F, E4)         \
+  V(pmulhw, 66, 0F, E5)          \
+  V(psubsb, 66, 0F, E8)          \
+  V(psubsw, 66, 0F, E9)          \
+  V(pminsw, 66, 0F, EA)          \
+  V(por, 66, 0F, EB)             \
+  V(paddsb, 66, 0F, EC)          \
+  V(paddsw, 66, 0F, ED)          \
+  V(pmaxsw, 66, 0F, EE)          \
+  V(pxor, 66, 0F, EF)            \
+  V(psllw, 66, 0F, F1)           \
+  V(pslld, 66, 0F, F2)           \
+  V(psllq, 66, 0F, F3)           \
+  V(pmuludq, 66, 0F, F4)         \
+  V(pmaddwd, 66, 0F, F5)         \
   V(psubb, 66, 0F, F8)           \
   V(psubw, 66, 0F, F9)           \
   V(psubd, 66, 0F, FA)           \
   V(psubq, 66, 0F, FB)           \
-  V(psubsb, 66, 0F, E8)          \
-  V(psubsw, 66, 0F, E9)          \
-  V(psubusb, 66, 0F, D8)         \
-  V(psubusw, 66, 0F, D9)         \
-  V(pand, 66, 0F, DB)            \
-  V(por, 66, 0F, EB)             \
-  V(pxor, 66, 0F, EF)
+  V(paddb, 66, 0F, FC)           \
+  V(paddw, 66, 0F, FD)           \
+  V(paddd, 66, 0F, FE)
 
 // SSE2 instructions whose AVX version has two operands.
 #define SSE2_UNOP_INSTRUCTION_LIST(V) \
+  V(ucomisd, 66, 0F, 2E)              \
   V(sqrtpd, 66, 0F, 51)               \
   V(cvtps2dq, 66, 0F, 5B)
 
@@ -129,12 +134,14 @@
   V(maxsd, F2, 0F, 5F)
 
 #define SSSE3_INSTRUCTION_LIST(V) \
-  V(phaddd, 66, 0F, 38, 02)       \
-  V(phaddw, 66, 0F, 38, 01)       \
   V(pshufb, 66, 0F, 38, 00)       \
+  V(phaddw, 66, 0F, 38, 01)       \
+  V(phaddd, 66, 0F, 38, 02)       \
+  V(pmaddubsw, 66, 0F, 38, 04)    \
   V(psignb, 66, 0F, 38, 08)       \
   V(psignw, 66, 0F, 38, 09)       \
-  V(psignd, 66, 0F, 38, 0A)
+  V(psignd, 66, 0F, 38, 0A)       \
+  V(pmulhrsw, 66, 0F, 38, 0B)
 
 // SSSE3 instructions whose AVX version has two operands.
 #define SSSE3_UNOP_INSTRUCTION_LIST(V) \
@@ -143,6 +150,7 @@
   V(pabsd, 66, 0F, 38, 1E)
 
 #define SSE4_INSTRUCTION_LIST(V) \
+  V(pmuldq, 66, 0F, 38, 28)      \
   V(pcmpeqq, 66, 0F, 38, 29)     \
   V(packusdw, 66, 0F, 38, 2B)    \
   V(pminsb, 66, 0F, 38, 38)      \
@@ -173,4 +181,9 @@
 
 #define SSE4_2_INSTRUCTION_LIST(V) V(pcmpgtq, 66, 0F, 38, 37)
 
+// These require AVX2, and we only define the VEX-128 versions.
+#define AVX2_BROADCAST_LIST(V)    \
+  V(vpbroadcastb, 66, 0F, 38, 78) \
+  V(vpbroadcastw, 66, 0F, 38, 79)
+
 #endif  // V8_CODEGEN_X64_SSE_INSTR_H_
diff --git a/deps/v8/src/common/assert-scope.cc b/deps/v8/src/common/assert-scope.cc
index 520826349d9e0a..c362a629ff9b53 100644
--- a/deps/v8/src/common/assert-scope.cc
+++ b/deps/v8/src/common/assert-scope.cc
@@ -4,6 +4,7 @@
 
 #include "src/common/assert-scope.h"
 
+#include "src/base/bit-field.h"
 #include "src/base/lazy-instance.h"
 #include "src/base/platform/platform.h"
 #include "src/execution/isolate.h"
@@ -14,96 +15,47 @@ namespace internal {
 
 namespace {
 
-DEFINE_LAZY_LEAKY_OBJECT_GETTER(base::Thread::LocalStorageKey,
-                                GetPerThreadAssertKey,
-                                base::Thread::CreateThreadLocalKey())
+template <PerThreadAssertType kType>
+using PerThreadDataBit = base::BitField<bool, kType, 1>;
+template <PerIsolateAssertType kType>
+using PerIsolateDataBit = base::BitField<bool, kType, 1>;
 
-}  // namespace
+// Thread-local storage for assert data. Default all asserts to "allow".
+thread_local uint32_t current_per_thread_assert_data(~0);
 
-class PerThreadAssertData final {
- public:
-  PerThreadAssertData() : nesting_level_(0) {
-    for (int i = 0; i < LAST_PER_THREAD_ASSERT_TYPE; i++) {
-      assert_states_[i] = true;
-    }
-  }
-
-  ~PerThreadAssertData() {
-    for (int i = 0; i < LAST_PER_THREAD_ASSERT_TYPE; ++i) {
-      DCHECK(assert_states_[i]);
-    }
-  }
-
-  bool Get(PerThreadAssertType type) const { return assert_states_[type]; }
-  void Set(PerThreadAssertType type, bool x) { assert_states_[type] = x; }
-
-  void IncrementLevel() { ++nesting_level_; }
-  bool DecrementLevel() { return --nesting_level_ == 0; }
-
-  static PerThreadAssertData* GetCurrent() {
-    return reinterpret_cast<PerThreadAssertData*>(
-        base::Thread::GetThreadLocal(*GetPerThreadAssertKey()));
-  }
-  static void SetCurrent(PerThreadAssertData* data) {
-    base::Thread::SetThreadLocal(*GetPerThreadAssertKey(), data);
-  }
-
- private:
-  bool assert_states_[LAST_PER_THREAD_ASSERT_TYPE];
-  int nesting_level_;
-
-  DISALLOW_COPY_AND_ASSIGN(PerThreadAssertData);
-};
+}  // namespace
 
 template <PerThreadAssertType kType, bool kAllow>
-PerThreadAssertScope<kType, kAllow>::PerThreadAssertScope() {
-  PerThreadAssertData* current_data = PerThreadAssertData::GetCurrent();
-  if (current_data == nullptr) {
-    current_data = new PerThreadAssertData();
-    PerThreadAssertData::SetCurrent(current_data);
-  }
-  data_and_old_state_.update(current_data, current_data->Get(kType));
-  current_data->IncrementLevel();
-  current_data->Set(kType, kAllow);
+PerThreadAssertScope<kType, kAllow>::PerThreadAssertScope()
+    : old_data_(current_per_thread_assert_data) {
+  current_per_thread_assert_data =
+      PerThreadDataBit<kType>::update(old_data_.value(), kAllow);
 }
 
 template <PerThreadAssertType kType, bool kAllow>
 PerThreadAssertScope<kType, kAllow>::~PerThreadAssertScope() {
-  if (data() == nullptr) return;
+  if (!old_data_.has_value()) return;
   Release();
 }
 
 template <PerThreadAssertType kType, bool kAllow>
 void PerThreadAssertScope<kType, kAllow>::Release() {
-  auto* current_data = data();
-  DCHECK_NOT_NULL(current_data);
-  current_data->Set(kType, old_state());
-  if (current_data->DecrementLevel()) {
-    PerThreadAssertData::SetCurrent(nullptr);
-    delete current_data;
-  }
-  set_data(nullptr);
+  current_per_thread_assert_data = old_data_.value();
+  old_data_.reset();
 }
 
 // static
 template <PerThreadAssertType kType, bool kAllow>
 bool PerThreadAssertScope<kType, kAllow>::IsAllowed() {
-  PerThreadAssertData* current_data = PerThreadAssertData::GetCurrent();
-  return current_data == nullptr || current_data->Get(kType);
+  return PerThreadDataBit<kType>::decode(current_per_thread_assert_data);
 }
 
-namespace {
-template <PerIsolateAssertType kType>
-using DataBit = base::BitField<bool, kType, 1>;
-}  // namespace
-
 template <PerIsolateAssertType kType, bool kAllow>
 PerIsolateAssertScope<kType, kAllow>::PerIsolateAssertScope(Isolate* isolate)
     : isolate_(isolate), old_data_(isolate->per_isolate_assert_data()) {
   DCHECK_NOT_NULL(isolate);
-  STATIC_ASSERT(kType < 32);
   isolate_->set_per_isolate_assert_data(
-      DataBit<kType>::update(old_data_, kAllow));
+      PerIsolateDataBit<kType>::update(old_data_, kAllow));
 }
 
 template <PerIsolateAssertType kType, bool kAllow>
@@ -114,16 +66,16 @@ PerIsolateAssertScope<kType, kAllow>::~PerIsolateAssertScope() {
 // static
 template <PerIsolateAssertType kType, bool kAllow>
 bool PerIsolateAssertScope<kType, kAllow>::IsAllowed(Isolate* isolate) {
-  return DataBit<kType>::decode(isolate->per_isolate_assert_data());
+  return PerIsolateDataBit<kType>::decode(isolate->per_isolate_assert_data());
 }
 
 // -----------------------------------------------------------------------------
 // Instantiations.
 
-template class PerThreadAssertScope<GARBAGE_COLLECTION_ASSERT, false>;
-template class PerThreadAssertScope<GARBAGE_COLLECTION_ASSERT, true>;
 template class PerThreadAssertScope<HEAP_ALLOCATION_ASSERT, false>;
 template class PerThreadAssertScope<HEAP_ALLOCATION_ASSERT, true>;
+template class PerThreadAssertScope<SAFEPOINTS_ASSERT, false>;
+template class PerThreadAssertScope<SAFEPOINTS_ASSERT, true>;
 template class PerThreadAssertScope<HANDLE_ALLOCATION_ASSERT, false>;
 template class PerThreadAssertScope<HANDLE_ALLOCATION_ASSERT, true>;
 template class PerThreadAssertScope<HANDLE_DEREFERENCE_ASSERT, false>;
@@ -132,6 +84,7 @@ template class PerThreadAssertScope<CODE_DEPENDENCY_CHANGE_ASSERT, false>;
 template class PerThreadAssertScope<CODE_DEPENDENCY_CHANGE_ASSERT, true>;
 template class PerThreadAssertScope<CODE_ALLOCATION_ASSERT, false>;
 template class PerThreadAssertScope<CODE_ALLOCATION_ASSERT, true>;
+template class PerThreadAssertScope<GC_MOLE, false>;
 
 template class PerIsolateAssertScope<JAVASCRIPT_EXECUTION_ASSERT, false>;
 template class PerIsolateAssertScope<JAVASCRIPT_EXECUTION_ASSERT, true>;
diff --git a/deps/v8/src/common/assert-scope.h b/deps/v8/src/common/assert-scope.h
index 8937197d2695b3..be687e73824444 100644
--- a/deps/v8/src/common/assert-scope.h
+++ b/deps/v8/src/common/assert-scope.h
@@ -13,28 +13,22 @@
 #include "src/base/optional.h"
 #include "src/base/platform/mutex.h"
 #include "src/common/globals.h"
-#include "src/utils/pointer-with-payload.h"
 
 namespace v8 {
 namespace internal {
 
 // Forward declarations.
 class Isolate;
-class PerThreadAssertData;
-
-template <>
-struct PointerWithPayloadTraits<PerThreadAssertData> {
-  static constexpr int value = 1;
-};
 
 enum PerThreadAssertType {
-  GARBAGE_COLLECTION_ASSERT,
+  SAFEPOINTS_ASSERT,
   HEAP_ALLOCATION_ASSERT,
   HANDLE_ALLOCATION_ASSERT,
   HANDLE_DEREFERENCE_ASSERT,
   CODE_DEPENDENCY_CHANGE_ASSERT,
   CODE_ALLOCATION_ASSERT,
-  LAST_PER_THREAD_ASSERT_TYPE
+  // Dummy type for disabling GC mole.
+  GC_MOLE,
 };
 
 enum PerIsolateAssertType {
@@ -43,43 +37,32 @@ enum PerIsolateAssertType {
   JAVASCRIPT_EXECUTION_DUMP,
   DEOPTIMIZATION_ASSERT,
   COMPILATION_ASSERT,
-  NO_EXCEPTION_ASSERT
+  NO_EXCEPTION_ASSERT,
 };
 
 template <PerThreadAssertType kType, bool kAllow>
-class PerThreadAssertScope {
+class V8_NODISCARD PerThreadAssertScope {
  public:
   V8_EXPORT_PRIVATE PerThreadAssertScope();
   V8_EXPORT_PRIVATE ~PerThreadAssertScope();
 
+  PerThreadAssertScope(const PerThreadAssertScope&) = delete;
+  PerThreadAssertScope& operator=(const PerThreadAssertScope&) = delete;
+
   V8_EXPORT_PRIVATE static bool IsAllowed();
 
   void Release();
 
  private:
-  PointerWithPayload<PerThreadAssertData, bool, 1> data_and_old_state_;
-
-  V8_INLINE void set_data(PerThreadAssertData* data) {
-    data_and_old_state_.SetPointer(data);
-  }
-
-  V8_INLINE PerThreadAssertData* data() const {
-    return data_and_old_state_.GetPointer();
-  }
-
-  V8_INLINE void set_old_state(bool old_state) {
-    return data_and_old_state_.SetPayload(old_state);
-  }
-
-  V8_INLINE bool old_state() const { return data_and_old_state_.GetPayload(); }
-
-  DISALLOW_COPY_AND_ASSIGN(PerThreadAssertScope);
+  base::Optional<uint32_t> old_data_;
 };
 
-template <PerIsolateAssertType type, bool allow>
-class PerIsolateAssertScope {
+template <PerIsolateAssertType kType, bool kAllow>
+class V8_NODISCARD PerIsolateAssertScope {
  public:
   V8_EXPORT_PRIVATE explicit PerIsolateAssertScope(Isolate* isolate);
+  PerIsolateAssertScope(const PerIsolateAssertScope&) = delete;
+  PerIsolateAssertScope& operator=(const PerIsolateAssertScope&) = delete;
   V8_EXPORT_PRIVATE ~PerIsolateAssertScope();
 
   static bool IsAllowed(Isolate* isolate);
@@ -87,15 +70,54 @@ class PerIsolateAssertScope {
  private:
   Isolate* isolate_;
   uint32_t old_data_;
+};
+
+template <typename... Scopes>
+class CombinationAssertScope;
+
+// Base case for CombinationAssertScope (equivalent to Scope).
+template <typename Scope>
+class V8_NODISCARD CombinationAssertScope<Scope> : public Scope {
+ public:
+  V8_EXPORT_PRIVATE static bool IsAllowed() {
+    // Define IsAllowed() explicitly rather than with using Scope::IsAllowed, to
+    // allow SFINAE removal of IsAllowed() when it's not defined (under debug).
+    return Scope::IsAllowed();
+  }
+  using Scope::Release;
+  using Scope::Scope;
+};
+
+// Inductive case for CombinationAssertScope.
+template <typename Scope, typename... Scopes>
+class CombinationAssertScope<Scope, Scopes...>
+    : public Scope, public CombinationAssertScope<Scopes...> {
+  using NextScopes = CombinationAssertScope<Scopes...>;
+
+ public:
+  // Constructor for per-thread scopes.
+  V8_EXPORT_PRIVATE CombinationAssertScope() : Scope(), NextScopes() {}
+  // Constructor for per-isolate scopes.
+  V8_EXPORT_PRIVATE explicit CombinationAssertScope(Isolate* isolate)
+      : Scope(isolate), NextScopes(isolate) {}
+
+  V8_EXPORT_PRIVATE static bool IsAllowed() {
+    return Scope::IsAllowed() && NextScopes::IsAllowed();
+  }
 
-  DISALLOW_COPY_AND_ASSIGN(PerIsolateAssertScope);
+  void Release() {
+    // Release in reverse order.
+    NextScopes::Release();
+    Scope::Release();
+  }
 };
 
-template <PerThreadAssertType type, bool allow>
+template <PerThreadAssertType kType, bool kAllow>
 #ifdef DEBUG
-class PerThreadAssertScopeDebugOnly : public PerThreadAssertScope<type, allow> {
+class PerThreadAssertScopeDebugOnly
+    : public PerThreadAssertScope<kType, kAllow> {
 #else
-class PerThreadAssertScopeDebugOnly {
+class V8_NODISCARD PerThreadAssertScopeDebugOnly {
  public:
   PerThreadAssertScopeDebugOnly() {  // NOLINT (modernize-use-equals-default)
     // Define a constructor to avoid unused variable warnings.
@@ -104,15 +126,15 @@ class PerThreadAssertScopeDebugOnly {
 #endif
 };
 
-template <PerIsolateAssertType type, bool allow>
+template <PerIsolateAssertType kType, bool kAllow>
 #ifdef DEBUG
 class PerIsolateAssertScopeDebugOnly
-    : public PerIsolateAssertScope<type, allow> {
+    : public PerIsolateAssertScope<kType, kAllow> {
  public:
   explicit PerIsolateAssertScopeDebugOnly(Isolate* isolate)
-      : PerIsolateAssertScope<type, allow>(isolate) {}
+      : PerIsolateAssertScope<kType, kAllow>(isolate) {}
 #else
-class PerIsolateAssertScopeDebugOnly {
+class V8_NODISCARD PerIsolateAssertScopeDebugOnly {
  public:
   explicit PerIsolateAssertScopeDebugOnly(Isolate* isolate) {}
 #endif
@@ -128,35 +150,16 @@ using DisallowHandleAllocation =
 using AllowHandleAllocation =
     PerThreadAssertScopeDebugOnly<HANDLE_ALLOCATION_ASSERT, true>;
 
-// Scope to document where we do not expect garbage collections. It differs from
-// DisallowHeapAllocation by also forbidding safepoints.
-using DisallowGarbageCollection =
-    PerThreadAssertScopeDebugOnly<GARBAGE_COLLECTION_ASSERT, false>;
-// The DISALLOW_GARBAGE_COLLECTION macro can be used to define a
-// DisallowGarbageCollection field in classes that isn't present in release
-// builds.
-#ifdef DEBUG
-#define DISALLOW_GARBAGE_COLLECTION(name) DisallowGarbageCollection name;
-#else
-#define DISALLOW_GARBAGE_COLLECTION(name)
-#endif
+// Scope to document where we do not expect safepoints to be entered.
+using DisallowSafepoints =
+    PerThreadAssertScopeDebugOnly<SAFEPOINTS_ASSERT, false>;
 
-// Scope to introduce an exception to DisallowGarbageCollection.
-using AllowGarbageCollection =
-    PerThreadAssertScopeDebugOnly<GARBAGE_COLLECTION_ASSERT, true>;
+// Scope to introduce an exception to DisallowSafepoints.
+using AllowSafepoints = PerThreadAssertScopeDebugOnly<SAFEPOINTS_ASSERT, true>;
 
-// Scope to document where we do not expect any allocation and GC. Deprecated
-// and will eventually be removed, use DisallowGarbageCollection instead.
+// Scope to document where we do not expect any allocation.
 using DisallowHeapAllocation =
     PerThreadAssertScopeDebugOnly<HEAP_ALLOCATION_ASSERT, false>;
-// The DISALLOW_HEAP_ALLOCATION macro can be used to define a
-// DisallowHeapAllocation field in classes that isn't present in release
-// builds.
-#ifdef DEBUG
-#define DISALLOW_HEAP_ALLOCATION(name) DisallowHeapAllocation name;
-#else
-#define DISALLOW_HEAP_ALLOCATION(name)
-#endif
 
 // Scope to introduce an exception to DisallowHeapAllocation.
 using AllowHeapAllocation =
@@ -186,12 +189,38 @@ using DisallowCodeAllocation =
 using AllowCodeAllocation =
     PerThreadAssertScopeDebugOnly<CODE_ALLOCATION_ASSERT, true>;
 
-class DisallowHeapAccess {
-  DisallowCodeDependencyChange no_dependency_change_;
-  DisallowHandleAllocation no_handle_allocation_;
-  DisallowHandleDereference no_handle_dereference_;
-  DisallowHeapAllocation no_heap_allocation_;
-};
+// Scope to document where we do not expect garbage collections. It differs from
+// DisallowHeapAllocation by also forbidding safepoints.
+using DisallowGarbageCollection =
+    CombinationAssertScope<DisallowSafepoints, DisallowHeapAllocation>;
+
+// Scope to skip gc mole verification in places where we do tricky raw
+// work.
+using DisableGCMole = PerThreadAssertScopeDebugOnly<GC_MOLE, false>;
+
+// The DISALLOW_GARBAGE_COLLECTION macro can be used to define a
+// DisallowGarbageCollection field in classes that isn't present in release
+// builds.
+#ifdef DEBUG
+#define DISALLOW_GARBAGE_COLLECTION(name) DisallowGarbageCollection name;
+#else
+#define DISALLOW_GARBAGE_COLLECTION(name)
+#endif
+
+// Scope to introduce an exception to DisallowGarbageCollection.
+using AllowGarbageCollection =
+    CombinationAssertScope<AllowSafepoints, AllowHeapAllocation>;
+
+// Scope to document where we do not expect any access to the heap.
+using DisallowHeapAccess =
+    CombinationAssertScope<DisallowCodeDependencyChange,
+                           DisallowHandleDereference, DisallowHandleAllocation,
+                           DisallowHeapAllocation>;
+
+// Scope to introduce an exception to DisallowHeapAccess.
+using AllowHeapAccess =
+    CombinationAssertScope<AllowCodeDependencyChange, AllowHandleDereference,
+                           AllowHandleAllocation, AllowHeapAllocation>;
 
 class DisallowHeapAccessIf {
  public:
@@ -203,12 +232,12 @@ class DisallowHeapAccessIf {
   base::Optional<DisallowHeapAccess> maybe_disallow_;
 };
 
-// Like MutexGuard but also asserts that no heap allocation happens while
+// Like MutexGuard but also asserts that no garbage collection happens while
 // we're holding the mutex.
-class NoHeapAllocationMutexGuard {
+class V8_NODISCARD NoGarbageCollectionMutexGuard {
  public:
-  explicit NoHeapAllocationMutexGuard(base::Mutex* mutex)
-      : guard_(mutex), mutex_(mutex), no_gc_(new DisallowHeapAllocation()) {}
+  explicit NoGarbageCollectionMutexGuard(base::Mutex* mutex)
+      : guard_(mutex), mutex_(mutex), no_gc_(new DisallowGarbageCollection()) {}
 
   void Unlock() {
     mutex_->Unlock();
@@ -216,13 +245,13 @@ class NoHeapAllocationMutexGuard {
   }
   void Lock() {
     mutex_->Lock();
-    no_gc_.reset(new DisallowHeapAllocation());
+    no_gc_.reset(new DisallowGarbageCollection());
   }
 
  private:
   base::MutexGuard guard_;
   base::Mutex* mutex_;
-  std::unique_ptr<DisallowHeapAllocation> no_gc_;
+  std::unique_ptr<DisallowGarbageCollection> no_gc_;
 };
 
 // Per-isolate assert scopes.
@@ -286,6 +315,8 @@ using AllowExceptions =
 // Explicit instantiation declarations.
 extern template class PerThreadAssertScope<HEAP_ALLOCATION_ASSERT, false>;
 extern template class PerThreadAssertScope<HEAP_ALLOCATION_ASSERT, true>;
+extern template class PerThreadAssertScope<SAFEPOINTS_ASSERT, false>;
+extern template class PerThreadAssertScope<SAFEPOINTS_ASSERT, true>;
 extern template class PerThreadAssertScope<HANDLE_ALLOCATION_ASSERT, false>;
 extern template class PerThreadAssertScope<HANDLE_ALLOCATION_ASSERT, true>;
 extern template class PerThreadAssertScope<HANDLE_DEREFERENCE_ASSERT, false>;
@@ -295,6 +326,7 @@ extern template class PerThreadAssertScope<CODE_DEPENDENCY_CHANGE_ASSERT,
 extern template class PerThreadAssertScope<CODE_DEPENDENCY_CHANGE_ASSERT, true>;
 extern template class PerThreadAssertScope<CODE_ALLOCATION_ASSERT, false>;
 extern template class PerThreadAssertScope<CODE_ALLOCATION_ASSERT, true>;
+extern template class PerThreadAssertScope<GC_MOLE, false>;
 
 extern template class PerIsolateAssertScope<JAVASCRIPT_EXECUTION_ASSERT, false>;
 extern template class PerIsolateAssertScope<JAVASCRIPT_EXECUTION_ASSERT, true>;
diff --git a/deps/v8/src/common/globals.h b/deps/v8/src/common/globals.h
index 988ab10c154936..516319cb98b0a3 100644
--- a/deps/v8/src/common/globals.h
+++ b/deps/v8/src/common/globals.h
@@ -465,14 +465,18 @@ constexpr int kNoDeoptimizationId = -1;
 // - Bailout: a check failed in the optimized code but we don't
 //   deoptimize the code, but try to heal the feedback and try to rerun
 //   the optimized code again.
+// - EagerWithResume: a check failed in the optimized code, but we can execute
+//   a more expensive check in a builtin that might either result in us resuming
+//   execution in the optimized code, or deoptimizing immediately.
 enum class DeoptimizeKind : uint8_t {
   kEager,
   kSoft,
   kBailout,
   kLazy,
+  kEagerWithResume,
 };
 constexpr DeoptimizeKind kFirstDeoptimizeKind = DeoptimizeKind::kEager;
-constexpr DeoptimizeKind kLastDeoptimizeKind = DeoptimizeKind::kLazy;
+constexpr DeoptimizeKind kLastDeoptimizeKind = DeoptimizeKind::kEagerWithResume;
 STATIC_ASSERT(static_cast<int>(kFirstDeoptimizeKind) == 0);
 constexpr int kDeoptimizeKindCount = static_cast<int>(kLastDeoptimizeKind) + 1;
 inline size_t hash_value(DeoptimizeKind kind) {
@@ -488,6 +492,8 @@ inline std::ostream& operator<<(std::ostream& os, DeoptimizeKind kind) {
       return os << "Lazy";
     case DeoptimizeKind::kBailout:
       return os << "Bailout";
+    case DeoptimizeKind::kEagerWithResume:
+      return os << "EagerMaybeResume";
   }
 }
 
@@ -1638,7 +1644,6 @@ enum class LoadSensitivity {
   V(TrapDataSegmentDropped)        \
   V(TrapElemSegmentDropped)        \
   V(TrapTableOutOfBounds)          \
-  V(TrapBrOnExnNull)               \
   V(TrapRethrowNull)               \
   V(TrapNullDereference)           \
   V(TrapIllegalCast)               \
@@ -1709,7 +1714,7 @@ enum class TraceRetainingPathMode { kEnabled, kDisabled };
 // can be used in Torque.
 enum class VariableAllocationInfo { NONE, STACK, CONTEXT, UNUSED };
 
-enum class DynamicMapChecksStatus : uint8_t {
+enum class DynamicCheckMapsStatus : uint8_t {
   kSuccess = 0,
   kBailout = 1,
   kDeopt = 2
@@ -1758,6 +1763,14 @@ class int31_t {
   int32_t value_;
 };
 
+enum PropertiesEnumerationMode {
+  // String and then Symbol properties according to the spec
+  // ES#sec-object.assign
+  kEnumerationOrder,
+  // Order of property addition
+  kPropertyAdditionOrder,
+};
+
 }  // namespace internal
 
 // Tag dispatching support for acquire loads and release stores.
diff --git a/deps/v8/src/common/message-template.h b/deps/v8/src/common/message-template.h
index c8ff902642fbcc..2cb3e4e3baf89f 100644
--- a/deps/v8/src/common/message-template.h
+++ b/deps/v8/src/common/message-template.h
@@ -564,7 +564,6 @@ namespace internal {
   T(WasmTrapJSTypeError, "type incompatibility when transforming from/to JS")  \
   T(WasmTrapDataSegmentDropped, "data segment has been dropped")               \
   T(WasmTrapElemSegmentDropped, "element segment has been dropped")            \
-  T(WasmTrapBrOnExnNull, "br_on_exn on null value")                            \
   T(WasmTrapRethrowNull, "rethrowing null value")                              \
   T(WasmTrapNullDereference, "dereferencing a null pointer")                   \
   T(WasmTrapIllegalCast, "illegal cast")                                       \
diff --git a/deps/v8/src/compiler-dispatcher/compiler-dispatcher.h b/deps/v8/src/compiler-dispatcher/compiler-dispatcher.h
index 21c7b8a4afff6a..501940314cde28 100644
--- a/deps/v8/src/compiler-dispatcher/compiler-dispatcher.h
+++ b/deps/v8/src/compiler-dispatcher/compiler-dispatcher.h
@@ -78,6 +78,8 @@ class V8_EXPORT_PRIVATE CompilerDispatcher {
 
   CompilerDispatcher(Isolate* isolate, Platform* platform,
                      size_t max_stack_size);
+  CompilerDispatcher(const CompilerDispatcher&) = delete;
+  CompilerDispatcher& operator=(const CompilerDispatcher&) = delete;
   ~CompilerDispatcher();
 
   // Returns true if the compiler dispatcher is enabled.
@@ -195,8 +197,6 @@ class V8_EXPORT_PRIVATE CompilerDispatcher {
   // Test support.
   base::AtomicValue<bool> block_for_testing_;
   base::Semaphore semaphore_for_testing_;
-
-  DISALLOW_COPY_AND_ASSIGN(CompilerDispatcher);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc b/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
index 931a9e197b2c23..d00b9b524bf251 100644
--- a/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
+++ b/deps/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
@@ -10,6 +10,7 @@
 #include "src/execution/isolate.h"
 #include "src/execution/local-isolate.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "src/init/v8.h"
 #include "src/logging/counters.h"
 #include "src/logging/log.h"
@@ -53,15 +54,16 @@ class OptimizingCompileDispatcher::CompileTask : public CancelableTask {
     ++dispatcher_->ref_count_;
   }
 
+  CompileTask(const CompileTask&) = delete;
+  CompileTask& operator=(const CompileTask&) = delete;
+
   ~CompileTask() override = default;
 
  private:
   // v8::Task overrides.
   void RunInternal() override {
     LocalIsolate local_isolate(isolate_, ThreadKind::kBackground);
-    DisallowHeapAllocation no_allocation;
-    DisallowHandleAllocation no_handles;
-    DisallowHandleDereference no_deref;
+    DCHECK(local_isolate.heap()->IsParked());
 
     {
       WorkerThreadRuntimeCallStatsScope runtime_call_stats_scope(
@@ -93,8 +95,6 @@ class OptimizingCompileDispatcher::CompileTask : public CancelableTask {
   Isolate* isolate_;
   WorkerThreadRuntimeCallStats* worker_thread_runtime_call_stats_;
   OptimizingCompileDispatcher* dispatcher_;
-
-  DISALLOW_COPY_AND_ASSIGN(CompileTask);
 };
 
 OptimizingCompileDispatcher::~OptimizingCompileDispatcher() {
@@ -119,8 +119,10 @@ OptimizedCompilationJob* OptimizingCompileDispatcher::NextInput(
   if (check_if_flushing) {
     if (mode_ == FLUSH) {
       UnparkedScope scope(local_isolate->heap());
-      AllowHandleDereference allow_handle_dereference;
+      local_isolate->heap()->AttachPersistentHandles(
+          job->compilation_info()->DetachPersistentHandles());
       DisposeCompilationJob(job, true);
+      local_isolate->heap()->DetachPersistentHandles();
       return nullptr;
     }
   }
diff --git a/deps/v8/src/compiler/access-builder.cc b/deps/v8/src/compiler/access-builder.cc
index ccb8772c4e2b9b..3cc4000d12eaed 100644
--- a/deps/v8/src/compiler/access-builder.cc
+++ b/deps/v8/src/compiler/access-builder.cc
@@ -680,8 +680,8 @@ FieldAccess AccessBuilder::ForModuleRegularImports() {
 }
 
 // static
-FieldAccess AccessBuilder::ForNameHashField() {
-  FieldAccess access = {kTaggedBase,        Name::kHashFieldOffset,
+FieldAccess AccessBuilder::ForNameRawHashField() {
+  FieldAccess access = {kTaggedBase,        Name::kRawHashFieldOffset,
                         Handle<Name>(),     MaybeHandle<Map>(),
                         Type::Unsigned32(), MachineType::Uint32(),
                         kNoWriteBarrier};
diff --git a/deps/v8/src/compiler/access-builder.h b/deps/v8/src/compiler/access-builder.h
index ce1e51ff234c5f..08e11179ba7801 100644
--- a/deps/v8/src/compiler/access-builder.h
+++ b/deps/v8/src/compiler/access-builder.h
@@ -221,8 +221,8 @@ class V8_EXPORT_PRIVATE AccessBuilder final
   // Provides access to Module::regular_imports() field.
   static FieldAccess ForModuleRegularImports();
 
-  // Provides access to Name::hash_field() field.
-  static FieldAccess ForNameHashField();
+  // Provides access to Name::raw_hash_field() field.
+  static FieldAccess ForNameRawHashField();
 
   // Provides access to String::length() field.
   static FieldAccess ForStringLength();
diff --git a/deps/v8/src/compiler/backend/arm/code-generator-arm.cc b/deps/v8/src/compiler/backend/arm/code-generator-arm.cc
index 9267cb1f0c353b..74215cac30e3a7 100644
--- a/deps/v8/src/compiler/backend/arm/code-generator-arm.cc
+++ b/deps/v8/src/compiler/backend/arm/code-generator-arm.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/codegen/arm/constants-arm.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/optimized-compilation-info.h"
@@ -961,7 +962,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ b(exit->label());
       break;
     }
@@ -1638,6 +1639,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
               i.InputDoubleRegister(0));
       DCHECK_EQ(LeaveCC, i.OutputSBit());
       break;
+    case kArmVcnt: {
+      __ vcnt(i.OutputSimd128Register(), i.InputSimd128Register(0));
+      break;
+    }
     case kArmLdrb:
       __ ldrb(i.OutputRegister(), i.InputOffset());
       DCHECK_EQ(LeaveCC, i.OutputSBit());
@@ -1861,6 +1866,23 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ and_(i.OutputRegister(0), i.InputRegister(0),
               Operand(kSpeculationPoisonRegister));
       break;
+    case kArmVmullLow: {
+      auto dt = static_cast<NeonDataType>(MiscField::decode(instr->opcode()));
+      __ vmull(dt, i.OutputSimd128Register(), i.InputSimd128Register(0).low(),
+               i.InputSimd128Register(1).low());
+      break;
+    }
+    case kArmVmullHigh: {
+      auto dt = static_cast<NeonDataType>(MiscField::decode(instr->opcode()));
+      __ vmull(dt, i.OutputSimd128Register(), i.InputSimd128Register(0).high(),
+               i.InputSimd128Register(1).high());
+      break;
+    }
+    case kArmVpaddl: {
+      auto dt = static_cast<NeonDataType>(MiscField::decode(instr->opcode()));
+      __ vpaddl(dt, i.OutputSimd128Register(), i.InputSimd128Register(0));
+      break;
+    }
     case kArmF64x2Splat: {
       Simd128Register dst = i.OutputSimd128Register();
       DoubleRegister src = i.InputDoubleRegister(0);
@@ -2167,6 +2189,39 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_SIMD_SHIFT_RIGHT(vshr, 6, Neon32, NeonU64);
       break;
     }
+    case kArmI64x2BitMask: {
+      UseScratchRegisterScope temps(tasm());
+      Register dst = i.OutputRegister();
+      Simd128Register src = i.InputSimd128Register(0);
+      QwNeonRegister tmp1 = temps.AcquireQ();
+      Register tmp = temps.Acquire();
+
+      __ vshr(NeonU64, tmp1, src, 63);
+      __ vmov(NeonU32, dst, tmp1.low(), 0);
+      __ vmov(NeonU32, tmp, tmp1.high(), 0);
+      __ add(dst, dst, Operand(tmp, LSL, 1));
+      break;
+    }
+    case kArmI64x2SConvertI32x4Low: {
+      __ vmovl(NeonS32, i.OutputSimd128Register(),
+               i.InputSimd128Register(0).low());
+      break;
+    }
+    case kArmI64x2SConvertI32x4High: {
+      __ vmovl(NeonS32, i.OutputSimd128Register(),
+               i.InputSimd128Register(0).high());
+      break;
+    }
+    case kArmI64x2UConvertI32x4Low: {
+      __ vmovl(NeonU32, i.OutputSimd128Register(),
+               i.InputSimd128Register(0).low());
+      break;
+    }
+    case kArmI64x2UConvertI32x4High: {
+      __ vmovl(NeonU32, i.OutputSimd128Register(),
+               i.InputSimd128Register(0).high());
+      break;
+    }
     case kArmF32x4Splat: {
       int src_code = i.InputFloatRegister(0).code();
       __ vdup(Neon32, i.OutputSimd128Register(),
@@ -2394,6 +2449,16 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
               i.InputSimd128Register(1));
       break;
     }
+    case kArmI64x2Eq: {
+      Simd128Register dst = i.OutputSimd128Register();
+      UseScratchRegisterScope temps(tasm());
+      Simd128Register scratch = temps.AcquireQ();
+      __ vceq(Neon32, dst, i.InputSimd128Register(0),
+              i.InputSimd128Register(1));
+      __ vrev64(Neon32, scratch, dst);
+      __ vand(dst, dst, scratch);
+      break;
+    }
     case kArmI32x4Eq: {
       __ vceq(Neon32, i.OutputSimd128Register(), i.InputSimd128Register(0),
               i.InputSimd128Register(1));
@@ -2666,6 +2731,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vmov(NeonU16, dst, tmp2.low(), 0);
       break;
     }
+    case kArmI16x8Q15MulRSatS: {
+      __ vqrdmulh(NeonS16, i.OutputSimd128Register(), i.InputSimd128Register(0),
+                  i.InputSimd128Register(1));
+      break;
+    }
     case kArmI8x16Splat: {
       __ vdup(Neon8, i.OutputSimd128Register(), i.InputRegister(0));
       break;
@@ -2822,6 +2892,19 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vmov(NeonU16, dst, tmp2.low(), 0);
       break;
     }
+    case kArmSignSelect: {
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register mask = i.InputSimd128Register(2);
+      auto sz = static_cast<NeonSize>(MiscField::decode(instr->opcode()));
+      if (Neon64 == sz) {
+        // vclt does not support Neon64.
+        __ vshr(NeonS64, dst, mask, 63);
+      } else {
+        __ vclt(sz, dst, mask, 0);
+      }
+      __ vbsl(dst, i.InputSimd128Register(0), i.InputSimd128Register(1));
+      break;
+    }
     case kArmS128Const: {
       QwNeonRegister dst = i.OutputSimd128Register();
       uint64_t imm1 = make_uint64(i.InputUint32(1), i.InputUint32(0));
@@ -3276,6 +3359,36 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vld1(Neon64, NeonListOperand(dst.low()), i.NeonInputOperand(0));
       break;
     }
+    case kArmS128LoadLaneLow: {
+      Simd128Register dst = i.OutputSimd128Register();
+      DCHECK_EQ(dst, i.InputSimd128Register(0));
+      auto sz = static_cast<NeonSize>(MiscField::decode(instr->opcode()));
+      NeonListOperand dst_list = NeonListOperand(dst.low());
+      __ LoadLane(sz, dst_list, i.InputUint8(1), i.NeonInputOperand(2));
+      break;
+    }
+    case kArmS128LoadLaneHigh: {
+      Simd128Register dst = i.OutputSimd128Register();
+      DCHECK_EQ(dst, i.InputSimd128Register(0));
+      auto sz = static_cast<NeonSize>(MiscField::decode(instr->opcode()));
+      NeonListOperand dst_list = NeonListOperand(dst.high());
+      __ LoadLane(sz, dst_list, i.InputUint8(1), i.NeonInputOperand(2));
+      break;
+    }
+    case kArmS128StoreLaneLow: {
+      Simd128Register src = i.InputSimd128Register(0);
+      NeonListOperand src_list = NeonListOperand(src.low());
+      auto sz = static_cast<NeonSize>(MiscField::decode(instr->opcode()));
+      __ StoreLane(sz, src_list, i.InputUint8(1), i.NeonInputOperand(2));
+      break;
+    }
+    case kArmS128StoreLaneHigh: {
+      Simd128Register src = i.InputSimd128Register(0);
+      NeonListOperand src_list = NeonListOperand(src.high());
+      auto sz = static_cast<NeonSize>(MiscField::decode(instr->opcode()));
+      __ StoreLane(sz, src_list, i.InputUint8(1), i.NeonInputOperand(2));
+      break;
+    }
     case kWord32AtomicLoadInt8:
       ASSEMBLE_ATOMIC_LOAD_INTEGER(ldrsb);
       break;
diff --git a/deps/v8/src/compiler/backend/arm/instruction-codes-arm.h b/deps/v8/src/compiler/backend/arm/instruction-codes-arm.h
index f4629ffec7c465..b5a77a1a10cb78 100644
--- a/deps/v8/src/compiler/backend/arm/instruction-codes-arm.h
+++ b/deps/v8/src/compiler/backend/arm/instruction-codes-arm.h
@@ -75,6 +75,8 @@ namespace compiler {
   V(ArmVabsF64)                    \
   V(ArmVnegF64)                    \
   V(ArmVsqrtF64)                   \
+  V(ArmVmullLow)                   \
+  V(ArmVmullHigh)                  \
   V(ArmVrintmF32)                  \
   V(ArmVrintmF64)                  \
   V(ArmVrintpF32)                  \
@@ -110,6 +112,8 @@ namespace compiler {
   V(ArmVst1F64)                    \
   V(ArmVld1S128)                   \
   V(ArmVst1S128)                   \
+  V(ArmVcnt)                       \
+  V(ArmVpaddl)                     \
   V(ArmFloat32Max)                 \
   V(ArmFloat64Max)                 \
   V(ArmFloat32Min)                 \
@@ -182,6 +186,12 @@ namespace compiler {
   V(ArmI64x2Sub)                   \
   V(ArmI64x2Mul)                   \
   V(ArmI64x2ShrU)                  \
+  V(ArmI64x2BitMask)               \
+  V(ArmI64x2Eq)                    \
+  V(ArmI64x2SConvertI32x4Low)      \
+  V(ArmI64x2SConvertI32x4High)     \
+  V(ArmI64x2UConvertI32x4Low)      \
+  V(ArmI64x2UConvertI32x4High)     \
   V(ArmI32x4Splat)                 \
   V(ArmI32x4ExtractLane)           \
   V(ArmI32x4ReplaceLane)           \
@@ -247,6 +257,7 @@ namespace compiler {
   V(ArmI16x8RoundingAverageU)      \
   V(ArmI16x8Abs)                   \
   V(ArmI16x8BitMask)               \
+  V(ArmI16x8Q15MulRSatS)           \
   V(ArmI8x16Splat)                 \
   V(ArmI8x16ExtractLaneS)          \
   V(ArmI8x16ReplaceLane)           \
@@ -277,6 +288,7 @@ namespace compiler {
   V(ArmI8x16RoundingAverageU)      \
   V(ArmI8x16Abs)                   \
   V(ArmI8x16BitMask)               \
+  V(ArmSignSelect)                 \
   V(ArmS128Const)                  \
   V(ArmS128Zero)                   \
   V(ArmS128AllOnes)                \
@@ -333,6 +345,10 @@ namespace compiler {
   V(ArmS128Load32x2U)              \
   V(ArmS128Load32Zero)             \
   V(ArmS128Load64Zero)             \
+  V(ArmS128LoadLaneLow)            \
+  V(ArmS128LoadLaneHigh)           \
+  V(ArmS128StoreLaneLow)           \
+  V(ArmS128StoreLaneHigh)          \
   V(ArmWord32AtomicPairLoad)       \
   V(ArmWord32AtomicPairStore)      \
   V(ArmWord32AtomicPairAdd)        \
diff --git a/deps/v8/src/compiler/backend/arm/instruction-scheduler-arm.cc b/deps/v8/src/compiler/backend/arm/instruction-scheduler-arm.cc
index 70fb1a7ccf0790..8b52a18482b470 100644
--- a/deps/v8/src/compiler/backend/arm/instruction-scheduler-arm.cc
+++ b/deps/v8/src/compiler/backend/arm/instruction-scheduler-arm.cc
@@ -76,6 +76,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArmVabsF64:
     case kArmVnegF64:
     case kArmVsqrtF64:
+    case kArmVmullLow:
+    case kArmVmullHigh:
     case kArmVrintmF32:
     case kArmVrintmF64:
     case kArmVrintpF32:
@@ -103,6 +105,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArmVmovHighF64U32:
     case kArmVmovF64U32U32:
     case kArmVmovU32U32F64:
+    case kArmVcnt:
+    case kArmVpaddl:
     case kArmFloat32Max:
     case kArmFloat64Max:
     case kArmFloat32Min:
@@ -162,6 +166,12 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArmI64x2Sub:
     case kArmI64x2Mul:
     case kArmI64x2ShrU:
+    case kArmI64x2BitMask:
+    case kArmI64x2Eq:
+    case kArmI64x2SConvertI32x4Low:
+    case kArmI64x2SConvertI32x4High:
+    case kArmI64x2UConvertI32x4Low:
+    case kArmI64x2UConvertI32x4High:
     case kArmI32x4Splat:
     case kArmI32x4ExtractLane:
     case kArmI32x4ReplaceLane:
@@ -227,6 +237,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArmI16x8RoundingAverageU:
     case kArmI16x8Abs:
     case kArmI16x8BitMask:
+    case kArmI16x8Q15MulRSatS:
     case kArmI8x16Splat:
     case kArmI8x16ExtractLaneS:
     case kArmI8x16ReplaceLane:
@@ -257,6 +268,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArmI8x16RoundingAverageU:
     case kArmI8x16Abs:
     case kArmI8x16BitMask:
+    case kArmSignSelect:
     case kArmS128Const:
     case kArmS128Zero:
     case kArmS128AllOnes:
@@ -326,6 +338,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArmS128Load32x2U:
     case kArmS128Load32Zero:
     case kArmS128Load64Zero:
+    case kArmS128LoadLaneLow:
+    case kArmS128LoadLaneHigh:
       return kIsLoadOperation;
 
     case kArmVstrF32:
@@ -347,6 +361,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArmWord32AtomicPairXor:
     case kArmWord32AtomicPairExchange:
     case kArmWord32AtomicPairCompareExchange:
+    case kArmS128StoreLaneLow:
+    case kArmS128StoreLaneHigh:
       return kHasSideEffect;
 
 #define CASE(Name) case k##Name:
diff --git a/deps/v8/src/compiler/backend/arm/instruction-selector-arm.cc b/deps/v8/src/compiler/backend/arm/instruction-selector-arm.cc
index 248f76558e36d0..bd1e7c4b4f398d 100644
--- a/deps/v8/src/compiler/backend/arm/instruction-selector-arm.cc
+++ b/deps/v8/src/compiler/backend/arm/instruction-selector-arm.cc
@@ -5,6 +5,8 @@
 #include "src/base/bits.h"
 #include "src/base/enum-set.h"
 #include "src/base/iterator.h"
+#include "src/base/platform/wrappers.h"
+#include "src/codegen/machine-type.h"
 #include "src/compiler/backend/instruction-selector-impl.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
@@ -78,13 +80,15 @@ class ArmOperandGenerator : public OperandGenerator {
 
 namespace {
 
-void VisitRR(InstructionSelector* selector, ArchOpcode opcode, Node* node) {
+void VisitRR(InstructionSelector* selector, InstructionCode opcode,
+             Node* node) {
   ArmOperandGenerator g(selector);
   selector->Emit(opcode, g.DefineAsRegister(node),
                  g.UseRegister(node->InputAt(0)));
 }
 
-void VisitRRR(InstructionSelector* selector, ArchOpcode opcode, Node* node) {
+void VisitRRR(InstructionSelector* selector, InstructionCode opcode,
+              Node* node) {
   ArmOperandGenerator g(selector);
   selector->Emit(opcode, g.DefineAsRegister(node),
                  g.UseRegister(node->InputAt(0)),
@@ -147,6 +151,14 @@ void VisitRRIR(InstructionSelector* selector, ArchOpcode opcode, Node* node) {
                  g.UseUniqueRegister(node->InputAt(1)));
 }
 
+void VisitRRRR(InstructionSelector* selector, InstructionCode opcode,
+               Node* node) {
+  ArmOperandGenerator g(selector);
+  selector->Emit(
+      opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)),
+      g.UseRegister(node->InputAt(1)), g.UseRegister(node->InputAt(2)));
+}
+
 template <IrOpcode::Value kOpcode, int kImmMin, int kImmMax,
           AddressingMode kImmMode, AddressingMode kRegMode>
 bool TryMatchShift(InstructionSelector* selector,
@@ -499,6 +511,76 @@ void InstructionSelector::VisitAbortCSAAssert(Node* node) {
   Emit(kArchAbortCSAAssert, g.NoOutput(), g.UseFixed(node->InputAt(0), r1));
 }
 
+namespace {
+// Helper struct for load lane and store lane to indicate which opcode to use
+// and what memory size to be encoded in the opcode, and the new lane index.
+struct LoadStoreLaneParams {
+  bool low_op;
+  NeonSize sz;
+  uint8_t laneidx;
+  LoadStoreLaneParams(uint8_t laneidx, NeonSize sz, int lanes)
+      : low_op(laneidx < lanes), sz(sz), laneidx(laneidx % lanes) {}
+};
+
+// The register mapping on ARM (1 Q to 2 D), means that loading/storing high
+// lanes of a Q register is equivalent to loading/storing the high D reg, modulo
+// number of lanes in a D reg. This function decides, based on the laneidx and
+// load/store size, whether the low or high D reg is accessed, and what the new
+// lane index is.
+LoadStoreLaneParams GetLoadStoreLaneParams(MachineRepresentation rep,
+                                           uint8_t laneidx) {
+  if (rep == MachineRepresentation::kWord8) {
+    return LoadStoreLaneParams(laneidx, Neon8, 8);
+  } else if (rep == MachineRepresentation::kWord16) {
+    return LoadStoreLaneParams(laneidx, Neon16, 4);
+  } else if (rep == MachineRepresentation::kWord32) {
+    return LoadStoreLaneParams(laneidx, Neon32, 2);
+  } else if (rep == MachineRepresentation::kWord64) {
+    return LoadStoreLaneParams(laneidx, Neon64, 1);
+  } else {
+    UNREACHABLE();
+  }
+}
+}  // namespace
+
+void InstructionSelector::VisitStoreLane(Node* node) {
+  StoreLaneParameters params = StoreLaneParametersOf(node->op());
+  LoadStoreLaneParams f = GetLoadStoreLaneParams(params.rep, params.laneidx);
+  InstructionCode opcode =
+      f.low_op ? kArmS128StoreLaneLow : kArmS128StoreLaneHigh;
+  opcode |= MiscField::encode(f.sz);
+
+  ArmOperandGenerator g(this);
+  InstructionOperand inputs[4];
+  size_t input_count = 4;
+  inputs[0] = g.UseRegister(node->InputAt(2));
+  inputs[1] = g.UseImmediate(f.laneidx);
+  inputs[2] = g.UseRegister(node->InputAt(0));
+  inputs[3] = g.UseRegister(node->InputAt(1));
+  EmitAddBeforeS128LoadStore(this, &opcode, &input_count, &inputs[2]);
+  Emit(opcode, 0, nullptr, input_count, inputs);
+}
+
+void InstructionSelector::VisitLoadLane(Node* node) {
+  LoadLaneParameters params = LoadLaneParametersOf(node->op());
+  LoadStoreLaneParams f =
+      GetLoadStoreLaneParams(params.rep.representation(), params.laneidx);
+  InstructionCode opcode =
+      f.low_op ? kArmS128LoadLaneLow : kArmS128LoadLaneHigh;
+  opcode |= MiscField::encode(f.sz);
+
+  ArmOperandGenerator g(this);
+  InstructionOperand output = g.DefineSameAsFirst(node);
+  InstructionOperand inputs[4];
+  size_t input_count = 4;
+  inputs[0] = g.UseRegister(node->InputAt(2));
+  inputs[1] = g.UseImmediate(f.laneidx);
+  inputs[2] = g.UseRegister(node->InputAt(0));
+  inputs[3] = g.UseRegister(node->InputAt(1));
+  EmitAddBeforeS128LoadStore(this, &opcode, &input_count, &inputs[2]);
+  Emit(opcode, 1, &output, input_count, inputs);
+}
+
 void InstructionSelector::VisitLoadTransform(Node* node) {
   LoadTransformParameters params = LoadTransformParametersOf(node->op());
   InstructionCode opcode = kArchNop;
@@ -615,13 +697,11 @@ void InstructionSelector::VisitStore(Node* node) {
   WriteBarrierKind write_barrier_kind = store_rep.write_barrier_kind();
   MachineRepresentation rep = store_rep.representation();
 
-  if (FLAG_enable_unconditional_write_barriers &&
-      CanBeTaggedOrCompressedPointer(rep)) {
+  if (FLAG_enable_unconditional_write_barriers && CanBeTaggedPointer(rep)) {
     write_barrier_kind = kFullWriteBarrier;
   }
 
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedPointer(rep));
     AddressingMode addressing_mode;
     InstructionOperand inputs[3];
@@ -1674,7 +1754,6 @@ void InstructionSelector::EmitPrepareResults(
     Node* node) {
   ArmOperandGenerator g(this);
 
-  int reverse_slot = 1;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -1687,10 +1766,11 @@ void InstructionSelector::EmitPrepareResults(
       } else if (output.location.GetType() == MachineType::Simd128()) {
         MarkAsSimd128(output.node);
       }
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       Emit(kArmPeek, g.DefineAsRegister(output.node),
            g.UseImmediate(reverse_slot));
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
@@ -2525,6 +2605,10 @@ void InstructionSelector::VisitWord32AtomicPairCompareExchange(Node* node) {
   V(F32x4Neg, kArmF32x4Neg)                             \
   V(F32x4RecipApprox, kArmF32x4RecipApprox)             \
   V(F32x4RecipSqrtApprox, kArmF32x4RecipSqrtApprox)     \
+  V(I64x2SConvertI32x4Low, kArmI64x2SConvertI32x4Low)   \
+  V(I64x2SConvertI32x4High, kArmI64x2SConvertI32x4High) \
+  V(I64x2UConvertI32x4Low, kArmI64x2UConvertI32x4Low)   \
+  V(I64x2UConvertI32x4High, kArmI64x2UConvertI32x4High) \
   V(I32x4SConvertF32x4, kArmI32x4SConvertF32x4)         \
   V(I32x4SConvertI16x8Low, kArmI32x4SConvertI16x8Low)   \
   V(I32x4SConvertI16x8High, kArmI32x4SConvertI16x8High) \
@@ -2541,6 +2625,7 @@ void InstructionSelector::VisitWord32AtomicPairCompareExchange(Node* node) {
   V(I16x8Abs, kArmI16x8Abs)                             \
   V(I8x16Neg, kArmI8x16Neg)                             \
   V(I8x16Abs, kArmI8x16Abs)                             \
+  V(I8x16Popcnt, kArmVcnt)                              \
   V(S128Not, kArmS128Not)                               \
   V(V32x4AnyTrue, kArmV32x4AnyTrue)                     \
   V(V32x4AllTrue, kArmV32x4AllTrue)                     \
@@ -2593,6 +2678,7 @@ void InstructionSelector::VisitWord32AtomicPairCompareExchange(Node* node) {
   V(I32x4MinS, kArmI32x4MinS)                         \
   V(I32x4MaxS, kArmI32x4MaxS)                         \
   V(I32x4Eq, kArmI32x4Eq)                             \
+  V(I64x2Eq, kArmI64x2Eq)                             \
   V(I32x4Ne, kArmI32x4Ne)                             \
   V(I32x4GtS, kArmI32x4GtS)                           \
   V(I32x4GeS, kArmI32x4GeS)                           \
@@ -2621,6 +2707,7 @@ void InstructionSelector::VisitWord32AtomicPairCompareExchange(Node* node) {
   V(I16x8GtU, kArmI16x8GtU)                           \
   V(I16x8GeU, kArmI16x8GeU)                           \
   V(I16x8RoundingAverageU, kArmI16x8RoundingAverageU) \
+  V(I16x8Q15MulRSatS, kArmI16x8Q15MulRSatS)           \
   V(I8x16SConvertI16x8, kArmI8x16SConvertI16x8)       \
   V(I8x16Add, kArmI8x16Add)                           \
   V(I8x16AddSatS, kArmI8x16AddSatS)                   \
@@ -2657,7 +2744,7 @@ void InstructionSelector::VisitI32x4DotI16x8S(Node* node) {
 void InstructionSelector::VisitS128Const(Node* node) {
   ArmOperandGenerator g(this);
   uint32_t val[kSimd128Size / sizeof(uint32_t)];
-  memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  base::Memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
   // If all bytes are zeros, avoid emitting code for generic constants.
   bool all_zeros = !(val[0] || val[1] || val[2] || val[3]);
   bool all_ones = val[0] == UINT32_MAX && val[1] == UINT32_MAX &&
@@ -2985,6 +3072,10 @@ void InstructionSelector::VisitI32x4BitMask(Node* node) {
   VisitBitMask<kArmI32x4BitMask>(this, node);
 }
 
+void InstructionSelector::VisitI64x2BitMask(Node* node) {
+  VisitBitMask<kArmI64x2BitMask>(this, node);
+}
+
 namespace {
 void VisitF32x4PminOrPmax(InstructionSelector* selector, ArchOpcode opcode,
                           Node* node) {
@@ -3021,6 +3112,52 @@ void InstructionSelector::VisitF64x2Pmax(Node* node) {
   VisitF64x2PminOrPMax(this, kArmF64x2Pmax, node);
 }
 
+#define EXT_MUL_LIST(V)                            \
+  V(I16x8ExtMulLowI8x16S, kArmVmullLow, NeonS8)    \
+  V(I16x8ExtMulHighI8x16S, kArmVmullHigh, NeonS8)  \
+  V(I16x8ExtMulLowI8x16U, kArmVmullLow, NeonU8)    \
+  V(I16x8ExtMulHighI8x16U, kArmVmullHigh, NeonU8)  \
+  V(I32x4ExtMulLowI16x8S, kArmVmullLow, NeonS16)   \
+  V(I32x4ExtMulHighI16x8S, kArmVmullHigh, NeonS16) \
+  V(I32x4ExtMulLowI16x8U, kArmVmullLow, NeonU16)   \
+  V(I32x4ExtMulHighI16x8U, kArmVmullHigh, NeonU16) \
+  V(I64x2ExtMulLowI32x4S, kArmVmullLow, NeonS32)   \
+  V(I64x2ExtMulHighI32x4S, kArmVmullHigh, NeonS32) \
+  V(I64x2ExtMulLowI32x4U, kArmVmullLow, NeonU32)   \
+  V(I64x2ExtMulHighI32x4U, kArmVmullHigh, NeonU32)
+
+#define VISIT_EXT_MUL(OPCODE, VMULL, NEONSIZE)                 \
+  void InstructionSelector::Visit##OPCODE(Node* node) {        \
+    VisitRRR(this, VMULL | MiscField::encode(NEONSIZE), node); \
+  }
+
+EXT_MUL_LIST(VISIT_EXT_MUL)
+
+#undef VISIT_EXT_MUL
+#undef EXT_MUL_LIST
+
+#define VISIT_EXTADD_PAIRWISE(OPCODE, NEONSIZE)                    \
+  void InstructionSelector::Visit##OPCODE(Node* node) {            \
+    VisitRR(this, kArmVpaddl | MiscField::encode(NEONSIZE), node); \
+  }
+VISIT_EXTADD_PAIRWISE(I16x8ExtAddPairwiseI8x16S, NeonS8)
+VISIT_EXTADD_PAIRWISE(I16x8ExtAddPairwiseI8x16U, NeonU8)
+VISIT_EXTADD_PAIRWISE(I32x4ExtAddPairwiseI16x8S, NeonS16)
+VISIT_EXTADD_PAIRWISE(I32x4ExtAddPairwiseI16x8U, NeonU16)
+#undef VISIT_EXTADD_PAIRWISE
+
+#define VISIT_SIGN_SELECT(OPCODE, SIZE)                 \
+  void InstructionSelector::Visit##OPCODE(Node* node) { \
+    InstructionCode opcode = kArmSignSelect;            \
+    opcode |= MiscField::encode(SIZE);                  \
+    VisitRRRR(this, opcode, node);                      \
+  }
+
+VISIT_SIGN_SELECT(I8x16SignSelect, Neon8)
+VISIT_SIGN_SELECT(I16x8SignSelect, Neon16)
+VISIT_SIGN_SELECT(I32x4SignSelect, Neon32)
+VISIT_SIGN_SELECT(I64x2SignSelect, Neon64)
+
 void InstructionSelector::VisitTruncateFloat32ToInt32(Node* node) {
   ArmOperandGenerator g(this);
 
diff --git a/deps/v8/src/compiler/backend/arm64/code-generator-arm64.cc b/deps/v8/src/compiler/backend/arm64/code-generator-arm64.cc
index 02809942a18d33..76613d1182a16d 100644
--- a/deps/v8/src/compiler/backend/arm64/code-generator-arm64.cc
+++ b/deps/v8/src/compiler/backend/arm64/code-generator-arm64.cc
@@ -902,7 +902,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ B(exit->label());
       break;
     }
@@ -1442,6 +1442,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       }
       break;
     }
+    case kArm64Prfm: {
+      __ prfm(MiscField::decode(opcode), i.MemoryOperand(0));
+      break;
+    }
     case kArm64Clz:
       __ Clz(i.OutputRegister64(), i.InputRegister64(0));
       break;
@@ -1641,15 +1645,24 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         __ Cset(i.OutputRegister(1), vc);
       }
       break;
-    case kArm64Float64ToInt64:
+    case kArm64Float64ToInt64: {
       __ Fcvtzs(i.OutputRegister(0), i.InputDoubleRegister(0));
-      if (i.OutputCount() > 1) {
+      bool set_overflow_to_min_i64 = MiscField::decode(instr->opcode());
+      DCHECK_IMPLIES(set_overflow_to_min_i64, i.OutputCount() == 1);
+      if (set_overflow_to_min_i64) {
+        // Avoid INT64_MAX as an overflow indicator and use INT64_MIN instead,
+        // because INT64_MIN allows easier out-of-bounds detection.
+        __ Cmn(i.OutputRegister64(), 1);
+        __ Csinc(i.OutputRegister64(), i.OutputRegister64(),
+                 i.OutputRegister64(), vc);
+      } else if (i.OutputCount() > 1) {
         // See kArm64Float32ToInt64 for a detailed description.
         __ Fcmp(i.InputDoubleRegister(0), static_cast<double>(INT64_MIN));
         __ Ccmp(i.OutputRegister(0), -1, VFlag, ge);
         __ Cset(i.OutputRegister(1), vc);
       }
       break;
+    }
     case kArm64Float32ToUint64:
       __ Fcvtzu(i.OutputRegister64(), i.InputFloat32Register(0));
       if (i.OutputCount() > 1) {
@@ -2208,6 +2221,18 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_SIMD_SHIFT_RIGHT(Ushr, 6, V2D, Ushl, X);
       break;
     }
+    case kArm64I64x2BitMask: {
+      UseScratchRegisterScope scope(tasm());
+      Register dst = i.OutputRegister32();
+      VRegister src = i.InputSimd128Register(0);
+      VRegister tmp1 = scope.AcquireV(kFormat2D);
+      Register tmp2 = scope.AcquireX();
+      __ Ushr(tmp1.V2D(), src.V2D(), 63);
+      __ Mov(dst.X(), tmp1.D(), 0);
+      __ Mov(tmp2.X(), tmp1.D(), 1);
+      __ Add(dst.W(), dst.W(), Operand(tmp2.W(), LSL, 1));
+      break;
+    }
     case kArm64I32x4Splat: {
       __ Dup(i.OutputSimd128Register().V4S(), i.InputRegister32(0));
       break;
@@ -2265,10 +2290,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       SIMD_BINOP_CASE(kArm64I32x4GeU, Cmhs, 4S);
       SIMD_UNOP_CASE(kArm64I32x4Abs, Abs, 4S);
     case kArm64I32x4BitMask: {
+      UseScratchRegisterScope scope(tasm());
       Register dst = i.OutputRegister32();
       VRegister src = i.InputSimd128Register(0);
-      VRegister tmp = i.TempSimd128Register(0);
-      VRegister mask = i.TempSimd128Register(1);
+      VRegister tmp = scope.AcquireQ();
+      VRegister mask = scope.AcquireQ();
 
       __ Sshr(tmp.V4S(), src.V4S(), 31);
       // Set i-th bit of each lane i. When AND with tmp, the lanes that
@@ -2384,10 +2410,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       SIMD_BINOP_CASE(kArm64I16x8Q15MulRSatS, Sqrdmulh, 8H);
       SIMD_UNOP_CASE(kArm64I16x8Abs, Abs, 8H);
     case kArm64I16x8BitMask: {
+      UseScratchRegisterScope scope(tasm());
       Register dst = i.OutputRegister32();
       VRegister src = i.InputSimd128Register(0);
-      VRegister tmp = i.TempSimd128Register(0);
-      VRegister mask = i.TempSimd128Register(1);
+      VRegister tmp = scope.AcquireQ();
+      VRegister mask = scope.AcquireQ();
 
       __ Sshr(tmp.V8H(), src.V8H(), 15);
       // Set i-th bit of each lane i. When AND with tmp, the lanes that
@@ -2490,10 +2517,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       SIMD_BINOP_CASE(kArm64I8x16RoundingAverageU, Urhadd, 16B);
       SIMD_UNOP_CASE(kArm64I8x16Abs, Abs, 16B);
     case kArm64I8x16BitMask: {
+      UseScratchRegisterScope scope(tasm());
       Register dst = i.OutputRegister32();
       VRegister src = i.InputSimd128Register(0);
-      VRegister tmp = i.TempSimd128Register(0);
-      VRegister mask = i.TempSimd128Register(1);
+      VRegister tmp = scope.AcquireQ();
+      VRegister mask = scope.AcquireQ();
 
       // Set i-th bit of each lane i. When AND with tmp, the lanes that
       // are signed will have i-th bit set, unsigned will be 0.
@@ -2506,6 +2534,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Mov(dst.W(), tmp.V8H(), 0);
       break;
     }
+    case kArm64SignSelect: {
+      VectorFormat f = VectorFormatFillQ(MiscField::decode(opcode));
+      __ Cmlt(i.OutputSimd128Register().Format(f),
+              i.InputSimd128Register(2).Format(f), 0);
+      __ Bsl(i.OutputSimd128Register().V16B(), i.InputSimd128Register(0).V16B(),
+             i.InputSimd128Register(1).V16B());
+      break;
+    }
     case kArm64S128Const: {
       uint64_t imm1 = make_uint64(i.InputUint32(1), i.InputUint32(0));
       uint64_t imm2 = make_uint64(i.InputUint32(3), i.InputUint32(2));
@@ -2638,6 +2674,19 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ ld1r(i.OutputSimd128Register().Format(f), i.MemoryOperand(0));
       break;
     }
+    case kArm64LoadLane: {
+      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
+      VectorFormat f = VectorFormatFillQ(MiscField::decode(opcode));
+      int laneidx = i.InputInt8(1);
+      __ ld1(i.OutputSimd128Register().Format(f), laneidx, i.MemoryOperand(2));
+      break;
+    }
+    case kArm64StoreLane: {
+      VectorFormat f = VectorFormatFillQ(MiscField::decode(opcode));
+      int laneidx = i.InputInt8(1);
+      __ st1(i.InputSimd128Register(0).Format(f), laneidx, i.MemoryOperand(2));
+      break;
+    }
     case kArm64S128Load8x8S: {
       __ Ldr(i.OutputSimd128Register().V8B(), i.MemoryOperand(0));
       __ Sxtl(i.OutputSimd128Register().V8H(), i.OutputSimd128Register().V8B());
@@ -3194,17 +3243,24 @@ void CodeGenerator::FinishCode() { __ ForceConstantPoolEmissionWithoutJump(); }
 void CodeGenerator::PrepareForDeoptimizationExits(
     ZoneDeque<DeoptimizationExit*>* exits) {
   __ ForceConstantPoolEmissionWithoutJump();
-  // We are conservative here, assuming all deopts are lazy deopts.
+  // We are conservative here, assuming all deopts are eager with resume deopts.
+  DCHECK_GE(Deoptimizer::kEagerWithResumeDeoptExitSize,
+            Deoptimizer::kLazyDeoptExitSize);
   DCHECK_GE(Deoptimizer::kLazyDeoptExitSize,
             Deoptimizer::kNonLazyDeoptExitSize);
-  __ CheckVeneerPool(
-      false, false,
-      static_cast<int>(exits->size()) * Deoptimizer::kLazyDeoptExitSize);
+  __ CheckVeneerPool(false, false,
+                     static_cast<int>(exits->size()) *
+                         Deoptimizer::kEagerWithResumeDeoptExitSize);
 
   // Check which deopt kinds exist in this Code object, to avoid emitting jumps
   // to unused entries.
   bool saw_deopt_kind[kDeoptimizeKindCount] = {false};
+  constexpr auto eager_with_resume_reason = DeoptimizeReason::kDynamicCheckMaps;
   for (auto exit : *exits) {
+    // TODO(rmcilroy): If we add any other kinds of kEagerWithResume deoptimize
+    // we will need to create a seperate array for each kEagerWithResume builtin
+    DCHECK_IMPLIES(exit->kind() == DeoptimizeKind::kEagerWithResume,
+                   exit->reason() == eager_with_resume_reason);
     saw_deopt_kind[static_cast<int>(exit->kind())] = true;
   }
 
@@ -3215,9 +3271,15 @@ void CodeGenerator::PrepareForDeoptimizationExits(
   for (int i = 0; i < kDeoptimizeKindCount; i++) {
     if (!saw_deopt_kind[i]) continue;
     __ bind(&jump_deoptimization_entry_labels_[i]);
-    __ LoadEntryFromBuiltinIndex(Deoptimizer::GetDeoptimizationEntry(
-                                     isolate(), static_cast<DeoptimizeKind>(i)),
-                                 scratch);
+    DeoptimizeKind kind = static_cast<DeoptimizeKind>(i);
+    if (kind == DeoptimizeKind::kEagerWithResume) {
+      __ LoadEntryFromBuiltinIndex(
+          Deoptimizer::GetDeoptWithResumeBuiltin(eager_with_resume_reason),
+          scratch);
+    } else {
+      __ LoadEntryFromBuiltinIndex(Deoptimizer::GetDeoptimizationEntry(kind),
+                                   scratch);
+    }
     __ Jump(scratch);
   }
 }
diff --git a/deps/v8/src/compiler/backend/arm64/instruction-codes-arm64.h b/deps/v8/src/compiler/backend/arm64/instruction-codes-arm64.h
index c80538f3a9df22..e56d0323fef633 100644
--- a/deps/v8/src/compiler/backend/arm64/instruction-codes-arm64.h
+++ b/deps/v8/src/compiler/backend/arm64/instruction-codes-arm64.h
@@ -93,6 +93,7 @@ namespace compiler {
   V(Arm64Poke)                              \
   V(Arm64PokePair)                          \
   V(Arm64Peek)                              \
+  V(Arm64Prfm)                              \
   V(Arm64Float32Cmp)                        \
   V(Arm64Float32Add)                        \
   V(Arm64Float32Sub)                        \
@@ -233,6 +234,7 @@ namespace compiler {
   V(Arm64I64x2Mul)                          \
   V(Arm64I64x2Eq)                           \
   V(Arm64I64x2ShrU)                         \
+  V(Arm64I64x2BitMask)                      \
   V(Arm64I32x4Splat)                        \
   V(Arm64I32x4ExtractLane)                  \
   V(Arm64I32x4ReplaceLane)                  \
@@ -327,6 +329,7 @@ namespace compiler {
   V(Arm64I8x16RoundingAverageU)             \
   V(Arm64I8x16Abs)                          \
   V(Arm64I8x16BitMask)                      \
+  V(Arm64SignSelect)                        \
   V(Arm64S128Const)                         \
   V(Arm64S128Zero)                          \
   V(Arm64S128Dup)                           \
@@ -369,6 +372,8 @@ namespace compiler {
   V(Arm64V16x8AllTrue)                      \
   V(Arm64V8x16AllTrue)                      \
   V(Arm64LoadSplat)                         \
+  V(Arm64LoadLane)                          \
+  V(Arm64StoreLane)                         \
   V(Arm64S128Load8x8S)                      \
   V(Arm64S128Load8x8U)                      \
   V(Arm64S128Load16x4S)                     \
diff --git a/deps/v8/src/compiler/backend/arm64/instruction-scheduler-arm64.cc b/deps/v8/src/compiler/backend/arm64/instruction-scheduler-arm64.cc
index 9d53074042e5ae..0e70a424f5b215 100644
--- a/deps/v8/src/compiler/backend/arm64/instruction-scheduler-arm64.cc
+++ b/deps/v8/src/compiler/backend/arm64/instruction-scheduler-arm64.cc
@@ -199,6 +199,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArm64I64x2Mul:
     case kArm64I64x2Eq:
     case kArm64I64x2ShrU:
+    case kArm64I64x2BitMask:
     case kArm64I32x4Splat:
     case kArm64I32x4ExtractLane:
     case kArm64I32x4ReplaceLane:
@@ -297,6 +298,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArm64I8x16RoundingAverageU:
     case kArm64I8x16Abs:
     case kArm64I8x16BitMask:
+    case kArm64SignSelect:
     case kArm64S128Const:
     case kArm64S128Zero:
     case kArm64S128Dup:
@@ -359,6 +361,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArm64LdrDecompressAnyTagged:
     case kArm64Peek:
     case kArm64LoadSplat:
+    case kArm64LoadLane:
     case kArm64S128Load8x8S:
     case kArm64S128Load8x8U:
     case kArm64S128Load16x4S:
@@ -382,6 +385,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kArm64StrCompressTagged:
     case kArm64DmbIsh:
     case kArm64DsbIsb:
+    case kArm64Prfm:
+    case kArm64StoreLane:
       return kHasSideEffect;
 
     case kArm64Word64AtomicLoadUint8:
diff --git a/deps/v8/src/compiler/backend/arm64/instruction-selector-arm64.cc b/deps/v8/src/compiler/backend/arm64/instruction-selector-arm64.cc
index 584cfb6184b95f..0f432f3bc1946c 100644
--- a/deps/v8/src/compiler/backend/arm64/instruction-selector-arm64.cc
+++ b/deps/v8/src/compiler/backend/arm64/instruction-selector-arm64.cc
@@ -3,8 +3,13 @@
 // found in the LICENSE file.
 
 #include "src/base/bits.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
+#include "src/codegen/machine-type.h"
+#include "src/common/globals.h"
+#include "src/compiler/backend/instruction-codes.h"
 #include "src/compiler/backend/instruction-selector-impl.h"
+#include "src/compiler/machine-operator.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
 
@@ -207,6 +212,14 @@ void VisitRRIR(InstructionSelector* selector, ArchOpcode opcode, Node* node) {
                  g.UseUniqueRegister(node->InputAt(1)));
 }
 
+void VisitRRRR(InstructionSelector* selector, InstructionCode opcode,
+               Node* node) {
+  Arm64OperandGenerator g(selector);
+  selector->Emit(
+      opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)),
+      g.UseRegister(node->InputAt(1)), g.UseRegister(node->InputAt(2)));
+}
+
 struct ExtendingLoadMatcher {
   ExtendingLoadMatcher(Node* node, InstructionSelector* selector)
       : matches_(false), selector_(selector), base_(nullptr), immediate_(0) {
@@ -616,6 +629,77 @@ void EmitLoad(InstructionSelector* selector, Node* node, InstructionCode opcode,
   selector->Emit(opcode, arraysize(outputs), outputs, input_count, inputs);
 }
 
+void InstructionSelector::VisitPrefetchTemporal(Node* node) {
+  Arm64OperandGenerator g(this);
+  InstructionOperand inputs[2] = {g.UseRegister(node->InputAt(0)),
+                                  g.UseRegister(node->InputAt(1))};
+  InstructionCode opcode = kArm64Prfm;
+  opcode |= AddressingModeField::encode(kMode_MRR);
+  opcode |= MiscField::encode(PLDL1KEEP);
+  Emit(opcode, 0, nullptr, 2, inputs);
+}
+
+void InstructionSelector::VisitPrefetchNonTemporal(Node* node) {
+  Arm64OperandGenerator g(this);
+  InstructionOperand inputs[2] = {g.UseRegister(node->InputAt(0)),
+                                  g.UseRegister(node->InputAt(1))};
+  InstructionCode opcode = kArm64Prfm;
+  opcode |= AddressingModeField::encode(kMode_MRR);
+  opcode |= MiscField::encode(PLDL1STRM);
+  Emit(opcode, 0, nullptr, 2, inputs);
+}
+
+namespace {
+// Manually add base and index into a register to get the actual address.
+// This should be used prior to instructions that only support
+// immediate/post-index addressing, like ld1 and st1.
+InstructionOperand EmitAddBeforeLoadOrStore(InstructionSelector* selector,
+                                            Node* node,
+                                            InstructionCode* opcode) {
+  Arm64OperandGenerator g(selector);
+  InstructionOperand addr = g.TempRegister();
+  selector->Emit(kArm64Add, addr, g.UseRegister(node->InputAt(0)),
+                 g.UseRegister(node->InputAt(1)));
+  *opcode |= AddressingModeField::encode(kMode_MRI);
+  return addr;
+}
+}  // namespace
+
+void InstructionSelector::VisitLoadLane(Node* node) {
+  LoadLaneParameters params = LoadLaneParametersOf(node->op());
+  DCHECK(
+      params.rep == MachineType::Int8() || params.rep == MachineType::Int16() ||
+      params.rep == MachineType::Int32() || params.rep == MachineType::Int64());
+
+  InstructionCode opcode = kArm64LoadLane;
+  opcode |= MiscField::encode(params.rep.MemSize() * kBitsPerByte);
+
+  Arm64OperandGenerator g(this);
+  InstructionOperand addr = EmitAddBeforeLoadOrStore(this, node, &opcode);
+  Emit(opcode, g.DefineSameAsFirst(node), g.UseRegister(node->InputAt(2)),
+       g.UseImmediate(params.laneidx), addr, g.TempImmediate(0));
+}
+
+void InstructionSelector::VisitStoreLane(Node* node) {
+  StoreLaneParameters params = StoreLaneParametersOf(node->op());
+  DCHECK_LE(MachineRepresentation::kWord8, params.rep);
+  DCHECK_GE(MachineRepresentation::kWord64, params.rep);
+
+  InstructionCode opcode = kArm64StoreLane;
+  opcode |= MiscField::encode(ElementSizeInBytes(params.rep) * kBitsPerByte);
+
+  Arm64OperandGenerator g(this);
+  InstructionOperand addr = EmitAddBeforeLoadOrStore(this, node, &opcode);
+  InstructionOperand inputs[4] = {
+      g.UseRegister(node->InputAt(2)),
+      g.UseImmediate(params.laneidx),
+      addr,
+      g.TempImmediate(0),
+  };
+
+  Emit(opcode, 0, nullptr, 4, inputs);
+}
+
 void InstructionSelector::VisitLoadTransform(Node* node) {
   LoadTransformParameters params = LoadTransformParametersOf(node->op());
   InstructionCode opcode = kArchNop;
@@ -684,9 +768,7 @@ void InstructionSelector::VisitLoadTransform(Node* node) {
   if (require_add) {
     // ld1r uses post-index, so construct address first.
     // TODO(v8:9886) If index can be immediate, use vldr without this add.
-    InstructionOperand addr = g.TempRegister();
-    Emit(kArm64Add, 1, &addr, 2, inputs);
-    inputs[0] = addr;
+    inputs[0] = EmitAddBeforeLoadOrStore(this, node, &opcode);
     inputs[1] = g.TempImmediate(0);
     opcode |= AddressingModeField::encode(kMode_MRI);
   } else {
@@ -791,8 +873,7 @@ void InstructionSelector::VisitStore(Node* node) {
   }
 
   // TODO(arm64): I guess this could be done in a better way.
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedOrCompressedPointer(rep));
     AddressingMode addressing_mode;
     InstructionOperand inputs[3];
@@ -1369,7 +1450,6 @@ void InstructionSelector::VisitWord64Ror(Node* node) {
   V(ChangeFloat64ToInt64, kArm64Float64ToInt64)               \
   V(ChangeFloat64ToUint32, kArm64Float64ToUint32)             \
   V(ChangeFloat64ToUint64, kArm64Float64ToUint64)             \
-  V(TruncateFloat64ToInt64, kArm64Float64ToInt64)             \
   V(TruncateFloat64ToUint32, kArm64Float64ToUint32)           \
   V(TruncateFloat64ToFloat32, kArm64Float64ToFloat32)         \
   V(TruncateFloat64ToWord32, kArchTruncateDoubleToI)          \
@@ -1787,6 +1867,18 @@ void InstructionSelector::VisitTryTruncateFloat32ToInt64(Node* node) {
   Emit(kArm64Float32ToInt64, output_count, outputs, 1, inputs);
 }
 
+void InstructionSelector::VisitTruncateFloat64ToInt64(Node* node) {
+  Arm64OperandGenerator g(this);
+
+  InstructionCode opcode = kArm64Float64ToInt64;
+  TruncateKind kind = OpParameter<TruncateKind>(node->op());
+  if (kind == TruncateKind::kSetOverflowToMin) {
+    opcode |= MiscField::encode(true);
+  }
+
+  Emit(opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)));
+}
+
 void InstructionSelector::VisitTryTruncateFloat64ToInt64(Node* node) {
   Arm64OperandGenerator g(this);
 
@@ -2023,7 +2115,6 @@ void InstructionSelector::EmitPrepareResults(
     Node* node) {
   Arm64OperandGenerator g(this);
 
-  int reverse_slot = 1;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -2038,10 +2129,11 @@ void InstructionSelector::EmitPrepareResults(
         MarkAsSimd128(output.node);
       }
 
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       Emit(kArm64Peek, g.DefineAsRegister(output.node),
            g.UseImmediate(reverse_slot));
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
@@ -3305,32 +3397,36 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(I16x8)                \
   V(I8x16)
 
-#define SIMD_UNOP_LIST(V)                                 \
-  V(F64x2Abs, kArm64F64x2Abs)                             \
-  V(F64x2Neg, kArm64F64x2Neg)                             \
-  V(F64x2Sqrt, kArm64F64x2Sqrt)                           \
-  V(F32x4SConvertI32x4, kArm64F32x4SConvertI32x4)         \
-  V(F32x4UConvertI32x4, kArm64F32x4UConvertI32x4)         \
-  V(F32x4Abs, kArm64F32x4Abs)                             \
-  V(F32x4Neg, kArm64F32x4Neg)                             \
-  V(F32x4Sqrt, kArm64F32x4Sqrt)                           \
-  V(F32x4RecipApprox, kArm64F32x4RecipApprox)             \
-  V(F32x4RecipSqrtApprox, kArm64F32x4RecipSqrtApprox)     \
-  V(I64x2Neg, kArm64I64x2Neg)                             \
-  V(I32x4SConvertF32x4, kArm64I32x4SConvertF32x4)         \
-  V(I32x4Neg, kArm64I32x4Neg)                             \
-  V(I32x4UConvertF32x4, kArm64I32x4UConvertF32x4)         \
-  V(I32x4Abs, kArm64I32x4Abs)                             \
-  V(I16x8Neg, kArm64I16x8Neg)                             \
-  V(I16x8Abs, kArm64I16x8Abs)                             \
-  V(I8x16Neg, kArm64I8x16Neg)                             \
-  V(I8x16Abs, kArm64I8x16Abs)                             \
-  V(S128Not, kArm64S128Not)                               \
-  V(V32x4AnyTrue, kArm64V128AnyTrue)                      \
-  V(V32x4AllTrue, kArm64V32x4AllTrue)                     \
-  V(V16x8AnyTrue, kArm64V128AnyTrue)                      \
-  V(V16x8AllTrue, kArm64V16x8AllTrue)                     \
-  V(V8x16AnyTrue, kArm64V128AnyTrue)                      \
+#define SIMD_UNOP_LIST(V)                             \
+  V(F64x2Abs, kArm64F64x2Abs)                         \
+  V(F64x2Neg, kArm64F64x2Neg)                         \
+  V(F64x2Sqrt, kArm64F64x2Sqrt)                       \
+  V(F32x4SConvertI32x4, kArm64F32x4SConvertI32x4)     \
+  V(F32x4UConvertI32x4, kArm64F32x4UConvertI32x4)     \
+  V(F32x4Abs, kArm64F32x4Abs)                         \
+  V(F32x4Neg, kArm64F32x4Neg)                         \
+  V(F32x4Sqrt, kArm64F32x4Sqrt)                       \
+  V(F32x4RecipApprox, kArm64F32x4RecipApprox)         \
+  V(F32x4RecipSqrtApprox, kArm64F32x4RecipSqrtApprox) \
+  V(I64x2Neg, kArm64I64x2Neg)                         \
+  V(I64x2BitMask, kArm64I64x2BitMask)                 \
+  V(I32x4SConvertF32x4, kArm64I32x4SConvertF32x4)     \
+  V(I32x4Neg, kArm64I32x4Neg)                         \
+  V(I32x4UConvertF32x4, kArm64I32x4UConvertF32x4)     \
+  V(I32x4Abs, kArm64I32x4Abs)                         \
+  V(I32x4BitMask, kArm64I32x4BitMask)                 \
+  V(I16x8Neg, kArm64I16x8Neg)                         \
+  V(I16x8Abs, kArm64I16x8Abs)                         \
+  V(I16x8BitMask, kArm64I16x8BitMask)                 \
+  V(I8x16Neg, kArm64I8x16Neg)                         \
+  V(I8x16Abs, kArm64I8x16Abs)                         \
+  V(I8x16BitMask, kArm64I8x16BitMask)                 \
+  V(S128Not, kArm64S128Not)                           \
+  V(V32x4AnyTrue, kArm64V128AnyTrue)                  \
+  V(V32x4AllTrue, kArm64V32x4AllTrue)                 \
+  V(V16x8AnyTrue, kArm64V128AnyTrue)                  \
+  V(V16x8AllTrue, kArm64V16x8AllTrue)                 \
+  V(V8x16AnyTrue, kArm64V128AnyTrue)                  \
   V(V8x16AllTrue, kArm64V8x16AllTrue)
 
 #define SIMD_SHIFT_OP_LIST(V) \
@@ -3433,7 +3529,7 @@ void InstructionSelector::VisitS128Const(Node* node) {
   static const int kUint32Immediates = 4;
   uint32_t val[kUint32Immediates];
   STATIC_ASSERT(sizeof(val) == kSimd128Size);
-  memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  base::Memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
   // If all bytes are zeros, avoid emitting code for generic constants
   bool all_zeros = !(val[0] || val[1] || val[2] || val[3]);
   InstructionOperand dst = g.DefineAsRegister(node);
@@ -3504,6 +3600,18 @@ SIMD_BINOP_LIST(SIMD_VISIT_BINOP)
 #undef SIMD_VISIT_BINOP
 #undef SIMD_BINOP_LIST
 
+#define VISIT_SIGN_SELECT(NAME, SIZE)                 \
+  void InstructionSelector::Visit##NAME(Node* node) { \
+    InstructionCode opcode = kArm64SignSelect;        \
+    opcode |= MiscField::encode(SIZE);                \
+    VisitRRRR(this, opcode, node);                    \
+  }
+
+VISIT_SIGN_SELECT(I8x16SignSelect, 8)
+VISIT_SIGN_SELECT(I16x8SignSelect, 16)
+VISIT_SIGN_SELECT(I32x4SignSelect, 32)
+VISIT_SIGN_SELECT(I64x2SignSelect, 64)
+
 void InstructionSelector::VisitI64x2Mul(Node* node) {
   Arm64OperandGenerator g(this);
   InstructionOperand temps[] = {g.TempSimd128Register()};
@@ -3578,29 +3686,6 @@ VISIT_SIMD_QFMOP(F32x4Qfma)
 VISIT_SIMD_QFMOP(F32x4Qfms)
 #undef VISIT_SIMD_QFMOP
 
-namespace {
-template <ArchOpcode opcode>
-void VisitBitMask(InstructionSelector* selector, Node* node) {
-  Arm64OperandGenerator g(selector);
-  InstructionOperand temps[] = {g.TempSimd128Register(),
-                                g.TempSimd128Register()};
-  selector->Emit(opcode, g.DefineAsRegister(node),
-                 g.UseRegister(node->InputAt(0)), arraysize(temps), temps);
-}
-}  // namespace
-
-void InstructionSelector::VisitI8x16BitMask(Node* node) {
-  VisitBitMask<kArm64I8x16BitMask>(this, node);
-}
-
-void InstructionSelector::VisitI16x8BitMask(Node* node) {
-  VisitBitMask<kArm64I16x8BitMask>(this, node);
-}
-
-void InstructionSelector::VisitI32x4BitMask(Node* node) {
-  VisitBitMask<kArm64I32x4BitMask>(this, node);
-}
-
 namespace {
 
 struct ShuffleEntry {
diff --git a/deps/v8/src/compiler/backend/code-generator-impl.h b/deps/v8/src/compiler/backend/code-generator-impl.h
index 93113b97ca5cfe..c94ca74f73082e 100644
--- a/deps/v8/src/compiler/backend/code-generator-impl.h
+++ b/deps/v8/src/compiler/backend/code-generator-impl.h
@@ -197,6 +197,7 @@ class DeoptimizationExit : public ZoneObject {
         pc_offset_(pc_offset),
         kind_(kind),
         reason_(reason),
+        immediate_args_(nullptr),
         emitted_(false) {}
 
   bool has_deoptimization_id() const {
@@ -210,12 +211,21 @@ class DeoptimizationExit : public ZoneObject {
     deoptimization_id_ = deoptimization_id;
   }
   SourcePosition pos() const { return pos_; }
+  // The label for the deoptimization call.
   Label* label() { return &label_; }
+  // The label after the deoptimization check, which will resume execution.
+  Label* continue_label() { return &continue_label_; }
   BailoutId bailout_id() const { return bailout_id_; }
   int translation_id() const { return translation_id_; }
   int pc_offset() const { return pc_offset_; }
   DeoptimizeKind kind() const { return kind_; }
   DeoptimizeReason reason() const { return reason_; }
+  const ZoneVector<ImmediateOperand*>* immediate_args() const {
+    return immediate_args_;
+  }
+  void set_immediate_args(ZoneVector<ImmediateOperand*>* immediate_args) {
+    immediate_args_ = immediate_args;
+  }
   // Returns whether the deopt exit has already been emitted. Most deopt exits
   // are emitted contiguously at the end of the code, but unconditional deopt
   // exits (kArchDeoptimize) may be inlined where they are encountered.
@@ -227,11 +237,13 @@ class DeoptimizationExit : public ZoneObject {
   int deoptimization_id_;
   const SourcePosition pos_;
   Label label_;
+  Label continue_label_;
   const BailoutId bailout_id_;
   const int translation_id_;
   const int pc_offset_;
   const DeoptimizeKind kind_;
   const DeoptimizeReason reason_;
+  ZoneVector<ImmediateOperand*>* immediate_args_;
   bool emitted_;
 };
 
diff --git a/deps/v8/src/compiler/backend/code-generator.cc b/deps/v8/src/compiler/backend/code-generator.cc
index 0cb0e6172ff780..83f8fbc4e8fdbb 100644
--- a/deps/v8/src/compiler/backend/code-generator.cc
+++ b/deps/v8/src/compiler/backend/code-generator.cc
@@ -152,6 +152,58 @@ uint32_t CodeGenerator::GetStackCheckOffset() {
   return std::max(frame_height_delta, max_pushed_argument_bytes);
 }
 
+void CodeGenerator::AssembleDeoptImmediateArgs(
+    const ZoneVector<ImmediateOperand*>* immediate_args, Label* deopt_exit) {
+  // EagerWithResume deopts should have immdiate args, and to ensure fixed
+  // deopt exit sizes, currently always have two immediate arguments in the
+  // deopt exit.
+  constexpr int kImmediateArgCount = 2;
+  DCHECK_NOT_NULL(immediate_args);
+  DCHECK_EQ(kImmediateArgCount, immediate_args->size());
+  const int expected_offsets[] = {
+      Deoptimizer::kEagerWithResumeImmedArgs1PcOffset,
+      Deoptimizer::kEagerWithResumeImmedArgs2PcOffset};
+  for (int i = 0; i < kImmediateArgCount; i++) {
+    ImmediateOperand* op = immediate_args->at(i);
+    Constant constant = instructions()->GetImmediate(op);
+
+    DCHECK_EQ(tasm()->SizeOfCodeGeneratedSince(deopt_exit),
+              expected_offsets[i] + Deoptimizer::kNonLazyDeoptExitSize);
+    USE(expected_offsets);
+
+    switch (constant.type()) {
+      case Constant::kInt32:
+        tasm()->dp(constant.ToInt32());
+        break;
+#ifdef V8_TARGET_ARCH_64_BIT
+      case Constant::kInt64:
+        tasm()->dp(constant.ToInt64());
+        break;
+#endif
+      case Constant::kFloat64: {
+        int smi;
+        CHECK(DoubleToSmiInteger(constant.ToFloat64().value(), &smi));
+        tasm()->dp(Smi::FromInt(smi).ptr());
+        break;
+      }
+      case Constant::kCompressedHeapObject:
+      case Constant::kHeapObject:
+        // Emit as a DATA_EMBEDDED_OBJECT to specify that this is a raw full
+        // pointer that is fixed size.
+        tasm()->dp(constant.ToHeapObject().address(),
+                   RelocInfo::DATA_EMBEDDED_OBJECT);
+        break;
+      default:
+        // Currently only Smis and Ints are supported, but other immediate
+        // constants can be added when required.
+        UNREACHABLE();
+    }
+  }
+
+  DCHECK_EQ(tasm()->SizeOfCodeGeneratedSince(deopt_exit),
+            Deoptimizer::kEagerWithResumeDeoptExitSize);
+}
+
 CodeGenerator::CodeGenResult CodeGenerator::AssembleDeoptimizerCall(
     DeoptimizationExit* exit) {
   int deoptimization_id = exit->deoptimization_id();
@@ -160,10 +212,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleDeoptimizerCall(
   }
 
   DeoptimizeKind deopt_kind = exit->kind();
-
   DeoptimizeReason deoptimization_reason = exit->reason();
-  Builtins::Name deopt_entry =
-      Deoptimizer::GetDeoptimizationEntry(tasm()->isolate(), deopt_kind);
   Label* jump_deoptimization_entry_label =
       &jump_deoptimization_entry_labels_[static_cast<int>(deopt_kind)];
   if (info()->source_positions()) {
@@ -172,15 +221,27 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleDeoptimizerCall(
   }
 
   if (deopt_kind == DeoptimizeKind::kLazy) {
+    ++lazy_deopt_count_;
     tasm()->BindExceptionHandler(exit->label());
   } else {
-    ++non_lazy_deopt_count_;
+    if (deopt_kind != DeoptimizeKind::kEagerWithResume) {
+      ++eager_soft_and_bailout_deopt_count_;
+    }
     tasm()->bind(exit->label());
   }
+  Builtins::Name target =
+      deopt_kind == DeoptimizeKind::kEagerWithResume
+          ? Deoptimizer::GetDeoptWithResumeBuiltin(deoptimization_reason)
+          : Deoptimizer::GetDeoptimizationEntry(deopt_kind);
+  tasm()->CallForDeoptimization(target, deoptimization_id, exit->label(),
+                                deopt_kind, exit->continue_label(),
+                                jump_deoptimization_entry_label);
 
-  tasm()->CallForDeoptimization(deopt_entry, deoptimization_id, exit->label(),
-                                deopt_kind, jump_deoptimization_entry_label);
+  if (deopt_kind == DeoptimizeKind::kEagerWithResume) {
+    AssembleDeoptImmediateArgs(exit->immediate_args(), exit->label());
+  }
   exit->set_emitted();
+
   return kSuccess;
 }
 
@@ -336,12 +397,17 @@ void CodeGenerator::AssembleCode() {
   offsets_info_.deoptimization_exits = tasm()->pc_offset();
   int last_updated = 0;
   // We sort the deoptimization exits here so that the lazy ones will
-  // be visited last. We need this as on architectures where
-  // Deoptimizer::kSupportsFixedDeoptExitSizes is true, lazy deopts
-  // might need additional instructions.
+  // be visited second last, and eagerwithresume last. We need this as on
+  // architectures where Deoptimizer::kSupportsFixedDeoptExitSizes is true,
+  // lazy deopts and eagerwithresume might need additional instructions.
   auto cmp = [](const DeoptimizationExit* a, const DeoptimizationExit* b) {
-    static_assert(DeoptimizeKind::kLazy == kLastDeoptimizeKind,
-                  "lazy deopts are expected to be emitted last");
+    // The deoptimization exits are sorted so that lazy deopt exits appear after
+    // eager deopts, and eager with resume deopts appear last.
+    static_assert(DeoptimizeKind::kEagerWithResume == kLastDeoptimizeKind,
+                  "eager with resume deopts are expected to be emitted last");
+    static_assert(static_cast<int>(DeoptimizeKind::kLazy) ==
+                      static_cast<int>(kLastDeoptimizeKind) - 1,
+                  "lazy deopts are expected to be emitted second from last");
     if (a->kind() != b->kind()) {
       return a->kind() < b->kind();
     }
@@ -543,8 +609,7 @@ bool CodeGenerator::IsNextInAssemblyOrder(RpoNumber block) const {
 void CodeGenerator::RecordSafepoint(ReferenceMap* references,
                                     Safepoint::DeoptMode deopt_mode) {
   Safepoint safepoint = safepoints()->DefineSafepoint(tasm(), deopt_mode);
-  int stackSlotToSpillSlotDelta =
-      frame()->GetTotalFrameSlotCount() - frame()->GetSpillSlotCount();
+  int frame_header_offset = frame()->GetFixedSlotCount();
   for (const InstructionOperand& operand : references->reference_operands()) {
     if (operand.IsStackSlot()) {
       int index = LocationOperand::cast(operand).index();
@@ -554,7 +619,7 @@ void CodeGenerator::RecordSafepoint(ReferenceMap* references,
       // and therefore don't work with the SafepointTable currently, but
       // we also don't need to worry about them, since the GC has special
       // knowledge about those fields anyway.
-      if (index < stackSlotToSpillSlotDelta) continue;
+      if (index < frame_header_offset) continue;
       safepoint.DefinePointerSlot(index);
     }
   }
@@ -785,18 +850,19 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleInstruction(
     case kFlags_deoptimize_and_poison: {
       // Assemble a conditional eager deoptimization after this instruction.
       InstructionOperandConverter i(this, instr);
-      size_t frame_state_offset = MiscField::decode(instr->opcode());
-      DeoptimizationExit* const exit =
-          AddDeoptimizationExit(instr, frame_state_offset);
-      Label continue_label;
+      size_t frame_state_offset =
+          DeoptFrameStateOffsetField::decode(instr->opcode());
+      size_t immediate_args_count =
+          DeoptImmedArgsCountField::decode(instr->opcode());
+      DeoptimizationExit* const exit = AddDeoptimizationExit(
+          instr, frame_state_offset, immediate_args_count);
       BranchInfo branch;
       branch.condition = condition;
       branch.true_label = exit->label();
-      branch.false_label = &continue_label;
+      branch.false_label = exit->continue_label();
       branch.fallthru = true;
-      // Assemble architecture-specific branch.
       AssembleArchDeoptBranch(instr, &branch);
-      tasm()->bind(&continue_label);
+      tasm()->bind(exit->continue_label());
       if (mode == kFlags_deoptimize_and_poison) {
         AssembleBranchPoisoning(NegateFlagsCondition(branch.condition), instr);
       }
@@ -848,7 +914,7 @@ void CodeGenerator::AssembleSourcePosition(SourcePosition source_position) {
         tasm()->isolate()->concurrent_recompilation_enabled()) {
       buffer << source_position;
     } else {
-      AllowHeapAllocation allocation;
+      AllowGarbageCollection allocation;
       AllowHandleAllocation handles;
       AllowHandleDereference deref;
       buffer << source_position.InliningStack(info);
@@ -928,7 +994,9 @@ Handle<DeoptimizationData> CodeGenerator::GenerateDeoptimizationData() {
   data->SetOptimizationId(Smi::FromInt(info->optimization_id()));
 
   data->SetDeoptExitStart(Smi::FromInt(deopt_exit_start_offset_));
-  data->SetNonLazyDeoptCount(Smi::FromInt(non_lazy_deopt_count_));
+  data->SetEagerSoftAndBailoutDeoptCount(
+      Smi::FromInt(eager_soft_and_bailout_deopt_count_));
+  data->SetLazyDeoptCount(Smi::FromInt(lazy_deopt_count_));
 
   if (info->has_shared_info()) {
     data->SetSharedFunctionInfo(*info->shared_info());
@@ -1001,7 +1069,7 @@ void CodeGenerator::RecordCallPosition(Instruction* instr) {
     FrameStateDescriptor* descriptor =
         GetDeoptimizationEntry(instr, frame_state_offset).descriptor();
     int pc_offset = tasm()->pc_offset_for_safepoint();
-    BuildTranslation(instr, pc_offset, frame_state_offset,
+    BuildTranslation(instr, pc_offset, frame_state_offset, 0,
                      descriptor->state_combine());
   }
 }
@@ -1143,7 +1211,7 @@ void CodeGenerator::BuildTranslationForFrameStateDescriptor(
 
 DeoptimizationExit* CodeGenerator::BuildTranslation(
     Instruction* instr, int pc_offset, size_t frame_state_offset,
-    OutputFrameStateCombine state_combine) {
+    size_t immediate_args_count, OutputFrameStateCombine state_combine) {
   DeoptimizationEntry const& entry =
       GetDeoptimizationEntry(instr, frame_state_offset);
   FrameStateDescriptor* const descriptor = entry.descriptor();
@@ -1171,6 +1239,15 @@ DeoptimizationExit* CodeGenerator::BuildTranslation(
   if (!Deoptimizer::kSupportsFixedDeoptExitSizes) {
     exit->set_deoptimization_id(next_deoptimization_id_++);
   }
+  if (immediate_args_count != 0) {
+    auto immediate_args = zone()->New<ZoneVector<ImmediateOperand*>>(zone());
+    InstructionOperandIterator iter(
+        instr, frame_state_offset - immediate_args_count - 1);
+    for (size_t i = 0; i < immediate_args_count; i++) {
+      immediate_args->emplace_back(ImmediateOperand::cast(iter.Advance()));
+    }
+    exit->set_immediate_args(immediate_args);
+  }
 
   deoptimization_exits_.push_back(exit);
   return exit;
@@ -1326,8 +1403,9 @@ void CodeGenerator::MarkLazyDeoptSite() {
 }
 
 DeoptimizationExit* CodeGenerator::AddDeoptimizationExit(
-    Instruction* instr, size_t frame_state_offset) {
-  return BuildTranslation(instr, -1, frame_state_offset,
+    Instruction* instr, size_t frame_state_offset,
+    size_t immediate_args_count) {
+  return BuildTranslation(instr, -1, frame_state_offset, immediate_args_count,
                           OutputFrameStateCombine::Ignore());
 }
 
diff --git a/deps/v8/src/compiler/backend/code-generator.h b/deps/v8/src/compiler/backend/code-generator.h
index 6181bc7d150f1a..9829a070ec9c8f 100644
--- a/deps/v8/src/compiler/backend/code-generator.h
+++ b/deps/v8/src/compiler/backend/code-generator.h
@@ -247,6 +247,9 @@ class V8_EXPORT_PRIVATE CodeGenerator final : public GapResolver::Assembler {
 
   CodeGenResult AssembleDeoptimizerCall(DeoptimizationExit* exit);
 
+  void AssembleDeoptImmediateArgs(
+      const ZoneVector<ImmediateOperand*>* immediate_args, Label* deopt_exit);
+
   // ===========================================================================
   // ============= Architecture-specific code generation methods. ==============
   // ===========================================================================
@@ -391,6 +394,7 @@ class V8_EXPORT_PRIVATE CodeGenerator final : public GapResolver::Assembler {
                                                     size_t frame_state_offset);
   DeoptimizationExit* BuildTranslation(Instruction* instr, int pc_offset,
                                        size_t frame_state_offset,
+                                       size_t immediate_args_count,
                                        OutputFrameStateCombine state_combine);
   void BuildTranslationForFrameStateDescriptor(
       FrameStateDescriptor* descriptor, InstructionOperandIterator* iter,
@@ -408,7 +412,8 @@ class V8_EXPORT_PRIVATE CodeGenerator final : public GapResolver::Assembler {
 
   void PrepareForDeoptimizationExits(ZoneDeque<DeoptimizationExit*>* exits);
   DeoptimizationExit* AddDeoptimizationExit(Instruction* instr,
-                                            size_t frame_state_offset);
+                                            size_t frame_state_offset,
+                                            size_t immediate_args_count);
 
   // ===========================================================================
 
@@ -438,7 +443,8 @@ class V8_EXPORT_PRIVATE CodeGenerator final : public GapResolver::Assembler {
   ZoneVector<HandlerInfo> handlers_;
   int next_deoptimization_id_ = 0;
   int deopt_exit_start_offset_ = 0;
-  int non_lazy_deopt_count_ = 0;
+  int eager_soft_and_bailout_deopt_count_ = 0;
+  int lazy_deopt_count_ = 0;
   ZoneDeque<DeoptimizationExit*> deoptimization_exits_;
   ZoneDeque<DeoptimizationLiteral> deoptimization_literals_;
   size_t inlined_function_count_ = 0;
diff --git a/deps/v8/src/compiler/backend/ia32/code-generator-ia32.cc b/deps/v8/src/compiler/backend/ia32/code-generator-ia32.cc
index 1820e3979925f6..45a2c59597acb3 100644
--- a/deps/v8/src/compiler/backend/ia32/code-generator-ia32.cc
+++ b/deps/v8/src/compiler/backend/ia32/code-generator-ia32.cc
@@ -6,6 +6,7 @@
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/callable.h"
 #include "src/codegen/ia32/assembler-ia32.h"
+#include "src/codegen/ia32/register-ia32.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/optimized-compilation-info.h"
 #include "src/compiler/backend/code-generator-impl.h"
@@ -262,7 +263,7 @@ class OutOfLineTruncateDoubleToI final : public OutOfLineCode {
 
   void Generate() final {
     __ AllocateStackSpace(kDoubleSize);
-    __ movsd(MemOperand(esp, 0), input_);
+    __ Movsd(MemOperand(esp, 0), input_);
     if (stub_mode_ == StubCallMode::kCallWasmRuntimeStub) {
       // A direct call to a wasm runtime stub defined in this module.
       // Just encode the stub index. This will be patched when the code
@@ -509,6 +510,58 @@ class OutOfLineRecordWrite final : public OutOfLineCode {
     }                                                  \
   } while (false)
 
+#define ASSEMBLE_SIMD_PINSR(OPCODE, CPU_FEATURE)             \
+  do {                                                       \
+    XMMRegister dst = i.OutputSimd128Register();             \
+    XMMRegister src = i.InputSimd128Register(0);             \
+    int8_t laneidx = i.InputInt8(1);                         \
+    if (HasAddressingMode(instr)) {                          \
+      if (CpuFeatures::IsSupported(AVX)) {                   \
+        CpuFeatureScope avx_scope(tasm(), AVX);              \
+        __ v##OPCODE(dst, src, i.MemoryOperand(2), laneidx); \
+      } else {                                               \
+        DCHECK_EQ(dst, src);                                 \
+        CpuFeatureScope sse_scope(tasm(), CPU_FEATURE);      \
+        __ OPCODE(dst, i.MemoryOperand(2), laneidx);         \
+      }                                                      \
+    } else {                                                 \
+      if (CpuFeatures::IsSupported(AVX)) {                   \
+        CpuFeatureScope avx_scope(tasm(), AVX);              \
+        __ v##OPCODE(dst, src, i.InputOperand(2), laneidx);  \
+      } else {                                               \
+        DCHECK_EQ(dst, src);                                 \
+        CpuFeatureScope sse_scope(tasm(), CPU_FEATURE);      \
+        __ OPCODE(dst, i.InputOperand(2), laneidx);          \
+      }                                                      \
+    }                                                        \
+  } while (false)
+
+// Helper macro to help define signselect opcodes. This should not be used for
+// i16x8.signselect, because there is no native word-sized blend instruction.
+// We choose a helper macro here instead of a macro-assembler function because
+// the blend instruction requires xmm0 as an implicit argument, and the codegen
+// relies on xmm0 being the scratch register, so we can freely overwrite it as
+// required.
+#define ASSEMBLE_SIMD_SIGN_SELECT(BLEND_OP)       \
+  do {                                            \
+    XMMRegister dst = i.OutputSimd128Register();  \
+    XMMRegister src1 = i.InputSimd128Register(0); \
+    XMMRegister src2 = i.InputSimd128Register(1); \
+    XMMRegister mask = i.InputSimd128Register(2); \
+    if (CpuFeatures::IsSupported(AVX)) {          \
+      CpuFeatureScope avx_scope(tasm(), AVX);     \
+      __ v##BLEND_OP(dst, src1, src2, mask);      \
+    } else {                                      \
+      CpuFeatureScope scope(tasm(), SSE4_1);      \
+      DCHECK_EQ(dst, src1);                       \
+      DCHECK_EQ(kScratchDoubleReg, xmm0);         \
+      if (mask != xmm0) {                         \
+        __ movaps(xmm0, mask);                    \
+      }                                           \
+      __ BLEND_OP(dst, src2);                     \
+    }                                             \
+  } while (false)
+
 void CodeGenerator::AssembleDeconstructFrame() {
   __ mov(esp, ebp);
   __ pop(ebp);
@@ -926,7 +979,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ jmp(exit->label());
       break;
     }
@@ -1693,20 +1746,20 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kIA32Movsd:
       if (instr->HasOutput()) {
-        __ movsd(i.OutputDoubleRegister(), i.MemoryOperand());
+        __ Movsd(i.OutputDoubleRegister(), i.MemoryOperand());
       } else {
         size_t index = 0;
         Operand operand = i.MemoryOperand(&index);
-        __ movsd(operand, i.InputDoubleRegister(index));
+        __ Movsd(operand, i.InputDoubleRegister(index));
       }
       break;
     case kIA32Movss:
       if (instr->HasOutput()) {
-        __ movss(i.OutputDoubleRegister(), i.MemoryOperand());
+        __ Movss(i.OutputDoubleRegister(), i.MemoryOperand());
       } else {
         size_t index = 0;
         Operand operand = i.MemoryOperand(&index);
-        __ movss(operand, i.InputDoubleRegister(index));
+        __ Movss(operand, i.InputDoubleRegister(index));
       }
       break;
     case kIA32Movdqu:
@@ -1722,14 +1775,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (instr->InputAt(0)->IsFPStackSlot()) {
         __ mov(i.OutputRegister(), i.InputOperand(0));
       } else {
-        __ movd(i.OutputRegister(), i.InputDoubleRegister(0));
+        __ Movd(i.OutputRegister(), i.InputDoubleRegister(0));
       }
       break;
     case kIA32BitcastIF:
       if (HasRegisterInput(instr, 0)) {
-        __ movd(i.OutputDoubleRegister(), i.InputRegister(0));
+        __ Movd(i.OutputDoubleRegister(), i.InputRegister(0));
       } else {
-        __ movss(i.OutputDoubleRegister(), i.InputOperand(0));
+        __ Movss(i.OutputDoubleRegister(), i.InputOperand(0));
       }
       break;
     case kIA32Lea: {
@@ -1774,45 +1827,45 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kIA32PushFloat32:
       if (instr->InputAt(0)->IsFPRegister()) {
         __ AllocateStackSpace(kFloatSize);
-        __ movss(Operand(esp, 0), i.InputDoubleRegister(0));
+        __ Movss(Operand(esp, 0), i.InputDoubleRegister(0));
         frame_access_state()->IncreaseSPDelta(kFloatSize / kSystemPointerSize);
       } else if (HasImmediateInput(instr, 0)) {
         __ Move(kScratchDoubleReg, i.InputFloat32(0));
         __ AllocateStackSpace(kFloatSize);
-        __ movss(Operand(esp, 0), kScratchDoubleReg);
+        __ Movss(Operand(esp, 0), kScratchDoubleReg);
         frame_access_state()->IncreaseSPDelta(kFloatSize / kSystemPointerSize);
       } else {
-        __ movss(kScratchDoubleReg, i.InputOperand(0));
+        __ Movss(kScratchDoubleReg, i.InputOperand(0));
         __ AllocateStackSpace(kFloatSize);
-        __ movss(Operand(esp, 0), kScratchDoubleReg);
+        __ Movss(Operand(esp, 0), kScratchDoubleReg);
         frame_access_state()->IncreaseSPDelta(kFloatSize / kSystemPointerSize);
       }
       break;
     case kIA32PushFloat64:
       if (instr->InputAt(0)->IsFPRegister()) {
         __ AllocateStackSpace(kDoubleSize);
-        __ movsd(Operand(esp, 0), i.InputDoubleRegister(0));
+        __ Movsd(Operand(esp, 0), i.InputDoubleRegister(0));
         frame_access_state()->IncreaseSPDelta(kDoubleSize / kSystemPointerSize);
       } else if (HasImmediateInput(instr, 0)) {
         __ Move(kScratchDoubleReg, i.InputDouble(0));
         __ AllocateStackSpace(kDoubleSize);
-        __ movsd(Operand(esp, 0), kScratchDoubleReg);
+        __ Movsd(Operand(esp, 0), kScratchDoubleReg);
         frame_access_state()->IncreaseSPDelta(kDoubleSize / kSystemPointerSize);
       } else {
-        __ movsd(kScratchDoubleReg, i.InputOperand(0));
+        __ Movsd(kScratchDoubleReg, i.InputOperand(0));
         __ AllocateStackSpace(kDoubleSize);
-        __ movsd(Operand(esp, 0), kScratchDoubleReg);
+        __ Movsd(Operand(esp, 0), kScratchDoubleReg);
         frame_access_state()->IncreaseSPDelta(kDoubleSize / kSystemPointerSize);
       }
       break;
     case kIA32PushSimd128:
       if (instr->InputAt(0)->IsFPRegister()) {
         __ AllocateStackSpace(kSimd128Size);
-        __ movups(Operand(esp, 0), i.InputSimd128Register(0));
+        __ Movups(Operand(esp, 0), i.InputSimd128Register(0));
       } else {
-        __ movups(kScratchDoubleReg, i.InputOperand(0));
+        __ Movups(kScratchDoubleReg, i.InputOperand(0));
         __ AllocateStackSpace(kSimd128Size);
-        __ movups(Operand(esp, 0), kScratchDoubleReg);
+        __ Movups(Operand(esp, 0), kScratchDoubleReg);
       }
       frame_access_state()->IncreaseSPDelta(kSimd128Size / kSystemPointerSize);
       break;
@@ -1824,7 +1877,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         frame_access_state()->IncreaseSPDelta(kFloatSize / kSystemPointerSize);
       } else if (instr->InputAt(0)->IsFPRegister()) {
         __ AllocateStackSpace(kFloatSize);
-        __ movsd(Operand(esp, 0), i.InputDoubleRegister(0));
+        __ Movsd(Operand(esp, 0), i.InputDoubleRegister(0));
         frame_access_state()->IncreaseSPDelta(kFloatSize / kSystemPointerSize);
       } else if (HasImmediateInput(instr, 0)) {
         __ push(i.InputImmediate(0));
@@ -1850,28 +1903,28 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (instr->OutputAt(0)->IsFPRegister()) {
         LocationOperand* op = LocationOperand::cast(instr->OutputAt(0));
         if (op->representation() == MachineRepresentation::kFloat64) {
-          __ movsd(i.OutputDoubleRegister(), Operand(ebp, offset));
+          __ Movsd(i.OutputDoubleRegister(), Operand(ebp, offset));
         } else if (op->representation() == MachineRepresentation::kFloat32) {
-          __ movss(i.OutputFloatRegister(), Operand(ebp, offset));
+          __ Movss(i.OutputFloatRegister(), Operand(ebp, offset));
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
-          __ movdqu(i.OutputSimd128Register(), Operand(ebp, offset));
+          __ Movdqu(i.OutputSimd128Register(), Operand(ebp, offset));
         }
       } else {
         __ mov(i.OutputRegister(), Operand(ebp, offset));
       }
       break;
     }
-    case kSSEF64x2Splat: {
-      DCHECK_EQ(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
-      XMMRegister dst = i.OutputSimd128Register();
-      __ shufpd(dst, dst, 0x0);
-      break;
-    }
-    case kAVXF64x2Splat: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
+    case kIA32F64x2Splat: {
+      XMMRegister dst = i.OutputDoubleRegister();
       XMMRegister src = i.InputDoubleRegister(0);
-      __ vshufpd(i.OutputSimd128Register(), src, src, 0x0);
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vshufpd(i.OutputSimd128Register(), src, src, 0x0);
+      } else {
+        DCHECK_EQ(dst, src);
+        __ shufpd(dst, src, 0x0);
+      }
       break;
     }
     case kSSEF64x2ExtractLane: {
@@ -1879,7 +1932,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister dst = i.OutputDoubleRegister();
       int8_t lane = i.InputInt8(1);
       if (lane != 0) {
-        DCHECK_LT(lane, 4);
+        DCHECK_EQ(lane, 1);
         __ shufpd(dst, dst, lane);
       }
       break;
@@ -1892,7 +1945,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (lane == 0) {
         if (dst != src) __ vmovapd(dst, src);
       } else {
-        DCHECK_LT(lane, 4);
+        DCHECK_EQ(lane, 1);
         __ vshufpd(dst, src, src, lane);
       }
       break;
@@ -2039,6 +2092,78 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Roundpd(i.OutputSimd128Register(), i.InputDoubleRegister(0), mode);
       break;
     }
+    case kIA32I64x2ExtMulLowI32x4S: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/true, /*is_signed=*/true);
+      break;
+    }
+    case kIA32I64x2ExtMulHighI32x4S: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/false, /*is_signed=*/true);
+      break;
+    }
+    case kIA32I64x2ExtMulLowI32x4U: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/true, /*is_signed=*/false);
+      break;
+    }
+    case kIA32I64x2ExtMulHighI32x4U: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/false, /*is_signed=*/false);
+      break;
+    }
+    case kIA32I32x4ExtMulLowI16x8S: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/true, /*is_signed=*/true);
+      break;
+    }
+    case kIA32I32x4ExtMulHighI16x8S: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/false, /*is_signed=*/true);
+      break;
+    }
+    case kIA32I32x4ExtMulLowI16x8U: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/true, /*is_signed=*/false);
+      break;
+    }
+    case kIA32I32x4ExtMulHighI16x8U: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/false, /*is_signed=*/false);
+      break;
+    }
+    case kIA32I16x8ExtMulLowI8x16S: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/true, /*is_signed=*/true);
+      break;
+    }
+    case kIA32I16x8ExtMulHighI8x16S: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/false, /*is_signed=*/true);
+      break;
+    }
+    case kIA32I16x8ExtMulLowI8x16U: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/true, /*is_signed=*/false);
+      break;
+    }
+    case kIA32I16x8ExtMulHighI8x16U: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), kScratchDoubleReg,
+                     /*low=*/false, /*is_signed=*/false);
+      break;
+    }
     case kIA32I64x2SplatI32Pair: {
       XMMRegister dst = i.OutputSimd128Register();
       __ Pinsrd(dst, i.InputRegister(0), 0);
@@ -2123,86 +2248,204 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_SIMD_SHIFT(Psrlq, 6);
       break;
     }
-    case kSSEF32x4Splat: {
-      DCHECK_EQ(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
-      XMMRegister dst = i.OutputSimd128Register();
-      __ shufps(dst, dst, 0x0);
+    case kIA32I64x2BitMask: {
+      __ Movmskpd(i.OutputRegister(), i.InputSimd128Register(0));
       break;
     }
-    case kAVXF32x4Splat: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      XMMRegister src = i.InputFloatRegister(0);
-      __ vshufps(i.OutputSimd128Register(), src, src, 0x0);
+    case kIA32I64x2Eq: {
+      __ Pcmpeqq(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                 i.InputSimd128Register(1));
       break;
     }
-    case kSSEF32x4ExtractLane: {
-      DCHECK_EQ(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
-      XMMRegister dst = i.OutputFloatRegister();
-      int8_t lane = i.InputInt8(1);
-      if (lane != 0) {
-        DCHECK_LT(lane, 4);
-        __ shufps(dst, dst, lane);
+    case kIA32I64x2SConvertI32x4Low: {
+      __ Pmovsxdq(i.OutputSimd128Register(), i.InputSimd128Register(0));
+      break;
+    }
+    case kIA32I64x2SConvertI32x4High: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vpunpckhqdq(dst, src, src);
+      } else {
+        __ pshufd(dst, src, 0xEE);
       }
+      __ Pmovsxdq(dst, dst);
       break;
     }
-    case kAVXF32x4ExtractLane: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      XMMRegister dst = i.OutputFloatRegister();
+    case kIA32I64x2UConvertI32x4Low: {
+      __ Pmovzxdq(i.OutputSimd128Register(), i.InputSimd128Register(0));
+      break;
+    }
+    case kIA32I64x2UConvertI32x4High: {
+      XMMRegister dst = i.OutputSimd128Register();
       XMMRegister src = i.InputSimd128Register(0);
-      int8_t lane = i.InputInt8(1);
-      if (lane == 0) {
-        if (dst != src) __ vmovaps(dst, src);
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vpxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
+        __ vpunpckhdq(dst, src, kScratchDoubleReg);
       } else {
-        DCHECK_LT(lane, 4);
-        __ vshufps(dst, src, src, lane);
+        CpuFeatureScope sse_scope(tasm(), SSE4_1);
+        __ pshufd(dst, src, 0xEE);
+        __ pmovzxdq(dst, dst);
       }
       break;
     }
-    case kSSEF32x4ReplaceLane: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      CpuFeatureScope sse_scope(tasm(), SSE4_1);
-      __ insertps(i.OutputSimd128Register(), i.InputOperand(2),
-                  i.InputInt8(1) << 4);
+    case kIA32I8x16SignSelect: {
+      ASSEMBLE_SIMD_SIGN_SELECT(pblendvb);
       break;
     }
-    case kAVXF32x4ReplaceLane: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vinsertps(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                   i.InputOperand(2), i.InputInt8(1) << 4);
+    case kIA32I16x8SignSelect: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src1 = i.InputSimd128Register(0);
+      XMMRegister src2 = i.InputSimd128Register(1);
+      XMMRegister mask = i.InputSimd128Register(2);
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vpsraw(kScratchDoubleReg, mask, 15);
+        __ vpblendvb(dst, src1, src2, kScratchDoubleReg);
+      } else {
+        CpuFeatureScope sse_scope(tasm(), SSE4_1);
+        DCHECK_EQ(dst, src1);
+        DCHECK_EQ(kScratchDoubleReg, xmm0);
+        __ pxor(kScratchDoubleReg, kScratchDoubleReg);
+        __ pcmpgtw(kScratchDoubleReg, mask);
+        __ pblendvb(dst, src2);
+      }
       break;
     }
-    case kIA32F32x4SConvertI32x4: {
-      __ Cvtdq2ps(i.OutputSimd128Register(), i.InputOperand(0));
+    case kIA32I32x4ExtAddPairwiseI16x8S: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      // kScratchDoubleReg = i16x8.splat(1)
+      __ Pcmpeqw(kScratchDoubleReg, kScratchDoubleReg);
+      __ Psrlw(kScratchDoubleReg, byte{15});
+      // pmaddwd multiplies signed words in kScratchDoubleReg and src, producing
+      // signed doublewords, then adds pairwise.
+      // src = |a|b|c|d|e|f|g|h|
+      // dst = | a*1 + b*1 | c*1 + d*1 | e*1 + f*1 | g*1 + h*1 |
+      __ Pmaddwd(dst, src, kScratchDoubleReg);
       break;
     }
-    case kSSEF32x4UConvertI32x4: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      CpuFeatureScope sse_scope(tasm(), SSE4_1);
+    case kIA32I32x4ExtAddPairwiseI16x8U: {
       XMMRegister dst = i.OutputSimd128Register();
-      __ pxor(kScratchDoubleReg, kScratchDoubleReg);      // zeros
-      __ pblendw(kScratchDoubleReg, dst, 0x55);           // get lo 16 bits
-      __ psubd(dst, kScratchDoubleReg);                   // get hi 16 bits
-      __ cvtdq2ps(kScratchDoubleReg, kScratchDoubleReg);  // convert lo exactly
-      __ psrld(dst, 1);                  // divide by 2 to get in unsigned range
-      __ cvtdq2ps(dst, dst);             // convert hi exactly
-      __ addps(dst, dst);                // double hi, exactly
-      __ addps(dst, kScratchDoubleReg);  // add hi and lo, may round.
+      XMMRegister src = i.InputSimd128Register(0);
+
+      // src = |a|b|c|d|e|f|g|h|
+      // kScratchDoubleReg = i32x4.splat(0x0000FFFF)
+      __ Pcmpeqd(kScratchDoubleReg, kScratchDoubleReg);
+      __ Psrld(kScratchDoubleReg, kScratchDoubleReg, uint8_t{16});
+      // kScratchDoubleReg =|0|b|0|d|0|f|0|h|
+      __ Pand(kScratchDoubleReg, src);
+      // dst = |0|a|0|c|0|e|0|g|
+      __ Psrld(dst, src, byte{16});
+      // dst = |a+b|c+d|e+f|g+h|
+      __ Paddd(dst, src, kScratchDoubleReg);
       break;
     }
-    case kAVXF32x4UConvertI32x4: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
+    case kIA32I16x8ExtAddPairwiseI8x16S: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      DCHECK_NE(dst, src);
+      // dst = i8x16.splat(1)
+      __ Move(dst, uint32_t{0x01010101});
+      __ Pshufd(dst, dst, byte{0});
+      __ Pmaddubsw(dst, dst, src);
+      break;
+      break;
+    }
+    case kIA32I16x8ExtAddPairwiseI8x16U: {
+      XMMRegister dst = i.OutputSimd128Register();
+      // dst = i8x16.splat(1)
+      __ Move(kScratchDoubleReg, uint32_t{0x01010101});
+      __ Pshufd(kScratchDoubleReg, kScratchDoubleReg, byte{0});
+      __ Pmaddubsw(dst, i.InputSimd128Register(0), kScratchDoubleReg);
+      break;
+    }
+    case kIA32I16x8Q15MulRSatS: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src0 = i.InputSimd128Register(0);
+      XMMRegister src1 = i.InputSimd128Register(1);
+      // k = i16x8.splat(0x8000)
+      __ Pcmpeqd(kScratchDoubleReg, kScratchDoubleReg);
+      __ Psllw(kScratchDoubleReg, kScratchDoubleReg, byte{15});
+
+      __ Pmulhrsw(dst, src0, src1);
+      __ Pcmpeqw(kScratchDoubleReg, dst);
+      __ Pxor(dst, kScratchDoubleReg);
+      break;
+    }
+    case kIA32I32x4SignSelect: {
+      ASSEMBLE_SIMD_SIGN_SELECT(blendvps);
+      break;
+    }
+    case kIA32I64x2SignSelect: {
+      ASSEMBLE_SIMD_SIGN_SELECT(blendvpd);
+      break;
+    }
+    case kIA32F32x4Splat: {
+      XMMRegister dst = i.OutputDoubleRegister();
+      XMMRegister src = i.InputDoubleRegister(0);
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vshufps(i.OutputSimd128Register(), src, src, 0x0);
+      } else {
+        DCHECK_EQ(dst, src);
+        __ shufps(dst, src, 0x0);
+      }
+      break;
+    }
+    case kIA32F32x4ExtractLane: {
+      XMMRegister dst = i.OutputFloatRegister();
+      XMMRegister src = i.InputSimd128Register(0);
+      uint8_t lane = i.InputUint8(1);
+      DCHECK_LT(lane, 4);
+      // These instructions are shorter than insertps, but will leave junk in
+      // the top lanes of dst.
+      if (lane == 0) {
+        if (dst != src) {
+          __ Movaps(dst, src);
+        }
+      } else if (lane == 1) {
+        __ Movshdup(dst, src);
+      } else if (lane == 2 && dst == src) {
+        // Check dst == src to avoid false dependency on dst.
+        __ Movhlps(dst, src);
+      } else if (dst == src) {
+        __ Shufps(dst, src, src, lane);
+      } else {
+        __ Pshufd(dst, src, lane);
+      }
+      break;
+    }
+    case kIA32Insertps: {
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vinsertps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputOperand(2), i.InputInt8(1) << 4);
+      } else {
+        DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
+        CpuFeatureScope sse_scope(tasm(), SSE4_1);
+        __ insertps(i.OutputSimd128Register(), i.InputOperand(2),
+                    i.InputInt8(1) << 4);
+      }
+      break;
+    }
+    case kIA32F32x4SConvertI32x4: {
+      __ Cvtdq2ps(i.OutputSimd128Register(), i.InputOperand(0));
+      break;
+    }
+    case kIA32F32x4UConvertI32x4: {
       XMMRegister dst = i.OutputSimd128Register();
       XMMRegister src = i.InputSimd128Register(0);
-      __ vpxor(kScratchDoubleReg, kScratchDoubleReg,
-               kScratchDoubleReg);  // zeros
-      __ vpblendw(kScratchDoubleReg, kScratchDoubleReg, src,
-                  0x55);                                   // get lo 16 bits
-      __ vpsubd(dst, src, kScratchDoubleReg);              // get hi 16 bits
-      __ vcvtdq2ps(kScratchDoubleReg, kScratchDoubleReg);  // convert lo exactly
-      __ vpsrld(dst, dst, 1);    // divide by 2 to get in unsigned range
-      __ vcvtdq2ps(dst, dst);    // convert hi exactly
-      __ vaddps(dst, dst, dst);  // double hi, exactly
-      __ vaddps(dst, dst, kScratchDoubleReg);  // add hi and lo, may round.
+      __ Pxor(kScratchDoubleReg, kScratchDoubleReg);      // zeros
+      __ Pblendw(kScratchDoubleReg, src, 0x55);           // get lo 16 bits
+      __ Psubd(dst, src, kScratchDoubleReg);              // get hi 16 bits
+      __ Cvtdq2ps(kScratchDoubleReg, kScratchDoubleReg);  // convert lo exactly
+      __ Psrld(dst, dst, 1);    // divide by 2 to get in unsigned range
+      __ Cvtdq2ps(dst, dst);    // convert hi exactly
+      __ Addps(dst, dst, dst);  // double hi, exactly
+      __ Addps(dst, dst, kScratchDoubleReg);  // add hi and lo, may round.
       break;
     }
     case kSSEF32x4Abs: {
@@ -2237,13 +2480,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
                 i.InputOperand(0));
       break;
     }
-    case kSSEF32x4Sqrt: {
-      __ sqrtps(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      break;
-    }
-    case kAVXF32x4Sqrt: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vsqrtps(i.OutputSimd128Register(), i.InputOperand(0));
+    case kIA32F32x4Sqrt: {
+      __ Sqrtps(i.OutputSimd128Register(), i.InputSimd128Register(0));
       break;
     }
     case kIA32F32x4RecipApprox: {
@@ -2254,60 +2492,29 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Rsqrtps(i.OutputSimd128Register(), i.InputOperand(0));
       break;
     }
-    case kSSEF32x4Add: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      __ addps(i.OutputSimd128Register(), i.InputOperand(1));
-      break;
-    }
-    case kAVXF32x4Add: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vaddps(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                i.InputOperand(1));
-      break;
-    }
-    case kSSEF32x4AddHoriz: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      CpuFeatureScope sse_scope(tasm(), SSE3);
-      __ haddps(i.OutputSimd128Register(), i.InputOperand(1));
-      break;
-    }
-    case kAVXF32x4AddHoriz: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vhaddps(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputOperand(1));
-      break;
-    }
-    case kSSEF32x4Sub: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      __ subps(i.OutputSimd128Register(), i.InputOperand(1));
+    case kIA32F32x4Add: {
+      __ Addps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+               i.InputOperand(1));
       break;
-    }
-    case kAVXF32x4Sub: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vsubps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+    };
+    case kIA32F32x4AddHoriz: {
+      __ Haddps(i.OutputSimd128Register(), i.InputSimd128Register(0),
                 i.InputOperand(1));
       break;
     }
-    case kSSEF32x4Mul: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      __ mulps(i.OutputSimd128Register(), i.InputOperand(1));
-      break;
-    }
-    case kAVXF32x4Mul: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vmulps(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                i.InputOperand(1));
+    case kIA32F32x4Sub: {
+      __ Subps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+               i.InputOperand(1));
       break;
     }
-    case kSSEF32x4Div: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      __ divps(i.OutputSimd128Register(), i.InputOperand(1));
+    case kIA32F32x4Mul: {
+      __ Mulps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+               i.InputOperand(1));
       break;
     }
-    case kAVXF32x4Div: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vdivps(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                i.InputOperand(1));
+    case kIA32F32x4Div: {
+      __ Divps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+               i.InputOperand(1));
       break;
     }
     case kSSEF32x4Min: {
@@ -2334,7 +2541,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister src0 = i.InputSimd128Register(0);
       Operand src1 = i.InputOperand(1);
       // See comment above for correction of minps.
-      __ movups(kScratchDoubleReg, src1);
+      __ vmovups(kScratchDoubleReg, src1);
       __ vminps(kScratchDoubleReg, kScratchDoubleReg, src0);
       __ vminps(dst, src0, src1);
       __ vorps(dst, dst, kScratchDoubleReg);
@@ -2454,52 +2661,21 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Pextrd(i.OutputRegister(), i.InputSimd128Register(0), i.InputInt8(1));
       break;
     }
-    case kSSEI32x4ReplaceLane: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      CpuFeatureScope sse_scope(tasm(), SSE4_1);
-      __ pinsrd(i.OutputSimd128Register(), i.InputOperand(2), i.InputInt8(1));
-      break;
-    }
-    case kAVXI32x4ReplaceLane: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vpinsrd(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputOperand(2), i.InputInt8(1));
-      break;
-    }
-    case kSSEI32x4SConvertF32x4: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      XMMRegister dst = i.OutputSimd128Register();
-      // NAN->0
-      __ movaps(kScratchDoubleReg, dst);
-      __ cmpeqps(kScratchDoubleReg, kScratchDoubleReg);
-      __ pand(dst, kScratchDoubleReg);
-      // Set top bit if >= 0 (but not -0.0!)
-      __ pxor(kScratchDoubleReg, dst);
-      // Convert
-      __ cvttps2dq(dst, dst);
-      // Set top bit if >=0 is now < 0
-      __ pand(kScratchDoubleReg, dst);
-      __ psrad(kScratchDoubleReg, 31);
-      // Set positive overflow lanes to 0x7FFFFFFF
-      __ pxor(dst, kScratchDoubleReg);
-      break;
-    }
-    case kAVXI32x4SConvertF32x4: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
+    case kIA32I32x4SConvertF32x4: {
       XMMRegister dst = i.OutputSimd128Register();
       XMMRegister src = i.InputSimd128Register(0);
       // NAN->0
-      __ vcmpeqps(kScratchDoubleReg, src, src);
-      __ vpand(dst, src, kScratchDoubleReg);
+      __ Cmpeqps(kScratchDoubleReg, src, src);
+      __ Pand(dst, src, kScratchDoubleReg);
       // Set top bit if >= 0 (but not -0.0!)
-      __ vpxor(kScratchDoubleReg, kScratchDoubleReg, dst);
+      __ Pxor(kScratchDoubleReg, dst);
       // Convert
-      __ vcvttps2dq(dst, dst);
+      __ Cvttps2dq(dst, dst);
       // Set top bit if >=0 is now < 0
-      __ vpand(kScratchDoubleReg, kScratchDoubleReg, dst);
-      __ vpsrad(kScratchDoubleReg, kScratchDoubleReg, 31);
+      __ Pand(kScratchDoubleReg, dst);
+      __ Psrad(kScratchDoubleReg, kScratchDoubleReg, 31);
       // Set positive overflow lanes to 0x7FFFFFFF
-      __ vpxor(dst, dst, kScratchDoubleReg);
+      __ Pxor(dst, kScratchDoubleReg);
       break;
     }
     case kIA32I32x4SConvertI16x8Low: {
@@ -2809,28 +2985,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Pshufd(dst, dst, 0x0);
       break;
     }
-    case kIA32I16x8ExtractLaneU: {
-      Register dst = i.OutputRegister();
-      __ Pextrw(dst, i.InputSimd128Register(0), i.InputInt8(1));
-      break;
-    }
     case kIA32I16x8ExtractLaneS: {
       Register dst = i.OutputRegister();
       __ Pextrw(dst, i.InputSimd128Register(0), i.InputInt8(1));
       __ movsx_w(dst, dst);
       break;
     }
-    case kSSEI16x8ReplaceLane: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      __ pinsrw(i.OutputSimd128Register(), i.InputOperand(2), i.InputInt8(1));
-      break;
-    }
-    case kAVXI16x8ReplaceLane: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vpinsrw(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputOperand(2), i.InputInt8(1));
-      break;
-    }
     case kIA32I16x8SConvertI8x16Low: {
       __ Pmovsxbw(i.OutputSimd128Register(), i.InputOperand(0));
       break;
@@ -3151,27 +3311,80 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Pshufb(dst, kScratchDoubleReg);
       break;
     }
-    case kIA32I8x16ExtractLaneU: {
-      Register dst = i.OutputRegister();
-      __ Pextrb(dst, i.InputSimd128Register(0), i.InputInt8(1));
-      break;
-    }
     case kIA32I8x16ExtractLaneS: {
       Register dst = i.OutputRegister();
       __ Pextrb(dst, i.InputSimd128Register(0), i.InputInt8(1));
       __ movsx_b(dst, dst);
       break;
     }
-    case kSSEI8x16ReplaceLane: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      CpuFeatureScope sse_scope(tasm(), SSE4_1);
-      __ pinsrb(i.OutputSimd128Register(), i.InputOperand(2), i.InputInt8(1));
+    case kIA32Pinsrb: {
+      ASSEMBLE_SIMD_PINSR(pinsrb, SSE4_1);
       break;
     }
-    case kAVXI8x16ReplaceLane: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      __ vpinsrb(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputOperand(2), i.InputInt8(1));
+    case kIA32Pinsrw: {
+      ASSEMBLE_SIMD_PINSR(pinsrw, SSE4_1);
+      break;
+    }
+    case kIA32Pinsrd: {
+      ASSEMBLE_SIMD_PINSR(pinsrd, SSE4_1);
+      break;
+    }
+    case kIA32Movlps: {
+      if (instr->HasOutput()) {
+        __ Movlps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                  i.MemoryOperand(2));
+      } else {
+        size_t index = 0;
+        Operand dst = i.MemoryOperand(&index);
+        __ Movlps(dst, i.InputSimd128Register(index));
+      }
+      break;
+    }
+    case kIA32Movhps: {
+      if (instr->HasOutput()) {
+        __ Movhps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                  i.MemoryOperand(2));
+      } else {
+        size_t index = 0;
+        Operand dst = i.MemoryOperand(&index);
+        __ Movhps(dst, i.InputSimd128Register(index));
+      }
+      break;
+    }
+    case kIA32Pextrb: {
+      if (HasAddressingMode(instr)) {
+        size_t index = 0;
+        Operand operand = i.MemoryOperand(&index);
+        __ Pextrb(operand, i.InputSimd128Register(index),
+                  i.InputUint8(index + 1));
+      } else {
+        Register dst = i.OutputRegister();
+        __ Pextrb(dst, i.InputSimd128Register(0), i.InputInt8(1));
+      }
+      break;
+    }
+    case kIA32Pextrw: {
+      if (HasAddressingMode(instr)) {
+        size_t index = 0;
+        Operand operand = i.MemoryOperand(&index);
+        __ Pextrw(operand, i.InputSimd128Register(index),
+                  i.InputUint8(index + 1));
+      } else {
+        Register dst = i.OutputRegister();
+        __ Pextrw(dst, i.InputSimd128Register(0), i.InputInt8(1));
+      }
+      break;
+    }
+    case kIA32S128Store32Lane: {
+      size_t index = 0;
+      Operand operand = i.MemoryOperand(&index);
+      uint8_t laneidx = i.InputUint8(index + 1);
+      if (laneidx == 0) {
+        __ Movss(operand, i.InputSimd128Register(index));
+      } else {
+        DCHECK_GE(3, laneidx);
+        __ Extractps(operand, i.InputSimd128Register(index), 1);
+      }
       break;
     }
     case kSSEI8x16SConvertI16x8: {
@@ -3670,23 +3883,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
                i.InputOperand(1));
       break;
     }
-    case kSSES128Select: {
-      DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
-      // Mask used here is stored in dst.
-      XMMRegister dst = i.OutputSimd128Register();
-      __ movaps(kScratchDoubleReg, i.InputSimd128Register(1));
-      __ xorps(kScratchDoubleReg, i.InputSimd128Register(2));
-      __ andps(dst, kScratchDoubleReg);
-      __ xorps(dst, i.InputSimd128Register(2));
-      break;
-    }
-    case kAVXS128Select: {
-      CpuFeatureScope avx_scope(tasm(), AVX);
-      XMMRegister dst = i.OutputSimd128Register();
-      __ vxorps(kScratchDoubleReg, i.InputSimd128Register(2),
-                i.InputOperand(1));
-      __ vandps(kScratchDoubleReg, kScratchDoubleReg, i.InputOperand(0));
-      __ vxorps(dst, kScratchDoubleReg, i.InputSimd128Register(2));
+    case kIA32S128Select: {
+      __ S128Select(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                    i.InputSimd128Register(1), i.InputSimd128Register(2),
+                    kScratchDoubleReg);
       break;
     }
     case kIA32S128AndNot: {
@@ -3727,7 +3927,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         __ Pshufb(dst, Operand(esp, 0));
       } else {  // two input operands
         DCHECK_EQ(6, instr->InputCount());
-        __ movups(kScratchDoubleReg, src0);
+        __ Movups(kScratchDoubleReg, src0);
         for (int j = 5; j > 1; j--) {
           uint32_t lanes = i.InputUint32(j);
           uint32_t mask = 0;
@@ -3739,7 +3939,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         }
         __ Pshufb(kScratchDoubleReg, Operand(esp, 0));
         Operand src1 = i.InputOperand(1);
-        if (!src1.is_reg(dst)) __ movups(dst, src1);
+        if (!src1.is_reg(dst)) __ Movups(dst, src1);
         for (int j = 5; j > 1; j--) {
           uint32_t lanes = i.InputUint32(j);
           uint32_t mask = 0;
@@ -3800,6 +4000,18 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Pmovzxdq(i.OutputSimd128Register(), i.MemoryOperand());
       break;
     }
+    case kIA32S32x4Rotate: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      uint8_t mask = i.InputUint8(1);
+      if (dst == src) {
+        // 1-byte shorter encoding than pshufd.
+        __ Shufps(dst, src, src, mask);
+      } else {
+        __ Pshufd(dst, src, mask);
+      }
+      break;
+    }
     case kIA32S32x4Swizzle: {
       DCHECK_EQ(2, instr->InputCount());
       __ Pshufd(i.OutputSimd128Register(), i.InputOperand(0), i.InputInt8(1));
@@ -4112,9 +4324,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vpor(dst, dst, kScratchDoubleReg);
       break;
     }
-    case kIA32V32x4AnyTrue:
-    case kIA32V16x8AnyTrue:
-    case kIA32V8x16AnyTrue: {
+    case kIA32S128AnyTrue: {
       Register dst = i.OutputRegister();
       XMMRegister src = i.InputSimd128Register(0);
       Register tmp = i.TempRegister(0);
@@ -4888,7 +5098,7 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         __ mov(g.ToRegister(destination), g.ToRegister(source));
       } else {
         DCHECK(source->IsFPRegister());
-        __ movaps(g.ToDoubleRegister(destination), g.ToDoubleRegister(source));
+        __ Movaps(g.ToDoubleRegister(destination), g.ToDoubleRegister(source));
       }
       return;
     case MoveType::kRegisterToStack: {
@@ -4901,12 +5111,12 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         MachineRepresentation rep =
             LocationOperand::cast(source)->representation();
         if (rep == MachineRepresentation::kFloat32) {
-          __ movss(dst, src);
+          __ Movss(dst, src);
         } else if (rep == MachineRepresentation::kFloat64) {
-          __ movsd(dst, src);
+          __ Movsd(dst, src);
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, rep);
-          __ movups(dst, src);
+          __ Movups(dst, src);
         }
       }
       return;
@@ -4921,12 +5131,12 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         MachineRepresentation rep =
             LocationOperand::cast(source)->representation();
         if (rep == MachineRepresentation::kFloat32) {
-          __ movss(dst, src);
+          __ Movss(dst, src);
         } else if (rep == MachineRepresentation::kFloat64) {
-          __ movsd(dst, src);
+          __ Movsd(dst, src);
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, rep);
-          __ movups(dst, src);
+          __ Movups(dst, src);
         }
       }
       return;
@@ -4941,15 +5151,15 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         MachineRepresentation rep =
             LocationOperand::cast(source)->representation();
         if (rep == MachineRepresentation::kFloat32) {
-          __ movss(kScratchDoubleReg, src);
-          __ movss(dst, kScratchDoubleReg);
+          __ Movss(kScratchDoubleReg, src);
+          __ Movss(dst, kScratchDoubleReg);
         } else if (rep == MachineRepresentation::kFloat64) {
-          __ movsd(kScratchDoubleReg, src);
-          __ movsd(dst, kScratchDoubleReg);
+          __ Movsd(kScratchDoubleReg, src);
+          __ Movsd(dst, kScratchDoubleReg);
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, rep);
-          __ movups(kScratchDoubleReg, src);
-          __ movups(dst, kScratchDoubleReg);
+          __ Movups(kScratchDoubleReg, src);
+          __ Movups(dst, kScratchDoubleReg);
         }
       }
       return;
@@ -5019,9 +5229,9 @@ void CodeGenerator::AssembleSwap(InstructionOperand* source,
         DCHECK(source->IsFPRegister());
         XMMRegister src = g.ToDoubleRegister(source);
         XMMRegister dst = g.ToDoubleRegister(destination);
-        __ movaps(kScratchDoubleReg, src);
-        __ movaps(src, dst);
-        __ movaps(dst, kScratchDoubleReg);
+        __ Movaps(kScratchDoubleReg, src);
+        __ Movaps(src, dst);
+        __ Movaps(dst, kScratchDoubleReg);
       }
       return;
     }
@@ -5042,18 +5252,18 @@ void CodeGenerator::AssembleSwap(InstructionOperand* source,
         MachineRepresentation rep =
             LocationOperand::cast(source)->representation();
         if (rep == MachineRepresentation::kFloat32) {
-          __ movss(kScratchDoubleReg, dst);
-          __ movss(dst, src);
-          __ movaps(src, kScratchDoubleReg);
+          __ Movss(kScratchDoubleReg, dst);
+          __ Movss(dst, src);
+          __ Movaps(src, kScratchDoubleReg);
         } else if (rep == MachineRepresentation::kFloat64) {
-          __ movsd(kScratchDoubleReg, dst);
-          __ movsd(dst, src);
-          __ movaps(src, kScratchDoubleReg);
+          __ Movsd(kScratchDoubleReg, dst);
+          __ Movsd(dst, src);
+          __ Movaps(src, kScratchDoubleReg);
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, rep);
-          __ movups(kScratchDoubleReg, dst);
-          __ movups(dst, src);
-          __ movups(src, kScratchDoubleReg);
+          __ Movups(kScratchDoubleReg, dst);
+          __ Movups(dst, src);
+          __ Movups(src, kScratchDoubleReg);
         }
       }
       return;
@@ -5077,20 +5287,20 @@ void CodeGenerator::AssembleSwap(InstructionOperand* source,
         MachineRepresentation rep =
             LocationOperand::cast(source)->representation();
         if (rep == MachineRepresentation::kFloat32) {
-          __ movss(kScratchDoubleReg, dst0);  // Save dst in scratch register.
+          __ Movss(kScratchDoubleReg, dst0);  // Save dst in scratch register.
           __ push(src0);  // Then use stack to copy src to destination.
           __ pop(dst0);
-          __ movss(src0, kScratchDoubleReg);
+          __ Movss(src0, kScratchDoubleReg);
         } else if (rep == MachineRepresentation::kFloat64) {
-          __ movsd(kScratchDoubleReg, dst0);  // Save dst in scratch register.
+          __ Movsd(kScratchDoubleReg, dst0);  // Save dst in scratch register.
           __ push(src0);  // Then use stack to copy src to destination.
           __ pop(dst0);
           __ push(g.ToOperand(source, kSystemPointerSize));
           __ pop(g.ToOperand(destination, kSystemPointerSize));
-          __ movsd(src0, kScratchDoubleReg);
+          __ Movsd(src0, kScratchDoubleReg);
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, rep);
-          __ movups(kScratchDoubleReg, dst0);  // Save dst in scratch register.
+          __ Movups(kScratchDoubleReg, dst0);  // Save dst in scratch register.
           __ push(src0);  // Then use stack to copy src to destination.
           __ pop(dst0);
           __ push(g.ToOperand(source, kSystemPointerSize));
@@ -5099,7 +5309,7 @@ void CodeGenerator::AssembleSwap(InstructionOperand* source,
           __ pop(g.ToOperand(destination, 2 * kSystemPointerSize));
           __ push(g.ToOperand(source, 3 * kSystemPointerSize));
           __ pop(g.ToOperand(destination, 3 * kSystemPointerSize));
-          __ movups(src0, kScratchDoubleReg);
+          __ Movups(src0, kScratchDoubleReg);
         }
       }
       return;
@@ -5128,6 +5338,8 @@ void CodeGenerator::AssembleJumpTable(Label** targets, size_t target_count) {
 #undef ASSEMBLE_SIMD_IMM_SHUFFLE
 #undef ASSEMBLE_SIMD_ALL_TRUE
 #undef ASSEMBLE_SIMD_SHIFT
+#undef ASSEMBLE_SIMD_PINSR
+#undef ASSEMBLE_SIMD_SIGN_SELECT
 
 }  // namespace compiler
 }  // namespace internal
diff --git a/deps/v8/src/compiler/backend/ia32/instruction-codes-ia32.h b/deps/v8/src/compiler/backend/ia32/instruction-codes-ia32.h
index a56486479d389f..632eeace20fe8a 100644
--- a/deps/v8/src/compiler/backend/ia32/instruction-codes-ia32.h
+++ b/deps/v8/src/compiler/backend/ia32/instruction-codes-ia32.h
@@ -108,6 +108,8 @@ namespace compiler {
   V(IA32Movss)                     \
   V(IA32Movsd)                     \
   V(IA32Movdqu)                    \
+  V(IA32Movlps)                    \
+  V(IA32Movhps)                    \
   V(IA32BitcastFI)                 \
   V(IA32BitcastIF)                 \
   V(IA32Lea)                       \
@@ -117,8 +119,7 @@ namespace compiler {
   V(IA32PushSimd128)               \
   V(IA32Poke)                      \
   V(IA32Peek)                      \
-  V(SSEF64x2Splat)                 \
-  V(AVXF64x2Splat)                 \
+  V(IA32F64x2Splat)                \
   V(SSEF64x2ExtractLane)           \
   V(AVXF64x2ExtractLane)           \
   V(SSEF64x2ReplaceLane)           \
@@ -146,33 +147,34 @@ namespace compiler {
   V(IA32I64x2Sub)                  \
   V(IA32I64x2Mul)                  \
   V(IA32I64x2ShrU)                 \
-  V(SSEF32x4Splat)                 \
-  V(AVXF32x4Splat)                 \
-  V(SSEF32x4ExtractLane)           \
-  V(AVXF32x4ExtractLane)           \
-  V(SSEF32x4ReplaceLane)           \
-  V(AVXF32x4ReplaceLane)           \
+  V(IA32I64x2BitMask)              \
+  V(IA32I64x2Eq)                   \
+  V(IA32I64x2SignSelect)           \
+  V(IA32I64x2ExtMulLowI32x4S)      \
+  V(IA32I64x2ExtMulHighI32x4S)     \
+  V(IA32I64x2ExtMulLowI32x4U)      \
+  V(IA32I64x2ExtMulHighI32x4U)     \
+  V(IA32I64x2SConvertI32x4Low)     \
+  V(IA32I64x2SConvertI32x4High)    \
+  V(IA32I64x2UConvertI32x4Low)     \
+  V(IA32I64x2UConvertI32x4High)    \
+  V(IA32F32x4Splat)                \
+  V(IA32F32x4ExtractLane)          \
+  V(IA32Insertps)                  \
   V(IA32F32x4SConvertI32x4)        \
-  V(SSEF32x4UConvertI32x4)         \
-  V(AVXF32x4UConvertI32x4)         \
+  V(IA32F32x4UConvertI32x4)        \
   V(SSEF32x4Abs)                   \
   V(AVXF32x4Abs)                   \
   V(SSEF32x4Neg)                   \
   V(AVXF32x4Neg)                   \
-  V(SSEF32x4Sqrt)                  \
-  V(AVXF32x4Sqrt)                  \
+  V(IA32F32x4Sqrt)                 \
   V(IA32F32x4RecipApprox)          \
   V(IA32F32x4RecipSqrtApprox)      \
-  V(SSEF32x4Add)                   \
-  V(AVXF32x4Add)                   \
-  V(SSEF32x4AddHoriz)              \
-  V(AVXF32x4AddHoriz)              \
-  V(SSEF32x4Sub)                   \
-  V(AVXF32x4Sub)                   \
-  V(SSEF32x4Mul)                   \
-  V(AVXF32x4Mul)                   \
-  V(SSEF32x4Div)                   \
-  V(AVXF32x4Div)                   \
+  V(IA32F32x4Add)                  \
+  V(IA32F32x4AddHoriz)             \
+  V(IA32F32x4Sub)                  \
+  V(IA32F32x4Mul)                  \
+  V(IA32F32x4Div)                  \
   V(SSEF32x4Min)                   \
   V(AVXF32x4Min)                   \
   V(SSEF32x4Max)                   \
@@ -190,10 +192,7 @@ namespace compiler {
   V(IA32F32x4Round)                \
   V(IA32I32x4Splat)                \
   V(IA32I32x4ExtractLane)          \
-  V(SSEI32x4ReplaceLane)           \
-  V(AVXI32x4ReplaceLane)           \
-  V(SSEI32x4SConvertF32x4)         \
-  V(AVXI32x4SConvertF32x4)         \
+  V(IA32I32x4SConvertF32x4)        \
   V(IA32I32x4SConvertI16x8Low)     \
   V(IA32I32x4SConvertI16x8High)    \
   V(IA32I32x4Neg)                  \
@@ -235,11 +234,15 @@ namespace compiler {
   V(IA32I32x4Abs)                  \
   V(IA32I32x4BitMask)              \
   V(IA32I32x4DotI16x8S)            \
+  V(IA32I32x4SignSelect)           \
+  V(IA32I32x4ExtMulLowI16x8S)      \
+  V(IA32I32x4ExtMulHighI16x8S)     \
+  V(IA32I32x4ExtMulLowI16x8U)      \
+  V(IA32I32x4ExtMulHighI16x8U)     \
+  V(IA32I32x4ExtAddPairwiseI16x8S) \
+  V(IA32I32x4ExtAddPairwiseI16x8U) \
   V(IA32I16x8Splat)                \
-  V(IA32I16x8ExtractLaneU)         \
   V(IA32I16x8ExtractLaneS)         \
-  V(SSEI16x8ReplaceLane)           \
-  V(AVXI16x8ReplaceLane)           \
   V(IA32I16x8SConvertI8x16Low)     \
   V(IA32I16x8SConvertI8x16High)    \
   V(IA32I16x8Neg)                  \
@@ -291,11 +294,22 @@ namespace compiler {
   V(IA32I16x8RoundingAverageU)     \
   V(IA32I16x8Abs)                  \
   V(IA32I16x8BitMask)              \
+  V(IA32I16x8SignSelect)           \
+  V(IA32I16x8ExtMulLowI8x16S)      \
+  V(IA32I16x8ExtMulHighI8x16S)     \
+  V(IA32I16x8ExtMulLowI8x16U)      \
+  V(IA32I16x8ExtMulHighI8x16U)     \
+  V(IA32I16x8ExtAddPairwiseI8x16S) \
+  V(IA32I16x8ExtAddPairwiseI8x16U) \
+  V(IA32I16x8Q15MulRSatS)          \
   V(IA32I8x16Splat)                \
-  V(IA32I8x16ExtractLaneU)         \
   V(IA32I8x16ExtractLaneS)         \
-  V(SSEI8x16ReplaceLane)           \
-  V(AVXI8x16ReplaceLane)           \
+  V(IA32Pinsrb)                    \
+  V(IA32Pinsrw)                    \
+  V(IA32Pinsrd)                    \
+  V(IA32Pextrb)                    \
+  V(IA32Pextrw)                    \
+  V(IA32S128Store32Lane)           \
   V(SSEI8x16SConvertI16x8)         \
   V(AVXI8x16SConvertI16x8)         \
   V(IA32I8x16Neg)                  \
@@ -341,6 +355,7 @@ namespace compiler {
   V(IA32I8x16RoundingAverageU)     \
   V(IA32I8x16Abs)                  \
   V(IA32I8x16BitMask)              \
+  V(IA32I8x16SignSelect)           \
   V(IA32S128Const)                 \
   V(IA32S128Zero)                  \
   V(IA32S128AllOnes)               \
@@ -352,8 +367,7 @@ namespace compiler {
   V(AVXS128Or)                     \
   V(SSES128Xor)                    \
   V(AVXS128Xor)                    \
-  V(SSES128Select)                 \
-  V(AVXS128Select)                 \
+  V(IA32S128Select)                \
   V(IA32S128AndNot)                \
   V(IA32I8x16Swizzle)              \
   V(IA32I8x16Shuffle)              \
@@ -367,6 +381,7 @@ namespace compiler {
   V(IA32S128Load16x4U)             \
   V(IA32S128Load32x2S)             \
   V(IA32S128Load32x2U)             \
+  V(IA32S32x4Rotate)               \
   V(IA32S32x4Swizzle)              \
   V(IA32S32x4Shuffle)              \
   V(IA32S16x8Blend)                \
@@ -401,11 +416,9 @@ namespace compiler {
   V(AVXS8x4Reverse)                \
   V(SSES8x2Reverse)                \
   V(AVXS8x2Reverse)                \
-  V(IA32V32x4AnyTrue)              \
+  V(IA32S128AnyTrue)               \
   V(IA32V32x4AllTrue)              \
-  V(IA32V16x8AnyTrue)              \
   V(IA32V16x8AllTrue)              \
-  V(IA32V8x16AnyTrue)              \
   V(IA32V8x16AllTrue)              \
   V(IA32Word32AtomicPairLoad)      \
   V(IA32Word32AtomicPairStore)     \
diff --git a/deps/v8/src/compiler/backend/ia32/instruction-scheduler-ia32.cc b/deps/v8/src/compiler/backend/ia32/instruction-scheduler-ia32.cc
index c8f3b19d0fc64e..f82f299c5c70d6 100644
--- a/deps/v8/src/compiler/backend/ia32/instruction-scheduler-ia32.cc
+++ b/deps/v8/src/compiler/backend/ia32/instruction-scheduler-ia32.cc
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/base/logging.h"
+#include "src/compiler/backend/instruction-codes.h"
 #include "src/compiler/backend/instruction-scheduler.h"
+#include "src/compiler/backend/instruction.h"
 
 namespace v8 {
 namespace internal {
@@ -98,8 +101,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kAVXFloat32Neg:
     case kIA32BitcastFI:
     case kIA32BitcastIF:
-    case kSSEF64x2Splat:
-    case kAVXF64x2Splat:
+    case kIA32F64x2Splat:
     case kSSEF64x2ExtractLane:
     case kAVXF64x2ExtractLane:
     case kSSEF64x2ReplaceLane:
@@ -127,33 +129,34 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kIA32I64x2Sub:
     case kIA32I64x2Mul:
     case kIA32I64x2ShrU:
-    case kSSEF32x4Splat:
-    case kAVXF32x4Splat:
-    case kSSEF32x4ExtractLane:
-    case kAVXF32x4ExtractLane:
-    case kSSEF32x4ReplaceLane:
-    case kAVXF32x4ReplaceLane:
+    case kIA32I64x2BitMask:
+    case kIA32I64x2Eq:
+    case kIA32I64x2SignSelect:
+    case kIA32I64x2ExtMulLowI32x4S:
+    case kIA32I64x2ExtMulHighI32x4S:
+    case kIA32I64x2ExtMulLowI32x4U:
+    case kIA32I64x2ExtMulHighI32x4U:
+    case kIA32I64x2SConvertI32x4Low:
+    case kIA32I64x2SConvertI32x4High:
+    case kIA32I64x2UConvertI32x4Low:
+    case kIA32I64x2UConvertI32x4High:
+    case kIA32F32x4Splat:
+    case kIA32F32x4ExtractLane:
+    case kIA32Insertps:
     case kIA32F32x4SConvertI32x4:
-    case kSSEF32x4UConvertI32x4:
-    case kAVXF32x4UConvertI32x4:
+    case kIA32F32x4UConvertI32x4:
     case kSSEF32x4Abs:
     case kAVXF32x4Abs:
     case kSSEF32x4Neg:
     case kAVXF32x4Neg:
-    case kSSEF32x4Sqrt:
-    case kAVXF32x4Sqrt:
+    case kIA32F32x4Sqrt:
     case kIA32F32x4RecipApprox:
     case kIA32F32x4RecipSqrtApprox:
-    case kSSEF32x4Add:
-    case kAVXF32x4Add:
-    case kSSEF32x4AddHoriz:
-    case kAVXF32x4AddHoriz:
-    case kSSEF32x4Sub:
-    case kAVXF32x4Sub:
-    case kSSEF32x4Mul:
-    case kAVXF32x4Mul:
-    case kSSEF32x4Div:
-    case kAVXF32x4Div:
+    case kIA32F32x4Add:
+    case kIA32F32x4AddHoriz:
+    case kIA32F32x4Sub:
+    case kIA32F32x4Mul:
+    case kIA32F32x4Div:
     case kSSEF32x4Min:
     case kAVXF32x4Min:
     case kSSEF32x4Max:
@@ -171,10 +174,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kIA32F32x4Round:
     case kIA32I32x4Splat:
     case kIA32I32x4ExtractLane:
-    case kSSEI32x4ReplaceLane:
-    case kAVXI32x4ReplaceLane:
-    case kSSEI32x4SConvertF32x4:
-    case kAVXI32x4SConvertF32x4:
+    case kIA32I32x4SConvertF32x4:
     case kIA32I32x4SConvertI16x8Low:
     case kIA32I32x4SConvertI16x8High:
     case kIA32I32x4Neg:
@@ -216,11 +216,15 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kIA32I32x4Abs:
     case kIA32I32x4BitMask:
     case kIA32I32x4DotI16x8S:
+    case kIA32I32x4SignSelect:
+    case kIA32I32x4ExtMulLowI16x8S:
+    case kIA32I32x4ExtMulHighI16x8S:
+    case kIA32I32x4ExtMulLowI16x8U:
+    case kIA32I32x4ExtMulHighI16x8U:
+    case kIA32I32x4ExtAddPairwiseI16x8S:
+    case kIA32I32x4ExtAddPairwiseI16x8U:
     case kIA32I16x8Splat:
-    case kIA32I16x8ExtractLaneU:
     case kIA32I16x8ExtractLaneS:
-    case kSSEI16x8ReplaceLane:
-    case kAVXI16x8ReplaceLane:
     case kIA32I16x8SConvertI8x16Low:
     case kIA32I16x8SConvertI8x16High:
     case kIA32I16x8Neg:
@@ -272,11 +276,22 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kIA32I16x8RoundingAverageU:
     case kIA32I16x8Abs:
     case kIA32I16x8BitMask:
+    case kIA32I16x8SignSelect:
+    case kIA32I16x8ExtMulLowI8x16S:
+    case kIA32I16x8ExtMulHighI8x16S:
+    case kIA32I16x8ExtMulLowI8x16U:
+    case kIA32I16x8ExtMulHighI8x16U:
+    case kIA32I16x8ExtAddPairwiseI8x16S:
+    case kIA32I16x8ExtAddPairwiseI8x16U:
+    case kIA32I16x8Q15MulRSatS:
     case kIA32I8x16Splat:
-    case kIA32I8x16ExtractLaneU:
     case kIA32I8x16ExtractLaneS:
-    case kSSEI8x16ReplaceLane:
-    case kAVXI8x16ReplaceLane:
+    case kIA32Pinsrb:
+    case kIA32Pinsrw:
+    case kIA32Pinsrd:
+    case kIA32Pextrb:
+    case kIA32Pextrw:
+    case kIA32S128Store32Lane:
     case kSSEI8x16SConvertI16x8:
     case kAVXI8x16SConvertI16x8:
     case kIA32I8x16Neg:
@@ -322,6 +337,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kIA32I8x16RoundingAverageU:
     case kIA32I8x16Abs:
     case kIA32I8x16BitMask:
+    case kIA32I8x16SignSelect:
     case kIA32S128Const:
     case kIA32S128Zero:
     case kIA32S128AllOnes:
@@ -333,11 +349,11 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kAVXS128Or:
     case kSSES128Xor:
     case kAVXS128Xor:
-    case kSSES128Select:
-    case kAVXS128Select:
+    case kIA32S128Select:
     case kIA32S128AndNot:
     case kIA32I8x16Swizzle:
     case kIA32I8x16Shuffle:
+    case kIA32S32x4Rotate:
     case kIA32S32x4Swizzle:
     case kIA32S32x4Shuffle:
     case kIA32S16x8Blend:
@@ -372,11 +388,9 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kAVXS8x4Reverse:
     case kSSES8x2Reverse:
     case kAVXS8x2Reverse:
-    case kIA32V32x4AnyTrue:
+    case kIA32S128AnyTrue:
     case kIA32V32x4AllTrue:
-    case kIA32V16x8AnyTrue:
     case kIA32V16x8AllTrue:
-    case kIA32V8x16AnyTrue:
     case kIA32V8x16AllTrue:
       return (instr->addressing_mode() == kMode_None)
                  ? kNoOpcodeFlags
@@ -398,6 +412,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kIA32Movss:
     case kIA32Movsd:
     case kIA32Movdqu:
+    case kIA32Movlps:
+    case kIA32Movhps:
     // Moves are used for memory load/store operations.
     case kIA32S128Load8Splat:
     case kIA32S128Load16Splat:
diff --git a/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc b/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc
index c16584a195d957..0f266cd824877f 100644
--- a/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc
+++ b/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc
@@ -2,10 +2,43 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include <limits>
+#include <type_traits>
+#include <vector>
+
+#include "src/base/flags.h"
 #include "src/base/iterator.h"
+#include "src/base/logging.h"
+#include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
+#include "src/codegen/cpu-features.h"
+#include "src/codegen/ia32/assembler-ia32.h"
+#include "src/codegen/ia32/register-ia32.h"
+#include "src/codegen/machine-type.h"
+#include "src/codegen/turbo-assembler.h"
+#include "src/common/globals.h"
+#include "src/compiler/backend/instruction-codes.h"
 #include "src/compiler/backend/instruction-selector-impl.h"
+#include "src/compiler/backend/instruction-selector.h"
+#include "src/compiler/backend/instruction.h"
+#include "src/compiler/common-operator.h"
+#include "src/compiler/frame.h"
+#include "src/compiler/globals.h"
+#include "src/compiler/linkage.h"
+#include "src/compiler/machine-operator.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
+#include "src/compiler/node.h"
+#include "src/compiler/opcodes.h"
+#include "src/compiler/operator.h"
+#include "src/compiler/write-barrier-kind.h"
+#include "src/flags/flags.h"
+#include "src/utils/utils.h"
+#include "src/wasm/simd-shuffle.h"
+#include "src/zone/zone-containers.h"
 
 namespace v8 {
 namespace internal {
@@ -278,6 +311,10 @@ void VisitRRSimd(InstructionSelector* selector, Node* node,
   }
 }
 
+void VisitRRSimd(InstructionSelector* selector, Node* node, ArchOpcode opcode) {
+  VisitRRSimd(selector, node, opcode, opcode);
+}
+
 // TODO(v8:9198): Like VisitRROFloat, but for SIMD. SSE requires operand1 to be
 // a register as we don't have memory alignment yet. For AVX, memory operands
 // are fine, but can have performance issues if not aligned to 16/32 bytes
@@ -294,6 +331,16 @@ void VisitRROSimd(InstructionSelector* selector, Node* node,
                    g.UseRegister(node->InputAt(1)));
   }
 }
+void VisitRRRSimd(InstructionSelector* selector, Node* node,
+                  ArchOpcode opcode) {
+  IA32OperandGenerator g(selector);
+  InstructionOperand dst = selector->IsSupported(AVX)
+                               ? g.DefineAsRegister(node)
+                               : g.DefineSameAsFirst(node);
+  InstructionOperand operand0 = g.UseRegister(node->InputAt(0));
+  InstructionOperand operand1 = g.UseRegister(node->InputAt(1));
+  selector->Emit(opcode, dst, operand0, operand1);
+}
 
 void VisitRRISimd(InstructionSelector* selector, Node* node,
                   ArchOpcode opcode) {
@@ -363,6 +410,52 @@ void InstructionSelector::VisitAbortCSAAssert(Node* node) {
   Emit(kArchAbortCSAAssert, g.NoOutput(), g.UseFixed(node->InputAt(0), edx));
 }
 
+void InstructionSelector::VisitLoadLane(Node* node) {
+  LoadLaneParameters params = LoadLaneParametersOf(node->op());
+  InstructionCode opcode = kArchNop;
+  if (params.rep == MachineType::Int8()) {
+    opcode = kIA32Pinsrb;
+  } else if (params.rep == MachineType::Int16()) {
+    opcode = kIA32Pinsrw;
+  } else if (params.rep == MachineType::Int32()) {
+    opcode = kIA32Pinsrd;
+  } else if (params.rep == MachineType::Int64()) {
+    // pinsrq not available on IA32.
+    if (params.laneidx == 0) {
+      opcode = kIA32Movlps;
+    } else {
+      DCHECK_EQ(1, params.laneidx);
+      opcode = kIA32Movhps;
+    }
+  } else {
+    UNREACHABLE();
+  }
+
+  IA32OperandGenerator g(this);
+  InstructionOperand outputs[] = {g.DefineAsRegister(node)};
+  // Input 0 is value node, 1 is lane idx, and GetEffectiveAddressMemoryOperand
+  // uses up to 3 inputs. This ordering is consistent with other operations that
+  // use the same opcode.
+  InstructionOperand inputs[5];
+  size_t input_count = 0;
+
+  inputs[input_count++] = g.UseRegister(node->InputAt(2));
+  inputs[input_count++] = g.UseImmediate(params.laneidx);
+
+  AddressingMode mode =
+      g.GetEffectiveAddressMemoryOperand(node, inputs, &input_count);
+  opcode |= AddressingModeField::encode(mode);
+
+  DCHECK_GE(5, input_count);
+
+  // IA32 supports unaligned loads.
+  DCHECK_NE(params.kind, MemoryAccessKind::kUnaligned);
+  // Trap handler is not supported on IA32.
+  DCHECK_NE(params.kind, MemoryAccessKind::kProtected);
+
+  Emit(opcode, 1, outputs, input_count, inputs);
+}
+
 void InstructionSelector::VisitLoadTransform(Node* node) {
   LoadTransformParameters params = LoadTransformParametersOf(node->op());
   InstructionCode opcode;
@@ -493,8 +586,7 @@ void InstructionSelector::VisitStore(Node* node) {
     write_barrier_kind = kFullWriteBarrier;
   }
 
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedPointer(rep));
     AddressingMode addressing_mode;
     InstructionOperand inputs[] = {
@@ -568,6 +660,41 @@ void InstructionSelector::VisitProtectedStore(Node* node) {
   UNIMPLEMENTED();
 }
 
+void InstructionSelector::VisitStoreLane(Node* node) {
+  IA32OperandGenerator g(this);
+
+  StoreLaneParameters params = StoreLaneParametersOf(node->op());
+  InstructionCode opcode = kArchNop;
+  if (params.rep == MachineRepresentation::kWord8) {
+    opcode = kIA32Pextrb;
+  } else if (params.rep == MachineRepresentation::kWord16) {
+    opcode = kIA32Pextrw;
+  } else if (params.rep == MachineRepresentation::kWord32) {
+    opcode = kIA32S128Store32Lane;
+  } else if (params.rep == MachineRepresentation::kWord64) {
+    if (params.laneidx == 0) {
+      opcode = kIA32Movlps;
+    } else {
+      DCHECK_EQ(1, params.laneidx);
+      opcode = kIA32Movhps;
+    }
+  } else {
+    UNREACHABLE();
+  }
+
+  InstructionOperand inputs[4];
+  size_t input_count = 0;
+  AddressingMode addressing_mode =
+      g.GetEffectiveAddressMemoryOperand(node, inputs, &input_count);
+  opcode |= AddressingModeField::encode(addressing_mode);
+
+  InstructionOperand value_operand = g.UseRegister(node->InputAt(2));
+  inputs[input_count++] = value_operand;
+  inputs[input_count++] = g.UseImmediate(params.laneidx);
+  DCHECK_GE(4, input_count);
+  Emit(opcode, 0, nullptr, input_count, inputs);
+}
+
 // Architecture supports unaligned access, therefore VisitLoad is used instead
 void InstructionSelector::VisitUnalignedLoad(Node* node) { UNREACHABLE(); }
 
@@ -1275,7 +1402,6 @@ void InstructionSelector::EmitPrepareResults(
     Node* node) {
   IA32OperandGenerator g(this);
 
-  int reverse_slot = 1;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -1288,10 +1414,11 @@ void InstructionSelector::EmitPrepareResults(
       } else if (output.location.GetType() == MachineType::Simd128()) {
         MarkAsSimd128(output.node);
       }
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       Emit(kIA32Peek, g.DefineAsRegister(output.node),
            g.UseImmediate(reverse_slot));
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
@@ -2056,11 +2183,6 @@ void InstructionSelector::VisitWord32AtomicPairCompareExchange(Node* node) {
   V(I8x16)
 
 #define SIMD_BINOP_LIST(V) \
-  V(F32x4Add)              \
-  V(F32x4AddHoriz)         \
-  V(F32x4Sub)              \
-  V(F32x4Mul)              \
-  V(F32x4Div)              \
   V(F32x4Min)              \
   V(F32x4Max)              \
   V(F32x4Eq)               \
@@ -2122,16 +2244,45 @@ void InstructionSelector::VisitWord32AtomicPairCompareExchange(Node* node) {
   V(S128Xor)
 
 #define SIMD_BINOP_UNIFIED_SSE_AVX_LIST(V) \
+  V(F32x4Add)                              \
+  V(F32x4AddHoriz)                         \
+  V(F32x4Sub)                              \
+  V(F32x4Mul)                              \
+  V(F32x4Div)                              \
   V(I64x2Add)                              \
   V(I64x2Sub)                              \
+  V(I64x2Eq)                               \
   V(I32x4DotI16x8S)                        \
   V(I16x8RoundingAverageU)                 \
+  V(I16x8Q15MulRSatS)                      \
   V(I8x16RoundingAverageU)
 
+// These opcodes require all inputs to be registers because the codegen is
+// simpler with all registers.
+#define SIMD_BINOP_RRR(V)  \
+  V(I64x2ExtMulLowI32x4S)  \
+  V(I64x2ExtMulHighI32x4S) \
+  V(I64x2ExtMulLowI32x4U)  \
+  V(I64x2ExtMulHighI32x4U) \
+  V(I32x4ExtMulLowI16x8S)  \
+  V(I32x4ExtMulHighI16x8S) \
+  V(I32x4ExtMulLowI16x8U)  \
+  V(I32x4ExtMulHighI16x8U) \
+  V(I16x8ExtMulLowI8x16S)  \
+  V(I16x8ExtMulHighI8x16S) \
+  V(I16x8ExtMulLowI8x16U)  \
+  V(I16x8ExtMulHighI8x16U)
+
 #define SIMD_UNOP_LIST(V)   \
+  V(F32x4Sqrt)              \
   V(F32x4SConvertI32x4)     \
   V(F32x4RecipApprox)       \
   V(F32x4RecipSqrtApprox)   \
+  V(I64x2BitMask)           \
+  V(I64x2SConvertI32x4Low)  \
+  V(I64x2SConvertI32x4High) \
+  V(I64x2UConvertI32x4Low)  \
+  V(I64x2UConvertI32x4High) \
   V(I32x4SConvertI16x8Low)  \
   V(I32x4SConvertI16x8High) \
   V(I32x4Neg)               \
@@ -2152,7 +2303,6 @@ void InstructionSelector::VisitWord32AtomicPairCompareExchange(Node* node) {
 #define SIMD_UNOP_PREFIX_LIST(V) \
   V(F32x4Abs)                    \
   V(F32x4Neg)                    \
-  V(F32x4Sqrt)                   \
   V(S128Not)
 
 #define SIMD_ANYTRUE_LIST(V) \
@@ -2179,7 +2329,7 @@ void InstructionSelector::VisitS128Const(Node* node) {
   IA32OperandGenerator g(this);
   static const int kUint32Immediates = kSimd128Size / sizeof(uint32_t);
   uint32_t val[kUint32Immediates];
-  memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  base::Memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
   // If all bytes are zeros or ones, avoid emitting code for generic constants
   bool all_zeros = !(val[0] || val[1] || val[2] || val[3]);
   bool all_ones = val[0] == UINT32_MAX && val[1] == UINT32_MAX &&
@@ -2229,7 +2379,7 @@ void InstructionSelector::VisitF64x2Max(Node* node) {
 }
 
 void InstructionSelector::VisitF64x2Splat(Node* node) {
-  VisitRRSimd(this, node, kAVXF64x2Splat, kSSEF64x2Splat);
+  VisitRRSimd(this, node, kIA32F64x2Splat);
 }
 
 void InstructionSelector::VisitF64x2ExtractLane(Node* node) {
@@ -2296,19 +2446,23 @@ void InstructionSelector::VisitI64x2Mul(Node* node) {
 }
 
 void InstructionSelector::VisitF32x4Splat(Node* node) {
-  VisitRRSimd(this, node, kAVXF32x4Splat, kSSEF32x4Splat);
+  VisitRRSimd(this, node, kIA32F32x4Splat);
 }
 
 void InstructionSelector::VisitF32x4ExtractLane(Node* node) {
-  VisitRRISimd(this, node, kAVXF32x4ExtractLane, kSSEF32x4ExtractLane);
+  IA32OperandGenerator g(this);
+  InstructionOperand operand0 = g.UseRegister(node->InputAt(0));
+  InstructionOperand operand1 =
+      g.UseImmediate(OpParameter<int32_t>(node->op()));
+  Emit(kIA32F32x4ExtractLane, g.DefineAsRegister(node), operand0, operand1);
 }
 
 void InstructionSelector::VisitF32x4UConvertI32x4(Node* node) {
-  VisitRRSimd(this, node, kAVXF32x4UConvertI32x4, kSSEF32x4UConvertI32x4);
+  VisitRRSimd(this, node, kIA32F32x4UConvertI32x4);
 }
 
 void InstructionSelector::VisitI32x4SConvertF32x4(Node* node) {
-  VisitRRSimd(this, node, kAVXI32x4SConvertF32x4, kSSEI32x4SConvertF32x4);
+  VisitRRSimd(this, node, kIA32I32x4SConvertF32x4);
 }
 
 void InstructionSelector::VisitI32x4UConvertF32x4(Node* node) {
@@ -2341,16 +2495,10 @@ void InstructionSelector::VisitS128Zero(Node* node) {
 
 void InstructionSelector::VisitS128Select(Node* node) {
   IA32OperandGenerator g(this);
-  InstructionOperand operand2 = g.UseRegister(node->InputAt(2));
-  if (IsSupported(AVX)) {
-    // AVX supports unaligned memory operands, so Use here is okay.
-    Emit(kAVXS128Select, g.DefineAsRegister(node), g.Use(node->InputAt(0)),
-         g.Use(node->InputAt(1)), operand2);
-  } else {
-    Emit(kSSES128Select, g.DefineSameAsFirst(node),
-         g.UseRegister(node->InputAt(0)), g.UseRegister(node->InputAt(1)),
-         operand2);
-  }
+  InstructionOperand dst =
+      IsSupported(AVX) ? g.DefineAsRegister(node) : g.DefineSameAsFirst(node);
+  Emit(kIA32S128Select, dst, g.UseRegister(node->InputAt(0)),
+       g.UseRegister(node->InputAt(1)), g.UseRegister(node->InputAt(2)));
 }
 
 void InstructionSelector::VisitS128AndNot(Node* node) {
@@ -2371,38 +2519,49 @@ void InstructionSelector::VisitS128AndNot(Node* node) {
     }                                                        \
   }
 SIMD_INT_TYPES(VISIT_SIMD_SPLAT)
+#undef SIMD_INT_TYPES
 #undef VISIT_SIMD_SPLAT
 
-#define SIMD_VISIT_EXTRACT_LANE(Type, Sign)                              \
-  void InstructionSelector::Visit##Type##ExtractLane##Sign(Node* node) { \
-    VisitRRISimd(this, node, kIA32##Type##ExtractLane##Sign);            \
-  }
-SIMD_VISIT_EXTRACT_LANE(I32x4, )
-SIMD_VISIT_EXTRACT_LANE(I16x8, U)
-SIMD_VISIT_EXTRACT_LANE(I16x8, S)
-SIMD_VISIT_EXTRACT_LANE(I8x16, U)
-SIMD_VISIT_EXTRACT_LANE(I8x16, S)
-#undef SIMD_VISIT_EXTRACT_LANE
+void InstructionSelector::VisitI8x16ExtractLaneU(Node* node) {
+  VisitRRISimd(this, node, kIA32Pextrb);
+}
 
-#define VISIT_SIMD_REPLACE_LANE(Type)                                    \
-  void InstructionSelector::Visit##Type##ReplaceLane(Node* node) {       \
-    IA32OperandGenerator g(this);                                        \
-    InstructionOperand operand0 = g.UseRegister(node->InputAt(0));       \
-    InstructionOperand operand1 =                                        \
-        g.UseImmediate(OpParameter<int32_t>(node->op()));                \
-    InstructionOperand operand2 = g.Use(node->InputAt(1));               \
-    if (IsSupported(AVX)) {                                              \
-      Emit(kAVX##Type##ReplaceLane, g.DefineAsRegister(node), operand0,  \
-           operand1, operand2);                                          \
-    } else {                                                             \
-      Emit(kSSE##Type##ReplaceLane, g.DefineSameAsFirst(node), operand0, \
-           operand1, operand2);                                          \
-    }                                                                    \
+void InstructionSelector::VisitI8x16ExtractLaneS(Node* node) {
+  VisitRRISimd(this, node, kIA32I8x16ExtractLaneS);
+}
+
+void InstructionSelector::VisitI16x8ExtractLaneU(Node* node) {
+  VisitRRISimd(this, node, kIA32Pextrw);
+}
+
+void InstructionSelector::VisitI16x8ExtractLaneS(Node* node) {
+  VisitRRISimd(this, node, kIA32I16x8ExtractLaneS);
+}
+
+void InstructionSelector::VisitI32x4ExtractLane(Node* node) {
+  VisitRRISimd(this, node, kIA32I32x4ExtractLane);
+}
+
+#define SIMD_REPLACE_LANE_TYPE_OP(V) \
+  V(I32x4, kIA32Pinsrd)              \
+  V(I16x8, kIA32Pinsrw)              \
+  V(I8x16, kIA32Pinsrb)              \
+  V(F32x4, kIA32Insertps)
+
+#define VISIT_SIMD_REPLACE_LANE(TYPE, OPCODE)                              \
+  void InstructionSelector::Visit##TYPE##ReplaceLane(Node* node) {         \
+    IA32OperandGenerator g(this);                                          \
+    InstructionOperand operand0 = g.UseRegister(node->InputAt(0));         \
+    InstructionOperand operand1 =                                          \
+        g.UseImmediate(OpParameter<int32_t>(node->op()));                  \
+    InstructionOperand operand2 = g.Use(node->InputAt(1));                 \
+    InstructionOperand dst = IsSupported(AVX) ? g.DefineAsRegister(node)   \
+                                              : g.DefineSameAsFirst(node); \
+    Emit(OPCODE, dst, operand0, operand1, operand2);                       \
   }
-SIMD_INT_TYPES(VISIT_SIMD_REPLACE_LANE)
-VISIT_SIMD_REPLACE_LANE(F32x4)
+SIMD_REPLACE_LANE_TYPE_OP(VISIT_SIMD_REPLACE_LANE)
 #undef VISIT_SIMD_REPLACE_LANE
-#undef SIMD_INT_TYPES
+#undef SIMD_REPLACE_LANE_TYPE_OP
 
 // The difference between this and VISIT_SIMD_REPLACE_LANE is that this forces
 // operand2 to be UseRegister, because the codegen relies on insertps using
@@ -2467,11 +2626,12 @@ SIMD_UNOP_PREFIX_LIST(VISIT_SIMD_UNOP_PREFIX)
 #undef VISIT_SIMD_UNOP_PREFIX
 #undef SIMD_UNOP_PREFIX_LIST
 
+// The implementation of AnyTrue is the same for all shapes.
 #define VISIT_SIMD_ANYTRUE(Opcode)                                  \
   void InstructionSelector::Visit##Opcode(Node* node) {             \
     IA32OperandGenerator g(this);                                   \
     InstructionOperand temps[] = {g.TempRegister()};                \
-    Emit(kIA32##Opcode, g.DefineAsRegister(node),                   \
+    Emit(kIA32S128AnyTrue, g.DefineAsRegister(node),                \
          g.UseRegister(node->InputAt(0)), arraysize(temps), temps); \
   }
 SIMD_ANYTRUE_LIST(VISIT_SIMD_ANYTRUE)
@@ -2505,6 +2665,14 @@ SIMD_BINOP_UNIFIED_SSE_AVX_LIST(VISIT_SIMD_BINOP_UNIFIED_SSE_AVX)
 #undef VISIT_SIMD_BINOP_UNIFIED_SSE_AVX
 #undef SIMD_BINOP_UNIFIED_SSE_AVX_LIST
 
+#define VISIT_SIMD_BINOP_RRR(OPCODE)                    \
+  void InstructionSelector::Visit##OPCODE(Node* node) { \
+    VisitRRRSimd(this, node, kIA32##OPCODE);            \
+  }
+SIMD_BINOP_RRR(VISIT_SIMD_BINOP_RRR)
+#undef VISIT_SIMD_BINOP_RRR
+#undef SIMD_BINOP_RRR
+
 // TODO(v8:9198): SSE requires operand1 to be a register as we don't have memory
 // alignment yet. For AVX, memory operands are fine, but can have performance
 // issues if not aligned to 16/32 bytes (based on load size), see SDM Vol 1,
@@ -2747,13 +2915,20 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node) {
   int index;
   const ShuffleEntry* arch_shuffle;
   if (wasm::SimdShuffle::TryMatchConcat(shuffle, &offset)) {
-    // Swap inputs from the normal order for (v)palignr.
-    SwapShuffleInputs(node);
-    is_swizzle = false;  // It's simpler to just handle the general case.
-    no_same_as_first = use_avx;  // SSE requires same-as-first.
-    opcode = kIA32S8x16Alignr;
-    // palignr takes a single imm8 offset.
-    imms[imm_count++] = offset;
+    if (wasm::SimdShuffle::TryMatch32x4Rotate(shuffle, shuffle32x4,
+                                              is_swizzle)) {
+      uint8_t shuffle_mask = wasm::SimdShuffle::PackShuffle4(shuffle32x4);
+      opcode = kIA32S32x4Rotate;
+      imms[imm_count++] = shuffle_mask;
+    } else {
+      // Swap inputs from the normal order for (v)palignr.
+      SwapShuffleInputs(node);
+      is_swizzle = false;  // It's simpler to just handle the general case.
+      no_same_as_first = use_avx;  // SSE requires same-as-first.
+      opcode = kIA32S8x16Alignr;
+      // palignr takes a single imm8 offset.
+      imms[imm_count++] = offset;
+    }
   } else if (TryMatchArchShuffle(shuffle, arch_shuffles,
                                  arraysize(arch_shuffles), is_swizzle,
                                  &arch_shuffle)) {
@@ -2898,6 +3073,62 @@ void InstructionSelector::VisitF64x2Pmax(Node* node) {
   VisitPminOrPmax(this, node, kIA32F64x2Pmax);
 }
 
+namespace {
+void VisitSignSelect(InstructionSelector* selector, Node* node,
+                     ArchOpcode opcode) {
+  IA32OperandGenerator g(selector);
+  // signselect(x, y, -1) = x
+  // pblendvb(dst, x, y, -1) = dst <- y, so we need to swap x and y.
+  if (selector->IsSupported(AVX)) {
+    selector->Emit(
+        opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(1)),
+        g.UseRegister(node->InputAt(0)), g.UseRegister(node->InputAt(2)));
+  } else {
+    // We would like to fix the mask to be xmm0, since that is what
+    // pblendvb/blendvps/blendvps uses as an implicit operand. However, xmm0 is
+    // also scratch register, so our mask values can be overwritten. Instead, we
+    // manually move the mask to xmm0 inside codegen.
+    selector->Emit(
+        opcode, g.DefineSameAsFirst(node), g.UseRegister(node->InputAt(1)),
+        g.UseRegister(node->InputAt(0)), g.UseRegister(node->InputAt(2)));
+  }
+}
+}  // namespace
+
+void InstructionSelector::VisitI8x16SignSelect(Node* node) {
+  VisitSignSelect(this, node, kIA32I8x16SignSelect);
+}
+
+void InstructionSelector::VisitI16x8SignSelect(Node* node) {
+  VisitSignSelect(this, node, kIA32I16x8SignSelect);
+}
+
+void InstructionSelector::VisitI32x4SignSelect(Node* node) {
+  VisitSignSelect(this, node, kIA32I32x4SignSelect);
+}
+
+void InstructionSelector::VisitI64x2SignSelect(Node* node) {
+  VisitSignSelect(this, node, kIA32I64x2SignSelect);
+}
+
+void InstructionSelector::VisitI32x4ExtAddPairwiseI16x8S(Node* node) {
+  VisitRRSimd(this, node, kIA32I32x4ExtAddPairwiseI16x8S);
+}
+
+void InstructionSelector::VisitI32x4ExtAddPairwiseI16x8U(Node* node) {
+  VisitRRSimd(this, node, kIA32I32x4ExtAddPairwiseI16x8U);
+}
+
+void InstructionSelector::VisitI16x8ExtAddPairwiseI8x16S(Node* node) {
+  IA32OperandGenerator g(this);
+  Emit(kIA32I16x8ExtAddPairwiseI8x16S, g.DefineAsRegister(node),
+       g.UseUniqueRegister(node->InputAt(0)));
+}
+
+void InstructionSelector::VisitI16x8ExtAddPairwiseI8x16U(Node* node) {
+  VisitRRSimd(this, node, kIA32I16x8ExtAddPairwiseI8x16U);
+}
+
 // static
 MachineOperatorBuilder::Flags
 InstructionSelector::SupportedMachineOperatorFlags() {
diff --git a/deps/v8/src/compiler/backend/instruction-codes.h b/deps/v8/src/compiler/backend/instruction-codes.h
index f9e68cea5768ec..44f6d5bcbfdf85 100644
--- a/deps/v8/src/compiler/backend/instruction-codes.h
+++ b/deps/v8/src/compiler/backend/instruction-codes.h
@@ -279,6 +279,8 @@ static_assert(ArchOpcodeField::is_valid(kLastArchOpcode),
 using AddressingModeField = base::BitField<AddressingMode, 9, 5>;
 using FlagsModeField = base::BitField<FlagsMode, 14, 3>;
 using FlagsConditionField = base::BitField<FlagsCondition, 17, 5>;
+using DeoptImmedArgsCountField = base::BitField<int, 22, 2>;
+using DeoptFrameStateOffsetField = base::BitField<int, 24, 8>;
 using MiscField = base::BitField<int, 22, 10>;
 
 }  // namespace compiler
diff --git a/deps/v8/src/compiler/backend/instruction-selector.cc b/deps/v8/src/compiler/backend/instruction-selector.cc
index b62cc8353281b9..a9b2010b7e35e6 100644
--- a/deps/v8/src/compiler/backend/instruction-selector.cc
+++ b/deps/v8/src/compiler/backend/instruction-selector.cc
@@ -7,6 +7,7 @@
 #include <limits>
 
 #include "src/base/iterator.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/tick-counter.h"
 #include "src/compiler/backend/instruction-selector-impl.h"
@@ -784,7 +785,22 @@ Instruction* InstructionSelector::EmitWithContinuation(
     continuation_inputs_.push_back(g.Label(cont->true_block()));
     continuation_inputs_.push_back(g.Label(cont->false_block()));
   } else if (cont->IsDeoptimize()) {
-    opcode |= MiscField::encode(static_cast<int>(input_count));
+    int immediate_args_count = 0;
+    if (cont->has_extra_args()) {
+      for (int i = 0; i < cont->extra_args_count(); i++) {
+        InstructionOperand op = cont->extra_args()[i];
+        continuation_inputs_.push_back(op);
+        input_count++;
+        if (op.IsImmediate()) {
+          immediate_args_count++;
+        } else {
+          // All immediate args should be added last.
+          DCHECK_EQ(immediate_args_count, 0);
+        }
+      }
+    }
+    opcode |= DeoptImmedArgsCountField::encode(immediate_args_count) |
+              DeoptFrameStateOffsetField::encode(static_cast<int>(input_count));
     AppendDeoptimizeArguments(&continuation_inputs_, cont->kind(),
                               cont->reason(), cont->feedback(),
                               cont->frame_state());
@@ -882,13 +898,9 @@ void InstructionSelector::InitializeCallBuffer(Node* call, CallBuffer* buffer,
       buffer->output_nodes.push_back(result);
     } else {
       buffer->output_nodes.resize(ret_count);
-      int stack_count = 0;
       for (size_t i = 0; i < ret_count; ++i) {
         LinkageLocation location = buffer->descriptor->GetReturnLocation(i);
         buffer->output_nodes[i] = PushParameter(nullptr, location);
-        if (location.IsCallerFrameSlot()) {
-          stack_count += location.GetSizeInPointers();
-        }
       }
       for (Edge const edge : call->use_edges()) {
         if (!NodeProperties::IsValueEdge(edge)) continue;
@@ -900,7 +912,9 @@ void InstructionSelector::InitializeCallBuffer(Node* call, CallBuffer* buffer,
         DCHECK(!buffer->output_nodes[index].node);
         buffer->output_nodes[index].node = node;
       }
-      frame_->EnsureReturnSlots(stack_count);
+
+      frame_->EnsureReturnSlots(
+          static_cast<int>(buffer->descriptor->StackReturnCount()));
     }
 
     // Filter out the outputs that aren't live because no projection uses them.
@@ -1377,6 +1391,8 @@ void InstructionSelector::VisitNode(Node* node) {
       return VisitDeoptimizeIf(node);
     case IrOpcode::kDeoptimizeUnless:
       return VisitDeoptimizeUnless(node);
+    case IrOpcode::kDynamicCheckMapsWithDeoptUnless:
+      return VisitDynamicCheckMapsWithDeoptUnless(node);
     case IrOpcode::kTrapIf:
       return VisitTrapIf(node, TrapIdOf(node->op()));
     case IrOpcode::kTrapUnless:
@@ -1415,6 +1431,12 @@ void InstructionSelector::VisitNode(Node* node) {
       MarkAsRepresentation(MachineRepresentation::kSimd128, node);
       return VisitLoadTransform(node);
     }
+    case IrOpcode::kPrefetchTemporal: {
+      return VisitPrefetchTemporal(node);
+    }
+    case IrOpcode::kPrefetchNonTemporal: {
+      return VisitPrefetchNonTemporal(node);
+    }
     case IrOpcode::kLoadLane: {
       MarkAsRepresentation(MachineRepresentation::kSimd128, node);
       return VisitLoadLane(node);
@@ -2711,7 +2733,6 @@ void InstructionSelector::VisitI64x2Splat(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitI64x2ExtractLane(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitI64x2ReplaceLane(Node* node) { UNIMPLEMENTED(); }
 #endif  // !V8_TARGET_ARCH_MIPS64
-void InstructionSelector::VisitI64x2Eq(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitF64x2Qfma(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitF64x2Qfms(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitF32x4Qfma(Node* node) { UNIMPLEMENTED(); }
@@ -2719,10 +2740,16 @@ void InstructionSelector::VisitF32x4Qfms(Node* node) { UNIMPLEMENTED(); }
 #endif  // !V8_TARGET_ARCH_ARM64
 #endif  // !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_S390X
 
-#if !V8_TARGET_ARCH_ARM64
-// TODO(v8:10971) Prototype i16x8.q15mulr_sat_s
-void InstructionSelector::VisitI16x8Q15MulRSatS(Node* node) { UNIMPLEMENTED(); }
+#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_S390X && !V8_TARGET_ARCH_ARM64 && \
+    !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS64 && \
+    !V8_TARGET_ARCH_MIPS
+void InstructionSelector::VisitI64x2Eq(Node* node) { UNIMPLEMENTED(); }
+#endif  // !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_S390X && !V8_TARGET_ARCH_ARM64
+        // && !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_ARM
+        // && !V8_TARGET_ARCH_MIPS64 && !V8_TARGET_ARCH_MIPS
 
+#if !V8_TARGET_ARCH_ARM64 && !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && \
+    !V8_TARGET_ARCH_ARM
 // TODO(v8:10972) Prototype i64x2 widen i32x4.
 void InstructionSelector::VisitI64x2SConvertI32x4Low(Node* node) {
   UNIMPLEMENTED();
@@ -2739,48 +2766,24 @@ void InstructionSelector::VisitI64x2UConvertI32x4Low(Node* node) {
 void InstructionSelector::VisitI64x2UConvertI32x4High(Node* node) {
   UNIMPLEMENTED();
 }
+#endif  // !V8_TARGET_ARCH_ARM64 || !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32
+        // && !V8_TARGET_ARCH_ARM
 
-// TODO(v8:11002) Prototype i8x16.popcnt.
-void InstructionSelector::VisitI8x16Popcnt(Node* node) { UNIMPLEMENTED(); }
-
-// TODO(v8:11008) Prototype extended multiplication.
-void InstructionSelector::VisitI64x2ExtMulLowI32x4S(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI64x2ExtMulHighI32x4S(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI64x2ExtMulLowI32x4U(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI64x2ExtMulHighI32x4U(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI32x4ExtMulLowI16x8S(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI32x4ExtMulHighI16x8S(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI32x4ExtMulLowI16x8U(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI32x4ExtMulHighI16x8U(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI16x8ExtMulLowI8x16S(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI16x8ExtMulHighI8x16S(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI16x8ExtMulLowI8x16U(Node* node) {
-  UNIMPLEMENTED();
-}
-void InstructionSelector::VisitI16x8ExtMulHighI8x16U(Node* node) {
+#if !V8_TARGET_ARCH_ARM64
+// TODO(v8:11168): Prototyping prefetch.
+void InstructionSelector::VisitPrefetchTemporal(Node* node) { UNIMPLEMENTED(); }
+void InstructionSelector::VisitPrefetchNonTemporal(Node* node) {
   UNIMPLEMENTED();
 }
+#endif  // !V8_TARGET_ARCH_ARM64
 
+#if !V8_TARGET_ARCH_ARM64 && !V8_TARGET_ARCH_ARM
+// TODO(v8:11002) Prototype i8x16.popcnt.
+void InstructionSelector::VisitI8x16Popcnt(Node* node) { UNIMPLEMENTED(); }
+#endif  // !V8_TARGET_ARCH_ARM64 && !V8_TARGET_ARCH_ARM
+
+#if !V8_TARGET_ARCH_ARM64 && !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_X64 && \
+    !V8_TARGET_ARCH_IA32
 // TODO(v8:11086) Prototype extended pairwise add.
 void InstructionSelector::VisitI32x4ExtAddPairwiseI16x8S(Node* node) {
   UNIMPLEMENTED();
@@ -2794,22 +2797,26 @@ void InstructionSelector::VisitI16x8ExtAddPairwiseI8x16S(Node* node) {
 void InstructionSelector::VisitI16x8ExtAddPairwiseI8x16U(Node* node) {
   UNIMPLEMENTED();
 }
-#endif  // !V8_TARGET_ARCH_ARM64
+#endif  // !V8_TARGET_ARCH_ARM64 && !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_X64
+        // && !V8_TARGET_ARCH_IA32
 
-#if !V8_TARGET_ARCH_X64
+#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_ARM64 && \
+    !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS64
 // TODO(v8:10975): Prototyping load lane and store lane.
 void InstructionSelector::VisitLoadLane(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitStoreLane(Node* node) { UNIMPLEMENTED(); }
+#endif  // !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_ARM64
+        // && !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS64
 
-// TODO(v8:10997) Prototype i64x2.bitmask.
-void InstructionSelector::VisitI64x2BitMask(Node* node) { UNIMPLEMENTED(); }
-
+#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_ARM64 && \
+    !V8_TARGET_ARCH_ARM
 // TODO(v8:10983) Prototyping sign select.
 void InstructionSelector::VisitI8x16SignSelect(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitI16x8SignSelect(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitI32x4SignSelect(Node* node) { UNIMPLEMENTED(); }
 void InstructionSelector::VisitI64x2SignSelect(Node* node) { UNIMPLEMENTED(); }
-#endif  // !V8_TARGET_ARCH_X64
+#endif  // !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_ARM64
+        // && !V8_TARGET_ARCH_ARM
 
 void InstructionSelector::VisitFinishRegion(Node* node) { EmitIdentity(node); }
 
@@ -3146,6 +3153,35 @@ void InstructionSelector::VisitDeoptimizeUnless(Node* node) {
   }
 }
 
+void InstructionSelector::VisitDynamicCheckMapsWithDeoptUnless(Node* node) {
+  OperandGenerator g(this);
+  DynamicCheckMapsWithDeoptUnlessNode n(node);
+  DeoptimizeParameters p = DeoptimizeParametersOf(node->op());
+
+  DynamicCheckMapsDescriptor descriptor;
+  // Note: We use Operator::kNoDeopt here because this builtin does not lazy
+  // deoptimize (which is the meaning of Operator::kNoDeopt), even though it can
+  // eagerly deoptimize.
+  CallDescriptor* call_descriptor = Linkage::GetStubCallDescriptor(
+      zone(), descriptor, descriptor.GetStackParameterCount(),
+      CallDescriptor::kNoFlags, Operator::kNoDeopt | Operator::kNoThrow);
+  InstructionOperand dynamic_check_args[] = {
+      g.UseLocation(n.map(), call_descriptor->GetInputLocation(1)),
+      g.UseImmediate(n.slot()), g.UseImmediate(n.handler())};
+
+  if (NeedsPoisoning(IsSafetyCheck::kCriticalSafetyCheck)) {
+    FlagsContinuation cont = FlagsContinuation::ForDeoptimizeAndPoison(
+        kEqual, p.kind(), p.reason(), p.feedback(), n.frame_state(),
+        dynamic_check_args, 3);
+    VisitWordCompareZero(node, n.condition(), &cont);
+  } else {
+    FlagsContinuation cont = FlagsContinuation::ForDeoptimize(
+        kEqual, p.kind(), p.reason(), p.feedback(), n.frame_state(),
+        dynamic_check_args, 3);
+    VisitWordCompareZero(node, n.condition(), &cont);
+  }
+}
+
 void InstructionSelector::VisitTrapIf(Node* node, TrapId trap_id) {
   FlagsContinuation cont =
       FlagsContinuation::ForTrap(kNotEqual, trap_id, node->InputAt(1));
@@ -3316,7 +3352,8 @@ FrameStateDescriptor* InstructionSelector::GetFrameStateDescriptor(
 void InstructionSelector::CanonicalizeShuffle(Node* node, uint8_t* shuffle,
                                               bool* is_swizzle) {
   // Get raw shuffle indices.
-  memcpy(shuffle, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  base::Memcpy(shuffle, S128ImmediateParameterOf(node->op()).data(),
+               kSimd128Size);
   bool needs_swap;
   bool inputs_equal = GetVirtualRegister(node->InputAt(0)) ==
                       GetVirtualRegister(node->InputAt(1));
diff --git a/deps/v8/src/compiler/backend/instruction-selector.h b/deps/v8/src/compiler/backend/instruction-selector.h
index fc16814d45330b..18bc4ccfcb6833 100644
--- a/deps/v8/src/compiler/backend/instruction-selector.h
+++ b/deps/v8/src/compiler/backend/instruction-selector.h
@@ -59,21 +59,23 @@ class FlagsContinuation final {
   }
 
   // Creates a new flags continuation for an eager deoptimization exit.
-  static FlagsContinuation ForDeoptimize(FlagsCondition condition,
-                                         DeoptimizeKind kind,
-                                         DeoptimizeReason reason,
-                                         FeedbackSource const& feedback,
-                                         Node* frame_state) {
+  static FlagsContinuation ForDeoptimize(
+      FlagsCondition condition, DeoptimizeKind kind, DeoptimizeReason reason,
+      FeedbackSource const& feedback, Node* frame_state,
+      InstructionOperand* extra_args = nullptr, int extra_args_count = 0) {
     return FlagsContinuation(kFlags_deoptimize, condition, kind, reason,
-                             feedback, frame_state);
+                             feedback, frame_state, extra_args,
+                             extra_args_count);
   }
 
   // Creates a new flags continuation for an eager deoptimization exit.
   static FlagsContinuation ForDeoptimizeAndPoison(
       FlagsCondition condition, DeoptimizeKind kind, DeoptimizeReason reason,
-      FeedbackSource const& feedback, Node* frame_state) {
+      FeedbackSource const& feedback, Node* frame_state,
+      InstructionOperand* extra_args = nullptr, int extra_args_count = 0) {
     return FlagsContinuation(kFlags_deoptimize_and_poison, condition, kind,
-                             reason, feedback, frame_state);
+                             reason, feedback, frame_state, extra_args,
+                             extra_args_count);
   }
 
   // Creates a new flags continuation for a boolean value.
@@ -120,6 +122,18 @@ class FlagsContinuation final {
     DCHECK(IsDeoptimize());
     return frame_state_or_result_;
   }
+  bool has_extra_args() const {
+    DCHECK(IsDeoptimize());
+    return extra_args_ != nullptr;
+  }
+  const InstructionOperand* extra_args() const {
+    DCHECK(has_extra_args());
+    return extra_args_;
+  }
+  int extra_args_count() const {
+    DCHECK(has_extra_args());
+    return extra_args_count_;
+  }
   Node* result() const {
     DCHECK(IsSet());
     return frame_state_or_result_;
@@ -198,13 +212,16 @@ class FlagsContinuation final {
 
   FlagsContinuation(FlagsMode mode, FlagsCondition condition,
                     DeoptimizeKind kind, DeoptimizeReason reason,
-                    FeedbackSource const& feedback, Node* frame_state)
+                    FeedbackSource const& feedback, Node* frame_state,
+                    InstructionOperand* extra_args, int extra_args_count)
       : mode_(mode),
         condition_(condition),
         kind_(kind),
         reason_(reason),
         feedback_(feedback),
-        frame_state_or_result_(frame_state) {
+        frame_state_or_result_(frame_state),
+        extra_args_(extra_args),
+        extra_args_count_(extra_args_count) {
     DCHECK(mode == kFlags_deoptimize || mode == kFlags_deoptimize_and_poison);
     DCHECK_NOT_NULL(frame_state);
   }
@@ -226,14 +243,16 @@ class FlagsContinuation final {
 
   FlagsMode const mode_;
   FlagsCondition condition_;
-  DeoptimizeKind kind_;          // Only valid if mode_ == kFlags_deoptimize*
-  DeoptimizeReason reason_;      // Only valid if mode_ == kFlags_deoptimize*
-  FeedbackSource feedback_;      // Only valid if mode_ == kFlags_deoptimize*
-  Node* frame_state_or_result_;  // Only valid if mode_ == kFlags_deoptimize*
-                                 // or mode_ == kFlags_set.
-  BasicBlock* true_block_;       // Only valid if mode_ == kFlags_branch*.
-  BasicBlock* false_block_;      // Only valid if mode_ == kFlags_branch*.
-  TrapId trap_id_;               // Only valid if mode_ == kFlags_trap.
+  DeoptimizeKind kind_;             // Only valid if mode_ == kFlags_deoptimize*
+  DeoptimizeReason reason_;         // Only valid if mode_ == kFlags_deoptimize*
+  FeedbackSource feedback_;         // Only valid if mode_ == kFlags_deoptimize*
+  Node* frame_state_or_result_;     // Only valid if mode_ == kFlags_deoptimize*
+                                    // or mode_ == kFlags_set.
+  InstructionOperand* extra_args_;  // Only valid if mode_ == kFlags_deoptimize*
+  int extra_args_count_;            // Only valid if mode_ == kFlags_deoptimize*
+  BasicBlock* true_block_;          // Only valid if mode_ == kFlags_branch*.
+  BasicBlock* false_block_;         // Only valid if mode_ == kFlags_branch*.
+  TrapId trap_id_;                  // Only valid if mode_ == kFlags_trap.
 };
 
 // This struct connects nodes of parameters which are going to be pushed on the
@@ -601,6 +620,7 @@ class V8_EXPORT_PRIVATE InstructionSelector final {
   void VisitCall(Node* call, BasicBlock* handler = nullptr);
   void VisitDeoptimizeIf(Node* node);
   void VisitDeoptimizeUnless(Node* node);
+  void VisitDynamicCheckMapsWithDeoptUnless(Node* node);
   void VisitTrapIf(Node* node, TrapId trap_id);
   void VisitTrapUnless(Node* node, TrapId trap_id);
   void VisitTailCall(Node* call);
diff --git a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc
index c8265d73ae815b..08f8ef7d0773c6 100644
--- a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc
+++ b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc
@@ -525,6 +525,15 @@ void EmitWordLoadPoisoningIfNeeded(CodeGenerator* codegen,
           i.InputSimd128Register(1));                           \
   } while (0)
 
+#define ASSEMBLE_SIMD_EXTENDED_MULTIPLY(op0, op1)                           \
+  do {                                                                      \
+    CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);                           \
+    __ xor_v(kSimd128RegZero, kSimd128RegZero, kSimd128RegZero);            \
+    __ op0(kSimd128ScratchReg, kSimd128RegZero, i.InputSimd128Register(0)); \
+    __ op0(kSimd128RegZero, kSimd128RegZero, i.InputSimd128Register(1));    \
+    __ op1(i.OutputSimd128Register(), kSimd128ScratchReg, kSimd128RegZero); \
+  } while (0)
+
 void CodeGenerator::AssembleDeconstructFrame() {
   __ mov(sp, fp);
   __ Pop(ra, fp);
@@ -867,7 +876,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ Branch(exit->label());
       break;
     }
@@ -1224,19 +1233,6 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ div_s(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
                i.InputDoubleRegister(1));
       break;
-    case kMipsModS: {
-      // TODO(bmeurer): We should really get rid of this special instruction,
-      // and generate a CallAddress instruction instead.
-      FrameScope scope(tasm(), StackFrame::MANUAL);
-      __ PrepareCallCFunction(0, 2, kScratchReg);
-      __ MovToFloatParameters(i.InputDoubleRegister(0),
-                              i.InputDoubleRegister(1));
-      // TODO(balazs.kilvady): implement mod_two_floats_operation(isolate())
-      __ CallCFunction(ExternalReference::mod_two_doubles_operation(), 0, 2);
-      // Move the result in the double result register.
-      __ MovFromFloatResult(i.OutputSingleRegister());
-      break;
-    }
     case kMipsAbsS:
       if (IsMipsArchVariant(kMips32r6)) {
         __ abs_s(i.OutputSingleRegister(), i.InputSingleRegister(0));
@@ -1514,9 +1510,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ mfc1(i.OutputRegister(), scratch);
       // Avoid INT32_MAX as an overflow indicator and use INT32_MIN instead,
       // because INT32_MIN allows easier out-of-bounds detection.
-      __ Addu(kScratchReg, i.OutputRegister(), 1);
-      __ Slt(kScratchReg2, kScratchReg, i.OutputRegister());
-      __ Movn(i.OutputRegister(), kScratchReg, kScratchReg2);
+      bool set_overflow_to_min_i32 = MiscField::decode(instr->opcode());
+      if (set_overflow_to_min_i32) {
+        __ Addu(kScratchReg, i.OutputRegister(), 1);
+        __ Slt(kScratchReg2, kScratchReg, i.OutputRegister());
+        __ Movn(i.OutputRegister(), kScratchReg, kScratchReg2);
+      }
       break;
     }
     case kMipsTruncUwD: {
@@ -1529,8 +1528,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ Trunc_uw_s(i.OutputRegister(), i.InputDoubleRegister(0), scratch);
       // Avoid UINT32_MAX as an overflow indicator and use 0 instead,
       // because 0 allows easier out-of-bounds detection.
-      __ Addu(kScratchReg, i.OutputRegister(), 1);
-      __ Movz(i.OutputRegister(), zero_reg, kScratchReg);
+      bool set_overflow_to_min_i32 = MiscField::decode(instr->opcode());
+      if (set_overflow_to_min_i32) {
+        __ Addu(kScratchReg, i.OutputRegister(), 1);
+        __ Movz(i.OutputRegister(), zero_reg, kScratchReg);
+      }
       break;
     }
     case kMipsFloat64ExtractLowWord32:
@@ -1684,17 +1686,18 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       }
       break;
     case kMipsPeek: {
-      // The incoming value is 0-based, but we need a 1-based value.
-      int reverse_slot = i.InputInt32(0) + 1;
+      int reverse_slot = i.InputInt32(0);
       int offset =
           FrameSlotToFPOffset(frame()->GetTotalFrameSlotCount() - reverse_slot);
       if (instr->OutputAt(0)->IsFPRegister()) {
         LocationOperand* op = LocationOperand::cast(instr->OutputAt(0));
         if (op->representation() == MachineRepresentation::kFloat64) {
           __ Ldc1(i.OutputDoubleRegister(), MemOperand(fp, offset));
-        } else {
-          DCHECK_EQ(op->representation(), MachineRepresentation::kFloat32);
+        } else if (op->representation() == MachineRepresentation::kFloat32) {
           __ lwc1(i.OutputSingleRegister(0), MemOperand(fp, offset));
+        } else {
+          DCHECK_EQ(op->representation(), MachineRepresentation::kSimd128);
+          __ ld_b(i.OutputSimd128Register(), MemOperand(fp, offset));
         }
       } else {
         __ lw(i.OutputRegister(0), MemOperand(fp, offset));
@@ -2273,6 +2276,61 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
                 i.InputInt6(1));
       break;
     }
+    case kMipsI64x2BitMask: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      Register dst = i.OutputRegister();
+      Simd128Register src = i.InputSimd128Register(0);
+      Simd128Register scratch0 = kSimd128RegZero;
+      Simd128Register scratch1 = kSimd128ScratchReg;
+      __ srli_d(scratch0, src, 63);
+      __ shf_w(scratch1, scratch0, 0x02);
+      __ slli_d(scratch1, scratch1, 1);
+      __ or_v(scratch0, scratch0, scratch1);
+      __ copy_u_b(dst, scratch0, 0);
+      break;
+    }
+    case kMipsI64x2Eq: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      __ ceq_d(i.OutputSimd128Register(), i.InputSimd128Register(0),
+               i.InputSimd128Register(1));
+      break;
+    }
+    case kMipsI64x2ExtMulLowI32x4S:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvr_w, dotp_s_d);
+      break;
+    case kMipsI64x2ExtMulHighI32x4S:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvl_w, dotp_s_d);
+      break;
+    case kMipsI64x2ExtMulLowI32x4U:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvr_w, dotp_u_d);
+      break;
+    case kMipsI64x2ExtMulHighI32x4U:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvl_w, dotp_u_d);
+      break;
+    case kMipsI32x4ExtMulLowI16x8S:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvr_h, dotp_s_w);
+      break;
+    case kMipsI32x4ExtMulHighI16x8S:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvl_h, dotp_s_w);
+      break;
+    case kMipsI32x4ExtMulLowI16x8U:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvr_h, dotp_u_w);
+      break;
+    case kMipsI32x4ExtMulHighI16x8U:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvl_h, dotp_u_w);
+      break;
+    case kMipsI16x8ExtMulLowI8x16S:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvr_b, dotp_s_h);
+      break;
+    case kMipsI16x8ExtMulHighI8x16S:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvl_b, dotp_s_h);
+      break;
+    case kMipsI16x8ExtMulLowI8x16U:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvr_b, dotp_u_h);
+      break;
+    case kMipsI16x8ExtMulHighI8x16U:
+      ASSEMBLE_SIMD_EXTENDED_MULTIPLY(ilvl_b, dotp_u_h);
+      break;
     case kMipsF32x4Splat: {
       CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
       __ FmoveLow(kScratchReg, i.InputSingleRegister(0));
@@ -2774,6 +2832,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ copy_u_b(dst, scratch0, 0);
       break;
     }
+    case kMipsI16x8Q15MulRSatS: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      __ mulr_q_h(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                  i.InputSimd128Register(1));
+      break;
+    }
     case kMipsI8x16Splat: {
       CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
       __ fill_b(i.OutputSimd128Register(), i.InputRegister(0));
@@ -4417,6 +4481,8 @@ void CodeGenerator::AssembleJumpTable(Label** targets, size_t target_count) {
 }
 
 #undef __
+#undef ASSEMBLE_F64X2_ARITHMETIC_BINOP
+#undef ASSEMBLE_SIMD_EXTENDED_MULTIPLY
 
 }  // namespace compiler
 }  // namespace internal
diff --git a/deps/v8/src/compiler/backend/mips/instruction-codes-mips.h b/deps/v8/src/compiler/backend/mips/instruction-codes-mips.h
index 47d439af583c72..6bc14ca317955f 100644
--- a/deps/v8/src/compiler/backend/mips/instruction-codes-mips.h
+++ b/deps/v8/src/compiler/backend/mips/instruction-codes-mips.h
@@ -49,7 +49,6 @@ namespace compiler {
   V(MipsSubS)                      \
   V(MipsMulS)                      \
   V(MipsDivS)                      \
-  V(MipsModS)                      \
   V(MipsAbsS)                      \
   V(MipsSqrtS)                     \
   V(MipsMaxS)                      \
@@ -168,6 +167,12 @@ namespace compiler {
   V(MipsI64x2Shl)                  \
   V(MipsI64x2ShrS)                 \
   V(MipsI64x2ShrU)                 \
+  V(MipsI64x2BitMask)              \
+  V(MipsI64x2Eq)                   \
+  V(MipsI64x2ExtMulLowI32x4S)      \
+  V(MipsI64x2ExtMulHighI32x4S)     \
+  V(MipsI64x2ExtMulLowI32x4U)      \
+  V(MipsI64x2ExtMulHighI32x4U)     \
   V(MipsF32x4Splat)                \
   V(MipsF32x4ExtractLane)          \
   V(MipsF32x4ReplaceLane)          \
@@ -218,6 +223,10 @@ namespace compiler {
   V(MipsI32x4Abs)                  \
   V(MipsI32x4BitMask)              \
   V(MipsI32x4DotI16x8S)            \
+  V(MipsI32x4ExtMulLowI16x8S)      \
+  V(MipsI32x4ExtMulHighI16x8S)     \
+  V(MipsI32x4ExtMulLowI16x8U)      \
+  V(MipsI32x4ExtMulHighI16x8U)     \
   V(MipsI16x8Splat)                \
   V(MipsI16x8ExtractLaneU)         \
   V(MipsI16x8ExtractLaneS)         \
@@ -247,6 +256,11 @@ namespace compiler {
   V(MipsI16x8RoundingAverageU)     \
   V(MipsI16x8Abs)                  \
   V(MipsI16x8BitMask)              \
+  V(MipsI16x8Q15MulRSatS)          \
+  V(MipsI16x8ExtMulLowI8x16S)      \
+  V(MipsI16x8ExtMulHighI8x16S)     \
+  V(MipsI16x8ExtMulLowI8x16U)      \
+  V(MipsI16x8ExtMulHighI8x16U)     \
   V(MipsI8x16Splat)                \
   V(MipsI8x16ExtractLaneU)         \
   V(MipsI8x16ExtractLaneS)         \
diff --git a/deps/v8/src/compiler/backend/mips/instruction-scheduler-mips.cc b/deps/v8/src/compiler/backend/mips/instruction-scheduler-mips.cc
index bf28eec44361ec..404f9e49514c2f 100644
--- a/deps/v8/src/compiler/backend/mips/instruction-scheduler-mips.cc
+++ b/deps/v8/src/compiler/backend/mips/instruction-scheduler-mips.cc
@@ -70,6 +70,12 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kMipsI64x2Shl:
     case kMipsI64x2ShrS:
     case kMipsI64x2ShrU:
+    case kMipsI64x2BitMask:
+    case kMipsI64x2Eq:
+    case kMipsI64x2ExtMulLowI32x4S:
+    case kMipsI64x2ExtMulHighI32x4S:
+    case kMipsI64x2ExtMulLowI32x4U:
+    case kMipsI64x2ExtMulHighI32x4U:
     case kMipsF32x4Abs:
     case kMipsF32x4Add:
     case kMipsF32x4AddHoriz:
@@ -151,6 +157,11 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kMipsI16x8UConvertI8x16Low:
     case kMipsI16x8Abs:
     case kMipsI16x8BitMask:
+    case kMipsI16x8Q15MulRSatS:
+    case kMipsI16x8ExtMulLowI8x16S:
+    case kMipsI16x8ExtMulHighI8x16S:
+    case kMipsI16x8ExtMulLowI8x16U:
+    case kMipsI16x8ExtMulHighI8x16U:
     case kMipsI32x4Add:
     case kMipsI32x4AddHoriz:
     case kMipsI32x4Eq:
@@ -181,6 +192,10 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kMipsI32x4Abs:
     case kMipsI32x4BitMask:
     case kMipsI32x4DotI16x8S:
+    case kMipsI32x4ExtMulLowI16x8S:
+    case kMipsI32x4ExtMulHighI16x8S:
+    case kMipsI32x4ExtMulLowI16x8U:
+    case kMipsI32x4ExtMulHighI16x8U:
     case kMipsI8x16Add:
     case kMipsI8x16AddSatS:
     case kMipsI8x16AddSatU:
@@ -330,7 +345,6 @@ int InstructionScheduler::GetTargetInstructionFlags(
       return kIsLoadOperation;
 
     case kMipsModD:
-    case kMipsModS:
     case kMipsMsaSt:
     case kMipsPush:
     case kMipsSb:
@@ -1530,7 +1544,6 @@ int InstructionScheduler::GetInstructionLatency(const Instruction* instr) {
       return RorLatency(instr->InputAt(1)->IsRegister());
     case kMipsLsa:
       return LsaLatency();
-    case kMipsModS:
     case kMipsModD:
       return PrepareCallCFunctionLatency() + MovToFloatParametersLatency() +
              CallCFunctionLatency() + MovFromFloatResultLatency();
diff --git a/deps/v8/src/compiler/backend/mips/instruction-selector-mips.cc b/deps/v8/src/compiler/backend/mips/instruction-selector-mips.cc
index 9b6abc80fadc04..423540b455cf9d 100644
--- a/deps/v8/src/compiler/backend/mips/instruction-selector-mips.cc
+++ b/deps/v8/src/compiler/backend/mips/instruction-selector-mips.cc
@@ -415,8 +415,7 @@ void InstructionSelector::VisitStore(Node* node) {
   }
 
   // TODO(mips): I guess this could be done in a better way.
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedPointer(rep));
     InstructionOperand inputs[3];
     size_t input_count = 0;
@@ -997,11 +996,25 @@ void InstructionSelector::VisitChangeUint32ToFloat64(Node* node) {
 }
 
 void InstructionSelector::VisitTruncateFloat32ToInt32(Node* node) {
-  VisitRR(this, kMipsTruncWS, node);
+  MipsOperandGenerator g(this);
+  InstructionCode opcode = kMipsTruncWS;
+  TruncateKind kind = OpParameter<TruncateKind>(node->op());
+  if (kind == TruncateKind::kSetOverflowToMin) {
+    opcode |= MiscField::encode(true);
+  }
+
+  Emit(opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitTruncateFloat32ToUint32(Node* node) {
-  VisitRR(this, kMipsTruncUwS, node);
+  MipsOperandGenerator g(this);
+  InstructionCode opcode = kMipsTruncUwS;
+  TruncateKind kind = OpParameter<TruncateKind>(node->op());
+  if (kind == TruncateKind::kSetOverflowToMin) {
+    opcode |= MiscField::encode(true);
+  }
+
+  Emit(opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitChangeFloat64ToInt32(Node* node) {
@@ -1360,7 +1373,6 @@ void InstructionSelector::EmitPrepareResults(
     Node* node) {
   MipsOperandGenerator g(this);
 
-  int reverse_slot = 0;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -1370,11 +1382,14 @@ void InstructionSelector::EmitPrepareResults(
         MarkAsFloat32(output.node);
       } else if (output.location.GetType() == MachineType::Float64()) {
         MarkAsFloat64(output.node);
+      } else if (output.location.GetType() == MachineType::Simd128()) {
+        MarkAsSimd128(output.node);
       }
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       Emit(kMipsPeek, g.DefineAsRegister(output.node),
            g.UseImmediate(reverse_slot));
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
@@ -2107,6 +2122,7 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(F64x2Trunc, kMipsF64x2Trunc)                         \
   V(F64x2NearestInt, kMipsF64x2NearestInt)               \
   V(I64x2Neg, kMipsI64x2Neg)                             \
+  V(I64x2BitMask, kMipsI64x2BitMask)                     \
   V(F32x4SConvertI32x4, kMipsF32x4SConvertI32x4)         \
   V(F32x4UConvertI32x4, kMipsF32x4UConvertI32x4)         \
   V(F32x4Abs, kMipsF32x4Abs)                             \
@@ -2121,16 +2137,19 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(I32x4SConvertF32x4, kMipsI32x4SConvertF32x4)         \
   V(I32x4UConvertF32x4, kMipsI32x4UConvertF32x4)         \
   V(I32x4Neg, kMipsI32x4Neg)                             \
+  V(I32x4BitMask, kMipsI32x4BitMask)                     \
   V(I32x4SConvertI16x8Low, kMipsI32x4SConvertI16x8Low)   \
   V(I32x4SConvertI16x8High, kMipsI32x4SConvertI16x8High) \
   V(I32x4UConvertI16x8Low, kMipsI32x4UConvertI16x8Low)   \
   V(I32x4UConvertI16x8High, kMipsI32x4UConvertI16x8High) \
   V(I16x8Neg, kMipsI16x8Neg)                             \
+  V(I16x8BitMask, kMipsI16x8BitMask)                     \
   V(I16x8SConvertI8x16Low, kMipsI16x8SConvertI8x16Low)   \
   V(I16x8SConvertI8x16High, kMipsI16x8SConvertI8x16High) \
   V(I16x8UConvertI8x16Low, kMipsI16x8UConvertI8x16Low)   \
   V(I16x8UConvertI8x16High, kMipsI16x8UConvertI8x16High) \
   V(I8x16Neg, kMipsI8x16Neg)                             \
+  V(I8x16BitMask, kMipsI8x16BitMask)                     \
   V(S128Not, kMipsS128Not)                               \
   V(V32x4AnyTrue, kMipsV32x4AnyTrue)                     \
   V(V32x4AllTrue, kMipsV32x4AllTrue)                     \
@@ -2164,9 +2183,14 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(F64x2Ne, kMipsF64x2Ne)                             \
   V(F64x2Lt, kMipsF64x2Lt)                             \
   V(F64x2Le, kMipsF64x2Le)                             \
+  V(I64x2Eq, kMipsI64x2Eq)                             \
   V(I64x2Add, kMipsI64x2Add)                           \
   V(I64x2Sub, kMipsI64x2Sub)                           \
   V(I64x2Mul, kMipsI64x2Mul)                           \
+  V(I64x2ExtMulLowI32x4S, kMipsI64x2ExtMulLowI32x4S)   \
+  V(I64x2ExtMulHighI32x4S, kMipsI64x2ExtMulHighI32x4S) \
+  V(I64x2ExtMulLowI32x4U, kMipsI64x2ExtMulLowI32x4U)   \
+  V(I64x2ExtMulHighI32x4U, kMipsI64x2ExtMulHighI32x4U) \
   V(F32x4Add, kMipsF32x4Add)                           \
   V(F32x4AddHoriz, kMipsF32x4AddHoriz)                 \
   V(F32x4Sub, kMipsF32x4Sub)                           \
@@ -2193,8 +2217,11 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(I32x4GtU, kMipsI32x4GtU)                           \
   V(I32x4GeU, kMipsI32x4GeU)                           \
   V(I32x4Abs, kMipsI32x4Abs)                           \
-  V(I32x4BitMask, kMipsI32x4BitMask)                   \
   V(I32x4DotI16x8S, kMipsI32x4DotI16x8S)               \
+  V(I32x4ExtMulLowI16x8S, kMipsI32x4ExtMulLowI16x8S)   \
+  V(I32x4ExtMulHighI16x8S, kMipsI32x4ExtMulHighI16x8S) \
+  V(I32x4ExtMulLowI16x8U, kMipsI32x4ExtMulLowI16x8U)   \
+  V(I32x4ExtMulHighI16x8U, kMipsI32x4ExtMulHighI16x8U) \
   V(I16x8Add, kMipsI16x8Add)                           \
   V(I16x8AddSatS, kMipsI16x8AddSatS)                   \
   V(I16x8AddSatU, kMipsI16x8AddSatU)                   \
@@ -2215,9 +2242,13 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(I16x8GeU, kMipsI16x8GeU)                           \
   V(I16x8SConvertI32x4, kMipsI16x8SConvertI32x4)       \
   V(I16x8UConvertI32x4, kMipsI16x8UConvertI32x4)       \
+  V(I16x8Q15MulRSatS, kMipsI16x8Q15MulRSatS)           \
+  V(I16x8ExtMulLowI8x16S, kMipsI16x8ExtMulLowI8x16S)   \
+  V(I16x8ExtMulHighI8x16S, kMipsI16x8ExtMulHighI8x16S) \
+  V(I16x8ExtMulLowI8x16U, kMipsI16x8ExtMulLowI8x16U)   \
+  V(I16x8ExtMulHighI8x16U, kMipsI16x8ExtMulHighI8x16U) \
   V(I16x8RoundingAverageU, kMipsI16x8RoundingAverageU) \
   V(I16x8Abs, kMipsI16x8Abs)                           \
-  V(I16x8BitMask, kMipsI16x8BitMask)                   \
   V(I8x16Add, kMipsI8x16Add)                           \
   V(I8x16AddSatS, kMipsI8x16AddSatS)                   \
   V(I8x16AddSatU, kMipsI8x16AddSatU)                   \
@@ -2239,7 +2270,6 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(I8x16SConvertI16x8, kMipsI8x16SConvertI16x8)       \
   V(I8x16UConvertI16x8, kMipsI8x16UConvertI16x8)       \
   V(I8x16Abs, kMipsI8x16Abs)                           \
-  V(I8x16BitMask, kMipsI8x16BitMask)                   \
   V(S128And, kMipsS128And)                             \
   V(S128Or, kMipsS128Or)                               \
   V(S128Xor, kMipsS128Xor)                             \
diff --git a/deps/v8/src/compiler/backend/mips64/code-generator-mips64.cc b/deps/v8/src/compiler/backend/mips64/code-generator-mips64.cc
index 887b7e574033c8..868134ff0445d6 100644
--- a/deps/v8/src/compiler/backend/mips64/code-generator-mips64.cc
+++ b/deps/v8/src/compiler/backend/mips64/code-generator-mips64.cc
@@ -846,7 +846,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ Branch(exit->label());
       break;
     }
@@ -1303,19 +1303,6 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ div_s(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
                i.InputDoubleRegister(1));
       break;
-    case kMips64ModS: {
-      // TODO(bmeurer): We should really get rid of this special instruction,
-      // and generate a CallAddress instruction instead.
-      FrameScope scope(tasm(), StackFrame::MANUAL);
-      __ PrepareCallCFunction(0, 2, kScratchReg);
-      __ MovToFloatParameters(i.InputDoubleRegister(0),
-                              i.InputDoubleRegister(1));
-      // TODO(balazs.kilvady): implement mod_two_floats_operation(isolate())
-      __ CallCFunction(ExternalReference::mod_two_doubles_operation(), 0, 2);
-      // Move the result in the double result register.
-      __ MovFromFloatResult(i.OutputSingleRegister());
-      break;
-    }
     case kMips64AbsS:
       if (kArchVariant == kMips64r6) {
         __ abs_s(i.OutputSingleRegister(), i.InputSingleRegister(0));
@@ -1568,68 +1555,62 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     }
     case kMips64TruncWS: {
       FPURegister scratch = kScratchDoubleReg;
+      bool set_overflow_to_min_i32 = MiscField::decode(instr->opcode());
       __ trunc_w_s(scratch, i.InputDoubleRegister(0));
       __ mfc1(i.OutputRegister(), scratch);
-      // Avoid INT32_MAX as an overflow indicator and use INT32_MIN instead,
-      // because INT32_MIN allows easier out-of-bounds detection.
-      __ addiu(kScratchReg, i.OutputRegister(), 1);
-      __ slt(kScratchReg2, kScratchReg, i.OutputRegister());
-      __ Movn(i.OutputRegister(), kScratchReg, kScratchReg2);
+      if (set_overflow_to_min_i32) {
+        // Avoid INT32_MAX as an overflow indicator and use INT32_MIN instead,
+        // because INT32_MIN allows easier out-of-bounds detection.
+        __ addiu(kScratchReg, i.OutputRegister(), 1);
+        __ slt(kScratchReg2, kScratchReg, i.OutputRegister());
+        __ Movn(i.OutputRegister(), kScratchReg, kScratchReg2);
+      }
       break;
     }
     case kMips64TruncLS: {
       FPURegister scratch = kScratchDoubleReg;
-      Register tmp_fcsr = kScratchReg;
-      Register result = kScratchReg2;
+      Register result = kScratchReg;
 
       bool load_status = instr->OutputCount() > 1;
-      if (load_status) {
-        // Save FCSR.
-        __ cfc1(tmp_fcsr, FCSR);
-        // Clear FPU flags.
-        __ ctc1(zero_reg, FCSR);
-      }
       // Other arches use round to zero here, so we follow.
       __ trunc_l_s(scratch, i.InputDoubleRegister(0));
       __ dmfc1(i.OutputRegister(), scratch);
       if (load_status) {
         __ cfc1(result, FCSR);
         // Check for overflow and NaNs.
-        __ andi(result, result,
-                (kFCSROverflowFlagMask | kFCSRInvalidOpFlagMask));
+        __ And(result, result,
+               (kFCSROverflowCauseMask | kFCSRInvalidOpCauseMask));
         __ Slt(result, zero_reg, result);
         __ xori(result, result, 1);
         __ mov(i.OutputRegister(1), result);
-        // Restore FCSR
-        __ ctc1(tmp_fcsr, FCSR);
       }
       break;
     }
     case kMips64TruncLD: {
       FPURegister scratch = kScratchDoubleReg;
-      Register tmp_fcsr = kScratchReg;
-      Register result = kScratchReg2;
+      Register result = kScratchReg;
 
+      bool set_overflow_to_min_i64 = MiscField::decode(instr->opcode());
       bool load_status = instr->OutputCount() > 1;
-      if (load_status) {
-        // Save FCSR.
-        __ cfc1(tmp_fcsr, FCSR);
-        // Clear FPU flags.
-        __ ctc1(zero_reg, FCSR);
-      }
+      DCHECK_IMPLIES(set_overflow_to_min_i64, instr->OutputCount() == 1);
       // Other arches use round to zero here, so we follow.
       __ trunc_l_d(scratch, i.InputDoubleRegister(0));
       __ dmfc1(i.OutputRegister(0), scratch);
       if (load_status) {
         __ cfc1(result, FCSR);
         // Check for overflow and NaNs.
-        __ andi(result, result,
-                (kFCSROverflowFlagMask | kFCSRInvalidOpFlagMask));
+        __ And(result, result,
+               (kFCSROverflowCauseMask | kFCSRInvalidOpCauseMask));
         __ Slt(result, zero_reg, result);
         __ xori(result, result, 1);
         __ mov(i.OutputRegister(1), result);
-        // Restore FCSR
-        __ ctc1(tmp_fcsr, FCSR);
+      }
+      if (set_overflow_to_min_i64) {
+        // Avoid INT64_MAX as an overflow indicator and use INT64_MIN instead,
+        // because INT64_MIN allows easier out-of-bounds detection.
+        __ Daddu(kScratchReg, i.OutputRegister(), 1);
+        __ slt(kScratchReg2, kScratchReg, i.OutputRegister());
+        __ Movn(i.OutputRegister(), kScratchReg, kScratchReg2);
       }
       break;
     }
@@ -1640,11 +1621,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     }
     case kMips64TruncUwS: {
       FPURegister scratch = kScratchDoubleReg;
+      bool set_overflow_to_min_i32 = MiscField::decode(instr->opcode());
       __ Trunc_uw_s(i.OutputRegister(), i.InputDoubleRegister(0), scratch);
-      // Avoid UINT32_MAX as an overflow indicator and use 0 instead,
-      // because 0 allows easier out-of-bounds detection.
-      __ addiu(kScratchReg, i.OutputRegister(), 1);
-      __ Movz(i.OutputRegister(), zero_reg, kScratchReg);
+      if (set_overflow_to_min_i32) {
+        // Avoid UINT32_MAX as an overflow indicator and use 0 instead,
+        // because 0 allows easier out-of-bounds detection.
+        __ addiu(kScratchReg, i.OutputRegister(), 1);
+        __ Movz(i.OutputRegister(), zero_reg, kScratchReg);
+      }
       break;
     }
     case kMips64TruncUlS: {
@@ -1965,6 +1949,21 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ insert_d(dst, 0, kScratchReg);
       break;
     }
+    case kMips64S128LoadLane: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      Simd128Register dst = i.OutputSimd128Register();
+      DCHECK_EQ(dst, i.InputSimd128Register(0));
+      auto sz = static_cast<MSASize>(MiscField::decode(instr->opcode()));
+      __ LoadLane(sz, dst, i.InputUint8(1), i.MemoryOperand(2));
+      break;
+    }
+    case kMips64S128StoreLane: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      Simd128Register src = i.InputSimd128Register(0);
+      auto sz = static_cast<MSASize>(MiscField::decode(instr->opcode()));
+      __ StoreLane(sz, src, i.InputUint8(1), i.MemoryOperand(2));
+      break;
+    }
     case kWord32AtomicLoadInt8:
       ASSEMBLE_ATOMIC_LOAD_INTEGER(Lb);
       break;
@@ -2423,6 +2422,37 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       }
       break;
     }
+    case kMips64I64x2BitMask: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      Register dst = i.OutputRegister();
+      Simd128Register src = i.InputSimd128Register(0);
+      Simd128Register scratch0 = kSimd128RegZero;
+      Simd128Register scratch1 = kSimd128ScratchReg;
+      __ srli_d(scratch0, src, 63);
+      __ shf_w(scratch1, scratch0, 0x02);
+      __ slli_d(scratch1, scratch1, 1);
+      __ or_v(scratch0, scratch0, scratch1);
+      __ copy_u_b(dst, scratch0, 0);
+      break;
+    }
+    case kMips64I64x2Eq: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      __ ceq_d(i.OutputSimd128Register(), i.InputSimd128Register(0),
+               i.InputSimd128Register(1));
+      break;
+    }
+    case kMips64ExtMulLow: {
+      auto dt = static_cast<MSADataType>(MiscField::decode(instr->opcode()));
+      __ ExtMulLow(dt, i.OutputSimd128Register(), i.InputSimd128Register(0),
+                   i.InputSimd128Register(1));
+      break;
+    }
+    case kMips64ExtMulHigh: {
+      auto dt = static_cast<MSADataType>(MiscField::decode(instr->opcode()));
+      __ ExtMulHigh(dt, i.OutputSimd128Register(), i.InputSimd128Register(0),
+                    i.InputSimd128Register(1));
+      break;
+    }
     case kMips64F32x4Splat: {
       CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
       __ FmoveLow(kScratchReg, i.InputSingleRegister(0));
@@ -2987,6 +3017,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ copy_u_b(dst, scratch0, 0);
       break;
     }
+    case kMips64I16x8Q15MulRSatS: {
+      CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
+      __ mulr_q_h(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                  i.InputSimd128Register(1));
+      break;
+    }
     case kMips64I8x16Splat: {
       CpuFeatureScope msa_scope(tasm(), MIPS_SIMD);
       __ fill_b(i.OutputSimd128Register(), i.InputRegister(0));
@@ -4674,6 +4710,7 @@ void CodeGenerator::AssembleJumpTable(Label** targets, size_t target_count) {
 #undef ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_INTEGER_EXT
 #undef ASSEMBLE_IEEE754_BINOP
 #undef ASSEMBLE_IEEE754_UNOP
+#undef ASSEMBLE_F64X2_ARITHMETIC_BINOP
 
 #undef TRACE_MSG
 #undef TRACE_UNIMPL
diff --git a/deps/v8/src/compiler/backend/mips64/instruction-codes-mips64.h b/deps/v8/src/compiler/backend/mips64/instruction-codes-mips64.h
index 18a8e616e755ec..5a162d90f7a2e5 100644
--- a/deps/v8/src/compiler/backend/mips64/instruction-codes-mips64.h
+++ b/deps/v8/src/compiler/backend/mips64/instruction-codes-mips64.h
@@ -68,7 +68,6 @@ namespace compiler {
   V(Mips64SubS)                              \
   V(Mips64MulS)                              \
   V(Mips64DivS)                              \
-  V(Mips64ModS)                              \
   V(Mips64AbsS)                              \
   V(Mips64NegS)                              \
   V(Mips64SqrtS)                             \
@@ -221,6 +220,10 @@ namespace compiler {
   V(Mips64I64x2Shl)                          \
   V(Mips64I64x2ShrS)                         \
   V(Mips64I64x2ShrU)                         \
+  V(Mips64I64x2BitMask)                      \
+  V(Mips64I64x2Eq)                           \
+  V(Mips64ExtMulLow)                         \
+  V(Mips64ExtMulHigh)                        \
   V(Mips64F32x4Abs)                          \
   V(Mips64F32x4Neg)                          \
   V(Mips64F32x4Sqrt)                         \
@@ -282,6 +285,7 @@ namespace compiler {
   V(Mips64I16x8RoundingAverageU)             \
   V(Mips64I16x8Abs)                          \
   V(Mips64I16x8BitMask)                      \
+  V(Mips64I16x8Q15MulRSatS)                  \
   V(Mips64I8x16Splat)                        \
   V(Mips64I8x16ExtractLaneU)                 \
   V(Mips64I8x16ExtractLaneS)                 \
@@ -361,6 +365,8 @@ namespace compiler {
   V(Mips64S128Load32x2U)                     \
   V(Mips64S128Load32Zero)                    \
   V(Mips64S128Load64Zero)                    \
+  V(Mips64S128LoadLane)                      \
+  V(Mips64S128StoreLane)                     \
   V(Mips64MsaLd)                             \
   V(Mips64MsaSt)                             \
   V(Mips64I32x4SConvertI16x8Low)             \
diff --git a/deps/v8/src/compiler/backend/mips64/instruction-scheduler-mips64.cc b/deps/v8/src/compiler/backend/mips64/instruction-scheduler-mips64.cc
index 0cbaf0cc47c46a..3c7a7738a7ff83 100644
--- a/deps/v8/src/compiler/backend/mips64/instruction-scheduler-mips64.cc
+++ b/deps/v8/src/compiler/backend/mips64/instruction-scheduler-mips64.cc
@@ -98,6 +98,10 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kMips64I64x2Shl:
     case kMips64I64x2ShrS:
     case kMips64I64x2ShrU:
+    case kMips64I64x2BitMask:
+    case kMips64I64x2Eq:
+    case kMips64ExtMulLow:
+    case kMips64ExtMulHigh:
     case kMips64F32x4Abs:
     case kMips64F32x4Add:
     case kMips64F32x4AddHoriz:
@@ -184,6 +188,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kMips64I16x8RoundingAverageU:
     case kMips64I16x8Abs:
     case kMips64I16x8BitMask:
+    case kMips64I16x8Q15MulRSatS:
     case kMips64I32x4Add:
     case kMips64I32x4AddHoriz:
     case kMips64I32x4Eq:
@@ -361,6 +366,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kMips64S128Load32x2U:
     case kMips64S128Load32Zero:
     case kMips64S128Load64Zero:
+    case kMips64S128LoadLane:
     case kMips64Word64AtomicLoadUint8:
     case kMips64Word64AtomicLoadUint16:
     case kMips64Word64AtomicLoadUint32:
@@ -369,7 +375,6 @@ int InstructionScheduler::GetTargetInstructionFlags(
       return kIsLoadOperation;
 
     case kMips64ModD:
-    case kMips64ModS:
     case kMips64MsaSt:
     case kMips64Push:
     case kMips64Sb:
@@ -386,6 +391,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kMips64Usw:
     case kMips64Uswc1:
     case kMips64Sync:
+    case kMips64S128StoreLane:
     case kMips64Word64AtomicStoreWord8:
     case kMips64Word64AtomicStoreWord16:
     case kMips64Word64AtomicStoreWord32:
@@ -1520,9 +1526,6 @@ int InstructionScheduler::GetInstructionLatency(const Instruction* instr) {
       return Latency::MUL_S;
     case kMips64DivS:
       return Latency::DIV_S;
-    case kMips64ModS:
-      return PrepareCallCFunctionLatency() + MovToFloatParametersLatency() +
-             CallCFunctionLatency() + MovFromFloatResultLatency();
     case kMips64AbsS:
       return Latency::ABS_S;
     case kMips64NegS:
diff --git a/deps/v8/src/compiler/backend/mips64/instruction-selector-mips64.cc b/deps/v8/src/compiler/backend/mips64/instruction-selector-mips64.cc
index 216b83cdb28340..8bb2f5fc035678 100644
--- a/deps/v8/src/compiler/backend/mips64/instruction-selector-mips64.cc
+++ b/deps/v8/src/compiler/backend/mips64/instruction-selector-mips64.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "src/base/bits.h"
+#include "src/base/platform/wrappers.h"
+#include "src/codegen/machine-type.h"
 #include "src/compiler/backend/instruction-selector-impl.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
@@ -373,7 +375,7 @@ void EmitLoad(InstructionSelector* selector, Node* node, InstructionCode opcode,
   } else {
     InstructionOperand addr_reg = g.TempRegister();
     selector->Emit(kMips64Dadd | AddressingModeField::encode(kMode_None),
-                   addr_reg, g.UseRegister(index), g.UseRegister(base));
+                   addr_reg, g.UseRegister(base), g.UseRegister(index));
     // Emit desired load opcode, using temp addr_reg.
     selector->Emit(opcode | AddressingModeField::encode(kMode_MRI),
                    g.DefineAsRegister(output == nullptr ? node : output),
@@ -381,6 +383,77 @@ void EmitLoad(InstructionSelector* selector, Node* node, InstructionCode opcode,
   }
 }
 
+namespace {
+InstructionOperand EmitAddBeforeS128LoadStore(InstructionSelector* selector,
+                                              Node* node,
+                                              InstructionCode* opcode) {
+  Mips64OperandGenerator g(selector);
+  Node* base = node->InputAt(0);
+  Node* index = node->InputAt(1);
+  InstructionOperand addr_reg = g.TempRegister();
+  selector->Emit(kMips64Dadd | AddressingModeField::encode(kMode_None),
+                 addr_reg, g.UseRegister(base), g.UseRegister(index));
+  *opcode |= AddressingModeField::encode(kMode_MRI);
+  return addr_reg;
+}
+
+// Helper struct for load lane and store lane to indicate what memory size
+// to be encoded in the opcode, and the new lane index.
+struct LoadStoreLaneParams {
+  MSASize sz;
+  uint8_t laneidx;
+  LoadStoreLaneParams(uint8_t laneidx, MSASize sz, int lanes)
+      : sz(sz), laneidx(laneidx % lanes) {}
+};
+
+LoadStoreLaneParams GetLoadStoreLaneParams(MachineRepresentation rep,
+                                           uint8_t laneidx) {
+  switch (rep) {
+    case MachineRepresentation::kWord8:
+      return LoadStoreLaneParams(laneidx, MSA_B, 16);
+    case MachineRepresentation::kWord16:
+      return LoadStoreLaneParams(laneidx, MSA_H, 8);
+    case MachineRepresentation::kWord32:
+      return LoadStoreLaneParams(laneidx, MSA_W, 4);
+    case MachineRepresentation::kWord64:
+      return LoadStoreLaneParams(laneidx, MSA_D, 2);
+    default:
+      break;
+  }
+  UNREACHABLE();
+}
+}  // namespace
+
+void InstructionSelector::VisitStoreLane(Node* node) {
+  StoreLaneParameters params = StoreLaneParametersOf(node->op());
+  LoadStoreLaneParams f = GetLoadStoreLaneParams(params.rep, params.laneidx);
+  InstructionCode opcode = kMips64S128StoreLane;
+  opcode |= MiscField::encode(f.sz);
+
+  Mips64OperandGenerator g(this);
+  InstructionOperand addr = EmitAddBeforeS128LoadStore(this, node, &opcode);
+  InstructionOperand inputs[4] = {
+      g.UseRegister(node->InputAt(2)),
+      g.UseImmediate(f.laneidx),
+      addr,
+      g.TempImmediate(0),
+  };
+  Emit(opcode, 0, nullptr, 4, inputs);
+}
+
+void InstructionSelector::VisitLoadLane(Node* node) {
+  LoadLaneParameters params = LoadLaneParametersOf(node->op());
+  LoadStoreLaneParams f =
+      GetLoadStoreLaneParams(params.rep.representation(), params.laneidx);
+  InstructionCode opcode = kMips64S128LoadLane;
+  opcode |= MiscField::encode(f.sz);
+
+  Mips64OperandGenerator g(this);
+  InstructionOperand addr = EmitAddBeforeS128LoadStore(this, node, &opcode);
+  Emit(opcode, g.DefineSameAsFirst(node), g.UseRegister(node->InputAt(2)),
+       g.UseImmediate(f.laneidx), addr, g.TempImmediate(0));
+}
+
 void InstructionSelector::VisitLoadTransform(Node* node) {
   LoadTransformParameters params = LoadTransformParametersOf(node->op());
 
@@ -494,8 +567,7 @@ void InstructionSelector::VisitStore(Node* node) {
   }
 
   // TODO(mips): I guess this could be done in a better way.
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedPointer(rep));
     InstructionOperand inputs[3];
     size_t input_count = 0;
@@ -1227,11 +1299,23 @@ void InstructionSelector::VisitChangeUint32ToFloat64(Node* node) {
 }
 
 void InstructionSelector::VisitTruncateFloat32ToInt32(Node* node) {
-  VisitRR(this, kMips64TruncWS, node);
+  Mips64OperandGenerator g(this);
+  InstructionCode opcode = kMips64TruncWS;
+  TruncateKind kind = OpParameter<TruncateKind>(node->op());
+  if (kind == TruncateKind::kSetOverflowToMin) {
+    opcode |= MiscField::encode(true);
+  }
+  Emit(opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitTruncateFloat32ToUint32(Node* node) {
-  VisitRR(this, kMips64TruncUwS, node);
+  Mips64OperandGenerator g(this);
+  InstructionCode opcode = kMips64TruncUwS;
+  TruncateKind kind = OpParameter<TruncateKind>(node->op());
+  if (kind == TruncateKind::kSetOverflowToMin) {
+    opcode |= MiscField::encode(true);
+  }
+  Emit(opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitChangeFloat64ToInt32(Node* node) {
@@ -1314,7 +1398,13 @@ void InstructionSelector::VisitTruncateFloat64ToUint32(Node* node) {
 }
 
 void InstructionSelector::VisitTruncateFloat64ToInt64(Node* node) {
-  VisitRR(this, kMips64TruncLD, node);
+  Mips64OperandGenerator g(this);
+  InstructionCode opcode = kMips64TruncLD;
+  TruncateKind kind = OpParameter<TruncateKind>(node->op());
+  if (kind == TruncateKind::kSetOverflowToMin) {
+    opcode |= MiscField::encode(true);
+  }
+  Emit(opcode, g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitTryTruncateFloat32ToInt64(Node* node) {
@@ -1727,7 +1817,6 @@ void InstructionSelector::EmitPrepareResults(
     Node* node) {
   Mips64OperandGenerator g(this);
 
-  int reverse_slot = 1;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -1740,10 +1829,11 @@ void InstructionSelector::EmitPrepareResults(
       } else if (output.location.GetType() == MachineType::Simd128()) {
         MarkAsSimd128(output.node);
       }
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       Emit(kMips64Peek, g.DefineAsRegister(output.node),
            g.UseImmediate(reverse_slot));
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
@@ -2793,6 +2883,7 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(F64x2Trunc, kMips64F64x2Trunc)                         \
   V(F64x2NearestInt, kMips64F64x2NearestInt)               \
   V(I64x2Neg, kMips64I64x2Neg)                             \
+  V(I64x2BitMask, kMips64I64x2BitMask)                     \
   V(F32x4SConvertI32x4, kMips64F32x4SConvertI32x4)         \
   V(F32x4UConvertI32x4, kMips64F32x4UConvertI32x4)         \
   V(F32x4Abs, kMips64F32x4Abs)                             \
@@ -2856,6 +2947,7 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(F64x2Ne, kMips64F64x2Ne)                             \
   V(F64x2Lt, kMips64F64x2Lt)                             \
   V(F64x2Le, kMips64F64x2Le)                             \
+  V(I64x2Eq, kMips64I64x2Eq)                             \
   V(I64x2Add, kMips64I64x2Add)                           \
   V(I64x2Sub, kMips64I64x2Sub)                           \
   V(I64x2Mul, kMips64I64x2Mul)                           \
@@ -2906,6 +2998,7 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(I16x8RoundingAverageU, kMips64I16x8RoundingAverageU) \
   V(I16x8SConvertI32x4, kMips64I16x8SConvertI32x4)       \
   V(I16x8UConvertI32x4, kMips64I16x8UConvertI32x4)       \
+  V(I16x8Q15MulRSatS, kMips64I16x8Q15MulRSatS)           \
   V(I8x16Add, kMips64I8x16Add)                           \
   V(I8x16AddSatS, kMips64I8x16AddSatS)                   \
   V(I8x16AddSatU, kMips64I8x16AddSatU)                   \
@@ -2935,7 +3028,7 @@ void InstructionSelector::VisitS128Const(Node* node) {
   Mips64OperandGenerator g(this);
   static const int kUint32Immediates = kSimd128Size / sizeof(uint32_t);
   uint32_t val[kUint32Immediates];
-  memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  base::Memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
   // If all bytes are zeros or ones, avoid emitting code for generic constants
   bool all_zeros = !(val[0] || val[1] || val[2] || val[3]);
   bool all_ones = val[0] == UINT32_MAX && val[1] == UINT32_MAX &&
@@ -3174,6 +3267,27 @@ void InstructionSelector::VisitF64x2Pmax(Node* node) {
   VisitUniqueRRR(this, kMips64F64x2Pmax, node);
 }
 
+#define VISIT_EXT_MUL(OPCODE1, OPCODE2, TYPE)                                  \
+  void InstructionSelector::Visit##OPCODE1##ExtMulLow##OPCODE2(Node* node) {   \
+    Mips64OperandGenerator g(this);                                            \
+    Emit(kMips64ExtMulLow | MiscField::encode(TYPE), g.DefineAsRegister(node), \
+         g.UseRegister(node->InputAt(0)), g.UseRegister(node->InputAt(1)));    \
+  }                                                                            \
+  void InstructionSelector::Visit##OPCODE1##ExtMulHigh##OPCODE2(Node* node) {  \
+    Mips64OperandGenerator g(this);                                            \
+    Emit(kMips64ExtMulHigh | MiscField::encode(TYPE),                          \
+         g.DefineAsRegister(node), g.UseRegister(node->InputAt(0)),            \
+         g.UseRegister(node->InputAt(1)));                                     \
+  }
+
+VISIT_EXT_MUL(I64x2, I32x4S, MSAS32)
+VISIT_EXT_MUL(I64x2, I32x4U, MSAU32)
+VISIT_EXT_MUL(I32x4, I16x8S, MSAS16)
+VISIT_EXT_MUL(I32x4, I16x8U, MSAU16)
+VISIT_EXT_MUL(I16x8, I8x16S, MSAS8)
+VISIT_EXT_MUL(I16x8, I8x16U, MSAU8)
+#undef VISIT_EXT_MUL
+
 // static
 MachineOperatorBuilder::Flags
 InstructionSelector::SupportedMachineOperatorFlags() {
diff --git a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
index ee1ef6d93954af..3d2e9d936481e6 100644
--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
+++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
@@ -1130,7 +1130,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ b(exit->label());
       break;
     }
@@ -1237,7 +1237,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
           DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
           __ mov(ip, Operand(offset));
           __ LoadSimd128(i.OutputSimd128Register(), MemOperand(fp, ip), r0,
-                         kScratchDoubleReg);
+                         kScratchSimd128Reg);
         }
       } else {
         __ LoadP(i.OutputRegister(), MemOperand(fp, offset), r0);
@@ -1758,8 +1758,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
             break;
           case MachineRepresentation::kSimd128: {
             __ addi(sp, sp, Operand(-kSimd128Size));
-            __ StoreSimd128(i.InputDoubleRegister(0), MemOperand(r0, sp), r0,
-                            kScratchDoubleReg);
+            __ StoreSimd128(i.InputSimd128Register(0), MemOperand(r0, sp), r0,
+                            kScratchSimd128Reg);
             frame_access_state()->IncreaseSPDelta(kSimd128Size /
                                                   kSystemPointerSize);
             break;
@@ -1805,8 +1805,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
           __ mov(ip, Operand(slot * kSystemPointerSize));
-          __ StoreSimd128(i.InputDoubleRegister(0), MemOperand(ip, sp), r0,
-                          kScratchDoubleReg);
+          __ StoreSimd128(i.InputSimd128Register(0), MemOperand(ip, sp), r0,
+                          kScratchSimd128Reg);
         }
       } else {
         __ StoreP(i.InputRegister(0), MemOperand(sp, slot * kSystemPointerSize),
@@ -1918,9 +1918,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
 #if V8_TARGET_ARCH_PPC64
       bool check_conversion =
           (opcode == kPPC_DoubleToInt64 && i.OutputCount() > 1);
-      if (check_conversion) {
         __ mtfsb0(VXCVI);  // clear FPSCR:VXCVI bit
-      }
 #endif
       __ ConvertDoubleToInt64(i.InputDoubleRegister(0),
 #if !V8_TARGET_ARCH_PPC64
@@ -2075,7 +2073,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       bool is_atomic = i.InputInt32(2);
       // lvx only supports MRR.
       DCHECK_EQ(mode, kMode_MRR);
-      __ LoadSimd128(result, operand, r0, kScratchDoubleReg);
+      __ LoadSimd128(result, operand, r0, kScratchSimd128Reg);
       if (is_atomic) __ lwsync();
       DCHECK_EQ(LeaveRC, i.OutputRCBit());
       break;
@@ -2109,7 +2107,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (is_atomic) __ lwsync();
       // stvx only supports MRR.
       DCHECK_EQ(mode, kMode_MRR);
-      __ StoreSimd128(value, operand, r0, kScratchDoubleReg);
+      __ StoreSimd128(value, operand, r0, kScratchSimd128Reg);
       if (is_atomic) __ sync();
       DCHECK_EQ(LeaveRC, i.OutputRCBit());
       break;
@@ -2224,18 +2222,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     }
 #endif  // V8_TARGET_ARCH_PPC64
     case kPPC_F64x2Splat: {
+      constexpr int lane_width_in_bytes = 8;
       Simd128Register dst = i.OutputSimd128Register();
-      __ MovDoubleToInt64(ip, i.InputDoubleRegister(0));
-      // Need to maintain 16 byte alignment for lvx.
-      __ mr(kScratchReg, sp);
-      __ ClearRightImm(
-          sp, sp,
-          Operand(base::bits::WhichPowerOfTwo(16)));  // equivalent to &= -16
-      __ addi(sp, sp, Operand(-16));
-      __ StoreP(ip, MemOperand(sp, 0));
-      __ StoreP(ip, MemOperand(sp, 8));
-      __ lvx(dst, MemOperand(r0, sp));
-      __ mr(sp, kScratchReg);
+      __ MovDoubleToInt64(kScratchReg, i.InputDoubleRegister(0));
+      __ mtvsrd(dst, kScratchReg);
+      __ vinsertd(dst, dst, Operand(1 * lane_width_in_bytes));
       break;
     }
     case kPPC_F32x4Splat: {
@@ -2246,18 +2237,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I64x2Splat: {
-      Register src = i.InputRegister(0);
+      constexpr int lane_width_in_bytes = 8;
       Simd128Register dst = i.OutputSimd128Register();
-      // Need to maintain 16 byte alignment for lvx.
-      __ mr(kScratchReg, sp);
-      __ ClearRightImm(
-          sp, sp,
-          Operand(base::bits::WhichPowerOfTwo(16)));  // equivalent to &= -16
-      __ addi(sp, sp, Operand(-16));
-      __ StoreP(src, MemOperand(sp, 0));
-      __ StoreP(src, MemOperand(sp, 8));
-      __ lvx(dst, MemOperand(r0, sp));
-      __ mr(sp, kScratchReg);
+      __ mtvsrd(dst, i.InputRegister(0));
+      __ vinsertd(dst, dst, Operand(1 * lane_width_in_bytes));
       break;
     }
     case kPPC_I32x4Splat: {
@@ -2280,59 +2263,59 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     }
     case kPPC_F64x2ExtractLane: {
       constexpr int lane_width_in_bytes = 8;
-      __ vextractd(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractd(kScratchSimd128Reg, i.InputSimd128Register(0),
                    Operand((1 - i.InputInt8(1)) * lane_width_in_bytes));
-      __ mfvsrd(kScratchReg, kScratchDoubleReg);
+      __ mfvsrd(kScratchReg, kScratchSimd128Reg);
       __ MovInt64ToDouble(i.OutputDoubleRegister(), kScratchReg);
       break;
     }
     case kPPC_F32x4ExtractLane: {
       constexpr int lane_width_in_bytes = 4;
-      __ vextractuw(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractuw(kScratchSimd128Reg, i.InputSimd128Register(0),
                     Operand((3 - i.InputInt8(1)) * lane_width_in_bytes));
-      __ mfvsrd(kScratchReg, kScratchDoubleReg);
+      __ mfvsrd(kScratchReg, kScratchSimd128Reg);
       __ MovIntToFloat(i.OutputDoubleRegister(), kScratchReg);
       break;
     }
     case kPPC_I64x2ExtractLane: {
       constexpr int lane_width_in_bytes = 8;
-      __ vextractd(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractd(kScratchSimd128Reg, i.InputSimd128Register(0),
                    Operand((1 - i.InputInt8(1)) * lane_width_in_bytes));
-      __ mfvsrd(i.OutputRegister(), kScratchDoubleReg);
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I32x4ExtractLane: {
       constexpr int lane_width_in_bytes = 4;
-      __ vextractuw(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractuw(kScratchSimd128Reg, i.InputSimd128Register(0),
                     Operand((3 - i.InputInt8(1)) * lane_width_in_bytes));
-      __ mfvsrd(i.OutputRegister(), kScratchDoubleReg);
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8ExtractLaneU: {
       constexpr int lane_width_in_bytes = 2;
-      __ vextractuh(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractuh(kScratchSimd128Reg, i.InputSimd128Register(0),
                     Operand((7 - i.InputInt8(1)) * lane_width_in_bytes));
-      __ mfvsrd(i.OutputRegister(), kScratchDoubleReg);
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8ExtractLaneS: {
       constexpr int lane_width_in_bytes = 2;
-      __ vextractuh(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractuh(kScratchSimd128Reg, i.InputSimd128Register(0),
                     Operand((7 - i.InputInt8(1)) * lane_width_in_bytes));
-      __ mfvsrd(kScratchReg, kScratchDoubleReg);
+      __ mfvsrd(kScratchReg, kScratchSimd128Reg);
       __ extsh(i.OutputRegister(), kScratchReg);
       break;
     }
     case kPPC_I8x16ExtractLaneU: {
-      __ vextractub(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractub(kScratchSimd128Reg, i.InputSimd128Register(0),
                     Operand(15 - i.InputInt8(1)));
-      __ mfvsrd(i.OutputRegister(), kScratchDoubleReg);
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I8x16ExtractLaneS: {
-      __ vextractub(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vextractub(kScratchSimd128Reg, i.InputSimd128Register(0),
                     Operand(15 - i.InputInt8(1)));
-      __ mfvsrd(kScratchReg, kScratchDoubleReg);
+      __ mfvsrd(kScratchReg, kScratchSimd128Reg);
       __ extsb(i.OutputRegister(), kScratchReg);
       break;
     }
@@ -2341,8 +2324,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       constexpr int lane_width_in_bytes = 8;
       Simd128Register dst = i.OutputSimd128Register();
       __ MovDoubleToInt64(r0, i.InputDoubleRegister(2));
-      __ mtvsrd(kScratchDoubleReg, r0);
-      __ vinsertd(dst, kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, r0);
+      __ vinsertd(dst, kScratchSimd128Reg,
                   Operand((1 - i.InputInt8(1)) * lane_width_in_bytes));
       break;
     }
@@ -2351,8 +2334,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       constexpr int lane_width_in_bytes = 4;
       Simd128Register dst = i.OutputSimd128Register();
       __ MovFloatToInt(r0, i.InputDoubleRegister(2));
-      __ mtvsrd(kScratchDoubleReg, r0);
-      __ vinsertw(dst, kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, r0);
+      __ vinsertw(dst, kScratchSimd128Reg,
                   Operand((3 - i.InputInt8(1)) * lane_width_in_bytes));
       break;
     }
@@ -2360,8 +2343,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
       constexpr int lane_width_in_bytes = 8;
       Simd128Register dst = i.OutputSimd128Register();
-      __ mtvsrd(kScratchDoubleReg, i.InputRegister(2));
-      __ vinsertd(dst, kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, i.InputRegister(2));
+      __ vinsertd(dst, kScratchSimd128Reg,
                   Operand((1 - i.InputInt8(1)) * lane_width_in_bytes));
       break;
     }
@@ -2369,8 +2352,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
       constexpr int lane_width_in_bytes = 4;
       Simd128Register dst = i.OutputSimd128Register();
-      __ mtvsrd(kScratchDoubleReg, i.InputRegister(2));
-      __ vinsertw(dst, kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, i.InputRegister(2));
+      __ vinsertw(dst, kScratchSimd128Reg,
                   Operand((3 - i.InputInt8(1)) * lane_width_in_bytes));
       break;
     }
@@ -2378,16 +2361,16 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
       constexpr int lane_width_in_bytes = 2;
       Simd128Register dst = i.OutputSimd128Register();
-      __ mtvsrd(kScratchDoubleReg, i.InputRegister(2));
-      __ vinserth(dst, kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, i.InputRegister(2));
+      __ vinserth(dst, kScratchSimd128Reg,
                   Operand((7 - i.InputInt8(1)) * lane_width_in_bytes));
       break;
     }
     case kPPC_I8x16ReplaceLane: {
       DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
       Simd128Register dst = i.OutputSimd128Register();
-      __ mtvsrd(kScratchDoubleReg, i.InputRegister(2));
-      __ vinsertb(dst, kScratchDoubleReg, Operand(15 - i.InputInt8(1)));
+      __ mtvsrd(kScratchSimd128Reg, i.InputRegister(2));
+      __ vinsertb(dst, kScratchSimd128Reg, Operand(15 - i.InputInt8(1)));
       break;
     }
     case kPPC_F64x2Add: {
@@ -2425,9 +2408,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vspltb(tempFPReg2, tempFPReg2, Operand(7));
       __ vsro(tempFPReg1, src0, tempFPReg2);
       __ vsro(tempFPReg2, src1, tempFPReg2);
-      __ vpkudum(kScratchDoubleReg, tempFPReg2, tempFPReg1);
+      __ vpkudum(kScratchSimd128Reg, tempFPReg2, tempFPReg1);
       // add the operands
-      __ vaddfp(dst, kScratchDoubleReg, dst);
+      __ vaddfp(dst, kScratchSimd128Reg, dst);
       break;
     }
     case kPPC_F32x4Sub: {
@@ -2451,23 +2434,30 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I64x2Mul: {
-      // Need to maintain 16 byte alignment for stvx and lvx.
-      __ mr(kScratchReg, sp);
-      __ ClearRightImm(
-          sp, sp,
-          Operand(base::bits::WhichPowerOfTwo(16)));  // equivalent to &= -16
-      __ addi(sp, sp, Operand(-32));
-      __ stvx(i.InputSimd128Register(0), MemOperand(r0, sp));
-      __ li(ip, Operand(16));
-      __ stvx(i.InputSimd128Register(1), MemOperand(ip, sp));
+      constexpr int lane_width_in_bytes = 8;
+      Simd128Register src0 = i.InputSimd128Register(0);
+      Simd128Register src1 = i.InputSimd128Register(1);
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      Simd128Register dst = i.OutputSimd128Register();
       for (int i = 0; i < 2; i++) {
-        __ LoadP(r0, MemOperand(sp, kBitsPerByte * i));
-        __ LoadP(ip, MemOperand(sp, (kBitsPerByte * i) + kSimd128Size));
+        if (i > 0) {
+          __ vextractd(kScratchSimd128Reg, src0,
+                       Operand(1 * lane_width_in_bytes));
+          __ vextractd(tempFPReg1, src1, Operand(1 * lane_width_in_bytes));
+          src0 = kScratchSimd128Reg;
+          src1 = tempFPReg1;
+        }
+        __ mfvsrd(r0, src0);
+        __ mfvsrd(ip, src1);
         __ mulld(r0, r0, ip);
-        __ StoreP(r0, MemOperand(sp, i * kBitsPerByte));
+        if (i <= 0) {
+          __ mtvsrd(dst, r0);
+        } else {
+          __ mtvsrd(kScratchSimd128Reg, r0);
+          __ vinsertd(dst, kScratchSimd128Reg,
+                      Operand(1 * lane_width_in_bytes));
+        }
       }
-      __ lvx(i.OutputSimd128Register(), MemOperand(r0, sp));
-      __ mr(sp, kScratchReg);
       break;
     }
     case kPPC_I32x4Add: {
@@ -2479,10 +2469,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src0 = i.InputSimd128Register(0);
       Simd128Register src1 = i.InputSimd128Register(1);
       Simd128Register dst = i.OutputSimd128Register();
-      __ vxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
-      __ vsum2sws(dst, src0, kScratchDoubleReg);
-      __ vsum2sws(kScratchDoubleReg, src1, kScratchDoubleReg);
-      __ vpkudum(dst, kScratchDoubleReg, dst);
+      __ vxor(kScratchSimd128Reg, kScratchSimd128Reg, kScratchSimd128Reg);
+      __ vsum2sws(dst, src0, kScratchSimd128Reg);
+      __ vsum2sws(kScratchSimd128Reg, src1, kScratchSimd128Reg);
+      __ vpkudum(dst, kScratchSimd128Reg, dst);
       break;
     }
     case kPPC_I32x4Sub: {
@@ -2504,10 +2494,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src0 = i.InputSimd128Register(0);
       Simd128Register src1 = i.InputSimd128Register(1);
       Simd128Register dst = i.OutputSimd128Register();
-      __ vxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
-      __ vsum4shs(dst, src0, kScratchDoubleReg);
-      __ vsum4shs(kScratchDoubleReg, src1, kScratchDoubleReg);
-      __ vpkuwus(dst, kScratchDoubleReg, dst);
+      __ vxor(kScratchSimd128Reg, kScratchSimd128Reg, kScratchSimd128Reg);
+      __ vsum4shs(dst, src0, kScratchSimd128Reg);
+      __ vsum4shs(kScratchSimd128Reg, src1, kScratchSimd128Reg);
+      __ vpkuwus(dst, kScratchSimd128Reg, dst);
       break;
     }
     case kPPC_I16x8Sub: {
@@ -2516,9 +2506,17 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I16x8Mul: {
-      __ vxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
-      __ vmladduhm(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                   i.InputSimd128Register(1), kScratchDoubleReg);
+      Simd128Register src0 = i.InputSimd128Register(0);
+      Simd128Register src1 = i.InputSimd128Register(1);
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      __ vmuleuh(kScratchSimd128Reg, src0, src1);
+      __ vmulouh(i.OutputSimd128Register(), src0, src1);
+      __ xxspltib(tempFPReg1, Operand(16));
+      __ vslw(kScratchSimd128Reg, kScratchSimd128Reg, tempFPReg1);
+      __ vslw(dst, dst, tempFPReg1);
+      __ vsrw(dst, dst, tempFPReg1);
+      __ vor(dst, kScratchSimd128Reg, dst);
       break;
     }
     case kPPC_I8x16Add: {
@@ -2532,12 +2530,17 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I8x16Mul: {
-      __ vmuleub(kScratchDoubleReg, i.InputSimd128Register(0),
-                 i.InputSimd128Register(1));
-      __ vmuloub(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputSimd128Register(1));
-      __ vpkuhum(i.OutputSimd128Register(), kScratchDoubleReg,
-                 i.OutputSimd128Register());
+      Simd128Register src0 = i.InputSimd128Register(0);
+      Simd128Register src1 = i.InputSimd128Register(1);
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      __ vmuleub(kScratchSimd128Reg, src0, src1);
+      __ vmuloub(i.OutputSimd128Register(), src0, src1);
+      __ xxspltib(tempFPReg1, Operand(8));
+      __ vslh(kScratchSimd128Reg, kScratchSimd128Reg, tempFPReg1);
+      __ vslh(dst, dst, tempFPReg1);
+      __ vsrh(dst, dst, tempFPReg1);
+      __ vor(dst, kScratchSimd128Reg, dst);
       break;
     }
     case kPPC_I64x2MinS: {
@@ -2626,9 +2629,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_F64x2Ne: {
-      __ xvcmpeqdp(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ xvcmpeqdp(kScratchSimd128Reg, i.InputSimd128Register(0),
                    i.InputSimd128Register(1));
-      __ vnor(i.OutputSimd128Register(), kScratchDoubleReg, kScratchDoubleReg);
+      __ vnor(i.OutputSimd128Register(), kScratchSimd128Reg,
+              kScratchSimd128Reg);
       break;
     }
     case kPPC_F64x2Le: {
@@ -2667,33 +2671,38 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_F32x4Ne: {
-      __ xvcmpeqsp(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ xvcmpeqsp(kScratchSimd128Reg, i.InputSimd128Register(0),
                    i.InputSimd128Register(1));
-      __ vnor(i.OutputSimd128Register(), kScratchDoubleReg, kScratchDoubleReg);
+      __ vnor(i.OutputSimd128Register(), kScratchSimd128Reg,
+              kScratchSimd128Reg);
       break;
     }
     case kPPC_I64x2Ne: {
-      __ vcmpequd(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequd(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
-      __ vnor(i.OutputSimd128Register(), kScratchDoubleReg, kScratchDoubleReg);
+      __ vnor(i.OutputSimd128Register(), kScratchSimd128Reg,
+              kScratchSimd128Reg);
       break;
     }
     case kPPC_I32x4Ne: {
-      __ vcmpequw(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequw(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
-      __ vnor(i.OutputSimd128Register(), kScratchDoubleReg, kScratchDoubleReg);
+      __ vnor(i.OutputSimd128Register(), kScratchSimd128Reg,
+              kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8Ne: {
-      __ vcmpequh(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequh(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
-      __ vnor(i.OutputSimd128Register(), kScratchDoubleReg, kScratchDoubleReg);
+      __ vnor(i.OutputSimd128Register(), kScratchSimd128Reg,
+              kScratchSimd128Reg);
       break;
     }
     case kPPC_I8x16Ne: {
-      __ vcmpequb(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequb(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
-      __ vnor(i.OutputSimd128Register(), kScratchDoubleReg, kScratchDoubleReg);
+      __ vnor(i.OutputSimd128Register(), kScratchSimd128Reg,
+              kScratchSimd128Reg);
       break;
     }
     case kPPC_F32x4Lt: {
@@ -2717,21 +2726,21 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I64x2GeS: {
-      __ vcmpequd(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequd(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtsd(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
       break;
     }
     case kPPC_I32x4GeS: {
-      __ vcmpequw(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequw(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtsw(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
       break;
     }
     case kPPC_I64x2GtU: {
@@ -2746,22 +2755,22 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I64x2GeU: {
-      __ vcmpequd(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequd(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtud(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
 
       break;
     }
     case kPPC_I32x4GeU: {
-      __ vcmpequw(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequw(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtuw(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8GtS: {
@@ -2770,12 +2779,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I16x8GeS: {
-      __ vcmpequh(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequh(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtsh(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8GtU: {
@@ -2784,12 +2793,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I16x8GeU: {
-      __ vcmpequh(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequh(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtuh(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
       break;
     }
     case kPPC_I8x16GtS: {
@@ -2798,12 +2807,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I8x16GeS: {
-      __ vcmpequb(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequb(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtsb(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
       break;
     }
     case kPPC_I8x16GtU: {
@@ -2812,20 +2821,20 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I8x16GeU: {
-      __ vcmpequb(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ vcmpequb(kScratchSimd128Reg, i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vcmpgtub(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1));
       __ vor(i.OutputSimd128Register(), i.OutputSimd128Register(),
-             kScratchDoubleReg);
+             kScratchSimd128Reg);
       break;
     }
-#define VECTOR_SHIFT(op)                                         \
-  {                                                              \
-    __ mtvsrd(kScratchDoubleReg, i.InputRegister(1));            \
-    __ vspltb(kScratchDoubleReg, kScratchDoubleReg, Operand(7)); \
-    __ op(i.OutputSimd128Register(), i.InputSimd128Register(0),  \
-          kScratchDoubleReg);                                    \
+#define VECTOR_SHIFT(op)                                           \
+  {                                                                \
+    __ mtvsrd(kScratchSimd128Reg, i.InputRegister(1));             \
+    __ vspltb(kScratchSimd128Reg, kScratchSimd128Reg, Operand(7)); \
+    __ op(i.OutputSimd128Register(), i.InputSimd128Register(0),    \
+          kScratchSimd128Reg);                                     \
   }
     case kPPC_I64x2Shl: {
       VECTOR_SHIFT(vsld)
@@ -2894,11 +2903,28 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vxor(dst, i.InputSimd128Register(0), src);
       break;
     }
+    case kPPC_S128Const: {
+      Simd128Register dst = i.OutputSimd128Register();
+      constexpr int lane_width_in_bytes = 8;
+      uint64_t low = make_uint64(i.InputUint32(1), i.InputUint32(0));
+      uint64_t high = make_uint64(i.InputUint32(3), i.InputUint32(2));
+      __ mov(r0, Operand(low));
+      __ mov(ip, Operand(high));
+      __ mtvsrd(dst, ip);
+      __ mtvsrd(kScratchSimd128Reg, r0);
+      __ vinsertd(dst, kScratchSimd128Reg, Operand(1 * lane_width_in_bytes));
+      break;
+    }
     case kPPC_S128Zero: {
       Simd128Register dst = i.OutputSimd128Register();
       __ vxor(dst, dst, dst);
       break;
     }
+    case kPPC_S128AllOnes: {
+      Simd128Register dst = i.OutputSimd128Register();
+      __ vcmpequb(dst, dst, dst);
+      break;
+    }
     case kPPC_S128Not: {
       Simd128Register dst = i.OutputSimd128Register();
       Simd128Register src = i.InputSimd128Register(0);
@@ -2946,30 +2972,24 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kPPC_I64x2Neg: {
+      constexpr int lane_width_in_bytes = 8;
       Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
-      __ li(ip, Operand(1));
-      // Need to maintain 16 byte alignment for lvx.
-      __ mr(kScratchReg, sp);
-      __ ClearRightImm(
-          sp, sp,
-          Operand(base::bits::WhichPowerOfTwo(16)));  // equivalent to &= -16
-      __ addi(sp, sp, Operand(-16));
-      __ StoreP(ip, MemOperand(sp, 0));
-      __ StoreP(ip, MemOperand(sp, 8));
-      __ lvx(kScratchDoubleReg, MemOperand(r0, sp));
-      __ mr(sp, kScratchReg);
+      __ li(kScratchReg, Operand(1));
+      __ mtvsrd(kScratchSimd128Reg, kScratchReg);
+      __ vinsertd(kScratchSimd128Reg, kScratchSimd128Reg,
+                  Operand(1 * lane_width_in_bytes));
       // Perform negation.
       __ vnor(tempFPReg1, i.InputSimd128Register(0), i.InputSimd128Register(0));
-      __ vaddudm(i.OutputSimd128Register(), tempFPReg1, kScratchDoubleReg);
+      __ vaddudm(i.OutputSimd128Register(), tempFPReg1, kScratchSimd128Reg);
       break;
     }
     case kPPC_I32x4Neg: {
       Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
       __ li(ip, Operand(1));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vspltw(kScratchDoubleReg, kScratchDoubleReg, Operand(1));
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltw(kScratchSimd128Reg, kScratchSimd128Reg, Operand(1));
       __ vnor(tempFPReg1, i.InputSimd128Register(0), i.InputSimd128Register(0));
-      __ vadduwm(i.OutputSimd128Register(), kScratchDoubleReg, tempFPReg1);
+      __ vadduwm(i.OutputSimd128Register(), kScratchSimd128Reg, tempFPReg1);
       break;
     }
     case kPPC_I32x4Abs: {
@@ -2977,20 +2997,20 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src = i.InputSimd128Register(0);
       constexpr int shift_bits = 31;
       __ li(ip, Operand(shift_bits));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vspltb(kScratchDoubleReg, kScratchDoubleReg, Operand(7));
-      __ vsraw(kScratchDoubleReg, src, kScratchDoubleReg);
-      __ vxor(tempFPReg1, src, kScratchDoubleReg);
-      __ vsubuwm(i.OutputSimd128Register(), tempFPReg1, kScratchDoubleReg);
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltb(kScratchSimd128Reg, kScratchSimd128Reg, Operand(7));
+      __ vsraw(kScratchSimd128Reg, src, kScratchSimd128Reg);
+      __ vxor(tempFPReg1, src, kScratchSimd128Reg);
+      __ vsubuwm(i.OutputSimd128Register(), tempFPReg1, kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8Neg: {
       Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
       __ li(ip, Operand(1));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vsplth(kScratchDoubleReg, kScratchDoubleReg, Operand(3));
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vsplth(kScratchSimd128Reg, kScratchSimd128Reg, Operand(3));
       __ vnor(tempFPReg1, i.InputSimd128Register(0), i.InputSimd128Register(0));
-      __ vadduhm(i.OutputSimd128Register(), kScratchDoubleReg, tempFPReg1);
+      __ vadduhm(i.OutputSimd128Register(), kScratchSimd128Reg, tempFPReg1);
       break;
     }
     case kPPC_I16x8Abs: {
@@ -2998,20 +3018,20 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src = i.InputSimd128Register(0);
       constexpr int shift_bits = 15;
       __ li(ip, Operand(shift_bits));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vspltb(kScratchDoubleReg, kScratchDoubleReg, Operand(7));
-      __ vsrah(kScratchDoubleReg, src, kScratchDoubleReg);
-      __ vxor(tempFPReg1, src, kScratchDoubleReg);
-      __ vsubuhm(i.OutputSimd128Register(), tempFPReg1, kScratchDoubleReg);
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltb(kScratchSimd128Reg, kScratchSimd128Reg, Operand(7));
+      __ vsrah(kScratchSimd128Reg, src, kScratchSimd128Reg);
+      __ vxor(tempFPReg1, src, kScratchSimd128Reg);
+      __ vsubuhm(i.OutputSimd128Register(), tempFPReg1, kScratchSimd128Reg);
       break;
     }
     case kPPC_I8x16Neg: {
       Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
       __ li(ip, Operand(1));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vspltb(kScratchDoubleReg, kScratchDoubleReg, Operand(7));
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltb(kScratchSimd128Reg, kScratchSimd128Reg, Operand(7));
       __ vnor(tempFPReg1, i.InputSimd128Register(0), i.InputSimd128Register(0));
-      __ vaddubm(i.OutputSimd128Register(), kScratchDoubleReg, tempFPReg1);
+      __ vaddubm(i.OutputSimd128Register(), kScratchSimd128Reg, tempFPReg1);
       break;
     }
     case kPPC_I8x16Abs: {
@@ -3019,11 +3039,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src = i.InputSimd128Register(0);
       constexpr int shift_bits = 7;
       __ li(ip, Operand(shift_bits));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vspltb(kScratchDoubleReg, kScratchDoubleReg, Operand(7));
-      __ vsrab(kScratchDoubleReg, src, kScratchDoubleReg);
-      __ vxor(tempFPReg1, src, kScratchDoubleReg);
-      __ vsububm(i.OutputSimd128Register(), tempFPReg1, kScratchDoubleReg);
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltb(kScratchSimd128Reg, kScratchSimd128Reg, Operand(7));
+      __ vsrab(kScratchSimd128Reg, src, kScratchSimd128Reg);
+      __ vxor(tempFPReg1, src, kScratchSimd128Reg);
+      __ vsububm(i.OutputSimd128Register(), tempFPReg1, kScratchSimd128Reg);
       break;
     }
     case kPPC_V64x2AnyTrue:
@@ -3034,22 +3054,24 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Register dst = i.OutputRegister();
       constexpr int bit_number = 24;
       __ li(r0, Operand(0));
-      __ li(ip, Operand(-1));
+      __ li(ip, Operand(1));
       // Check if both lanes are 0, if so then return false.
-      __ vxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
-      __ vcmpequd(kScratchDoubleReg, src, kScratchDoubleReg, SetRC);
+      __ vxor(kScratchSimd128Reg, kScratchSimd128Reg, kScratchSimd128Reg);
+      __ mtcrf(0xFF, r0);  // Clear cr.
+      __ vcmpequd(kScratchSimd128Reg, src, kScratchSimd128Reg, SetRC);
       __ isel(dst, r0, ip, bit_number);
       break;
     }
-#define SIMD_ALL_TRUE(opcode)                                       \
-  Simd128Register src = i.InputSimd128Register(0);                  \
-  Register dst = i.OutputRegister();                                \
-  constexpr int bit_number = 24;                                    \
-  __ li(r0, Operand(0));                                            \
-  __ li(ip, Operand(-1));                                           \
-  /* Check if all lanes > 0, if not then return false.*/            \
-  __ vxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg); \
-  __ opcode(kScratchDoubleReg, src, kScratchDoubleReg, SetRC);      \
+#define SIMD_ALL_TRUE(opcode)                                          \
+  Simd128Register src = i.InputSimd128Register(0);                     \
+  Register dst = i.OutputRegister();                                   \
+  constexpr int bit_number = 24;                                       \
+  __ li(r0, Operand(0));                                               \
+  __ li(ip, Operand(1));                                               \
+  /* Check if all lanes > 0, if not then return false.*/               \
+  __ vxor(kScratchSimd128Reg, kScratchSimd128Reg, kScratchSimd128Reg); \
+  __ mtcrf(0xFF, r0); /* Clear cr.*/                                   \
+  __ opcode(kScratchSimd128Reg, src, kScratchSimd128Reg, SetRC);       \
   __ isel(dst, ip, r0, bit_number);
     case kPPC_V64x2AllTrue: {
       SIMD_ALL_TRUE(vcmpgtud)
@@ -3071,10 +3093,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kPPC_I32x4SConvertF32x4: {
       Simd128Register src = i.InputSimd128Register(0);
       // NaN to 0
-      __ vor(kScratchDoubleReg, src, src);
-      __ xvcmpeqsp(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
-      __ vand(kScratchDoubleReg, src, kScratchDoubleReg);
-      __ xvcvspsxws(i.OutputSimd128Register(), kScratchDoubleReg);
+      __ vor(kScratchSimd128Reg, src, src);
+      __ xvcmpeqsp(kScratchSimd128Reg, kScratchSimd128Reg, kScratchSimd128Reg);
+      __ vand(kScratchSimd128Reg, src, kScratchSimd128Reg);
+      __ xvcvspsxws(i.OutputSimd128Register(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I32x4UConvertF32x4: {
@@ -3101,9 +3123,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vupklsh(i.OutputSimd128Register(), i.InputSimd128Register(0));
       // Zero extend.
       __ mov(ip, Operand(0xFFFF));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vspltw(kScratchDoubleReg, kScratchDoubleReg, Operand(1));
-      __ vand(i.OutputSimd128Register(), kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltw(kScratchSimd128Reg, kScratchSimd128Reg, Operand(1));
+      __ vand(i.OutputSimd128Register(), kScratchSimd128Reg,
               i.OutputSimd128Register());
       break;
     }
@@ -3111,9 +3133,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vupkhsh(i.OutputSimd128Register(), i.InputSimd128Register(0));
       // Zero extend.
       __ mov(ip, Operand(0xFFFF));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vspltw(kScratchDoubleReg, kScratchDoubleReg, Operand(1));
-      __ vand(i.OutputSimd128Register(), kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltw(kScratchSimd128Reg, kScratchSimd128Reg, Operand(1));
+      __ vand(i.OutputSimd128Register(), kScratchSimd128Reg,
               i.OutputSimd128Register());
       break;
     }
@@ -3130,9 +3152,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vupklsb(i.OutputSimd128Register(), i.InputSimd128Register(0));
       // Zero extend.
       __ li(ip, Operand(0xFF));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vsplth(kScratchDoubleReg, kScratchDoubleReg, Operand(3));
-      __ vand(i.OutputSimd128Register(), kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vsplth(kScratchSimd128Reg, kScratchSimd128Reg, Operand(3));
+      __ vand(i.OutputSimd128Register(), kScratchSimd128Reg,
               i.OutputSimd128Register());
       break;
     }
@@ -3140,49 +3162,43 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ vupkhsb(i.OutputSimd128Register(), i.InputSimd128Register(0));
       // Zero extend.
       __ li(ip, Operand(0xFF));
-      __ mtvsrd(kScratchDoubleReg, ip);
-      __ vsplth(kScratchDoubleReg, kScratchDoubleReg, Operand(3));
-      __ vand(i.OutputSimd128Register(), kScratchDoubleReg,
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vsplth(kScratchSimd128Reg, kScratchSimd128Reg, Operand(3));
+      __ vand(i.OutputSimd128Register(), kScratchSimd128Reg,
               i.OutputSimd128Register());
       break;
     }
     case kPPC_I16x8SConvertI32x4: {
-      __ vpkswss(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputSimd128Register(1));
+      __ vpkswss(i.OutputSimd128Register(), i.InputSimd128Register(1),
+                 i.InputSimd128Register(0));
       break;
     }
     case kPPC_I16x8UConvertI32x4: {
-      __ vpkswus(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputSimd128Register(1));
+      __ vpkswus(i.OutputSimd128Register(), i.InputSimd128Register(1),
+                 i.InputSimd128Register(0));
       break;
     }
     case kPPC_I8x16SConvertI16x8: {
-      __ vpkshss(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputSimd128Register(1));
+      __ vpkshss(i.OutputSimd128Register(), i.InputSimd128Register(1),
+                 i.InputSimd128Register(0));
       break;
     }
     case kPPC_I8x16UConvertI16x8: {
-      __ vpkshus(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                 i.InputSimd128Register(1));
+      __ vpkshus(i.OutputSimd128Register(), i.InputSimd128Register(1),
+                 i.InputSimd128Register(0));
       break;
     }
     case kPPC_I8x16Shuffle: {
+      constexpr int lane_width_in_bytes = 8;
       Simd128Register dst = i.OutputSimd128Register(),
                       src0 = i.InputSimd128Register(0),
                       src1 = i.InputSimd128Register(1);
       __ mov(r0, Operand(make_uint64(i.InputUint32(3), i.InputUint32(2))));
       __ mov(ip, Operand(make_uint64(i.InputUint32(5), i.InputUint32(4))));
-      // Need to maintain 16 byte alignment for lvx.
-      __ mr(kScratchReg, sp);
-      __ ClearRightImm(
-          sp, sp,
-          Operand(base::bits::WhichPowerOfTwo(16)));  // equivalent to &= -16
-      __ addi(sp, sp, Operand(-16));
-      __ StoreP(r0, MemOperand(sp, 0));
-      __ StoreP(ip, MemOperand(sp, 8));
-      __ lvx(kScratchDoubleReg, MemOperand(r0, sp));
-      __ mr(sp, kScratchReg);
-      __ vperm(dst, src0, src1, kScratchDoubleReg);
+      __ mtvsrd(kScratchSimd128Reg, r0);
+      __ mtvsrd(dst, ip);
+      __ vinsertd(dst, kScratchSimd128Reg, Operand(1 * lane_width_in_bytes));
+      __ vperm(dst, src0, src1, dst);
       break;
     }
     case kPPC_I16x8AddSatS: {
@@ -3243,10 +3259,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ stdx(ip, MemOperand(r0, sp));
       __ li(ip, Operand(8));
       __ stdx(r0, MemOperand(ip, sp));
-      __ lxvd(kScratchDoubleReg, MemOperand(r0, sp));
+      __ lxvd(kScratchSimd128Reg, MemOperand(r0, sp));
       __ addi(sp, sp, Operand(16));
       __ vxor(tempFPReg1, tempFPReg1, tempFPReg1);
-      __ vperm(dst, kScratchDoubleReg, tempFPReg1, tempFPReg2);
+      __ vperm(dst, kScratchSimd128Reg, tempFPReg1, tempFPReg2);
       break;
     }
     case kPPC_F64x2Qfma: {
@@ -3254,9 +3270,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src1 = i.InputSimd128Register(1);
       Simd128Register src2 = i.InputSimd128Register(2);
       Simd128Register dst = i.OutputSimd128Register();
-      __ vor(kScratchDoubleReg, src1, src1);
-      __ xvmaddmdp(kScratchDoubleReg, src2, src0);
-      __ vor(dst, kScratchDoubleReg, kScratchDoubleReg);
+      __ vor(kScratchSimd128Reg, src1, src1);
+      __ xvmaddmdp(kScratchSimd128Reg, src2, src0);
+      __ vor(dst, kScratchSimd128Reg, kScratchSimd128Reg);
       break;
     }
     case kPPC_F64x2Qfms: {
@@ -3264,9 +3280,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src1 = i.InputSimd128Register(1);
       Simd128Register src2 = i.InputSimd128Register(2);
       Simd128Register dst = i.OutputSimd128Register();
-      __ vor(kScratchDoubleReg, src1, src1);
-      __ xvnmsubmdp(kScratchDoubleReg, src2, src0);
-      __ vor(dst, kScratchDoubleReg, kScratchDoubleReg);
+      __ vor(kScratchSimd128Reg, src1, src1);
+      __ xvnmsubmdp(kScratchSimd128Reg, src2, src0);
+      __ vor(dst, kScratchSimd128Reg, kScratchSimd128Reg);
       break;
     }
     case kPPC_F32x4Qfma: {
@@ -3274,9 +3290,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src1 = i.InputSimd128Register(1);
       Simd128Register src2 = i.InputSimd128Register(2);
       Simd128Register dst = i.OutputSimd128Register();
-      __ vor(kScratchDoubleReg, src1, src1);
-      __ xvmaddmsp(kScratchDoubleReg, src2, src0);
-      __ vor(dst, kScratchDoubleReg, kScratchDoubleReg);
+      __ vor(kScratchSimd128Reg, src1, src1);
+      __ xvmaddmsp(kScratchSimd128Reg, src2, src0);
+      __ vor(dst, kScratchSimd128Reg, kScratchSimd128Reg);
       break;
     }
     case kPPC_F32x4Qfms: {
@@ -3284,9 +3300,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src1 = i.InputSimd128Register(1);
       Simd128Register src2 = i.InputSimd128Register(2);
       Simd128Register dst = i.OutputSimd128Register();
-      __ vor(kScratchDoubleReg, src1, src1);
-      __ xvnmsubmsp(kScratchDoubleReg, src2, src0);
-      __ vor(dst, kScratchDoubleReg, kScratchDoubleReg);
+      __ vor(kScratchSimd128Reg, src1, src1);
+      __ xvnmsubmsp(kScratchSimd128Reg, src2, src0);
+      __ vor(dst, kScratchSimd128Reg, kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8RoundingAverageU: {
@@ -3318,19 +3334,22 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
   __ xvcmpeqdp(tempFPReg1, i.InputSimd128Register(1),                   \
                i.InputSimd128Register(1));                              \
   __ vsel(i.OutputSimd128Register(), i.InputSimd128Register(1), result, \
-          tempFPReg1);
+          tempFPReg1);                                                  \
+  /* Use xvmindp to turn any selected SNANs to QNANs. */                \
+  __ xvmindp(i.OutputSimd128Register(), i.OutputSimd128Register(),      \
+             i.OutputSimd128Register());
     case kPPC_F64x2Min: {
-      __ xvmindp(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ xvmindp(kScratchSimd128Reg, i.InputSimd128Register(0),
                  i.InputSimd128Register(1));
       // We need to check if an input is NAN and preserve it.
-      F64X2_MIN_MAX_NAN(kScratchDoubleReg)
+      F64X2_MIN_MAX_NAN(kScratchSimd128Reg)
       break;
     }
     case kPPC_F64x2Max: {
-      __ xvmaxdp(kScratchDoubleReg, i.InputSimd128Register(0),
+      __ xvmaxdp(kScratchSimd128Reg, i.InputSimd128Register(0),
                  i.InputSimd128Register(1));
       // We need to check if an input is NAN and preserve it.
-      F64X2_MIN_MAX_NAN(kScratchDoubleReg)
+      F64X2_MIN_MAX_NAN(kScratchSimd128Reg)
       break;
     }
 #undef F64X2_MIN_MAX_NAN
@@ -3381,40 +3400,324 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ xvrspi(i.OutputSimd128Register(), i.InputSimd128Register(0));
       break;
     }
+    case kPPC_I64x2BitMask: {
+      __ mov(kScratchReg,
+             Operand(0x8080808080800040));  // Select 0 for the high bits.
+      __ mtvsrd(kScratchSimd128Reg, kScratchReg);
+      __ vbpermq(kScratchSimd128Reg, i.InputSimd128Register(0),
+                 kScratchSimd128Reg);
+      __ vextractub(kScratchSimd128Reg, kScratchSimd128Reg, Operand(6));
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
+      break;
+    }
     case kPPC_I32x4BitMask: {
       __ mov(kScratchReg,
              Operand(0x8080808000204060));  // Select 0 for the high bits.
-      __ mtvsrd(kScratchDoubleReg, kScratchReg);
-      __ vbpermq(kScratchDoubleReg, i.InputSimd128Register(0),
-                 kScratchDoubleReg);
-      __ vextractub(kScratchDoubleReg, kScratchDoubleReg, Operand(6));
-      __ mfvsrd(i.OutputRegister(), kScratchDoubleReg);
+      __ mtvsrd(kScratchSimd128Reg, kScratchReg);
+      __ vbpermq(kScratchSimd128Reg, i.InputSimd128Register(0),
+                 kScratchSimd128Reg);
+      __ vextractub(kScratchSimd128Reg, kScratchSimd128Reg, Operand(6));
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I16x8BitMask: {
       __ mov(kScratchReg, Operand(0x10203040506070));
-      __ mtvsrd(kScratchDoubleReg, kScratchReg);
-      __ vbpermq(kScratchDoubleReg, i.InputSimd128Register(0),
-                 kScratchDoubleReg);
-      __ vextractub(kScratchDoubleReg, kScratchDoubleReg, Operand(6));
-      __ mfvsrd(i.OutputRegister(), kScratchDoubleReg);
+      __ mtvsrd(kScratchSimd128Reg, kScratchReg);
+      __ vbpermq(kScratchSimd128Reg, i.InputSimd128Register(0),
+                 kScratchSimd128Reg);
+      __ vextractub(kScratchSimd128Reg, kScratchSimd128Reg, Operand(6));
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I8x16BitMask: {
       Register temp = i.ToRegister(instr->TempAt(0));
       __ mov(temp, Operand(0x8101820283038));
       __ mov(ip, Operand(0x4048505860687078));
-      __ mtvsrdd(kScratchDoubleReg, temp, ip);
-      __ vbpermq(kScratchDoubleReg, i.InputSimd128Register(0),
-                 kScratchDoubleReg);
-      __ vextractuh(kScratchDoubleReg, kScratchDoubleReg, Operand(6));
-      __ mfvsrd(i.OutputRegister(), kScratchDoubleReg);
+      __ mtvsrdd(kScratchSimd128Reg, temp, ip);
+      __ vbpermq(kScratchSimd128Reg, i.InputSimd128Register(0),
+                 kScratchSimd128Reg);
+      __ vextractuh(kScratchSimd128Reg, kScratchSimd128Reg, Operand(6));
+      __ mfvsrd(i.OutputRegister(), kScratchSimd128Reg);
       break;
     }
     case kPPC_I32x4DotI16x8S: {
-      __ vxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
+      __ vxor(kScratchSimd128Reg, kScratchSimd128Reg, kScratchSimd128Reg);
       __ vmsumshm(i.OutputSimd128Register(), i.InputSimd128Register(0),
-                  i.InputSimd128Register(1), kScratchDoubleReg);
+                  i.InputSimd128Register(1), kScratchSimd128Reg);
+      break;
+    }
+    case kPPC_F32x4Pmin: {
+      Simd128Register dst = i.OutputSimd128Register(),
+                      src0 = i.InputSimd128Register(0),
+                      src1 = i.InputSimd128Register(1);
+      __ xvcmpgtsp(kScratchSimd128Reg, src0, src1);
+      __ vsel(dst, src0, src1, kScratchSimd128Reg);
+      break;
+    }
+    case kPPC_F32x4Pmax: {
+      Simd128Register dst = i.OutputSimd128Register(),
+                      src0 = i.InputSimd128Register(0),
+                      src1 = i.InputSimd128Register(1);
+      __ xvcmpgtsp(kScratchSimd128Reg, src1, src0);
+      __ vsel(dst, src0, src1, kScratchSimd128Reg);
+      break;
+    }
+    case kPPC_F64x2Pmin: {
+      Simd128Register dst = i.OutputSimd128Register(),
+                      src0 = i.InputSimd128Register(0),
+                      src1 = i.InputSimd128Register(1);
+      __ xvcmpgtdp(kScratchSimd128Reg, src0, src1);
+      __ vsel(dst, src0, src1, kScratchSimd128Reg);
+      break;
+    }
+    case kPPC_F64x2Pmax: {
+      Simd128Register dst = i.OutputSimd128Register(),
+                      src0 = i.InputSimd128Register(0),
+                      src1 = i.InputSimd128Register(1);
+      __ xvcmpgtdp(kScratchSimd128Reg, src1, src0);
+      __ vsel(dst, src0, src1, kScratchSimd128Reg);
+      break;
+    }
+#define ASSEMBLE_LOAD_TRANSFORM(scratch, load_instr) \
+  AddressingMode mode = kMode_None;                  \
+  MemOperand operand = i.MemoryOperand(&mode);       \
+  DCHECK_EQ(mode, kMode_MRR);                        \
+  __ load_instr(scratch, operand);
+    case kPPC_S128Load8Splat: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsibzx)
+      __ vspltb(dst, kScratchSimd128Reg, Operand(7));
+      break;
+    }
+    case kPPC_S128Load16Splat: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsihzx)
+      __ vsplth(dst, kScratchSimd128Reg, Operand(3));
+      break;
+    }
+    case kPPC_S128Load32Splat: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsiwzx)
+      __ vspltw(dst, kScratchSimd128Reg, Operand(1));
+      break;
+    }
+    case kPPC_S128Load64Splat: {
+      constexpr int lane_width_in_bytes = 8;
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(dst, lxsdx)
+      __ vinsertd(dst, dst, Operand(1 * lane_width_in_bytes));
+      break;
+    }
+    case kPPC_S128Load8x8S: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsdx)
+      __ vupkhsb(dst, kScratchSimd128Reg);
+      break;
+    }
+    case kPPC_S128Load8x8U: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsdx)
+      __ vupkhsb(dst, kScratchSimd128Reg);
+      // Zero extend.
+      __ li(ip, Operand(0xFF));
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vsplth(kScratchSimd128Reg, kScratchSimd128Reg, Operand(3));
+      __ vand(dst, kScratchSimd128Reg, dst);
+      break;
+    }
+    case kPPC_S128Load16x4S: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsdx)
+      __ vupkhsh(dst, kScratchSimd128Reg);
+      break;
+    }
+    case kPPC_S128Load16x4U: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsdx)
+      __ vupkhsh(dst, kScratchSimd128Reg);
+      // Zero extend.
+      __ mov(ip, Operand(0xFFFF));
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vspltw(kScratchSimd128Reg, kScratchSimd128Reg, Operand(1));
+      __ vand(dst, kScratchSimd128Reg, dst);
+
+      break;
+    }
+    case kPPC_S128Load32x2S: {
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsdx)
+      __ vupkhsw(dst, kScratchSimd128Reg);
+      break;
+    }
+    case kPPC_S128Load32x2U: {
+      constexpr int lane_width_in_bytes = 8;
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsdx)
+      __ vupkhsw(dst, kScratchSimd128Reg);
+      // Zero extend.
+      __ mov(ip, Operand(0xFFFFFFFF));
+      __ mtvsrd(kScratchSimd128Reg, ip);
+      __ vinsertd(kScratchSimd128Reg, kScratchSimd128Reg,
+                  Operand(1 * lane_width_in_bytes));
+      __ vand(dst, kScratchSimd128Reg, dst);
+      break;
+    }
+    case kPPC_S128Load32Zero: {
+      constexpr int lane_width_in_bytes = 4;
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsiwzx)
+      __ vxor(dst, dst, dst);
+      __ vinsertw(dst, kScratchSimd128Reg, Operand(3 * lane_width_in_bytes));
+      break;
+    }
+    case kPPC_S128Load64Zero: {
+      constexpr int lane_width_in_bytes = 8;
+      Simd128Register dst = i.OutputSimd128Register();
+      ASSEMBLE_LOAD_TRANSFORM(kScratchSimd128Reg, lxsdx)
+      __ vxor(dst, dst, dst);
+      __ vinsertd(dst, kScratchSimd128Reg, Operand(1 * lane_width_in_bytes));
+      break;
+    }
+#undef ASSEMBLE_LOAD_TRANSFORM
+    case kPPC_S128Load8Lane: {
+      Simd128Register dst = i.OutputSimd128Register();
+      DCHECK_EQ(dst, i.InputSimd128Register(0));
+      AddressingMode mode = kMode_None;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ lxsibzx(kScratchSimd128Reg, operand);
+      __ vinsertb(dst, kScratchSimd128Reg, Operand(15 - i.InputUint8(3)));
+      break;
+    }
+    case kPPC_S128Load16Lane: {
+      Simd128Register dst = i.OutputSimd128Register();
+      DCHECK_EQ(dst, i.InputSimd128Register(0));
+      constexpr int lane_width_in_bytes = 2;
+      AddressingMode mode = kMode_None;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ lxsihzx(kScratchSimd128Reg, operand);
+      __ vinserth(dst, kScratchSimd128Reg,
+                  Operand((7 - i.InputUint8(3)) * lane_width_in_bytes));
+      break;
+    }
+    case kPPC_S128Load32Lane: {
+      Simd128Register dst = i.OutputSimd128Register();
+      DCHECK_EQ(dst, i.InputSimd128Register(0));
+      constexpr int lane_width_in_bytes = 4;
+      AddressingMode mode = kMode_None;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ lxsiwzx(kScratchSimd128Reg, operand);
+      __ vinsertw(dst, kScratchSimd128Reg,
+                  Operand((3 - i.InputUint8(3)) * lane_width_in_bytes));
+      break;
+    }
+    case kPPC_S128Load64Lane: {
+      Simd128Register dst = i.OutputSimd128Register();
+      DCHECK_EQ(dst, i.InputSimd128Register(0));
+      constexpr int lane_width_in_bytes = 8;
+      AddressingMode mode = kMode_None;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ lxsdx(kScratchSimd128Reg, operand);
+      __ vinsertd(dst, kScratchSimd128Reg,
+                  Operand((1 - i.InputUint8(3)) * lane_width_in_bytes));
+      break;
+    }
+    case kPPC_S128Store8Lane: {
+      AddressingMode mode = kMode_None;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ vextractub(kScratchSimd128Reg, i.InputSimd128Register(0),
+                    Operand(15 - i.InputInt8(3)));
+      __ stxsibx(kScratchSimd128Reg, operand);
+      break;
+    }
+    case kPPC_S128Store16Lane: {
+      AddressingMode mode = kMode_None;
+      constexpr int lane_width_in_bytes = 2;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ vextractuh(kScratchSimd128Reg, i.InputSimd128Register(0),
+                    Operand((7 - i.InputUint8(3)) * lane_width_in_bytes));
+      __ stxsihx(kScratchSimd128Reg, operand);
+      break;
+    }
+    case kPPC_S128Store32Lane: {
+      AddressingMode mode = kMode_None;
+      constexpr int lane_width_in_bytes = 4;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ vextractuw(kScratchSimd128Reg, i.InputSimd128Register(0),
+                    Operand((3 - i.InputUint8(3)) * lane_width_in_bytes));
+      __ stxsiwx(kScratchSimd128Reg, operand);
+      break;
+    }
+    case kPPC_S128Store64Lane: {
+      AddressingMode mode = kMode_None;
+      constexpr int lane_width_in_bytes = 8;
+      size_t index = 1;
+      MemOperand operand = i.MemoryOperand(&mode, &index);
+      DCHECK_EQ(mode, kMode_MRR);
+      __ vextractd(kScratchSimd128Reg, i.InputSimd128Register(0),
+                   Operand((1 - i.InputUint8(3)) * lane_width_in_bytes));
+      __ stxsdx(kScratchSimd128Reg, operand);
+      break;
+    }
+#define EXT_ADD_PAIRWISE(mul_even, mul_odd, add)           \
+  __ mul_even(tempFPReg1, src, kScratchSimd128Reg);        \
+  __ mul_odd(kScratchSimd128Reg, src, kScratchSimd128Reg); \
+  __ add(dst, tempFPReg1, kScratchSimd128Reg);
+    case kPPC_I32x4ExtAddPairwiseI16x8S: {
+      Simd128Register src = i.InputSimd128Register(0);
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      __ li(kScratchReg, Operand(1));
+      __ mtvsrd(kScratchSimd128Reg, kScratchReg);
+      __ vsplth(kScratchSimd128Reg, kScratchSimd128Reg, Operand(3));
+      EXT_ADD_PAIRWISE(vmulesh, vmulesh, vadduwm)
+      break;
+    }
+    case kPPC_I32x4ExtAddPairwiseI16x8U: {
+      Simd128Register src = i.InputSimd128Register(0);
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      __ li(kScratchReg, Operand(1));
+      __ mtvsrd(kScratchSimd128Reg, kScratchReg);
+      __ vsplth(kScratchSimd128Reg, kScratchSimd128Reg, Operand(3));
+      EXT_ADD_PAIRWISE(vmuleuh, vmuleuh, vadduwm)
+      break;
+    }
+
+    case kPPC_I16x8ExtAddPairwiseI8x16S: {
+      Simd128Register src = i.InputSimd128Register(0);
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      __ xxspltib(kScratchSimd128Reg, Operand(1));
+      EXT_ADD_PAIRWISE(vmulesb, vmulesb, vadduhm)
+      break;
+    }
+    case kPPC_I16x8ExtAddPairwiseI8x16U: {
+      Simd128Register src = i.InputSimd128Register(0);
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      __ xxspltib(kScratchSimd128Reg, Operand(1));
+      EXT_ADD_PAIRWISE(vmuleub, vmuleub, vadduhm)
+      break;
+    }
+#undef EXT_ADD_PAIRWISE
+    case kPPC_I16x8Q15MulRSatS: {
+      __ vxor(kScratchSimd128Reg, kScratchSimd128Reg, kScratchSimd128Reg);
+      __ vmhraddshs(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                    i.InputSimd128Register(1), kScratchSimd128Reg);
       break;
     }
     case kPPC_StoreCompressTagged: {
@@ -3805,9 +4108,8 @@ void CodeGenerator::AssembleConstructFrame() {
   }
 }
 
-void CodeGenerator::AssembleReturn(InstructionOperand* pop) {
+void CodeGenerator::AssembleReturn(InstructionOperand* additional_pop_count) {
   auto call_descriptor = linkage()->GetIncomingDescriptor();
-  int pop_count = static_cast<int>(call_descriptor->StackParameterCount());
 
   const int returns = frame()->GetReturnSlotCount();
   if (returns != 0) {
@@ -3829,36 +4131,82 @@ void CodeGenerator::AssembleReturn(InstructionOperand* pop) {
   if (double_saves != 0) {
     __ MultiPopDoubles(double_saves);
   }
-  PPCOperandConverter g(this, nullptr);
+
   unwinding_info_writer_.MarkBlockWillExit();
 
+  // We might need r6 for scratch.
+  DCHECK_EQ(0u, call_descriptor->CalleeSavedRegisters() & r6.bit());
+  PPCOperandConverter g(this, nullptr);
+  const int parameter_count =
+      static_cast<int>(call_descriptor->StackParameterCount());
+
+  // {aditional_pop_count} is only greater than zero if {parameter_count = 0}.
+  // Check RawMachineAssembler::PopAndReturn.
+  if (parameter_count != 0) {
+    if (additional_pop_count->IsImmediate()) {
+      DCHECK_EQ(g.ToConstant(additional_pop_count).ToInt32(), 0);
+    } else if (__ emit_debug_code()) {
+      __ cmpi(g.ToRegister(additional_pop_count), Operand(0));
+      __ Assert(eq, AbortReason::kUnexpectedAdditionalPopValue);
+    }
+  }
+
+  Register argc_reg = r6;
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  // Functions with JS linkage have at least one parameter (the receiver).
+  // If {parameter_count} == 0, it means it is a builtin with
+  // kDontAdaptArgumentsSentinel, which takes care of JS arguments popping
+  // itself.
+  const bool drop_jsargs = frame_access_state()->has_frame() &&
+                           call_descriptor->IsJSFunctionCall() &&
+                           parameter_count != 0;
+#else
+  const bool drop_jsargs = false;
+#endif
   if (call_descriptor->IsCFunctionCall()) {
     AssembleDeconstructFrame();
   } else if (frame_access_state()->has_frame()) {
     // Canonicalize JSFunction return sites for now unless they have an variable
     // number of stack slot pops
-    if (pop->IsImmediate() && g.ToConstant(pop).ToInt32() == 0) {
+    if (additional_pop_count->IsImmediate() &&
+        g.ToConstant(additional_pop_count).ToInt32() == 0) {
       if (return_label_.is_bound()) {
         __ b(&return_label_);
         return;
       } else {
         __ bind(&return_label_);
-        AssembleDeconstructFrame();
       }
-    } else {
-      AssembleDeconstructFrame();
     }
+    if (drop_jsargs) {
+      // Get the actual argument count.
+      __ LoadP(argc_reg, MemOperand(fp, StandardFrameConstants::kArgCOffset));
+    }
+    AssembleDeconstructFrame();
   }
   // Constant pool is unavailable since the frame has been destructed
   ConstantPoolUnavailableScope constant_pool_unavailable(tasm());
-  if (pop->IsImmediate()) {
-    DCHECK(Constant::kInt32 == g.ToConstant(pop).type() ||
-           Constant::kInt64 == g.ToConstant(pop).type());
-    pop_count += g.ToConstant(pop).ToInt32();
+  if (drop_jsargs) {
+    // We must pop all arguments from the stack (including the receiver). This
+    // number of arguments is given by max(1 + argc_reg, parameter_count).
+    __ addi(argc_reg, argc_reg, Operand(1));  // Also pop the receiver.
+    if (parameter_count > 1) {
+      Label skip;
+      __ cmpi(argc_reg, Operand(parameter_count));
+      __ bgt(&skip);
+      __ mov(argc_reg, Operand(parameter_count));
+      __ bind(&skip);
+    }
+    __ Drop(argc_reg);
+  } else if (additional_pop_count->IsImmediate()) {
+    int additional_count = g.ToConstant(additional_pop_count).ToInt32();
+    __ Drop(parameter_count + additional_count);
+  } else if (parameter_count == 0) {
+    __ Drop(g.ToRegister(additional_pop_count));
   } else {
-    __ Drop(g.ToRegister(pop));
+    // {additional_pop_count} is guaranteed to be zero if {parameter_count !=
+    // 0}. Check RawMachineAssembler::PopAndReturn.
+    __ Drop(parameter_count);
   }
-  __ Drop(pop_count);
   __ Ret();
 }
 
@@ -4007,7 +4355,7 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         MemOperand dst = g.ToMemOperand(destination);
         __ mov(ip, Operand(dst.offset()));
         __ StoreSimd128(g.ToSimd128Register(source), MemOperand(dst.ra(), ip),
-                        r0, kScratchDoubleReg);
+                        r0, kScratchSimd128Reg);
       }
     } else {
       DoubleRegister src = g.ToDoubleRegister(source);
@@ -4038,7 +4386,7 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         MemOperand src = g.ToMemOperand(source);
         __ mov(ip, Operand(src.offset()));
         __ LoadSimd128(g.ToSimd128Register(destination),
-                       MemOperand(src.ra(), ip), r0, kScratchDoubleReg);
+                       MemOperand(src.ra(), ip), r0, kScratchSimd128Reg);
       }
     } else {
       LocationOperand* op = LocationOperand::cast(source);
@@ -4051,17 +4399,17 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         __ StoreSingle(temp, g.ToMemOperand(destination), r0);
       } else {
         DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
-        // push d0, to be used as scratch
+        // push v0, to be used as scratch
         __ addi(sp, sp, Operand(-kSimd128Size));
-        __ StoreSimd128(d0, MemOperand(r0, sp), r0, kScratchDoubleReg);
+        __ StoreSimd128(v0, MemOperand(r0, sp), r0, kScratchSimd128Reg);
         MemOperand src = g.ToMemOperand(source);
         MemOperand dst = g.ToMemOperand(destination);
         __ mov(ip, Operand(src.offset()));
-        __ LoadSimd128(d0, MemOperand(src.ra(), ip), r0, kScratchDoubleReg);
+        __ LoadSimd128(v0, MemOperand(src.ra(), ip), r0, kScratchSimd128Reg);
         __ mov(ip, Operand(dst.offset()));
-        __ StoreSimd128(d0, MemOperand(dst.ra(), ip), r0, kScratchDoubleReg);
-        // restore d0
-        __ LoadSimd128(d0, MemOperand(r0, sp), ip, kScratchDoubleReg);
+        __ StoreSimd128(v0, MemOperand(dst.ra(), ip), r0, kScratchSimd128Reg);
+        // restore v0
+        __ LoadSimd128(v0, MemOperand(r0, sp), ip, kScratchSimd128Reg);
         __ addi(sp, sp, Operand(kSimd128Size));
       }
     }
@@ -4121,15 +4469,15 @@ void CodeGenerator::AssembleSwap(InstructionOperand* source,
   } else if (source->IsSimd128Register()) {
     Simd128Register src = g.ToSimd128Register(source);
     if (destination->IsSimd128Register()) {
-      __ SwapSimd128(src, g.ToSimd128Register(destination), kScratchDoubleReg);
+      __ SwapSimd128(src, g.ToSimd128Register(destination), kScratchSimd128Reg);
     } else {
       DCHECK(destination->IsSimd128StackSlot());
-      __ SwapSimd128(src, g.ToMemOperand(destination), kScratchDoubleReg);
+      __ SwapSimd128(src, g.ToMemOperand(destination), kScratchSimd128Reg);
     }
   } else if (source->IsSimd128StackSlot()) {
     DCHECK(destination->IsSimd128StackSlot());
     __ SwapSimd128(g.ToMemOperand(source), g.ToMemOperand(destination),
-                   kScratchDoubleReg);
+                   kScratchSimd128Reg);
 
   } else {
     UNREACHABLE();
diff --git a/deps/v8/src/compiler/backend/ppc/instruction-codes-ppc.h b/deps/v8/src/compiler/backend/ppc/instruction-codes-ppc.h
index a4cda21d485a59..b0aa6529c7a674 100644
--- a/deps/v8/src/compiler/backend/ppc/instruction-codes-ppc.h
+++ b/deps/v8/src/compiler/backend/ppc/instruction-codes-ppc.h
@@ -214,6 +214,8 @@ namespace compiler {
   V(PPC_F64x2Floor)                  \
   V(PPC_F64x2Trunc)                  \
   V(PPC_F64x2NearestInt)             \
+  V(PPC_F64x2Pmin)                   \
+  V(PPC_F64x2Pmax)                   \
   V(PPC_F32x4Splat)                  \
   V(PPC_F32x4ExtractLane)            \
   V(PPC_F32x4ReplaceLane)            \
@@ -239,6 +241,8 @@ namespace compiler {
   V(PPC_F32x4Floor)                  \
   V(PPC_F32x4Trunc)                  \
   V(PPC_F32x4NearestInt)             \
+  V(PPC_F32x4Pmin)                   \
+  V(PPC_F32x4Pmax)                   \
   V(PPC_I64x2Splat)                  \
   V(PPC_I64x2ExtractLane)            \
   V(PPC_I64x2ReplaceLane)            \
@@ -259,6 +263,7 @@ namespace compiler {
   V(PPC_I64x2ShrS)                   \
   V(PPC_I64x2ShrU)                   \
   V(PPC_I64x2Neg)                    \
+  V(PPC_I64x2BitMask)                \
   V(PPC_I32x4Splat)                  \
   V(PPC_I32x4ExtractLane)            \
   V(PPC_I32x4ReplaceLane)            \
@@ -289,6 +294,8 @@ namespace compiler {
   V(PPC_I32x4UConvertI16x8High)      \
   V(PPC_I32x4BitMask)                \
   V(PPC_I32x4DotI16x8S)              \
+  V(PPC_I32x4ExtAddPairwiseI16x8S)   \
+  V(PPC_I32x4ExtAddPairwiseI16x8U)   \
   V(PPC_F32x4Qfma)                   \
   V(PPC_F32x4Qfms)                   \
   V(PPC_I16x8Splat)                  \
@@ -326,6 +333,9 @@ namespace compiler {
   V(PPC_I16x8SubSatU)                \
   V(PPC_I16x8RoundingAverageU)       \
   V(PPC_I16x8BitMask)                \
+  V(PPC_I16x8ExtAddPairwiseI8x16S)   \
+  V(PPC_I16x8ExtAddPairwiseI8x16U)   \
+  V(PPC_I16x8Q15MulRSatS)            \
   V(PPC_I8x16Splat)                  \
   V(PPC_I8x16ExtractLaneU)           \
   V(PPC_I8x16ExtractLaneS)           \
@@ -369,10 +379,32 @@ namespace compiler {
   V(PPC_S128And)                     \
   V(PPC_S128Or)                      \
   V(PPC_S128Xor)                     \
+  V(PPC_S128Const)                   \
   V(PPC_S128Zero)                    \
+  V(PPC_S128AllOnes)                 \
   V(PPC_S128Not)                     \
   V(PPC_S128Select)                  \
   V(PPC_S128AndNot)                  \
+  V(PPC_S128Load8Splat)              \
+  V(PPC_S128Load16Splat)             \
+  V(PPC_S128Load32Splat)             \
+  V(PPC_S128Load64Splat)             \
+  V(PPC_S128Load8x8S)                \
+  V(PPC_S128Load8x8U)                \
+  V(PPC_S128Load16x4S)               \
+  V(PPC_S128Load16x4U)               \
+  V(PPC_S128Load32x2S)               \
+  V(PPC_S128Load32x2U)               \
+  V(PPC_S128Load32Zero)              \
+  V(PPC_S128Load64Zero)              \
+  V(PPC_S128Load8Lane)               \
+  V(PPC_S128Load16Lane)              \
+  V(PPC_S128Load32Lane)              \
+  V(PPC_S128Load64Lane)              \
+  V(PPC_S128Store8Lane)              \
+  V(PPC_S128Store16Lane)             \
+  V(PPC_S128Store32Lane)             \
+  V(PPC_S128Store64Lane)             \
   V(PPC_StoreCompressTagged)         \
   V(PPC_LoadDecompressTaggedSigned)  \
   V(PPC_LoadDecompressTaggedPointer) \
diff --git a/deps/v8/src/compiler/backend/ppc/instruction-scheduler-ppc.cc b/deps/v8/src/compiler/backend/ppc/instruction-scheduler-ppc.cc
index 87ea3f321946f6..a737d23e9a794a 100644
--- a/deps/v8/src/compiler/backend/ppc/instruction-scheduler-ppc.cc
+++ b/deps/v8/src/compiler/backend/ppc/instruction-scheduler-ppc.cc
@@ -137,6 +137,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_F64x2Floor:
     case kPPC_F64x2Trunc:
     case kPPC_F64x2NearestInt:
+    case kPPC_F64x2Pmin:
+    case kPPC_F64x2Pmax:
     case kPPC_F32x4Splat:
     case kPPC_F32x4ExtractLane:
     case kPPC_F32x4ReplaceLane:
@@ -164,6 +166,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_F32x4Floor:
     case kPPC_F32x4Trunc:
     case kPPC_F32x4NearestInt:
+    case kPPC_F32x4Pmin:
+    case kPPC_F32x4Pmax:
     case kPPC_I64x2Splat:
     case kPPC_I64x2ExtractLane:
     case kPPC_I64x2ReplaceLane:
@@ -184,6 +188,7 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_I64x2ShrS:
     case kPPC_I64x2ShrU:
     case kPPC_I64x2Neg:
+    case kPPC_I64x2BitMask:
     case kPPC_I32x4Splat:
     case kPPC_I32x4ExtractLane:
     case kPPC_I32x4ReplaceLane:
@@ -214,6 +219,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_I32x4UConvertI16x8High:
     case kPPC_I32x4BitMask:
     case kPPC_I32x4DotI16x8S:
+    case kPPC_I32x4ExtAddPairwiseI16x8S:
+    case kPPC_I32x4ExtAddPairwiseI16x8U:
     case kPPC_I16x8Splat:
     case kPPC_I16x8ExtractLaneU:
     case kPPC_I16x8ExtractLaneS:
@@ -249,6 +256,9 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_I16x8SubSatU:
     case kPPC_I16x8RoundingAverageU:
     case kPPC_I16x8BitMask:
+    case kPPC_I16x8ExtAddPairwiseI8x16S:
+    case kPPC_I16x8ExtAddPairwiseI8x16U:
+    case kPPC_I16x8Q15MulRSatS:
     case kPPC_I8x16Splat:
     case kPPC_I8x16ExtractLaneU:
     case kPPC_I8x16ExtractLaneS:
@@ -292,7 +302,9 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_S128And:
     case kPPC_S128Or:
     case kPPC_S128Xor:
+    case kPPC_S128Const:
     case kPPC_S128Zero:
+    case kPPC_S128AllOnes:
     case kPPC_S128Not:
     case kPPC_S128Select:
     case kPPC_S128AndNot:
@@ -316,6 +328,22 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_LoadDecompressTaggedSigned:
     case kPPC_LoadDecompressTaggedPointer:
     case kPPC_LoadDecompressAnyTagged:
+    case kPPC_S128Load8Splat:
+    case kPPC_S128Load16Splat:
+    case kPPC_S128Load32Splat:
+    case kPPC_S128Load64Splat:
+    case kPPC_S128Load8x8S:
+    case kPPC_S128Load8x8U:
+    case kPPC_S128Load16x4S:
+    case kPPC_S128Load16x4U:
+    case kPPC_S128Load32x2S:
+    case kPPC_S128Load32x2U:
+    case kPPC_S128Load32Zero:
+    case kPPC_S128Load64Zero:
+    case kPPC_S128Load8Lane:
+    case kPPC_S128Load16Lane:
+    case kPPC_S128Load32Lane:
+    case kPPC_S128Load64Lane:
       return kIsLoadOperation;
 
     case kPPC_StoreWord8:
@@ -330,6 +358,10 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kPPC_PushFrame:
     case kPPC_StoreToStackSlot:
     case kPPC_Sync:
+    case kPPC_S128Store8Lane:
+    case kPPC_S128Store16Lane:
+    case kPPC_S128Store32Lane:
+    case kPPC_S128Store64Lane:
       return kHasSideEffect;
 
     case kPPC_AtomicStoreUint8:
diff --git a/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc b/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc
index 9c66d6f7331de8..3d4697b380e7ef 100644
--- a/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc
+++ b/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc
@@ -283,8 +283,7 @@ void InstructionSelector::VisitStore(Node* node) {
     write_barrier_kind = kFullWriteBarrier;
   }
 
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedOrCompressedPointer(rep));
     AddressingMode addressing_mode;
     InstructionOperand inputs[3];
@@ -2211,6 +2210,7 @@ void InstructionSelector::VisitInt64AbsWithOverflow(Node* node) {
   V(I16x8AddSatU)          \
   V(I16x8SubSatU)          \
   V(I16x8RoundingAverageU) \
+  V(I16x8Q15MulRSatS)      \
   V(I8x16Add)              \
   V(I8x16Sub)              \
   V(I8x16Mul)              \
@@ -2388,7 +2388,20 @@ SIMD_BOOL_LIST(SIMD_VISIT_BOOL)
 SIMD_VISIT_BITMASK(I8x16BitMask)
 SIMD_VISIT_BITMASK(I16x8BitMask)
 SIMD_VISIT_BITMASK(I32x4BitMask)
+SIMD_VISIT_BITMASK(I64x2BitMask)
 #undef SIMD_VISIT_BITMASK
+
+#define SIMD_VISIT_PMIN_MAX(Type)                                           \
+  void InstructionSelector::Visit##Type(Node* node) {                       \
+    PPCOperandGenerator g(this);                                            \
+    Emit(kPPC_##Type, g.DefineAsRegister(node),                             \
+         g.UseRegister(node->InputAt(0)), g.UseRegister(node->InputAt(1))); \
+  }
+SIMD_VISIT_PMIN_MAX(F64x2Pmin)
+SIMD_VISIT_PMIN_MAX(F32x4Pmin)
+SIMD_VISIT_PMIN_MAX(F64x2Pmax)
+SIMD_VISIT_PMIN_MAX(F32x4Pmax)
+#undef SIMD_VISIT_PMIN_MAX
 #undef SIMD_TYPES
 
 void InstructionSelector::VisitI8x16Shuffle(Node* node) {
@@ -2428,14 +2441,67 @@ void InstructionSelector::VisitS128Select(Node* node) {
        g.UseRegister(node->InputAt(2)));
 }
 
-void InstructionSelector::VisitS128Const(Node* node) { UNIMPLEMENTED(); }
+void InstructionSelector::VisitS128Const(Node* node) {
+  PPCOperandGenerator g(this);
+  uint32_t val[kSimd128Size / sizeof(uint32_t)];
+  base::Memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  // If all bytes are zeros, avoid emitting code for generic constants.
+  bool all_zeros = !(val[0] || val[1] || val[2] || val[3]);
+  bool all_ones = val[0] == UINT32_MAX && val[1] == UINT32_MAX &&
+                  val[2] == UINT32_MAX && val[3] == UINT32_MAX;
+  InstructionOperand dst = g.DefineAsRegister(node);
+  if (all_zeros) {
+    Emit(kPPC_S128Zero, dst);
+  } else if (all_ones) {
+    Emit(kPPC_S128AllOnes, dst);
+  } else {
+    Emit(kPPC_S128Const, dst, g.UseImmediate(val[0]), g.UseImmediate(val[1]),
+         g.UseImmediate(val[2]), g.UseImmediate(val[3]));
+  }
+}
+
+void InstructionSelector::VisitI64x2ExtMulLowI32x4S(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI64x2ExtMulHighI32x4S(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI64x2ExtMulLowI32x4U(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI64x2ExtMulHighI32x4U(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI32x4ExtMulLowI16x8S(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI32x4ExtMulHighI16x8S(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI32x4ExtMulLowI16x8U(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI32x4ExtMulHighI16x8U(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI16x8ExtMulLowI8x16S(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI16x8ExtMulHighI8x16S(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI16x8ExtMulLowI8x16U(Node* node) {
+  UNIMPLEMENTED();
+}
+void InstructionSelector::VisitI16x8ExtMulHighI8x16U(Node* node) {
+  UNIMPLEMENTED();
+}
 
 void InstructionSelector::EmitPrepareResults(
     ZoneVector<PushParameter>* results, const CallDescriptor* call_descriptor,
     Node* node) {
   PPCOperandGenerator g(this);
 
-  int reverse_slot = 1;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -2448,22 +2514,64 @@ void InstructionSelector::EmitPrepareResults(
       } else if (output.location.GetType() == MachineType::Simd128()) {
         MarkAsSimd128(output.node);
       }
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       Emit(kPPC_Peek, g.DefineAsRegister(output.node),
            g.UseImmediate(reverse_slot));
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
-void InstructionSelector::VisitLoadTransform(Node* node) { UNIMPLEMENTED(); }
-
-void InstructionSelector::VisitF32x4Pmin(Node* node) { UNIMPLEMENTED(); }
-
-void InstructionSelector::VisitF32x4Pmax(Node* node) { UNIMPLEMENTED(); }
-
-void InstructionSelector::VisitF64x2Pmin(Node* node) { UNIMPLEMENTED(); }
+void InstructionSelector::VisitLoadTransform(Node* node) {
+  LoadTransformParameters params = LoadTransformParametersOf(node->op());
+  PPCOperandGenerator g(this);
+  Node* base = node->InputAt(0);
+  Node* index = node->InputAt(1);
 
-void InstructionSelector::VisitF64x2Pmax(Node* node) { UNIMPLEMENTED(); }
+  ArchOpcode opcode;
+  switch (params.transformation) {
+    case LoadTransformation::kS128Load8Splat:
+      opcode = kPPC_S128Load8Splat;
+      break;
+    case LoadTransformation::kS128Load16Splat:
+      opcode = kPPC_S128Load16Splat;
+      break;
+    case LoadTransformation::kS128Load32Splat:
+      opcode = kPPC_S128Load32Splat;
+      break;
+    case LoadTransformation::kS128Load64Splat:
+      opcode = kPPC_S128Load64Splat;
+      break;
+    case LoadTransformation::kS128Load8x8S:
+      opcode = kPPC_S128Load8x8S;
+      break;
+    case LoadTransformation::kS128Load8x8U:
+      opcode = kPPC_S128Load8x8U;
+      break;
+    case LoadTransformation::kS128Load16x4S:
+      opcode = kPPC_S128Load16x4S;
+      break;
+    case LoadTransformation::kS128Load16x4U:
+      opcode = kPPC_S128Load16x4U;
+      break;
+    case LoadTransformation::kS128Load32x2S:
+      opcode = kPPC_S128Load32x2S;
+      break;
+    case LoadTransformation::kS128Load32x2U:
+      opcode = kPPC_S128Load32x2U;
+      break;
+    case LoadTransformation::kS128Load32Zero:
+      opcode = kPPC_S128Load32Zero;
+      break;
+    case LoadTransformation::kS128Load64Zero:
+      opcode = kPPC_S128Load64Zero;
+      break;
+    default:
+      UNREACHABLE();
+  }
+  Emit(opcode | AddressingModeField::encode(kMode_MRR),
+       g.DefineAsRegister(node), g.UseRegister(base), g.UseRegister(index));
+}
 
 // static
 MachineOperatorBuilder::Flags
diff --git a/deps/v8/src/compiler/backend/register-allocator.cc b/deps/v8/src/compiler/backend/register-allocator.cc
index c0905b945f03cc..8280665c90bd6f 100644
--- a/deps/v8/src/compiler/backend/register-allocator.cc
+++ b/deps/v8/src/compiler/backend/register-allocator.cc
@@ -2600,7 +2600,12 @@ void BundleBuilder::BuildBundles() {
         LiveRangeBundle* input_bundle = input_range->get_bundle();
         if (input_bundle != nullptr) {
           TRACE("Merge\n");
-          if (out->TryMerge(input_bundle, data()->is_trace_alloc())) {
+          LiveRangeBundle* merged = LiveRangeBundle::TryMerge(
+              out, input_bundle, data()->is_trace_alloc());
+          if (merged != nullptr) {
+            DCHECK_EQ(out_range->get_bundle(), merged);
+            DCHECK_EQ(input_range->get_bundle(), merged);
+            out = merged;
             TRACE("Merged %d and %d to %d\n", phi->virtual_register(), input,
                   out->id());
           } else if (input_range->Start() > out_range->Start()) {
@@ -2641,13 +2646,16 @@ bool LiveRangeBundle::TryAddRange(LiveRange* range) {
   InsertUses(range->first_interval());
   return true;
 }
-bool LiveRangeBundle::TryMerge(LiveRangeBundle* other, bool trace_alloc) {
-  if (other == this) return true;
 
-  auto iter1 = uses_.begin();
-  auto iter2 = other->uses_.begin();
+LiveRangeBundle* LiveRangeBundle::TryMerge(LiveRangeBundle* lhs,
+                                           LiveRangeBundle* rhs,
+                                           bool trace_alloc) {
+  if (rhs == lhs) return nullptr;
 
-  while (iter1 != uses_.end() && iter2 != other->uses_.end()) {
+  auto iter1 = lhs->uses_.begin();
+  auto iter2 = rhs->uses_.begin();
+
+  while (iter1 != lhs->uses_.end() && iter2 != rhs->uses_.end()) {
     if (iter1->start >= iter2->end) {
       ++iter2;
     } else if (iter2->start >= iter1->end) {
@@ -2655,21 +2663,25 @@ bool LiveRangeBundle::TryMerge(LiveRangeBundle* other, bool trace_alloc) {
     } else {
       TRACE_COND(trace_alloc, "No merge %d:%d %d:%d\n", iter1->start,
                  iter1->end, iter2->start, iter2->end);
-      return false;
+      return nullptr;
     }
   }
   // Uses are disjoint, merging is possible.
-  for (auto it = other->ranges_.begin(); it != other->ranges_.end(); ++it) {
-    (*it)->set_bundle(this);
-    InsertUses((*it)->first_interval());
+  if (lhs->uses_.size() < rhs->uses_.size()) {
+    // Merge the smallest bundle into the biggest.
+    std::swap(lhs, rhs);
   }
-  ranges_.insert(other->ranges_.begin(), other->ranges_.end());
-  other->ranges_.clear();
-
-  return true;
+  for (auto it = rhs->ranges_.begin(); it != rhs->ranges_.end(); ++it) {
+    (*it)->set_bundle(lhs);
+    lhs->InsertUses((*it)->first_interval());
+  }
+  lhs->ranges_.insert(rhs->ranges_.begin(), rhs->ranges_.end());
+  rhs->ranges_.clear();
+  return lhs;
 }
 
-void LiveRangeBundle::MergeSpillRanges() {
+void LiveRangeBundle::MergeSpillRangesAndClear() {
+  DCHECK_IMPLIES(ranges_.empty(), uses_.empty());
   SpillRange* target = nullptr;
   for (auto range : ranges_) {
     if (range->TopLevel()->HasSpillRange()) {
@@ -2681,6 +2693,11 @@ void LiveRangeBundle::MergeSpillRanges() {
       }
     }
   }
+  // Clear the fields so that we don't try to merge the spill ranges again when
+  // we hit the same bundle from a different LiveRange in AssignSpillSlots.
+  // LiveRangeBundles are not used after this.
+  ranges_.clear();
+  uses_.clear();
 }
 
 RegisterAllocator::RegisterAllocator(TopTierRegisterAllocationData* data,
@@ -4481,7 +4498,7 @@ void OperandAssigner::AssignSpillSlots() {
   for (auto range : data()->live_ranges()) {
     data()->tick_counter()->TickAndMaybeEnterSafepoint();
     if (range != nullptr && range->get_bundle() != nullptr) {
-      range->get_bundle()->MergeSpillRanges();
+      range->get_bundle()->MergeSpillRangesAndClear();
     }
   }
   ZoneVector<SpillRange*>& spill_ranges = data()->spill_ranges();
diff --git a/deps/v8/src/compiler/backend/register-allocator.h b/deps/v8/src/compiler/backend/register-allocator.h
index 858fac8a4eebb9..e2b4d6217fee7f 100644
--- a/deps/v8/src/compiler/backend/register-allocator.h
+++ b/deps/v8/src/compiler/backend/register-allocator.h
@@ -727,7 +727,7 @@ struct LiveRangeOrdering {
 };
 class LiveRangeBundle : public ZoneObject {
  public:
-  void MergeSpillRanges();
+  void MergeSpillRangesAndClear();
 
   int id() { return id_; }
 
@@ -782,7 +782,11 @@ class LiveRangeBundle : public ZoneObject {
       : ranges_(zone), uses_(zone), id_(id) {}
 
   bool TryAddRange(LiveRange* range);
-  bool TryMerge(LiveRangeBundle* other, bool trace_alloc);
+
+  // If merging is possible, merge either {lhs} into {rhs} or {rhs} into
+  // {lhs}, clear the source and return the result. Otherwise return nullptr.
+  static LiveRangeBundle* TryMerge(LiveRangeBundle* lhs, LiveRangeBundle* rhs,
+                                   bool trace_alloc);
 
   ZoneSet<LiveRange*, LiveRangeOrdering> ranges_;
   ZoneSet<Range, RangeOrdering> uses_;
diff --git a/deps/v8/src/compiler/backend/s390/code-generator-s390.cc b/deps/v8/src/compiler/backend/s390/code-generator-s390.cc
index 4b51bb74b7154c..9750b0d5382c3e 100644
--- a/deps/v8/src/compiler/backend/s390/code-generator-s390.cc
+++ b/deps/v8/src/compiler/backend/s390/code-generator-s390.cc
@@ -210,10 +210,10 @@ class OutOfLineRecordWrite final : public OutOfLineCode {
                      MemoryChunk::kPointersToHereAreInterestingMask, eq,
                      exit());
     if (offset_ == no_reg) {
-      __ AddP(scratch1_, object_, Operand(offset_immediate_));
+      __ AddS64(scratch1_, object_, Operand(offset_immediate_));
     } else {
       DCHECK_EQ(0, offset_immediate_);
-      __ AddP(scratch1_, object_, offset_);
+      __ AddS64(scratch1_, object_, offset_);
     }
     RememberedSetAction const remembered_set_action =
         mode_ > RecordWriteMode::kValueIsMap ? EMIT_REMEMBERED_SET
@@ -290,7 +290,7 @@ Condition FlagsConditionToCondition(FlagsCondition condition, ArchOpcode op) {
     case kSignedGreaterThan:
       return gt;
     case kOverflow:
-      // Overflow checked for AddP/SubP only.
+      // Overflow checked for AddS64/SubS64 only.
       switch (op) {
         case kS390_Add32:
         case kS390_Add64:
@@ -485,7 +485,7 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
   ([&](int index) {                                                   \
     DCHECK(HasImmediateInput(instr, (index)));                        \
     int doZeroExt = i.InputInt32(index);                              \
-    if (doZeroExt) __ LoadlW(i.OutputRegister(), i.OutputRegister()); \
+    if (doZeroExt) __ LoadU32(i.OutputRegister(), i.OutputRegister()); \
   })(num)
 
 #define ASSEMBLE_BIN32_OP(_rr, _rm, _ri) \
@@ -602,10 +602,10 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
 // Copy remainder to output reg
 #define ASSEMBLE_MODULO(div_instr, shift_instr) \
   do {                                          \
-    __ LoadRR(r0, i.InputRegister(0));          \
+    __ mov(r0, i.InputRegister(0));             \
     __ shift_instr(r0, Operand(32));            \
     __ div_instr(r0, i.InputRegister(1));       \
-    __ LoadlW(i.OutputRegister(), r0);          \
+    __ LoadU32(i.OutputRegister(), r0);         \
   } while (0)
 
 #define ASSEMBLE_FLOAT_MODULO()                                             \
@@ -643,185 +643,6 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
     __ MovFromFloatResult(i.OutputDoubleRegister());                           \
   } while (0)
 
-#define ASSEMBLE_DOUBLE_MAX()                                           \
-  do {                                                                  \
-    DoubleRegister left_reg = i.InputDoubleRegister(0);                 \
-    DoubleRegister right_reg = i.InputDoubleRegister(1);                \
-    DoubleRegister result_reg = i.OutputDoubleRegister();               \
-    Label check_zero, return_left, return_right, return_nan, done;      \
-    __ cdbr(left_reg, right_reg);                                       \
-    __ bunordered(&return_nan, Label::kNear);                           \
-    __ beq(&check_zero);                                                \
-    __ bge(&return_left, Label::kNear);                                 \
-    __ b(&return_right, Label::kNear);                                  \
-                                                                        \
-    __ bind(&check_zero);                                               \
-    __ lzdr(kDoubleRegZero);                                            \
-    __ cdbr(left_reg, kDoubleRegZero);                                  \
-    /* left == right != 0. */                                           \
-    __ bne(&return_left, Label::kNear);                                 \
-    /* At this point, both left and right are either 0 or -0. */        \
-    /* N.B. The following works because +0 + -0 == +0 */                \
-    /* For max we want logical-and of sign bit: (L + R) */              \
-    __ ldr(result_reg, left_reg);                                       \
-    __ adbr(result_reg, right_reg);                                     \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_nan);                                               \
-    /* If left or right are NaN, adbr propagates the appropriate one.*/ \
-    __ adbr(left_reg, right_reg);                                       \
-    __ b(&return_left, Label::kNear);                                   \
-                                                                        \
-    __ bind(&return_right);                                             \
-    if (right_reg != result_reg) {                                      \
-      __ ldr(result_reg, right_reg);                                    \
-    }                                                                   \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_left);                                              \
-    if (left_reg != result_reg) {                                       \
-      __ ldr(result_reg, left_reg);                                     \
-    }                                                                   \
-    __ bind(&done);                                                     \
-  } while (0)
-
-#define ASSEMBLE_DOUBLE_MIN()                                           \
-  do {                                                                  \
-    DoubleRegister left_reg = i.InputDoubleRegister(0);                 \
-    DoubleRegister right_reg = i.InputDoubleRegister(1);                \
-    DoubleRegister result_reg = i.OutputDoubleRegister();               \
-    Label check_zero, return_left, return_right, return_nan, done;      \
-    __ cdbr(left_reg, right_reg);                                       \
-    __ bunordered(&return_nan, Label::kNear);                           \
-    __ beq(&check_zero);                                                \
-    __ ble(&return_left, Label::kNear);                                 \
-    __ b(&return_right, Label::kNear);                                  \
-                                                                        \
-    __ bind(&check_zero);                                               \
-    __ lzdr(kDoubleRegZero);                                            \
-    __ cdbr(left_reg, kDoubleRegZero);                                  \
-    /* left == right != 0. */                                           \
-    __ bne(&return_left, Label::kNear);                                 \
-    /* At this point, both left and right are either 0 or -0. */        \
-    /* N.B. The following works because +0 + -0 == +0 */                \
-    /* For min we want logical-or of sign bit: -(-L + -R) */            \
-    __ lcdbr(left_reg, left_reg);                                       \
-    __ ldr(result_reg, left_reg);                                       \
-    if (left_reg == right_reg) {                                        \
-      __ adbr(result_reg, right_reg);                                   \
-    } else {                                                            \
-      __ sdbr(result_reg, right_reg);                                   \
-    }                                                                   \
-    __ lcdbr(result_reg, result_reg);                                   \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_nan);                                               \
-    /* If left or right are NaN, adbr propagates the appropriate one.*/ \
-    __ adbr(left_reg, right_reg);                                       \
-    __ b(&return_left, Label::kNear);                                   \
-                                                                        \
-    __ bind(&return_right);                                             \
-    if (right_reg != result_reg) {                                      \
-      __ ldr(result_reg, right_reg);                                    \
-    }                                                                   \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_left);                                              \
-    if (left_reg != result_reg) {                                       \
-      __ ldr(result_reg, left_reg);                                     \
-    }                                                                   \
-    __ bind(&done);                                                     \
-  } while (0)
-
-#define ASSEMBLE_FLOAT_MAX()                                            \
-  do {                                                                  \
-    DoubleRegister left_reg = i.InputDoubleRegister(0);                 \
-    DoubleRegister right_reg = i.InputDoubleRegister(1);                \
-    DoubleRegister result_reg = i.OutputDoubleRegister();               \
-    Label check_zero, return_left, return_right, return_nan, done;      \
-    __ cebr(left_reg, right_reg);                                       \
-    __ bunordered(&return_nan, Label::kNear);                           \
-    __ beq(&check_zero);                                                \
-    __ bge(&return_left, Label::kNear);                                 \
-    __ b(&return_right, Label::kNear);                                  \
-                                                                        \
-    __ bind(&check_zero);                                               \
-    __ lzdr(kDoubleRegZero);                                            \
-    __ cebr(left_reg, kDoubleRegZero);                                  \
-    /* left == right != 0. */                                           \
-    __ bne(&return_left, Label::kNear);                                 \
-    /* At this point, both left and right are either 0 or -0. */        \
-    /* N.B. The following works because +0 + -0 == +0 */                \
-    /* For max we want logical-and of sign bit: (L + R) */              \
-    __ ldr(result_reg, left_reg);                                       \
-    __ aebr(result_reg, right_reg);                                     \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_nan);                                               \
-    /* If left or right are NaN, aebr propagates the appropriate one.*/ \
-    __ aebr(left_reg, right_reg);                                       \
-    __ b(&return_left, Label::kNear);                                   \
-                                                                        \
-    __ bind(&return_right);                                             \
-    if (right_reg != result_reg) {                                      \
-      __ ldr(result_reg, right_reg);                                    \
-    }                                                                   \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_left);                                              \
-    if (left_reg != result_reg) {                                       \
-      __ ldr(result_reg, left_reg);                                     \
-    }                                                                   \
-    __ bind(&done);                                                     \
-  } while (0)
-
-#define ASSEMBLE_FLOAT_MIN()                                            \
-  do {                                                                  \
-    DoubleRegister left_reg = i.InputDoubleRegister(0);                 \
-    DoubleRegister right_reg = i.InputDoubleRegister(1);                \
-    DoubleRegister result_reg = i.OutputDoubleRegister();               \
-    Label check_zero, return_left, return_right, return_nan, done;      \
-    __ cebr(left_reg, right_reg);                                       \
-    __ bunordered(&return_nan, Label::kNear);                           \
-    __ beq(&check_zero);                                                \
-    __ ble(&return_left, Label::kNear);                                 \
-    __ b(&return_right, Label::kNear);                                  \
-                                                                        \
-    __ bind(&check_zero);                                               \
-    __ lzdr(kDoubleRegZero);                                            \
-    __ cebr(left_reg, kDoubleRegZero);                                  \
-    /* left == right != 0. */                                           \
-    __ bne(&return_left, Label::kNear);                                 \
-    /* At this point, both left and right are either 0 or -0. */        \
-    /* N.B. The following works because +0 + -0 == +0 */                \
-    /* For min we want logical-or of sign bit: -(-L + -R) */            \
-    __ lcebr(left_reg, left_reg);                                       \
-    __ ldr(result_reg, left_reg);                                       \
-    if (left_reg == right_reg) {                                        \
-      __ aebr(result_reg, right_reg);                                   \
-    } else {                                                            \
-      __ sebr(result_reg, right_reg);                                   \
-    }                                                                   \
-    __ lcebr(result_reg, result_reg);                                   \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_nan);                                               \
-    /* If left or right are NaN, aebr propagates the appropriate one.*/ \
-    __ aebr(left_reg, right_reg);                                       \
-    __ b(&return_left, Label::kNear);                                   \
-                                                                        \
-    __ bind(&return_right);                                             \
-    if (right_reg != result_reg) {                                      \
-      __ ldr(result_reg, right_reg);                                    \
-    }                                                                   \
-    __ b(&done, Label::kNear);                                          \
-                                                                        \
-    __ bind(&return_left);                                              \
-    if (left_reg != result_reg) {                                       \
-      __ ldr(result_reg, left_reg);                                     \
-    }                                                                   \
-    __ bind(&done);                                                     \
-  } while (0)
 //
 // Only MRI mode for these instructions available
 #define ASSEMBLE_LOAD_FLOAT(asm_instr)                \
@@ -878,7 +699,7 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
     AddressingMode mode = kMode_None;                    \
     MemOperand operand = i.MemoryOperand(&mode, &index); \
     DoubleRegister value = i.InputDoubleRegister(index); \
-    __ StoreFloat32(value, operand);                     \
+    __ StoreF32(value, operand);                         \
   } while (0)
 
 #define ASSEMBLE_STORE_DOUBLE()                          \
@@ -887,7 +708,7 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
     AddressingMode mode = kMode_None;                    \
     MemOperand operand = i.MemoryOperand(&mode, &index); \
     DoubleRegister value = i.InputDoubleRegister(index); \
-    __ StoreDouble(value, operand);                      \
+    __ StoreF64(value, operand);                         \
   } while (0)
 
 #define ASSEMBLE_STORE_INTEGER(asm_instr)                \
@@ -901,7 +722,7 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
 
 #define ATOMIC_COMP_EXCHANGE(start, end, shift_amount, offset)              \
   {                                                                         \
-    __ LoadlW(temp0, MemOperand(addr, offset));                             \
+    __ LoadU32(temp0, MemOperand(addr, offset));                             \
     __ llgfr(temp1, temp0);                                                 \
     __ RotateInsertSelectBits(temp0, old_val, Operand(start), Operand(end), \
                               Operand(shift_amount), false);                \
@@ -1021,7 +842,7 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
     MemOperand op = i.MemoryOperand(&mode, &index);   \
     __ lay(addr, op);                                 \
     __ CmpAndSwap(output, new_val, MemOperand(addr)); \
-    __ LoadlW(output, output);                        \
+    __ LoadU32(output, output);                        \
   } while (false)
 
 #define ASSEMBLE_ATOMIC_BINOP_WORD(load_and_op)      \
@@ -1033,7 +854,7 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
     MemOperand op = i.MemoryOperand(&mode);          \
     __ lay(addr, op);                                \
     __ load_and_op(result, value, MemOperand(addr)); \
-    __ LoadlW(result, result);                       \
+    __ LoadU32(result, result);                       \
   } while (false)
 
 #define ASSEMBLE_ATOMIC_BINOP_WORD64(load_and_op)    \
@@ -1050,7 +871,7 @@ static inline int AssembleUnaryOp(Instruction* instr, _R _r, _M _m, _I _i) {
 #define ATOMIC_BIN_OP(bin_inst, offset, shift_amount, start, end)           \
   do {                                                                      \
     Label do_cs;                                                            \
-    __ LoadlW(prev, MemOperand(addr, offset));                              \
+    __ LoadU32(prev, MemOperand(addr, offset));                              \
     __ bind(&do_cs);                                                        \
     __ RotateInsertSelectBits(temp, value, Operand(start), Operand(end),    \
                               Operand(static_cast<intptr_t>(shift_amount)), \
@@ -1191,16 +1012,16 @@ void CodeGenerator::AssemblePopArgumentsAdaptorFrame(Register args_reg,
   Label done;
 
   // Check if current frame is an arguments adaptor frame.
-  __ LoadP(scratch1, MemOperand(fp, StandardFrameConstants::kContextOffset));
-  __ CmpP(scratch1,
-          Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR)));
+  __ LoadU64(scratch1, MemOperand(fp, StandardFrameConstants::kContextOffset));
+  __ CmpS64(scratch1,
+            Operand(StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR)));
   __ bne(&done);
 
   // Load arguments count from current arguments adaptor frame (note, it
   // does not include receiver).
   Register caller_args_count_reg = scratch1;
-  __ LoadP(caller_args_count_reg,
-           MemOperand(fp, ArgumentsAdaptorFrameConstants::kLengthOffset));
+  __ LoadU64(caller_args_count_reg,
+             MemOperand(fp, ArgumentsAdaptorFrameConstants::kLengthOffset));
   __ SmiUntag(caller_args_count_reg);
 
   __ PrepareForTailCall(args_reg, caller_args_count_reg, scratch2, scratch3);
@@ -1243,13 +1064,13 @@ void AdjustStackPointerForTailCall(
     if (pending_pushes != nullptr) {
       FlushPendingPushRegisters(tasm, state, pending_pushes);
     }
-    tasm->AddP(sp, sp, Operand(-stack_slot_delta * kSystemPointerSize));
+    tasm->AddS64(sp, sp, Operand(-stack_slot_delta * kSystemPointerSize));
     state->IncreaseSPDelta(stack_slot_delta);
   } else if (allow_shrinkage && stack_slot_delta < 0) {
     if (pending_pushes != nullptr) {
       FlushPendingPushRegisters(tasm, state, pending_pushes);
     }
-    tasm->AddP(sp, sp, Operand(-stack_slot_delta * kSystemPointerSize));
+    tasm->AddS64(sp, sp, Operand(-stack_slot_delta * kSystemPointerSize));
     state->IncreaseSPDelta(stack_slot_delta);
   }
 }
@@ -1312,7 +1133,7 @@ void CodeGenerator::AssembleTailCallAfterGap(Instruction* instr,
 void CodeGenerator::AssembleCodeStartRegisterCheck() {
   Register scratch = r1;
   __ ComputeCodeStartAddress(scratch);
-  __ CmpP(scratch, kJavaScriptCallCodeStartRegister);
+  __ CmpS64(scratch, kJavaScriptCallCodeStartRegister);
   __ Assert(eq, AbortReason::kWrongFunctionCodeStart);
 }
 
@@ -1327,14 +1148,14 @@ void CodeGenerator::BailoutIfDeoptimized() {
   if (FLAG_debug_code) {
     // Check that {kJavaScriptCallCodeStartRegister} is correct.
     __ ComputeCodeStartAddress(ip);
-    __ CmpP(ip, kJavaScriptCallCodeStartRegister);
+    __ CmpS64(ip, kJavaScriptCallCodeStartRegister);
     __ Assert(eq, AbortReason::kWrongFunctionCodeStart);
   }
 
   int offset = Code::kCodeDataContainerOffset - Code::kHeaderSize;
   __ LoadTaggedPointerField(
       ip, MemOperand(kJavaScriptCallCodeStartRegister, offset), r0);
-  __ LoadW(ip,
+  __ LoadS32(ip,
            FieldMemOperand(ip, CodeDataContainer::kKindSpecificFlagsOffset));
   __ TestBit(ip, Code::kMarkedForDeoptimizationBit);
   __ Jump(BUILTIN_CODE(isolate(), CompileLazyDeoptimizedCode),
@@ -1348,9 +1169,9 @@ void CodeGenerator::GenerateSpeculationPoisonFromCodeStartRegister() {
 
   // Calculate a mask which has all bits set in the normal case, but has all
   // bits cleared if we are speculatively executing the wrong PC.
-  __ LoadImmP(kSpeculationPoisonRegister, Operand::Zero());
-  __ LoadImmP(r0, Operand(-1));
-  __ CmpP(kJavaScriptCallCodeStartRegister, scratch);
+  __ mov(kSpeculationPoisonRegister, Operand::Zero());
+  __ mov(r0, Operand(-1));
+  __ CmpS64(kJavaScriptCallCodeStartRegister, scratch);
   __ LoadOnConditionP(eq, kSpeculationPoisonRegister, r0);
 }
 
@@ -1472,7 +1293,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         // Check the function's context matches the context argument.
         __ LoadTaggedPointerField(
             kScratchReg, FieldMemOperand(func, JSFunction::kContextOffset));
-        __ CmpP(cp, kScratchReg);
+        __ CmpS64(cp, kScratchReg);
         __ Assert(eq, AbortReason::kWrongFunctionContext);
       }
       static_assert(kJavaScriptCallCodeStartRegister == r4, "ABI mismatch");
@@ -1525,7 +1346,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (linkage()->GetIncomingDescriptor()->IsWasmCapiFunction()) {
         // Put the return address in a stack slot.
         __ larl(r0, &return_location);
-        __ StoreP(r0, MemOperand(fp, WasmExitFrameConstants::kCallingPCOffset));
+        __ StoreU64(r0,
+                    MemOperand(fp, WasmExitFrameConstants::kCallingPCOffset));
       }
       if (instr->InputAt(0)->IsImmediate()) {
         ExternalReference ref = i.InputExternalReference(0);
@@ -1587,7 +1409,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ b(exit->label());
       break;
     }
@@ -1595,13 +1417,13 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       AssembleReturn(instr->InputAt(0));
       break;
     case kArchFramePointer:
-      __ LoadRR(i.OutputRegister(), fp);
+      __ mov(i.OutputRegister(), fp);
       break;
     case kArchParentFramePointer:
       if (frame_access_state()->has_frame()) {
-        __ LoadP(i.OutputRegister(), MemOperand(fp, 0));
+        __ LoadU64(i.OutputRegister(), MemOperand(fp, 0));
       } else {
-        __ LoadRR(i.OutputRegister(), fp);
+        __ mov(i.OutputRegister(), fp);
       }
       break;
     case kArchStackPointerGreaterThan: {
@@ -1614,12 +1436,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
 
       if (ShouldApplyOffsetToStackCheck(instr, &offset)) {
         lhs_register = i.TempRegister(0);
-        __ SubP(lhs_register, sp, Operand(offset));
+        __ SubS64(lhs_register, sp, Operand(offset));
       }
 
       constexpr size_t kValueIndex = 0;
       DCHECK(instr->InputAt(kValueIndex)->IsRegister());
-      __ CmpLogicalP(lhs_register, i.InputRegister(kValueIndex));
+      __ CmpU64(lhs_register, i.InputRegister(kValueIndex));
       break;
     }
     case kArchStackCheckOffset:
@@ -1664,8 +1486,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kArchStackSlot: {
       FrameOffset offset =
           frame_access_state()->GetFrameOffset(i.InputInt32(0));
-      __ AddP(i.OutputRegister(), offset.from_stack_pointer() ? sp : fp,
-              Operand(offset.offset()));
+      __ AddS64(i.OutputRegister(), offset.from_stack_pointer() ? sp : fp,
+                Operand(offset.offset()));
       break;
     }
     case kArchWordPoisonOnSpeculation:
@@ -1679,16 +1501,16 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (instr->OutputAt(0)->IsFPRegister()) {
         LocationOperand* op = LocationOperand::cast(instr->OutputAt(0));
         if (op->representation() == MachineRepresentation::kFloat64) {
-          __ LoadDouble(i.OutputDoubleRegister(), MemOperand(fp, offset));
+          __ LoadF64(i.OutputDoubleRegister(), MemOperand(fp, offset));
         } else if (op->representation() == MachineRepresentation::kFloat32) {
-          __ LoadFloat32(i.OutputFloatRegister(), MemOperand(fp, offset));
+          __ LoadF32(i.OutputFloatRegister(), MemOperand(fp, offset));
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
-          __ LoadSimd128(i.OutputSimd128Register(), MemOperand(fp, offset),
-                         kScratchReg);
+          __ LoadV128(i.OutputSimd128Register(), MemOperand(fp, offset),
+                      kScratchReg);
         }
       } else {
-        __ LoadP(i.OutputRegister(), MemOperand(fp, offset));
+        __ LoadU64(i.OutputRegister(), MemOperand(fp, offset));
       }
       break;
     }
@@ -1747,7 +1569,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_ShiftLeft32:
       // zero-ext
       if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-        ASSEMBLE_BIN32_OP(RRRInstr(ShiftLeft), nullInstr, RRIInstr(ShiftLeft));
+        ASSEMBLE_BIN32_OP(RRRInstr(ShiftLeftU32), nullInstr,
+                          RRIInstr(ShiftLeftU32));
       } else {
         ASSEMBLE_BIN32_OP(RRInstr(sll), nullInstr, RIInstr(sll));
       }
@@ -1777,85 +1600,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_ShiftRightArith64:
       ASSEMBLE_BIN_OP(RRRInstr(srag), nullInstr, RRIInstr(srag));
       break;
-#if !V8_TARGET_ARCH_S390X
-    case kS390_AddPair:
-      // i.InputRegister(0) ... left low word.
-      // i.InputRegister(1) ... left high word.
-      // i.InputRegister(2) ... right low word.
-      // i.InputRegister(3) ... right high word.
-      __ AddLogical32(i.OutputRegister(0), i.InputRegister(0),
-                      i.InputRegister(2));
-      __ AddLogicalWithCarry32(i.OutputRegister(1), i.InputRegister(1),
-                               i.InputRegister(3));
-      break;
-    case kS390_SubPair:
-      // i.InputRegister(0) ... left low word.
-      // i.InputRegister(1) ... left high word.
-      // i.InputRegister(2) ... right low word.
-      // i.InputRegister(3) ... right high word.
-      __ SubLogical32(i.OutputRegister(0), i.InputRegister(0),
-                      i.InputRegister(2));
-      __ SubLogicalWithBorrow32(i.OutputRegister(1), i.InputRegister(1),
-                                i.InputRegister(3));
-      break;
-    case kS390_MulPair:
-      // i.InputRegister(0) ... left low word.
-      // i.InputRegister(1) ... left high word.
-      // i.InputRegister(2) ... right low word.
-      // i.InputRegister(3) ... right high word.
-      __ sllg(r0, i.InputRegister(1), Operand(32));
-      __ sllg(r1, i.InputRegister(3), Operand(32));
-      __ lr(r0, i.InputRegister(0));
-      __ lr(r1, i.InputRegister(2));
-      __ msgr(r1, r0);
-      __ lr(i.OutputRegister(0), r1);
-      __ srag(i.OutputRegister(1), r1, Operand(32));
-      break;
-    case kS390_ShiftLeftPair: {
-      Register second_output =
-          instr->OutputCount() >= 2 ? i.OutputRegister(1) : i.TempRegister(0);
-      if (instr->InputAt(2)->IsImmediate()) {
-        __ ShiftLeftPair(i.OutputRegister(0), second_output, i.InputRegister(0),
-                         i.InputRegister(1), i.InputInt32(2));
-      } else {
-        __ ShiftLeftPair(i.OutputRegister(0), second_output, i.InputRegister(0),
-                         i.InputRegister(1), kScratchReg, i.InputRegister(2));
-      }
-      break;
-    }
-    case kS390_ShiftRightPair: {
-      Register second_output =
-          instr->OutputCount() >= 2 ? i.OutputRegister(1) : i.TempRegister(0);
-      if (instr->InputAt(2)->IsImmediate()) {
-        __ ShiftRightPair(i.OutputRegister(0), second_output,
-                          i.InputRegister(0), i.InputRegister(1),
-                          i.InputInt32(2));
-      } else {
-        __ ShiftRightPair(i.OutputRegister(0), second_output,
-                          i.InputRegister(0), i.InputRegister(1), kScratchReg,
-                          i.InputRegister(2));
-      }
-      break;
-    }
-    case kS390_ShiftRightArithPair: {
-      Register second_output =
-          instr->OutputCount() >= 2 ? i.OutputRegister(1) : i.TempRegister(0);
-      if (instr->InputAt(2)->IsImmediate()) {
-        __ ShiftRightArithPair(i.OutputRegister(0), second_output,
-                               i.InputRegister(0), i.InputRegister(1),
-                               i.InputInt32(2));
-      } else {
-        __ ShiftRightArithPair(i.OutputRegister(0), second_output,
-                               i.InputRegister(0), i.InputRegister(1),
-                               kScratchReg, i.InputRegister(2));
-      }
-      break;
-    }
-#endif
     case kS390_RotRight32: {
       // zero-ext
       if (HasRegisterInput(instr, 1)) {
-        __ LoadComplementRR(kScratchReg, i.InputRegister(1));
+        __ lcgr(kScratchReg, i.InputRegister(1));
         __ rll(i.OutputRegister(), i.InputRegister(0), kScratchReg);
       } else {
         __ rll(i.OutputRegister(), i.InputRegister(0),
@@ -1928,15 +1676,15 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_Add32: {
       // zero-ext
       if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-        ASSEMBLE_BIN32_OP(RRRInstr(ark), RM32Instr(Add32), RRIInstr(Add32));
+        ASSEMBLE_BIN32_OP(RRRInstr(ark), RM32Instr(AddS32), RRIInstr(AddS32));
       } else {
-        ASSEMBLE_BIN32_OP(RRInstr(ar), RM32Instr(Add32), RIInstr(Add32));
+        ASSEMBLE_BIN32_OP(RRInstr(ar), RM32Instr(AddS32), RIInstr(AddS32));
       }
       break;
     }
     case kS390_Add64:
       if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-        ASSEMBLE_BIN_OP(RRRInstr(agrk), RM64Instr(ag), RRIInstr(AddP));
+        ASSEMBLE_BIN_OP(RRRInstr(agrk), RM64Instr(ag), RRIInstr(AddS64));
       } else {
         ASSEMBLE_BIN_OP(RRInstr(agr), RM64Instr(ag), RIInstr(agfi));
       }
@@ -1950,16 +1698,16 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_Sub32:
       // zero-ext
       if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-        ASSEMBLE_BIN32_OP(RRRInstr(srk), RM32Instr(Sub32), RRIInstr(Sub32));
+        ASSEMBLE_BIN32_OP(RRRInstr(srk), RM32Instr(SubS32), RRIInstr(SubS32));
       } else {
-        ASSEMBLE_BIN32_OP(RRInstr(sr), RM32Instr(Sub32), RIInstr(Sub32));
+        ASSEMBLE_BIN32_OP(RRInstr(sr), RM32Instr(SubS32), RIInstr(SubS32));
       }
       break;
     case kS390_Sub64:
       if (CpuFeatures::IsSupported(DISTINCT_OPS)) {
-        ASSEMBLE_BIN_OP(RRRInstr(sgrk), RM64Instr(sg), RRIInstr(SubP));
+        ASSEMBLE_BIN_OP(RRRInstr(sgrk), RM64Instr(sg), RRIInstr(SubS64));
       } else {
-        ASSEMBLE_BIN_OP(RRInstr(sgr), RM64Instr(sg), RIInstr(SubP));
+        ASSEMBLE_BIN_OP(RRInstr(sgr), RM64Instr(sg), RIInstr(SubS64));
       }
       break;
     case kS390_SubFloat:
@@ -1971,9 +1719,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_Mul32:
       // zero-ext
       if (CpuFeatures::IsSupported(MISC_INSTR_EXT2)) {
-        ASSEMBLE_BIN32_OP(RRRInstr(msrkc), RM32Instr(msc), RIInstr(Mul32));
+        ASSEMBLE_BIN32_OP(RRRInstr(msrkc), RM32Instr(msc), RIInstr(MulS32));
       } else {
-        ASSEMBLE_BIN32_OP(RRInstr(Mul32), RM32Instr(Mul32), RIInstr(Mul32));
+        ASSEMBLE_BIN32_OP(RRInstr(MulS32), RM32Instr(MulS32), RIInstr(MulS32));
       }
       break;
     case kS390_Mul32WithOverflow:
@@ -1983,12 +1731,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
                         RRIInstr(Mul32WithOverflowIfCCUnequal));
       break;
     case kS390_Mul64:
-      ASSEMBLE_BIN_OP(RRInstr(Mul64), RM64Instr(Mul64), RIInstr(Mul64));
+      ASSEMBLE_BIN_OP(RRInstr(MulS64), RM64Instr(MulS64), RIInstr(MulS64));
       break;
     case kS390_MulHigh32:
       // zero-ext
-      ASSEMBLE_BIN_OP(RRRInstr(MulHigh32), RRM32Instr(MulHigh32),
-                      RRIInstr(MulHigh32));
+      ASSEMBLE_BIN_OP(RRRInstr(MulHighS32), RRM32Instr(MulHighS32),
+                      RRIInstr(MulHighS32));
       break;
     case kS390_MulHighU32:
       // zero-ext
@@ -2002,11 +1750,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_BIN_OP(DDInstr(mdbr), DMTInstr(MulFloat64), nullInstr);
       break;
     case kS390_Div64:
-      ASSEMBLE_BIN_OP(RRRInstr(Div64), RRM64Instr(Div64), nullInstr);
+      ASSEMBLE_BIN_OP(RRRInstr(DivS64), RRM64Instr(DivS64), nullInstr);
       break;
     case kS390_Div32: {
       // zero-ext
-      ASSEMBLE_BIN_OP(RRRInstr(Div32), RRM32Instr(Div32), nullInstr);
+      ASSEMBLE_BIN_OP(RRRInstr(DivS32), RRM32Instr(DivS32), nullInstr);
       break;
     }
     case kS390_DivU64:
@@ -2025,14 +1773,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kS390_Mod32:
       // zero-ext
-      ASSEMBLE_BIN_OP(RRRInstr(Mod32), RRM32Instr(Mod32), nullInstr);
+      ASSEMBLE_BIN_OP(RRRInstr(ModS32), RRM32Instr(ModS32), nullInstr);
       break;
     case kS390_ModU32:
       // zero-ext
       ASSEMBLE_BIN_OP(RRRInstr(ModU32), RRM32Instr(ModU32), nullInstr);
       break;
     case kS390_Mod64:
-      ASSEMBLE_BIN_OP(RRRInstr(Mod64), RRM64Instr(Mod64), nullInstr);
+      ASSEMBLE_BIN_OP(RRRInstr(ModS64), RRM64Instr(ModS64), nullInstr);
       break;
     case kS390_ModU64:
       ASSEMBLE_BIN_OP(RRRInstr(ModU64), RRM64Instr(ModU64), nullInstr);
@@ -2047,16 +1795,16 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_UNARY_OP(D_DInstr(sqdbr), nullInstr, nullInstr);
       break;
     case kS390_FloorFloat:
-      __ fiebra(v8::internal::Assembler::FIDBRA_ROUND_TOWARD_NEG_INF,
-                i.OutputDoubleRegister(), i.InputDoubleRegister(0));
+      __ fiebra(ROUND_TOWARD_NEG_INF, i.OutputDoubleRegister(),
+                i.InputDoubleRegister(0));
       break;
     case kS390_CeilFloat:
-      __ fiebra(v8::internal::Assembler::FIDBRA_ROUND_TOWARD_POS_INF,
-                i.OutputDoubleRegister(), i.InputDoubleRegister(0));
+      __ fiebra(ROUND_TOWARD_POS_INF, i.OutputDoubleRegister(),
+                i.InputDoubleRegister(0));
       break;
     case kS390_TruncateFloat:
-      __ fiebra(v8::internal::Assembler::FIDBRA_ROUND_TOWARD_0,
-                i.OutputDoubleRegister(), i.InputDoubleRegister(0));
+      __ fiebra(ROUND_TOWARD_0, i.OutputDoubleRegister(),
+                i.InputDoubleRegister(0));
       break;
     //  Double operations
     case kS390_ModDouble:
@@ -2133,35 +1881,39 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ lcgr(i.OutputRegister(), i.InputRegister(0));
       break;
     case kS390_MaxFloat:
-      ASSEMBLE_FLOAT_MAX();
+      __ FloatMax(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
+                  i.InputDoubleRegister(1));
       break;
     case kS390_MaxDouble:
-      ASSEMBLE_DOUBLE_MAX();
+      __ DoubleMax(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
+                   i.InputDoubleRegister(1));
       break;
     case kS390_MinFloat:
-      ASSEMBLE_FLOAT_MIN();
+      __ FloatMin(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
+                  i.InputDoubleRegister(1));
       break;
     case kS390_MinDouble:
-      ASSEMBLE_DOUBLE_MIN();
+      __ DoubleMin(i.OutputDoubleRegister(), i.InputDoubleRegister(0),
+                   i.InputDoubleRegister(1));
       break;
     case kS390_AbsDouble:
       __ lpdbr(i.OutputDoubleRegister(), i.InputDoubleRegister(0));
       break;
     case kS390_FloorDouble:
-      __ fidbra(v8::internal::Assembler::FIDBRA_ROUND_TOWARD_NEG_INF,
-                i.OutputDoubleRegister(), i.InputDoubleRegister(0));
+      __ fidbra(ROUND_TOWARD_NEG_INF, i.OutputDoubleRegister(),
+                i.InputDoubleRegister(0));
       break;
     case kS390_CeilDouble:
-      __ fidbra(v8::internal::Assembler::FIDBRA_ROUND_TOWARD_POS_INF,
-                i.OutputDoubleRegister(), i.InputDoubleRegister(0));
+      __ fidbra(ROUND_TOWARD_POS_INF, i.OutputDoubleRegister(),
+                i.InputDoubleRegister(0));
       break;
     case kS390_TruncateDouble:
-      __ fidbra(v8::internal::Assembler::FIDBRA_ROUND_TOWARD_0,
-                i.OutputDoubleRegister(), i.InputDoubleRegister(0));
+      __ fidbra(ROUND_TOWARD_0, i.OutputDoubleRegister(),
+                i.InputDoubleRegister(0));
       break;
     case kS390_RoundDouble:
-      __ fidbra(v8::internal::Assembler::FIDBRA_ROUND_TO_NEAREST_AWAY_FROM_0,
-                i.OutputDoubleRegister(), i.InputDoubleRegister(0));
+      __ fidbra(ROUND_TO_NEAREST_AWAY_FROM_0, i.OutputDoubleRegister(),
+                i.InputDoubleRegister(0));
       break;
     case kS390_NegFloat:
       ASSEMBLE_UNARY_OP(D_DInstr(lcebr), nullInstr, nullInstr);
@@ -2172,14 +1924,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_Cntlz32: {
       __ llgfr(i.OutputRegister(), i.InputRegister(0));
       __ flogr(r0, i.OutputRegister());
-      __ Add32(i.OutputRegister(), r0, Operand(-32));
+      __ AddS32(i.OutputRegister(), r0, Operand(-32));
       // No need to zero-ext b/c llgfr is done already
       break;
     }
 #if V8_TARGET_ARCH_S390X
     case kS390_Cntlz64: {
       __ flogr(r0, i.InputRegister(0));
-      __ LoadRR(i.OutputRegister(), r0);
+      __ mov(i.OutputRegister(), r0);
       break;
     }
 #endif
@@ -2192,11 +1944,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
 #endif
     case kS390_Cmp32:
-      ASSEMBLE_COMPARE32(Cmp32, CmpLogical32);
+      ASSEMBLE_COMPARE32(CmpS32, CmpU32);
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_Cmp64:
-      ASSEMBLE_COMPARE(CmpP, CmpLogicalP);
+      ASSEMBLE_COMPARE(CmpS64, CmpU64);
       break;
 #endif
     case kS390_CmpFloat:
@@ -2251,18 +2003,17 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         switch (op->representation()) {
           case MachineRepresentation::kFloat32:
             __ lay(sp, MemOperand(sp, -kSystemPointerSize));
-            __ StoreFloat32(i.InputDoubleRegister(0), MemOperand(sp));
+            __ StoreF32(i.InputDoubleRegister(0), MemOperand(sp));
             break;
           case MachineRepresentation::kFloat64:
             __ lay(sp, MemOperand(sp, -kDoubleSize));
-            __ StoreDouble(i.InputDoubleRegister(0), MemOperand(sp));
+            __ StoreF64(i.InputDoubleRegister(0), MemOperand(sp));
             frame_access_state()->IncreaseSPDelta(kDoubleSize /
                                                   kSystemPointerSize);
             break;
           case MachineRepresentation::kSimd128: {
             __ lay(sp, MemOperand(sp, -kSimd128Size));
-            __ StoreSimd128(i.InputDoubleRegister(0), MemOperand(sp),
-                            kScratchReg);
+            __ StoreV128(i.InputDoubleRegister(0), MemOperand(sp), kScratchReg);
             frame_access_state()->IncreaseSPDelta(kSimd128Size /
                                                   kSystemPointerSize);
             break;
@@ -2282,13 +2033,13 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (instr->InputAt(0)->IsFPRegister()) {
         LocationOperand* op = LocationOperand::cast(instr->InputAt(0));
         if (op->representation() == MachineRepresentation::kFloat64) {
-          __ StoreDouble(i.InputDoubleRegister(0), MemOperand(sp));
+          __ StoreF64(i.InputDoubleRegister(0), MemOperand(sp));
         } else {
           DCHECK_EQ(MachineRepresentation::kFloat32, op->representation());
-          __ StoreFloat32(i.InputDoubleRegister(0), MemOperand(sp));
+          __ StoreF32(i.InputDoubleRegister(0), MemOperand(sp));
         }
       } else {
-        __ StoreP(i.InputRegister(0), MemOperand(sp));
+        __ StoreU64(i.InputRegister(0), MemOperand(sp));
       }
       break;
     }
@@ -2297,20 +2048,19 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       if (instr->InputAt(0)->IsFPRegister()) {
         LocationOperand* op = LocationOperand::cast(instr->InputAt(0));
         if (op->representation() == MachineRepresentation::kFloat64) {
-          __ StoreDouble(i.InputDoubleRegister(0),
-                         MemOperand(sp, slot * kSystemPointerSize));
+          __ StoreF64(i.InputDoubleRegister(0),
+                      MemOperand(sp, slot * kSystemPointerSize));
         } else if (op->representation() == MachineRepresentation::kFloat32) {
-          __ StoreFloat32(i.InputDoubleRegister(0),
-                          MemOperand(sp, slot * kSystemPointerSize));
+          __ StoreF32(i.InputDoubleRegister(0),
+                      MemOperand(sp, slot * kSystemPointerSize));
         } else {
           DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
-          __ StoreSimd128(i.InputDoubleRegister(0),
-                          MemOperand(sp, slot * kSystemPointerSize),
-                          kScratchReg);
+          __ StoreV128(i.InputDoubleRegister(0),
+                       MemOperand(sp, slot * kSystemPointerSize), kScratchReg);
         }
       } else {
-        __ StoreP(i.InputRegister(0),
-                  MemOperand(sp, slot * kSystemPointerSize));
+        __ StoreU64(i.InputRegister(0),
+                    MemOperand(sp, slot * kSystemPointerSize));
       }
       break;
     }
@@ -2373,7 +2123,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ ConvertDoubleToInt32(i.OutputRegister(0), i.InputDoubleRegister(0),
                               kRoundToNearest);
       __ b(Condition(0xE), &done, Label::kNear);  // normal case
-      __ lghi(i.OutputRegister(0), Operand::Zero());
+      __ mov(i.OutputRegister(0), Operand::Zero());
       __ bind(&done);
       break;
     }
@@ -2382,21 +2132,21 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ ConvertDoubleToUnsignedInt32(i.OutputRegister(0),
                                       i.InputDoubleRegister(0));
       __ b(Condition(0xE), &done, Label::kNear);  // normal case
-      __ lghi(i.OutputRegister(0), Operand::Zero());
+      __ mov(i.OutputRegister(0), Operand::Zero());
       __ bind(&done);
       break;
     }
     case kS390_DoubleToInt64: {
       Label done;
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand(1));
+        __ mov(i.OutputRegister(1), Operand(1));
       }
       __ ConvertDoubleToInt64(i.OutputRegister(0), i.InputDoubleRegister(0));
       __ b(Condition(0xE), &done, Label::kNear);  // normal case
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand::Zero());
+        __ mov(i.OutputRegister(1), Operand::Zero());
       } else {
-        __ lghi(i.OutputRegister(0), Operand::Zero());
+        __ mov(i.OutputRegister(0), Operand::Zero());
       }
       __ bind(&done);
       break;
@@ -2404,15 +2154,15 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_DoubleToUint64: {
       Label done;
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand(1));
+        __ mov(i.OutputRegister(1), Operand(1));
       }
       __ ConvertDoubleToUnsignedInt64(i.OutputRegister(0),
                                       i.InputDoubleRegister(0));
       __ b(Condition(0xE), &done, Label::kNear);  // normal case
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand::Zero());
+        __ mov(i.OutputRegister(1), Operand::Zero());
       } else {
-        __ lghi(i.OutputRegister(0), Operand::Zero());
+        __ mov(i.OutputRegister(0), Operand::Zero());
       }
       __ bind(&done);
       break;
@@ -2440,7 +2190,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         // Avoid UINT32_MAX as an overflow indicator and use 0 instead,
         // because 0 allows easier out-of-bounds detection.
         __ b(Condition(0xE), &done, Label::kNear);  // normal case
-        __ lghi(i.OutputRegister(0), Operand::Zero());
+        __ mov(i.OutputRegister(0), Operand::Zero());
       }
       __ bind(&done);
       break;
@@ -2448,15 +2198,15 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_Float32ToUint64: {
       Label done;
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand(1));
+        __ mov(i.OutputRegister(1), Operand(1));
       }
       __ ConvertFloat32ToUnsignedInt64(i.OutputRegister(0),
                                        i.InputDoubleRegister(0));
       __ b(Condition(0xE), &done, Label::kNear);  // normal case
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand::Zero());
+        __ mov(i.OutputRegister(1), Operand::Zero());
       } else {
-        __ lghi(i.OutputRegister(0), Operand::Zero());
+        __ mov(i.OutputRegister(0), Operand::Zero());
       }
       __ bind(&done);
       break;
@@ -2464,14 +2214,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_Float32ToInt64: {
       Label done;
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand(1));
+        __ mov(i.OutputRegister(1), Operand(1));
       }
       __ ConvertFloat32ToInt64(i.OutputRegister(0), i.InputDoubleRegister(0));
       __ b(Condition(0xE), &done, Label::kNear);  // normal case
       if (i.OutputCount() > 1) {
-        __ lghi(i.OutputRegister(1), Operand::Zero());
+        __ mov(i.OutputRegister(1), Operand::Zero());
       } else {
-        __ lghi(i.OutputRegister(0), Operand::Zero());
+        __ mov(i.OutputRegister(0), Operand::Zero());
       }
       __ bind(&done);
       break;
@@ -2480,8 +2230,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_UNARY_OP(D_DInstr(ledbr), nullInstr, nullInstr);
       break;
     case kS390_Float32ToDouble:
-      ASSEMBLE_UNARY_OP(D_DInstr(ldebr), D_MTInstr(LoadFloat32ToDouble),
-                        nullInstr);
+      ASSEMBLE_UNARY_OP(D_DInstr(ldebr), D_MTInstr(LoadF32AsF64), nullInstr);
       break;
     case kS390_DoubleExtractLowWord32:
       __ lgdr(i.OutputRegister(), i.InputDoubleRegister(0));
@@ -2510,11 +2259,11 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ ldgr(i.OutputDoubleRegister(), kScratchReg);
       break;
     case kS390_LoadWordS8:
-      ASSEMBLE_LOAD_INTEGER(LoadB);
+      ASSEMBLE_LOAD_INTEGER(LoadS8);
       EmitWordLoadPoisoningIfNeeded(this, instr, i);
       break;
     case kS390_BitcastFloat32ToInt32:
-      ASSEMBLE_UNARY_OP(R_DInstr(MovFloatToInt), R_MInstr(LoadlW), nullInstr);
+      ASSEMBLE_UNARY_OP(R_DInstr(MovFloatToInt), R_MInstr(LoadU32), nullInstr);
       break;
     case kS390_BitcastInt32ToFloat32:
       __ MovIntToFloat(i.OutputDoubleRegister(), i.InputRegister(0));
@@ -2528,23 +2277,23 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
 #endif
     case kS390_LoadWordU8:
-      ASSEMBLE_LOAD_INTEGER(LoadlB);
+      ASSEMBLE_LOAD_INTEGER(LoadU8);
       EmitWordLoadPoisoningIfNeeded(this, instr, i);
       break;
     case kS390_LoadWordU16:
-      ASSEMBLE_LOAD_INTEGER(LoadLogicalHalfWordP);
+      ASSEMBLE_LOAD_INTEGER(LoadU16);
       EmitWordLoadPoisoningIfNeeded(this, instr, i);
       break;
     case kS390_LoadWordS16:
-      ASSEMBLE_LOAD_INTEGER(LoadHalfWordP);
+      ASSEMBLE_LOAD_INTEGER(LoadS16);
       EmitWordLoadPoisoningIfNeeded(this, instr, i);
       break;
     case kS390_LoadWordU32:
-      ASSEMBLE_LOAD_INTEGER(LoadlW);
+      ASSEMBLE_LOAD_INTEGER(LoadU32);
       EmitWordLoadPoisoningIfNeeded(this, instr, i);
       break;
     case kS390_LoadWordS32:
-      ASSEMBLE_LOAD_INTEGER(LoadW);
+      ASSEMBLE_LOAD_INTEGER(LoadS32);
       EmitWordLoadPoisoningIfNeeded(this, instr, i);
       break;
     case kS390_LoadReverse16:
@@ -2604,10 +2353,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kS390_LoadFloat32:
-      ASSEMBLE_LOAD_FLOAT(LoadFloat32);
+      ASSEMBLE_LOAD_FLOAT(LoadF32);
       break;
     case kS390_LoadDouble:
-      ASSEMBLE_LOAD_FLOAT(LoadDouble);
+      ASSEMBLE_LOAD_FLOAT(LoadF64);
       break;
     case kS390_LoadSimd128: {
       AddressingMode mode = kMode_None;
@@ -2617,17 +2366,17 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kS390_StoreWord8:
-      ASSEMBLE_STORE_INTEGER(StoreByte);
+      ASSEMBLE_STORE_INTEGER(StoreU8);
       break;
     case kS390_StoreWord16:
-      ASSEMBLE_STORE_INTEGER(StoreHalfWord);
+      ASSEMBLE_STORE_INTEGER(StoreU16);
       break;
     case kS390_StoreWord32:
-      ASSEMBLE_STORE_INTEGER(StoreW);
+      ASSEMBLE_STORE_INTEGER(StoreU32);
       break;
 #if V8_TARGET_ARCH_S390X
     case kS390_StoreWord64:
-      ASSEMBLE_STORE_INTEGER(StoreP);
+      ASSEMBLE_STORE_INTEGER(StoreU64);
       break;
 #endif
     case kS390_StoreReverse16:
@@ -2678,7 +2427,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
 #define ATOMIC_EXCHANGE(start, end, shift_amount, offset)              \
   {                                                                    \
     Label do_cs;                                                       \
-    __ LoadlW(output, MemOperand(r1, offset));                         \
+    __ LoadU32(output, MemOperand(r1, offset));                         \
     __ bind(&do_cs);                                                   \
     __ llgfr(r0, output);                                              \
     __ RotateInsertSelectBits(r0, value, Operand(start), Operand(end), \
@@ -2802,25 +2551,25 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Register output = i.OutputRegister();
       Label do_cs;
       __ lay(r1, MemOperand(base, index));
-      __ LoadlW(output, MemOperand(r1));
+      __ LoadU32(output, MemOperand(r1));
       __ bind(&do_cs);
       __ cs(output, value, MemOperand(r1));
       __ bne(&do_cs, Label::kNear);
       break;
     }
     case kWord32AtomicCompareExchangeInt8:
-      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_BYTE(LoadB);
+      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_BYTE(LoadS8);
       break;
     case kS390_Word64AtomicCompareExchangeUint8:
     case kWord32AtomicCompareExchangeUint8:
-      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_BYTE(LoadlB);
+      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_BYTE(LoadU8);
       break;
     case kWord32AtomicCompareExchangeInt16:
-      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_HALFWORD(LoadHalfWordP);
+      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_HALFWORD(LoadS16);
       break;
     case kS390_Word64AtomicCompareExchangeUint16:
     case kWord32AtomicCompareExchangeUint16:
-      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_HALFWORD(LoadLogicalHalfWordP);
+      ASSEMBLE_ATOMIC_COMPARE_EXCHANGE_HALFWORD(LoadU16);
       break;
     case kS390_Word64AtomicCompareExchangeUint32:
     case kWord32AtomicCompareExchangeWord32:
@@ -2831,7 +2580,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     ASSEMBLE_ATOMIC_BINOP_BYTE(inst, [&]() {                                 \
       intptr_t shift_right = static_cast<intptr_t>(shift_amount);            \
       __ srlk(result, prev, Operand(shift_right));                           \
-      __ LoadB(result, result);                                              \
+      __ LoadS8(result, result);                                              \
     });                                                                      \
     break;                                                                   \
   case kS390_Word64Atomic##op##Uint8:                                        \
@@ -2847,7 +2596,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     ASSEMBLE_ATOMIC_BINOP_HALFWORD(inst, [&]() {                             \
       intptr_t shift_right = static_cast<intptr_t>(shift_amount);            \
       __ srlk(result, prev, Operand(shift_right));                           \
-      __ LoadHalfWordP(result, result);                                      \
+      __ LoadS16(result, result);                                      \
     });                                                                      \
     break;                                                                   \
   case kS390_Word64Atomic##op##Uint16:                                       \
@@ -2859,8 +2608,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
                                 true);                                       \
     });                                                                      \
     break;
-      ATOMIC_BINOP_CASE(Add, Add32)
-      ATOMIC_BINOP_CASE(Sub, Sub32)
+      ATOMIC_BINOP_CASE(Add, AddS32)
+      ATOMIC_BINOP_CASE(Sub, SubS32)
       ATOMIC_BINOP_CASE(And, And)
       ATOMIC_BINOP_CASE(Or, Or)
       ATOMIC_BINOP_CASE(Xor, Xor)
@@ -3283,7 +3032,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       for (int i = 0; i < 2; i++) {
         __ vlgv(scratch_0, src0, MemOperand(r0, i), Condition(3));
         __ vlgv(scratch_1, src1, MemOperand(r0, i), Condition(3));
-        __ Mul64(scratch_0, scratch_1);
+        __ MulS64(scratch_0, scratch_1);
         scratch_0 = r1;
         scratch_1 = ip;
       }
@@ -3752,7 +3501,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kS390_F32x4RecipApprox: {
-      __ lgfi(kScratchReg, Operand(1));
+      __ mov(kScratchReg, Operand(1));
       __ ConvertIntToFloat(kScratchDoubleReg, kScratchReg);
 #ifdef V8_TARGET_BIG_ENDIAN
       __ vrep(kScratchDoubleReg, kScratchDoubleReg, Operand(0), Condition(2));
@@ -3768,7 +3517,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       DoubleRegister tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
       __ vfsq(tempFPReg1, i.InputSimd128Register(0), Condition(0), Condition(0),
               Condition(2));
-      __ lgfi(kScratchReg, Operand(1));
+      __ mov(kScratchReg, Operand(1));
       __ ConvertIntToFloat(kScratchDoubleReg, kScratchReg);
 #ifdef V8_TARGET_BIG_ENDIAN
       __ vrep(kScratchDoubleReg, kScratchDoubleReg, Operand(0), Condition(2));
@@ -3812,7 +3561,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       Simd128Register src = i.InputSimd128Register(0);
       Register dst = i.OutputRegister();
       Register temp = i.TempRegister(0);
-      __ lgfi(dst, Operand(1));
+      __ mov(dst, Operand(1));
       __ xgr(temp, temp);
       __ vtm(src, src, Condition(0), Condition(0), Condition(0));
       __ locgr(Condition(8), dst, temp);
@@ -3822,7 +3571,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
   Simd128Register src = i.InputSimd128Register(0);                             \
   Register dst = i.OutputRegister();                                           \
   Register temp = i.TempRegister(0);                                           \
-  __ lgfi(temp, Operand(1));                                                   \
+  __ mov(temp, Operand(1));                                                    \
   __ xgr(dst, dst);                                                            \
   __ vx(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg, Condition(0), \
         Condition(0), Condition(2));                                           \
@@ -3869,12 +3618,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kS390_S128Const: {
 #ifdef V8_TARGET_BIG_ENDIAN
       for (int index = 0, j = 0; index < 2; index++, j = +2) {
-        __ lgfi(index < 1 ? ip : r0, Operand(i.InputInt32(j)));
+        __ mov(index < 1 ? ip : r0, Operand(i.InputInt32(j)));
         __ iihf(index < 1 ? ip : r0, Operand(i.InputInt32(j + 1)));
       }
 #else
       for (int index = 0, j = 0; index < 2; index++, j = +2) {
-        __ lgfi(index < 1 ? r0 : ip, Operand(i.InputInt32(j)));
+        __ mov(index < 1 ? r0 : ip, Operand(i.InputInt32(j)));
         __ iihf(index < 1 ? r0 : ip, Operand(i.InputInt32(j + 1)));
       }
 #endif
@@ -4184,10 +3933,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       // create 2 * 8 byte inputs indicating new indices
       for (int i = 0, j = 0; i < 2; i++, j = +2) {
 #ifdef V8_TARGET_BIG_ENDIAN
-        __ lgfi(i < 1 ? ip : r0, Operand(k8x16_indices[j]));
+        __ mov(i < 1 ? ip : r0, Operand(k8x16_indices[j]));
         __ iihf(i < 1 ? ip : r0, Operand(k8x16_indices[j + 1]));
 #else
-        __ lgfi(i < 1 ? r0 : ip, Operand(k8x16_indices[j]));
+        __ mov(i < 1 ? r0 : ip, Operand(k8x16_indices[j]));
         __ iihf(i < 1 ? r0 : ip, Operand(k8x16_indices[j + 1]));
 #endif
       }
@@ -4225,12 +3974,27 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
 #endif
       break;
     }
+    case kS390_I64x2BitMask: {
+#ifdef V8_TARGET_BIG_ENDIAN
+      __ mov(kScratchReg, Operand(0x80800040));
+      __ iihf(kScratchReg, Operand(0x80808080));  // Zeroing the high bits.
+#else
+      __ mov(kScratchReg, Operand(0x80808080));
+      __ iihf(kScratchReg, Operand(0x40008080));
+#endif
+      __ vlvg(kScratchDoubleReg, kScratchReg, MemOperand(r0, 1), Condition(3));
+      __ vbperm(kScratchDoubleReg, i.InputSimd128Register(0), kScratchDoubleReg,
+                Condition(0), Condition(0), Condition(0));
+      __ vlgv(i.OutputRegister(), kScratchDoubleReg, MemOperand(r0, 7),
+              Condition(0));
+      break;
+    }
     case kS390_I32x4BitMask: {
 #ifdef V8_TARGET_BIG_ENDIAN
-      __ lgfi(kScratchReg, Operand(0x204060));
+      __ mov(kScratchReg, Operand(0x204060));
       __ iihf(kScratchReg, Operand(0x80808080));  // Zeroing the high bits.
 #else
-      __ lgfi(kScratchReg, Operand(0x80808080));
+      __ mov(kScratchReg, Operand(0x80808080));
       __ iihf(kScratchReg, Operand(0x60402000));
 #endif
       __ vlvg(kScratchDoubleReg, kScratchReg, MemOperand(r0, 1), Condition(3));
@@ -4242,10 +4006,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     }
     case kS390_I16x8BitMask: {
 #ifdef V8_TARGET_BIG_ENDIAN
-      __ lgfi(kScratchReg, Operand(0x40506070));
+      __ mov(kScratchReg, Operand(0x40506070));
       __ iihf(kScratchReg, Operand(0x102030));
 #else
-      __ lgfi(kScratchReg, Operand(0x30201000));
+      __ mov(kScratchReg, Operand(0x30201000));
       __ iihf(kScratchReg, Operand(0x70605040));
 #endif
       __ vlvg(kScratchDoubleReg, kScratchReg, MemOperand(r0, 1), Condition(3));
@@ -4257,14 +4021,14 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     }
     case kS390_I8x16BitMask: {
 #ifdef V8_TARGET_BIG_ENDIAN
-      __ lgfi(r0, Operand(0x60687078));
+      __ mov(r0, Operand(0x60687078));
       __ iihf(r0, Operand(0x40485058));
-      __ lgfi(ip, Operand(0x20283038));
+      __ mov(ip, Operand(0x20283038));
       __ iihf(ip, Operand(0x81018));
 #else
-      __ lgfi(ip, Operand(0x58504840));
+      __ mov(ip, Operand(0x58504840));
       __ iihf(ip, Operand(0x78706860));
-      __ lgfi(r0, Operand(0x18100800));
+      __ mov(r0, Operand(0x18100800));
       __ iihf(r0, Operand(0x38302820));
 #endif
       __ vlvgp(kScratchDoubleReg, ip, r0);
@@ -4349,6 +4113,141 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
             Condition(0), Condition(0), Condition(2));
       break;
     }
+#define ASSEMBLE_SIMD_I64X2_EXT_MUL(UNPACK_INSTR)                              \
+  __ UNPACK_INSTR(kScratchDoubleReg, i.InputSimd128Register(0), Condition(0),  \
+                  Condition(0), Condition(2));                                 \
+  __ UNPACK_INSTR(i.OutputSimd128Register(), i.InputSimd128Register(1),        \
+                  Condition(0), Condition(0), Condition(2));                   \
+  Register scratch_0 = r0;                                                     \
+  Register scratch_1 = r1;                                                     \
+  for (int lane = 0; lane < 2; lane++) {                                       \
+    __ vlgv(scratch_0, kScratchDoubleReg, MemOperand(r0, lane), Condition(3)); \
+    __ vlgv(scratch_1, i.OutputSimd128Register(), MemOperand(r0, lane),        \
+            Condition(3));                                                     \
+    __ MulS64(scratch_0, scratch_1);                                           \
+    scratch_0 = r1;                                                            \
+    scratch_1 = ip;                                                            \
+  }                                                                            \
+  __ vlvgp(i.OutputSimd128Register(), r0, r1);
+    case kS390_I64x2ExtMulLowI32x4S: {
+      ASSEMBLE_SIMD_I64X2_EXT_MUL(vupl)
+      break;
+    }
+    case kS390_I64x2ExtMulHighI32x4S: {
+      ASSEMBLE_SIMD_I64X2_EXT_MUL(vuph)
+      break;
+    }
+    case kS390_I64x2ExtMulLowI32x4U: {
+      ASSEMBLE_SIMD_I64X2_EXT_MUL(vupll)
+      break;
+    }
+    case kS390_I64x2ExtMulHighI32x4U: {
+      ASSEMBLE_SIMD_I64X2_EXT_MUL(vuplh)
+      break;
+    }
+#undef ASSEMBLE_SIMD_I64X2_EXT_MUL
+#define ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(UNPACK_INSTR, MODE)                 \
+  __ UNPACK_INSTR(kScratchDoubleReg, i.InputSimd128Register(0), Condition(0), \
+                  Condition(0), Condition(MODE));                             \
+  __ UNPACK_INSTR(i.OutputSimd128Register(), i.InputSimd128Register(1),       \
+                  Condition(0), Condition(0), Condition(MODE));               \
+  __ vml(i.OutputSimd128Register(), kScratchDoubleReg,                        \
+         i.OutputSimd128Register(), Condition(0), Condition(0),               \
+         Condition(MODE + 1));
+    case kS390_I32x4ExtMulLowI16x8S: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vupl, 1)
+      break;
+    }
+    case kS390_I32x4ExtMulHighI16x8S: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vuph, 1)
+      break;
+    }
+    case kS390_I32x4ExtMulLowI16x8U: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vupll, 1)
+      break;
+    }
+    case kS390_I32x4ExtMulHighI16x8U: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vuplh, 1)
+      break;
+    }
+    case kS390_I16x8ExtMulLowI8x16S: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vupl, 0)
+      break;
+    }
+    case kS390_I16x8ExtMulHighI8x16S: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vuph, 0)
+      break;
+    }
+    case kS390_I16x8ExtMulLowI8x16U: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vupll, 0)
+      break;
+    }
+    case kS390_I16x8ExtMulHighI8x16U: {
+      ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL(vuplh, 0)
+      break;
+    }
+#undef ASSEMBLE_SIMD_I32X4_I16X8_EXT_MUL
+#define EXT_ADD_PAIRWISE(lane_size, mul_even, mul_odd)                        \
+  Simd128Register src = i.InputSimd128Register(0);                            \
+  Simd128Register dst = i.OutputSimd128Register();                            \
+  Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));         \
+  __ vrepi(kScratchDoubleReg, Operand(1), Condition(lane_size));              \
+  __ mul_even(tempFPReg1, src, kScratchDoubleReg, Condition(0), Condition(0), \
+              Condition(lane_size));                                          \
+  __ mul_odd(kScratchDoubleReg, src, kScratchDoubleReg, Condition(0),         \
+             Condition(0), Condition(lane_size));                             \
+  __ va(dst, tempFPReg1, kScratchDoubleReg, Condition(0), Condition(0),       \
+        Condition(lane_size + 1));
+    case kS390_I32x4ExtAddPairwiseI16x8S: {
+      EXT_ADD_PAIRWISE(1, vme, vmo)
+      break;
+    }
+    case kS390_I32x4ExtAddPairwiseI16x8U: {
+      Simd128Register src0 = i.InputSimd128Register(0);
+      Simd128Register dst = i.OutputSimd128Register();
+      __ vx(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg,
+            Condition(0), Condition(0), Condition(3));
+      __ vsum(dst, src0, kScratchDoubleReg, Condition(0), Condition(0),
+              Condition(1));
+
+      break;
+    }
+    case kS390_I16x8ExtAddPairwiseI8x16S: {
+      EXT_ADD_PAIRWISE(0, vme, vmo)
+      break;
+    }
+    case kS390_I16x8ExtAddPairwiseI8x16U: {
+      EXT_ADD_PAIRWISE(0, vmle, vmlo)
+      break;
+    }
+#undef EXT_ADD_PAIRWISE
+#define Q15_MUL_ROAUND(accumulator, unpack)                                    \
+  __ unpack(tempFPReg1, i.InputSimd128Register(0), Condition(0), Condition(0), \
+            Condition(1));                                                     \
+  __ unpack(accumulator, i.InputSimd128Register(1), Condition(0),              \
+            Condition(0), Condition(1));                                       \
+  __ vml(accumulator, tempFPReg1, accumulator, Condition(0), Condition(0),     \
+         Condition(2));                                                        \
+  __ va(accumulator, accumulator, tempFPReg2, Condition(0), Condition(0),      \
+        Condition(2));                                                         \
+  __ vrepi(tempFPReg1, Operand(15), Condition(2));                             \
+  __ vesrav(accumulator, accumulator, tempFPReg1, Condition(0), Condition(0),  \
+            Condition(2));
+    case kS390_I16x8Q15MulRSatS: {
+      Simd128Register dst = i.OutputSimd128Register();
+      Simd128Register tempFPReg1 = i.ToSimd128Register(instr->TempAt(0));
+      Simd128Register tempFPReg2 = i.ToSimd128Register(instr->TempAt(1));
+      __ vrepi(tempFPReg2, Operand(0x4000), Condition(2));
+      Q15_MUL_ROAUND(kScratchDoubleReg, vupl)
+      Q15_MUL_ROAUND(dst, vuph)
+#ifdef V8_TARGET_BIG_ENDIAN
+      __ vpks(dst, dst, kScratchDoubleReg, Condition(0), Condition(2));
+#else
+      __ vpks(dst, kScratchDoubleReg, dst, Condition(0), Condition(2));
+#endif
+      break;
+    }
+#undef Q15_MUL_ROAUND
     case kS390_StoreCompressTagged: {
       CHECK(!instr->HasOutput());
       size_t index = 0;
@@ -4410,7 +4309,7 @@ void CodeGenerator::AssembleBranchPoisoning(FlagsCondition condition,
   }
 
   condition = NegateFlagsCondition(condition);
-  __ LoadImmP(r0, Operand::Zero());
+  __ mov(r0, Operand::Zero());
   __ LoadOnConditionP(FlagsConditionToCondition(condition, kArchNop),
                       kSpeculationPoisonRegister, r0);
 }
@@ -4509,14 +4408,14 @@ void CodeGenerator::AssembleArchBoolean(Instruction* instr,
   Condition cond = FlagsConditionToCondition(condition, op);
   Label done;
   if (check_unordered) {
-    __ LoadImmP(reg, (cond == eq || cond == le || cond == lt) ? Operand::Zero()
-                                                              : Operand(1));
+    __ mov(reg, (cond == eq || cond == le || cond == lt) ? Operand::Zero()
+                                                         : Operand(1));
     __ bunordered(&done);
   }
 
   // TODO(john.yan): use load imm high on condition here
-  __ LoadImmP(reg, Operand::Zero());
-  __ LoadImmP(kScratchReg, Operand(1));
+  __ mov(reg, Operand::Zero());
+  __ mov(kScratchReg, Operand(1));
   // locr is sufficient since reg's upper 32 is guarrantee to be 0
   __ locr(cond, reg, kScratchReg);
   __ bind(&done);
@@ -4542,11 +4441,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instruction* instr) {
     cases[index] = GetLabel(i.InputRpo(index + 2));
   }
   Label* const table = AddJumpTable(cases, case_count);
-  __ CmpLogicalP(input, Operand(case_count));
+  __ CmpU64(input, Operand(case_count));
   __ bge(GetLabel(i.InputRpo(1)));
   __ larl(kScratchReg, table);
-  __ ShiftLeftP(r1, input, Operand(kSystemPointerSizeLog2));
-  __ LoadP(kScratchReg, MemOperand(kScratchReg, r1));
+  __ ShiftLeftU64(r1, input, Operand(kSystemPointerSizeLog2));
+  __ LoadU64(kScratchReg, MemOperand(kScratchReg, r1));
   __ Jump(kScratchReg);
 }
 
@@ -4583,7 +4482,7 @@ void CodeGenerator::AssembleConstructFrame() {
         __ lay(sp, MemOperand(sp, -kSystemPointerSize));
       } else {
         __ Push(r14, fp);
-        __ LoadRR(fp, sp);
+        __ mov(fp, sp);
       }
     } else if (call_descriptor->IsJSFunctionCall()) {
       __ Prologue(ip);
@@ -4648,13 +4547,14 @@ void CodeGenerator::AssembleConstructFrame() {
       // check in the condition code.
       if ((required_slots * kSystemPointerSize) < (FLAG_stack_size * 1024)) {
         Register scratch = r1;
-        __ LoadP(
+        __ LoadU64(
             scratch,
             FieldMemOperand(kWasmInstanceRegister,
                             WasmInstanceObject::kRealStackLimitAddressOffset));
-        __ LoadP(scratch, MemOperand(scratch));
-        __ AddP(scratch, scratch, Operand(required_slots * kSystemPointerSize));
-        __ CmpLogicalP(sp, scratch);
+        __ LoadU64(scratch, MemOperand(scratch));
+        __ AddS64(scratch, scratch,
+                  Operand(required_slots * kSystemPointerSize));
+        __ CmpU64(sp, scratch);
         __ bge(&done);
       }
 
@@ -4696,9 +4596,8 @@ void CodeGenerator::AssembleConstructFrame() {
   }
 }
 
-void CodeGenerator::AssembleReturn(InstructionOperand* pop) {
+void CodeGenerator::AssembleReturn(InstructionOperand* additional_pop_count) {
   auto call_descriptor = linkage()->GetIncomingDescriptor();
-  int pop_count = static_cast<int>(call_descriptor->StackParameterCount());
 
   const int returns = frame()->GetReturnSlotCount();
   if (returns != 0) {
@@ -4720,30 +4619,78 @@ void CodeGenerator::AssembleReturn(InstructionOperand* pop) {
 
   unwinding_info_writer_.MarkBlockWillExit();
 
+  // We might need r3 for scratch.
+  DCHECK_EQ(0u, call_descriptor->CalleeSavedRegisters() & r5.bit());
   S390OperandConverter g(this, nullptr);
+  const int parameter_count =
+      static_cast<int>(call_descriptor->StackParameterCount());
+
+  // {aditional_pop_count} is only greater than zero if {parameter_count = 0}.
+  // Check RawMachineAssembler::PopAndReturn.
+  if (parameter_count != 0) {
+    if (additional_pop_count->IsImmediate()) {
+      DCHECK_EQ(g.ToConstant(additional_pop_count).ToInt32(), 0);
+    } else if (__ emit_debug_code()) {
+      __ CmpS64(g.ToRegister(additional_pop_count), Operand(0));
+      __ Assert(eq, AbortReason::kUnexpectedAdditionalPopValue);
+    }
+  }
+
+  Register argc_reg = r5;
+#ifdef V8_NO_ARGUMENTS_ADAPTOR
+  // Functions with JS linkage have at least one parameter (the receiver).
+  // If {parameter_count} == 0, it means it is a builtin with
+  // kDontAdaptArgumentsSentinel, which takes care of JS arguments popping
+  // itself.
+  const bool drop_jsargs = frame_access_state()->has_frame() &&
+                           call_descriptor->IsJSFunctionCall() &&
+                           parameter_count != 0;
+#else
+  const bool drop_jsargs = false;
+#endif
   if (call_descriptor->IsCFunctionCall()) {
     AssembleDeconstructFrame();
   } else if (frame_access_state()->has_frame()) {
     // Canonicalize JSFunction return sites for now unless they have an variable
     // number of stack slot pops
-    if (pop->IsImmediate() && g.ToConstant(pop).ToInt32() == 0) {
+    if (additional_pop_count->IsImmediate() &&
+        g.ToConstant(additional_pop_count).ToInt32() == 0) {
       if (return_label_.is_bound()) {
         __ b(&return_label_);
         return;
       } else {
         __ bind(&return_label_);
-        AssembleDeconstructFrame();
       }
-    } else {
-      AssembleDeconstructFrame();
     }
+    if (drop_jsargs) {
+      // Get the actual argument count.
+      __ LoadU64(argc_reg, MemOperand(fp, StandardFrameConstants::kArgCOffset));
+    }
+    AssembleDeconstructFrame();
   }
-  if (pop->IsImmediate()) {
-    pop_count += g.ToConstant(pop).ToInt32();
+
+  if (drop_jsargs) {
+    // We must pop all arguments from the stack (including the receiver). This
+    // number of arguments is given by max(1 + argc_reg, parameter_count).
+    __ AddS64(argc_reg, argc_reg, Operand(1));  // Also pop the receiver.
+    if (parameter_count > 1) {
+      Label skip;
+      __ CmpS64(argc_reg, Operand(parameter_count));
+      __ bgt(&skip);
+      __ mov(argc_reg, Operand(parameter_count));
+      __ bind(&skip);
+    }
+    __ Drop(argc_reg);
+  } else if (additional_pop_count->IsImmediate()) {
+    int additional_count = g.ToConstant(additional_pop_count).ToInt32();
+    __ Drop(parameter_count + additional_count);
+  } else if (parameter_count == 0) {
+    __ Drop(g.ToRegister(additional_pop_count));
   } else {
-    __ Drop(g.ToRegister(pop));
+    // {additional_pop_count} is guaranteed to be zero if {parameter_count !=
+    // 0}. Check RawMachineAssembler::PopAndReturn.
+    __ Drop(parameter_count);
   }
-  __ Drop(pop_count);
   __ Ret();
 }
 
@@ -4763,17 +4710,17 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
     if (destination->IsRegister()) {
       __ Move(g.ToRegister(destination), src);
     } else {
-      __ StoreP(src, g.ToMemOperand(destination));
+      __ StoreU64(src, g.ToMemOperand(destination));
     }
   } else if (source->IsStackSlot()) {
     DCHECK(destination->IsRegister() || destination->IsStackSlot());
     MemOperand src = g.ToMemOperand(source);
     if (destination->IsRegister()) {
-      __ LoadP(g.ToRegister(destination), src);
+      __ LoadU64(g.ToRegister(destination), src);
     } else {
       Register temp = kScratchReg;
-      __ LoadP(temp, src, r0);
-      __ StoreP(temp, g.ToMemOperand(destination));
+      __ LoadU64(temp, src, r0);
+      __ StoreU64(temp, g.ToMemOperand(destination));
     }
   } else if (source->IsConstant()) {
     Constant src = g.ToConstant(source);
@@ -4789,7 +4736,7 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
 #endif
             __ mov(dst, Operand(src.ToInt32(), src.rmode()));
           } else {
-            __ Load(dst, Operand(src.ToInt32()));
+            __ mov(dst, Operand(src.ToInt32()));
           }
           break;
         case Constant::kInt64:
@@ -4797,7 +4744,7 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
           if (RelocInfo::IsWasmReference(src.rmode())) {
             __ mov(dst, Operand(src.ToInt64(), src.rmode()));
           } else {
-            __ Load(dst, Operand(src.ToInt64()));
+            __ mov(dst, Operand(src.ToInt64()));
           }
 #else
           __ mov(dst, Operand(src.ToInt64()));
@@ -4841,7 +4788,7 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
           break;
       }
       if (destination->IsStackSlot()) {
-        __ StoreP(dst, g.ToMemOperand(destination), r0);
+        __ StoreU64(dst, g.ToMemOperand(destination), r0);
       }
     } else {
       DoubleRegister dst = destination->IsFPRegister()
@@ -4851,15 +4798,15 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
                          ? src.ToFloat32()
                          : src.ToFloat64().value();
       if (src.type() == Constant::kFloat32) {
-        __ LoadFloat32Literal(dst, src.ToFloat32(), kScratchReg);
+        __ LoadF32<float>(dst, src.ToFloat32(), kScratchReg);
       } else {
-        __ LoadDoubleLiteral(dst, value, kScratchReg);
+        __ LoadF64<double>(dst, value, kScratchReg);
       }
 
       if (destination->IsFloatStackSlot()) {
-        __ StoreFloat32(dst, g.ToMemOperand(destination));
+        __ StoreF32(dst, g.ToMemOperand(destination));
       } else if (destination->IsDoubleStackSlot()) {
-        __ StoreDouble(dst, g.ToMemOperand(destination));
+        __ StoreF64(dst, g.ToMemOperand(destination));
       }
     }
   } else if (source->IsFPRegister()) {
@@ -4870,8 +4817,8 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
                Condition(0), Condition(0), Condition(0));
       } else {
         DCHECK(destination->IsSimd128StackSlot());
-        __ StoreSimd128(g.ToSimd128Register(source),
-                        g.ToMemOperand(destination), kScratchReg);
+        __ StoreV128(g.ToSimd128Register(source), g.ToMemOperand(destination),
+                     kScratchReg);
       }
     } else {
       DoubleRegister src = g.ToDoubleRegister(source);
@@ -4882,9 +4829,9 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
         DCHECK(destination->IsFPStackSlot());
         LocationOperand* op = LocationOperand::cast(source);
         if (op->representation() == MachineRepresentation::kFloat64) {
-          __ StoreDouble(src, g.ToMemOperand(destination));
+          __ StoreF64(src, g.ToMemOperand(destination));
         } else {
-          __ StoreFloat32(src, g.ToMemOperand(destination));
+          __ StoreF32(src, g.ToMemOperand(destination));
         }
       }
     }
@@ -4894,28 +4841,28 @@ void CodeGenerator::AssembleMove(InstructionOperand* source,
     if (destination->IsFPRegister()) {
       LocationOperand* op = LocationOperand::cast(source);
       if (op->representation() == MachineRepresentation::kFloat64) {
-        __ LoadDouble(g.ToDoubleRegister(destination), src);
+        __ LoadF64(g.ToDoubleRegister(destination), src);
       } else if (op->representation() == MachineRepresentation::kFloat32) {
-        __ LoadFloat32(g.ToDoubleRegister(destination), src);
+        __ LoadF32(g.ToDoubleRegister(destination), src);
       } else {
         DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
-        __ LoadSimd128(g.ToSimd128Register(destination), g.ToMemOperand(source),
-                       kScratchReg);
+        __ LoadV128(g.ToSimd128Register(destination), g.ToMemOperand(source),
+                    kScratchReg);
       }
     } else {
       LocationOperand* op = LocationOperand::cast(source);
       DoubleRegister temp = kScratchDoubleReg;
       if (op->representation() == MachineRepresentation::kFloat64) {
-        __ LoadDouble(temp, src);
-        __ StoreDouble(temp, g.ToMemOperand(destination));
+        __ LoadF64(temp, src);
+        __ StoreF64(temp, g.ToMemOperand(destination));
       } else if (op->representation() == MachineRepresentation::kFloat32) {
-        __ LoadFloat32(temp, src);
-        __ StoreFloat32(temp, g.ToMemOperand(destination));
+        __ LoadF32(temp, src);
+        __ StoreF32(temp, g.ToMemOperand(destination));
       } else {
         DCHECK_EQ(MachineRepresentation::kSimd128, op->representation());
-        __ LoadSimd128(kScratchDoubleReg, g.ToMemOperand(source), kScratchReg);
-        __ StoreSimd128(kScratchDoubleReg, g.ToMemOperand(destination),
-                        kScratchReg);
+        __ LoadV128(kScratchDoubleReg, g.ToMemOperand(source), kScratchReg);
+        __ StoreV128(kScratchDoubleReg, g.ToMemOperand(destination),
+                     kScratchReg);
       }
     }
   } else {
diff --git a/deps/v8/src/compiler/backend/s390/instruction-codes-s390.h b/deps/v8/src/compiler/backend/s390/instruction-codes-s390.h
index f7d3370e508a75..bed16450be4cbe 100644
--- a/deps/v8/src/compiler/backend/s390/instruction-codes-s390.h
+++ b/deps/v8/src/compiler/backend/s390/instruction-codes-s390.h
@@ -23,13 +23,10 @@ namespace compiler {
   V(S390_Xor64)                             \
   V(S390_ShiftLeft32)                       \
   V(S390_ShiftLeft64)                       \
-  V(S390_ShiftLeftPair)                     \
   V(S390_ShiftRight32)                      \
   V(S390_ShiftRight64)                      \
-  V(S390_ShiftRightPair)                    \
   V(S390_ShiftRightArith32)                 \
   V(S390_ShiftRightArith64)                 \
-  V(S390_ShiftRightArithPair)               \
   V(S390_RotRight32)                        \
   V(S390_RotRight64)                        \
   V(S390_Not32)                             \
@@ -40,15 +37,12 @@ namespace compiler {
   V(S390_Lay)                               \
   V(S390_Add32)                             \
   V(S390_Add64)                             \
-  V(S390_AddPair)                           \
   V(S390_AddFloat)                          \
   V(S390_AddDouble)                         \
   V(S390_Sub32)                             \
   V(S390_Sub64)                             \
   V(S390_SubFloat)                          \
   V(S390_SubDouble)                         \
-  V(S390_SubPair)                           \
-  V(S390_MulPair)                           \
   V(S390_Mul32)                             \
   V(S390_Mul32WithOverflow)                 \
   V(S390_Mul64)                             \
@@ -261,6 +255,11 @@ namespace compiler {
   V(S390_I64x2ReplaceLane)                  \
   V(S390_I64x2ExtractLane)                  \
   V(S390_I64x2Eq)                           \
+  V(S390_I64x2BitMask)                      \
+  V(S390_I64x2ExtMulLowI32x4S)              \
+  V(S390_I64x2ExtMulHighI32x4S)             \
+  V(S390_I64x2ExtMulLowI32x4U)              \
+  V(S390_I64x2ExtMulHighI32x4U)             \
   V(S390_I32x4Splat)                        \
   V(S390_I32x4ExtractLane)                  \
   V(S390_I32x4ReplaceLane)                  \
@@ -291,6 +290,12 @@ namespace compiler {
   V(S390_I32x4Abs)                          \
   V(S390_I32x4BitMask)                      \
   V(S390_I32x4DotI16x8S)                    \
+  V(S390_I32x4ExtMulLowI16x8S)              \
+  V(S390_I32x4ExtMulHighI16x8S)             \
+  V(S390_I32x4ExtMulLowI16x8U)              \
+  V(S390_I32x4ExtMulHighI16x8U)             \
+  V(S390_I32x4ExtAddPairwiseI16x8S)         \
+  V(S390_I32x4ExtAddPairwiseI16x8U)         \
   V(S390_I16x8Splat)                        \
   V(S390_I16x8ExtractLaneU)                 \
   V(S390_I16x8ExtractLaneS)                 \
@@ -326,6 +331,13 @@ namespace compiler {
   V(S390_I16x8RoundingAverageU)             \
   V(S390_I16x8Abs)                          \
   V(S390_I16x8BitMask)                      \
+  V(S390_I16x8ExtMulLowI8x16S)              \
+  V(S390_I16x8ExtMulHighI8x16S)             \
+  V(S390_I16x8ExtMulLowI8x16U)              \
+  V(S390_I16x8ExtMulHighI8x16U)             \
+  V(S390_I16x8ExtAddPairwiseI8x16S)         \
+  V(S390_I16x8ExtAddPairwiseI8x16U)         \
+  V(S390_I16x8Q15MulRSatS)                  \
   V(S390_I8x16Splat)                        \
   V(S390_I8x16ExtractLaneU)                 \
   V(S390_I8x16ExtractLaneS)                 \
diff --git a/deps/v8/src/compiler/backend/s390/instruction-scheduler-s390.cc b/deps/v8/src/compiler/backend/s390/instruction-scheduler-s390.cc
index be0b14c796bbcb..8c1c804760b457 100644
--- a/deps/v8/src/compiler/backend/s390/instruction-scheduler-s390.cc
+++ b/deps/v8/src/compiler/backend/s390/instruction-scheduler-s390.cc
@@ -23,13 +23,10 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kS390_Xor64:
     case kS390_ShiftLeft32:
     case kS390_ShiftLeft64:
-    case kS390_ShiftLeftPair:
     case kS390_ShiftRight32:
     case kS390_ShiftRight64:
-    case kS390_ShiftRightPair:
     case kS390_ShiftRightArith32:
     case kS390_ShiftRightArith64:
-    case kS390_ShiftRightArithPair:
     case kS390_RotRight32:
     case kS390_RotRight64:
     case kS390_Not32:
@@ -40,13 +37,10 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kS390_Lay:
     case kS390_Add32:
     case kS390_Add64:
-    case kS390_AddPair:
     case kS390_AddFloat:
     case kS390_AddDouble:
     case kS390_Sub32:
     case kS390_Sub64:
-    case kS390_SubPair:
-    case kS390_MulPair:
     case kS390_SubFloat:
     case kS390_SubDouble:
     case kS390_Mul32:
@@ -207,6 +201,11 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kS390_I64x2ReplaceLane:
     case kS390_I64x2ExtractLane:
     case kS390_I64x2Eq:
+    case kS390_I64x2BitMask:
+    case kS390_I64x2ExtMulLowI32x4S:
+    case kS390_I64x2ExtMulHighI32x4S:
+    case kS390_I64x2ExtMulLowI32x4U:
+    case kS390_I64x2ExtMulHighI32x4U:
     case kS390_I32x4Splat:
     case kS390_I32x4ExtractLane:
     case kS390_I32x4ReplaceLane:
@@ -237,6 +236,12 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kS390_I32x4Abs:
     case kS390_I32x4BitMask:
     case kS390_I32x4DotI16x8S:
+    case kS390_I32x4ExtMulLowI16x8S:
+    case kS390_I32x4ExtMulHighI16x8S:
+    case kS390_I32x4ExtMulLowI16x8U:
+    case kS390_I32x4ExtMulHighI16x8U:
+    case kS390_I32x4ExtAddPairwiseI16x8S:
+    case kS390_I32x4ExtAddPairwiseI16x8U:
     case kS390_I16x8Splat:
     case kS390_I16x8ExtractLaneU:
     case kS390_I16x8ExtractLaneS:
@@ -272,6 +277,13 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kS390_I16x8RoundingAverageU:
     case kS390_I16x8Abs:
     case kS390_I16x8BitMask:
+    case kS390_I16x8ExtMulLowI8x16S:
+    case kS390_I16x8ExtMulHighI8x16S:
+    case kS390_I16x8ExtMulLowI8x16U:
+    case kS390_I16x8ExtMulHighI8x16U:
+    case kS390_I16x8ExtAddPairwiseI8x16S:
+    case kS390_I16x8ExtAddPairwiseI8x16U:
+    case kS390_I16x8Q15MulRSatS:
     case kS390_I8x16Splat:
     case kS390_I8x16ExtractLaneU:
     case kS390_I8x16ExtractLaneS:
diff --git a/deps/v8/src/compiler/backend/s390/instruction-selector-s390.cc b/deps/v8/src/compiler/backend/s390/instruction-selector-s390.cc
index 124193f50b651e..c2dd218fd66eb9 100644
--- a/deps/v8/src/compiler/backend/s390/instruction-selector-s390.cc
+++ b/deps/v8/src/compiler/backend/s390/instruction-selector-s390.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/base/platform/wrappers.h"
 #include "src/compiler/backend/instruction-selector-impl.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
@@ -721,15 +722,14 @@ static void VisitGeneralStore(
   Node* base = node->InputAt(0);
   Node* offset = node->InputAt(1);
   Node* value = node->InputAt(2);
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedOrCompressedPointer(rep));
     AddressingMode addressing_mode;
     InstructionOperand inputs[3];
     size_t input_count = 0;
     inputs[input_count++] = g.UseUniqueRegister(base);
-    // OutOfLineRecordWrite uses the offset in an 'AddP' instruction as well as
-    // for the store itself, so we must check compatibility with both.
+    // OutOfLineRecordWrite uses the offset in an 'AddS64' instruction as well
+    // as for the store itself, so we must check compatibility with both.
     if (g.CanBeImmediate(offset, OperandMode::kInt20Imm)) {
       inputs[input_count++] = g.UseImmediate(offset);
       addressing_mode = kMode_MRI;
@@ -1054,114 +1054,6 @@ static inline bool TryMatchSignExtInt16OrInt8FromWord32Sar(
   return false;
 }
 
-#if !V8_TARGET_ARCH_S390X
-void VisitPairBinop(InstructionSelector* selector, InstructionCode opcode,
-                    InstructionCode opcode2, Node* node) {
-  S390OperandGenerator g(selector);
-
-  Node* projection1 = NodeProperties::FindProjection(node, 1);
-  if (projection1) {
-    // We use UseUniqueRegister here to avoid register sharing with the output
-    // registers.
-    InstructionOperand inputs[] = {
-        g.UseRegister(node->InputAt(0)), g.UseUniqueRegister(node->InputAt(1)),
-        g.UseRegister(node->InputAt(2)), g.UseUniqueRegister(node->InputAt(3))};
-
-    InstructionOperand outputs[] = {
-        g.DefineAsRegister(node),
-        g.DefineAsRegister(NodeProperties::FindProjection(node, 1))};
-
-    selector->Emit(opcode, 2, outputs, 4, inputs);
-  } else {
-    // The high word of the result is not used, so we emit the standard 32 bit
-    // instruction.
-    selector->Emit(opcode2, g.DefineSameAsFirst(node),
-                   g.UseRegister(node->InputAt(0)),
-                   g.UseRegister(node->InputAt(2)), g.TempImmediate(0));
-  }
-}
-
-void InstructionSelector::VisitInt32PairAdd(Node* node) {
-  VisitPairBinop(this, kS390_AddPair, kS390_Add32, node);
-}
-
-void InstructionSelector::VisitInt32PairSub(Node* node) {
-  VisitPairBinop(this, kS390_SubPair, kS390_Sub32, node);
-}
-
-void InstructionSelector::VisitInt32PairMul(Node* node) {
-  S390OperandGenerator g(this);
-  Node* projection1 = NodeProperties::FindProjection(node, 1);
-  if (projection1) {
-    InstructionOperand inputs[] = {g.UseUniqueRegister(node->InputAt(0)),
-                                   g.UseUniqueRegister(node->InputAt(1)),
-                                   g.UseUniqueRegister(node->InputAt(2)),
-                                   g.UseUniqueRegister(node->InputAt(3))};
-
-    InstructionOperand outputs[] = {
-        g.DefineAsRegister(node),
-        g.DefineAsRegister(NodeProperties::FindProjection(node, 1))};
-
-    Emit(kS390_MulPair, 2, outputs, 4, inputs);
-  } else {
-    // The high word of the result is not used, so we emit the standard 32 bit
-    // instruction.
-    Emit(kS390_Mul32, g.DefineSameAsFirst(node),
-         g.UseRegister(node->InputAt(0)), g.Use(node->InputAt(2)),
-         g.TempImmediate(0));
-  }
-}
-
-namespace {
-// Shared routine for multiple shift operations.
-void VisitPairShift(InstructionSelector* selector, InstructionCode opcode,
-                    Node* node) {
-  S390OperandGenerator g(selector);
-  // We use g.UseUniqueRegister here to guarantee that there is
-  // no register aliasing of input registers with output registers.
-  Int32Matcher m(node->InputAt(2));
-  InstructionOperand shift_operand;
-  if (m.HasResolvedValue()) {
-    shift_operand = g.UseImmediate(m.node());
-  } else {
-    shift_operand = g.UseUniqueRegister(m.node());
-  }
-
-  InstructionOperand inputs[] = {g.UseUniqueRegister(node->InputAt(0)),
-                                 g.UseUniqueRegister(node->InputAt(1)),
-                                 shift_operand};
-
-  Node* projection1 = NodeProperties::FindProjection(node, 1);
-
-  InstructionOperand outputs[2];
-  InstructionOperand temps[1];
-  int32_t output_count = 0;
-  int32_t temp_count = 0;
-
-  outputs[output_count++] = g.DefineAsRegister(node);
-  if (projection1) {
-    outputs[output_count++] = g.DefineAsRegister(projection1);
-  } else {
-    temps[temp_count++] = g.TempRegister();
-  }
-
-  selector->Emit(opcode, output_count, outputs, 3, inputs, temp_count, temps);
-}
-}  // namespace
-
-void InstructionSelector::VisitWord32PairShl(Node* node) {
-  VisitPairShift(this, kS390_ShiftLeftPair, node);
-}
-
-void InstructionSelector::VisitWord32PairShr(Node* node) {
-  VisitPairShift(this, kS390_ShiftRightPair, node);
-}
-
-void InstructionSelector::VisitWord32PairSar(Node* node) {
-  VisitPairShift(this, kS390_ShiftRightArithPair, node);
-}
-#endif
-
 void InstructionSelector::VisitWord32Rol(Node* node) { UNREACHABLE(); }
 
 void InstructionSelector::VisitWord64Rol(Node* node) { UNREACHABLE(); }
@@ -2554,6 +2446,11 @@ void InstructionSelector::VisitWord64AtomicStore(Node* node) {
   V(I64x2Sub)              \
   V(I64x2Mul)              \
   V(I64x2Eq)               \
+  V(I64x2ExtMulLowI32x4S)  \
+  V(I64x2ExtMulHighI32x4S) \
+  V(I64x2ExtMulLowI32x4U)  \
+  V(I64x2ExtMulHighI32x4U) \
+  V(I16x8Q15MulRSatS)      \
   V(I32x4Add)              \
   V(I32x4AddHoriz)         \
   V(I32x4Sub)              \
@@ -2569,6 +2466,10 @@ void InstructionSelector::VisitWord64AtomicStore(Node* node) {
   V(I32x4GtU)              \
   V(I32x4GeU)              \
   V(I32x4DotI16x8S)        \
+  V(I32x4ExtMulLowI16x8S)  \
+  V(I32x4ExtMulHighI16x8S) \
+  V(I32x4ExtMulLowI16x8U)  \
+  V(I32x4ExtMulHighI16x8U) \
   V(I16x8Add)              \
   V(I16x8AddHoriz)         \
   V(I16x8Sub)              \
@@ -2590,6 +2491,10 @@ void InstructionSelector::VisitWord64AtomicStore(Node* node) {
   V(I16x8AddSatU)          \
   V(I16x8SubSatU)          \
   V(I16x8RoundingAverageU) \
+  V(I16x8ExtMulLowI8x16S)  \
+  V(I16x8ExtMulHighI8x16S) \
+  V(I16x8ExtMulLowI8x16U)  \
+  V(I16x8ExtMulHighI8x16U) \
   V(I8x16Add)              \
   V(I8x16Sub)              \
   V(I8x16Mul)              \
@@ -2794,6 +2699,7 @@ SIMD_VISIT_QFMOP(F32x4Qfms)
 SIMD_VISIT_BITMASK(I8x16BitMask)
 SIMD_VISIT_BITMASK(I16x8BitMask)
 SIMD_VISIT_BITMASK(I32x4BitMask)
+SIMD_VISIT_BITMASK(I64x2BitMask)
 #undef SIMD_VISIT_BITMASK
 
 #define SIMD_VISIT_PMIN_MAX(Type)                                           \
@@ -2849,7 +2755,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) {
 void InstructionSelector::VisitS128Const(Node* node) {
   S390OperandGenerator g(this);
   uint32_t val[kSimd128Size / sizeof(uint32_t)];
-  memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  base::Memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
   // If all bytes are zeros, avoid emitting code for generic constants.
   bool all_zeros = !(val[0] || val[1] || val[2] || val[3]);
   bool all_ones = val[0] == UINT32_MAX && val[1] == UINT32_MAX &&
@@ -2891,7 +2797,6 @@ void InstructionSelector::EmitPrepareResults(
     Node* node) {
   S390OperandGenerator g(this);
 
-  int reverse_slot = 1;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -2904,10 +2809,11 @@ void InstructionSelector::EmitPrepareResults(
       } else if (output.location.GetType() == MachineType::Simd128()) {
         MarkAsSimd128(output.node);
       }
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       Emit(kS390_Peek, g.DefineAsRegister(output.node),
            g.UseImmediate(reverse_slot));
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
diff --git a/deps/v8/src/compiler/backend/x64/code-generator-x64.cc b/deps/v8/src/compiler/backend/x64/code-generator-x64.cc
index df1d6de8355a79..e905c7194fd6f8 100644
--- a/deps/v8/src/compiler/backend/x64/code-generator-x64.cc
+++ b/deps/v8/src/compiler/backend/x64/code-generator-x64.cc
@@ -5,9 +5,12 @@
 #include <limits>
 
 #include "src/base/overflowing-math.h"
+#include "src/codegen/assembler.h"
+#include "src/codegen/cpu-features.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/optimized-compilation-info.h"
 #include "src/codegen/x64/assembler-x64.h"
+#include "src/codegen/x64/register-x64.h"
 #include "src/compiler/backend/code-generator-impl.h"
 #include "src/compiler/backend/code-generator.h"
 #include "src/compiler/backend/gap-resolver.h"
@@ -598,22 +601,37 @@ void EmitWordLoadPoisoningIfNeeded(CodeGenerator* codegen,
     }                                                             \
   } while (false)
 
-#define ASSEMBLE_SIMD_PUNPCK_SHUFFLE(opcode)             \
-  do {                                                   \
-    XMMRegister dst = i.OutputSimd128Register();         \
-    DCHECK_EQ(dst, i.InputSimd128Register(0));           \
-    byte input_index = instr->InputCount() == 2 ? 1 : 0; \
-    ASSEMBLE_SIMD_INSTR(opcode, dst, input_index);       \
+#define ASSEMBLE_SIMD_PUNPCK_SHUFFLE(opcode)                    \
+  do {                                                          \
+    XMMRegister dst = i.OutputSimd128Register();                \
+    byte input_index = instr->InputCount() == 2 ? 1 : 0;        \
+    if (CpuFeatures::IsSupported(AVX)) {                        \
+      CpuFeatureScope avx_scope(tasm(), AVX);                   \
+      DCHECK(instr->InputAt(input_index)->IsSimd128Register()); \
+      __ v##opcode(dst, i.InputSimd128Register(0),              \
+                   i.InputSimd128Register(input_index));        \
+    } else {                                                    \
+      DCHECK_EQ(dst, i.InputSimd128Register(0));                \
+      ASSEMBLE_SIMD_INSTR(opcode, dst, input_index);            \
+    }                                                           \
   } while (false)
 
-#define ASSEMBLE_SIMD_IMM_SHUFFLE(opcode, imm)                              \
-  do {                                                                      \
-    DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));        \
-    if (instr->InputAt(1)->IsSimd128Register()) {                           \
-      __ opcode(i.OutputSimd128Register(), i.InputSimd128Register(1), imm); \
-    } else {                                                                \
-      __ opcode(i.OutputSimd128Register(), i.InputOperand(1), imm);         \
-    }                                                                       \
+#define ASSEMBLE_SIMD_IMM_SHUFFLE(opcode, imm)                \
+  do {                                                        \
+    XMMRegister dst = i.OutputSimd128Register();              \
+    XMMRegister src = i.InputSimd128Register(0);              \
+    if (CpuFeatures::IsSupported(AVX)) {                      \
+      CpuFeatureScope avx_scope(tasm(), AVX);                 \
+      DCHECK(instr->InputAt(1)->IsSimd128Register());         \
+      __ v##opcode(dst, src, i.InputSimd128Register(1), imm); \
+    } else {                                                  \
+      DCHECK_EQ(dst, src);                                    \
+      if (instr->InputAt(1)->IsSimd128Register()) {           \
+        __ opcode(dst, i.InputSimd128Register(1), imm);       \
+      } else {                                                \
+        __ opcode(dst, i.InputOperand(1), imm);               \
+      }                                                       \
+    }                                                         \
   } while (false)
 
 #define ASSEMBLE_SIMD_ALL_TRUE(opcode)          \
@@ -1098,7 +1116,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     case kArchDeoptimize: {
       DeoptimizationExit* exit =
-          BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
+          BuildTranslation(instr, -1, 0, 0, OutputFrameStateCombine::Ignore());
       __ jmp(exit->label());
       break;
     }
@@ -1665,20 +1683,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     }
     case kX64F64x2Abs:
     case kSSEFloat64Abs: {
-      // TODO(bmeurer): Use RIP relative 128-bit constants.
-      XMMRegister tmp = i.ToDoubleRegister(instr->TempAt(0));
-      __ Pcmpeqd(tmp, tmp);
-      __ Psrlq(tmp, 1);
-      __ Andpd(i.OutputDoubleRegister(), tmp);
+      __ Abspd(i.OutputDoubleRegister());
       break;
     }
     case kX64F64x2Neg:
     case kSSEFloat64Neg: {
-      // TODO(bmeurer): Use RIP relative 128-bit constants.
-      XMMRegister tmp = i.ToDoubleRegister(instr->TempAt(0));
-      __ Pcmpeqd(tmp, tmp);
-      __ Psllq(tmp, 63);
-      __ Xorpd(i.OutputDoubleRegister(), tmp);
+      __ Negpd(i.OutputDoubleRegister());
       break;
     }
     case kSSEFloat64Sqrt:
@@ -2385,8 +2395,21 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64F64x2ExtractLane: {
-      __ Pextrq(kScratchRegister, i.InputSimd128Register(0), i.InputInt8(1));
-      __ Movq(i.OutputDoubleRegister(), kScratchRegister);
+      DoubleRegister dst = i.OutputDoubleRegister();
+      XMMRegister src = i.InputSimd128Register(0);
+      uint8_t lane = i.InputUint8(1);
+      if (lane == 0) {
+        __ Move(dst, src);
+      } else {
+        DCHECK_EQ(1, lane);
+        if (CpuFeatures::IsSupported(AVX)) {
+          CpuFeatureScope avx_scope(tasm(), AVX);
+          // Pass src as operand to avoid false-dependency on dst.
+          __ vmovhlps(dst, src, src);
+        } else {
+          __ movhlps(dst, src);
+        }
+      }
       break;
     }
     case kX64F64x2Sqrt: {
@@ -2491,19 +2514,42 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64F32x4Splat: {
-      __ Shufps(i.OutputSimd128Register(), i.InputDoubleRegister(0), 0);
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputDoubleRegister(0);
+      if (CpuFeatures::IsSupported(AVX2)) {
+        CpuFeatureScope avx2_scope(tasm(), AVX2);
+        __ vbroadcastss(dst, src);
+      } else if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vshufps(dst, src, src, 0);
+      } else {
+        if (dst == src) {
+          // 1 byte shorter than pshufd.
+          __ shufps(dst, src, 0);
+        } else {
+          __ pshufd(dst, src, 0);
+        }
+      }
       break;
     }
     case kX64F32x4ExtractLane: {
-      if (CpuFeatures::IsSupported(AVX)) {
-        CpuFeatureScope avx_scope(tasm(), AVX);
-        XMMRegister src = i.InputSimd128Register(0);
-        // vshufps and leave junk in the 3 high lanes.
-        __ vshufps(i.OutputDoubleRegister(), src, src, i.InputInt8(1));
+      XMMRegister dst = i.OutputDoubleRegister();
+      XMMRegister src = i.InputSimd128Register(0);
+      uint8_t lane = i.InputUint8(1);
+      DCHECK_LT(lane, 4);
+      // These instructions are shorter than insertps, but will leave junk in
+      // the top lanes of dst.
+      if (lane == 0) {
+        __ Move(dst, src);
+      } else if (lane == 1) {
+        __ Movshdup(dst, src);
+      } else if (lane == 2 && dst == src) {
+        // Check dst == src to avoid false dependency on dst.
+        __ Movhlps(dst, src);
+      } else if (dst == src) {
+        __ Shufps(dst, src, src, lane);
       } else {
-        __ extractps(kScratchRegister, i.InputSimd128Register(0),
-                     i.InputUint8(1));
-        __ movd(i.OutputDoubleRegister(), kScratchRegister);
+        __ Pshufd(dst, src, lane);
       }
       break;
     }
@@ -2719,10 +2765,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister dst = i.OutputSimd128Register();
       if (HasRegisterInput(instr, 0)) {
         __ Movq(dst, i.InputRegister(0));
+        __ Movddup(dst, dst);
       } else {
-        __ Movq(dst, i.InputOperand(0));
+        __ Movddup(dst, i.InputOperand(0));
       }
-      __ Movddup(dst, dst);
       break;
     }
     case kX64I64x2ExtractLane: {
@@ -2733,7 +2779,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister dst = i.OutputSimd128Register();
       XMMRegister src = i.InputSimd128Register(0);
       if (dst == src) {
-        __ Movapd(kScratchDoubleReg, src);
+        __ Movdqa(kScratchDoubleReg, src);
         src = kScratchDoubleReg;
       }
       __ Pxor(dst, dst);
@@ -2783,8 +2829,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister tmp1 = i.TempSimd128Register(0);
       XMMRegister tmp2 = i.TempSimd128Register(1);
 
-      __ Movaps(tmp1, left);
-      __ Movaps(tmp2, right);
+      __ Movdqa(tmp1, left);
+      __ Movdqa(tmp2, right);
 
       // Multiply high dword of each qword of left with right.
       __ Psrlq(tmp1, 32);
@@ -2810,11 +2856,70 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_SIMD_SHIFT(psrlq, 6);
       break;
     }
+    case kX64I64x2ExtMulLowI32x4S: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/true,
+                     /*is_signed=*/true);
+      break;
+    }
+    case kX64I64x2ExtMulHighI32x4S: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/false,
+                     /*is_signed=*/true);
+      break;
+    }
+    case kX64I64x2ExtMulLowI32x4U: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/true,
+                     /*is_signed=*/false);
+      break;
+    }
+    case kX64I64x2ExtMulHighI32x4U: {
+      __ I64x2ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/false,
+                     /*is_signed=*/false);
+      break;
+    }
+    case kX64I64x2SConvertI32x4Low: {
+      __ Pmovsxdq(i.OutputSimd128Register(), i.InputSimd128Register(0));
+      break;
+    }
+    case kX64I64x2SConvertI32x4High: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vpunpckhqdq(dst, src, src);
+      } else {
+        __ pshufd(dst, src, 0xEE);
+      }
+      __ Pmovsxdq(dst, dst);
+      break;
+    }
+    case kX64I64x2UConvertI32x4Low: {
+      __ Pmovzxdq(i.OutputSimd128Register(), i.InputSimd128Register(0));
+      break;
+    }
+    case kX64I64x2UConvertI32x4High: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      if (CpuFeatures::IsSupported(AVX)) {
+        CpuFeatureScope avx_scope(tasm(), AVX);
+        __ vpxor(kScratchDoubleReg, kScratchDoubleReg, kScratchDoubleReg);
+        __ vpunpckhdq(dst, src, kScratchDoubleReg);
+      } else {
+        CpuFeatureScope sse_scope(tasm(), SSE4_1);
+        __ pshufd(dst, src, 0xEE);
+        __ pmovzxdq(dst, dst);
+      }
+      break;
+    }
     case kX64I32x4Splat: {
       XMMRegister dst = i.OutputSimd128Register();
       if (HasRegisterInput(instr, 0)) {
         __ Movd(dst, i.InputRegister(0));
       } else {
+        // TODO(v8:9198): Pshufd can load from aligned memory once supported.
         __ Movd(dst, i.InputOperand(0));
       }
       __ Pshufd(dst, dst, uint8_t{0x0});
@@ -2848,9 +2953,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64I32x4SConvertI16x8High: {
-      XMMRegister dst = i.OutputSimd128Register();
-      __ Palignr(dst, i.InputSimd128Register(0), uint8_t{8});
-      __ Pmovsxwd(dst, dst);
+      __ I32x4SConvertI16x8High(i.OutputSimd128Register(),
+                                i.InputSimd128Register(0));
       break;
     }
     case kX64I32x4Neg: {
@@ -2954,9 +3058,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64I32x4UConvertI16x8High: {
-      XMMRegister dst = i.OutputSimd128Register();
-      __ Palignr(dst, i.InputSimd128Register(0), uint8_t{8});
-      __ Pmovzxwd(dst, dst);
+      __ I32x4UConvertI16x8High(i.OutputSimd128Register(),
+                                i.InputSimd128Register(0));
       break;
     }
     case kX64I32x4ShrU: {
@@ -3001,6 +3104,35 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       ASSEMBLE_SIMD_BINOP(pmaddwd);
       break;
     }
+    case kX64I32x4ExtAddPairwiseI16x8S: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      // kScratchDoubleReg = |1|1|1|1|1|1|1|1|
+      __ Pcmpeqw(kScratchDoubleReg, kScratchDoubleReg);
+      __ Psrlw(kScratchDoubleReg, byte{15});
+      // pmaddwd multiplies signed words in kScratchDoubleReg and src, producing
+      // signed doublewords, then adds pairwise.
+      // src = |a|b|c|d|e|f|g|h|
+      // dst = | a*1 + b*1 | c*1 + d*1 | e*1 + f*1 | g*1 + h*1 |
+      __ Pmaddwd(dst, src, kScratchDoubleReg);
+      break;
+    }
+    case kX64I32x4ExtAddPairwiseI16x8U: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+
+      // src = |a|b|c|d|e|f|g|h|
+      // kScratchDoubleReg = i32x4.splat(0x0000FFFF)
+      __ Pcmpeqd(kScratchDoubleReg, kScratchDoubleReg);
+      __ Psrld(kScratchDoubleReg, byte{16});
+      // kScratchDoubleReg =|0|b|0|d|0|f|0|h|
+      __ Pand(kScratchDoubleReg, src);
+      // dst = |0|a|0|c|0|e|0|g|
+      __ Psrld(dst, src, byte{16});
+      // dst = |a+b|c+d|e+f|g+h|
+      __ Paddd(dst, kScratchDoubleReg);
+      break;
+    }
     case kX64S128Const: {
       // Emit code for generic constants as all zeros, or ones cases will be
       // handled separately by the selector.
@@ -3044,9 +3176,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64I16x8SConvertI8x16High: {
-      XMMRegister dst = i.OutputSimd128Register();
-      __ Palignr(dst, i.InputSimd128Register(0), uint8_t{8});
-      __ Pmovsxbw(dst, dst);
+      __ I16x8SConvertI8x16High(i.OutputSimd128Register(),
+                                i.InputSimd128Register(0));
       break;
     }
     case kX64I16x8Neg: {
@@ -3134,9 +3265,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64I16x8UConvertI8x16High: {
-      XMMRegister dst = i.OutputSimd128Register();
-      __ Palignr(dst, i.InputSimd128Register(0), uint8_t{8});
-      __ Pmovzxbw(dst, dst);
+      __ I16x8UConvertI8x16High(i.OutputSimd128Register(),
+                                i.InputSimd128Register(0));
       break;
     }
     case kX64I16x8ShrU: {
@@ -3197,6 +3327,62 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       __ shrq(dst, Immediate(8));
       break;
     }
+    case kX64I16x8ExtMulLowI8x16S: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/true,
+                     /*is_signed=*/true);
+      break;
+    }
+    case kX64I16x8ExtMulHighI8x16S: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/false,
+                     /*is_signed=*/true);
+      break;
+    }
+    case kX64I16x8ExtMulLowI8x16U: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/true,
+                     /*is_signed=*/false);
+      break;
+    }
+    case kX64I16x8ExtMulHighI8x16U: {
+      __ I16x8ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/false,
+                     /*is_signed=*/false);
+      break;
+    }
+    case kX64I16x8ExtAddPairwiseI8x16S: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      DCHECK_NE(dst, src);
+      // dst = i8x16.splat(1)
+      __ Move(dst, uint32_t{0x01010101});
+      __ Pshufd(dst, dst, byte{0});
+      __ Pmaddubsw(dst, dst, src);
+      break;
+    }
+    case kX64I16x8ExtAddPairwiseI8x16U: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      // dst = i8x16.splat(1)
+      __ Move(kScratchDoubleReg, uint32_t{0x01010101});
+      __ Pshufd(kScratchDoubleReg, kScratchDoubleReg, byte{0});
+      __ Pmaddubsw(dst, src, kScratchDoubleReg);
+      break;
+    }
+    case kX64I16x8Q15MulRSatS: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src0 = i.InputSimd128Register(0);
+      XMMRegister src1 = i.InputSimd128Register(1);
+      // k = i16x8.splat(0x8000)
+      __ Pcmpeqd(kScratchDoubleReg, kScratchDoubleReg);
+      __ Psllw(kScratchDoubleReg, byte{15});
+
+      __ Pmulhrsw(dst, src0, src1);
+      __ Pcmpeqw(kScratchDoubleReg, dst);
+      __ Pxor(dst, kScratchDoubleReg);
+      break;
+    }
     case kX64I8x16Splat: {
       XMMRegister dst = i.OutputSimd128Register();
       if (HasRegisterInput(instr, 0)) {
@@ -3363,8 +3549,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       // right= BBbb BBbb ... BBbb BBbb
       // t = 00AA 00AA ... 00AA 00AA
       // s = 00BB 00BB ... 00BB 00BB
-      __ Movaps(tmp, dst);
-      __ Movaps(kScratchDoubleReg, right);
+      __ Movdqa(tmp, dst);
+      __ Movdqa(kScratchDoubleReg, right);
       __ Psrlw(tmp, byte{8});
       __ Psrlw(kScratchDoubleReg, byte{8});
       // dst = left * 256
@@ -3513,12 +3699,12 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
         XMMRegister mask = i.InputSimd128Register(2);
         DCHECK_EQ(xmm0, mask);
-        __ movapd(kScratchDoubleReg, mask);
-        __ pxor(mask, mask);
+        __ movaps(kScratchDoubleReg, mask);
+        __ xorps(mask, mask);
         __ pcmpgtw(mask, kScratchDoubleReg);
         __ pblendvb(i.OutputSimd128Register(), i.InputSimd128Register(1));
         // Restore mask.
-        __ movapd(mask, kScratchDoubleReg);
+        __ movaps(mask, kScratchDoubleReg);
       }
       break;
     }
@@ -3527,6 +3713,30 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
                   i.InputSimd128Register(1), i.InputSimd128Register(2));
       break;
     }
+    case kX64I32x4ExtMulLowI16x8S: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/true,
+                     /*is_signed=*/true);
+      break;
+    }
+    case kX64I32x4ExtMulHighI16x8S: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/false,
+                     /*is_signed=*/true);
+      break;
+    }
+    case kX64I32x4ExtMulLowI16x8U: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/true,
+                     /*is_signed=*/false);
+      break;
+    }
+    case kX64I32x4ExtMulHighI16x8U: {
+      __ I32x4ExtMul(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                     i.InputSimd128Register(1), /*low=*/false,
+                     /*is_signed=*/false);
+      break;
+    }
     case kX64I64x2SignSelect: {
       __ Blendvpd(i.OutputSimd128Register(), i.InputSimd128Register(0),
                   i.InputSimd128Register(1), i.InputSimd128Register(2));
@@ -3548,7 +3758,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister dst = i.OutputSimd128Register();
       XMMRegister src = i.InputSimd128Register(0);
       if (dst == src) {
-        __ Movaps(kScratchDoubleReg, dst);
+        __ Movdqa(kScratchDoubleReg, dst);
         __ Pcmpeqd(dst, dst);
         __ Pxor(dst, kScratchDoubleReg);
       } else {
@@ -3559,12 +3769,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64S128Select: {
-      // Mask used here is stored in dst.
-      XMMRegister dst = i.OutputSimd128Register();
-      __ Movaps(kScratchDoubleReg, i.InputSimd128Register(1));
-      __ Xorps(kScratchDoubleReg, i.InputSimd128Register(2));
-      __ Andps(dst, kScratchDoubleReg);
-      __ Xorps(dst, i.InputSimd128Register(2));
+      __ S128Select(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                    i.InputSimd128Register(1), i.InputSimd128Register(2));
       break;
     }
     case kX64S128AndNot: {
@@ -3591,6 +3797,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kX64I8x16Shuffle: {
       XMMRegister dst = i.OutputSimd128Register();
       XMMRegister tmp_simd = i.TempSimd128Register(0);
+      DCHECK_NE(tmp_simd, i.InputSimd128Register(0));
       if (instr->InputCount() == 5) {  // only one input operand
         uint32_t mask[4] = {};
         DCHECK_EQ(i.OutputSimd128Register(), i.InputSimd128Register(0));
@@ -3601,8 +3808,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         SetupSimdImmediateInRegister(tasm(), mask, tmp_simd);
         __ Pshufb(dst, tmp_simd);
       } else {  // two input operands
+        DCHECK_NE(tmp_simd, i.InputSimd128Register(1));
         DCHECK_EQ(6, instr->InputCount());
-        ASSEMBLE_SIMD_INSTR(Movups, kScratchDoubleReg, 0);
+        ASSEMBLE_SIMD_INSTR(Movdqu, kScratchDoubleReg, 0);
         uint32_t mask1[4] = {};
         for (int j = 5; j > 1; j--) {
           uint32_t lanes = i.InputUint32(j);
@@ -3616,9 +3824,9 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         uint32_t mask2[4] = {};
         if (instr->InputAt(1)->IsSimd128Register()) {
           XMMRegister src1 = i.InputSimd128Register(1);
-          if (src1 != dst) __ movups(dst, src1);
+          if (src1 != dst) __ Movdqa(dst, src1);
         } else {
-          __ Movups(dst, i.InputOperand(1));
+          __ Movdqu(dst, i.InputOperand(1));
         }
         for (int j = 5; j > 1; j--) {
           uint32_t lanes = i.InputUint32(j);
@@ -3636,17 +3844,27 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
     case kX64S128Load8Splat: {
       EmitOOLTrapIfNeeded(zone(), this, opcode, instr, __ pc_offset());
       XMMRegister dst = i.OutputSimd128Register();
-      __ Pinsrb(dst, dst, i.MemoryOperand(), 0);
-      __ Pxor(kScratchDoubleReg, kScratchDoubleReg);
-      __ Pshufb(dst, kScratchDoubleReg);
+      if (CpuFeatures::IsSupported(AVX2)) {
+        CpuFeatureScope avx2_scope(tasm(), AVX2);
+        __ vpbroadcastb(dst, i.MemoryOperand());
+      } else {
+        __ Pinsrb(dst, dst, i.MemoryOperand(), 0);
+        __ Pxor(kScratchDoubleReg, kScratchDoubleReg);
+        __ Pshufb(dst, kScratchDoubleReg);
+      }
       break;
     }
     case kX64S128Load16Splat: {
       EmitOOLTrapIfNeeded(zone(), this, opcode, instr, __ pc_offset());
       XMMRegister dst = i.OutputSimd128Register();
-      __ Pinsrw(dst, dst, i.MemoryOperand(), 0);
-      __ Pshuflw(dst, dst, uint8_t{0});
-      __ Punpcklqdq(dst, dst);
+      if (CpuFeatures::IsSupported(AVX2)) {
+        CpuFeatureScope avx2_scope(tasm(), AVX2);
+        __ vpbroadcastw(dst, i.MemoryOperand());
+      } else {
+        __ Pinsrw(dst, dst, i.MemoryOperand(), 0);
+        __ Pshuflw(dst, dst, uint8_t{0});
+        __ Punpcklqdq(dst, dst);
+      }
       break;
     }
     case kX64S128Load32Splat: {
@@ -3722,6 +3940,23 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       }
       break;
     }
+    case kX64Shufps: {
+      __ Shufps(i.OutputSimd128Register(), i.InputSimd128Register(0),
+                i.InputSimd128Register(1), i.InputUint8(2));
+      break;
+    }
+    case kX64S32x4Rotate: {
+      XMMRegister dst = i.OutputSimd128Register();
+      XMMRegister src = i.InputSimd128Register(0);
+      uint8_t mask = i.InputUint8(1);
+      if (dst == src) {
+        // 1-byte shorter encoding than pshufd.
+        __ Shufps(dst, src, src, mask);
+      } else {
+        __ Pshufd(dst, src, mask);
+      }
+      break;
+    }
     case kX64S32x4Swizzle: {
       DCHECK_EQ(2, instr->InputCount());
       ASSEMBLE_SIMD_IMM_INSTR(Pshufd, i.OutputSimd128Register(), 0,
@@ -3738,7 +3973,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64S16x8Blend: {
-      ASSEMBLE_SIMD_IMM_SHUFFLE(Pblendw, i.InputUint8(2));
+      ASSEMBLE_SIMD_IMM_SHUFFLE(pblendw, i.InputUint8(2));
       break;
     }
     case kX64S16x8HalfShuffle1: {
@@ -3757,7 +3992,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64S8x16Alignr: {
-      ASSEMBLE_SIMD_IMM_SHUFFLE(Palignr, i.InputUint8(2));
+      ASSEMBLE_SIMD_IMM_SHUFFLE(palignr, i.InputUint8(2));
       break;
     }
     case kX64S16x8Dup: {
@@ -3796,35 +4031,35 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       break;
     }
     case kX64S64x2UnpackHigh:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpckhqdq);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpckhqdq);
       break;
     case kX64S32x4UnpackHigh:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpckhdq);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpckhdq);
       break;
     case kX64S16x8UnpackHigh:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpckhwd);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpckhwd);
       break;
     case kX64S8x16UnpackHigh:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpckhbw);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpckhbw);
       break;
     case kX64S64x2UnpackLow:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpcklqdq);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpcklqdq);
       break;
     case kX64S32x4UnpackLow:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpckldq);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpckldq);
       break;
     case kX64S16x8UnpackLow:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpcklwd);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpcklwd);
       break;
     case kX64S8x16UnpackLow:
-      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(Punpcklbw);
+      ASSEMBLE_SIMD_PUNPCK_SHUFFLE(punpcklbw);
       break;
     case kX64S16x8UnzipHigh: {
       XMMRegister dst = i.OutputSimd128Register();
       XMMRegister src2 = dst;
       DCHECK_EQ(dst, i.InputSimd128Register(0));
       if (instr->InputCount() == 2) {
-        ASSEMBLE_SIMD_INSTR(Movups, kScratchDoubleReg, 1);
+        ASSEMBLE_SIMD_INSTR(Movdqu, kScratchDoubleReg, 1);
         __ Psrld(kScratchDoubleReg, byte{16});
         src2 = kScratchDoubleReg;
       }
@@ -3850,7 +4085,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister src2 = dst;
       DCHECK_EQ(dst, i.InputSimd128Register(0));
       if (instr->InputCount() == 2) {
-        ASSEMBLE_SIMD_INSTR(Movups, kScratchDoubleReg, 1);
+        ASSEMBLE_SIMD_INSTR(Movdqu, kScratchDoubleReg, 1);
         __ Psrlw(kScratchDoubleReg, byte{8});
         src2 = kScratchDoubleReg;
       }
@@ -3863,7 +4098,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       XMMRegister src2 = dst;
       DCHECK_EQ(dst, i.InputSimd128Register(0));
       if (instr->InputCount() == 2) {
-        ASSEMBLE_SIMD_INSTR(Movups, kScratchDoubleReg, 1);
+        ASSEMBLE_SIMD_INSTR(Movdqu, kScratchDoubleReg, 1);
         __ Psllw(kScratchDoubleReg, byte{8});
         __ Psrlw(kScratchDoubleReg, byte{8});
         src2 = kScratchDoubleReg;
@@ -3878,10 +4113,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       DCHECK_EQ(dst, i.InputSimd128Register(0));
       __ Psllw(dst, byte{8});
       if (instr->InputCount() == 1) {
-        __ Movups(kScratchDoubleReg, dst);
+        __ Movdqa(kScratchDoubleReg, dst);
       } else {
         DCHECK_EQ(2, instr->InputCount());
-        ASSEMBLE_SIMD_INSTR(Movups, kScratchDoubleReg, 1);
+        ASSEMBLE_SIMD_INSTR(Movdqu, kScratchDoubleReg, 1);
         __ Psllw(kScratchDoubleReg, byte{8});
       }
       __ Psrlw(dst, byte{8});
@@ -3893,10 +4128,10 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
       DCHECK_EQ(dst, i.InputSimd128Register(0));
       __ Psrlw(dst, byte{8});
       if (instr->InputCount() == 1) {
-        __ Movups(kScratchDoubleReg, dst);
+        __ Movdqa(kScratchDoubleReg, dst);
       } else {
         DCHECK_EQ(2, instr->InputCount());
-        ASSEMBLE_SIMD_INSTR(Movups, kScratchDoubleReg, 1);
+        ASSEMBLE_SIMD_INSTR(Movdqu, kScratchDoubleReg, 1);
         __ Psrlw(kScratchDoubleReg, byte{8});
       }
       __ Psllw(kScratchDoubleReg, byte{8});
@@ -3915,7 +4150,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
         __ Pshuflw(dst, dst, shuffle_mask);
         __ Pshufhw(dst, dst, shuffle_mask);
       }
-      __ Movaps(kScratchDoubleReg, dst);
+      __ Movdqa(kScratchDoubleReg, dst);
       __ Psrlw(kScratchDoubleReg, byte{8});
       __ Psllw(dst, byte{8});
       __ Por(dst, kScratchDoubleReg);
@@ -4112,6 +4347,7 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
   return kSuccess;
 }  // NOLadability/fn_size)
 
+#undef ASSEMBLE_PINSR
 #undef ASSEMBLE_UNOP
 #undef ASSEMBLE_BINOP
 #undef ASSEMBLE_COMPARE
diff --git a/deps/v8/src/compiler/backend/x64/instruction-codes-x64.h b/deps/v8/src/compiler/backend/x64/instruction-codes-x64.h
index f1958e8141766c..375a81d09681e0 100644
--- a/deps/v8/src/compiler/backend/x64/instruction-codes-x64.h
+++ b/deps/v8/src/compiler/backend/x64/instruction-codes-x64.h
@@ -212,6 +212,14 @@ namespace compiler {
   V(X64I64x2Eq)                           \
   V(X64I64x2ShrU)                         \
   V(X64I64x2SignSelect)                   \
+  V(X64I64x2ExtMulLowI32x4S)              \
+  V(X64I64x2ExtMulHighI32x4S)             \
+  V(X64I64x2ExtMulLowI32x4U)              \
+  V(X64I64x2ExtMulHighI32x4U)             \
+  V(X64I64x2SConvertI32x4Low)             \
+  V(X64I64x2SConvertI32x4High)            \
+  V(X64I64x2UConvertI32x4Low)             \
+  V(X64I64x2UConvertI32x4High)            \
   V(X64I32x4Splat)                        \
   V(X64I32x4ExtractLane)                  \
   V(X64I32x4SConvertF32x4)                \
@@ -242,6 +250,12 @@ namespace compiler {
   V(X64I32x4BitMask)                      \
   V(X64I32x4DotI16x8S)                    \
   V(X64I32x4SignSelect)                   \
+  V(X64I32x4ExtMulLowI16x8S)              \
+  V(X64I32x4ExtMulHighI16x8S)             \
+  V(X64I32x4ExtMulLowI16x8U)              \
+  V(X64I32x4ExtMulHighI16x8U)             \
+  V(X64I32x4ExtAddPairwiseI16x8S)         \
+  V(X64I32x4ExtAddPairwiseI16x8U)         \
   V(X64I16x8Splat)                        \
   V(X64I16x8ExtractLaneS)                 \
   V(X64I16x8SConvertI8x16Low)             \
@@ -276,6 +290,13 @@ namespace compiler {
   V(X64I16x8Abs)                          \
   V(X64I16x8BitMask)                      \
   V(X64I16x8SignSelect)                   \
+  V(X64I16x8ExtMulLowI8x16S)              \
+  V(X64I16x8ExtMulHighI8x16S)             \
+  V(X64I16x8ExtMulLowI8x16U)              \
+  V(X64I16x8ExtMulHighI8x16U)             \
+  V(X64I16x8ExtAddPairwiseI8x16S)         \
+  V(X64I16x8ExtAddPairwiseI8x16U)         \
+  V(X64I16x8Q15MulRSatS)                  \
   V(X64I8x16Splat)                        \
   V(X64I8x16ExtractLaneS)                 \
   V(X64Pinsrb)                            \
@@ -334,6 +355,8 @@ namespace compiler {
   V(X64S128Load32x2U)                     \
   V(X64S128Store32Lane)                   \
   V(X64S128Store64Lane)                   \
+  V(X64Shufps)                            \
+  V(X64S32x4Rotate)                       \
   V(X64S32x4Swizzle)                      \
   V(X64S32x4Shuffle)                      \
   V(X64S16x8Blend)                        \
diff --git a/deps/v8/src/compiler/backend/x64/instruction-scheduler-x64.cc b/deps/v8/src/compiler/backend/x64/instruction-scheduler-x64.cc
index 2af0877e537807..e9ed7c9e854180 100644
--- a/deps/v8/src/compiler/backend/x64/instruction-scheduler-x64.cc
+++ b/deps/v8/src/compiler/backend/x64/instruction-scheduler-x64.cc
@@ -188,6 +188,14 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kX64I64x2Eq:
     case kX64I64x2ShrU:
     case kX64I64x2SignSelect:
+    case kX64I64x2ExtMulLowI32x4S:
+    case kX64I64x2ExtMulHighI32x4S:
+    case kX64I64x2ExtMulLowI32x4U:
+    case kX64I64x2ExtMulHighI32x4U:
+    case kX64I64x2SConvertI32x4Low:
+    case kX64I64x2SConvertI32x4High:
+    case kX64I64x2UConvertI32x4Low:
+    case kX64I64x2UConvertI32x4High:
     case kX64I32x4Splat:
     case kX64I32x4ExtractLane:
     case kX64I32x4SConvertF32x4:
@@ -218,6 +226,12 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kX64I32x4BitMask:
     case kX64I32x4DotI16x8S:
     case kX64I32x4SignSelect:
+    case kX64I32x4ExtMulLowI16x8S:
+    case kX64I32x4ExtMulHighI16x8S:
+    case kX64I32x4ExtMulLowI16x8U:
+    case kX64I32x4ExtMulHighI16x8U:
+    case kX64I32x4ExtAddPairwiseI16x8S:
+    case kX64I32x4ExtAddPairwiseI16x8U:
     case kX64I16x8Splat:
     case kX64I16x8ExtractLaneS:
     case kX64I16x8SConvertI8x16Low:
@@ -252,6 +266,13 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kX64I16x8Abs:
     case kX64I16x8BitMask:
     case kX64I16x8SignSelect:
+    case kX64I16x8ExtMulLowI8x16S:
+    case kX64I16x8ExtMulHighI8x16S:
+    case kX64I16x8ExtMulLowI8x16U:
+    case kX64I16x8ExtMulHighI8x16U:
+    case kX64I16x8ExtAddPairwiseI8x16S:
+    case kX64I16x8ExtAddPairwiseI8x16U:
+    case kX64I16x8Q15MulRSatS:
     case kX64I8x16Splat:
     case kX64I8x16ExtractLaneS:
     case kX64I8x16SConvertI16x8:
@@ -296,6 +317,8 @@ int InstructionScheduler::GetTargetInstructionFlags(
     case kX64V16x8AllTrue:
     case kX64I8x16Swizzle:
     case kX64I8x16Shuffle:
+    case kX64Shufps:
+    case kX64S32x4Rotate:
     case kX64S32x4Swizzle:
     case kX64S32x4Shuffle:
     case kX64S16x8Blend:
diff --git a/deps/v8/src/compiler/backend/x64/instruction-selector-x64.cc b/deps/v8/src/compiler/backend/x64/instruction-selector-x64.cc
index 7a8a2b4aa64b15..e2d8cf27bfcd5b 100644
--- a/deps/v8/src/compiler/backend/x64/instruction-selector-x64.cc
+++ b/deps/v8/src/compiler/backend/x64/instruction-selector-x64.cc
@@ -7,6 +7,8 @@
 #include "src/base/iterator.h"
 #include "src/base/logging.h"
 #include "src/base/overflowing-math.h"
+#include "src/base/platform/wrappers.h"
+#include "src/codegen/cpu-features.h"
 #include "src/codegen/machine-type.h"
 #include "src/compiler/backend/instruction-selector-impl.h"
 #include "src/compiler/machine-operator.h"
@@ -479,8 +481,7 @@ void InstructionSelector::VisitStore(Node* node) {
     write_barrier_kind = kFullWriteBarrier;
   }
 
-  if (write_barrier_kind != kNoWriteBarrier &&
-      V8_LIKELY(!FLAG_disable_write_barriers)) {
+  if (write_barrier_kind != kNoWriteBarrier && !FLAG_disable_write_barriers) {
     DCHECK(CanBeTaggedOrCompressedPointer(store_rep.representation()));
     AddressingMode addressing_mode;
     InstructionOperand inputs[] = {
@@ -1826,8 +1827,6 @@ void InstructionSelector::EmitPrepareResults(
     ZoneVector<PushParameter>* results, const CallDescriptor* call_descriptor,
     Node* node) {
   X64OperandGenerator g(this);
-
-  int reverse_slot = 1;
   for (PushParameter output : *results) {
     if (!output.location.IsCallerFrameSlot()) continue;
     // Skip any alignment holes in nodes.
@@ -1841,10 +1840,11 @@ void InstructionSelector::EmitPrepareResults(
         MarkAsSimd128(output.node);
       }
       InstructionOperand result = g.DefineAsRegister(output.node);
+      int offset = call_descriptor->GetOffsetToReturns();
+      int reverse_slot = -output.location.GetLocation() - offset;
       InstructionOperand slot = g.UseImmediate(reverse_slot);
       Emit(kX64Peek, 1, &result, 1, &slot);
     }
-    reverse_slot += output.location.GetSizeInPointers();
   }
 }
 
@@ -2820,6 +2820,10 @@ VISIT_ATOMIC_BINOP(Xor)
   V(I64x2Add)                      \
   V(I64x2Sub)                      \
   V(I64x2Eq)                       \
+  V(I64x2ExtMulLowI32x4S)          \
+  V(I64x2ExtMulHighI32x4S)         \
+  V(I64x2ExtMulLowI32x4U)          \
+  V(I64x2ExtMulHighI32x4U)         \
   V(I32x4Add)                      \
   V(I32x4AddHoriz)                 \
   V(I32x4Sub)                      \
@@ -2831,6 +2835,10 @@ VISIT_ATOMIC_BINOP(Xor)
   V(I32x4MinU)                     \
   V(I32x4MaxU)                     \
   V(I32x4DotI16x8S)                \
+  V(I32x4ExtMulLowI16x8S)          \
+  V(I32x4ExtMulHighI16x8S)         \
+  V(I32x4ExtMulLowI16x8U)          \
+  V(I32x4ExtMulHighI16x8U)         \
   V(I16x8SConvertI32x4)            \
   V(I16x8UConvertI32x4)            \
   V(I16x8Add)                      \
@@ -2848,6 +2856,11 @@ VISIT_ATOMIC_BINOP(Xor)
   V(I16x8MinU)                     \
   V(I16x8MaxU)                     \
   V(I16x8RoundingAverageU)         \
+  V(I16x8ExtMulLowI8x16S)          \
+  V(I16x8ExtMulHighI8x16S)         \
+  V(I16x8ExtMulLowI8x16U)          \
+  V(I16x8ExtMulHighI8x16U)         \
+  V(I16x8Q15MulRSatS)              \
   V(I8x16SConvertI16x8)            \
   V(I8x16UConvertI16x8)            \
   V(I8x16Add)                      \
@@ -2898,6 +2911,10 @@ VISIT_ATOMIC_BINOP(Xor)
   V(F32x4RecipSqrtApprox)   \
   V(I64x2Neg)               \
   V(I64x2BitMask)           \
+  V(I64x2SConvertI32x4Low)  \
+  V(I64x2SConvertI32x4High) \
+  V(I64x2UConvertI32x4Low)  \
+  V(I64x2UConvertI32x4High) \
   V(I32x4SConvertI16x8Low)  \
   V(I32x4SConvertI16x8High) \
   V(I32x4Neg)               \
@@ -2944,7 +2961,7 @@ void InstructionSelector::VisitS128Const(Node* node) {
   X64OperandGenerator g(this);
   static const int kUint32Immediates = kSimd128Size / sizeof(uint32_t);
   uint32_t val[kUint32Immediates];
-  memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
+  base::Memcpy(val, S128ImmediateParameterOf(node->op()).data(), kSimd128Size);
   // If all bytes are zeros or ones, avoid emitting code for generic constants
   bool all_zeros = !(val[0] || val[1] || val[2] || val[3]);
   bool all_ones = val[0] == UINT32_MAX && val[1] == UINT32_MAX &&
@@ -2993,9 +3010,8 @@ void InstructionSelector::VisitF64x2Splat(Node* node) {
 
 void InstructionSelector::VisitF32x4Splat(Node* node) {
   X64OperandGenerator g(this);
-  InstructionOperand dst =
-      IsSupported(AVX) ? g.DefineAsRegister(node) : g.DefineSameAsFirst(node);
-  Emit(kX64F32x4Splat, dst, g.UseRegister(node->InputAt(0)));
+  Emit(kX64F32x4Splat, g.DefineAsRegister(node),
+       g.UseRegister(node->InputAt(0)));
 }
 
 #define SIMD_VISIT_EXTRACT_LANE(Type, Sign, Op)                               \
@@ -3149,9 +3165,10 @@ SIMD_ALLTRUE_LIST(VISIT_SIMD_ALLTRUE)
 
 void InstructionSelector::VisitS128Select(Node* node) {
   X64OperandGenerator g(this);
-  Emit(kX64S128Select, g.DefineSameAsFirst(node),
-       g.UseRegister(node->InputAt(0)), g.UseRegister(node->InputAt(1)),
-       g.UseRegister(node->InputAt(2)));
+  InstructionOperand dst =
+      IsSupported(AVX) ? g.DefineAsRegister(node) : g.DefineSameAsFirst(node);
+  Emit(kX64S128Select, dst, g.UseRegister(node->InputAt(0)),
+       g.UseRegister(node->InputAt(1)), g.UseRegister(node->InputAt(2)));
 }
 
 namespace {
@@ -3197,16 +3214,14 @@ void InstructionSelector::VisitS128AndNot(Node* node) {
 
 void InstructionSelector::VisitF64x2Abs(Node* node) {
   X64OperandGenerator g(this);
-  InstructionOperand temps[] = {g.TempDoubleRegister()};
-  Emit(kX64F64x2Abs, g.DefineSameAsFirst(node), g.UseRegister(node->InputAt(0)),
-       arraysize(temps), temps);
+  Emit(kX64F64x2Abs, g.DefineSameAsFirst(node),
+       g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitF64x2Neg(Node* node) {
   X64OperandGenerator g(this);
-  InstructionOperand temps[] = {g.TempDoubleRegister()};
-  Emit(kX64F64x2Neg, g.DefineSameAsFirst(node), g.UseRegister(node->InputAt(0)),
-       arraysize(temps), temps);
+  Emit(kX64F64x2Neg, g.DefineSameAsFirst(node),
+       g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitF32x4UConvertI32x4(Node* node) {
@@ -3324,6 +3339,10 @@ struct ShuffleEntry {
   ArchOpcode opcode;
   bool src0_needs_reg;
   bool src1_needs_reg;
+  // If AVX is supported, this shuffle can use AVX's three-operand encoding, so
+  // does not require same as first. We conservatively set this to false
+  // (original behavior), and selectively enable for specific arch shuffles.
+  bool no_same_as_first_if_avx = false;
 };
 
 // Shuffles that map to architecture-specific instruction sequences. These are
@@ -3335,34 +3354,42 @@ static const ShuffleEntry arch_shuffles[] = {
     {{0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23},
      kX64S64x2UnpackLow,
      true,
+     true,
      true},
     {{8, 9, 10, 11, 12, 13, 14, 15, 24, 25, 26, 27, 28, 29, 30, 31},
      kX64S64x2UnpackHigh,
      true,
+     true,
      true},
     {{0, 1, 2, 3, 16, 17, 18, 19, 4, 5, 6, 7, 20, 21, 22, 23},
      kX64S32x4UnpackLow,
      true,
+     true,
      true},
     {{8, 9, 10, 11, 24, 25, 26, 27, 12, 13, 14, 15, 28, 29, 30, 31},
      kX64S32x4UnpackHigh,
      true,
+     true,
      true},
     {{0, 1, 16, 17, 2, 3, 18, 19, 4, 5, 20, 21, 6, 7, 22, 23},
      kX64S16x8UnpackLow,
      true,
+     true,
      true},
     {{8, 9, 24, 25, 10, 11, 26, 27, 12, 13, 28, 29, 14, 15, 30, 31},
      kX64S16x8UnpackHigh,
      true,
+     true,
      true},
     {{0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23},
      kX64S8x16UnpackLow,
      true,
+     true,
      true},
     {{8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31},
      kX64S8x16UnpackHigh,
      true,
+     true,
      true},
 
     {{0, 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21, 24, 25, 28, 29},
@@ -3422,6 +3449,15 @@ bool TryMatchArchShuffle(const uint8_t* shuffle, const ShuffleEntry* table,
   return false;
 }
 
+bool TryMatchShufps(const uint8_t* shuffle32x4) {
+  DCHECK_GT(8, shuffle32x4[2]);
+  DCHECK_GT(8, shuffle32x4[3]);
+  // shufps can be used if the first 2 indices select the first input [0-3], and
+  // the other 2 indices select the second input [4-7].
+  return shuffle32x4[0] < 4 && shuffle32x4[1] < 4 && shuffle32x4[2] > 3 &&
+         shuffle32x4[3] > 3;
+}
+
 }  // namespace
 
 void InstructionSelector::VisitI8x16Shuffle(Node* node) {
@@ -3453,15 +3489,22 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node) {
   int index;
   const ShuffleEntry* arch_shuffle;
   if (wasm::SimdShuffle::TryMatchConcat(shuffle, &offset)) {
-    // Swap inputs from the normal order for (v)palignr.
-    SwapShuffleInputs(node);
-    is_swizzle = false;        // It's simpler to just handle the general case.
-    no_same_as_first = false;  // SSE requires same-as-first.
-    // TODO(v8:9608): also see v8:9083
-    src1_needs_reg = true;
-    opcode = kX64S8x16Alignr;
-    // palignr takes a single imm8 offset.
-    imms[imm_count++] = offset;
+    if (wasm::SimdShuffle::TryMatch32x4Rotate(shuffle, shuffle32x4,
+                                              is_swizzle)) {
+      uint8_t shuffle_mask = wasm::SimdShuffle::PackShuffle4(shuffle32x4);
+      opcode = kX64S32x4Rotate;
+      imms[imm_count++] = shuffle_mask;
+    } else {
+      // Swap inputs from the normal order for (v)palignr.
+      SwapShuffleInputs(node);
+      is_swizzle = false;  // It's simpler to just handle the general case.
+      no_same_as_first = CpuFeatures::IsSupported(AVX);
+      // TODO(v8:9608): also see v8:9083
+      src1_needs_reg = true;
+      opcode = kX64S8x16Alignr;
+      // palignr takes a single imm8 offset.
+      imms[imm_count++] = offset;
+    }
   } else if (TryMatchArchShuffle(shuffle, arch_shuffles,
                                  arraysize(arch_shuffles), is_swizzle,
                                  &arch_shuffle)) {
@@ -3470,7 +3513,8 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node) {
     // SSE can't take advantage of both operands in registers and needs
     // same-as-first.
     src1_needs_reg = arch_shuffle->src1_needs_reg;
-    no_same_as_first = false;
+    no_same_as_first =
+        IsSupported(AVX) && arch_shuffle->no_same_as_first_if_avx;
   } else if (wasm::SimdShuffle::TryMatch32x4Shuffle(shuffle, shuffle32x4)) {
     uint8_t shuffle_mask = wasm::SimdShuffle::PackShuffle4(shuffle32x4);
     if (is_swizzle) {
@@ -3495,6 +3539,13 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node) {
         opcode = kX64S16x8Blend;
         uint8_t blend_mask = wasm::SimdShuffle::PackBlend4(shuffle32x4);
         imms[imm_count++] = blend_mask;
+        no_same_as_first = CpuFeatures::IsSupported(AVX);
+      } else if (TryMatchShufps(shuffle32x4)) {
+        opcode = kX64Shufps;
+        uint8_t mask = wasm::SimdShuffle::PackShuffle4(shuffle32x4);
+        imms[imm_count++] = mask;
+        src1_needs_reg = true;
+        no_same_as_first = IsSupported(AVX);
       } else {
         opcode = kX64S32x4Shuffle;
         no_same_as_first = true;
@@ -3514,6 +3565,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node) {
       opcode = kX64S16x8Blend;
       blend_mask = wasm::SimdShuffle::PackBlend8(shuffle16x8);
       imms[imm_count++] = blend_mask;
+      no_same_as_first = CpuFeatures::IsSupported(AVX);
     } else if (wasm::SimdShuffle::TryMatchSplat<8>(shuffle, &index)) {
       opcode = kX64S16x8Dup;
       src0_needs_reg = false;
@@ -3552,7 +3604,9 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node) {
   InstructionOperand dst =
       no_same_as_first ? g.DefineAsRegister(node) : g.DefineSameAsFirst(node);
   // TODO(v8:9198): Use src0_needs_reg when we have memory alignment for SIMD.
-  InstructionOperand src0 = g.UseUniqueRegister(input0);
+  // We only need a unique register for input0 if we use temp registers.
+  InstructionOperand src0 =
+      temp_count ? g.UseUniqueRegister(input0) : g.UseRegister(input0);
   USE(src0_needs_reg);
 
   int input_count = 0;
@@ -3561,7 +3615,9 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node) {
   if (!is_swizzle) {
     Node* input1 = node->InputAt(1);
     // TODO(v8:9198): Use src1_needs_reg when we have memory alignment for SIMD.
-    inputs[input_count++] = g.UseUniqueRegister(input1);
+    // We only need a unique register for input1 if we use temp registers.
+    inputs[input_count++] =
+        temp_count ? g.UseUniqueRegister(input1) : g.UseRegister(input1);
     USE(src1_needs_reg);
   }
   for (int i = 0; i < imm_count; ++i) {
@@ -3606,6 +3662,37 @@ void InstructionSelector::VisitF64x2Pmax(Node* node) {
   VisitPminOrPmax(this, node, kX64F64x2Pmax);
 }
 
+void InstructionSelector::VisitI32x4ExtAddPairwiseI16x8S(Node* node) {
+  X64OperandGenerator g(this);
+  InstructionOperand dst = CpuFeatures::IsSupported(AVX)
+                               ? g.DefineAsRegister(node)
+                               : g.DefineSameAsFirst(node);
+  Emit(kX64I32x4ExtAddPairwiseI16x8S, dst, g.UseRegister(node->InputAt(0)));
+}
+
+void InstructionSelector::VisitI32x4ExtAddPairwiseI16x8U(Node* node) {
+  X64OperandGenerator g(this);
+  InstructionOperand dst = CpuFeatures::IsSupported(AVX)
+                               ? g.DefineAsRegister(node)
+                               : g.DefineSameAsFirst(node);
+  Emit(kX64I32x4ExtAddPairwiseI16x8U, dst, g.UseRegister(node->InputAt(0)));
+}
+
+void InstructionSelector::VisitI16x8ExtAddPairwiseI8x16S(Node* node) {
+  X64OperandGenerator g(this);
+  // Codegen depends on dst != src.
+  Emit(kX64I16x8ExtAddPairwiseI8x16S, g.DefineAsRegister(node),
+       g.UseUniqueRegister(node->InputAt(0)));
+}
+
+void InstructionSelector::VisitI16x8ExtAddPairwiseI8x16U(Node* node) {
+  X64OperandGenerator g(this);
+  InstructionOperand dst = CpuFeatures::IsSupported(AVX)
+                               ? g.DefineAsRegister(node)
+                               : g.DefineSameAsFirst(node);
+  Emit(kX64I16x8ExtAddPairwiseI8x16U, dst, g.UseRegister(node->InputAt(0)));
+}
+
 // static
 MachineOperatorBuilder::Flags
 InstructionSelector::SupportedMachineOperatorFlags() {
diff --git a/deps/v8/src/compiler/basic-block-instrumentor.cc b/deps/v8/src/compiler/basic-block-instrumentor.cc
index 20c916757a305f..2d9b026dfac835 100644
--- a/deps/v8/src/compiler/basic-block-instrumentor.cc
+++ b/deps/v8/src/compiler/basic-block-instrumentor.cc
@@ -92,7 +92,7 @@ BasicBlockProfilerData* BasicBlockInstrumentor::Instrument(
   } else {
     counters_array = graph->NewNode(PointerConstant(&common, data->counts()));
   }
-  Node* one = graph->NewNode(common.Int32Constant(1));
+  Node* one = graph->NewNode(common.Float64Constant(1));
   BasicBlockVector* blocks = schedule->rpo_order();
   size_t block_number = 0;
   for (BasicBlockVector::iterator it = blocks->begin(); block_number < n_blocks;
@@ -104,18 +104,18 @@ BasicBlockProfilerData* BasicBlockInstrumentor::Instrument(
     // It is unnecessary to wire effect and control deps for load and store
     // since this happens after scheduling.
     // Construct increment operation.
-    int offset_to_counter_value = static_cast<int>(block_number) * kInt32Size;
+    int offset_to_counter_value = static_cast<int>(block_number) * kDoubleSize;
     if (on_heap_counters) {
       offset_to_counter_value += ByteArray::kHeaderSize - kHeapObjectTag;
     }
     Node* offset_to_counter =
         graph->NewNode(IntPtrConstant(&common, offset_to_counter_value));
     Node* load =
-        graph->NewNode(machine.Load(MachineType::Uint32()), counters_array,
+        graph->NewNode(machine.Load(MachineType::Float64()), counters_array,
                        offset_to_counter, graph->start(), graph->start());
-    Node* inc = graph->NewNode(machine.Int32Add(), load, one);
+    Node* inc = graph->NewNode(machine.Float64Add(), load, one);
     Node* store = graph->NewNode(
-        machine.Store(StoreRepresentation(MachineRepresentation::kWord32,
+        machine.Store(StoreRepresentation(MachineRepresentation::kFloat64,
                                           kNoWriteBarrier)),
         counters_array, offset_to_counter, inc, graph->start(), graph->start());
     // Insert the new nodes.
diff --git a/deps/v8/src/compiler/bytecode-analysis.cc b/deps/v8/src/compiler/bytecode-analysis.cc
index e12af452756b26..e76189a31fcd87 100644
--- a/deps/v8/src/compiler/bytecode-analysis.cc
+++ b/deps/v8/src/compiler/bytecode-analysis.cc
@@ -90,8 +90,8 @@ BytecodeAnalysis::BytecodeAnalysis(Handle<BytecodeArray> bytecode_array,
       resume_jump_targets_(zone),
       end_to_header_(zone),
       header_to_info_(zone),
-      osr_entry_point_(-1),
-      liveness_map_(bytecode_array->length(), zone) {
+      osr_entry_point_(-1) {
+  if (analyze_liveness) liveness_map_.emplace(bytecode_array->length(), zone);
   Analyze();
 }
 
@@ -433,10 +433,10 @@ void BytecodeAnalysis::Analyze() {
     }
 
     if (analyze_liveness_) {
-      BytecodeLiveness const& liveness = liveness_map_.InitializeLiveness(
+      BytecodeLiveness const& liveness = liveness_map().InitializeLiveness(
           current_offset, bytecode_array()->register_count(), zone());
       UpdateLiveness(bytecode, liveness, &next_bytecode_in_liveness, iterator,
-                     bytecode_array(), liveness_map_);
+                     bytecode_array(), liveness_map());
     }
   }
 
@@ -481,8 +481,8 @@ void BytecodeAnalysis::Analyze() {
     int end_offset = iterator.current_offset();
 
     BytecodeLiveness& header_liveness =
-        liveness_map_.GetLiveness(header_offset);
-    BytecodeLiveness& end_liveness = liveness_map_.GetLiveness(end_offset);
+        liveness_map().GetLiveness(header_offset);
+    BytecodeLiveness& end_liveness = liveness_map().GetLiveness(end_offset);
 
     if (!end_liveness.out->UnionIsChanged(*header_liveness.in)) {
       // Only update the loop body if the loop end liveness changed.
@@ -497,15 +497,15 @@ void BytecodeAnalysis::Analyze() {
       Bytecode bytecode = iterator.current_bytecode();
       int current_offset = iterator.current_offset();
       BytecodeLiveness const& liveness =
-          liveness_map_.GetLiveness(current_offset);
+          liveness_map().GetLiveness(current_offset);
       UpdateLiveness(bytecode, liveness, &next_bytecode_in_liveness, iterator,
-                     bytecode_array(), liveness_map_);
+                     bytecode_array(), liveness_map());
     }
     // Now we are at the loop header. Since the in-liveness of the header
     // can't change, we need only to update the out-liveness.
     UpdateOutLiveness(iterator.current_bytecode(), header_liveness.out,
                       next_bytecode_in_liveness, iterator, bytecode_array(),
-                      liveness_map_);
+                      liveness_map());
   }
 
   // Process the generator switch statement separately, once the loops are done.
@@ -518,12 +518,12 @@ void BytecodeAnalysis::Analyze() {
 
     int current_offset = iterator.current_offset();
     BytecodeLiveness& switch_liveness =
-        liveness_map_.GetLiveness(current_offset);
+        liveness_map().GetLiveness(current_offset);
 
     bool any_changed = false;
     for (const auto& entry : iterator.GetJumpTableTargetOffsets()) {
       if (switch_liveness.out->UnionIsChanged(
-              *liveness_map_.GetInLiveness(entry.target_offset))) {
+              *liveness_map().GetInLiveness(entry.target_offset))) {
         any_changed = true;
       }
     }
@@ -539,13 +539,13 @@ void BytecodeAnalysis::Analyze() {
         Bytecode bytecode = iterator.current_bytecode();
         int current_offset = iterator.current_offset();
         BytecodeLiveness const& liveness =
-            liveness_map_.GetLiveness(current_offset);
+            liveness_map().GetLiveness(current_offset);
 
         // There shouldn't be any more loops.
         DCHECK_NE(bytecode, Bytecode::kJumpLoop);
 
         UpdateLiveness(bytecode, liveness, &next_bytecode_in_liveness, iterator,
-                       bytecode_array(), liveness_map_);
+                       bytecode_array(), liveness_map());
       }
     }
   }
@@ -624,14 +624,14 @@ const BytecodeLivenessState* BytecodeAnalysis::GetInLivenessFor(
     int offset) const {
   if (!analyze_liveness_) return nullptr;
 
-  return liveness_map_.GetInLiveness(offset);
+  return liveness_map().GetInLiveness(offset);
 }
 
 const BytecodeLivenessState* BytecodeAnalysis::GetOutLivenessFor(
     int offset) const {
   if (!analyze_liveness_) return nullptr;
 
-  return liveness_map_.GetOutLiveness(offset);
+  return liveness_map().GetOutLiveness(offset);
 }
 
 std::ostream& BytecodeAnalysis::PrintLivenessTo(std::ostream& os) const {
@@ -826,16 +826,16 @@ bool BytecodeAnalysis::LivenessIsValid() {
 
     int current_offset = iterator.current_offset();
 
-    BytecodeLiveness& liveness = liveness_map_.GetLiveness(current_offset);
+    BytecodeLiveness& liveness = liveness_map().GetLiveness(current_offset);
 
     previous_liveness.CopyFrom(*liveness.out);
 
     UpdateOutLiveness(bytecode, liveness.out, next_bytecode_in_liveness,
-                      iterator, bytecode_array(), liveness_map_);
+                      iterator, bytecode_array(), liveness_map());
     // UpdateOutLiveness skips kJumpLoop, so we update it manually.
     if (bytecode == Bytecode::kJumpLoop) {
       int target_offset = iterator.GetJumpTargetOffset();
-      liveness.out->Union(*liveness_map_.GetInLiveness(target_offset));
+      liveness.out->Union(*liveness_map().GetInLiveness(target_offset));
     }
 
     if (!liveness.out->Equals(previous_liveness)) {
@@ -885,7 +885,7 @@ bool BytecodeAnalysis::LivenessIsValid() {
     }
 
     // The accumulator must be dead at the start of the target of the jump.
-    if (liveness_map_.GetLiveness(jump_target).in->AccumulatorIsLive()) {
+    if (liveness_map().GetLiveness(jump_target).in->AccumulatorIsLive()) {
       invalid_offset = jump_target;
       which_invalid = 0;
       break;
diff --git a/deps/v8/src/compiler/bytecode-analysis.h b/deps/v8/src/compiler/bytecode-analysis.h
index d7eaa137f10bfe..a05194f8329a91 100644
--- a/deps/v8/src/compiler/bytecode-analysis.h
+++ b/deps/v8/src/compiler/bytecode-analysis.h
@@ -154,6 +154,14 @@ class V8_EXPORT_PRIVATE BytecodeAnalysis : public ZoneObject {
 
   Zone* zone() const { return zone_; }
   Handle<BytecodeArray> bytecode_array() const { return bytecode_array_; }
+  BytecodeLivenessMap& liveness_map() {
+    DCHECK(analyze_liveness_);
+    return *liveness_map_;
+  }
+  const BytecodeLivenessMap& liveness_map() const {
+    DCHECK(analyze_liveness_);
+    return *liveness_map_;
+  }
 
   std::ostream& PrintLivenessTo(std::ostream& os) const;
 
@@ -167,7 +175,7 @@ class V8_EXPORT_PRIVATE BytecodeAnalysis : public ZoneObject {
   ZoneMap<int, int> end_to_header_;
   ZoneMap<int, LoopInfo> header_to_info_;
   int osr_entry_point_;
-  BytecodeLivenessMap liveness_map_;
+  base::Optional<BytecodeLivenessMap> liveness_map_;
 };
 
 }  // namespace compiler
diff --git a/deps/v8/src/compiler/bytecode-graph-builder.cc b/deps/v8/src/compiler/bytecode-graph-builder.cc
index 14d014bca65d51..52acfc847efa49 100644
--- a/deps/v8/src/compiler/bytecode-graph-builder.cc
+++ b/deps/v8/src/compiler/bytecode-graph-builder.cc
@@ -5,8 +5,10 @@
 #include "src/compiler/bytecode-graph-builder.h"
 
 #include "src/ast/ast.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/source-position-table.h"
 #include "src/codegen/tick-counter.h"
+#include "src/common/assert-scope.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/bytecode-analysis.h"
 #include "src/compiler/compiler-source-position-table.h"
@@ -411,10 +413,6 @@ class BytecodeGraphBuilder {
   NativeContextRef native_context() const { return native_context_; }
   SharedFunctionInfoRef shared_info() const { return shared_info_; }
 
-  bool should_disallow_heap_access() const {
-    return broker_->is_concurrent_inlining();
-  }
-
 #define DECLARE_VISIT_BYTECODE(name, ...) void Visit##name();
   BYTECODE_LIST(DECLARE_VISIT_BYTECODE)
 #undef DECLARE_VISIT_BYTECODE
@@ -432,7 +430,7 @@ class BytecodeGraphBuilder {
   const FrameStateFunctionInfo* const frame_state_function_info_;
   std::unique_ptr<SourcePositionTableIterator> source_position_iterator_;
   interpreter::BytecodeArrayIterator bytecode_iterator_;
-  BytecodeAnalysis const& bytecode_analysis_;
+  BytecodeAnalysis const bytecode_analysis_;
   Environment* environment_;
   bool const osr_;
   int currently_peeled_loop_offset_;
@@ -912,28 +910,32 @@ void BytecodeGraphBuilder::Environment::PrepareForLoopExit(
   // live after exiting the loop.
   for (int i = 0; i < parameter_count(); i++) {
     if (assignments.ContainsParameter(i)) {
-      Node* rename =
-          graph()->NewNode(common()->LoopExitValue(), values_[i], loop_exit);
+      Node* rename = graph()->NewNode(
+          common()->LoopExitValue(MachineRepresentation::kTagged), values_[i],
+          loop_exit);
       values_[i] = rename;
     }
   }
   for (int i = 0; i < register_count(); i++) {
     if (assignments.ContainsLocal(i) &&
         (liveness == nullptr || liveness->RegisterIsLive(i))) {
-      Node* rename = graph()->NewNode(common()->LoopExitValue(),
-                                      values_[register_base() + i], loop_exit);
+      Node* rename = graph()->NewNode(
+          common()->LoopExitValue(MachineRepresentation::kTagged),
+          values_[register_base() + i], loop_exit);
       values_[register_base() + i] = rename;
     }
   }
   if (liveness == nullptr || liveness->AccumulatorIsLive()) {
-    Node* rename = graph()->NewNode(common()->LoopExitValue(),
-                                    values_[accumulator_base()], loop_exit);
+    Node* rename = graph()->NewNode(
+        common()->LoopExitValue(MachineRepresentation::kTagged),
+        values_[accumulator_base()], loop_exit);
     values_[accumulator_base()] = rename;
   }
 
   if (generator_state_ != nullptr) {
-    generator_state_ = graph()->NewNode(common()->LoopExitValue(),
-                                        generator_state_, loop_exit);
+    generator_state_ = graph()->NewNode(
+        common()->LoopExitValue(MachineRepresentation::kTagged),
+        generator_state_, loop_exit);
   }
 }
 
@@ -1014,12 +1016,9 @@ BytecodeGraphBuilder::BytecodeGraphBuilder(
           bytecode_array().SourcePositionTable())),
       bytecode_iterator_(
           std::make_unique<OffHeapBytecodeArray>(bytecode_array())),
-      bytecode_analysis_(broker_->GetBytecodeAnalysis(
-          bytecode_array().object(), osr_offset,
-          flags & BytecodeGraphBuilderFlag::kAnalyzeEnvironmentLiveness,
-          should_disallow_heap_access()
-              ? SerializationPolicy::kAssumeSerialized
-              : SerializationPolicy::kSerializeIfNeeded)),
+      bytecode_analysis_(
+          bytecode_array().object(), local_zone, osr_offset,
+          flags & BytecodeGraphBuilderFlag::kAnalyzeEnvironmentLiveness),
       environment_(nullptr),
       osr_(!osr_offset.IsNone()),
       currently_peeled_loop_offset_(-1),
@@ -1174,7 +1173,6 @@ FeedbackSource BytecodeGraphBuilder::CreateFeedbackSource(FeedbackSlot slot) {
 }
 
 void BytecodeGraphBuilder::CreateGraph() {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   SourcePositionTable::Scope pos_scope(source_positions_, start_position_);
 
   // Set up the basic structure of the graph. Outputs for {Start} are the formal
@@ -1507,7 +1505,8 @@ void BytecodeGraphBuilder::VisitBytecodes() {
     VisitSingleBytecode();
   }
 
-  if (!should_disallow_heap_access() && has_one_shot_bytecode) {
+  // TODO(leszeks): Increment usage counter on BG thread.
+  if (!FLAG_concurrent_inlining && has_one_shot_bytecode) {
     // (For concurrent inlining this is done in the serializer instead.)
     isolate()->CountUsage(
         v8::Isolate::UseCounterFeature::kOptimizedFunctionWithOneShotBytecode);
@@ -2245,7 +2244,6 @@ void BytecodeGraphBuilder::VisitCreateClosure() {
 }
 
 void BytecodeGraphBuilder::VisitCreateBlockContext() {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
   ScopeInfoRef scope_info(
       broker(), bytecode_iterator().GetConstantForIndexOperand(0, isolate()));
   const Operator* op = javascript()->CreateBlockContext(scope_info.object());
@@ -2254,7 +2252,6 @@ void BytecodeGraphBuilder::VisitCreateBlockContext() {
 }
 
 void BytecodeGraphBuilder::VisitCreateFunctionContext() {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
   ScopeInfoRef scope_info(
       broker(), bytecode_iterator().GetConstantForIndexOperand(0, isolate()));
   uint32_t slots = bytecode_iterator().GetUnsignedImmediateOperand(1);
@@ -2265,7 +2262,6 @@ void BytecodeGraphBuilder::VisitCreateFunctionContext() {
 }
 
 void BytecodeGraphBuilder::VisitCreateEvalContext() {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
   ScopeInfoRef scope_info(
       broker(), bytecode_iterator().GetConstantForIndexOperand(0, isolate()));
   uint32_t slots = bytecode_iterator().GetUnsignedImmediateOperand(1);
@@ -2276,7 +2272,6 @@ void BytecodeGraphBuilder::VisitCreateEvalContext() {
 }
 
 void BytecodeGraphBuilder::VisitCreateCatchContext() {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
   interpreter::Register reg = bytecode_iterator().GetRegisterOperand(0);
   Node* exception = environment()->LookupRegister(reg);
   ScopeInfoRef scope_info(
@@ -2288,7 +2283,6 @@ void BytecodeGraphBuilder::VisitCreateCatchContext() {
 }
 
 void BytecodeGraphBuilder::VisitCreateWithContext() {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
   Node* object =
       environment()->LookupRegister(bytecode_iterator().GetRegisterOperand(0));
   ScopeInfoRef scope_info(
@@ -2408,7 +2402,6 @@ void BytecodeGraphBuilder::VisitCloneObject() {
 }
 
 void BytecodeGraphBuilder::VisitGetTemplateObject() {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
   FeedbackSource source =
       CreateFeedbackSource(bytecode_iterator().GetIndexOperand(1));
   TemplateObjectDescriptionRef description(
@@ -4314,7 +4307,7 @@ Node** BytecodeGraphBuilder::EnsureInputBufferSize(int size) {
 }
 
 void BytecodeGraphBuilder::ExitThenEnterExceptionHandlers(int current_offset) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   HandlerTable table(bytecode_array().handler_table_address(),
                      bytecode_array().handler_table_size(),
                      HandlerTable::kRangeBasedEncoding);
@@ -4365,7 +4358,8 @@ Node* BytecodeGraphBuilder::MakeNode(const Operator* op, int value_input_count,
     if (has_effect) ++input_count_with_deps;
     Node** buffer = EnsureInputBufferSize(input_count_with_deps);
     if (value_input_count > 0) {
-      memcpy(buffer, value_inputs, kSystemPointerSize * value_input_count);
+      base::Memcpy(buffer, value_inputs,
+                   kSystemPointerSize * value_input_count);
     }
     Node** current_input = buffer + value_input_count;
     if (has_context) {
diff --git a/deps/v8/src/compiler/code-assembler.cc b/deps/v8/src/compiler/code-assembler.cc
index 185a2d06707d6e..0344a1916f2b02 100644
--- a/deps/v8/src/compiler/code-assembler.cc
+++ b/deps/v8/src/compiler/code-assembler.cc
@@ -8,6 +8,7 @@
 
 #include "src/base/bits.h"
 #include "src/codegen/code-factory.h"
+#include "src/codegen/code-stub-assembler.h"
 #include "src/codegen/interface-descriptors.h"
 #include "src/codegen/machine-type.h"
 #include "src/codegen/macro-assembler.h"
@@ -315,7 +316,8 @@ TNode<Float64T> CodeAssembler::Float64Constant(double value) {
   return UncheckedCast<Float64T>(jsgraph()->Float64Constant(value));
 }
 
-bool CodeAssembler::ToInt32Constant(Node* node, int32_t* out_value) {
+bool CodeAssembler::TryToInt32Constant(TNode<IntegralT> node,
+                                       int32_t* out_value) {
   {
     Int64Matcher m(node);
     if (m.HasResolvedValue() &&
@@ -337,16 +339,22 @@ bool CodeAssembler::ToInt32Constant(Node* node, int32_t* out_value) {
   return false;
 }
 
-bool CodeAssembler::ToInt64Constant(Node* node, int64_t* out_value) {
+bool CodeAssembler::TryToInt64Constant(TNode<IntegralT> node,
+                                       int64_t* out_value) {
   Int64Matcher m(node);
   if (m.HasResolvedValue()) *out_value = m.ResolvedValue();
   return m.HasResolvedValue();
 }
 
-bool CodeAssembler::ToSmiConstant(Node* node, Smi* out_value) {
+bool CodeAssembler::TryToSmiConstant(TNode<Smi> tnode, Smi* out_value) {
+  Node* node = tnode;
   if (node->opcode() == IrOpcode::kBitcastWordToTaggedSigned) {
     node = node->InputAt(0);
   }
+  return TryToSmiConstant(ReinterpretCast<IntPtrT>(tnode), out_value);
+}
+
+bool CodeAssembler::TryToSmiConstant(TNode<IntegralT> node, Smi* out_value) {
   IntPtrMatcher m(node);
   if (m.HasResolvedValue()) {
     intptr_t value = m.ResolvedValue();
@@ -358,11 +366,17 @@ bool CodeAssembler::ToSmiConstant(Node* node, Smi* out_value) {
   return false;
 }
 
-bool CodeAssembler::ToIntPtrConstant(Node* node, intptr_t* out_value) {
+bool CodeAssembler::TryToIntPtrConstant(TNode<Smi> tnode, intptr_t* out_value) {
+  Node* node = tnode;
   if (node->opcode() == IrOpcode::kBitcastWordToTaggedSigned ||
       node->opcode() == IrOpcode::kBitcastWordToTagged) {
     node = node->InputAt(0);
   }
+  return TryToIntPtrConstant(ReinterpretCast<IntPtrT>(tnode), out_value);
+}
+
+bool CodeAssembler::TryToIntPtrConstant(TNode<IntegralT> node,
+                                        intptr_t* out_value) {
   IntPtrMatcher m(node);
   if (m.HasResolvedValue()) *out_value = m.ResolvedValue();
   return m.HasResolvedValue();
@@ -577,13 +591,13 @@ TNode<Word32T> CodeAssembler::Word32Sar(SloppyTNode<Word32T> value, int shift) {
     return UncheckedCast<BoolT>(raw_assembler()->Name(left, right));      \
   }
 
-CODE_ASSEMBLER_COMPARE(IntPtrEqual, WordT, intptr_t, ToIntPtrConstant, ==)
-CODE_ASSEMBLER_COMPARE(WordEqual, WordT, intptr_t, ToIntPtrConstant, ==)
-CODE_ASSEMBLER_COMPARE(WordNotEqual, WordT, intptr_t, ToIntPtrConstant, !=)
-CODE_ASSEMBLER_COMPARE(Word32Equal, Word32T, int32_t, ToInt32Constant, ==)
-CODE_ASSEMBLER_COMPARE(Word32NotEqual, Word32T, int32_t, ToInt32Constant, !=)
-CODE_ASSEMBLER_COMPARE(Word64Equal, Word64T, int64_t, ToInt64Constant, ==)
-CODE_ASSEMBLER_COMPARE(Word64NotEqual, Word64T, int64_t, ToInt64Constant, !=)
+CODE_ASSEMBLER_COMPARE(IntPtrEqual, WordT, intptr_t, TryToIntPtrConstant, ==)
+CODE_ASSEMBLER_COMPARE(WordEqual, WordT, intptr_t, TryToIntPtrConstant, ==)
+CODE_ASSEMBLER_COMPARE(WordNotEqual, WordT, intptr_t, TryToIntPtrConstant, !=)
+CODE_ASSEMBLER_COMPARE(Word32Equal, Word32T, int32_t, TryToInt32Constant, ==)
+CODE_ASSEMBLER_COMPARE(Word32NotEqual, Word32T, int32_t, TryToInt32Constant, !=)
+CODE_ASSEMBLER_COMPARE(Word64Equal, Word64T, int64_t, TryToInt64Constant, ==)
+CODE_ASSEMBLER_COMPARE(Word64NotEqual, Word64T, int64_t, TryToInt64Constant, !=)
 #undef CODE_ASSEMBLER_COMPARE
 
 TNode<UintPtrT> CodeAssembler::ChangeUint32ToWord(TNode<Word32T> value) {
@@ -667,11 +681,23 @@ TNode<Object> CodeAssembler::LoadFullTagged(Node* base, Node* offset,
       Load(MachineType::Pointer(), base, offset, needs_poisoning));
 }
 
-Node* CodeAssembler::AtomicLoad(MachineType type, Node* base, Node* offset) {
+Node* CodeAssembler::AtomicLoad(MachineType type, TNode<RawPtrT> base,
+                                TNode<WordT> offset) {
   return raw_assembler()->AtomicLoad(type, base, offset);
 }
 
-Node* CodeAssembler::LoadFromObject(MachineType type, TNode<HeapObject> object,
+template <class Type>
+TNode<Type> CodeAssembler::AtomicLoad64(TNode<RawPtrT> base,
+                                        TNode<WordT> offset) {
+  return UncheckedCast<Type>(raw_assembler()->AtomicLoad64(base, offset));
+}
+
+template TNode<AtomicInt64> CodeAssembler::AtomicLoad64<AtomicInt64>(
+    TNode<RawPtrT> base, TNode<WordT> offset);
+template TNode<AtomicUint64> CodeAssembler::AtomicLoad64<AtomicUint64>(
+    TNode<RawPtrT> base, TNode<WordT> offset);
+
+Node* CodeAssembler::LoadFromObject(MachineType type, TNode<Object> object,
                                     TNode<IntPtrT> offset) {
   return raw_assembler()->LoadFromObject(type, object, offset);
 }
@@ -696,14 +722,14 @@ TNode<Object> CodeAssembler::LoadRoot(RootIndex root_index) {
       LoadFullTagged(isolate_root, IntPtrConstant(offset)));
 }
 
-Node* CodeAssembler::Store(Node* base, Node* value) {
-  return raw_assembler()->Store(MachineRepresentation::kTagged, base, value,
-                                kFullWriteBarrier);
+void CodeAssembler::Store(Node* base, Node* value) {
+  raw_assembler()->Store(MachineRepresentation::kTagged, base, value,
+                         kFullWriteBarrier);
 }
 
 void CodeAssembler::StoreToObject(MachineRepresentation rep,
-                                  TNode<HeapObject> object,
-                                  TNode<IntPtrT> offset, Node* value,
+                                  TNode<Object> object, TNode<IntPtrT> offset,
+                                  Node* value,
                                   StoreToObjectWriteBarrier write_barrier) {
   WriteBarrierKind write_barrier_kind;
   switch (write_barrier) {
@@ -751,67 +777,85 @@ void CodeAssembler::OptimizedStoreMap(TNode<HeapObject> object,
   raw_assembler()->OptimizedStoreMap(object, map);
 }
 
-Node* CodeAssembler::Store(Node* base, Node* offset, Node* value) {
-  return raw_assembler()->Store(MachineRepresentation::kTagged, base, offset,
-                                value, kFullWriteBarrier);
+void CodeAssembler::Store(Node* base, Node* offset, Node* value) {
+  raw_assembler()->Store(MachineRepresentation::kTagged, base, offset, value,
+                         kFullWriteBarrier);
 }
 
-Node* CodeAssembler::StoreEphemeronKey(Node* base, Node* offset, Node* value) {
-  return raw_assembler()->Store(MachineRepresentation::kTagged, base, offset,
-                                value, kEphemeronKeyWriteBarrier);
+void CodeAssembler::StoreEphemeronKey(Node* base, Node* offset, Node* value) {
+  raw_assembler()->Store(MachineRepresentation::kTagged, base, offset, value,
+                         kEphemeronKeyWriteBarrier);
 }
 
-Node* CodeAssembler::StoreNoWriteBarrier(MachineRepresentation rep, Node* base,
-                                         Node* value) {
-  return raw_assembler()->Store(
+void CodeAssembler::StoreNoWriteBarrier(MachineRepresentation rep, Node* base,
+                                        Node* value) {
+  raw_assembler()->Store(
       rep, base, value,
       CanBeTaggedPointer(rep) ? kAssertNoWriteBarrier : kNoWriteBarrier);
 }
 
-Node* CodeAssembler::StoreNoWriteBarrier(MachineRepresentation rep, Node* base,
-                                         Node* offset, Node* value) {
-  return raw_assembler()->Store(
+void CodeAssembler::StoreNoWriteBarrier(MachineRepresentation rep, Node* base,
+                                        Node* offset, Node* value) {
+  raw_assembler()->Store(
       rep, base, offset, value,
       CanBeTaggedPointer(rep) ? kAssertNoWriteBarrier : kNoWriteBarrier);
 }
 
-Node* CodeAssembler::UnsafeStoreNoWriteBarrier(MachineRepresentation rep,
-                                               Node* base, Node* value) {
-  return raw_assembler()->Store(rep, base, value, kNoWriteBarrier);
+void CodeAssembler::UnsafeStoreNoWriteBarrier(MachineRepresentation rep,
+                                              Node* base, Node* value) {
+  raw_assembler()->Store(rep, base, value, kNoWriteBarrier);
 }
 
-Node* CodeAssembler::UnsafeStoreNoWriteBarrier(MachineRepresentation rep,
-                                               Node* base, Node* offset,
-                                               Node* value) {
-  return raw_assembler()->Store(rep, base, offset, value, kNoWriteBarrier);
+void CodeAssembler::UnsafeStoreNoWriteBarrier(MachineRepresentation rep,
+                                              Node* base, Node* offset,
+                                              Node* value) {
+  raw_assembler()->Store(rep, base, offset, value, kNoWriteBarrier);
 }
 
-Node* CodeAssembler::StoreFullTaggedNoWriteBarrier(Node* base,
-                                                   Node* tagged_value) {
-  return StoreNoWriteBarrier(MachineType::PointerRepresentation(), base,
-                             BitcastTaggedToWord(tagged_value));
+void CodeAssembler::StoreFullTaggedNoWriteBarrier(TNode<RawPtrT> base,
+                                                  TNode<Object> tagged_value) {
+  StoreNoWriteBarrier(MachineType::PointerRepresentation(), base,
+                      BitcastTaggedToWord(tagged_value));
 }
 
-Node* CodeAssembler::StoreFullTaggedNoWriteBarrier(Node* base, Node* offset,
-                                                   Node* tagged_value) {
-  return StoreNoWriteBarrier(MachineType::PointerRepresentation(), base, offset,
-                             BitcastTaggedToWord(tagged_value));
+void CodeAssembler::StoreFullTaggedNoWriteBarrier(TNode<RawPtrT> base,
+                                                  TNode<IntPtrT> offset,
+                                                  TNode<Object> tagged_value) {
+  StoreNoWriteBarrier(MachineType::PointerRepresentation(), base, offset,
+                      BitcastTaggedToWord(tagged_value));
 }
 
-Node* CodeAssembler::AtomicStore(MachineRepresentation rep, Node* base,
-                                 Node* offset, Node* value, Node* value_high) {
-  return raw_assembler()->AtomicStore(rep, base, offset, value, value_high);
+void CodeAssembler::AtomicStore(MachineRepresentation rep, TNode<RawPtrT> base,
+                                TNode<WordT> offset, TNode<Word32T> value) {
+  raw_assembler()->AtomicStore(rep, base, offset, value);
 }
 
-#define ATOMIC_FUNCTION(name)                                        \
-  Node* CodeAssembler::Atomic##name(                                 \
-      MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset, \
-      Node* value, base::Optional<TNode<UintPtrT>> value_high) {     \
-    Node* value_high_node = nullptr;                                 \
-    if (value_high) value_high_node = *value_high;                   \
-    return raw_assembler()->Atomic##name(type, base, offset, value,  \
-                                         value_high_node);           \
-  }
+void CodeAssembler::AtomicStore64(TNode<RawPtrT> base, TNode<WordT> offset,
+                                  TNode<UintPtrT> value,
+                                  TNode<UintPtrT> value_high) {
+  raw_assembler()->AtomicStore64(base, offset, value, value_high);
+}
+
+#define ATOMIC_FUNCTION(name)                                                 \
+  TNode<Word32T> CodeAssembler::Atomic##name(                                 \
+      MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset,          \
+      TNode<Word32T> value) {                                                 \
+    return UncheckedCast<Word32T>(                                            \
+        raw_assembler()->Atomic##name(type, base, offset, value));            \
+  }                                                                           \
+  template <class Type>                                                       \
+  TNode<Type> CodeAssembler::Atomic##name##64(                                \
+      TNode<RawPtrT> base, TNode<UintPtrT> offset, TNode<UintPtrT> value,     \
+      TNode<UintPtrT> value_high) {                                           \
+    return UncheckedCast<Type>(                                               \
+        raw_assembler()->Atomic##name##64(base, offset, value, value_high));  \
+  }                                                                           \
+  template TNode<AtomicInt64> CodeAssembler::Atomic##name##64 < AtomicInt64 > \
+      (TNode<RawPtrT> base, TNode<UintPtrT> offset, TNode<UintPtrT> value,    \
+       TNode<UintPtrT> value_high);                                           \
+  template TNode<AtomicUint64> CodeAssembler::Atomic##name##64 <              \
+      AtomicUint64 > (TNode<RawPtrT> base, TNode<UintPtrT> offset,            \
+                      TNode<UintPtrT> value, TNode<UintPtrT> value_high);
 ATOMIC_FUNCTION(Add)
 ATOMIC_FUNCTION(Sub)
 ATOMIC_FUNCTION(And)
@@ -820,22 +864,43 @@ ATOMIC_FUNCTION(Xor)
 ATOMIC_FUNCTION(Exchange)
 #undef ATOMIC_FUNCTION
 
-Node* CodeAssembler::AtomicCompareExchange(MachineType type, Node* base,
-                                           Node* offset, Node* old_value,
-                                           Node* new_value,
-                                           Node* old_value_high,
-                                           Node* new_value_high) {
-  return raw_assembler()->AtomicCompareExchange(
-      type, base, offset, old_value, old_value_high, new_value, new_value_high);
-}
-
-Node* CodeAssembler::StoreRoot(RootIndex root_index, Node* value) {
+TNode<Word32T> CodeAssembler::AtomicCompareExchange(MachineType type,
+                                                    TNode<RawPtrT> base,
+                                                    TNode<WordT> offset,
+                                                    TNode<Word32T> old_value,
+                                                    TNode<Word32T> new_value) {
+  return UncheckedCast<Word32T>(raw_assembler()->AtomicCompareExchange(
+      type, base, offset, old_value, new_value));
+}
+
+template <class Type>
+TNode<Type> CodeAssembler::AtomicCompareExchange64(
+    TNode<RawPtrT> base, TNode<WordT> offset, TNode<UintPtrT> old_value,
+    TNode<UintPtrT> new_value, TNode<UintPtrT> old_value_high,
+    TNode<UintPtrT> new_value_high) {
+  // This uses Uint64() intentionally: AtomicCompareExchange is not implemented
+  // for Int64(), which is fine because the machine instruction only cares
+  // about words.
+  return UncheckedCast<Type>(raw_assembler()->AtomicCompareExchange64(
+      base, offset, old_value, old_value_high, new_value, new_value_high));
+}
+
+template TNode<AtomicInt64> CodeAssembler::AtomicCompareExchange64<AtomicInt64>(
+    TNode<RawPtrT> base, TNode<WordT> offset, TNode<UintPtrT> old_value,
+    TNode<UintPtrT> new_value, TNode<UintPtrT> old_value_high,
+    TNode<UintPtrT> new_value_high);
+template TNode<AtomicUint64>
+CodeAssembler::AtomicCompareExchange64<AtomicUint64>(
+    TNode<RawPtrT> base, TNode<WordT> offset, TNode<UintPtrT> old_value,
+    TNode<UintPtrT> new_value, TNode<UintPtrT> old_value_high,
+    TNode<UintPtrT> new_value_high);
+
+void CodeAssembler::StoreRoot(RootIndex root_index, TNode<Object> value) {
   DCHECK(!RootsTable::IsImmortalImmovable(root_index));
   TNode<ExternalReference> isolate_root =
       ExternalConstant(ExternalReference::isolate_root(isolate()));
   int offset = IsolateData::root_slot_offset(root_index);
-  return StoreFullTaggedNoWriteBarrier(isolate_root, IntPtrConstant(offset),
-                                       value);
+  StoreFullTaggedNoWriteBarrier(isolate_root, IntPtrConstant(offset), value);
 }
 
 Node* CodeAssembler::Projection(int index, Node* value) {
@@ -1112,7 +1177,7 @@ Node* CodeAssembler::CallCFunctionN(Signature<MachineType>* signature,
 }
 
 Node* CodeAssembler::CallCFunction(
-    Node* function, MachineType return_type,
+    Node* function, base::Optional<MachineType> return_type,
     std::initializer_list<CodeAssembler::CFunctionArg> args) {
   return raw_assembler()->CallCFunction(function, return_type, args);
 }
@@ -1152,7 +1217,7 @@ void CodeAssembler::GotoIfNot(TNode<IntegralT> condition, Label* false_label) {
 void CodeAssembler::Branch(TNode<IntegralT> condition, Label* true_label,
                            Label* false_label) {
   int32_t constant;
-  if (ToInt32Constant(condition, &constant)) {
+  if (TryToInt32Constant(condition, &constant)) {
     if ((true_label->is_used() || true_label->is_bound()) &&
         (false_label->is_used() || false_label->is_bound())) {
       return Goto(constant ? true_label : false_label);
@@ -1168,7 +1233,7 @@ void CodeAssembler::Branch(TNode<BoolT> condition,
                            const std::function<void()>& true_body,
                            const std::function<void()>& false_body) {
   int32_t constant;
-  if (ToInt32Constant(condition, &constant)) {
+  if (TryToInt32Constant(condition, &constant)) {
     return constant ? true_body() : false_body();
   }
 
@@ -1185,7 +1250,7 @@ void CodeAssembler::Branch(TNode<BoolT> condition,
 void CodeAssembler::Branch(TNode<BoolT> condition, Label* true_label,
                            const std::function<void()>& false_body) {
   int32_t constant;
-  if (ToInt32Constant(condition, &constant)) {
+  if (TryToInt32Constant(condition, &constant)) {
     return constant ? Goto(true_label) : false_body();
   }
 
@@ -1199,7 +1264,7 @@ void CodeAssembler::Branch(TNode<BoolT> condition,
                            const std::function<void()>& true_body,
                            Label* false_label) {
   int32_t constant;
-  if (ToInt32Constant(condition, &constant)) {
+  if (TryToInt32Constant(condition, &constant)) {
     return constant ? true_body() : Goto(false_label);
   }
 
diff --git a/deps/v8/src/compiler/code-assembler.h b/deps/v8/src/compiler/code-assembler.h
index 792ecd385c6d92..70991d8c7ba759 100644
--- a/deps/v8/src/compiler/code-assembler.h
+++ b/deps/v8/src/compiler/code-assembler.h
@@ -178,6 +178,20 @@ HEAP_OBJECT_TEMPLATE_TYPE_LIST(OBJECT_TYPE_TEMPLATE_CASE)
 #undef OBJECT_TYPE_STRUCT_CASE
 #undef OBJECT_TYPE_TEMPLATE_CASE
 
+#if defined(V8_HOST_ARCH_32_BIT)
+#define BINT_IS_SMI
+using BInt = Smi;
+using AtomicInt64 = PairT<IntPtrT, IntPtrT>;
+using AtomicUint64 = PairT<UintPtrT, UintPtrT>;
+#elif defined(V8_HOST_ARCH_64_BIT)
+#define BINT_IS_INTPTR
+using BInt = IntPtrT;
+using AtomicInt64 = IntPtrT;
+using AtomicUint64 = UintPtrT;
+#else
+#error Unknown architecture.
+#endif
+
 // {raw_value} must be a tagged Object.
 // {raw_type} must be a tagged Smi.
 // {raw_location} must be a tagged String.
@@ -551,10 +565,12 @@ class V8_EXPORT_PRIVATE CodeAssembler {
     return value ? Int32TrueConstant() : Int32FalseConstant();
   }
 
-  bool ToInt32Constant(Node* node, int32_t* out_value);
-  bool ToInt64Constant(Node* node, int64_t* out_value);
-  bool ToIntPtrConstant(Node* node, intptr_t* out_value);
-  bool ToSmiConstant(Node* node, Smi* out_value);
+  bool TryToInt32Constant(TNode<IntegralT> node, int32_t* out_value);
+  bool TryToInt64Constant(TNode<IntegralT> node, int64_t* out_value);
+  bool TryToIntPtrConstant(TNode<IntegralT> node, intptr_t* out_value);
+  bool TryToIntPtrConstant(TNode<Smi> tnode, intptr_t* out_value);
+  bool TryToSmiConstant(TNode<IntegralT> node, Smi* out_value);
+  bool TryToSmiConstant(TNode<Smi> node, Smi* out_value);
 
   bool IsUndefinedConstant(TNode<Object> node);
   bool IsNullConstant(TNode<Object> node);
@@ -633,7 +649,7 @@ class V8_EXPORT_PRIVATE CodeAssembler {
   void SetSourcePosition(const char* file, int line);
   void PushSourcePosition();
   void PopSourcePosition();
-  class SourcePositionScope {
+  class V8_NODISCARD SourcePositionScope {
    public:
     explicit SourcePositionScope(CodeAssembler* ca) : ca_(ca) {
       ca->PushSourcePosition();
@@ -731,7 +747,13 @@ class V8_EXPORT_PRIVATE CodeAssembler {
     return UncheckedCast<Type>(
         Load(MachineTypeOf<Type>::value, base, offset, needs_poisoning));
   }
-  Node* AtomicLoad(MachineType type, Node* base, Node* offset);
+  template <class Type>
+  TNode<Type> AtomicLoad(TNode<RawPtrT> base, TNode<WordT> offset) {
+    return UncheckedCast<Type>(
+        AtomicLoad(MachineTypeOf<Type>::value, base, offset));
+  }
+  template <class Type>
+  TNode<Type> AtomicLoad64(TNode<RawPtrT> base, TNode<WordT> offset);
   // Load uncompressed tagged value from (most likely off JS heap) memory
   // location.
   TNode<Object> LoadFullTagged(
@@ -740,35 +762,36 @@ class V8_EXPORT_PRIVATE CodeAssembler {
       Node* base, Node* offset,
       LoadSensitivity needs_poisoning = LoadSensitivity::kSafe);
 
-  Node* LoadFromObject(MachineType type, TNode<HeapObject> object,
+  Node* LoadFromObject(MachineType type, TNode<Object> object,
                        TNode<IntPtrT> offset);
 
   // Load a value from the root array.
   TNode<Object> LoadRoot(RootIndex root_index);
 
   // Store value to raw memory location.
-  Node* Store(Node* base, Node* value);
-  Node* Store(Node* base, Node* offset, Node* value);
-  Node* StoreEphemeronKey(Node* base, Node* offset, Node* value);
-  Node* StoreNoWriteBarrier(MachineRepresentation rep, Node* base, Node* value);
-  Node* StoreNoWriteBarrier(MachineRepresentation rep, Node* base, Node* offset,
-                            Node* value);
-  Node* UnsafeStoreNoWriteBarrier(MachineRepresentation rep, Node* base,
-                                  Node* value);
-  Node* UnsafeStoreNoWriteBarrier(MachineRepresentation rep, Node* base,
-                                  Node* offset, Node* value);
+  void Store(Node* base, Node* value);
+  void Store(Node* base, Node* offset, Node* value);
+  void StoreEphemeronKey(Node* base, Node* offset, Node* value);
+  void StoreNoWriteBarrier(MachineRepresentation rep, Node* base, Node* value);
+  void StoreNoWriteBarrier(MachineRepresentation rep, Node* base, Node* offset,
+                           Node* value);
+  void UnsafeStoreNoWriteBarrier(MachineRepresentation rep, Node* base,
+                                 Node* value);
+  void UnsafeStoreNoWriteBarrier(MachineRepresentation rep, Node* base,
+                                 Node* offset, Node* value);
 
   // Stores uncompressed tagged value to (most likely off JS heap) memory
   // location without write barrier.
-  Node* StoreFullTaggedNoWriteBarrier(Node* base, Node* tagged_value);
-  Node* StoreFullTaggedNoWriteBarrier(Node* base, Node* offset,
-                                      Node* tagged_value);
+  void StoreFullTaggedNoWriteBarrier(TNode<RawPtrT> base,
+                                     TNode<Object> tagged_value);
+  void StoreFullTaggedNoWriteBarrier(TNode<RawPtrT> base, TNode<IntPtrT> offset,
+                                     TNode<Object> tagged_value);
 
   // Optimized memory operations that map to Turbofan simplified nodes.
   TNode<HeapObject> OptimizedAllocate(TNode<IntPtrT> size,
                                       AllocationType allocation,
                                       AllowLargeObjects allow_large_objects);
-  void StoreToObject(MachineRepresentation rep, TNode<HeapObject> object,
+  void StoreToObject(MachineRepresentation rep, TNode<Object> object,
                      TNode<IntPtrT> offset, Node* value,
                      StoreToObjectWriteBarrier write_barrier);
   void OptimizedStoreField(MachineRepresentation rep, TNode<HeapObject> object,
@@ -780,38 +803,66 @@ class V8_EXPORT_PRIVATE CodeAssembler {
                                                TNode<HeapObject> object,
                                                int offset, Node* value);
   void OptimizedStoreMap(TNode<HeapObject> object, TNode<Map>);
+  void AtomicStore(MachineRepresentation rep, TNode<RawPtrT> base,
+                   TNode<WordT> offset, TNode<Word32T> value);
   // {value_high} is used for 64-bit stores on 32-bit platforms, must be
   // nullptr in other cases.
-  Node* AtomicStore(MachineRepresentation rep, Node* base, Node* offset,
-                    Node* value, Node* value_high = nullptr);
+  void AtomicStore64(TNode<RawPtrT> base, TNode<WordT> offset,
+                     TNode<UintPtrT> value, TNode<UintPtrT> value_high);
 
-  Node* AtomicAdd(MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset,
-                  Node* value, base::Optional<TNode<UintPtrT>> value_high);
+  TNode<Word32T> AtomicAdd(MachineType type, TNode<RawPtrT> base,
+                           TNode<UintPtrT> offset, TNode<Word32T> value);
+  template <class Type>
+  TNode<Type> AtomicAdd64(TNode<RawPtrT> base, TNode<UintPtrT> offset,
+                          TNode<UintPtrT> value, TNode<UintPtrT> value_high);
 
-  Node* AtomicSub(MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset,
-                  Node* value, base::Optional<TNode<UintPtrT>> value_high);
+  TNode<Word32T> AtomicSub(MachineType type, TNode<RawPtrT> base,
+                           TNode<UintPtrT> offset, TNode<Word32T> value);
+  template <class Type>
+  TNode<Type> AtomicSub64(TNode<RawPtrT> base, TNode<UintPtrT> offset,
+                          TNode<UintPtrT> value, TNode<UintPtrT> value_high);
 
-  Node* AtomicAnd(MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset,
-                  Node* value, base::Optional<TNode<UintPtrT>> value_high);
+  TNode<Word32T> AtomicAnd(MachineType type, TNode<RawPtrT> base,
+                           TNode<UintPtrT> offset, TNode<Word32T> value);
+  template <class Type>
+  TNode<Type> AtomicAnd64(TNode<RawPtrT> base, TNode<UintPtrT> offset,
+                          TNode<UintPtrT> value, TNode<UintPtrT> value_high);
 
-  Node* AtomicOr(MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset,
-                 Node* value, base::Optional<TNode<UintPtrT>> value_high);
+  TNode<Word32T> AtomicOr(MachineType type, TNode<RawPtrT> base,
+                          TNode<UintPtrT> offset, TNode<Word32T> value);
+  template <class Type>
+  TNode<Type> AtomicOr64(TNode<RawPtrT> base, TNode<UintPtrT> offset,
+                         TNode<UintPtrT> value, TNode<UintPtrT> value_high);
 
-  Node* AtomicXor(MachineType type, TNode<RawPtrT> base, TNode<UintPtrT> offset,
-                  Node* value, base::Optional<TNode<UintPtrT>> value_high);
+  TNode<Word32T> AtomicXor(MachineType type, TNode<RawPtrT> base,
+                           TNode<UintPtrT> offset, TNode<Word32T> value);
+  template <class Type>
+  TNode<Type> AtomicXor64(TNode<RawPtrT> base, TNode<UintPtrT> offset,
+                          TNode<UintPtrT> value, TNode<UintPtrT> value_high);
 
   // Exchange value at raw memory location
-  Node* AtomicExchange(MachineType type, TNode<RawPtrT> base,
-                       TNode<UintPtrT> offset, Node* value,
-                       base::Optional<TNode<UintPtrT>> value_high);
+  TNode<Word32T> AtomicExchange(MachineType type, TNode<RawPtrT> base,
+                                TNode<UintPtrT> offset, TNode<Word32T> value);
+  template <class Type>
+  TNode<Type> AtomicExchange64(TNode<RawPtrT> base, TNode<UintPtrT> offset,
+                               TNode<UintPtrT> value,
+                               TNode<UintPtrT> value_high);
 
   // Compare and Exchange value at raw memory location
-  Node* AtomicCompareExchange(MachineType type, Node* base, Node* offset,
-                              Node* old_value, Node* new_value,
-                              Node* old_value_high = nullptr,
-                              Node* new_value_high = nullptr);
+  TNode<Word32T> AtomicCompareExchange(MachineType type, TNode<RawPtrT> base,
+                                       TNode<WordT> offset,
+                                       TNode<Word32T> old_value,
+                                       TNode<Word32T> new_value);
+
+  template <class Type>
+  TNode<Type> AtomicCompareExchange64(TNode<RawPtrT> base, TNode<WordT> offset,
+                                      TNode<UintPtrT> old_value,
+                                      TNode<UintPtrT> new_value,
+                                      TNode<UintPtrT> old_value_high,
+                                      TNode<UintPtrT> new_value_high);
+
   // Store a value to the root array.
-  Node* StoreRoot(RootIndex root_index, Node* value);
+  void StoreRoot(RootIndex root_index, TNode<Object> value);
 
 // Basic arithmetic operations.
 #define DECLARE_CODE_ASSEMBLER_BINARY_OP(name, ResType, Arg1Type, Arg2Type) \
@@ -992,8 +1043,6 @@ class V8_EXPORT_PRIVATE CodeAssembler {
   TNode<Int32T> TruncateFloat32ToInt32(SloppyTNode<Float32T> value);
 
   // Projections
-  Node* Projection(int index, Node* value);
-
   template <int index, class T1, class T2>
   TNode<typename std::tuple_element<index, std::tuple<T1, T2>>::type>
   Projection(TNode<PairT<T1, T2>> value) {
@@ -1125,7 +1174,8 @@ class V8_EXPORT_PRIVATE CodeAssembler {
 
   // Call to a C function.
   template <class... CArgs>
-  Node* CallCFunction(Node* function, MachineType return_type, CArgs... cargs) {
+  Node* CallCFunction(Node* function, base::Optional<MachineType> return_type,
+                      CArgs... cargs) {
     static_assert(v8::internal::conjunction<
                       std::is_convertible<CArgs, CFunctionArg>...>::value,
                   "invalid argument types");
@@ -1185,7 +1235,7 @@ class V8_EXPORT_PRIVATE CodeAssembler {
  private:
   void HandleException(Node* result);
 
-  Node* CallCFunction(Node* function, MachineType return_type,
+  Node* CallCFunction(Node* function, base::Optional<MachineType> return_type,
                       std::initializer_list<CFunctionArg> args);
 
   Node* CallCFunctionWithoutFunctionDescriptor(
@@ -1232,11 +1282,15 @@ class V8_EXPORT_PRIVATE CodeAssembler {
                   const CallInterfaceDescriptor& descriptor, int input_count,
                   Node* const* inputs);
 
+  Node* AtomicLoad(MachineType type, TNode<RawPtrT> base, TNode<WordT> offset);
+
   // These two don't have definitions and are here only for catching use cases
   // where the cast is not necessary.
   TNode<Int32T> Signed(TNode<Int32T> x);
   TNode<Uint32T> Unsigned(TNode<Uint32T> x);
 
+  Node* Projection(int index, Node* value);
+
   RawMachineAssembler* raw_assembler() const;
   JSGraph* jsgraph() const;
 
@@ -1512,7 +1566,7 @@ class V8_EXPORT_PRIVATE CodeAssemblerState {
   VariableId NextVariableId() { return next_variable_id_++; }
 };
 
-class V8_EXPORT_PRIVATE ScopedExceptionHandler {
+class V8_EXPORT_PRIVATE V8_NODISCARD ScopedExceptionHandler {
  public:
   ScopedExceptionHandler(CodeAssembler* assembler,
                          CodeAssemblerExceptionHandlerLabel* label);
@@ -1533,17 +1587,6 @@ class V8_EXPORT_PRIVATE ScopedExceptionHandler {
 };
 
 }  // namespace compiler
-
-#if defined(V8_HOST_ARCH_32_BIT)
-#define BINT_IS_SMI
-using BInt = Smi;
-#elif defined(V8_HOST_ARCH_64_BIT)
-#define BINT_IS_INTPTR
-using BInt = IntPtrT;
-#else
-#error Unknown architecture.
-#endif
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/compiler/common-operator-reducer.cc b/deps/v8/src/compiler/common-operator-reducer.cc
index 70f4bbf47b2735..9a91ea159735f9 100644
--- a/deps/v8/src/compiler/common-operator-reducer.cc
+++ b/deps/v8/src/compiler/common-operator-reducer.cc
@@ -53,7 +53,7 @@ CommonOperatorReducer::CommonOperatorReducer(Editor* editor, Graph* graph,
 }
 
 Reduction CommonOperatorReducer::Reduce(Node* node) {
-  DisallowHeapAccess no_heap_access;
+  DisallowHeapAccessIf no_heap_access(!FLAG_turbo_direct_heap_access);
   switch (node->opcode()) {
     case IrOpcode::kBranch:
       return ReduceBranch(node);
diff --git a/deps/v8/src/compiler/common-operator.cc b/deps/v8/src/compiler/common-operator.cc
index 8a1bfca8c78b42..8b3826424fb1c8 100644
--- a/deps/v8/src/compiler/common-operator.cc
+++ b/deps/v8/src/compiler/common-operator.cc
@@ -112,7 +112,8 @@ std::ostream& operator<<(std::ostream& os, DeoptimizeParameters p) {
 DeoptimizeParameters const& DeoptimizeParametersOf(Operator const* const op) {
   DCHECK(op->opcode() == IrOpcode::kDeoptimize ||
          op->opcode() == IrOpcode::kDeoptimizeIf ||
-         op->opcode() == IrOpcode::kDeoptimizeUnless);
+         op->opcode() == IrOpcode::kDeoptimizeUnless ||
+         op->opcode() == IrOpcode::kDynamicCheckMapsWithDeoptUnless);
   return OpParameter<DeoptimizeParameters>(op);
 }
 
@@ -192,6 +193,10 @@ MachineRepresentation PhiRepresentationOf(const Operator* const op) {
   return OpParameter<MachineRepresentation>(op);
 }
 
+MachineRepresentation LoopExitValueRepresentationOf(const Operator* const op) {
+  DCHECK_EQ(IrOpcode::kLoopExitValue, op->opcode());
+  return OpParameter<MachineRepresentation>(op);
+}
 
 int ParameterIndexOf(const Operator* const op) {
   DCHECK_EQ(IrOpcode::kParameter, op->opcode());
@@ -436,7 +441,7 @@ ZoneVector<MachineType> const* MachineTypesOf(Operator const* op) {
 V8_EXPORT_PRIVATE bool operator==(IfValueParameters const& l,
                                   IfValueParameters const& r) {
   return l.value() == r.value() &&
-         r.comparison_order() == r.comparison_order() && l.hint() == r.hint();
+         l.comparison_order() == r.comparison_order() && l.hint() == r.hint();
 }
 
 size_t hash_value(IfValueParameters const& p) {
@@ -465,12 +470,13 @@ IfValueParameters const& IfValueParametersOf(const Operator* op) {
   V(Throw, Operator::kKontrol, 0, 1, 1, 0, 0, 1)          \
   V(Terminate, Operator::kKontrol, 0, 1, 1, 0, 0, 1)      \
   V(LoopExit, Operator::kKontrol, 0, 0, 2, 0, 0, 1)       \
-  V(LoopExitValue, Operator::kPure, 1, 0, 1, 1, 0, 0)     \
   V(LoopExitEffect, Operator::kNoThrow, 0, 1, 1, 0, 1, 0) \
   V(Checkpoint, Operator::kKontrol, 0, 1, 1, 0, 1, 0)     \
   V(FinishRegion, Operator::kKontrol, 1, 1, 0, 1, 1, 0)   \
   V(Retain, Operator::kKontrol, 1, 1, 0, 0, 1, 0)
 
+#define CACHED_LOOP_EXIT_VALUE_LIST(V) V(kTagged)
+
 #define CACHED_BRANCH_LIST(V)   \
   V(None, CriticalSafetyCheck)  \
   V(True, CriticalSafetyCheck)  \
@@ -725,6 +731,19 @@ struct CommonOperatorGlobalCache final {
   CACHED_MERGE_LIST(CACHED_MERGE)
 #undef CACHED_MERGE
 
+  template <MachineRepresentation kRep>
+  struct LoopExitValueOperator final : public Operator1<MachineRepresentation> {
+    LoopExitValueOperator()
+        : Operator1<MachineRepresentation>(IrOpcode::kLoopExitValue,
+                                           Operator::kPure, "LoopExitValue", 1,
+                                           0, 1, 1, 0, 0, kRep) {}
+  };
+#define CACHED_LOOP_EXIT_VALUE(rep)                 \
+  LoopExitValueOperator<MachineRepresentation::rep> \
+      kLoopExitValue##rep##Operator;
+  CACHED_LOOP_EXIT_VALUE_LIST(CACHED_LOOP_EXIT_VALUE)
+#undef CACHED_LOOP_EXIT_VALUE
+
   template <DeoptimizeKind kKind, DeoptimizeReason kReason>
   struct DeoptimizeOperator final : public Operator1<DeoptimizeParameters> {
     DeoptimizeOperator()
@@ -782,6 +801,20 @@ struct CommonOperatorGlobalCache final {
   CACHED_DEOPTIMIZE_UNLESS_LIST(CACHED_DEOPTIMIZE_UNLESS)
 #undef CACHED_DEOPTIMIZE_UNLESS
 
+  struct DynamicMapCheckOperator final : Operator1<DeoptimizeParameters> {
+    DynamicMapCheckOperator()
+        : Operator1<DeoptimizeParameters>(                 // --
+              IrOpcode::kDynamicCheckMapsWithDeoptUnless,  // opcode
+              Operator::kFoldable | Operator::kNoThrow,    // properties
+              "DynamicCheckMapsWithDeoptUnless",           // name
+              5, 1, 1, 0, 1, 1,                            // counts
+              DeoptimizeParameters(DeoptimizeKind::kEagerWithResume,
+                                   DeoptimizeReason::kDynamicCheckMaps,
+                                   FeedbackSource(),
+                                   IsSafetyCheck::kCriticalSafetyCheck)) {}
+  };
+  DynamicMapCheckOperator kDynamicCheckMapsWithDeoptUnless;
+
   template <TrapId trap_id>
   struct TrapIfOperator final : public Operator1<TrapId> {
     TrapIfOperator()
@@ -1019,6 +1052,10 @@ const Operator* CommonOperatorBuilder::DeoptimizeUnless(
       parameter);                                       // parameter
 }
 
+const Operator* CommonOperatorBuilder::DynamicCheckMapsWithDeoptUnless() {
+  return &cache_.kDynamicCheckMapsWithDeoptUnless;
+}
+
 const Operator* CommonOperatorBuilder::TrapIf(TrapId trap_id) {
   switch (trap_id) {
 #define CACHED_TRAP_IF(Trap) \
@@ -1125,6 +1162,24 @@ const Operator* CommonOperatorBuilder::Merge(int control_input_count) {
       0, 0, control_input_count, 0, 0, 1);   // counts
 }
 
+const Operator* CommonOperatorBuilder::LoopExitValue(
+    MachineRepresentation rep) {
+  switch (rep) {
+#define CACHED_LOOP_EXIT_VALUE(kRep) \
+  case MachineRepresentation::kRep:  \
+    return &cache_.kLoopExitValue##kRep##Operator;
+
+    CACHED_LOOP_EXIT_VALUE_LIST(CACHED_LOOP_EXIT_VALUE)
+#undef CACHED_LOOP_EXIT_VALUE
+    default:
+      // Uncached.
+      return zone()->New<Operator1<MachineRepresentation>>(  // --
+          IrOpcode::kLoopExitValue, Operator::kPure,         // opcode
+          "LoopExitValue",                                   // name
+          1, 0, 1, 1, 0, 0,                                  // counts
+          rep);                                              // parameter
+  }
+}
 
 const Operator* CommonOperatorBuilder::Parameter(int index,
                                                  const char* debug_name) {
diff --git a/deps/v8/src/compiler/common-operator.h b/deps/v8/src/compiler/common-operator.h
index b6cede1cc5a886..d2768a9cf4b517 100644
--- a/deps/v8/src/compiler/common-operator.h
+++ b/deps/v8/src/compiler/common-operator.h
@@ -167,6 +167,9 @@ V8_EXPORT_PRIVATE CallDescriptor const* CallDescriptorOf(const Operator* const)
 V8_EXPORT_PRIVATE size_t ProjectionIndexOf(const Operator* const)
     V8_WARN_UNUSED_RESULT;
 
+V8_EXPORT_PRIVATE MachineRepresentation
+LoopExitValueRepresentationOf(const Operator* const) V8_WARN_UNUSED_RESULT;
+
 V8_EXPORT_PRIVATE MachineRepresentation
 PhiRepresentationOf(const Operator* const) V8_WARN_UNUSED_RESULT;
 
@@ -488,6 +491,10 @@ class V8_EXPORT_PRIVATE CommonOperatorBuilder final
       DeoptimizeKind kind, DeoptimizeReason reason,
       FeedbackSource const& feedback,
       IsSafetyCheck is_safety_check = IsSafetyCheck::kSafetyCheck);
+  // DynamicCheckMapsWithDeoptUnless will call the dynamic map check builtin if
+  // the condition is false, which may then either deoptimize or resume
+  // execution.
+  const Operator* DynamicCheckMapsWithDeoptUnless();
   const Operator* TrapIf(TrapId trap_id);
   const Operator* TrapUnless(TrapId trap_id);
   const Operator* Return(int value_input_count = 1);
@@ -523,7 +530,7 @@ class V8_EXPORT_PRIVATE CommonOperatorBuilder final
   const Operator* EffectPhi(int effect_input_count);
   const Operator* InductionVariablePhi(int value_input_count);
   const Operator* LoopExit();
-  const Operator* LoopExitValue();
+  const Operator* LoopExitValue(MachineRepresentation rep);
   const Operator* LoopExitEffect();
   const Operator* Checkpoint();
   const Operator* BeginRegion(RegionObservability);
@@ -636,6 +643,27 @@ class StartNode final : public CommonNodeWrapperBase {
   }
 };
 
+class DynamicCheckMapsWithDeoptUnlessNode final : public CommonNodeWrapperBase {
+ public:
+  explicit constexpr DynamicCheckMapsWithDeoptUnlessNode(Node* node)
+      : CommonNodeWrapperBase(node) {
+    CONSTEXPR_DCHECK(node->opcode() ==
+                     IrOpcode::kDynamicCheckMapsWithDeoptUnless);
+  }
+
+#define INPUTS(V)                   \
+  V(Condition, condition, 0, BoolT) \
+  V(Slot, slot, 1, IntPtrT)         \
+  V(Map, map, 2, Map)               \
+  V(Handler, handler, 3, Object)
+  INPUTS(DEFINE_INPUT_ACCESSORS)
+#undef INPUTS
+
+  FrameState frame_state() {
+    return FrameState{NodeProperties::GetValueInput(node(), 4)};
+  }
+};
+
 #undef DEFINE_INPUT_ACCESSORS
 
 }  // namespace compiler
diff --git a/deps/v8/src/compiler/compilation-dependencies.cc b/deps/v8/src/compiler/compilation-dependencies.cc
index 5fc60071143e8d..be503aa73febb7 100644
--- a/deps/v8/src/compiler/compilation-dependencies.cc
+++ b/deps/v8/src/compiler/compilation-dependencies.cc
@@ -168,7 +168,7 @@ class FieldRepresentationDependency final : public CompilationDependency {
   }
 
   bool IsValid() const override {
-    DisallowHeapAllocation no_heap_allocation;
+    DisallowGarbageCollection no_heap_allocation;
     Handle<Map> owner = owner_.object();
     return representation_.Equals(owner->instance_descriptors(kRelaxedLoad)
                                       .GetDetails(descriptor_)
@@ -206,7 +206,7 @@ class FieldTypeDependency final : public CompilationDependency {
   }
 
   bool IsValid() const override {
-    DisallowHeapAllocation no_heap_allocation;
+    DisallowGarbageCollection no_heap_allocation;
     Handle<Map> owner = owner_.object();
     Handle<Object> type = type_.object();
     return *type ==
@@ -235,7 +235,7 @@ class FieldConstnessDependency final : public CompilationDependency {
   }
 
   bool IsValid() const override {
-    DisallowHeapAllocation no_heap_allocation;
+    DisallowGarbageCollection no_heap_allocation;
     Handle<Map> owner = owner_.object();
     return PropertyConstness::kConst ==
            owner->instance_descriptors(kRelaxedLoad)
@@ -270,10 +270,6 @@ class GlobalPropertyDependency final : public CompilationDependency {
     // The dependency is never valid if the cell is 'invalidated'. This is
     // marked by setting the value to the hole.
     if (cell->value() == *(cell_.isolate()->factory()->the_hole_value())) {
-      DCHECK(cell->property_details().cell_type() ==
-                 PropertyCellType::kInvalidated ||
-             cell->property_details().cell_type() ==
-                 PropertyCellType::kUninitialized);
       return false;
     }
     return type_ == cell->property_details().cell_type() &&
@@ -384,6 +380,7 @@ void CompilationDependencies::RecordDependency(
 
 MapRef CompilationDependencies::DependOnInitialMap(
     const JSFunctionRef& function) {
+  DCHECK(!function.IsNeverSerializedHeapObject());
   MapRef map = function.initial_map();
   RecordDependency(zone_->New<InitialMapDependency>(function, map));
   return map;
@@ -391,6 +388,7 @@ MapRef CompilationDependencies::DependOnInitialMap(
 
 ObjectRef CompilationDependencies::DependOnPrototypeProperty(
     const JSFunctionRef& function) {
+  DCHECK(!function.IsNeverSerializedHeapObject());
   ObjectRef prototype = function.prototype();
   RecordDependency(
       zone_->New<PrototypePropertyDependency>(function, prototype));
@@ -398,6 +396,7 @@ ObjectRef CompilationDependencies::DependOnPrototypeProperty(
 }
 
 void CompilationDependencies::DependOnStableMap(const MapRef& map) {
+  DCHECK(!map.IsNeverSerializedHeapObject());
   if (map.CanTransition()) {
     RecordDependency(zone_->New<StableMapDependency>(map));
   } else {
@@ -411,6 +410,7 @@ void CompilationDependencies::DependOnTransition(const MapRef& target_map) {
 
 AllocationType CompilationDependencies::DependOnPretenureMode(
     const AllocationSiteRef& site) {
+  DCHECK(!site.IsNeverSerializedHeapObject());
   AllocationType allocation = site.GetAllocationType();
   RecordDependency(zone_->New<PretenureModeDependency>(site, allocation));
   return allocation;
@@ -418,7 +418,9 @@ AllocationType CompilationDependencies::DependOnPretenureMode(
 
 PropertyConstness CompilationDependencies::DependOnFieldConstness(
     const MapRef& map, InternalIndex descriptor) {
+  DCHECK(!map.IsNeverSerializedHeapObject());
   MapRef owner = map.FindFieldOwner(descriptor);
+  DCHECK(!owner.IsNeverSerializedHeapObject());
   PropertyConstness constness =
       owner.GetPropertyDetails(descriptor).constness();
   if (constness == PropertyConstness::kMutable) return constness;
@@ -451,12 +453,14 @@ void CompilationDependencies::DependOnFieldType(const MapRef& map,
 
 void CompilationDependencies::DependOnGlobalProperty(
     const PropertyCellRef& cell) {
+  DCHECK(!cell.IsNeverSerializedHeapObject());
   PropertyCellType type = cell.property_details().cell_type();
   bool read_only = cell.property_details().IsReadOnly();
   RecordDependency(zone_->New<GlobalPropertyDependency>(cell, type, read_only));
 }
 
 bool CompilationDependencies::DependOnProtector(const PropertyCellRef& cell) {
+  DCHECK(!cell.IsNeverSerializedHeapObject());
   if (cell.value().AsSmi() != Protectors::kProtectorValid) return false;
   RecordDependency(zone_->New<ProtectorDependency>(cell));
   return true;
@@ -500,6 +504,7 @@ bool CompilationDependencies::DependOnPromiseThenProtector() {
 
 void CompilationDependencies::DependOnElementsKind(
     const AllocationSiteRef& site) {
+  DCHECK(!site.IsNeverSerializedHeapObject());
   // Do nothing if the object doesn't have any useful element transitions left.
   ElementsKind kind = site.PointsToLiteral()
                           ? site.boilerplate().value().GetElementsKind()
@@ -640,6 +645,7 @@ CompilationDependencies::DependOnInitialMapInstanceSizePrediction(
 CompilationDependency const*
 CompilationDependencies::TransitionDependencyOffTheRecord(
     const MapRef& target_map) const {
+  DCHECK(!target_map.IsNeverSerializedHeapObject());
   if (target_map.CanBeDeprecated()) {
     return zone_->New<TransitionDependency>(target_map);
   } else {
@@ -651,7 +657,9 @@ CompilationDependencies::TransitionDependencyOffTheRecord(
 CompilationDependency const*
 CompilationDependencies::FieldRepresentationDependencyOffTheRecord(
     const MapRef& map, InternalIndex descriptor) const {
+  DCHECK(!map.IsNeverSerializedHeapObject());
   MapRef owner = map.FindFieldOwner(descriptor);
+  DCHECK(!owner.IsNeverSerializedHeapObject());
   PropertyDetails details = owner.GetPropertyDetails(descriptor);
   DCHECK(details.representation().Equals(
       map.GetPropertyDetails(descriptor).representation()));
@@ -662,7 +670,9 @@ CompilationDependencies::FieldRepresentationDependencyOffTheRecord(
 CompilationDependency const*
 CompilationDependencies::FieldTypeDependencyOffTheRecord(
     const MapRef& map, InternalIndex descriptor) const {
+  DCHECK(!map.IsNeverSerializedHeapObject());
   MapRef owner = map.FindFieldOwner(descriptor);
+  DCHECK(!owner.IsNeverSerializedHeapObject());
   ObjectRef type = owner.GetFieldType(descriptor);
   DCHECK(type.equals(map.GetFieldType(descriptor)));
   return zone_->New<FieldTypeDependency>(owner, descriptor, type);
diff --git a/deps/v8/src/compiler/compiler-source-position-table.h b/deps/v8/src/compiler/compiler-source-position-table.h
index 9974a2daad485b..699402c8efb40d 100644
--- a/deps/v8/src/compiler/compiler-source-position-table.h
+++ b/deps/v8/src/compiler/compiler-source-position-table.h
@@ -17,7 +17,7 @@ namespace compiler {
 class V8_EXPORT_PRIVATE SourcePositionTable final
     : public NON_EXPORTED_BASE(ZoneObject) {
  public:
-  class Scope final {
+  class V8_NODISCARD Scope final {
    public:
     Scope(SourcePositionTable* source_positions, SourcePosition position)
         : source_positions_(source_positions),
diff --git a/deps/v8/src/compiler/constant-folding-reducer.cc b/deps/v8/src/compiler/constant-folding-reducer.cc
index 9649dbda08ca2f..1c672c700d5d51 100644
--- a/deps/v8/src/compiler/constant-folding-reducer.cc
+++ b/deps/v8/src/compiler/constant-folding-reducer.cc
@@ -63,7 +63,7 @@ ConstantFoldingReducer::ConstantFoldingReducer(Editor* editor, JSGraph* jsgraph,
 ConstantFoldingReducer::~ConstantFoldingReducer() = default;
 
 Reduction ConstantFoldingReducer::Reduce(Node* node) {
-  DisallowHeapAccess no_heap_access;
+  DisallowHeapAccessIf no_heap_access(!FLAG_turbo_direct_heap_access);
   if (!NodeProperties::IsConstant(node) && NodeProperties::IsTyped(node) &&
       node->op()->HasProperty(Operator::kEliminatable) &&
       node->opcode() != IrOpcode::kFinishRegion) {
diff --git a/deps/v8/src/compiler/dead-code-elimination.cc b/deps/v8/src/compiler/dead-code-elimination.cc
index bab6b7b506e368..61552ba523cb52 100644
--- a/deps/v8/src/compiler/dead-code-elimination.cc
+++ b/deps/v8/src/compiler/dead-code-elimination.cc
@@ -46,7 +46,7 @@ Node* FindDeadInput(Node* node) {
 }  // namespace
 
 Reduction DeadCodeElimination::Reduce(Node* node) {
-  DisallowHeapAccess no_heap_access;
+  DisallowHeapAccessIf no_heap_access(!FLAG_turbo_direct_heap_access);
   switch (node->opcode()) {
     case IrOpcode::kEnd:
       return ReduceEnd(node);
diff --git a/deps/v8/src/compiler/effect-control-linearizer.cc b/deps/v8/src/compiler/effect-control-linearizer.cc
index 015f1cce6f80c4..5fe983213cc39c 100644
--- a/deps/v8/src/compiler/effect-control-linearizer.cc
+++ b/deps/v8/src/compiler/effect-control-linearizer.cc
@@ -286,13 +286,10 @@ class EffectControlLinearizer {
   void MigrateInstanceOrDeopt(Node* value, Node* value_map, Node* frame_state,
                               FeedbackSource const& feedback_source,
                               DeoptimizeReason reason);
+  // Tries to migrate |value| if its map |value_map| is deprecated, but doesn't
+  // deopt on failure.
+  void TryMigrateInstance(Node* value, Node* value_map);
 
-  // Helper functions used in LowerDynamicCheckMaps
-  void BuildCallDynamicMapChecksBuiltin(Node* actual_value,
-                                        Node* actual_handler,
-                                        int feedback_slot_index,
-                                        GraphAssemblerLabel<0>* done,
-                                        Node* frame_state);
   bool should_maintain_schedule() const {
     return maintain_schedule_ == MaintainSchedule::kMaintain;
   }
@@ -1889,52 +1886,63 @@ void EffectControlLinearizer::LowerCheckMaps(Node* node, Node* frame_state) {
   }
 }
 
-void EffectControlLinearizer::BuildCallDynamicMapChecksBuiltin(
-    Node* actual_value, Node* actual_handler, int feedback_slot_index,
-    GraphAssemblerLabel<0>* done, Node* frame_state) {
-  Node* slot_index = __ IntPtrConstant(feedback_slot_index);
+void EffectControlLinearizer::TryMigrateInstance(Node* value, Node* value_map) {
+  auto done = __ MakeLabel();
+  // If map is not deprecated the migration attempt does not make sense.
+  Node* bitfield3 = __ LoadField(AccessBuilder::ForMapBitField3(), value_map);
+  Node* is_not_deprecated = __ Word32Equal(
+      __ Word32And(bitfield3,
+                   __ Int32Constant(Map::Bits3::IsDeprecatedBit::kMask)),
+      __ Int32Constant(0));
+  __ GotoIf(is_not_deprecated, &done);
   Operator::Properties properties = Operator::kNoDeopt | Operator::kNoThrow;
-  auto builtin = Builtins::kDynamicMapChecks;
-  Node* result = CallBuiltin(builtin, properties, slot_index, actual_value,
-                             actual_handler);
-  __ GotoIf(__ WordEqual(result, __ IntPtrConstant(static_cast<int>(
-                                     DynamicMapChecksStatus::kSuccess))),
-            done);
-  __ DeoptimizeIf(DeoptimizeKind::kBailout, DeoptimizeReason::kMissingMap,
-                  FeedbackSource(),
-                  __ WordEqual(result, __ IntPtrConstant(static_cast<int>(
-                                           DynamicMapChecksStatus::kBailout))),
-                  frame_state, IsSafetyCheck::kCriticalSafetyCheck);
-  __ DeoptimizeIf(DeoptimizeReason::kWrongHandler, FeedbackSource(),
-                  __ WordEqual(result, __ IntPtrConstant(static_cast<int>(
-                                           DynamicMapChecksStatus::kDeopt))),
-                  frame_state, IsSafetyCheck::kCriticalSafetyCheck);
-  __ Unreachable(done);
+  Runtime::FunctionId id = Runtime::kTryMigrateInstance;
+  auto call_descriptor = Linkage::GetRuntimeCallDescriptor(
+      graph()->zone(), id, 1, properties, CallDescriptor::kNoFlags);
+  __ Call(call_descriptor, __ CEntryStubConstant(1), value,
+          __ ExternalConstant(ExternalReference::Create(id)),
+          __ Int32Constant(1), __ NoContextConstant());
+  __ Goto(&done);
+  __ Bind(&done);
 }
 
 void EffectControlLinearizer::LowerDynamicCheckMaps(Node* node,
                                                     Node* frame_state) {
   DynamicCheckMapsParameters const& p =
       DynamicCheckMapsParametersOf(node->op());
-  Node* actual_value = node->InputAt(0);
+  Node* value = node->InputAt(0);
 
   FeedbackSource const& feedback = p.feedback();
-  Node* actual_value_map = __ LoadField(AccessBuilder::ForMap(), actual_value);
+  Node* slot_index = __ IntPtrConstant(feedback.index());
+  Node* value_map = __ LoadField(AccessBuilder::ForMap(), value);
   Node* actual_handler =
       p.handler()->IsSmi()
           ? __ SmiConstant(Smi::ToInt(*p.handler()))
           : __ HeapConstant(Handle<HeapObject>::cast(p.handler()));
 
   auto done = __ MakeLabel();
-  auto call_builtin = __ MakeDeferredLabel();
 
   ZoneHandleSet<Map> maps = p.maps();
   size_t const map_count = maps.size();
   for (size_t i = 0; i < map_count; ++i) {
     Node* map = __ HeapConstant(maps[i]);
-    Node* check = __ TaggedEqual(actual_value_map, map);
+    Node* check = __ TaggedEqual(value_map, map);
     if (i == map_count - 1) {
-      __ BranchWithCriticalSafetyCheck(check, &done, &call_builtin);
+      if (p.flags() & CheckMapsFlag::kTryMigrateInstance) {
+        auto migrate = __ MakeDeferredLabel();
+        __ BranchWithCriticalSafetyCheck(check, &done, &migrate);
+
+        __ Bind(&migrate);
+        TryMigrateInstance(value, value_map);
+
+        // Reload the current map of the {value} before performing the dynanmic
+        // map check.
+        value_map = __ LoadField(AccessBuilder::ForMap(), value);
+      }
+
+      __ DynamicCheckMapsWithDeoptUnless(check, slot_index, value_map,
+                                         actual_handler, frame_state);
+      __ Goto(&done);
     } else {
       auto next_map = __ MakeLabel();
       __ BranchWithCriticalSafetyCheck(check, &done, &next_map);
@@ -1942,12 +1950,6 @@ void EffectControlLinearizer::LowerDynamicCheckMaps(Node* node,
     }
   }
 
-  __ Bind(&call_builtin);
-  {
-    BuildCallDynamicMapChecksBuiltin(actual_value, actual_handler,
-                                     feedback.index(), &done, frame_state);
-  }
-
   __ Bind(&done);
 }
 
@@ -2607,7 +2609,12 @@ Node* EffectControlLinearizer::BuildCheckedFloat64ToInt32(
 Node* EffectControlLinearizer::BuildCheckedFloat64ToIndex(
     const FeedbackSource& feedback, Node* value, Node* frame_state) {
   if (machine()->Is64()) {
-    Node* value64 = __ TruncateFloat64ToInt64(value);
+    Node* value64 =
+        __ TruncateFloat64ToInt64(value, TruncateKind::kArchitectureDefault);
+    // The TruncateKind above means there will be a precision loss in case
+    // INT64_MAX input is passed, but that precision loss would not be
+    // detected and would not lead to a deoptimization from the first check.
+    // But in this case, we'll deopt anyway because of the following checks.
     Node* check_same = __ Float64Equal(value, __ ChangeInt64ToFloat64(value64));
     __ DeoptimizeIfNot(DeoptimizeReason::kLostPrecisionOrNaN, feedback,
                        check_same, frame_state);
@@ -2641,7 +2648,8 @@ Node* EffectControlLinearizer::LowerCheckedFloat64ToInt32(Node* node,
 Node* EffectControlLinearizer::BuildCheckedFloat64ToInt64(
     CheckForMinusZeroMode mode, const FeedbackSource& feedback, Node* value,
     Node* frame_state) {
-  Node* value64 = __ TruncateFloat64ToInt64(value);
+  Node* value64 =
+      __ TruncateFloat64ToInt64(value, TruncateKind::kSetOverflowToMin);
   Node* check_same = __ Float64Equal(value, __ ChangeInt64ToFloat64(value64));
   __ DeoptimizeIfNot(DeoptimizeReason::kLostPrecisionOrNaN, feedback,
                      check_same, frame_state);
@@ -3917,7 +3925,7 @@ Node* EffectControlLinearizer::LowerNewConsString(Node* node) {
   Node* result =
       __ Allocate(AllocationType::kYoung, __ IntPtrConstant(ConsString::kSize));
   __ StoreField(AccessBuilder::ForMap(), result, result_map);
-  __ StoreField(AccessBuilder::ForNameHashField(), result,
+  __ StoreField(AccessBuilder::ForNameRawHashField(), result,
                 __ Int32Constant(Name::kEmptyHashField));
   __ StoreField(AccessBuilder::ForStringLength(), result, length);
   __ StoreField(AccessBuilder::ForConsStringFirst(), result, first);
@@ -4227,7 +4235,7 @@ Node* EffectControlLinearizer::LowerStringFromSingleCharCode(Node* node) {
                       __ IntPtrConstant(SeqOneByteString::SizeFor(1)));
       __ StoreField(AccessBuilder::ForMap(), vtrue2,
                     __ HeapConstant(factory()->one_byte_string_map()));
-      __ StoreField(AccessBuilder::ForNameHashField(), vtrue2,
+      __ StoreField(AccessBuilder::ForNameRawHashField(), vtrue2,
                     __ Int32Constant(Name::kEmptyHashField));
       __ StoreField(AccessBuilder::ForStringLength(), vtrue2,
                     __ Int32Constant(1));
@@ -4252,7 +4260,7 @@ Node* EffectControlLinearizer::LowerStringFromSingleCharCode(Node* node) {
                     __ IntPtrConstant(SeqTwoByteString::SizeFor(1)));
     __ StoreField(AccessBuilder::ForMap(), vfalse1,
                   __ HeapConstant(factory()->string_map()));
-    __ StoreField(AccessBuilder::ForNameHashField(), vfalse1,
+    __ StoreField(AccessBuilder::ForNameRawHashField(), vfalse1,
                   __ Int32Constant(Name::kEmptyHashField));
     __ StoreField(AccessBuilder::ForStringLength(), vfalse1,
                   __ Int32Constant(1));
@@ -4353,7 +4361,7 @@ Node* EffectControlLinearizer::LowerStringFromSingleCodePoint(Node* node) {
                         __ IntPtrConstant(SeqOneByteString::SizeFor(1)));
         __ StoreField(AccessBuilder::ForMap(), vtrue2,
                       __ HeapConstant(factory()->one_byte_string_map()));
-        __ StoreField(AccessBuilder::ForNameHashField(), vtrue2,
+        __ StoreField(AccessBuilder::ForNameRawHashField(), vtrue2,
                       __ Int32Constant(Name::kEmptyHashField));
         __ StoreField(AccessBuilder::ForStringLength(), vtrue2,
                       __ Int32Constant(1));
@@ -4378,7 +4386,7 @@ Node* EffectControlLinearizer::LowerStringFromSingleCodePoint(Node* node) {
                       __ IntPtrConstant(SeqTwoByteString::SizeFor(1)));
       __ StoreField(AccessBuilder::ForMap(), vfalse1,
                     __ HeapConstant(factory()->string_map()));
-      __ StoreField(AccessBuilder::ForNameHashField(), vfalse1,
+      __ StoreField(AccessBuilder::ForNameRawHashField(), vfalse1,
                     __ IntPtrConstant(Name::kEmptyHashField));
       __ StoreField(AccessBuilder::ForStringLength(), vfalse1,
                     __ Int32Constant(1));
@@ -4418,7 +4426,7 @@ Node* EffectControlLinearizer::LowerStringFromSingleCodePoint(Node* node) {
                     __ IntPtrConstant(SeqTwoByteString::SizeFor(2)));
     __ StoreField(AccessBuilder::ForMap(), vfalse0,
                   __ HeapConstant(factory()->string_map()));
-    __ StoreField(AccessBuilder::ForNameHashField(), vfalse0,
+    __ StoreField(AccessBuilder::ForNameRawHashField(), vfalse0,
                   __ Int32Constant(Name::kEmptyHashField));
     __ StoreField(AccessBuilder::ForStringLength(), vfalse0,
                   __ Int32Constant(2));
@@ -5085,9 +5093,16 @@ Node* EffectControlLinearizer::LowerFastApiCall(Node* node) {
 
   call_descriptor->SetCFunctionInfo(c_signature);
 
+  // CPU profiler support
+  Node* target_address = __ ExternalConstant(
+      ExternalReference::fast_api_call_target_address(isolate()));
+  __ Store(StoreRepresentation(MachineType::PointerRepresentation(),
+                               kNoWriteBarrier),
+           target_address, 0, n.target());
+
   Node** const inputs = graph()->zone()->NewArray<Node*>(
       c_arg_count + FastApiCallNode::kFastCallExtraInputCount);
-  inputs[0] = NodeProperties::GetValueInput(node, 0);  // the target
+  inputs[0] = n.target();
   for (int i = FastApiCallNode::kFastTargetInputCount;
        i < c_arg_count + FastApiCallNode::kFastTargetInputCount; ++i) {
     if (c_signature->ArgumentInfo(i - 1).GetType() ==
@@ -5099,12 +5114,17 @@ Node* EffectControlLinearizer::LowerFastApiCall(Node* node) {
     }
   }
   inputs[c_arg_count + 1] = fast_api_call_stack_slot_;
+
   inputs[c_arg_count + 2] = __ effect();
   inputs[c_arg_count + 3] = __ control();
 
   __ Call(call_descriptor,
           c_arg_count + FastApiCallNode::kFastCallExtraInputCount, inputs);
 
+  __ Store(StoreRepresentation(MachineType::PointerRepresentation(),
+                               kNoWriteBarrier),
+           target_address, 0, __ IntPtrConstant(0));
+
   // Generate the load from `fast_api_call_stack_slot_`.
   Node* load = __ Load(MachineType::Int32(), fast_api_call_stack_slot_, 0);
 
diff --git a/deps/v8/src/compiler/escape-analysis.cc b/deps/v8/src/compiler/escape-analysis.cc
index 07587524a46fe0..c27bf8551c37e8 100644
--- a/deps/v8/src/compiler/escape-analysis.cc
+++ b/deps/v8/src/compiler/escape-analysis.cc
@@ -126,7 +126,7 @@ class VariableTracker {
   Node* Get(Variable var, Node* effect) { return table_.Get(effect).Get(var); }
   Zone* zone() { return zone_; }
 
-  class Scope : public ReduceScope {
+  class V8_NODISCARD Scope : public ReduceScope {
    public:
     Scope(VariableTracker* tracker, Node* node, Reduction* reduction);
     ~Scope();
@@ -174,7 +174,7 @@ class EscapeAnalysisTracker : public ZoneObject {
   EscapeAnalysisTracker(const EscapeAnalysisTracker&) = delete;
   EscapeAnalysisTracker& operator=(const EscapeAnalysisTracker&) = delete;
 
-  class Scope : public VariableTracker::Scope {
+  class V8_NODISCARD Scope : public VariableTracker::Scope {
    public:
     Scope(EffectGraphReducer* reducer, EscapeAnalysisTracker* tracker,
           Node* node, Reduction* reduction)
diff --git a/deps/v8/src/compiler/frame.cc b/deps/v8/src/compiler/frame.cc
index 5313ec3d61f419..98938e835890a5 100644
--- a/deps/v8/src/compiler/frame.cc
+++ b/deps/v8/src/compiler/frame.cc
@@ -18,8 +18,11 @@ Frame::Frame(int fixed_frame_size_in_slots)
       allocated_registers_(nullptr),
       allocated_double_registers_(nullptr) {}
 
-int Frame::AlignFrame(int alignment) {
+void Frame::AlignFrame(int alignment) {
   int alignment_slots = alignment / kSystemPointerSize;
+  // In the calculations below we assume that alignment_slots is a power of 2.
+  DCHECK(base::bits::IsPowerOfTwo(alignment_slots));
+
   // We have to align return slots separately, because they are claimed
   // separately on the stack.
   int return_delta =
@@ -34,7 +37,6 @@ int Frame::AlignFrame(int alignment) {
       spill_slot_count_ += delta;
     }
   }
-  return delta;
 }
 
 void FrameAccessState::MarkHasFrame(bool state) {
diff --git a/deps/v8/src/compiler/frame.h b/deps/v8/src/compiler/frame.h
index 7d1a9dfb3a4fa7..1b03a22968b495 100644
--- a/deps/v8/src/compiler/frame.h
+++ b/deps/v8/src/compiler/frame.h
@@ -146,7 +146,7 @@ class V8_EXPORT_PRIVATE Frame : public ZoneObject {
     }
   }
 
-  int AlignFrame(int alignment = kDoubleSize);
+  void AlignFrame(int alignment = kDoubleSize);
 
   int ReserveSpillSlots(size_t slot_count) {
     DCHECK_EQ(0, spill_slot_count_);
diff --git a/deps/v8/src/compiler/graph-assembler.cc b/deps/v8/src/compiler/graph-assembler.cc
index aaa0644da62f09..897e22ac26485a 100644
--- a/deps/v8/src/compiler/graph-assembler.cc
+++ b/deps/v8/src/compiler/graph-assembler.cc
@@ -495,6 +495,11 @@ Node* GraphAssembler::Float64RoundTruncate(Node* value) {
       graph()->NewNode(machine()->Float64RoundTruncate().op(), value));
 }
 
+Node* GraphAssembler::TruncateFloat64ToInt64(Node* value, TruncateKind kind) {
+  return AddNode(
+      graph()->NewNode(machine()->TruncateFloat64ToInt64(kind), value));
+}
+
 Node* GraphAssembler::Projection(int index, Node* value) {
   return AddNode(
       graph()->NewNode(common()->Projection(index), value, control()));
@@ -807,6 +812,15 @@ Node* GraphAssembler::DeoptimizeIfNot(DeoptimizeReason reason,
                          frame_state, is_safety_check);
 }
 
+Node* GraphAssembler::DynamicCheckMapsWithDeoptUnless(Node* condition,
+                                                      Node* slot_index,
+                                                      Node* value, Node* map,
+                                                      Node* frame_state) {
+  return AddNode(graph()->NewNode(common()->DynamicCheckMapsWithDeoptUnless(),
+                                  condition, slot_index, value, map,
+                                  frame_state, effect(), control()));
+}
+
 TNode<Object> GraphAssembler::Call(const CallDescriptor* call_descriptor,
                                    int inputs_size, Node** inputs) {
   return Call(common()->Call(call_descriptor), inputs_size, inputs);
diff --git a/deps/v8/src/compiler/graph-assembler.h b/deps/v8/src/compiler/graph-assembler.h
index eb7f6cc3c07cff..a2de1b7c0946a5 100644
--- a/deps/v8/src/compiler/graph-assembler.h
+++ b/deps/v8/src/compiler/graph-assembler.h
@@ -48,7 +48,6 @@ class BasicBlock;
   V(Float64SilenceNaN)                   \
   V(RoundFloat64ToInt32)                 \
   V(TruncateFloat64ToFloat32)            \
-  V(TruncateFloat64ToInt64)              \
   V(TruncateFloat64ToWord32)             \
   V(TruncateInt64ToInt32)                \
   V(Word32ReverseBytes)                  \
@@ -90,6 +89,7 @@ class BasicBlock;
   V(Word64And)                            \
   V(Word64Equal)                          \
   V(Word64Or)                             \
+  V(Word64Shr)                            \
   V(WordAnd)                              \
   V(WordEqual)                            \
   V(WordOr)                               \
@@ -284,6 +284,7 @@ class V8_EXPORT_PRIVATE GraphAssembler {
 
   Node* Float64RoundDown(Node* value);
   Node* Float64RoundTruncate(Node* value);
+  Node* TruncateFloat64ToInt64(Node* value, TruncateKind kind);
 
   Node* BitcastWordToTagged(Node* value);
   Node* BitcastWordToTaggedSigned(Node* value);
@@ -330,6 +331,9 @@ class V8_EXPORT_PRIVATE GraphAssembler {
       DeoptimizeReason reason, FeedbackSource const& feedback, Node* condition,
       Node* frame_state,
       IsSafetyCheck is_safety_check = IsSafetyCheck::kSafetyCheck);
+  Node* DynamicCheckMapsWithDeoptUnless(Node* condition, Node* slot_index,
+                                        Node* map, Node* handler,
+                                        Node* frame_state);
   TNode<Object> Call(const CallDescriptor* call_descriptor, int inputs_size,
                      Node** inputs);
   TNode<Object> Call(const Operator* op, int inputs_size, Node** inputs);
@@ -435,11 +439,11 @@ class V8_EXPORT_PRIVATE GraphAssembler {
   // All labels created while a LoopScope is live are considered to be inside
   // the loop.
   template <MachineRepresentation... Reps>
-  class LoopScope final {
+  class V8_NODISCARD LoopScope final {
    private:
     // The internal scope is only here to increment the graph assembler's
     // nesting level prior to `loop_header_label` creation below.
-    class LoopScopeInternal {
+    class V8_NODISCARD LoopScopeInternal {
      public:
       explicit LoopScopeInternal(GraphAssembler* gasm)
           : previous_loop_nesting_level_(gasm->loop_nesting_level_),
@@ -486,7 +490,7 @@ class V8_EXPORT_PRIVATE GraphAssembler {
   };
 
   // Upon destruction, restores effect and control to the state at construction.
-  class RestoreEffectControlScope {
+  class V8_NODISCARD RestoreEffectControlScope {
    public:
     explicit RestoreEffectControlScope(GraphAssembler* gasm)
         : gasm_(gasm), effect_(gasm->effect()), control_(gasm->control()) {}
@@ -566,8 +570,9 @@ void GraphAssembler::MergeState(GraphAssemblerLabel<sizeof...(Vars)>* label,
                              *loop_headers_.back()));
     AddNode(graph()->NewNode(common()->LoopExitEffect(), effect(), control()));
     for (size_t i = 0; i < kVarCount; i++) {
-      var_array[i] = AddNode(
-          graph()->NewNode(common()->LoopExitValue(), var_array[i], control()));
+      var_array[i] = AddNode(graph()->NewNode(
+          common()->LoopExitValue(MachineRepresentation::kTagged), var_array[i],
+          control()));
     }
   }
 
diff --git a/deps/v8/src/compiler/graph-visualizer.cc b/deps/v8/src/compiler/graph-visualizer.cc
index c633f4fa62e712..c6f58152bfc852 100644
--- a/deps/v8/src/compiler/graph-visualizer.cc
+++ b/deps/v8/src/compiler/graph-visualizer.cc
@@ -8,6 +8,7 @@
 #include <sstream>
 #include <string>
 
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/optimized-compilation-info.h"
 #include "src/codegen/source-position.h"
 #include "src/compiler/all-nodes.h"
@@ -110,13 +111,12 @@ void JsonPrintFunctionSource(std::ostream& os, int source_id,
     }
     os << "\"";
     {
-      DisallowHeapAllocation no_allocation;
+      DisallowGarbageCollection no_gc;
       start = shared->StartPosition();
       end = shared->EndPosition();
       os << ", \"sourceText\": \"";
       int len = shared->EndPosition() - start;
-      SubStringRange source(String::cast(script->source()), no_allocation,
-                            start, len);
+      SubStringRange source(String::cast(script->source()), no_gc, start, len);
       for (const auto& c : source) {
         os << AsEscapedUC16ForJSON(c);
       }
@@ -173,7 +173,7 @@ void JsonPrintAllSourceWithPositions(std::ostream& os,
   JsonPrintFunctionSource(os, -1,
                           info->shared_info().is_null()
                               ? std::unique_ptr<char[]>(new char[1]{0})
-                              : info->shared_info()->DebugName().ToCString(),
+                              : info->shared_info()->DebugNameCStr(),
                           script, isolate, info->shared_info(), true);
   const auto& inlined = info->inlined_functions();
   SourceIdAssigner id_assigner(info->inlined_functions().size());
@@ -181,7 +181,7 @@ void JsonPrintAllSourceWithPositions(std::ostream& os,
     os << ", ";
     Handle<SharedFunctionInfo> shared = inlined[id].shared_info;
     const int source_id = id_assigner.GetIdFor(shared);
-    JsonPrintFunctionSource(os, source_id, shared->DebugName().ToCString(),
+    JsonPrintFunctionSource(os, source_id, shared->DebugNameCStr(),
                             handle(Script::cast(shared->script()), isolate),
                             isolate, shared, true);
   }
@@ -255,7 +255,7 @@ std::unique_ptr<char[]> GetVisualizerLogFileName(OptimizedCompilationInfo* info,
   }
 
   char* buffer = new char[full_filename.length() + 1];
-  memcpy(buffer, full_filename.begin(), full_filename.length());
+  base::Memcpy(buffer, full_filename.begin(), full_filename.length());
   buffer[full_filename.length()] = '\0';
   return std::unique_ptr<char[]>(buffer);
 }
diff --git a/deps/v8/src/compiler/graph.h b/deps/v8/src/compiler/graph.h
index c8af078895fb65..eb6bfd7e77ad2b 100644
--- a/deps/v8/src/compiler/graph.h
+++ b/deps/v8/src/compiler/graph.h
@@ -40,7 +40,7 @@ class V8_EXPORT_PRIVATE Graph final : public NON_EXPORTED_BASE(ZoneObject) {
   // Scope used when creating a subgraph for inlining. Automatically preserves
   // the original start and end nodes of the graph, and resets them when you
   // leave the scope.
-  class SubgraphScope final {
+  class V8_NODISCARD SubgraphScope final {
    public:
     explicit SubgraphScope(Graph* graph)
         : graph_(graph), start_(graph->start()), end_(graph->end()) {}
diff --git a/deps/v8/src/compiler/heap-refs.h b/deps/v8/src/compiler/heap-refs.h
index b268593a48cb85..e5bfa3e34ed135 100644
--- a/deps/v8/src/compiler/heap-refs.h
+++ b/deps/v8/src/compiler/heap-refs.h
@@ -61,13 +61,17 @@ enum class OddballType : uint8_t {
   /* Subtypes of FixedArray */                      \
   V(ObjectBoilerplateDescription)                   \
   V(ScopeInfo)                                      \
+  /* Subtypes of String */                          \
+  V(InternalizedString)                             \
   /* Subtypes of Name */                            \
+  V(String)                                         \
   V(Symbol)                                         \
   /* Subtypes of HeapObject */                      \
   V(AccessorInfo)                                   \
   V(ArrayBoilerplateDescription)                    \
   V(CallHandlerInfo)                                \
   V(Cell)                                           \
+  V(Name)                                           \
   V(TemplateObjectDescription)
 
 // This list is sorted such that subtypes appear before their supertypes.
@@ -91,9 +95,6 @@ enum class OddballType : uint8_t {
   V(BytecodeArray)                            \
   V(FixedArray)                               \
   V(FixedDoubleArray)                         \
-  /* Subtypes of Name */                      \
-  V(InternalizedString)                       \
-  V(String)                                   \
   /* Subtypes of JSReceiver */                \
   V(JSObject)                                 \
   /* Subtypes of HeapObject */                \
@@ -108,7 +109,6 @@ enum class OddballType : uint8_t {
   V(HeapNumber)                               \
   V(JSReceiver)                               \
   V(Map)                                      \
-  V(Name)                                     \
   V(PropertyCell)                             \
   V(SharedFunctionInfo)                       \
   V(SourceTextModule)                         \
@@ -138,6 +138,7 @@ class V8_EXPORT_PRIVATE ObjectRef {
   Handle<Object> object() const;
 
   bool equals(const ObjectRef& other) const;
+  bool ShouldHaveBeenSerialized() const;
 
   bool IsSmi() const;
   int AsSmi() const;
@@ -177,6 +178,10 @@ class V8_EXPORT_PRIVATE ObjectRef {
     }
   };
 
+#ifdef DEBUG
+  bool IsNeverSerializedHeapObject() const;
+#endif  // DEBUG
+
  protected:
   JSHeapBroker* broker() const;
   ObjectData* data() const;
@@ -592,7 +597,6 @@ class V8_EXPORT_PRIVATE MapRef : public HeapObjectRef {
   int UnusedPropertyFields() const;
   ElementsKind elements_kind() const;
   bool is_stable() const;
-  bool is_extensible() const;
   bool is_constructor() const;
   bool has_prototype_slot() const;
   bool is_access_check_needed() const;
@@ -631,7 +635,6 @@ class V8_EXPORT_PRIVATE MapRef : public HeapObjectRef {
       ZoneVector<MapRef>* prototype_maps);
 
   // Concerning the underlying instance_descriptors:
-  void SerializeOwnDescriptors();
   void SerializeOwnDescriptor(InternalIndex descriptor_index);
   bool serialized_own_descriptor(InternalIndex descriptor_index) const;
   MapRef FindFieldOwner(InternalIndex descriptor_index) const;
@@ -817,13 +820,6 @@ class V8_EXPORT_PRIVATE SharedFunctionInfoRef : public HeapObjectRef {
     return GetInlineability() == SharedFunctionInfo::kIsInlineable;
   }
 
-  // Template objects may not be created at compilation time. This method
-  // wraps the retrieval of the template object and creates it if
-  // necessary.
-  JSArrayRef GetTemplateObject(
-      TemplateObjectDescriptionRef description, FeedbackSource const& source,
-      SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
-
   void SerializeFunctionTemplateInfo();
   base::Optional<FunctionTemplateInfoRef> function_template_info() const;
 
@@ -837,8 +833,8 @@ class StringRef : public NameRef {
 
   Handle<String> object() const;
 
-  int length() const;
-  uint16_t GetFirstChar();
+  base::Optional<int> length() const;
+  base::Optional<uint16_t> GetFirstChar();
   base::Optional<double> ToNumber();
   bool IsSeqString() const;
   bool IsExternalString() const;
diff --git a/deps/v8/src/compiler/js-call-reducer.cc b/deps/v8/src/compiler/js-call-reducer.cc
index 7088fb0d43f2a9..9684086a5d5ec0 100644
--- a/deps/v8/src/compiler/js-call-reducer.cc
+++ b/deps/v8/src/compiler/js-call-reducer.cc
@@ -25,6 +25,7 @@
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/property-access-builder.h"
 #include "src/compiler/simplified-operator.h"
+#include "src/compiler/state-values-utils.h"
 #include "src/compiler/type-cache.h"
 #include "src/ic/call-optimization.h"
 #include "src/logging/counters.h"
@@ -318,7 +319,7 @@ class JSCallReducerAssembler : public JSGraphAssembler {
   // custom catch logic within the reduction itself; or a catch handler in the
   // outside graph into which the reduction will be integrated (in this case
   // the scope is called 'outermost').
-  class CatchScope {
+  class V8_NODISCARD CatchScope {
    private:
     // Only used to partially construct the outermost scope.
     explicit CatchScope(Zone* zone) : if_exception_nodes_(zone) {}
@@ -2202,10 +2203,6 @@ TNode<Object> PromiseBuiltinReducerAssembler::ReducePromiseConstructor(
 
 #undef _
 
-bool JSCallReducer::should_disallow_heap_access() const {
-  return broker_->is_concurrent_inlining();
-}
-
 Reduction JSCallReducer::ReplaceWithSubgraph(JSCallReducerAssembler* gasm,
                                              Node* subgraph) {
   // TODO(jgruber): Consider a less fiddly way of integrating the new subgraph
@@ -2362,8 +2359,6 @@ Reduction JSCallReducer::ReduceMathMinMax(Node* node, const Operator* op,
 }
 
 Reduction JSCallReducer::Reduce(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   switch (node->opcode()) {
     case IrOpcode::kJSConstruct:
       return ReduceJSConstruct(node);
@@ -2403,8 +2398,6 @@ void JSCallReducer::Finalize() {
 
 // ES6 section 22.1.1 The Array Constructor
 Reduction JSCallReducer::ReduceArrayConstructor(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   Node* target = n.target();
   CallParameters const& p = n.Parameters();
@@ -2454,8 +2447,6 @@ Reduction JSCallReducer::ReduceObjectConstructor(Node* node) {
 
 // ES6 section 19.2.3.1 Function.prototype.apply ( thisArg, argArray )
 Reduction JSCallReducer::ReduceFunctionPrototypeApply(Node* node) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   int arity = p.arity_without_implicit_args();
@@ -2577,8 +2568,6 @@ Reduction JSCallReducer::ReduceFunctionPrototypeApply(Node* node) {
 
 // ES section #sec-function.prototype.bind
 Reduction JSCallReducer::ReduceFunctionPrototypeBind(Node* node) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   if (p.speculation_mode() == SpeculationMode::kDisallowSpeculation) {
@@ -2607,7 +2596,7 @@ Reduction JSCallReducer::ReduceFunctionPrototypeBind(Node* node) {
   MapRef first_receiver_map(broker(), receiver_maps[0]);
   bool const is_constructor = first_receiver_map.is_constructor();
 
-  if (should_disallow_heap_access() &&
+  if (first_receiver_map.ShouldHaveBeenSerialized() &&
       !first_receiver_map.serialized_prototype()) {
     TRACE_BROKER_MISSING(broker(),
                          "serialized prototype on map " << first_receiver_map);
@@ -2617,17 +2606,18 @@ Reduction JSCallReducer::ReduceFunctionPrototypeBind(Node* node) {
   for (Handle<Map> const map : receiver_maps) {
     MapRef receiver_map(broker(), map);
 
-    if (should_disallow_heap_access() && !receiver_map.serialized_prototype()) {
+    if (receiver_map.ShouldHaveBeenSerialized() &&
+        !receiver_map.serialized_prototype()) {
       TRACE_BROKER_MISSING(broker(),
                            "serialized prototype on map " << receiver_map);
       return inference.NoChange();
     }
 
     // Check for consistency among the {receiver_maps}.
-    STATIC_ASSERT(LAST_TYPE == LAST_FUNCTION_TYPE);
     if (!receiver_map.prototype().equals(prototype) ||
         receiver_map.is_constructor() != is_constructor ||
-        receiver_map.instance_type() < FIRST_FUNCTION_TYPE) {
+        !InstanceTypeChecker::IsJSFunctionOrBoundFunction(
+            receiver_map.instance_type())) {
       return inference.NoChange();
     }
 
@@ -2713,8 +2703,6 @@ Reduction JSCallReducer::ReduceFunctionPrototypeBind(Node* node) {
 
 // ES6 section 19.2.3.3 Function.prototype.call (thisArg, ...args)
 Reduction JSCallReducer::ReduceFunctionPrototypeCall(Node* node) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   Node* target = n.target();
@@ -2727,7 +2715,7 @@ Reduction JSCallReducer::ReduceFunctionPrototypeCall(Node* node) {
   HeapObjectMatcher m(target);
   if (m.HasResolvedValue() && m.Ref(broker()).IsJSFunction()) {
     JSFunctionRef function = m.Ref(broker()).AsJSFunction();
-    if (should_disallow_heap_access() && !function.serialized()) {
+    if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
       TRACE_BROKER_MISSING(broker(), "Serialize call on function " << function);
       return NoChange();
     }
@@ -2800,7 +2788,8 @@ Reduction JSCallReducer::ReduceObjectGetPrototype(Node* node, Node* object) {
   MapHandles const& object_maps = inference.GetMaps();
 
   MapRef candidate_map(broker(), object_maps[0]);
-  if (should_disallow_heap_access() && !candidate_map.serialized_prototype()) {
+  if (candidate_map.ShouldHaveBeenSerialized() &&
+      !candidate_map.serialized_prototype()) {
     TRACE_BROKER_MISSING(broker(), "prototype for map " << candidate_map);
     return inference.NoChange();
   }
@@ -2809,7 +2798,8 @@ Reduction JSCallReducer::ReduceObjectGetPrototype(Node* node, Node* object) {
   // Check if we can constant-fold the {candidate_prototype}.
   for (size_t i = 0; i < object_maps.size(); ++i) {
     MapRef object_map(broker(), object_maps[i]);
-    if (should_disallow_heap_access() && !object_map.serialized_prototype()) {
+    if (object_map.ShouldHaveBeenSerialized() &&
+        !object_map.serialized_prototype()) {
       TRACE_BROKER_MISSING(broker(), "prototype for map " << object_map);
       return inference.NoChange();
     }
@@ -2933,8 +2923,6 @@ Reduction JSCallReducer::ReduceObjectPrototypeHasOwnProperty(Node* node) {
 
 // ES #sec-object.prototype.isprototypeof
 Reduction JSCallReducer::ReduceObjectPrototypeIsPrototypeOf(Node* node) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   Node* receiver = n.receiver();
   Node* value = n.ArgumentOrUndefined(0, jsgraph());
@@ -3284,7 +3272,6 @@ class IteratingArrayBuiltinHelper {
 
 Reduction JSCallReducer::ReduceArrayForEach(
     Node* node, const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3297,7 +3284,6 @@ Reduction JSCallReducer::ReduceArrayForEach(
 
 Reduction JSCallReducer::ReduceArrayReduce(
     Node* node, const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3311,7 +3297,6 @@ Reduction JSCallReducer::ReduceArrayReduce(
 
 Reduction JSCallReducer::ReduceArrayReduceRight(
     Node* node, const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3325,7 +3310,6 @@ Reduction JSCallReducer::ReduceArrayReduceRight(
 
 Reduction JSCallReducer::ReduceArrayMap(Node* node,
                                         const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3345,7 +3329,6 @@ Reduction JSCallReducer::ReduceArrayMap(Node* node,
 
 Reduction JSCallReducer::ReduceArrayFilter(
     Node* node, const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3365,7 +3348,6 @@ Reduction JSCallReducer::ReduceArrayFilter(
 
 Reduction JSCallReducer::ReduceArrayFind(Node* node,
                                          const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3380,7 +3362,6 @@ Reduction JSCallReducer::ReduceArrayFind(Node* node,
 
 Reduction JSCallReducer::ReduceArrayFindIndex(
     Node* node, const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3395,7 +3376,6 @@ Reduction JSCallReducer::ReduceArrayFindIndex(
 
 Reduction JSCallReducer::ReduceArrayEvery(Node* node,
                                           const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3411,7 +3391,6 @@ Reduction JSCallReducer::ReduceArrayEvery(Node* node,
 // ES7 Array.prototype.inludes(searchElement[, fromIndex])
 // #sec-array.prototype.includes
 Reduction JSCallReducer::ReduceArrayIncludes(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3426,7 +3405,6 @@ Reduction JSCallReducer::ReduceArrayIncludes(Node* node) {
 // ES6 Array.prototype.indexOf(searchElement[, fromIndex])
 // #sec-array.prototype.indexof
 Reduction JSCallReducer::ReduceArrayIndexOf(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3440,7 +3418,6 @@ Reduction JSCallReducer::ReduceArrayIndexOf(Node* node) {
 
 Reduction JSCallReducer::ReduceArraySome(Node* node,
                                          const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
   IteratingArrayBuiltinHelper h(node, broker(), jsgraph(), dependencies());
   if (!h.can_reduce()) return h.inference()->NoChange();
 
@@ -3503,8 +3480,6 @@ bool CanOptimizeFastCall(
 
 Reduction JSCallReducer::ReduceCallApiFunction(
     Node* node, const SharedFunctionInfoRef& shared) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   int const argc = p.arity_without_implicit_args();
@@ -3830,13 +3805,14 @@ Reduction JSCallReducer::ReduceCallOrConstructWithArrayLikeOrSpread(
   // some other function (and same for the {arguments_list}).
   CreateArgumentsType const type = CreateArgumentsTypeOf(arguments_list->op());
   Node* frame_state = NodeProperties::GetFrameStateInput(arguments_list);
-  FrameStateInfo state_info = FrameStateInfoOf(frame_state->op());
   int start_index = 0;
 
   int formal_parameter_count;
   {
     Handle<SharedFunctionInfo> shared;
-    if (!state_info.shared_info().ToHandle(&shared)) return NoChange();
+    if (!FrameStateInfoOf(frame_state->op()).shared_info().ToHandle(&shared)) {
+      return NoChange();
+    }
     formal_parameter_count = SharedFunctionInfoRef(broker(), shared)
                                  .internal_formal_parameter_count();
   }
@@ -3900,11 +3876,31 @@ Reduction JSCallReducer::ReduceCallOrConstructWithArrayLikeOrSpread(
     frame_state = outer_state;
   }
   // Add the actual parameters to the {node}, skipping the receiver.
-  Node* const parameters = frame_state->InputAt(kFrameStateParametersInput);
-  for (int i = start_index + 1; i < parameters->InputCount(); ++i) {
-    node->InsertInput(graph()->zone(),
-                      JSCallOrConstructNode::ArgumentIndex(argc++),
-                      parameters->InputAt(i));
+  const int argument_count =
+      FrameStateInfoOf(frame_state->op()).parameter_count() -
+      1;  // Minus receiver.
+  if (start_index < argument_count) {
+    Node* const parameters = frame_state->InputAt(kFrameStateParametersInput);
+    StateValuesAccess parameters_access(parameters);
+    auto parameters_it = ++parameters_access.begin();  // Skip the receiver.
+    for (int i = 0; i < start_index; i++) {
+      // A non-zero start_index implies that there are rest arguments. Skip
+      // them.
+      ++parameters_it;
+    }
+    for (int i = start_index; i < argument_count; ++i, ++parameters_it) {
+      Node* parameter_node = parameters_it.node();
+      DCHECK_NOT_NULL(parameter_node);
+      node->InsertInput(graph()->zone(),
+                        JSCallOrConstructNode::ArgumentIndex(argc++),
+                        parameter_node);
+    }
+    // TODO(jgruber): Currently, each use-site does the awkward dance above,
+    // iterating based on the FrameStateInfo's parameter count minus one, and
+    // manually advancing the iterator past the receiver. Consider wrapping all
+    // this in an understandable iterator s.t. one only needs to iterate from
+    // the beginning until done().
+    DCHECK(parameters_it.done());
   }
 
   if (IsCallWithArrayLikeOrSpread(node)) {
@@ -4001,7 +3997,7 @@ bool ShouldUseCallICFeedback(Node* node) {
 }  // namespace
 
 bool JSCallReducer::IsBuiltinOrApiFunction(JSFunctionRef function) const {
-  if (should_disallow_heap_access() && !function.serialized()) {
+  if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
     TRACE_BROKER_MISSING(broker(), "data for function " << function);
     return false;
   }
@@ -4029,7 +4025,7 @@ Reduction JSCallReducer::ReduceJSCall(Node* node) {
     ObjectRef target_ref = m.Ref(broker());
     if (target_ref.IsJSFunction()) {
       JSFunctionRef function = target_ref.AsJSFunction();
-      if (should_disallow_heap_access() && !function.serialized()) {
+      if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
         TRACE_BROKER_MISSING(broker(), "data for function " << function);
         return NoChange();
       }
@@ -4042,7 +4038,7 @@ Reduction JSCallReducer::ReduceJSCall(Node* node) {
       return ReduceJSCall(node, function.shared());
     } else if (target_ref.IsJSBoundFunction()) {
       JSBoundFunctionRef function = target_ref.AsJSBoundFunction();
-      if (should_disallow_heap_access() && !function.serialized()) {
+      if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
         TRACE_BROKER_MISSING(broker(), "data for function " << function);
         return NoChange();
       }
@@ -4663,7 +4659,7 @@ Reduction JSCallReducer::ReduceJSConstruct(Node* node) {
 
     if (target_ref.IsJSFunction()) {
       JSFunctionRef function = target_ref.AsJSFunction();
-      if (should_disallow_heap_access() && !function.serialized()) {
+      if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
         TRACE_BROKER_MISSING(broker(),
                              "function, not serialized: " << function);
         return NoChange();
@@ -4726,7 +4722,7 @@ Reduction JSCallReducer::ReduceJSConstruct(Node* node) {
       }
     } else if (target_ref.IsJSBoundFunction()) {
       JSBoundFunctionRef function = target_ref.AsJSBoundFunction();
-      if (should_disallow_heap_access() && !function.serialized()) {
+      if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
         TRACE_BROKER_MISSING(broker(),
                              "function, not serialized: " << function);
         return NoChange();
@@ -5079,8 +5075,6 @@ void JSCallReducer::CheckIfElementsKind(Node* receiver_elements_kind,
 
 // ES6 section 22.1.3.18 Array.prototype.push ( )
 Reduction JSCallReducer::ReduceArrayPrototypePush(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   if (p.speculation_mode() == SpeculationMode::kDisallowSpeculation) {
@@ -5217,8 +5211,6 @@ Reduction JSCallReducer::ReduceArrayPrototypePush(Node* node) {
 
 // ES6 section 22.1.3.17 Array.prototype.pop ( )
 Reduction JSCallReducer::ReduceArrayPrototypePop(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   if (p.speculation_mode() == SpeculationMode::kDisallowSpeculation) {
@@ -5354,8 +5346,6 @@ Reduction JSCallReducer::ReduceArrayPrototypePop(Node* node) {
 
 // ES6 section 22.1.3.22 Array.prototype.shift ( )
 Reduction JSCallReducer::ReduceArrayPrototypeShift(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   if (p.speculation_mode() == SpeculationMode::kDisallowSpeculation) {
@@ -5574,8 +5564,6 @@ Reduction JSCallReducer::ReduceArrayPrototypeShift(Node* node) {
 
 // ES6 section 22.1.3.23 Array.prototype.slice ( )
 Reduction JSCallReducer::ReduceArrayPrototypeSlice(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   if (!FLAG_turbo_inline_array_builtins) return NoChange();
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
@@ -5648,8 +5636,6 @@ Reduction JSCallReducer::ReduceArrayPrototypeSlice(Node* node) {
 
 // ES6 section 22.1.2.2 Array.isArray ( arg )
 Reduction JSCallReducer::ReduceArrayIsArray(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   // We certainly know that undefined is not an array.
   JSCallNode n(node);
   if (n.ArgumentCount() < 1) {
@@ -5676,8 +5662,6 @@ Reduction JSCallReducer::ReduceArrayIsArray(Node* node) {
 Reduction JSCallReducer::ReduceArrayIterator(Node* node,
                                              ArrayIteratorKind array_kind,
                                              IterationKind iteration_kind) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   Node* receiver = n.receiver();
   Node* context = n.context();
@@ -5737,8 +5721,6 @@ Reduction JSCallReducer::ReduceArrayIterator(Node* node,
 
 // ES #sec-%arrayiteratorprototype%.next
 Reduction JSCallReducer::ReduceArrayIteratorPrototypeNext(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   Node* iterator = n.receiver();
@@ -6049,7 +6031,7 @@ Reduction JSCallReducer::ReduceStringPrototypeStartsWith(Node* node) {
     ObjectRef target_ref = m.Ref(broker());
     if (target_ref.IsString()) {
       StringRef str = target_ref.AsString();
-      if (str.length() == 1) {
+      if (str.length().has_value() && str.length().value() == 1) {
         receiver = effect = graph()->NewNode(
             simplified()->CheckString(p.feedback()), receiver, effect, control);
 
@@ -6080,7 +6062,7 @@ Reduction JSCallReducer::ReduceStringPrototypeStartsWith(Node* node) {
               graph()->NewNode(simplified()->StringCharCodeAt(), receiver,
                                masked_position, etrue, if_true);
 
-          Node* search_first = jsgraph()->Constant(str.GetFirstChar());
+          Node* search_first = jsgraph()->Constant(str.GetFirstChar().value());
           vtrue = graph()->NewNode(simplified()->NumberEqual(), string_first,
                                    search_first);
         }
@@ -6366,7 +6348,6 @@ Reduction JSCallReducer::ReducePromiseConstructor(Node* node) {
   // lowering.
   if (broker()->is_native_context_independent()) return NoChange();
 
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
   PromiseBuiltinReducerAssembler a(this, node, broker());
 
   // We only inline when we have the executor.
@@ -6388,7 +6369,8 @@ bool JSCallReducer::DoPromiseChecks(MapInference* inference) {
   for (Handle<Map> map : receiver_maps) {
     MapRef receiver_map(broker(), map);
     if (!receiver_map.IsJSPromiseMap()) return false;
-    if (should_disallow_heap_access() && !receiver_map.serialized_prototype()) {
+    if (receiver_map.ShouldHaveBeenSerialized() &&
+        !receiver_map.serialized_prototype()) {
       TRACE_BROKER_MISSING(broker(), "prototype for map " << receiver_map);
       return false;
     }
@@ -6454,8 +6436,6 @@ Node* JSCallReducer::CreateClosureFromBuiltinSharedFunctionInfo(
 
 // ES section #sec-promise.prototype.finally
 Reduction JSCallReducer::ReducePromisePrototypeFinally(Node* node) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   int arity = p.arity_without_implicit_args();
@@ -6574,8 +6554,6 @@ Reduction JSCallReducer::ReducePromisePrototypeFinally(Node* node) {
 }
 
 Reduction JSCallReducer::ReducePromisePrototypeThen(Node* node) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   if (p.speculation_mode() == SpeculationMode::kDisallowSpeculation) {
@@ -6640,8 +6618,6 @@ Reduction JSCallReducer::ReducePromisePrototypeThen(Node* node) {
 
 // ES section #sec-promise.resolve
 Reduction JSCallReducer::ReducePromiseResolveTrampoline(Node* node) {
-  DisallowHeapAccessIf no_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   Node* receiver = n.receiver();
   Node* value = n.ArgumentOrUndefined(0, jsgraph());
@@ -7265,8 +7241,6 @@ Reduction JSCallReducer::ReduceCollectionIteratorPrototypeNext(
 }
 
 Reduction JSCallReducer::ReduceArrayBufferIsView(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   Node* value = n.ArgumentOrUndefined(0, jsgraph());
   RelaxEffectsAndControls(node);
@@ -7278,8 +7252,6 @@ Reduction JSCallReducer::ReduceArrayBufferIsView(Node* node) {
 
 Reduction JSCallReducer::ReduceArrayBufferViewAccessor(
     Node* node, InstanceType instance_type, FieldAccess const& access) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   Node* receiver = NodeProperties::GetValueInput(node, 1);
   Node* effect = NodeProperties::GetEffectInput(node);
   Node* control = NodeProperties::GetControlInput(node);
@@ -7581,8 +7553,6 @@ Reduction JSCallReducer::ReduceNumberParseInt(Node* node) {
 }
 
 Reduction JSCallReducer::ReduceRegExpPrototypeTest(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   JSCallNode n(node);
   CallParameters const& p = n.Parameters();
   if (FLAG_force_slow_path) return NoChange();
@@ -7609,7 +7579,7 @@ Reduction JSCallReducer::ReduceRegExpPrototypeTest(Node* node) {
   ZoneVector<PropertyAccessInfo> access_infos(graph()->zone());
   AccessInfoFactory access_info_factory(broker(), dependencies(),
                                         graph()->zone());
-  if (should_disallow_heap_access()) {
+  if (broker()->is_concurrent_inlining()) {
     // Obtain precomputed access infos from the broker.
     for (auto map : regexp_maps) {
       MapRef map_ref(broker(), map);
diff --git a/deps/v8/src/compiler/js-call-reducer.h b/deps/v8/src/compiler/js-call-reducer.h
index fe5af04aa86306..0a2050b200b1eb 100644
--- a/deps/v8/src/compiler/js-call-reducer.h
+++ b/deps/v8/src/compiler/js-call-reducer.h
@@ -238,7 +238,6 @@ class V8_EXPORT_PRIVATE JSCallReducer final : public AdvancedReducer {
   SimplifiedOperatorBuilder* simplified() const;
   Flags flags() const { return flags_; }
   CompilationDependencies* dependencies() const { return dependencies_; }
-  bool should_disallow_heap_access() const;
 
   JSGraph* const jsgraph_;
   JSHeapBroker* const broker_;
diff --git a/deps/v8/src/compiler/js-create-lowering.cc b/deps/v8/src/compiler/js-create-lowering.cc
index 619475ef7f0b90..74cb7937fa138d 100644
--- a/deps/v8/src/compiler/js-create-lowering.cc
+++ b/deps/v8/src/compiler/js-create-lowering.cc
@@ -55,7 +55,6 @@ const int kBlockContextAllocationLimit = 16;
 }  // namespace
 
 Reduction JSCreateLowering::Reduce(Node* node) {
-  DisallowHeapAccess disallow_heap_access;
   switch (node->opcode()) {
     case IrOpcode::kJSCreate:
       return ReduceJSCreate(node);
@@ -1201,10 +1200,15 @@ Reduction JSCreateLowering::ReduceJSCreateLiteralRegExp(Node* node) {
 Reduction JSCreateLowering::ReduceJSGetTemplateObject(Node* node) {
   JSGetTemplateObjectNode n(node);
   GetTemplateObjectParameters const& parameters = n.Parameters();
-  SharedFunctionInfoRef shared(broker(), parameters.shared());
-  JSArrayRef template_object = shared.GetTemplateObject(
-      TemplateObjectDescriptionRef(broker(), parameters.description()),
-      parameters.feedback());
+
+  const ProcessedFeedback& feedback =
+      broker()->GetFeedbackForTemplateObject(parameters.feedback());
+  // TODO(v8:7790): Consider not generating JSGetTemplateObject operator
+  // in the BytecodeGraphBuilder in the first place, if template_object is not
+  // available.
+  if (feedback.IsInsufficient()) return NoChange();
+
+  JSArrayRef template_object = feedback.AsTemplateObject().value();
   Node* value = jsgraph()->Constant(template_object);
   ReplaceWithValue(node, value);
   return Replace(value);
diff --git a/deps/v8/src/compiler/js-generic-lowering.cc b/deps/v8/src/compiler/js-generic-lowering.cc
index 0b38bd538d1a19..c8cce37ad9d98a 100644
--- a/deps/v8/src/compiler/js-generic-lowering.cc
+++ b/deps/v8/src/compiler/js-generic-lowering.cc
@@ -234,8 +234,19 @@ void JSGenericLowering::LowerJSStrictEqual(Node* node) {
 }
 
 namespace {
+
+// The megamorphic load builtin can be used as a performance optimization in
+// some cases - unlike the full builtin, the megamorphic builtin does fewer
+// checks and does not collect feedback.
 bool ShouldUseMegamorphicLoadBuiltin(FeedbackSource const& source,
                                      JSHeapBroker* broker) {
+  if (broker->is_native_context_independent()) {
+    // The decision to use the megamorphic load builtin is made based on
+    // current feedback, and is thus context-dependent. It cannot be used when
+    // generating NCI code.
+    return false;
+  }
+
   ProcessedFeedback const& feedback = broker->GetFeedback(source);
 
   if (feedback.kind() == ProcessedFeedback::kElementAccess) {
@@ -318,12 +329,30 @@ void JSGenericLowering::LowerJSLoadNamed(Node* node) {
 }
 
 void JSGenericLowering::LowerJSLoadNamedFromSuper(Node* node) {
-  // TODO(marja, v8:9237): Call a builtin which collects feedback.
   JSLoadNamedFromSuperNode n(node);
   NamedAccess const& p = n.Parameters();
-  node->RemoveInput(2);  // Feedback vector
+  Node* effect = NodeProperties::GetEffectInput(node);
+  Node* control = NodeProperties::GetControlInput(node);
+  // Node inputs: receiver, home object, FeedbackVector.
+  // LoadSuperIC expects: receiver, lookup start object, name, slot,
+  // FeedbackVector.
+  Node* home_object_map = effect = graph()->NewNode(
+      jsgraph()->simplified()->LoadField(AccessBuilder::ForMap()),
+      n.home_object(), effect, control);
+  Node* home_object_proto = effect = graph()->NewNode(
+      jsgraph()->simplified()->LoadField(AccessBuilder::ForMapPrototype()),
+      home_object_map, effect, control);
+  n->ReplaceInput(n.HomeObjectIndex(), home_object_proto);
+  NodeProperties::ReplaceEffectInput(node, effect);
+  STATIC_ASSERT(n.FeedbackVectorIndex() == 2);
+  // If the code below will be used for the invalid feedback case, it needs to
+  // be double-checked that the FeedbackVector parameter will be the
+  // UndefinedConstant.
+  DCHECK(p.feedback().IsValid());
   node->InsertInput(zone(), 2, jsgraph()->HeapConstant(p.name()));
-  ReplaceWithRuntimeCall(node, Runtime::kLoadFromSuper);
+  node->InsertInput(zone(), 3,
+                    jsgraph()->TaggedIndexConstant(p.feedback().index()));
+  ReplaceWithBuiltinCall(node, Builtins::kLoadSuperIC);
 }
 
 void JSGenericLowering::LowerJSLoadGlobal(Node* node) {
@@ -985,10 +1014,14 @@ void JSGenericLowering::LowerJSConstructWithSpread(Node* node) {
     node->InsertInput(zone(), 0, stub_code);
     node->InsertInput(zone(), 3, stub_arity);
     node->InsertInput(zone(), 4, slot);
-    node->InsertInput(zone(), 5, spread);
-    node->InsertInput(zone(), 6, feedback_vector);
+    // Arguments in the stack should be inserted in reversed order, ie, the last
+    // arguments defined in the interface descriptor should be inserted first.
+    DCHECK_EQ(callable.descriptor().GetStackArgumentOrder(),
+              StackArgumentOrder::kJS);
+    node->InsertInput(zone(), 5, feedback_vector);
+    node->InsertInput(zone(), 6, spread);
     node->InsertInput(zone(), 7, receiver);
-    // After: {code, target, new_target, arity, slot, spread, vector, receiver,
+    // After: {code, target, new_target, arity, slot, vector, spread, receiver,
     // ...args}.
 
     NodeProperties::ChangeOp(node, common()->Call(call_descriptor));
diff --git a/deps/v8/src/compiler/js-heap-broker.cc b/deps/v8/src/compiler/js-heap-broker.cc
index eaa9f2461b07c1..0ed6958640952e 100644
--- a/deps/v8/src/compiler/js-heap-broker.cc
+++ b/deps/v8/src/compiler/js-heap-broker.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "src/compiler/js-heap-broker.h"
+
 #include "src/common/globals.h"
 #include "src/compiler/heap-refs.h"
 
@@ -16,7 +17,6 @@
 #include "src/codegen/code-factory.h"
 #include "src/codegen/optimized-compilation-info.h"
 #include "src/compiler/access-info.h"
-#include "src/compiler/bytecode-analysis.h"
 #include "src/compiler/graph-reducer.h"
 #include "src/compiler/per-isolate-compiler-cache.h"
 #include "src/execution/protectors-inl.h"
@@ -83,61 +83,9 @@ enum ObjectDataKind {
   kUnserializedReadOnlyHeapObject
 };
 
-class AllowHandleAllocationIfNeeded {
- public:
-  explicit AllowHandleAllocationIfNeeded(ObjectDataKind kind,
-                                         JSHeapBroker::BrokerMode mode,
-                                         bool direct_heap_access = false) {
-    DCHECK_IMPLIES(mode == JSHeapBroker::BrokerMode::kSerialized,
-                   kind == kUnserializedReadOnlyHeapObject ||
-                       kind == kNeverSerializedHeapObject ||
-                       (direct_heap_access && kind == kSerializedHeapObject));
-    if (kind == kUnserializedHeapObject) maybe_allow_handle_.emplace();
-  }
-
- private:
-  base::Optional<AllowHandleAllocation> maybe_allow_handle_;
-};
-
-class AllowHandleDereferenceIfNeeded {
- public:
-  explicit AllowHandleDereferenceIfNeeded(ObjectDataKind kind,
-                                          JSHeapBroker::BrokerMode mode,
-                                          bool direct_heap_access = false)
-      : AllowHandleDereferenceIfNeeded(kind) {
-    DCHECK_IMPLIES(mode == JSHeapBroker::BrokerMode::kSerialized,
-                   kind == kUnserializedReadOnlyHeapObject ||
-                       kind == kNeverSerializedHeapObject ||
-                       (direct_heap_access && kind == kSerializedHeapObject));
-  }
-
-  explicit AllowHandleDereferenceIfNeeded(ObjectDataKind kind) {
-    if (kind == kUnserializedHeapObject ||
-        kind == kUnserializedReadOnlyHeapObject) {
-      maybe_allow_handle_.emplace();
-    }
-  }
-
- private:
-  base::Optional<AllowHandleDereference> maybe_allow_handle_;
-};
-
-class AllowHeapAllocationIfNeeded {
- public:
-  explicit AllowHeapAllocationIfNeeded(ObjectDataKind kind,
-                                       JSHeapBroker::BrokerMode mode) {
-    DCHECK_IMPLIES(mode == JSHeapBroker::BrokerMode::kSerialized,
-                   kind == kUnserializedReadOnlyHeapObject);
-    if (kind == kUnserializedHeapObject) maybe_allow_handle_.emplace();
-  }
-
- private:
-  base::Optional<AllowHeapAllocation> maybe_allow_handle_;
-};
-
 namespace {
 bool IsReadOnlyHeapObject(Object object) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return (object.IsCode() && Code::cast(object).is_builtin()) ||
          (object.IsHeapObject() &&
           ReadOnlyHeap::Contains(HeapObject::cast(object)));
@@ -720,8 +668,7 @@ class HeapNumberData : public HeapObjectData {
  public:
   HeapNumberData(JSHeapBroker* broker, ObjectData** storage,
                  Handle<HeapNumber> object)
-      : HeapObjectData(broker, storage, object), value_(object->value()) {
-  }
+      : HeapObjectData(broker, storage, object), value_(object->value()) {}
 
   double value() const { return value_; }
 
@@ -819,7 +766,9 @@ class NativeContextData : public ContextData {
 class NameData : public HeapObjectData {
  public:
   NameData(JSHeapBroker* broker, ObjectData** storage, Handle<Name> object)
-      : HeapObjectData(broker, storage, object) {}
+      : HeapObjectData(broker, storage, object) {
+    DCHECK(!FLAG_turbo_direct_heap_access);
+  }
 };
 
 class StringData : public NameData {
@@ -857,44 +806,25 @@ class SymbolData : public NameData {
   }
 };
 
-namespace {
-
-// String to double helper without heap allocation.
-base::Optional<double> StringToDouble(Handle<String> object) {
-  const int kMaxLengthForDoubleConversion = 23;
-  String string = *object;
-  int length = string.length();
-  if (length <= kMaxLengthForDoubleConversion) {
-    const int flags = ALLOW_HEX | ALLOW_OCTAL | ALLOW_BINARY;
-    uc16 buffer[kMaxLengthForDoubleConversion];
-    String::WriteToFlat(*object, buffer, 0, length);
-    Vector<const uc16> v(buffer, length);
-    return StringToDouble(v, flags);
-  }
-  return base::nullopt;
-}
-
-}  // namespace
-
 StringData::StringData(JSHeapBroker* broker, ObjectData** storage,
                        Handle<String> object)
     : NameData(broker, storage, object),
       length_(object->length()),
       first_char_(length_ > 0 ? object->Get(0) : 0),
-      to_number_(StringToDouble(object)),
+      to_number_(TryStringToDouble(broker->local_isolate(), object)),
       is_external_string_(object->IsExternalString()),
       is_seq_string_(object->IsSeqString()),
-      chars_as_strings_(broker->zone()) {}
+      chars_as_strings_(broker->zone()) {
+  DCHECK(!FLAG_turbo_direct_heap_access);
+}
 
 class InternalizedStringData : public StringData {
  public:
   InternalizedStringData(JSHeapBroker* broker, ObjectData** storage,
-                         Handle<InternalizedString> object);
-
-  uint32_t array_index() const { return array_index_; }
-
- private:
-  uint32_t array_index_;
+                         Handle<InternalizedString> object)
+      : StringData(broker, storage, object) {
+    DCHECK(!FLAG_turbo_direct_heap_access);
+  }
 };
 
 ObjectData* StringData::GetCharAsString(JSHeapBroker* broker, uint32_t index,
@@ -917,11 +847,6 @@ ObjectData* StringData::GetCharAsString(JSHeapBroker* broker, uint32_t index,
   return result;
 }
 
-InternalizedStringData::InternalizedStringData(
-    JSHeapBroker* broker, ObjectData** storage,
-    Handle<InternalizedString> object)
-    : StringData(broker, storage, object) {}
-
 namespace {
 
 bool IsFastLiteralHelper(Handle<JSObject> boilerplate, int max_depth,
@@ -1045,8 +970,7 @@ class BigIntData : public HeapObjectData {
  public:
   BigIntData(JSHeapBroker* broker, ObjectData** storage, Handle<BigInt> object)
       : HeapObjectData(broker, storage, object),
-        as_uint64_(object->AsUint64(nullptr)) {
-  }
+        as_uint64_(object->AsUint64(nullptr)) {}
 
   uint64_t AsUint64() const { return as_uint64_; }
 
@@ -1118,13 +1042,11 @@ class MapData : public HeapObjectData {
                               InternalIndex descriptor_index);
   void SerializeOwnDescriptors(JSHeapBroker* broker);
   ObjectData* GetStrongValue(InternalIndex descriptor_index) const;
-  // TODO(neis): This code needs to be changed to allow for ObjectData* instance
-  // descriptors. However, this is likely to require a non-trivial refactoring
-  // of how maps are serialized because actual instance descriptors don't
-  // contain information about owner maps.
-  DescriptorArrayData* instance_descriptors() const {
-    return instance_descriptors_;
-  }
+  // TODO(neis, solanes): This code needs to be changed to allow for
+  // kNeverSerialized instance descriptors. However, this is likely to require a
+  // non-trivial refactoring of how maps are serialized because actual instance
+  // descriptors don't contain information about owner maps.
+  ObjectData* instance_descriptors() const { return instance_descriptors_; }
 
   void SerializeRootMap(JSHeapBroker* broker);
   ObjectData* FindRootMap() const;
@@ -1173,7 +1095,7 @@ class MapData : public HeapObjectData {
   ZoneVector<ObjectData*> elements_kind_generalizations_;
 
   bool serialized_own_descriptors_ = false;
-  DescriptorArrayData* instance_descriptors_ = nullptr;
+  ObjectData* instance_descriptors_ = nullptr;
 
   bool serialized_constructor_ = false;
   ObjectData* constructor_ = nullptr;
@@ -1250,7 +1172,6 @@ HeapObjectData::HeapObjectData(JSHeapBroker* broker, ObjectData** storage,
 InstanceType HeapObjectData::GetMapInstanceType() const {
   ObjectData* map_data = map();
   if (map_data->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(kind());
     return Handle<Map>::cast(map_data->object())->instance_type();
   }
   return map_data->AsMap()->instance_type();
@@ -1608,8 +1529,7 @@ class FixedDoubleArrayData : public FixedArrayBaseData {
 FixedDoubleArrayData::FixedDoubleArrayData(JSHeapBroker* broker,
                                            ObjectData** storage,
                                            Handle<FixedDoubleArray> object)
-    : FixedArrayBaseData(broker, storage, object), contents_(broker->zone()) {
-}
+    : FixedArrayBaseData(broker, storage, object), contents_(broker->zone()) {}
 
 void FixedDoubleArrayData::SerializeContents(JSHeapBroker* broker) {
   if (serialized_contents_) return;
@@ -1831,15 +1751,15 @@ SharedFunctionInfoData::SharedFunctionInfoData(
       builtin_id_(object->HasBuiltinId() ? object->builtin_id()
                                          : Builtins::kNoBuiltinId),
       context_header_size_(object->scope_info().ContextHeaderLength()),
-      GetBytecodeArray_(
-          object->HasBytecodeArray()
-              ? broker->GetOrCreateData(object->GetBytecodeArray())
-              : nullptr)
+      GetBytecodeArray_(object->HasBytecodeArray()
+                            ? broker->GetOrCreateData(
+                                  object->GetBytecodeArray(broker->isolate()))
+                            : nullptr)
 #define INIT_MEMBER(type, name) , name##_(object->name())
           BROKER_SFI_FIELDS(INIT_MEMBER)
 #undef INIT_MEMBER
       ,
-      inlineability_(object->GetInlineability()),
+      inlineability_(object->GetInlineability(broker->isolate())),
       function_template_info_(nullptr),
       template_objects_(broker->zone()),
       scope_info_(nullptr) {
@@ -2060,7 +1980,6 @@ class CodeData : public HeapObjectData {
 #define DEFINE_IS(Name)                                                 \
   bool ObjectData::Is##Name() const {                                   \
     if (should_access_heap()) {                                         \
-      AllowHandleDereferenceIfNeeded allow_handle_dereference(kind());  \
       return object()->Is##Name();                                      \
     }                                                                   \
     if (is_smi()) return false;                                         \
@@ -2168,8 +2087,10 @@ void MapData::SerializeOwnDescriptors(JSHeapBroker* broker) {
 }
 
 ObjectData* MapData::GetStrongValue(InternalIndex descriptor_index) const {
-  auto data = instance_descriptors_->contents().find(descriptor_index.as_int());
-  if (data == instance_descriptors_->contents().end()) return nullptr;
+  DescriptorArrayData* descriptor_array =
+      instance_descriptors()->AsDescriptorArray();
+  auto data = descriptor_array->contents().find(descriptor_index.as_int());
+  if (data == descriptor_array->contents().end()) return nullptr;
   return data->second.value;
 }
 
@@ -2180,18 +2101,17 @@ void MapData::SerializeOwnDescriptor(JSHeapBroker* broker,
 
   if (instance_descriptors_ == nullptr) {
     instance_descriptors_ =
-        broker->GetOrCreateData(map->instance_descriptors(kRelaxedLoad))
-            ->AsDescriptorArray();
+        broker->GetOrCreateData(map->instance_descriptors(kRelaxedLoad));
   }
 
   ZoneMap<int, PropertyDescriptor>& contents =
-      instance_descriptors()->contents();
+      instance_descriptors()->AsDescriptorArray()->contents();
   CHECK_LT(descriptor_index.as_int(), map->NumberOfOwnDescriptors());
   if (contents.find(descriptor_index.as_int()) != contents.end()) return;
 
   Isolate* const isolate = broker->isolate();
   auto descriptors =
-      Handle<DescriptorArray>::cast(instance_descriptors_->object());
+      Handle<DescriptorArray>::cast(instance_descriptors()->object());
   CHECK_EQ(*descriptors, map->instance_descriptors(kRelaxedLoad));
 
   PropertyDescriptor d;
@@ -2218,7 +2138,7 @@ void MapData::SerializeOwnDescriptor(JSHeapBroker* broker,
   }
 
   TRACE(broker, "Copied descriptor " << descriptor_index.as_int() << " into "
-                                     << instance_descriptors_ << " ("
+                                     << instance_descriptors() << " ("
                                      << contents.size() << " total)");
 }
 
@@ -2372,6 +2292,12 @@ void JSRegExpData::SerializeAsRegExpBoilerplate(JSHeapBroker* broker) {
   last_index_ = broker->GetOrCreateData(boilerplate->last_index());
 }
 
+#ifdef DEBUG
+bool ObjectRef::IsNeverSerializedHeapObject() const {
+  return data_->kind() == ObjectDataKind::kNeverSerializedHeapObject;
+}
+#endif  // DEBUG
+
 bool ObjectRef::equals(const ObjectRef& other) const {
 #ifdef DEBUG
   if (broker()->mode() == JSHeapBroker::kSerialized &&
@@ -2382,6 +2308,11 @@ bool ObjectRef::equals(const ObjectRef& other) const {
   return data_ == other.data_;
 }
 
+bool ObjectRef::ShouldHaveBeenSerialized() const {
+  return broker()->mode() == JSHeapBroker::kSerialized &&
+         data()->kind() == kSerializedHeapObject;
+}
+
 Isolate* ObjectRef::isolate() const { return broker()->isolate(); }
 
 ContextRef ContextRef::previous(size_t* depth,
@@ -2389,10 +2320,6 @@ ContextRef ContextRef::previous(size_t* depth,
   DCHECK_NOT_NULL(depth);
 
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     Context current = *object();
     while (*depth != 0 && current.unchecked_previous().IsContext()) {
       current = Context::cast(current.unchecked_previous());
@@ -2413,10 +2340,6 @@ ContextRef ContextRef::previous(size_t* depth,
 base::Optional<ObjectRef> ContextRef::get(int index,
                                           SerializationPolicy policy) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     Handle<Object> value(object()->get(index), broker()->isolate());
     return ObjectRef(broker(), value);
   }
@@ -2453,7 +2376,6 @@ JSHeapBroker::JSHeapBroker(Isolate* isolate, Zone* broker_zone,
       is_concurrent_inlining_(is_concurrent_inlining),
       code_kind_(code_kind),
       feedback_(zone()),
-      bytecode_analyses_(zone()),
       property_access_infos_(zone()),
       minimorphic_property_access_infos_(zone()),
       typed_array_string_tags_(zone()),
@@ -2464,6 +2386,7 @@ JSHeapBroker::JSHeapBroker(Isolate* isolate, Zone* broker_zone,
   // immediately with a larger-capacity one.  It doesn't seem to affect the
   // performance in a noticeable way though.
   TRACE(this, "Constructing heap broker");
+  DCHECK_IMPLIES(is_concurrent_inlining_, FLAG_turbo_direct_heap_access);
 }
 
 JSHeapBroker::~JSHeapBroker() { DCHECK_NULL(local_isolate_); }
@@ -2628,7 +2551,7 @@ void JSHeapBroker::SetTargetNativeContextRef(
 }
 
 void JSHeapBroker::CollectArrayAndObjectPrototypes() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CHECK_EQ(mode(), kSerializing);
   CHECK(array_and_object_prototypes_.empty());
 
@@ -2825,12 +2748,6 @@ int ObjectRef::AsSmi() const {
 
 base::Optional<MapRef> JSObjectRef::GetObjectCreateMap() const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHeapAllocationIfNeeded allow_heap_allocation(data()->kind(),
-                                                      broker()->mode());
     Handle<Map> instance_map;
     if (Map::TryGetObjectCreateMap(broker()->isolate(), object())
             .ToHandle(&instance_map)) {
@@ -2856,12 +2773,6 @@ INSTANCE_TYPE_CHECKERS(DEF_TESTER)
 
 base::Optional<MapRef> MapRef::AsElementsKind(ElementsKind kind) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHeapAllocationIfNeeded allow_heap_allocation(data()->kind(),
-                                                      broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return MapRef(broker(),
                   Map::AsElementsKind(broker()->isolate(), object(), kind));
   }
@@ -2941,10 +2852,6 @@ bool MapRef::HasOnlyStablePrototypesWithFastElements(
 
 bool MapRef::supports_fast_array_iteration() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
     return SupportsFastArrayIteration(broker()->isolate(), object());
   }
   return data()->AsMap()->supports_fast_array_iteration();
@@ -2952,10 +2859,6 @@ bool MapRef::supports_fast_array_iteration() const {
 
 bool MapRef::supports_fast_array_resize() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
     return SupportsFastArrayResize(broker()->isolate(), object());
   }
   return data()->AsMap()->supports_fast_array_resize();
@@ -2963,10 +2866,6 @@ bool MapRef::supports_fast_array_resize() const {
 
 int JSFunctionRef::InitialMapInstanceSizeWithMinSlack() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
     return object()->ComputeInstanceSizeWithMinSlack(broker()->isolate());
   }
   return data()->AsJSFunction()->initial_map_instance_size_with_min_slack();
@@ -3001,10 +2900,6 @@ OddballType MapRef::oddball_type() const {
 
 FeedbackCellRef FeedbackVectorRef::GetClosureFeedbackCell(int index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return FeedbackCellRef(broker(), object()->GetClosureFeedbackCell(index));
   }
 
@@ -3015,8 +2910,6 @@ FeedbackCellRef FeedbackVectorRef::GetClosureFeedbackCell(int index) const {
 
 double JSObjectRef::RawFastDoublePropertyAt(FieldIndex index) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->RawFastDoublePropertyAt(index);
   }
   JSObjectData* object_data = data()->AsJSObject();
@@ -3026,8 +2919,6 @@ double JSObjectRef::RawFastDoublePropertyAt(FieldIndex index) const {
 
 uint64_t JSObjectRef::RawFastDoublePropertyAsBitsAt(FieldIndex index) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->RawFastDoublePropertyAsBitsAt(index);
   }
   JSObjectData* object_data = data()->AsJSObject();
@@ -3037,10 +2928,6 @@ uint64_t JSObjectRef::RawFastDoublePropertyAsBitsAt(FieldIndex index) const {
 
 ObjectRef JSObjectRef::RawFastPropertyAt(FieldIndex index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return ObjectRef(broker(), broker()->CanonicalPersistentHandle(
                                    object()->RawFastPropertyAt(index)));
   }
@@ -3054,12 +2941,6 @@ ObjectRef JSObjectRef::RawFastPropertyAt(FieldIndex index) const {
 bool AllocationSiteRef::IsFastLiteral() const {
   if (data_->should_access_heap()) {
     CHECK_NE(data_->kind(), ObjectDataKind::kNeverSerializedHeapObject);
-    AllowHeapAllocationIfNeeded allow_heap_allocation(
-        data()->kind(), broker()->mode());  // For TryMigrateInstance.
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return IsInlinableFastLiteral(
         handle(object()->boilerplate(), broker()->isolate()));
   }
@@ -3080,13 +2961,6 @@ void JSObjectRef::SerializeElements() {
 
 void JSObjectRef::EnsureElementsTenured() {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHeapAllocationIfNeeded allow_heap_allocation(data()->kind(),
-                                                      broker()->mode());
-
     Handle<FixedArrayBase> object_elements = elements().object();
     if (ObjectInYoungGeneration(*object_elements)) {
       // If we would like to pretenure a fixed cow array, we must ensure that
@@ -3104,18 +2978,15 @@ void JSObjectRef::EnsureElementsTenured() {
 
 FieldIndex MapRef::GetFieldIndexFor(InternalIndex descriptor_index) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return FieldIndex::ForDescriptor(*object(), descriptor_index);
   }
-  DescriptorArrayData* descriptors = data()->AsMap()->instance_descriptors();
+  DescriptorArrayData* descriptors =
+      data()->AsMap()->instance_descriptors()->AsDescriptorArray();
   return descriptors->contents().at(descriptor_index.as_int()).field_index;
 }
 
 int MapRef::GetInObjectPropertyOffset(int i) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->GetInObjectPropertyOffset(i);
   }
   return (GetInObjectPropertiesStartInWords() + i) * kTaggedSize;
@@ -3124,28 +2995,24 @@ int MapRef::GetInObjectPropertyOffset(int i) const {
 PropertyDetails MapRef::GetPropertyDetails(
     InternalIndex descriptor_index) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()
         ->instance_descriptors(kRelaxedLoad)
         .GetDetails(descriptor_index);
   }
-  DescriptorArrayData* descriptors = data()->AsMap()->instance_descriptors();
+  DescriptorArrayData* descriptors =
+      data()->AsMap()->instance_descriptors()->AsDescriptorArray();
   return descriptors->contents().at(descriptor_index.as_int()).details;
 }
 
 NameRef MapRef::GetPropertyKey(InternalIndex descriptor_index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return NameRef(broker(), broker()->CanonicalPersistentHandle(
                                  object()
                                      ->instance_descriptors(kRelaxedLoad)
                                      .GetKey(descriptor_index)));
   }
-  DescriptorArrayData* descriptors = data()->AsMap()->instance_descriptors();
+  DescriptorArrayData* descriptors =
+      data()->AsMap()->instance_descriptors()->AsDescriptorArray();
   return NameRef(broker(),
                  descriptors->contents().at(descriptor_index.as_int()).key);
 }
@@ -3162,16 +3029,13 @@ bool MapRef::IsPrimitiveMap() const {
 
 MapRef MapRef::FindFieldOwner(InternalIndex descriptor_index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     Handle<Map> owner(
         object()->FindFieldOwner(broker()->isolate(), descriptor_index),
         broker()->isolate());
     return MapRef(broker(), owner);
   }
-  DescriptorArrayData* descriptors = data()->AsMap()->instance_descriptors();
+  DescriptorArrayData* descriptors =
+      data()->AsMap()->instance_descriptors()->AsDescriptorArray();
   return MapRef(
       broker(),
       descriptors->contents().at(descriptor_index.as_int()).field_owner);
@@ -3179,17 +3043,14 @@ MapRef MapRef::FindFieldOwner(InternalIndex descriptor_index) const {
 
 ObjectRef MapRef::GetFieldType(InternalIndex descriptor_index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     Handle<FieldType> field_type(object()
                                      ->instance_descriptors(kRelaxedLoad)
                                      .GetFieldType(descriptor_index),
                                  broker()->isolate());
     return ObjectRef(broker(), field_type);
   }
-  DescriptorArrayData* descriptors = data()->AsMap()->instance_descriptors();
+  DescriptorArrayData* descriptors =
+      data()->AsMap()->instance_descriptors()->AsDescriptorArray();
   return ObjectRef(
       broker(),
       descriptors->contents().at(descriptor_index.as_int()).field_type);
@@ -3197,41 +3058,69 @@ ObjectRef MapRef::GetFieldType(InternalIndex descriptor_index) const {
 
 bool MapRef::IsUnboxedDoubleField(InternalIndex descriptor_index) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->IsUnboxedDoubleField(
         FieldIndex::ForDescriptor(*object(), descriptor_index));
   }
-  DescriptorArrayData* descriptors = data()->AsMap()->instance_descriptors();
+  DescriptorArrayData* descriptors =
+      data()->AsMap()->instance_descriptors()->AsDescriptorArray();
   return descriptors->contents()
       .at(descriptor_index.as_int())
       .is_unboxed_double_field;
 }
 
-uint16_t StringRef::GetFirstChar() {
+base::Optional<int> StringRef::length() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    return object()->Get(0);
+    if (data_->kind() == kNeverSerializedHeapObject &&
+        !this->IsInternalizedString()) {
+      TRACE_BROKER_MISSING(
+          broker(),
+          "length for kNeverSerialized non-internalized string " << *this);
+      return base::nullopt;
+    } else {
+      return object()->synchronized_length();
+    }
+  }
+  return data()->AsString()->length();
+}
+
+base::Optional<uint16_t> StringRef::GetFirstChar() {
+  if (data_->should_access_heap()) {
+    if (data_->kind() == kNeverSerializedHeapObject &&
+        !this->IsInternalizedString()) {
+      TRACE_BROKER_MISSING(
+          broker(),
+          "first char for kNeverSerialized non-internalized string " << *this);
+      return base::nullopt;
+    }
+
+    if (broker()->local_isolate()) {
+      return object()->Get(0, broker()->local_isolate());
+    } else {
+      // TODO(solanes, v8:7790): Remove this case once we always have a local
+      // isolate, i.e. the inlining phase is done concurrently all the time.
+      return object()->Get(0);
+    }
   }
   return data()->AsString()->first_char();
 }
 
 base::Optional<double> StringRef::ToNumber() {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    return StringToDouble(object());
+    if (data_->kind() == kNeverSerializedHeapObject &&
+        !this->IsInternalizedString()) {
+      TRACE_BROKER_MISSING(
+          broker(),
+          "number for kNeverSerialized non-internalized string " << *this);
+      return base::nullopt;
+    }
+
+    return TryStringToDouble(broker()->local_isolate(), object());
   }
   return data()->AsString()->to_number();
 }
 
 int ArrayBoilerplateDescriptionRef::constants_elements_length() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->constant_elements().length();
   }
   return data()->AsArrayBoilerplateDescription()->constants_elements_length();
@@ -3239,10 +3128,6 @@ int ArrayBoilerplateDescriptionRef::constants_elements_length() const {
 
 ObjectRef FixedArrayRef::get(int i) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return ObjectRef(broker(),
                      broker()->CanonicalPersistentHandle(object()->get(i)));
   }
@@ -3251,8 +3136,6 @@ ObjectRef FixedArrayRef::get(int i) const {
 
 Float64 FixedDoubleArrayRef::get(int i) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return Float64::FromBits(object()->get_representation(i));
   } else {
     return data()->AsFixedDoubleArray()->Get(i);
@@ -3267,10 +3150,6 @@ Address BytecodeArrayRef::GetFirstBytecodeAddress() const {
 
 Handle<Object> BytecodeArrayRef::GetConstantAtIndex(int index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return broker()->CanonicalPersistentHandle(
         object()->constant_pool().get(index));
   }
@@ -3280,10 +3159,6 @@ Handle<Object> BytecodeArrayRef::GetConstantAtIndex(int index) const {
 
 bool BytecodeArrayRef::IsConstantAtIndexSmi(int index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->constant_pool().get(index).IsSmi();
   }
   return data()->AsBytecodeArray()->IsConstantAtIndexSmi(index);
@@ -3291,10 +3166,6 @@ bool BytecodeArrayRef::IsConstantAtIndexSmi(int index) const {
 
 Smi BytecodeArrayRef::GetConstantAtIndexAsSmi(int index) const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return Smi::cast(object()->constant_pool().get(index));
   }
   return data()->AsBytecodeArray()->GetConstantAtIndexAsSmi(index);
@@ -3318,21 +3189,13 @@ int BytecodeArrayRef::handler_table_size() const {
   return object()->handler_table().length();
 }
 
-#define IF_ACCESS_FROM_HEAP_C(name)                                            \
-  if (data_->should_access_heap()) {                                           \
-    AllowHandleAllocationIfNeeded handle_allocation(data_->kind(),             \
-                                                    broker()->mode());         \
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data_->kind(),     \
-                                                            broker()->mode()); \
-    return object()->name();                                                   \
+#define IF_ACCESS_FROM_HEAP_C(name)  \
+  if (data_->should_access_heap()) { \
+    return object()->name();         \
   }
 
 #define IF_ACCESS_FROM_HEAP(result, name)                                      \
   if (data_->should_access_heap()) {                                           \
-    AllowHandleAllocationIfNeeded handle_allocation(data_->kind(),             \
-                                                    broker()->mode());         \
-    AllowHandleDereferenceIfNeeded handle_dereference(data_->kind(),           \
-                                                      broker()->mode());       \
     return result##Ref(broker(),                                               \
                        broker()->CanonicalPersistentHandle(object()->name())); \
   }
@@ -3363,20 +3226,12 @@ int BytecodeArrayRef::handler_table_size() const {
 // kSerialized only for methods that we identified to be safe.
 #define IF_ACCESS_FROM_HEAP_WITH_FLAG(result, name)                            \
   if (data_->should_access_heap() || FLAG_turbo_direct_heap_access) {          \
-    AllowHandleAllocationIfNeeded handle_allocation(                           \
-        data_->kind(), broker()->mode(), FLAG_turbo_direct_heap_access);       \
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(                   \
-        data_->kind(), broker()->mode(), FLAG_turbo_direct_heap_access);       \
     return result##Ref(broker(),                                               \
                        broker()->CanonicalPersistentHandle(object()->name())); \
   }
-#define IF_ACCESS_FROM_HEAP_WITH_FLAG_C(name)                            \
-  if (data_->should_access_heap() || FLAG_turbo_direct_heap_access) {    \
-    AllowHandleAllocationIfNeeded handle_allocation(                     \
-        data_->kind(), broker()->mode(), FLAG_turbo_direct_heap_access); \
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(             \
-        data_->kind(), broker()->mode(), FLAG_turbo_direct_heap_access); \
-    return object()->name();                                             \
+#define IF_ACCESS_FROM_HEAP_WITH_FLAG_C(name)                         \
+  if (data_->should_access_heap() || FLAG_turbo_direct_heap_access) { \
+    return object()->name();                                          \
   }
 
 // Like BIMODAL_ACCESSOR[_C] except that we force a direct heap access if
@@ -3393,6 +3248,11 @@ int BytecodeArrayRef::handler_table_size() const {
     IF_ACCESS_FROM_HEAP_WITH_FLAG_C(name);                 \
     return ObjectRef::data()->As##holder()->name();        \
   }
+#define BIMODAL_ACCESSOR_WITH_FLAG_B(holder, field, name, BitField)    \
+  typename BitField::FieldType holder##Ref::name() const {             \
+    IF_ACCESS_FROM_HEAP_WITH_FLAG_C(name);                             \
+    return BitField::decode(ObjectRef::data()->As##holder()->field()); \
+  }
 
 BIMODAL_ACCESSOR(AllocationSite, Object, nested_site)
 BIMODAL_ACCESSOR_C(AllocationSite, bool, CanInlineCall)
@@ -3441,25 +3301,28 @@ BIMODAL_ACCESSOR_C(JSTypedArray, bool, is_on_heap)
 BIMODAL_ACCESSOR_C(JSTypedArray, size_t, length)
 BIMODAL_ACCESSOR(JSTypedArray, HeapObject, buffer)
 
-BIMODAL_ACCESSOR_B(Map, bit_field2, elements_kind, Map::Bits2::ElementsKindBits)
-BIMODAL_ACCESSOR_B(Map, bit_field3, is_dictionary_map,
-                   Map::Bits3::IsDictionaryMapBit)
-BIMODAL_ACCESSOR_B(Map, bit_field3, is_deprecated, Map::Bits3::IsDeprecatedBit)
-BIMODAL_ACCESSOR_B(Map, bit_field3, NumberOfOwnDescriptors,
-                   Map::Bits3::NumberOfOwnDescriptorsBits)
-BIMODAL_ACCESSOR_B(Map, bit_field3, is_migration_target,
-                   Map::Bits3::IsMigrationTargetBit)
-BIMODAL_ACCESSOR_B(Map, bit_field3, is_extensible, Map::Bits3::IsExtensibleBit)
-BIMODAL_ACCESSOR_B(Map, bit_field, has_prototype_slot,
-                   Map::Bits1::HasPrototypeSlotBit)
-BIMODAL_ACCESSOR_B(Map, bit_field, is_access_check_needed,
-                   Map::Bits1::IsAccessCheckNeededBit)
-BIMODAL_ACCESSOR_B(Map, bit_field, is_callable, Map::Bits1::IsCallableBit)
-BIMODAL_ACCESSOR_B(Map, bit_field, has_indexed_interceptor,
-                   Map::Bits1::HasIndexedInterceptorBit)
-BIMODAL_ACCESSOR_B(Map, bit_field, is_constructor, Map::Bits1::IsConstructorBit)
-BIMODAL_ACCESSOR_B(Map, bit_field, is_undetectable,
-                   Map::Bits1::IsUndetectableBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field2, elements_kind,
+                             Map::Bits2::ElementsKindBits)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field3, is_dictionary_map,
+                             Map::Bits3::IsDictionaryMapBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field3, is_deprecated,
+                             Map::Bits3::IsDeprecatedBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field3, NumberOfOwnDescriptors,
+                             Map::Bits3::NumberOfOwnDescriptorsBits)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field3, is_migration_target,
+                             Map::Bits3::IsMigrationTargetBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field, has_prototype_slot,
+                             Map::Bits1::HasPrototypeSlotBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field, is_access_check_needed,
+                             Map::Bits1::IsAccessCheckNeededBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field, is_callable,
+                             Map::Bits1::IsCallableBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field, has_indexed_interceptor,
+                             Map::Bits1::HasIndexedInterceptorBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field, is_constructor,
+                             Map::Bits1::IsConstructorBit)
+BIMODAL_ACCESSOR_WITH_FLAG_B(Map, bit_field, is_undetectable,
+                             Map::Bits1::IsUndetectableBit)
 BIMODAL_ACCESSOR_C(Map, int, instance_size)
 BIMODAL_ACCESSOR_C(Map, int, NextFreePropertyIndex)
 BIMODAL_ACCESSOR_C(Map, int, UnusedPropertyFields)
@@ -3493,11 +3356,6 @@ base::Optional<CallHandlerInfoRef> FunctionTemplateInfoRef::call_code() const {
 
 bool FunctionTemplateInfoRef::is_signature_undefined() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-
     return object()->signature().IsUndefined(broker()->isolate());
   }
   return data()->AsFunctionTemplateInfo()->is_signature_undefined();
@@ -3505,11 +3363,6 @@ bool FunctionTemplateInfoRef::is_signature_undefined() const {
 
 bool FunctionTemplateInfoRef::has_call_code() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-
     CallOptimization call_optimization(broker()->isolate(), object());
     return call_optimization.is_simple_api_call();
   }
@@ -3523,11 +3376,6 @@ HolderLookupResult FunctionTemplateInfoRef::LookupHolderOfExpectedType(
   const HolderLookupResult not_found;
 
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-
     CallOptimization call_optimization(broker()->isolate(), object());
     Handle<Map> receiver_map_ref(receiver_map.object());
     if (!receiver_map_ref->IsJSReceiverMap() ||
@@ -3595,23 +3443,42 @@ BIMODAL_ACCESSOR_C(ScopeInfo, bool, HasOuterScopeInfo)
 BIMODAL_ACCESSOR(ScopeInfo, ScopeInfo, OuterScopeInfo)
 
 BIMODAL_ACCESSOR_C(SharedFunctionInfo, int, builtin_id)
-BIMODAL_ACCESSOR(SharedFunctionInfo, BytecodeArray, GetBytecodeArray)
+BytecodeArrayRef SharedFunctionInfoRef::GetBytecodeArray() const {
+  if (data_->should_access_heap() || FLAG_turbo_direct_heap_access) {
+    BytecodeArray bytecode_array;
+    LocalIsolate* local_isolate = broker()->local_isolate();
+    if (local_isolate && !local_isolate->is_main_thread()) {
+      bytecode_array = object()->GetBytecodeArray(local_isolate);
+    } else {
+      bytecode_array = object()->GetBytecodeArray(broker()->isolate());
+    }
+    return BytecodeArrayRef(
+        broker(), broker()->CanonicalPersistentHandle(bytecode_array));
+  }
+  return BytecodeArrayRef(
+      broker(), ObjectRef ::data()->AsSharedFunctionInfo()->GetBytecodeArray());
+}
 #define DEF_SFI_ACCESSOR(type, name) \
   BIMODAL_ACCESSOR_WITH_FLAG_C(SharedFunctionInfo, type, name)
 BROKER_SFI_FIELDS(DEF_SFI_ACCESSOR)
 #undef DEF_SFI_ACCESSOR
-BIMODAL_ACCESSOR_C(SharedFunctionInfo, SharedFunctionInfo::Inlineability,
-                   GetInlineability)
-
-BIMODAL_ACCESSOR_C(String, int, length)
+SharedFunctionInfo::Inlineability SharedFunctionInfoRef::GetInlineability()
+    const {
+  if (data_->should_access_heap()) {
+    if (LocalIsolate* local_isolate = broker()->local_isolate()) {
+      return object()->GetInlineability(local_isolate);
+    } else {
+      return object()->GetInlineability(broker()->isolate());
+    }
+  }
+  return ObjectRef ::data()->AsSharedFunctionInfo()->GetInlineability();
+}
 
 BIMODAL_ACCESSOR(FeedbackCell, HeapObject, value)
 
 base::Optional<ObjectRef> MapRef::GetStrongValue(
     InternalIndex descriptor_index) const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     MaybeObject value =
         object()->instance_descriptors(kRelaxedLoad).GetValue(descriptor_index);
     HeapObject object;
@@ -3635,8 +3502,6 @@ void MapRef::SerializeRootMap() {
 
 base::Optional<MapRef> MapRef::FindRootMap() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return MapRef(broker(), broker()->CanonicalPersistentHandle(
                                 object()->FindRootMap(broker()->isolate())));
   }
@@ -3650,15 +3515,13 @@ base::Optional<MapRef> MapRef::FindRootMap() const {
 
 void* JSTypedArrayRef::data_ptr() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->DataPtr();
   }
   return data()->AsJSTypedArray()->data_ptr();
 }
 
 bool MapRef::IsInobjectSlackTrackingInProgress() const {
-  IF_ACCESS_FROM_HEAP_C(IsInobjectSlackTrackingInProgress);
+  IF_ACCESS_FROM_HEAP_WITH_FLAG_C(IsInobjectSlackTrackingInProgress);
   return Map::Bits3::ConstructionCounterBits::decode(
              data()->AsMap()->bit_field3()) != Map::kNoSlackTracking;
 }
@@ -3734,10 +3597,6 @@ bool StringRef::IsSeqString() const {
 
 ScopeInfoRef NativeContextRef::scope_info() const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return ScopeInfoRef(
         broker(), broker()->CanonicalPersistentHandle(object()->scope_info()));
   }
@@ -3746,10 +3605,6 @@ ScopeInfoRef NativeContextRef::scope_info() const {
 
 SharedFunctionInfoRef FeedbackVectorRef::shared_function_info() const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return SharedFunctionInfoRef(
         broker(),
         broker()->CanonicalPersistentHandle(object()->shared_function_info()));
@@ -3822,8 +3677,6 @@ bool ObjectRef::IsTheHole() const {
 
 bool ObjectRef::BooleanValue() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return object()->BooleanValue(broker()->isolate());
   }
   return IsSmi() ? (AsSmi() != 0) : data()->AsHeapObject()->boolean_value();
@@ -3912,10 +3765,6 @@ base::Optional<ObjectRef> JSArrayRef::GetOwnCowElement(
 
 base::Optional<CellRef> SourceTextModuleRef::GetCell(int cell_index) const {
   if (data_->should_access_heap() || FLAG_turbo_direct_heap_access) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(
-        data()->kind(), broker()->mode(), FLAG_turbo_direct_heap_access);
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(
-        data()->kind(), broker()->mode(), FLAG_turbo_direct_heap_access);
     return CellRef(broker(), broker()->CanonicalPersistentHandle(
                                  object()->GetCell(cell_index)));
   }
@@ -3927,10 +3776,6 @@ base::Optional<CellRef> SourceTextModuleRef::GetCell(int cell_index) const {
 
 ObjectRef SourceTextModuleRef::import_meta() const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return ObjectRef(
         broker(), broker()->CanonicalPersistentHandle(object()->import_meta()));
   }
@@ -3953,8 +3798,6 @@ ObjectRef::ObjectRef(JSHeapBroker* broker, Handle<Object> object,
       RefsMap::Entry* entry = broker->refs_->LookupOrInsert(object.address());
       ObjectData** storage = &(entry->value);
       if (*storage == nullptr) {
-        AllowHandleDereferenceIfNeeded allow_handle_dereference(
-            kUnserializedHeapObject, broker->mode());
         entry->value = broker->zone()->New<ObjectData>(
             broker, storage, object,
             object->IsSmi() ? kSmi : kUnserializedHeapObject);
@@ -3966,8 +3809,6 @@ ObjectRef::ObjectRef(JSHeapBroker* broker, Handle<Object> object,
       UNREACHABLE();
   }
   if (!data_) {  // TODO(mslekova): Remove once we're on the background thread.
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data_->kind(),
-                                                            broker->mode());
     object->Print();
   }
   CHECK_WITH_MSG(data_ != nullptr, "Object is not known to the heap broker");
@@ -4003,8 +3844,6 @@ OddballType GetOddballType(Isolate* isolate, Map map) {
 
 HeapObjectType HeapObjectRef::GetHeapObjectType() const {
   if (data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     Map map = Handle<HeapObject>::cast(object())->map();
     HeapObjectType::Flags flags(0);
     if (map.is_undetectable()) flags |= HeapObjectType::kUndetectable;
@@ -4019,10 +3858,6 @@ HeapObjectType HeapObjectRef::GetHeapObjectType() const {
 }
 base::Optional<JSObjectRef> AllocationSiteRef::boilerplate() const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return JSObjectRef(
         broker(), broker()->CanonicalPersistentHandle(object()->boilerplate()));
   }
@@ -4040,10 +3875,6 @@ ElementsKind JSObjectRef::GetElementsKind() const {
 
 FixedArrayBaseRef JSObjectRef::elements() const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return FixedArrayBaseRef(
         broker(), broker()->CanonicalPersistentHandle(object()->elements()));
   }
@@ -4244,48 +4075,6 @@ bool JSFunctionRef::serialized() const {
   return data()->AsJSFunction()->serialized();
 }
 
-JSArrayRef SharedFunctionInfoRef::GetTemplateObject(
-    TemplateObjectDescriptionRef description, FeedbackSource const& source,
-    SerializationPolicy policy) {
-  // First, see if we have processed feedback from the vector, respecting
-  // the serialization policy.
-  ProcessedFeedback const& feedback =
-      policy == SerializationPolicy::kSerializeIfNeeded
-          ? broker()->ProcessFeedbackForTemplateObject(source)
-          : broker()->GetFeedbackForTemplateObject(source);
-
-  if (!feedback.IsInsufficient()) {
-    return feedback.AsTemplateObject().value();
-  }
-
-  if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
-    Handle<JSArray> template_object =
-        TemplateObjectDescription::GetTemplateObject(
-            isolate(), broker()->target_native_context().object(),
-            description.object(), object(), source.slot.ToInt());
-    return JSArrayRef(broker(), template_object);
-  }
-
-  ObjectData* array =
-      data()->AsSharedFunctionInfo()->GetTemplateObject(source.slot);
-  if (array != nullptr) return JSArrayRef(broker(), array);
-
-  CHECK_EQ(policy, SerializationPolicy::kSerializeIfNeeded);
-  CHECK_EQ(broker()->mode(), JSHeapBroker::kSerializing);
-
-  Handle<JSArray> template_object =
-      TemplateObjectDescription::GetTemplateObject(
-          broker()->isolate(), broker()->target_native_context().object(),
-          description.object(), object(), source.slot.ToInt());
-  array = broker()->GetOrCreateData(template_object);
-  data()->AsSharedFunctionInfo()->SetTemplateObject(source.slot, array);
-  return JSArrayRef(broker(), array);
-}
-
 void SharedFunctionInfoRef::SerializeFunctionTemplateInfo() {
   if (data_->should_access_heap()) return;
   CHECK_EQ(broker()->mode(), JSHeapBroker::kSerializing);
@@ -4321,10 +4110,6 @@ int SharedFunctionInfoRef::context_header_size() const {
 
 ScopeInfoRef SharedFunctionInfoRef::scope_info() const {
   if (data_->should_access_heap()) {
-    AllowHandleAllocationIfNeeded allow_handle_allocation(data()->kind(),
-                                                          broker()->mode());
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(data()->kind(),
-                                                            broker()->mode());
     return ScopeInfoRef(
         broker(), broker()->CanonicalPersistentHandle(object()->scope_info()));
   }
@@ -4337,12 +4122,6 @@ void JSObjectRef::SerializeObjectCreateMap() {
   data()->AsJSObject()->SerializeObjectCreateMap(broker());
 }
 
-void MapRef::SerializeOwnDescriptors() {
-  if (data_->should_access_heap()) return;
-  CHECK_EQ(broker()->mode(), JSHeapBroker::kSerializing);
-  data()->AsMap()->SerializeOwnDescriptors(broker());
-}
-
 void MapRef::SerializeOwnDescriptor(InternalIndex descriptor_index) {
   if (data_->should_access_heap()) return;
   CHECK_EQ(broker()->mode(), JSHeapBroker::kSerializing);
@@ -4352,9 +4131,10 @@ void MapRef::SerializeOwnDescriptor(InternalIndex descriptor_index) {
 bool MapRef::serialized_own_descriptor(InternalIndex descriptor_index) const {
   CHECK_LT(descriptor_index.as_int(), NumberOfOwnDescriptors());
   if (data_->should_access_heap()) return true;
+  ObjectData* maybe_desc_array_data = data()->AsMap()->instance_descriptors();
+  if (!maybe_desc_array_data) return false;
   DescriptorArrayData* desc_array_data =
-      data()->AsMap()->instance_descriptors();
-  if (!desc_array_data) return false;
+      maybe_desc_array_data->AsDescriptorArray();
   return desc_array_data->contents().find(descriptor_index.as_int()) !=
          desc_array_data->contents().end();
 }
@@ -4505,7 +4285,6 @@ GlobalAccessFeedback::GlobalAccessFeedback(PropertyCellRef cell,
 
 GlobalAccessFeedback::GlobalAccessFeedback(FeedbackSlotKind slot_kind)
     : ProcessedFeedback(kGlobalAccess, slot_kind),
-      cell_or_context_(base::nullopt),
       index_and_immutable_(0 /* doesn't matter */) {
   DCHECK(IsGlobalICKind(slot_kind));
 }
@@ -4719,8 +4498,7 @@ void FilterRelevantReceiverMaps(Isolate* isolate, MapHandles* maps) {
 MaybeObjectHandle TryGetMinimorphicHandler(
     std::vector<MapAndHandler> const& maps_and_handlers, FeedbackSlotKind kind,
     Handle<NativeContext> native_context, bool is_turboprop) {
-  if (!is_turboprop || !FLAG_turboprop_dynamic_map_checks ||
-      !IsLoadICKind(kind)) {
+  if (!is_turboprop || !FLAG_turbo_dynamic_map_checks || !IsLoadICKind(kind)) {
     return MaybeObjectHandle();
   }
 
@@ -5217,8 +4995,6 @@ std::ostream& operator<<(std::ostream& os, const ObjectRef& ref) {
     AllowHandleDereference allow_handle_dereference;
     return os << ref.data() << " {" << ref.object() << "}";
   } else if (ref.data_->should_access_heap()) {
-    AllowHandleDereferenceIfNeeded allow_handle_dereference(
-        ref.data()->kind(), ref.broker()->mode());
     return os << ref.data() << " {" << ref.object() << "}";
   } else {
     return os << ref.data();
@@ -5346,36 +5122,6 @@ TemplateObjectFeedback const& ProcessedFeedback::AsTemplateObject() const {
   return *static_cast<TemplateObjectFeedback const*>(this);
 }
 
-BytecodeAnalysis const& JSHeapBroker::GetBytecodeAnalysis(
-    Handle<BytecodeArray> bytecode_array, BailoutId osr_bailout_id,
-    bool analyze_liveness, SerializationPolicy policy) {
-  ObjectData* bytecode_array_data = GetOrCreateData(bytecode_array);
-  CHECK_NOT_NULL(bytecode_array_data);
-
-  auto it = bytecode_analyses_.find(bytecode_array_data);
-  if (it != bytecode_analyses_.end()) {
-    // Bytecode analysis can be run for OSR or for non-OSR. In the rare case
-    // where we optimize for OSR and consider the top-level function itself for
-    // inlining (because of recursion), we need both the OSR and the non-OSR
-    // analysis. Fortunately, the only difference between the two lies in
-    // whether the OSR entry offset gets computed (from the OSR bailout id).
-    // Hence it's okay to reuse the OSR-version when asked for the non-OSR
-    // version, such that we need to store at most one analysis result per
-    // bytecode array.
-    CHECK_IMPLIES(osr_bailout_id != it->second->osr_bailout_id(),
-                  osr_bailout_id.IsNone());
-    CHECK_EQ(analyze_liveness, it->second->liveness_analyzed());
-    return *it->second;
-  }
-
-  CHECK_EQ(policy, SerializationPolicy::kSerializeIfNeeded);
-  BytecodeAnalysis* analysis = zone()->New<BytecodeAnalysis>(
-      bytecode_array, zone(), osr_bailout_id, analyze_liveness);
-  DCHECK_EQ(analysis->osr_bailout_id(), osr_bailout_id);
-  bytecode_analyses_[bytecode_array_data] = analysis;
-  return *analysis;
-}
-
 bool JSHeapBroker::StackHasOverflowed() const {
   DCHECK_IMPLIES(local_isolate_ == nullptr,
                  ThreadId::Current() == isolate_->thread_id());
diff --git a/deps/v8/src/compiler/js-heap-broker.h b/deps/v8/src/compiler/js-heap-broker.h
index a9be949566665a..97d54c39c1699d 100644
--- a/deps/v8/src/compiler/js-heap-broker.h
+++ b/deps/v8/src/compiler/js-heap-broker.h
@@ -18,6 +18,7 @@
 #include "src/handles/handles.h"
 #include "src/handles/persistent-handles.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "src/interpreter/bytecode-array-accessor.h"
 #include "src/objects/code-kind.h"
 #include "src/objects/feedback-vector.h"
@@ -32,7 +33,6 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
-class BytecodeAnalysis;
 class ObjectRef;
 
 std::ostream& operator<<(std::ostream& os, const ObjectRef& ref);
@@ -166,10 +166,6 @@ class V8_EXPORT_PRIVATE JSHeapBroker {
   ElementAccessFeedback const& ProcessFeedbackMapsForElementAccess(
       MapHandles const& maps, KeyedAccessMode const& keyed_mode,
       FeedbackSlotKind slot_kind);
-  BytecodeAnalysis const& GetBytecodeAnalysis(
-      Handle<BytecodeArray> bytecode_array, BailoutId osr_offset,
-      bool analyze_liveness,
-      SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
 
   // Binary, comparison and for-in hints can be fully expressed via
   // an enum. Insufficient feedback is signaled by <Hint enum>::kNone.
@@ -382,7 +378,6 @@ class V8_EXPORT_PRIVATE JSHeapBroker {
   ZoneUnorderedMap<FeedbackSource, ProcessedFeedback const*,
                    FeedbackSource::Hash, FeedbackSource::Equal>
       feedback_;
-  ZoneUnorderedMap<ObjectData*, BytecodeAnalysis*> bytecode_analyses_;
   ZoneUnorderedMap<PropertyAccessTarget, PropertyAccessInfo,
                    PropertyAccessTarget::Hash, PropertyAccessTarget::Equal>
       property_access_infos_;
@@ -413,7 +408,7 @@ class V8_EXPORT_PRIVATE JSHeapBroker {
   static const uint32_t kInitialRefsBucketCount = 1024;  // must be power of 2
 };
 
-class TraceScope {
+class V8_NODISCARD TraceScope {
  public:
   TraceScope(JSHeapBroker* broker, const char* label)
       : TraceScope(broker, static_cast<void*>(broker), label) {}
@@ -472,7 +467,7 @@ class OffHeapBytecodeArray final : public interpreter::AbstractBytecodeArray {
 //   d) The given condition evaluates to true.
 // Used, for example, when printing the graph with --trace-turbo with a
 // previously parked LocalHeap.
-class UnparkedScopeIfNeeded {
+class V8_NODISCARD UnparkedScopeIfNeeded {
  public:
   explicit UnparkedScopeIfNeeded(JSHeapBroker* broker,
                                  bool extra_condition = true) {
diff --git a/deps/v8/src/compiler/js-heap-copy-reducer.cc b/deps/v8/src/compiler/js-heap-copy-reducer.cc
index 4ad4181b59a863..7ebc383ea5a7e6 100644
--- a/deps/v8/src/compiler/js-heap-copy-reducer.cc
+++ b/deps/v8/src/compiler/js-heap-copy-reducer.cc
@@ -152,10 +152,9 @@ Reduction JSHeapCopyReducer::Reduce(Node* node) {
     case IrOpcode::kJSGetTemplateObject: {
       GetTemplateObjectParameters const& p =
           GetTemplateObjectParametersOf(node->op());
-      SharedFunctionInfoRef shared(broker(), p.shared());
-      TemplateObjectDescriptionRef description(broker(), p.description());
-      shared.GetTemplateObject(description, p.feedback(),
-                               SerializationPolicy::kSerializeIfNeeded);
+      SharedFunctionInfoRef(broker(), p.shared());
+      TemplateObjectDescriptionRef(broker(), p.description());
+      broker()->ProcessFeedbackForTemplateObject(p.feedback());
       break;
     }
     case IrOpcode::kJSCreateWithContext: {
diff --git a/deps/v8/src/compiler/js-inlining-heuristic.cc b/deps/v8/src/compiler/js-inlining-heuristic.cc
index 33846d1ac31415..a09644ff9a03da 100644
--- a/deps/v8/src/compiler/js-inlining-heuristic.cc
+++ b/deps/v8/src/compiler/js-inlining-heuristic.cc
@@ -142,8 +142,6 @@ JSInliningHeuristic::Candidate JSInliningHeuristic::CollectFunctions(
 }
 
 Reduction JSInliningHeuristic::Reduce(Node* node) {
-  DisallowHeapAccessIf no_heap_acess(broker()->is_concurrent_inlining());
-
   if (!IrOpcode::IsInlineeOpcode(node->opcode())) return NoChange();
 
   if (total_inlined_bytecode_size_ >= FLAG_max_inlined_bytecode_size_absolute) {
@@ -246,8 +244,6 @@ Reduction JSInliningHeuristic::Reduce(Node* node) {
 }
 
 void JSInliningHeuristic::Finalize() {
-  DisallowHeapAccessIf no_heap_acess(broker()->is_concurrent_inlining());
-
   if (candidates_.empty()) return;  // Nothing to do without candidates.
   if (FLAG_trace_turbo_inlining) PrintCandidates();
 
diff --git a/deps/v8/src/compiler/js-inlining.cc b/deps/v8/src/compiler/js-inlining.cc
index 30f0a01d52aea5..050e26799efe1c 100644
--- a/deps/v8/src/compiler/js-inlining.cc
+++ b/deps/v8/src/compiler/js-inlining.cc
@@ -267,7 +267,7 @@ Node* JSInliner::CreateArtificialFrameState(Node* node, Node* outer_frame_state,
 namespace {
 
 bool NeedsImplicitReceiver(SharedFunctionInfoRef shared_info) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return !shared_info.construct_as_builtin() &&
          !IsDerivedConstructor(shared_info.kind());
 }
diff --git a/deps/v8/src/compiler/js-intrinsic-lowering.cc b/deps/v8/src/compiler/js-intrinsic-lowering.cc
index 653f8ff11403ef..449136051bc43e 100644
--- a/deps/v8/src/compiler/js-intrinsic-lowering.cc
+++ b/deps/v8/src/compiler/js-intrinsic-lowering.cc
@@ -27,8 +27,6 @@ JSIntrinsicLowering::JSIntrinsicLowering(Editor* editor, JSGraph* jsgraph,
     : AdvancedReducer(editor), jsgraph_(jsgraph), broker_(broker) {}
 
 Reduction JSIntrinsicLowering::Reduce(Node* node) {
-  DisallowHeapAccessIf no_heap_access(broker()->is_concurrent_inlining());
-
   if (node->opcode() != IrOpcode::kJSCallRuntime) return NoChange();
   const Runtime::Function* const f =
       Runtime::FunctionForId(CallRuntimeParametersOf(node->op()).id());
diff --git a/deps/v8/src/compiler/js-native-context-specialization.cc b/deps/v8/src/compiler/js-native-context-specialization.cc
index a0115df0dbb009..68d9fa05f0d682 100644
--- a/deps/v8/src/compiler/js-native-context-specialization.cc
+++ b/deps/v8/src/compiler/js-native-context-specialization.cc
@@ -53,10 +53,6 @@ bool HasOnlyJSArrayMaps(JSHeapBroker* broker,
 
 }  // namespace
 
-bool JSNativeContextSpecialization::should_disallow_heap_access() const {
-  return broker()->is_concurrent_inlining();
-}
-
 JSNativeContextSpecialization::JSNativeContextSpecialization(
     Editor* editor, JSGraph* jsgraph, JSHeapBroker* broker, Flags flags,
     CompilationDependencies* dependencies, Zone* zone, Zone* shared_zone)
@@ -73,8 +69,6 @@ JSNativeContextSpecialization::JSNativeContextSpecialization(
       type_cache_(TypeCache::Get()) {}
 
 Reduction JSNativeContextSpecialization::Reduce(Node* node) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   switch (node->opcode()) {
     case IrOpcode::kJSAdd:
       return ReduceJSAdd(node);
@@ -182,7 +176,7 @@ Reduction JSNativeContextSpecialization::ReduceJSToString(Node* node) {
   return NoChange();
 }
 
-const StringConstantBase*
+base::Optional<const StringConstantBase*>
 JSNativeContextSpecialization::CreateDelayedStringConstant(Node* node) {
   if (node->opcode() == IrOpcode::kDelayedStringConstant) {
     return StringConstantBaseOf(node->op());
@@ -195,8 +189,9 @@ JSNativeContextSpecialization::CreateDelayedStringConstant(Node* node) {
       HeapObjectMatcher matcher(node);
       if (matcher.HasResolvedValue() && matcher.Ref(broker()).IsString()) {
         StringRef s = matcher.Ref(broker()).AsString();
+        if (!s.length().has_value()) return base::nullopt;
         return shared_zone()->New<StringLiteral>(
-            s.object(), static_cast<size_t>(s.length()));
+            s.object(), static_cast<size_t>(s.length().value()));
       } else {
         UNREACHABLE();
       }
@@ -335,10 +330,14 @@ Reduction JSNativeContextSpecialization::ReduceJSAdd(Node* node) {
   // string constant and the addition won't throw due to too long result.
   if (*lhs_len + *rhs_len <= String::kMaxLength &&
       (IsStringConstant(broker(), lhs) || IsStringConstant(broker(), rhs))) {
-    const StringConstantBase* left = CreateDelayedStringConstant(lhs);
-    const StringConstantBase* right = CreateDelayedStringConstant(rhs);
+    base::Optional<const StringConstantBase*> left =
+        CreateDelayedStringConstant(lhs);
+    if (!left.has_value()) return NoChange();
+    base::Optional<const StringConstantBase*> right =
+        CreateDelayedStringConstant(rhs);
+    if (!right.has_value()) return NoChange();
     const StringConstantBase* cons =
-        shared_zone()->New<StringCons>(left, right);
+        shared_zone()->New<StringCons>(left.value(), right.value());
 
     Node* reduced = graph()->NewNode(common()->DelayedStringConstant(cons));
     ReplaceWithValue(node, reduced);
@@ -360,7 +359,8 @@ Reduction JSNativeContextSpecialization::ReduceJSGetSuperConstructor(
   }
   JSFunctionRef function = m.Ref(broker()).AsJSFunction();
   MapRef function_map = function.map();
-  if (should_disallow_heap_access() && !function_map.serialized_prototype()) {
+  if (function_map.ShouldHaveBeenSerialized() &&
+      !function_map.serialized_prototype()) {
     TRACE_BROKER_MISSING(broker(), "data for map " << function_map);
     return NoChange();
   }
@@ -411,7 +411,7 @@ Reduction JSNativeContextSpecialization::ReduceJSInstanceOf(Node* node) {
   MapRef receiver_map = receiver_ref.map();
 
   PropertyAccessInfo access_info = PropertyAccessInfo::Invalid(graph()->zone());
-  if (should_disallow_heap_access()) {
+  if (broker()->is_concurrent_inlining()) {
     access_info = broker()->GetPropertyAccessInfo(
         receiver_map,
         NameRef(broker(), isolate()->factory()->has_instance_symbol()),
@@ -545,7 +545,7 @@ JSNativeContextSpecialization::InferHasInPrototypeChain(
         all = false;
         break;
       }
-      if (should_disallow_heap_access() && !map.serialized_prototype()) {
+      if (map.ShouldHaveBeenSerialized() && !map.serialized_prototype()) {
         TRACE_BROKER_MISSING(broker(), "prototype data for map " << map);
         return kMayBeInPrototypeChain;
       }
@@ -624,7 +624,7 @@ Reduction JSNativeContextSpecialization::ReduceJSOrdinaryHasInstance(
     // OrdinaryHasInstance on bound functions turns into a recursive invocation
     // of the instanceof operator again.
     JSBoundFunctionRef function = m.Ref(broker()).AsJSBoundFunction();
-    if (should_disallow_heap_access() && !function.serialized()) {
+    if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
       TRACE_BROKER_MISSING(broker(), "data for JSBoundFunction " << function);
       return NoChange();
     }
@@ -647,7 +647,7 @@ Reduction JSNativeContextSpecialization::ReduceJSOrdinaryHasInstance(
     // Optimize if we currently know the "prototype" property.
 
     JSFunctionRef function = m.Ref(broker()).AsJSFunction();
-    if (should_disallow_heap_access() && !function.serialized()) {
+    if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
       TRACE_BROKER_MISSING(broker(), "data for JSFunction " << function);
       return NoChange();
     }
@@ -725,7 +725,7 @@ Reduction JSNativeContextSpecialization::ReduceJSResolvePromise(Node* node) {
   ZoneVector<PropertyAccessInfo> access_infos(graph()->zone());
   AccessInfoFactory access_info_factory(broker(), dependencies(),
                                         graph()->zone());
-  if (!should_disallow_heap_access()) {
+  if (!broker()->is_concurrent_inlining()) {
     access_info_factory.ComputePropertyAccessInfos(
         resolution_maps, factory()->then_string(), AccessMode::kLoad,
         &access_infos);
@@ -824,17 +824,11 @@ Reduction JSNativeContextSpecialization::ReduceGlobalAccess(
     DCHECK_EQ(receiver, lookup_start_object);
     if (property_details.IsReadOnly()) {
       // Don't even bother trying to lower stores to read-only data properties.
+      // TODO(neis): We could generate code that checks if the new value equals
+      // the old one and then does nothing or deopts, respectively.
       return NoChange();
     } else if (property_cell_type == PropertyCellType::kUndefined) {
-      // There's no fast-path for dealing with undefined property cells.
       return NoChange();
-    } else if (property_cell_type == PropertyCellType::kConstantType) {
-      // There's also no fast-path to store to a global cell which pretended
-      // to be stable, but is no longer stable now.
-      if (property_cell_value.IsHeapObject() &&
-          !property_cell_value.AsHeapObject().map().is_stable()) {
-        return NoChange();
-      }
     }
   } else if (access_mode == AccessMode::kHas) {
     DCHECK_EQ(receiver, lookup_start_object);
@@ -947,23 +941,30 @@ Reduction JSNativeContextSpecialization::ReduceGlobalAccess(
       }
       case PropertyCellType::kConstantType: {
         // Record a code dependency on the cell, and just deoptimize if the new
-        // values' type doesn't match the type of the previous value in the
+        // value's type doesn't match the type of the previous value in the
         // cell.
         dependencies()->DependOnGlobalProperty(property_cell);
         Type property_cell_value_type;
         MachineRepresentation representation = MachineRepresentation::kTagged;
         if (property_cell_value.IsHeapObject()) {
-          // We cannot do anything if the {property_cell_value}s map is no
-          // longer stable.
           MapRef property_cell_value_map =
               property_cell_value.AsHeapObject().map();
-          dependencies()->DependOnStableMap(property_cell_value_map);
+          if (property_cell_value_map.is_stable()) {
+            dependencies()->DependOnStableMap(property_cell_value_map);
+          } else {
+            // The value's map is already unstable. If this store were to go
+            // through the C++ runtime, it would transition the PropertyCell to
+            // kMutable. We don't want to change the cell type from generated
+            // code (to simplify concurrent heap access), however, so we keep
+            // it as kConstantType and do the store anyways (if the new value's
+            // map matches). This is safe because it merely prolongs the limbo
+            // state that we are in already.
+          }
 
           // Check that the {value} is a HeapObject.
           value = effect = graph()->NewNode(simplified()->CheckHeapObject(),
                                             value, effect, control);
-
-          // Check {value} map against the {property_cell} map.
+          // Check {value} map against the {property_cell_value} map.
           effect = graph()->NewNode(
               simplified()->CheckMaps(
                   CheckMapsFlag::kNone,
@@ -1090,7 +1091,7 @@ Reduction JSNativeContextSpecialization::ReduceMinimorphicPropertyAccess(
   MinimorphicLoadPropertyAccessInfo access_info =
       broker()->GetPropertyAccessInfo(
           feedback, source,
-          should_disallow_heap_access()
+          broker()->is_concurrent_inlining()
               ? SerializationPolicy::kAssumeSerialized
               : SerializationPolicy::kSerializeIfNeeded);
   if (access_info.IsInvalid()) return NoChange();
@@ -1194,7 +1195,7 @@ Reduction JSNativeContextSpecialization::ReduceNamedAccess(
       if (map.is_deprecated()) continue;
       PropertyAccessInfo access_info = broker()->GetPropertyAccessInfo(
           map, feedback.name(), access_mode, dependencies(),
-          should_disallow_heap_access()
+          broker()->is_concurrent_inlining()
               ? SerializationPolicy::kAssumeSerialized
               : SerializationPolicy::kSerializeIfNeeded);
       access_infos_for_feedback.push_back(access_info);
@@ -1467,7 +1468,7 @@ Reduction JSNativeContextSpecialization::ReduceJSLoadNamed(Node* node) {
         name.equals(ObjectRef(broker(), factory()->prototype_string()))) {
       // Optimize "prototype" property of functions.
       JSFunctionRef function = object.AsJSFunction();
-      if (should_disallow_heap_access() && !function.serialized()) {
+      if (function.ShouldHaveBeenSerialized() && !function.serialized()) {
         TRACE_BROKER_MISSING(broker(), "data for function " << function);
         return NoChange();
       }
@@ -1484,7 +1485,8 @@ Reduction JSNativeContextSpecialization::ReduceJSLoadNamed(Node* node) {
     } else if (object.IsString() &&
                name.equals(ObjectRef(broker(), factory()->length_string()))) {
       // Constant-fold "length" property on constant strings.
-      Node* value = jsgraph()->Constant(object.AsString().length());
+      if (!object.AsString().length().has_value()) return NoChange();
+      Node* value = jsgraph()->Constant(object.AsString().length().value());
       ReplaceWithValue(node, value);
       return Replace(value);
     }
@@ -1779,7 +1781,8 @@ Reduction JSNativeContextSpecialization::ReduceElementAccess(
     base::Optional<JSTypedArrayRef> typed_array =
         GetTypedArrayConstant(broker(), receiver);
     if (typed_array.has_value()) {
-      if (should_disallow_heap_access() && !typed_array->serialized()) {
+      if (typed_array->ShouldHaveBeenSerialized() &&
+          !typed_array->serialized()) {
         TRACE_BROKER_MISSING(broker(), "data for typed array " << *typed_array);
         return NoChange();
       }
@@ -1981,7 +1984,9 @@ Reduction JSNativeContextSpecialization::ReduceElementLoadFromHeapConstant(
   if (receiver_ref.IsString()) {
     DCHECK_NE(access_mode, AccessMode::kHas);
     // Ensure that {key} is less than {receiver} length.
-    Node* length = jsgraph()->Constant(receiver_ref.AsString().length());
+    if (!receiver_ref.AsString().length().has_value()) return NoChange();
+    Node* length =
+        jsgraph()->Constant(receiver_ref.AsString().length().value());
 
     // Load the single character string from {receiver} or yield
     // undefined if the {key} is out of bounds (depending on the
@@ -1998,8 +2003,6 @@ Reduction JSNativeContextSpecialization::ReduceElementLoadFromHeapConstant(
 Reduction JSNativeContextSpecialization::ReducePropertyAccess(
     Node* node, Node* key, base::Optional<NameRef> static_name, Node* value,
     FeedbackSource const& source, AccessMode access_mode) {
-  DisallowHeapAccessIf disallow_heap_access(should_disallow_heap_access());
-
   DCHECK_EQ(key == nullptr, static_name.has_value());
   DCHECK(node->opcode() == IrOpcode::kJSLoadProperty ||
          node->opcode() == IrOpcode::kJSStoreProperty ||
@@ -2195,9 +2198,9 @@ Reduction JSNativeContextSpecialization::ReduceJSStoreProperty(Node* node) {
 }
 
 Node* JSNativeContextSpecialization::InlinePropertyGetterCall(
-    Node* receiver, Node* context, Node* frame_state, Node** effect,
-    Node** control, ZoneVector<Node*>* if_exceptions,
-    PropertyAccessInfo const& access_info) {
+    Node* receiver, ConvertReceiverMode receiver_mode, Node* context,
+    Node* frame_state, Node** effect, Node** control,
+    ZoneVector<Node*>* if_exceptions, PropertyAccessInfo const& access_info) {
   ObjectRef constant(broker(), access_info.constant());
   Node* target = jsgraph()->Constant(constant);
   FrameStateInfo const& frame_info = FrameStateInfoOf(frame_state->op());
@@ -2208,7 +2211,7 @@ Node* JSNativeContextSpecialization::InlinePropertyGetterCall(
     value = *effect = *control = graph()->NewNode(
         jsgraph()->javascript()->Call(JSCallNode::ArityForArgc(0),
                                       CallFrequency(), FeedbackSource(),
-                                      ConvertReceiverMode::kNotNullOrUndefined),
+                                      receiver_mode),
         target, receiver, feedback, context, frame_state, *effect, *control);
   } else {
     Node* holder = access_info.holder().is_null()
@@ -2343,8 +2346,13 @@ JSNativeContextSpecialization::BuildPropertyLoad(
   if (access_info.IsNotFound()) {
     value = jsgraph()->UndefinedConstant();
   } else if (access_info.IsAccessorConstant()) {
-    value = InlinePropertyGetterCall(receiver, context, frame_state, &effect,
-                                     &control, if_exceptions, access_info);
+    ConvertReceiverMode receiver_mode =
+        receiver == lookup_start_object
+            ? ConvertReceiverMode::kNotNullOrUndefined
+            : ConvertReceiverMode::kAny;
+    value =
+        InlinePropertyGetterCall(receiver, receiver_mode, context, frame_state,
+                                 &effect, &control, if_exceptions, access_info);
   } else if (access_info.IsModuleExport()) {
     Node* cell = jsgraph()->Constant(
         ObjectRef(broker(), access_info.constant()).AsCell());
diff --git a/deps/v8/src/compiler/js-native-context-specialization.h b/deps/v8/src/compiler/js-native-context-specialization.h
index 3d0c3472618c0c..cc351abb2f0858 100644
--- a/deps/v8/src/compiler/js-native-context-specialization.h
+++ b/deps/v8/src/compiler/js-native-context-specialization.h
@@ -129,7 +129,8 @@ class V8_EXPORT_PRIVATE JSNativeContextSpecialization final
 
   Reduction ReduceJSLoadPropertyWithEnumeratedKey(Node* node);
 
-  const StringConstantBase* CreateDelayedStringConstant(Node* node);
+  base::Optional<const StringConstantBase*> CreateDelayedStringConstant(
+      Node* node);
 
   // A triple of nodes that represents a continuation.
   class ValueEffectControl final {
@@ -174,9 +175,10 @@ class V8_EXPORT_PRIVATE JSNativeContextSpecialization final
                                        PropertyAccessInfo const& access_info);
 
   // Helpers for accessor inlining.
-  Node* InlinePropertyGetterCall(Node* receiver, Node* context,
-                                 Node* frame_state, Node** effect,
-                                 Node** control,
+  Node* InlinePropertyGetterCall(Node* receiver,
+                                 ConvertReceiverMode receiver_mode,
+                                 Node* context, Node* frame_state,
+                                 Node** effect, Node** control,
                                  ZoneVector<Node*>* if_exceptions,
                                  PropertyAccessInfo const& access_info);
   void InlinePropertySetterCall(Node* receiver, Node* value, Node* context,
@@ -260,7 +262,6 @@ class V8_EXPORT_PRIVATE JSNativeContextSpecialization final
   CompilationDependencies* dependencies() const { return dependencies_; }
   Zone* zone() const { return zone_; }
   Zone* shared_zone() const { return shared_zone_; }
-  bool should_disallow_heap_access() const;
 
   JSGraph* const jsgraph_;
   JSHeapBroker* const broker_;
diff --git a/deps/v8/src/compiler/js-operator.h b/deps/v8/src/compiler/js-operator.h
index 7e61bf37606110..518eff7fc074e0 100644
--- a/deps/v8/src/compiler/js-operator.h
+++ b/deps/v8/src/compiler/js-operator.h
@@ -1414,9 +1414,6 @@ class JSLoadNamedFromSuperNode final : public JSNodeWrapperBase {
 
   const NamedAccess& Parameters() const { return NamedAccessOf(node()->op()); }
 
-  // TODO(marja, v8:9237): A more intuitive order would be (home_object,
-  // receiver, feedback_vector). The order can be changed once we no longer
-  // delegate to Runtime_LoadFromSuper.
 #define INPUTS(V)                       \
   V(Receiver, receiver, 0, Object)      \
   V(HomeObject, home_object, 1, Object) \
diff --git a/deps/v8/src/compiler/js-type-hint-lowering.cc b/deps/v8/src/compiler/js-type-hint-lowering.cc
index 046ed475775892..ab2ae0bf29c1e9 100644
--- a/deps/v8/src/compiler/js-type-hint-lowering.cc
+++ b/deps/v8/src/compiler/js-type-hint-lowering.cc
@@ -27,9 +27,6 @@ bool BinaryOperationHintToNumberOperationHint(
     case BinaryOperationHint::kSignedSmallInputs:
       *number_hint = NumberOperationHint::kSignedSmallInputs;
       return true;
-    case BinaryOperationHint::kSigned32:
-      *number_hint = NumberOperationHint::kSigned32;
-      return true;
     case BinaryOperationHint::kNumber:
       *number_hint = NumberOperationHint::kNumber;
       return true;
@@ -50,7 +47,6 @@ bool BinaryOperationHintToBigIntOperationHint(
   switch (binop_hint) {
     case BinaryOperationHint::kSignedSmall:
     case BinaryOperationHint::kSignedSmallInputs:
-    case BinaryOperationHint::kSigned32:
     case BinaryOperationHint::kNumber:
     case BinaryOperationHint::kNumberOrOddball:
     case BinaryOperationHint::kAny:
@@ -119,15 +115,13 @@ class JSSpeculativeBinopBuilder final {
   const Operator* SpeculativeNumberOp(NumberOperationHint hint) {
     switch (op_->opcode()) {
       case IrOpcode::kJSAdd:
-        if (hint == NumberOperationHint::kSignedSmall ||
-            hint == NumberOperationHint::kSigned32) {
+        if (hint == NumberOperationHint::kSignedSmall) {
           return simplified()->SpeculativeSafeIntegerAdd(hint);
         } else {
           return simplified()->SpeculativeNumberAdd(hint);
         }
       case IrOpcode::kJSSubtract:
-        if (hint == NumberOperationHint::kSignedSmall ||
-            hint == NumberOperationHint::kSigned32) {
+        if (hint == NumberOperationHint::kSignedSmall) {
           return simplified()->SpeculativeSafeIntegerSubtract(hint);
         } else {
           return simplified()->SpeculativeNumberSubtract(hint);
diff --git a/deps/v8/src/compiler/js-typed-lowering.cc b/deps/v8/src/compiler/js-typed-lowering.cc
index 9927cc0b706ef6..a8dce04d44db59 100644
--- a/deps/v8/src/compiler/js-typed-lowering.cc
+++ b/deps/v8/src/compiler/js-typed-lowering.cc
@@ -109,11 +109,14 @@ class JSBinopReduction final {
       JSHeapBroker* broker = lowering_->broker();
       if (m.right().HasResolvedValue() && m.right().Ref(broker).IsString()) {
         StringRef right_string = m.right().Ref(broker).AsString();
-        if (right_string.length() >= ConsString::kMinLength) return true;
+        if (right_string.length().has_value() &&
+            right_string.length().value() >= ConsString::kMinLength)
+          return true;
       }
       if (m.left().HasResolvedValue() && m.left().Ref(broker).IsString()) {
         StringRef left_string = m.left().Ref(broker).AsString();
-        if (left_string.length() >= ConsString::kMinLength) {
+        if (left_string.length().has_value() &&
+            left_string.length().value() >= ConsString::kMinLength) {
           // The invariant for ConsString requires the left hand side to be
           // a sequential or external string if the right hand side is the
           // empty string. Since we don't know anything about the right hand
@@ -1046,6 +1049,9 @@ Reduction JSTypedLowering::ReduceJSToNumeric(Node* node) {
   if (input_type.Is(Type::NonBigIntPrimitive())) {
     // ToNumeric(x:primitive\bigint) => ToNumber(x)
     NodeProperties::ChangeOp(node, javascript()->ToNumber());
+    Type node_type = NodeProperties::GetType(node);
+    NodeProperties::SetType(
+        node, Type::Intersect(node_type, Type::Number(), graph()->zone()));
     return Changed(node).FollowedBy(ReduceJSToNumber(node));
   }
   return NoChange();
@@ -2367,8 +2373,6 @@ Reduction JSTypedLowering::ReduceJSResolvePromise(Node* node) {
 }
 
 Reduction JSTypedLowering::Reduce(Node* node) {
-  DisallowHeapAccess no_heap_access;
-
   const IrOpcode::Value opcode = node->opcode();
   if (broker()->generate_full_feedback_collection() &&
       IrOpcode::IsFeedbackCollectingOpcode(opcode)) {
@@ -2480,7 +2484,6 @@ Reduction JSTypedLowering::Reduce(Node* node) {
   return NoChange();
 }
 
-
 Factory* JSTypedLowering::factory() const { return jsgraph()->factory(); }
 
 
diff --git a/deps/v8/src/compiler/linkage.cc b/deps/v8/src/compiler/linkage.cc
index ee025896c075fa..ea316513d84848 100644
--- a/deps/v8/src/compiler/linkage.cc
+++ b/deps/v8/src/compiler/linkage.cc
@@ -119,6 +119,12 @@ int CallDescriptor::GetStackParameterDelta(
   return stack_param_delta;
 }
 
+int CallDescriptor::GetOffsetToReturns() const {
+  int offset = static_cast<int>(StackParameterCount());
+  if (ShouldPadArguments(offset)) offset++;
+  return offset;
+}
+
 int CallDescriptor::GetTaggedParameterSlots() const {
   int result = 0;
   for (size_t i = 0; i < InputCount(); ++i) {
diff --git a/deps/v8/src/compiler/linkage.h b/deps/v8/src/compiler/linkage.h
index ad68a579575d3e..5e3a1163cc30a2 100644
--- a/deps/v8/src/compiler/linkage.h
+++ b/deps/v8/src/compiler/linkage.h
@@ -307,10 +307,10 @@ class V8_EXPORT_PRIVATE CallDescriptor final
   // The number of C parameters to this call.
   size_t ParameterCount() const { return location_sig_->parameter_count(); }
 
-  // The number of stack parameters to the call.
+  // The number of stack parameter slots to the call.
   size_t StackParameterCount() const { return stack_param_count_; }
 
-  // The number of stack return values from the call.
+  // The number of stack return value slots from the call.
   size_t StackReturnCount() const { return stack_return_count_; }
 
   // The number of parameters to the JS function call.
@@ -394,6 +394,9 @@ class V8_EXPORT_PRIVATE CallDescriptor final
 
   int GetStackParameterDelta(const CallDescriptor* tail_caller) const;
 
+  // Returns the number of slots to the first return value slot.
+  int GetOffsetToReturns() const;
+
   int GetTaggedParameterSlots() const;
 
   bool CanTailCall(const CallDescriptor* callee) const;
diff --git a/deps/v8/src/compiler/loop-analysis.cc b/deps/v8/src/compiler/loop-analysis.cc
index e950701d31453f..11c610fc8849cb 100644
--- a/deps/v8/src/compiler/loop-analysis.cc
+++ b/deps/v8/src/compiler/loop-analysis.cc
@@ -25,7 +25,8 @@ namespace compiler {
 // Temporary information for each node during marking.
 struct NodeInfo {
   Node* node;
-  NodeInfo* next;       // link in chaining loop members
+  NodeInfo* next;  // link in chaining loop members
+  bool backwards_visited;
 };
 
 
@@ -61,7 +62,7 @@ class LoopFinderImpl {
         end_(graph->end()),
         queue_(zone),
         queued_(graph, 2),
-        info_(graph->NodeCount(), {nullptr, nullptr}, zone),
+        info_(graph->NodeCount(), {nullptr, nullptr, false}, zone),
         loops_(zone),
         loop_num_(graph->NodeCount(), -1, zone),
         loop_tree_(loop_tree),
@@ -192,7 +193,7 @@ class LoopFinderImpl {
     while (!queue_.empty()) {
       tick_counter_->TickAndMaybeEnterSafepoint();
       Node* node = queue_.front();
-      info(node);
+      info(node).backwards_visited = true;
       queue_.pop_front();
       queued_.Set(node, false);
 
@@ -224,10 +225,18 @@ class LoopFinderImpl {
         Node* input = node->InputAt(i);
         if (IsBackedge(node, i)) {
           // Only propagate the loop mark on backedges.
-          if (SetBackwardMark(input, loop_num)) Queue(input);
+          if (SetBackwardMark(input, loop_num) ||
+              !info(input).backwards_visited) {
+            Queue(input);
+          }
         } else {
           // Entry or normal edge. Propagate all marks except loop_num.
-          if (PropagateBackwardMarks(node, input, loop_num)) Queue(input);
+          // TODO(manoskouk): Add test that needs backwards_visited to function
+          // correctly, probably using wasm loop unrolling when it is available.
+          if (PropagateBackwardMarks(node, input, loop_num) ||
+              !info(input).backwards_visited) {
+            Queue(input);
+          }
         }
       }
     }
diff --git a/deps/v8/src/compiler/loop-peeling.cc b/deps/v8/src/compiler/loop-peeling.cc
index 34f53b5e475b0e..3cbf7b583a1d13 100644
--- a/deps/v8/src/compiler/loop-peeling.cc
+++ b/deps/v8/src/compiler/loop-peeling.cc
@@ -289,7 +289,7 @@ PeeledIteration* LoopPeeler::Peel(LoopTree::Loop* loop) {
         // Change exit marker to phi.
         exit->InsertInput(graph_->zone(), 1, peeling.map(exit->InputAt(0)));
         NodeProperties::ChangeOp(
-            exit, common_->Phi(MachineRepresentation::kTagged, 2));
+            exit, common_->Phi(LoopExitValueRepresentationOf(exit->op()), 2));
         break;
       case IrOpcode::kLoopExitEffect:
         // Change effect exit marker to effect phi.
diff --git a/deps/v8/src/compiler/machine-operator.cc b/deps/v8/src/compiler/machine-operator.cc
index e3d16d7e603448..9a90fa6f7c795a 100644
--- a/deps/v8/src/compiler/machine-operator.cc
+++ b/deps/v8/src/compiler/machine-operator.cc
@@ -271,7 +271,6 @@ ShiftKind ShiftKindOf(Operator const* op) {
   V(ChangeFloat64ToInt64, Operator::kNoProperties, 1, 0, 1)                \
   V(ChangeFloat64ToUint32, Operator::kNoProperties, 1, 0, 1)               \
   V(ChangeFloat64ToUint64, Operator::kNoProperties, 1, 0, 1)               \
-  V(TruncateFloat64ToInt64, Operator::kNoProperties, 1, 0, 1)              \
   V(TruncateFloat64ToUint32, Operator::kNoProperties, 1, 0, 1)             \
   V(TryTruncateFloat32ToInt64, Operator::kNoProperties, 1, 0, 2)           \
   V(TryTruncateFloat64ToInt64, Operator::kNoProperties, 1, 0, 2)           \
@@ -1138,6 +1137,25 @@ const Operator* MachineOperatorBuilder::TruncateFloat32ToInt32(
   }
 }
 
+template <TruncateKind kind>
+struct TruncateFloat64ToInt64Operator : Operator1<TruncateKind> {
+  TruncateFloat64ToInt64Operator()
+      : Operator1(IrOpcode::kTruncateFloat64ToInt64, Operator::kPure,
+                  "TruncateFloat64ToInt64", 1, 0, 0, 1, 0, 0, kind) {}
+};
+
+const Operator* MachineOperatorBuilder::TruncateFloat64ToInt64(
+    TruncateKind kind) {
+  switch (kind) {
+    case TruncateKind::kArchitectureDefault:
+      return GetCachedOperator<
+          TruncateFloat64ToInt64Operator<TruncateKind::kArchitectureDefault>>();
+    case TruncateKind::kSetOverflowToMin:
+      return GetCachedOperator<
+          TruncateFloat64ToInt64Operator<TruncateKind::kSetOverflowToMin>>();
+  }
+}
+
 size_t hash_value(TruncateKind kind) { return static_cast<size_t>(kind); }
 
 std::ostream& operator<<(std::ostream& os, TruncateKind kind) {
@@ -1160,6 +1178,18 @@ std::ostream& operator<<(std::ostream& os, TruncateKind kind) {
 MACHINE_PURE_OP_LIST(PURE)
 #undef PURE
 
+const Operator* MachineOperatorBuilder::PrefetchTemporal() {
+  return GetCachedOperator<
+      CachedOperator<IrOpcode::kPrefetchTemporal, 2, 1, 1, 0, 1, 0>>(
+      Operator::kNoDeopt | Operator::kNoThrow, "PrefetchTemporal");
+}
+
+const Operator* MachineOperatorBuilder::PrefetchNonTemporal() {
+  return GetCachedOperator<
+      CachedOperator<IrOpcode::kPrefetchNonTemporal, 2, 1, 1, 0, 1, 0>>(
+      Operator::kNoDeopt | Operator::kNoThrow, "PrefetchNonTemporal");
+}
+
 const Operator* MachineOperatorBuilder::Load(LoadRepresentation rep) {
 #define LOAD(Type)                                         \
   if (rep == MachineType::Type()) {                        \
@@ -1671,13 +1701,13 @@ const Operator* MachineOperatorBuilder::Word64PoisonOnSpeculation() {
   return GetCachedOperator<Word64PoisonOnSpeculationOperator>();
 }
 
-#define EXTRACT_LANE_OP(Type, Sign, lane_count)                                \
-  const Operator* MachineOperatorBuilder::Type##ExtractLane##Sign(             \
-      int32_t lane_index) {                                                    \
-    DCHECK(0 <= lane_index && lane_index < lane_count);                        \
-    return zone_->New<Operator1<int32_t>>(                                     \
-        IrOpcode::k##Type##ExtractLane##Sign, Operator::kPure, "Extract lane", \
-        1, 0, 0, 1, 0, 0, lane_index);                                         \
+#define EXTRACT_LANE_OP(Type, Sign, lane_count)                      \
+  const Operator* MachineOperatorBuilder::Type##ExtractLane##Sign(   \
+      int32_t lane_index) {                                          \
+    DCHECK(0 <= lane_index && lane_index < lane_count);              \
+    return zone_->New<Operator1<int32_t>>(                           \
+        IrOpcode::k##Type##ExtractLane##Sign, Operator::kPure,       \
+        "" #Type "ExtractLane" #Sign, 1, 0, 0, 1, 0, 0, lane_index); \
   }
 EXTRACT_LANE_OP(F64x2, , 2)
 EXTRACT_LANE_OP(F32x4, , 4)
diff --git a/deps/v8/src/compiler/machine-operator.h b/deps/v8/src/compiler/machine-operator.h
index 7912c55de5eb00..eceeb623b02cf3 100644
--- a/deps/v8/src/compiler/machine-operator.h
+++ b/deps/v8/src/compiler/machine-operator.h
@@ -465,7 +465,7 @@ class V8_EXPORT_PRIVATE MachineOperatorBuilder final
   const Operator* ChangeFloat64ToInt64();
   const Operator* ChangeFloat64ToUint32();  // narrowing
   const Operator* ChangeFloat64ToUint64();
-  const Operator* TruncateFloat64ToInt64();
+  const Operator* TruncateFloat64ToInt64(TruncateKind kind);
   const Operator* TruncateFloat64ToUint32();
   const Operator* TruncateFloat32ToInt32(TruncateKind kind);
   const Operator* TruncateFloat32ToUint32(TruncateKind kind);
@@ -828,6 +828,9 @@ class V8_EXPORT_PRIVATE MachineOperatorBuilder final
   const Operator* LoadTransform(MemoryAccessKind kind,
                                 LoadTransformation transform);
 
+  const Operator* PrefetchTemporal();
+  const Operator* PrefetchNonTemporal();
+
   // SIMD load: replace a specified lane with [base + index].
   const Operator* LoadLane(MemoryAccessKind kind, LoadRepresentation rep,
                            uint8_t laneidx);
diff --git a/deps/v8/src/compiler/node-matchers.h b/deps/v8/src/compiler/node-matchers.h
index c9736c1d48f53b..a342afc94dd995 100644
--- a/deps/v8/src/compiler/node-matchers.h
+++ b/deps/v8/src/compiler/node-matchers.h
@@ -8,6 +8,7 @@
 #include <cmath>
 #include <limits>
 
+#include "src/base/bounds.h"
 #include "src/base/compiler-specific.h"
 #include "src/codegen/external-reference.h"
 #include "src/common/globals.h"
@@ -144,8 +145,8 @@ struct IntMatcher final : public ValueMatcher<T, kOpcode> {
     return this->HasResolvedValue() && this->ResolvedValue() == value;
   }
   bool IsInRange(const T& low, const T& high) const {
-    return this->HasResolvedValue() && low <= this->ResolvedValue() &&
-           this->ResolvedValue() <= high;
+    return this->HasResolvedValue() &&
+           base::IsInRange(this->ResolvedValue(), low, high);
   }
   bool IsMultipleOf(T n) const {
     return this->HasResolvedValue() && (this->ResolvedValue() % n) == 0;
diff --git a/deps/v8/src/compiler/node-origin-table.h b/deps/v8/src/compiler/node-origin-table.h
index c45e235a6ea483..92db07537ee67a 100644
--- a/deps/v8/src/compiler/node-origin-table.h
+++ b/deps/v8/src/compiler/node-origin-table.h
@@ -67,7 +67,7 @@ inline bool operator!=(const NodeOrigin& lhs, const NodeOrigin& rhs) {
 class V8_EXPORT_PRIVATE NodeOriginTable final
     : public NON_EXPORTED_BASE(ZoneObject) {
  public:
-  class Scope final {
+  class V8_NODISCARD Scope final {
    public:
     Scope(NodeOriginTable* origins, const char* reducer_name, Node* node)
         : origins_(origins), prev_origin_(NodeOrigin::Unknown()) {
@@ -90,7 +90,7 @@ class V8_EXPORT_PRIVATE NodeOriginTable final
     NodeOrigin prev_origin_;
   };
 
-  class PhaseScope final {
+  class V8_NODISCARD PhaseScope final {
    public:
     PhaseScope(NodeOriginTable* origins, const char* phase_name)
         : origins_(origins) {
diff --git a/deps/v8/src/compiler/opcodes.h b/deps/v8/src/compiler/opcodes.h
index 5027f734d4427b..cf65864e8d6eb1 100644
--- a/deps/v8/src/compiler/opcodes.h
+++ b/deps/v8/src/compiler/opcodes.h
@@ -10,27 +10,28 @@
 #include "src/common/globals.h"
 
 // Opcodes for control operators.
-#define CONTROL_OP_LIST(V) \
-  V(Start)                 \
-  V(Loop)                  \
-  V(Branch)                \
-  V(Switch)                \
-  V(IfTrue)                \
-  V(IfFalse)               \
-  V(IfSuccess)             \
-  V(IfException)           \
-  V(IfValue)               \
-  V(IfDefault)             \
-  V(Merge)                 \
-  V(Deoptimize)            \
-  V(DeoptimizeIf)          \
-  V(DeoptimizeUnless)      \
-  V(TrapIf)                \
-  V(TrapUnless)            \
-  V(Return)                \
-  V(TailCall)              \
-  V(Terminate)             \
-  V(Throw)                 \
+#define CONTROL_OP_LIST(V)           \
+  V(Start)                           \
+  V(Loop)                            \
+  V(Branch)                          \
+  V(Switch)                          \
+  V(IfTrue)                          \
+  V(IfFalse)                         \
+  V(IfSuccess)                       \
+  V(IfException)                     \
+  V(IfValue)                         \
+  V(IfDefault)                       \
+  V(Merge)                           \
+  V(Deoptimize)                      \
+  V(DeoptimizeIf)                    \
+  V(DeoptimizeUnless)                \
+  V(DynamicCheckMapsWithDeoptUnless) \
+  V(TrapIf)                          \
+  V(TrapUnless)                      \
+  V(Return)                          \
+  V(TailCall)                        \
+  V(Terminate)                       \
+  V(Throw)                           \
   V(End)
 
 // Opcodes for constant operators.
@@ -979,6 +980,8 @@
   V(V8x16AnyTrue)               \
   V(V8x16AllTrue)               \
   V(LoadTransform)              \
+  V(PrefetchTemporal)           \
+  V(PrefetchNonTemporal)        \
   V(LoadLane)                   \
   V(StoreLane)
 
diff --git a/deps/v8/src/compiler/pipeline-statistics.cc b/deps/v8/src/compiler/pipeline-statistics.cc
index 7ef6437ee98b21..82a6e6bb3ec887 100644
--- a/deps/v8/src/compiler/pipeline-statistics.cc
+++ b/deps/v8/src/compiler/pipeline-statistics.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/compiler/pipeline-statistics.h"
+
 #include <memory>
 
 #include "src/codegen/optimized-compilation-info.h"
-#include "src/compiler/pipeline-statistics.h"
 #include "src/compiler/zone-stats.h"
 #include "src/objects/shared-function-info.h"
 #include "src/objects/string.h"
@@ -18,10 +19,10 @@ namespace compiler {
 namespace {
 
 // We log detailed phase information about the pipeline
-// in both the v8.turbofan and the v8.wasm.detailed categories.
+// in both the v8.turbofan and the v8.wasm.turbofan categories.
 constexpr const char kTraceCategory[] =           // --
     TRACE_DISABLED_BY_DEFAULT("v8.turbofan") ","  // --
-    TRACE_DISABLED_BY_DEFAULT("v8.wasm.detailed");
+    TRACE_DISABLED_BY_DEFAULT("v8.wasm.turbofan");
 
 }  // namespace
 
@@ -64,8 +65,7 @@ PipelineStatistics::PipelineStatistics(OptimizedCompilationInfo* info,
       phase_kind_name_(nullptr),
       phase_name_(nullptr) {
   if (info->has_shared_info()) {
-    std::unique_ptr<char[]> name = info->shared_info()->DebugName().ToCString();
-    function_name_ = name.get();
+    function_name_.assign(info->shared_info()->DebugNameCStr().get());
   }
   total_stats_.Begin(this);
 }
diff --git a/deps/v8/src/compiler/pipeline-statistics.h b/deps/v8/src/compiler/pipeline-statistics.h
index 330c523521df19..8a05d98011df4b 100644
--- a/deps/v8/src/compiler/pipeline-statistics.h
+++ b/deps/v8/src/compiler/pipeline-statistics.h
@@ -74,8 +74,7 @@ class PipelineStatistics : public Malloced {
   CommonStats phase_stats_;
 };
 
-
-class PhaseScope {
+class V8_NODISCARD PhaseScope {
  public:
   PhaseScope(PipelineStatistics* pipeline_stats, const char* name)
       : pipeline_stats_(pipeline_stats) {
diff --git a/deps/v8/src/compiler/pipeline.cc b/deps/v8/src/compiler/pipeline.cc
index 1023c6bb687533..42560b54511cab 100644
--- a/deps/v8/src/compiler/pipeline.cc
+++ b/deps/v8/src/compiler/pipeline.cc
@@ -744,7 +744,7 @@ class NodeOriginsWrapper final : public Reducer {
   NodeOriginTable* const table_;
 };
 
-class PipelineRunScope {
+class V8_NODISCARD PipelineRunScope {
  public:
   PipelineRunScope(
       PipelineData* data, const char* phase_name,
@@ -769,7 +769,7 @@ class PipelineRunScope {
 
 // LocalIsolateScope encapsulates the phase where persistent handles are
 // attached to the LocalHeap inside {local_isolate}.
-class LocalIsolateScope {
+class V8_NODISCARD LocalIsolateScope {
  public:
   explicit LocalIsolateScope(JSHeapBroker* broker,
                              OptimizedCompilationInfo* info,
@@ -802,15 +802,15 @@ void PrintFunctionSource(OptimizedCompilationInfo* info, Isolate* isolate,
       if (source_name.IsString()) {
         os << String::cast(source_name).ToCString().get() << ":";
       }
-      os << shared->DebugName().ToCString().get() << ") id{";
+      os << shared->DebugNameCStr().get() << ") id{";
       os << info->optimization_id() << "," << source_id << "} start{";
       os << shared->StartPosition() << "} ---\n";
       {
-        DisallowHeapAllocation no_allocation;
+        DisallowGarbageCollection no_gc;
         int start = shared->StartPosition();
         int len = shared->EndPosition() - start;
-        SubStringRange source(String::cast(script->source()), no_allocation,
-                              start, len);
+        SubStringRange source(String::cast(script->source()), no_gc, start,
+                              len);
         for (const auto& c : source) {
           os << AsReversiblyEscapedUC16(c);
         }
@@ -828,7 +828,7 @@ void PrintInlinedFunctionInfo(
     int inlining_id, const OptimizedCompilationInfo::InlinedFunctionHolder& h) {
   CodeTracer::StreamScope tracing_scope(isolate->GetCodeTracer());
   auto& os = tracing_scope.stream();
-  os << "INLINE (" << h.shared_info->DebugName().ToCString().get() << ") id{"
+  os << "INLINE (" << h.shared_info->DebugNameCStr().get() << ") id{"
      << info->optimization_id() << "," << source_id << "} AS " << inlining_id
      << " AT ";
   const SourcePosition position = h.position.position;
@@ -989,7 +989,7 @@ PipelineStatistics* CreatePipelineStatistics(
 
   bool tracing_enabled;
   TRACE_EVENT_CATEGORY_GROUP_ENABLED(
-      TRACE_DISABLED_BY_DEFAULT("v8.wasm.detailed"), &tracing_enabled);
+      TRACE_DISABLED_BY_DEFAULT("v8.wasm.turbofan"), &tracing_enabled);
   if (tracing_enabled || FLAG_turbo_stats_wasm) {
     pipeline_statistics = new PipelineStatistics(
         info, wasm_engine->GetOrCreateTurboStatistics(), zone_stats);
@@ -1056,6 +1056,15 @@ class PipelineCompilationJob final : public OptimizedCompilationJob {
   Linkage* linkage_;
 };
 
+namespace {
+
+bool ShouldUseConcurrentInlining(CodeKind code_kind, bool is_osr) {
+  if (is_osr) return false;
+  return code_kind == CodeKind::TURBOPROP || FLAG_concurrent_inlining;
+}
+
+}  // namespace
+
 PipelineCompilationJob::PipelineCompilationJob(
     Isolate* isolate, Handle<SharedFunctionInfo> shared_info,
     Handle<JSFunction> function, BailoutId osr_offset,
@@ -1074,7 +1083,7 @@ PipelineCompilationJob::PipelineCompilationJob(
           compilation_info(), function->GetIsolate(), &zone_stats_)),
       data_(&zone_stats_, function->GetIsolate(), compilation_info(),
             pipeline_statistics_.get(),
-            FLAG_concurrent_inlining && osr_offset.IsNone()),
+            ShouldUseConcurrentInlining(code_kind, !osr_offset.IsNone())),
       pipeline_(&data_),
       linkage_(nullptr) {
   compilation_info_.SetOptimizingForOsr(osr_offset, osr_frame);
@@ -1087,7 +1096,7 @@ namespace {
 // duration of the job phase and unset immediately afterwards. Each job
 // needs to set the correct RuntimeCallStats table depending on whether it
 // is running on a background or foreground thread.
-class PipelineJobScope {
+class V8_NODISCARD PipelineJobScope {
  public:
   PipelineJobScope(PipelineData* data, RuntimeCallStats* stats) : data_(data) {
     data_->set_runtime_call_stats(stats);
@@ -1236,7 +1245,7 @@ void PipelineCompilationJob::RegisterWeakObjectsInOptimizedCode(
   std::vector<Handle<Map>> maps;
   DCHECK(code->is_optimized_code());
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     int const mode_mask = RelocInfo::EmbeddedObjectModeMask();
     for (RelocIterator it(*code, mode_mask); !it.done(); it.next()) {
       DCHECK(RelocInfo::IsEmbeddedObjectMode(it.rinfo()->rmode()));
@@ -1723,6 +1732,10 @@ struct GenericLoweringPhase {
     JSGenericLowering generic_lowering(data->jsgraph(), &graph_reducer,
                                        data->broker());
     AddReducer(data, &graph_reducer, &generic_lowering);
+
+    // JSGEnericLowering accesses the heap due to ObjectRef's type checks.
+    UnparkedScopeIfNeeded scope(data->broker());
+
     graph_reducer.ReduceGraph();
   }
 };
@@ -3030,8 +3043,8 @@ MaybeHandle<Code> Pipeline::GenerateCodeForTesting(
   }
 
   {
-    LocalIsolate local_isolate(isolate, ThreadKind::kMain);
-    LocalIsolateScope local_isolate_scope(data.broker(), info, &local_isolate);
+    LocalIsolateScope local_isolate_scope(data.broker(), info,
+                                          isolate->main_thread_local_isolate());
     if (data.broker()->is_concurrent_inlining()) {
       if (!pipeline.CreateGraph()) return MaybeHandle<Code>();
     }
@@ -3282,6 +3295,7 @@ bool PipelineImpl::SelectInstructions(Linkage* linkage) {
   DCHECK_NOT_NULL(data->schedule());
 
   if (FLAG_turbo_profiling) {
+    UnparkedScopeIfNeeded unparked_scope(data->broker());
     data->info()->set_profiler_data(BasicBlockInstrumentor::Instrument(
         info(), data->graph(), data->schedule(), data->isolate()));
   }
diff --git a/deps/v8/src/compiler/pipeline.h b/deps/v8/src/compiler/pipeline.h
index 8a2b679010a730..509f5febc6a48e 100644
--- a/deps/v8/src/compiler/pipeline.h
+++ b/deps/v8/src/compiler/pipeline.h
@@ -45,10 +45,11 @@ class SourcePositionTable;
 class Pipeline : public AllStatic {
  public:
   // Returns a new compilation job for the given JavaScript function.
-  static std::unique_ptr<OptimizedCompilationJob> NewCompilationJob(
-      Isolate* isolate, Handle<JSFunction> function, CodeKind code_kind,
-      bool has_script, BailoutId osr_offset = BailoutId::None(),
-      JavaScriptFrame* osr_frame = nullptr);
+  static V8_EXPORT_PRIVATE std::unique_ptr<OptimizedCompilationJob>
+  NewCompilationJob(Isolate* isolate, Handle<JSFunction> function,
+                    CodeKind code_kind, bool has_script,
+                    BailoutId osr_offset = BailoutId::None(),
+                    JavaScriptFrame* osr_frame = nullptr);
 
   // Run the pipeline for the WebAssembly compilation info.
   static void GenerateCodeForWasmFunction(
diff --git a/deps/v8/src/compiler/raw-machine-assembler.cc b/deps/v8/src/compiler/raw-machine-assembler.cc
index dce807b7abd602..1bff7c82a751a6 100644
--- a/deps/v8/src/compiler/raw-machine-assembler.cc
+++ b/deps/v8/src/compiler/raw-machine-assembler.cc
@@ -731,14 +731,18 @@ namespace {
 enum FunctionDescriptorMode { kHasFunctionDescriptor, kNoFunctionDescriptor };
 
 Node* CallCFunctionImpl(
-    RawMachineAssembler* rasm, Node* function, MachineType return_type,
+    RawMachineAssembler* rasm, Node* function,
+    base::Optional<MachineType> return_type,
     std::initializer_list<RawMachineAssembler::CFunctionArg> args,
     bool caller_saved_regs, SaveFPRegsMode mode,
     FunctionDescriptorMode no_function_descriptor) {
   static constexpr std::size_t kNumCArgs = 10;
 
-  MachineSignature::Builder builder(rasm->zone(), 1, args.size());
-  builder.AddReturn(return_type);
+  MachineSignature::Builder builder(rasm->zone(), return_type ? 1 : 0,
+                                    args.size());
+  if (return_type) {
+    builder.AddReturn(*return_type);
+  }
   for (const auto& arg : args) builder.AddParam(arg.first);
 
   bool caller_saved_fp_regs = caller_saved_regs && (mode == kSaveFPRegs);
@@ -763,7 +767,7 @@ Node* CallCFunctionImpl(
 }  // namespace
 
 Node* RawMachineAssembler::CallCFunction(
-    Node* function, MachineType return_type,
+    Node* function, base::Optional<MachineType> return_type,
     std::initializer_list<RawMachineAssembler::CFunctionArg> args) {
   return CallCFunctionImpl(this, function, return_type, args, false,
                            kDontSaveFPRegs, kHasFunctionDescriptor);
diff --git a/deps/v8/src/compiler/raw-machine-assembler.h b/deps/v8/src/compiler/raw-machine-assembler.h
index 8509568bf56052..eff7a845c6d62a 100644
--- a/deps/v8/src/compiler/raw-machine-assembler.h
+++ b/deps/v8/src/compiler/raw-machine-assembler.h
@@ -221,16 +221,22 @@ class V8_EXPORT_PRIVATE RawMachineAssembler {
 
   // Atomic memory operations.
   Node* AtomicLoad(MachineType type, Node* base, Node* index) {
-    if (type.representation() == MachineRepresentation::kWord64) {
-      if (machine()->Is64()) {
-        return AddNode(machine()->Word64AtomicLoad(type), base, index);
-      } else {
-        return AddNode(machine()->Word32AtomicPairLoad(), base, index);
-      }
-    }
+    DCHECK_NE(type.representation(), MachineRepresentation::kWord64);
     return AddNode(machine()->Word32AtomicLoad(type), base, index);
   }
 
+  Node* AtomicLoad64(Node* base, Node* index) {
+    if (machine()->Is64()) {
+      // This uses Uint64() intentionally: AtomicLoad is not implemented for
+      // Int64(), which is fine because the machine instruction only cares
+      // about words.
+      return AddNode(machine()->Word64AtomicLoad(MachineType::Uint64()), base,
+                     index);
+    } else {
+      return AddNode(machine()->Word32AtomicPairLoad(), base, index);
+    }
+  }
+
 #if defined(V8_TARGET_BIG_ENDIAN)
 #define VALUE_HALVES value_high, value
 #else
@@ -238,34 +244,41 @@ class V8_EXPORT_PRIVATE RawMachineAssembler {
 #endif
 
   Node* AtomicStore(MachineRepresentation rep, Node* base, Node* index,
-                    Node* value, Node* value_high) {
-    if (rep == MachineRepresentation::kWord64) {
-      if (machine()->Is64()) {
-        DCHECK_NULL(value_high);
-        return AddNode(machine()->Word64AtomicStore(rep), base, index, value);
-      } else {
-        return AddNode(machine()->Word32AtomicPairStore(), base, index,
-                       VALUE_HALVES);
-      }
-    }
-    DCHECK_NULL(value_high);
+                    Node* value) {
+    DCHECK_NE(rep, MachineRepresentation::kWord64);
     return AddNode(machine()->Word32AtomicStore(rep), base, index, value);
   }
-#define ATOMIC_FUNCTION(name)                                                \
-  Node* Atomic##name(MachineType type, Node* base, Node* index, Node* value, \
-                     Node* value_high) {                                     \
-    if (type.representation() == MachineRepresentation::kWord64) {           \
-      if (machine()->Is64()) {                                               \
-        DCHECK_NULL(value_high);                                             \
-        return AddNode(machine()->Word64Atomic##name(type), base, index,     \
-                       value);                                               \
-      } else {                                                               \
-        return AddNode(machine()->Word32AtomicPair##name(), base, index,     \
-                       VALUE_HALVES);                                        \
-      }                                                                      \
-    }                                                                        \
-    DCHECK_NULL(value_high);                                                 \
-    return AddNode(machine()->Word32Atomic##name(type), base, index, value); \
+
+  Node* AtomicStore64(Node* base, Node* index, Node* value, Node* value_high) {
+    if (machine()->Is64()) {
+      DCHECK_NULL(value_high);
+      return AddNode(
+          machine()->Word64AtomicStore(MachineRepresentation::kWord64), base,
+          index, value);
+    } else {
+      return AddNode(machine()->Word32AtomicPairStore(), base, index,
+                     VALUE_HALVES);
+    }
+  }
+
+#define ATOMIC_FUNCTION(name)                                                  \
+  Node* Atomic##name(MachineType type, Node* base, Node* index, Node* value) { \
+    DCHECK_NE(type.representation(), MachineRepresentation::kWord64);          \
+    return AddNode(machine()->Word32Atomic##name(type), base, index, value);   \
+  }                                                                            \
+  Node* Atomic##name##64(Node * base, Node * index, Node * value,              \
+                         Node * value_high) {                                  \
+    if (machine()->Is64()) {                                                   \
+      DCHECK_NULL(value_high);                                                 \
+      /* This uses Uint64() intentionally: Atomic operations are not  */       \
+      /* implemented for Int64(), which is fine because the machine   */       \
+      /* instruction only cares about words.                          */       \
+      return AddNode(machine()->Word64Atomic##name(MachineType::Uint64()),     \
+                     base, index, value);                                      \
+    } else {                                                                   \
+      return AddNode(machine()->Word32AtomicPair##name(), base, index,         \
+                     VALUE_HALVES);                                            \
+    }                                                                          \
   }
   ATOMIC_FUNCTION(Exchange)
   ATOMIC_FUNCTION(Add)
@@ -277,26 +290,30 @@ class V8_EXPORT_PRIVATE RawMachineAssembler {
 #undef VALUE_HALVES
 
   Node* AtomicCompareExchange(MachineType type, Node* base, Node* index,
-                              Node* old_value, Node* old_value_high,
-                              Node* new_value, Node* new_value_high) {
-    if (type.representation() == MachineRepresentation::kWord64) {
-      if (machine()->Is64()) {
-        DCHECK_NULL(old_value_high);
-        DCHECK_NULL(new_value_high);
-        return AddNode(machine()->Word64AtomicCompareExchange(type), base,
-                       index, old_value, new_value);
-      } else {
-        return AddNode(machine()->Word32AtomicPairCompareExchange(), base,
-                       index, old_value, old_value_high, new_value,
-                       new_value_high);
-      }
-    }
-    DCHECK_NULL(old_value_high);
-    DCHECK_NULL(new_value_high);
+                              Node* old_value, Node* new_value) {
+    DCHECK_NE(type.representation(), MachineRepresentation::kWord64);
     return AddNode(machine()->Word32AtomicCompareExchange(type), base, index,
                    old_value, new_value);
   }
 
+  Node* AtomicCompareExchange64(Node* base, Node* index, Node* old_value,
+                                Node* old_value_high, Node* new_value,
+                                Node* new_value_high) {
+    if (machine()->Is64()) {
+      DCHECK_NULL(old_value_high);
+      DCHECK_NULL(new_value_high);
+      // This uses Uint64() intentionally: AtomicCompareExchange is not
+      // implemented for Int64(), which is fine because the machine instruction
+      // only cares about words.
+      return AddNode(
+          machine()->Word64AtomicCompareExchange(MachineType::Uint64()), base,
+          index, old_value, new_value);
+    } else {
+      return AddNode(machine()->Word32AtomicPairCompareExchange(), base, index,
+                     old_value, old_value_high, new_value, new_value_high);
+    }
+  }
+
   // Arithmetic Operations.
   Node* WordAnd(Node* a, Node* b) {
     return AddNode(machine()->WordAnd(), a, b);
@@ -910,14 +927,15 @@ class V8_EXPORT_PRIVATE RawMachineAssembler {
 
   // Call to a C function.
   template <class... CArgs>
-  Node* CallCFunction(Node* function, MachineType return_type, CArgs... cargs) {
+  Node* CallCFunction(Node* function, base::Optional<MachineType> return_type,
+                      CArgs... cargs) {
     static_assert(v8::internal::conjunction<
                       std::is_convertible<CArgs, CFunctionArg>...>::value,
                   "invalid argument types");
     return CallCFunction(function, return_type, {cargs...});
   }
 
-  Node* CallCFunction(Node* function, MachineType return_type,
+  Node* CallCFunction(Node* function, base::Optional<MachineType> return_type,
                       std::initializer_list<CFunctionArg> args);
 
   // Call to a C function without a function discriptor on AIX.
diff --git a/deps/v8/src/compiler/scheduler.cc b/deps/v8/src/compiler/scheduler.cc
index 90500d1f5cf660..fdfa16052b4be1 100644
--- a/deps/v8/src/compiler/scheduler.cc
+++ b/deps/v8/src/compiler/scheduler.cc
@@ -478,14 +478,14 @@ class CFGBuilder : public ZoneObject {
 
     BranchHint hint_from_profile = BranchHint::kNone;
     if (const ProfileDataFromFile* profile_data = scheduler_->profile_data()) {
-      uint32_t block_zero_count =
+      double block_zero_count =
           profile_data->GetCounter(successor_blocks[0]->id().ToSize());
-      uint32_t block_one_count =
+      double block_one_count =
           profile_data->GetCounter(successor_blocks[1]->id().ToSize());
       // If a branch is visited a non-trivial number of times and substantially
       // more often than its alternative, then mark it as likely.
-      constexpr uint32_t kMinimumCount = 100000;
-      constexpr uint32_t kThresholdRatio = 4000;
+      constexpr double kMinimumCount = 100000;
+      constexpr double kThresholdRatio = 4000;
       if (block_zero_count > kMinimumCount &&
           block_zero_count / kThresholdRatio > block_one_count) {
         hint_from_profile = BranchHint::kTrue;
diff --git a/deps/v8/src/compiler/serializer-for-background-compilation.cc b/deps/v8/src/compiler/serializer-for-background-compilation.cc
index 3e57da18a0e406..2733aaaa7df755 100644
--- a/deps/v8/src/compiler/serializer-for-background-compilation.cc
+++ b/deps/v8/src/compiler/serializer-for-background-compilation.cc
@@ -549,8 +549,6 @@ class SerializerForBackgroundCompilation {
 
   Handle<FeedbackVector> feedback_vector() const;
   Handle<BytecodeArray> bytecode_array() const;
-  BytecodeAnalysis const& GetBytecodeAnalysis(
-      SerializationPolicy policy = SerializationPolicy::kAssumeSerialized);
 
   JSHeapBroker* broker() const { return broker_; }
   CompilationDependencies* dependencies() const { return dependencies_; }
@@ -558,6 +556,7 @@ class SerializerForBackgroundCompilation {
   Environment* environment() const { return environment_; }
   SerializerForBackgroundCompilationFlags flags() const { return flags_; }
   BailoutId osr_offset() const { return osr_offset_; }
+  const BytecodeAnalysis& bytecode_analysis() { return *bytecode_analysis_; }
 
   JSHeapBroker* const broker_;
   CompilationDependencies* const dependencies_;
@@ -567,6 +566,7 @@ class SerializerForBackgroundCompilation {
   // {closure_hints_} but that would be cumbersome.
   VirtualClosure const function_;
   BailoutId const osr_offset_;
+  base::Optional<BytecodeAnalysis> bytecode_analysis_;
   ZoneUnorderedMap<int, Environment*> jump_target_environments_;
   Environment* const environment_;
   HintsVector const arguments_;
@@ -839,7 +839,7 @@ void Hints::Reset(Hints* other, Zone* zone) {
 
 class SerializerForBackgroundCompilation::Environment : public ZoneObject {
  public:
-  Environment(Zone* zone, CompilationSubject function);
+  Environment(Zone* zone, Isolate* isolate, CompilationSubject function);
   Environment(Zone* zone, Isolate* isolate, CompilationSubject function,
               base::Optional<Hints> new_target, const HintsVector& arguments,
               MissingArgumentsPolicy padding);
@@ -881,15 +881,15 @@ class SerializerForBackgroundCompilation::Environment : public ZoneObject {
 };
 
 SerializerForBackgroundCompilation::Environment::Environment(
-    Zone* zone, CompilationSubject function)
+    Zone* zone, Isolate* isolate, CompilationSubject function)
     : parameters_hints_(function.virtual_closure()
                             .shared()
-                            ->GetBytecodeArray()
+                            ->GetBytecodeArray(isolate)
                             .parameter_count(),
                         Hints(), zone),
       locals_hints_(function.virtual_closure()
                         .shared()
-                        ->GetBytecodeArray()
+                        ->GetBytecodeArray(isolate)
                         .register_count(),
                     Hints(), zone) {
   // Consume the virtual_closure's context hint information.
@@ -900,7 +900,7 @@ SerializerForBackgroundCompilation::Environment::Environment(
     Zone* zone, Isolate* isolate, CompilationSubject function,
     base::Optional<Hints> new_target, const HintsVector& arguments,
     MissingArgumentsPolicy padding)
-    : Environment(zone, function) {
+    : Environment(zone, isolate, function) {
   // Set the hints for the actually passed arguments, at most up to
   // the parameter_count.
   for (size_t i = 0; i < std::min(arguments.size(), parameters_hints_.size());
@@ -922,7 +922,7 @@ SerializerForBackgroundCompilation::Environment::Environment(
   interpreter::Register new_target_reg =
       function.virtual_closure()
           .shared()
-          ->GetBytecodeArray()
+          ->GetBytecodeArray(isolate)
           .incoming_new_target_or_generator_register();
   if (new_target_reg.is_valid()) {
     Hints& hints = register_hints(new_target_reg);
@@ -1065,7 +1065,8 @@ SerializerForBackgroundCompilation::SerializerForBackgroundCompilation(
       osr_offset_(osr_offset),
       jump_target_environments_(zone()),
       environment_(zone()->New<Environment>(
-          zone(), CompilationSubject(closure, broker_->isolate(), zone()))),
+          zone(), broker_->isolate(),
+          CompilationSubject(closure, broker_->isolate(), zone()))),
       arguments_(zone()) {
   closure_hints_.AddConstant(closure, zone(), broker_);
   JSFunctionRef(broker, closure).Serialize();
@@ -1256,21 +1257,12 @@ Handle<FeedbackVector> SerializerForBackgroundCompilation::feedback_vector()
 
 Handle<BytecodeArray> SerializerForBackgroundCompilation::bytecode_array()
     const {
-  return handle(function().shared()->GetBytecodeArray(), broker()->isolate());
-}
-
-BytecodeAnalysis const& SerializerForBackgroundCompilation::GetBytecodeAnalysis(
-    SerializationPolicy policy) {
-  return broker()->GetBytecodeAnalysis(
-      bytecode_array(), osr_offset(),
-      flags() &
-          SerializerForBackgroundCompilationFlag::kAnalyzeEnvironmentLiveness,
-      policy);
+  return handle(function().shared()->GetBytecodeArray(broker()->isolate()),
+                broker()->isolate());
 }
 
 void SerializerForBackgroundCompilation::TraverseBytecode() {
-  BytecodeAnalysis const& bytecode_analysis =
-      GetBytecodeAnalysis(SerializationPolicy::kSerializeIfNeeded);
+  bytecode_analysis_.emplace(bytecode_array(), zone(), osr_offset(), false);
   BytecodeArrayRef(broker(), bytecode_array()).SerializeForCompilation();
 
   BytecodeArrayIterator iterator(bytecode_array());
@@ -1308,10 +1300,10 @@ void SerializerForBackgroundCompilation::TraverseBytecode() {
     try_start_matcher.HandlerOffsetForCurrentPosition(
         save_handler_environments);
 
-    if (bytecode_analysis.IsLoopHeader(current_offset)) {
+    if (bytecode_analysis().IsLoopHeader(current_offset)) {
       // Graph builder might insert jumps to resume targets in the loop body.
       LoopInfo const& loop_info =
-          bytecode_analysis.GetLoopInfoFor(current_offset);
+          bytecode_analysis().GetLoopInfoFor(current_offset);
       for (const auto& target : loop_info.resume_jump_targets()) {
         ContributeToJumpTargetEnvironment(target.target_offset());
       }
@@ -1375,11 +1367,16 @@ void SerializerForBackgroundCompilation::VisitGetTemplateObject(
       broker(), iterator->GetConstantForIndexOperand(0, broker()->isolate()));
   FeedbackSlot slot = iterator->GetSlotOperand(1);
   FeedbackSource source(feedback_vector(), slot);
-  SharedFunctionInfoRef shared(broker(), function().shared());
-  JSArrayRef template_object = shared.GetTemplateObject(
-      description, source, SerializationPolicy::kSerializeIfNeeded);
-  environment()->accumulator_hints() =
-      Hints::SingleConstant(template_object.object(), zone());
+
+  ProcessedFeedback const& feedback =
+      broker()->ProcessFeedbackForTemplateObject(source);
+  if (feedback.IsInsufficient()) {
+    environment()->accumulator_hints() = Hints();
+  } else {
+    JSArrayRef template_object = feedback.AsTemplateObject().value();
+    environment()->accumulator_hints() =
+        Hints::SingleConstant(template_object.object(), zone());
+  }
 }
 
 void SerializerForBackgroundCompilation::VisitLdaTrue(
@@ -2031,14 +2028,17 @@ void SerializerForBackgroundCompilation::ProcessCalleeForCallOrConstruct(
   Handle<SharedFunctionInfo> shared = callee.shared(broker()->isolate());
   if (shared->IsApiFunction()) {
     ProcessApiCall(shared, arguments);
-    DCHECK_NE(shared->GetInlineability(), SharedFunctionInfo::kIsInlineable);
+    DCHECK_NE(shared->GetInlineability(broker()->isolate()),
+              SharedFunctionInfo::kIsInlineable);
   } else if (shared->HasBuiltinId()) {
     ProcessBuiltinCall(shared, new_target, arguments, speculation_mode, padding,
                        result_hints);
-    DCHECK_NE(shared->GetInlineability(), SharedFunctionInfo::kIsInlineable);
+    DCHECK_NE(shared->GetInlineability(broker()->isolate()),
+              SharedFunctionInfo::kIsInlineable);
   } else if ((flags() &
               SerializerForBackgroundCompilationFlag::kEnableTurboInlining) &&
-             shared->GetInlineability() == SharedFunctionInfo::kIsInlineable &&
+             shared->GetInlineability(broker()->isolate()) ==
+                 SharedFunctionInfo::kIsInlineable &&
              callee.HasFeedbackVector()) {
     CompilationSubject subject =
         callee.ToCompilationSubject(broker()->isolate(), zone());
@@ -2777,7 +2777,7 @@ void SerializerForBackgroundCompilation::VisitSwitchOnSmiNoFeedback(
 
 void SerializerForBackgroundCompilation::VisitSwitchOnGeneratorState(
     interpreter::BytecodeArrayIterator* iterator) {
-  for (const auto& target : GetBytecodeAnalysis().resume_jump_targets()) {
+  for (const auto& target : bytecode_analysis().resume_jump_targets()) {
     ContributeToJumpTargetEnvironment(target.target_offset());
   }
 }
diff --git a/deps/v8/src/compiler/simd-scalar-lowering.cc b/deps/v8/src/compiler/simd-scalar-lowering.cc
index 36d590b1aa4667..f9bf22f8be5679 100644
--- a/deps/v8/src/compiler/simd-scalar-lowering.cc
+++ b/deps/v8/src/compiler/simd-scalar-lowering.cc
@@ -4,6 +4,7 @@
 
 #include "src/compiler/simd-scalar-lowering.h"
 
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/machine-type.h"
 #include "src/common/globals.h"
 #include "src/compiler/diamond.h"
@@ -119,7 +120,11 @@ void SimdScalarLowering::LowerGraph() {
   V(I64x2ShrU)                    \
   V(I64x2Add)                     \
   V(I64x2Sub)                     \
-  V(I64x2Mul)
+  V(I64x2Mul)                     \
+  V(I64x2ExtMulLowI32x4S)         \
+  V(I64x2ExtMulLowI32x4U)         \
+  V(I64x2ExtMulHighI32x4S)        \
+  V(I64x2ExtMulHighI32x4U)
 
 #define FOREACH_INT32X4_OPCODE(V) \
   V(I32x4Splat)                   \
@@ -167,7 +172,11 @@ void SimdScalarLowering::LowerGraph() {
   V(V16x8AllTrue)                 \
   V(V8x16AnyTrue)                 \
   V(V8x16AllTrue)                 \
-  V(I32x4BitMask)
+  V(I32x4BitMask)                 \
+  V(I32x4ExtMulLowI16x8S)         \
+  V(I32x4ExtMulLowI16x8U)         \
+  V(I32x4ExtMulHighI16x8S)        \
+  V(I32x4ExtMulHighI16x8U)
 
 #define FOREACH_FLOAT64X2_OPCODE(V) \
   V(F64x2Splat)                     \
@@ -267,7 +276,11 @@ void SimdScalarLowering::LowerGraph() {
   V(I16x8GeU)                     \
   V(I16x8RoundingAverageU)        \
   V(I16x8Abs)                     \
-  V(I16x8BitMask)
+  V(I16x8BitMask)                 \
+  V(I16x8ExtMulLowI8x16S)         \
+  V(I16x8ExtMulLowI8x16U)         \
+  V(I16x8ExtMulHighI8x16S)        \
+  V(I16x8ExtMulHighI8x16U)
 
 #define FOREACH_INT8X16_OPCODE(V) \
   V(I8x16Splat)                   \
@@ -1303,7 +1316,7 @@ void SimdScalarLowering::LowerNode(Node* node) {
         }
         case SimdType::kInt16x8: {
           int16_t val[kNumLanes16];
-          memcpy(val, params.data(), kSimd128Size);
+          base::Memcpy(val, params.data(), kSimd128Size);
           for (int i = 0; i < num_lanes; ++i) {
             rep_node[i] = mcgraph_->Int32Constant(static_cast<int32_t>(
                 base::ReadLittleEndianValue<int16_t>(&val[i])));
@@ -1312,7 +1325,7 @@ void SimdScalarLowering::LowerNode(Node* node) {
         }
         case SimdType::kInt32x4: {
           uint32_t val[kNumLanes32];
-          memcpy(val, params.data(), kSimd128Size);
+          base::Memcpy(val, params.data(), kSimd128Size);
           for (int i = 0; i < num_lanes; ++i) {
             rep_node[i] = mcgraph_->Int32Constant(
                 base::ReadLittleEndianValue<uint32_t>(&val[i]));
@@ -1321,7 +1334,7 @@ void SimdScalarLowering::LowerNode(Node* node) {
         }
         case SimdType::kInt64x2: {
           uint64_t val[kNumLanes64];
-          memcpy(val, params.data(), kSimd128Size);
+          base::Memcpy(val, params.data(), kSimd128Size);
           for (int i = 0; i < num_lanes; ++i) {
             rep_node[i] = mcgraph_->Int64Constant(
                 base::ReadLittleEndianValue<uint64_t>(&val[i]));
@@ -1330,7 +1343,7 @@ void SimdScalarLowering::LowerNode(Node* node) {
         }
         case SimdType::kFloat32x4: {
           float val[kNumLanes32];
-          memcpy(val, params.data(), kSimd128Size);
+          base::Memcpy(val, params.data(), kSimd128Size);
           for (int i = 0; i < num_lanes; ++i) {
             rep_node[i] = mcgraph_->Float32Constant(
                 base::ReadLittleEndianValue<float>(&val[i]));
@@ -1339,7 +1352,7 @@ void SimdScalarLowering::LowerNode(Node* node) {
         }
         case SimdType::kFloat64x2: {
           double val[kNumLanes64];
-          memcpy(val, params.data(), kSimd128Size);
+          base::Memcpy(val, params.data(), kSimd128Size);
           for (int i = 0; i < num_lanes; ++i) {
             rep_node[i] = mcgraph_->Float64Constant(
                 base::ReadLittleEndianValue<double>(&val[i]));
@@ -1564,6 +1577,19 @@ void SimdScalarLowering::LowerNode(Node* node) {
       }
       break;
     }
+    case IrOpcode::kLoopExitValue: {
+      if (!HasReplacement(0, node->InputAt(0))) break;
+      Node* control = node->InputAt(NodeProperties::FirstControlIndex(node));
+      Node** inputs = GetReplacementsWithType(node->InputAt(0), rep_type);
+      Node** rep_nodes = zone()->NewArray<Node*>(num_lanes);
+      for (int i = 0; i < num_lanes; i++) {
+        auto op =
+            common()->LoopExitValue(MachineTypeFrom(rep_type).representation());
+        rep_nodes[i] = graph()->NewNode(op, inputs[i], control);
+      }
+      ReplaceNode(node, rep_nodes, num_lanes);
+      break;
+    }
     case IrOpcode::kI64x2Add: {
       LowerBinaryOp(node, rep_type, machine()->Int64Add());
       break;
@@ -2126,9 +2152,6 @@ void SimdScalarLowering::LowerNode(Node* node) {
     }
     case IrOpcode::kS128Select: {
       DCHECK_EQ(3, node->InputCount());
-      DCHECK(ReplacementType(node->InputAt(0)) == SimdType::kInt32x4 ||
-             ReplacementType(node->InputAt(0)) == SimdType::kInt16x8 ||
-             ReplacementType(node->InputAt(0)) == SimdType::kInt8x16);
       Node** boolean_input =
           GetReplacementsWithType(node->InputAt(0), rep_type);
       Node** rep_left = GetReplacementsWithType(node->InputAt(1), rep_type);
@@ -2270,12 +2293,63 @@ void SimdScalarLowering::LowerNode(Node* node) {
       ReplaceNode(node, rep_node, num_lanes);
       break;
     }
+#define LOWER_EXT_MUL(OP, MULTIPLY, INPUT_TYPE, LOW, SIGNED)                 \
+  case IrOpcode::OP: {                                                       \
+    LowerExtMul(node, machine()->MULTIPLY(), rep_type, SimdType::INPUT_TYPE, \
+                LOW, SIGNED);                                                \
+    break;                                                                   \
+  }
+      LOWER_EXT_MUL(kI16x8ExtMulLowI8x16S, Int32Mul, kInt8x16, true, true)
+      LOWER_EXT_MUL(kI16x8ExtMulLowI8x16U, Int32Mul, kInt8x16, true, false)
+      LOWER_EXT_MUL(kI16x8ExtMulHighI8x16S, Int32Mul, kInt8x16, false, true)
+      LOWER_EXT_MUL(kI16x8ExtMulHighI8x16U, Int32Mul, kInt8x16, false, false)
+      LOWER_EXT_MUL(kI32x4ExtMulLowI16x8S, Int32Mul, kInt16x8, true, true)
+      LOWER_EXT_MUL(kI32x4ExtMulLowI16x8U, Int32Mul, kInt16x8, true, false)
+      LOWER_EXT_MUL(kI32x4ExtMulHighI16x8S, Int32Mul, kInt16x8, false, true)
+      LOWER_EXT_MUL(kI32x4ExtMulHighI16x8U, Int32Mul, kInt16x8, false, false)
+      LOWER_EXT_MUL(kI64x2ExtMulLowI32x4S, Int64Mul, kInt32x4, true, true)
+      LOWER_EXT_MUL(kI64x2ExtMulLowI32x4U, Int64Mul, kInt32x4, true, false)
+      LOWER_EXT_MUL(kI64x2ExtMulHighI32x4S, Int64Mul, kInt32x4, false, true)
+      LOWER_EXT_MUL(kI64x2ExtMulHighI32x4U, Int64Mul, kInt32x4, false, false)
     default: {
       DefaultLowering(node);
     }
   }
 }
 
+Node* SimdScalarLowering::ExtendNode(Node* node, SimdType rep_type,
+                                     bool is_signed) {
+  if (rep_type == SimdType::kInt8x16 && !is_signed) {
+    node = Mask(node, kMask8);
+  } else if (rep_type == SimdType::kInt16x8 && !is_signed) {
+    node = Mask(node, kMask16);
+  } else if (rep_type == SimdType::kInt32x4) {
+    if (is_signed) {
+      node = graph()->NewNode(machine()->SignExtendWord32ToInt64(), node);
+    } else {
+      node = graph()->NewNode(machine()->ChangeUint32ToUint64(), node);
+    }
+  }
+  return node;
+}
+
+void SimdScalarLowering::LowerExtMul(Node* node, const Operator* multiply,
+                                     SimdType output_type, SimdType input_type,
+                                     bool low, bool is_signed) {
+  DCHECK_EQ(2, node->InputCount());
+  int num_lanes = NumLanes(output_type);
+  Node** rep_left = GetReplacementsWithType(node->InputAt(0), input_type);
+  Node** rep_right = GetReplacementsWithType(node->InputAt(1), input_type);
+  int start_index = low ? 0 : num_lanes;
+  Node** rep_node = zone()->NewArray<Node*>(num_lanes);
+  for (int i = 0; i < num_lanes; i++) {
+    Node* left = ExtendNode(rep_left[start_index + i], input_type, is_signed);
+    Node* right = ExtendNode(rep_right[start_index + i], input_type, is_signed);
+    rep_node[i] = graph()->NewNode(multiply, left, right);
+  }
+  ReplaceNode(node, rep_node, num_lanes);
+}
+
 bool SimdScalarLowering::DefaultLowering(Node* node) {
   bool something_changed = false;
   for (int i = NodeProperties::PastValueIndex(node) - 1; i >= 0; i--) {
diff --git a/deps/v8/src/compiler/simd-scalar-lowering.h b/deps/v8/src/compiler/simd-scalar-lowering.h
index c4ba1e3019f5b9..8143f308c4e293 100644
--- a/deps/v8/src/compiler/simd-scalar-lowering.h
+++ b/deps/v8/src/compiler/simd-scalar-lowering.h
@@ -121,6 +121,14 @@ class SimdScalarLowering {
   void LowerAllTrueOp(Node* node, SimdType rep_type);
   void LowerFloatPseudoMinMax(Node* node, const Operator* op, bool is_max,
                               SimdType type);
+  void LowerExtMul(Node* node, const Operator* op, SimdType output_type,
+                   SimdType input_type, bool low, bool is_signed);
+
+  // Extends node, which is a lowered node of type rep_type, e.g. int8, int16,
+  // int32 to a 32-bit or 64-bit node. node should be a lowered node (i.e. not a
+  // SIMD node). The assumption here is that small ints are stored sign
+  // extended.
+  Node* ExtendNode(Node* node, SimdType rep_type, bool is_signed);
 
   MachineGraph* const mcgraph_;
   NodeMarker<State> state_;
diff --git a/deps/v8/src/compiler/simplified-lowering.cc b/deps/v8/src/compiler/simplified-lowering.cc
index ef56d56e447500..a61ff7bf700eb6 100644
--- a/deps/v8/src/compiler/simplified-lowering.cc
+++ b/deps/v8/src/compiler/simplified-lowering.cc
@@ -101,8 +101,6 @@ UseInfo CheckedUseInfoAsWord32FromHint(
     case NumberOperationHint::kSignedSmall:
     case NumberOperationHint::kSignedSmallInputs:
       return UseInfo::CheckedSignedSmallAsWord32(identify_zeros, feedback);
-    case NumberOperationHint::kSigned32:
-      return UseInfo::CheckedSigned32AsWord32(identify_zeros, feedback);
     case NumberOperationHint::kNumber:
       return UseInfo::CheckedNumberAsWord32(feedback);
     case NumberOperationHint::kNumberOrBoolean:
@@ -120,7 +118,6 @@ UseInfo CheckedUseInfoAsFloat64FromHint(
   switch (hint) {
     case NumberOperationHint::kSignedSmall:
     case NumberOperationHint::kSignedSmallInputs:
-    case NumberOperationHint::kSigned32:
       // Not used currently.
       UNREACHABLE();
     case NumberOperationHint::kNumber:
@@ -1447,8 +1444,7 @@ class RepresentationSelector {
 
     // Try to use type feedback.
     NumberOperationHint hint = NumberOperationHintOf(node->op());
-    DCHECK(hint == NumberOperationHint::kSignedSmall ||
-           hint == NumberOperationHint::kSigned32);
+    DCHECK_EQ(hint, NumberOperationHint::kSignedSmall);
 
     Type left_feedback_type = TypeOf(node->InputAt(0));
     Type right_feedback_type = TypeOf(node->InputAt(1));
@@ -1559,8 +1555,7 @@ class RepresentationSelector {
     // Handle the case when no uint32 checks on inputs are necessary
     // (but an overflow check is needed on the output).
     if (BothInputsAreUnsigned32(node)) {
-      if (hint == NumberOperationHint::kSignedSmall ||
-          hint == NumberOperationHint::kSigned32) {
+      if (hint == NumberOperationHint::kSignedSmall) {
         VisitBinop<T>(node, UseInfo::TruncatingWord32(),
                       MachineRepresentation::kWord32, Type::Unsigned32());
         if (lower<T>()) ChangeToUint32OverflowOp(node);
@@ -1572,8 +1567,7 @@ class RepresentationSelector {
     // (but an overflow check is needed on the output).
     if (BothInputsAre(node, Type::Signed32())) {
       // If both the inputs the feedback are int32, use the overflow op.
-      if (hint == NumberOperationHint::kSignedSmall ||
-          hint == NumberOperationHint::kSigned32) {
+      if (hint == NumberOperationHint::kSignedSmall) {
         VisitBinop<T>(node, UseInfo::TruncatingWord32(),
                       MachineRepresentation::kWord32, Type::Signed32());
         if (lower<T>()) ChangeToInt32OverflowOp(node);
@@ -1581,8 +1575,7 @@ class RepresentationSelector {
       }
     }
 
-    if (hint == NumberOperationHint::kSignedSmall ||
-        hint == NumberOperationHint::kSigned32) {
+    if (hint == NumberOperationHint::kSignedSmall) {
       // If the result is truncated, we only need to check the inputs.
       // For the left hand side we just propagate the identify zeros
       // mode of the {truncation}; and for modulus the sign of the
@@ -2057,7 +2050,6 @@ class RepresentationSelector {
         // Try to use type feedback.
         NumberOperationHint hint = NumberOperationHintOf(node->op());
         switch (hint) {
-          case NumberOperationHint::kSigned32:
           case NumberOperationHint::kSignedSmall:
             if (propagate<T>()) {
               VisitBinop<T>(node,
@@ -2160,8 +2152,7 @@ class RepresentationSelector {
         // (but an overflow check is needed on the output).
         if (BothInputsAre(node, Type::Signed32())) {
           // If both inputs and feedback are int32, use the overflow op.
-          if (hint == NumberOperationHint::kSignedSmall ||
-              hint == NumberOperationHint::kSigned32) {
+          if (hint == NumberOperationHint::kSignedSmall) {
             VisitBinop<T>(node, UseInfo::TruncatingWord32(),
                           MachineRepresentation::kWord32, Type::Signed32());
             if (lower<T>()) {
@@ -2172,8 +2163,7 @@ class RepresentationSelector {
           }
         }
 
-        if (hint == NumberOperationHint::kSignedSmall ||
-            hint == NumberOperationHint::kSigned32) {
+        if (hint == NumberOperationHint::kSignedSmall) {
           VisitBinop<T>(node, CheckedUseInfoAsWord32FromHint(hint),
                         MachineRepresentation::kWord32, Type::Signed32());
           if (lower<T>()) {
@@ -2239,8 +2229,7 @@ class RepresentationSelector {
         // Handle the case when no uint32 checks on inputs are necessary
         // (but an overflow check is needed on the output).
         if (BothInputsAreUnsigned32(node)) {
-          if (hint == NumberOperationHint::kSignedSmall ||
-              hint == NumberOperationHint::kSigned32) {
+          if (hint == NumberOperationHint::kSignedSmall) {
             VisitBinop<T>(node, UseInfo::TruncatingWord32(),
                           MachineRepresentation::kWord32, Type::Unsigned32());
             if (lower<T>()) ChangeToUint32OverflowOp(node);
@@ -2252,8 +2241,7 @@ class RepresentationSelector {
         // (but an overflow check is needed on the output).
         if (BothInputsAreSigned32(node)) {
           // If both the inputs the feedback are int32, use the overflow op.
-          if (hint == NumberOperationHint::kSignedSmall ||
-              hint == NumberOperationHint::kSigned32) {
+          if (hint == NumberOperationHint::kSignedSmall) {
             VisitBinop<T>(node, UseInfo::TruncatingWord32(),
                           MachineRepresentation::kWord32, Type::Signed32());
             if (lower<T>()) ChangeToInt32OverflowOp(node);
@@ -2261,8 +2249,7 @@ class RepresentationSelector {
           }
         }
 
-        if (hint == NumberOperationHint::kSigned32 ||
-            hint == NumberOperationHint::kSignedSmall ||
+        if (hint == NumberOperationHint::kSignedSmall ||
             hint == NumberOperationHint::kSignedSmallInputs) {
           // If the result is truncated, we only need to check the inputs.
           if (truncation.IsUsedAsWord32()) {
@@ -2442,8 +2429,7 @@ class RepresentationSelector {
         NumberOperationHint hint = NumberOperationHintOf(node->op());
         Type rhs_type = GetUpperBound(node->InputAt(1));
         if (rhs_type.Is(type_cache_->kZeroish) &&
-            (hint == NumberOperationHint::kSignedSmall ||
-             hint == NumberOperationHint::kSigned32) &&
+            hint == NumberOperationHint::kSignedSmall &&
             !truncation.IsUsedAsWord32()) {
           // The SignedSmall or Signed32 feedback means that the results that we
           // have seen so far were of type Unsigned31.  We speculate that this
@@ -3330,7 +3316,6 @@ class RepresentationSelector {
         NumberOperationParameters const& p =
             NumberOperationParametersOf(node->op());
         switch (p.hint()) {
-          case NumberOperationHint::kSigned32:
           case NumberOperationHint::kSignedSmall:
           case NumberOperationHint::kSignedSmallInputs:
             VisitUnop<T>(node,
diff --git a/deps/v8/src/compiler/simplified-operator-reducer.cc b/deps/v8/src/compiler/simplified-operator-reducer.cc
index d2591b5502a3c3..b1d3f8b2f3a544 100644
--- a/deps/v8/src/compiler/simplified-operator-reducer.cc
+++ b/deps/v8/src/compiler/simplified-operator-reducer.cc
@@ -41,7 +41,7 @@ SimplifiedOperatorReducer::~SimplifiedOperatorReducer() = default;
 
 
 Reduction SimplifiedOperatorReducer::Reduce(Node* node) {
-  DisallowHeapAccess no_heap_access;
+  DisallowHeapAccessIf no_heap_access(!FLAG_turbo_direct_heap_access);
   switch (node->opcode()) {
     case IrOpcode::kBooleanNot: {
       HeapObjectMatcher m(node->InputAt(0));
diff --git a/deps/v8/src/compiler/simplified-operator.cc b/deps/v8/src/compiler/simplified-operator.cc
index db6d8257b1195c..582a74db699c3f 100644
--- a/deps/v8/src/compiler/simplified-operator.cc
+++ b/deps/v8/src/compiler/simplified-operator.cc
@@ -561,8 +561,6 @@ std::ostream& operator<<(std::ostream& os, NumberOperationHint hint) {
       return os << "SignedSmall";
     case NumberOperationHint::kSignedSmallInputs:
       return os << "SignedSmallInputs";
-    case NumberOperationHint::kSigned32:
-      return os << "Signed32";
     case NumberOperationHint::kNumber:
       return os << "Number";
     case NumberOperationHint::kNumberOrBoolean:
@@ -1188,7 +1186,6 @@ struct SimplifiedOperatorGlobalCache final {
       k##Name##SignedSmallOperator;                                         \
   Name##Operator<NumberOperationHint::kSignedSmallInputs>                   \
       k##Name##SignedSmallInputsOperator;                                   \
-  Name##Operator<NumberOperationHint::kSigned32> k##Name##Signed32Operator; \
   Name##Operator<NumberOperationHint::kNumber> k##Name##NumberOperator;     \
   Name##Operator<NumberOperationHint::kNumberOrOddball>                     \
       k##Name##NumberOrOddballOperator;
@@ -1209,8 +1206,6 @@ struct SimplifiedOperatorGlobalCache final {
   };
   SpeculativeToNumberOperator<NumberOperationHint::kSignedSmall>
       kSpeculativeToNumberSignedSmallOperator;
-  SpeculativeToNumberOperator<NumberOperationHint::kSigned32>
-      kSpeculativeToNumberSigned32Operator;
   SpeculativeToNumberOperator<NumberOperationHint::kNumber>
       kSpeculativeToNumberNumberOperator;
   SpeculativeToNumberOperator<NumberOperationHint::kNumberOrOddball>
@@ -1595,8 +1590,6 @@ const Operator* SimplifiedOperatorBuilder::SpeculativeToNumber(
         return &cache_.kSpeculativeToNumberSignedSmallOperator;
       case NumberOperationHint::kSignedSmallInputs:
         break;
-      case NumberOperationHint::kSigned32:
-        return &cache_.kSpeculativeToNumberSigned32Operator;
       case NumberOperationHint::kNumber:
         return &cache_.kSpeculativeToNumberNumberOperator;
       case NumberOperationHint::kNumberOrBoolean:
@@ -1837,8 +1830,6 @@ const Operator* SimplifiedOperatorBuilder::AllocateRaw(
         return &cache_.k##Name##SignedSmallOperator;                          \
       case NumberOperationHint::kSignedSmallInputs:                           \
         return &cache_.k##Name##SignedSmallInputsOperator;                    \
-      case NumberOperationHint::kSigned32:                                    \
-        return &cache_.k##Name##Signed32Operator;                             \
       case NumberOperationHint::kNumber:                                      \
         return &cache_.k##Name##NumberOperator;                               \
       case NumberOperationHint::kNumberOrBoolean:                             \
@@ -1861,8 +1852,6 @@ const Operator* SimplifiedOperatorBuilder::SpeculativeNumberEqual(
       return &cache_.kSpeculativeNumberEqualSignedSmallOperator;
     case NumberOperationHint::kSignedSmallInputs:
       return &cache_.kSpeculativeNumberEqualSignedSmallInputsOperator;
-    case NumberOperationHint::kSigned32:
-      return &cache_.kSpeculativeNumberEqualSigned32Operator;
     case NumberOperationHint::kNumber:
       return &cache_.kSpeculativeNumberEqualNumberOperator;
     case NumberOperationHint::kNumberOrBoolean:
diff --git a/deps/v8/src/compiler/simplified-operator.h b/deps/v8/src/compiler/simplified-operator.h
index e130674c91b406..815243c0aebe73 100644
--- a/deps/v8/src/compiler/simplified-operator.h
+++ b/deps/v8/src/compiler/simplified-operator.h
@@ -559,7 +559,6 @@ Type ValueTypeParameterOf(const Operator* op) V8_WARN_UNUSED_RESULT;
 enum class NumberOperationHint : uint8_t {
   kSignedSmall,        // Inputs were Smi, output was in Smi.
   kSignedSmallInputs,  // Inputs were Smi, output was Number.
-  kSigned32,           // Inputs were Signed32, output was Number.
   kNumber,             // Inputs were Number, output was Number.
   kNumberOrBoolean,    // Inputs were Number or Boolean, output was Number.
   kNumberOrOddball,    // Inputs were Number or Oddball, output was Number.
diff --git a/deps/v8/src/compiler/state-values-utils.cc b/deps/v8/src/compiler/state-values-utils.cc
index ed2a70110a59b0..d38d7f3ddf7b59 100644
--- a/deps/v8/src/compiler/state-values-utils.cc
+++ b/deps/v8/src/compiler/state-values-utils.cc
@@ -379,7 +379,10 @@ void StateValuesAccess::iterator::EnsureValid() {
   }
 }
 
-Node* StateValuesAccess::iterator::node() { return Top()->Get(nullptr); }
+Node* StateValuesAccess::iterator::node() {
+  DCHECK(!done());
+  return Top()->Get(nullptr);
+}
 
 MachineType StateValuesAccess::iterator::type() {
   Node* parent = Top()->parent();
@@ -401,6 +404,7 @@ bool StateValuesAccess::iterator::operator!=(iterator const& other) const {
 }
 
 StateValuesAccess::iterator& StateValuesAccess::iterator::operator++() {
+  DCHECK(!done());
   Advance();
   return *this;
 }
diff --git a/deps/v8/src/compiler/type-narrowing-reducer.cc b/deps/v8/src/compiler/type-narrowing-reducer.cc
index 723293dfb86f56..b24e82c53b876b 100644
--- a/deps/v8/src/compiler/type-narrowing-reducer.cc
+++ b/deps/v8/src/compiler/type-narrowing-reducer.cc
@@ -17,7 +17,7 @@ TypeNarrowingReducer::TypeNarrowingReducer(Editor* editor, JSGraph* jsgraph,
 TypeNarrowingReducer::~TypeNarrowingReducer() = default;
 
 Reduction TypeNarrowingReducer::Reduce(Node* node) {
-  DisallowHeapAccess no_heap_access;
+  DisallowHeapAccessIf no_heap_access(!FLAG_turbo_direct_heap_access);
 
   Type new_type = Type::Any();
 
diff --git a/deps/v8/src/compiler/typed-optimization.cc b/deps/v8/src/compiler/typed-optimization.cc
index 6905f4e36db313..d5bc845f7c501d 100644
--- a/deps/v8/src/compiler/typed-optimization.cc
+++ b/deps/v8/src/compiler/typed-optimization.cc
@@ -34,7 +34,7 @@ TypedOptimization::TypedOptimization(Editor* editor,
 TypedOptimization::~TypedOptimization() = default;
 
 Reduction TypedOptimization::Reduce(Node* node) {
-  DisallowHeapAccess no_heap_access;
+  DisallowHeapAccessIf no_heap_access(!FLAG_turbo_direct_heap_access);
   switch (node->opcode()) {
     case IrOpcode::kConvertReceiver:
       return ReduceConvertReceiver(node);
@@ -432,7 +432,7 @@ Reduction TypedOptimization::
         Node* comparison, const StringRef& string, bool inverted) {
   switch (comparison->opcode()) {
     case IrOpcode::kStringEqual:
-      if (string.length() != 1) {
+      if (string.length().has_value() && string.length().value() != 1) {
         // String.fromCharCode(x) always has length 1.
         return Replace(jsgraph()->BooleanConstant(false));
       }
@@ -440,7 +440,7 @@ Reduction TypedOptimization::
     case IrOpcode::kStringLessThan:
       V8_FALLTHROUGH;
     case IrOpcode::kStringLessThanOrEqual:
-      if (string.length() == 0) {
+      if (string.length().has_value() && string.length().value() == 0) {
         // String.fromCharCode(x) <= "" is always false,
         // "" < String.fromCharCode(x) is always true.
         return Replace(jsgraph()->BooleanConstant(inverted));
@@ -482,12 +482,13 @@ TypedOptimization::TryReduceStringComparisonOfStringFromSingleCharCode(
         simplified()->NumberBitwiseAnd(), from_char_code_repl,
         jsgraph()->Constant(std::numeric_limits<uint16_t>::max()));
   }
-  Node* constant_repl = jsgraph()->Constant(string.GetFirstChar());
+  if (!string.GetFirstChar().has_value()) return NoChange();
+  Node* constant_repl = jsgraph()->Constant(string.GetFirstChar().value());
 
   Node* number_comparison = nullptr;
   if (inverted) {
     // "x..." <= String.fromCharCode(z) is true if x < z.
-    if (string.length() > 1 &&
+    if (string.length().has_value() && string.length().value() > 1 &&
         comparison->opcode() == IrOpcode::kStringLessThanOrEqual) {
       comparison_op = simplified()->NumberLessThan();
     }
@@ -495,7 +496,7 @@ TypedOptimization::TryReduceStringComparisonOfStringFromSingleCharCode(
         graph()->NewNode(comparison_op, constant_repl, from_char_code_repl);
   } else {
     // String.fromCharCode(z) < "x..." is true if z <= x.
-    if (string.length() > 1 &&
+    if (string.length().has_value() && string.length().value() > 1 &&
         comparison->opcode() == IrOpcode::kStringLessThan) {
       comparison_op = simplified()->NumberLessThanOrEqual();
     }
@@ -557,9 +558,11 @@ Reduction TypedOptimization::ReduceStringLength(Node* node) {
       // Constant-fold the String::length of the {input}.
       HeapObjectMatcher m(input);
       if (m.Ref(broker()).IsString()) {
-        uint32_t const length = m.Ref(broker()).AsString().length();
-        Node* value = jsgraph()->Constant(length);
-        return Replace(value);
+        if (m.Ref(broker()).AsString().length().has_value()) {
+          uint32_t const length = m.Ref(broker()).AsString().length().value();
+          Node* value = jsgraph()->Constant(length);
+          return Replace(value);
+        }
       }
       break;
     }
diff --git a/deps/v8/src/compiler/typer.cc b/deps/v8/src/compiler/typer.cc
index 831263554a0512..1e4acdc33563c1 100644
--- a/deps/v8/src/compiler/typer.cc
+++ b/deps/v8/src/compiler/typer.cc
@@ -115,6 +115,7 @@ class Typer::Visitor : public Reducer {
       DECLARE_IMPOSSIBLE_CASE(Deoptimize)
       DECLARE_IMPOSSIBLE_CASE(DeoptimizeIf)
       DECLARE_IMPOSSIBLE_CASE(DeoptimizeUnless)
+      DECLARE_IMPOSSIBLE_CASE(DynamicCheckMapsWithDeoptUnless)
       DECLARE_IMPOSSIBLE_CASE(TrapIf)
       DECLARE_IMPOSSIBLE_CASE(TrapUnless)
       DECLARE_IMPOSSIBLE_CASE(Return)
diff --git a/deps/v8/src/compiler/types.cc b/deps/v8/src/compiler/types.cc
index 3594dd9cad12b0..7912b09ac0c219 100644
--- a/deps/v8/src/compiler/types.cc
+++ b/deps/v8/src/compiler/types.cc
@@ -21,7 +21,7 @@ namespace compiler {
 bool RangeType::Limits::IsEmpty() { return this->min > this->max; }
 
 RangeType::Limits RangeType::Limits::Intersect(Limits lhs, Limits rhs) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   Limits result(lhs);
   if (lhs.min < rhs.min) result.min = rhs.min;
   if (lhs.max > rhs.max) result.max = rhs.max;
@@ -29,7 +29,7 @@ RangeType::Limits RangeType::Limits::Intersect(Limits lhs, Limits rhs) {
 }
 
 RangeType::Limits RangeType::Limits::Union(Limits lhs, Limits rhs) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (lhs.IsEmpty()) return rhs;
   if (rhs.IsEmpty()) return lhs;
   Limits result(lhs);
@@ -39,14 +39,14 @@ RangeType::Limits RangeType::Limits::Union(Limits lhs, Limits rhs) {
 }
 
 bool Type::Overlap(const RangeType* lhs, const RangeType* rhs) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   return !RangeType::Limits::Intersect(RangeType::Limits(lhs),
                                        RangeType::Limits(rhs))
               .IsEmpty();
 }
 
 bool Type::Contains(const RangeType* lhs, const RangeType* rhs) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   return lhs->Min() <= rhs->Min() && rhs->Max() <= lhs->Max();
 }
 
@@ -94,7 +94,7 @@ double Type::Max() const {
 
 // The largest bitset subsumed by this type.
 Type::bitset Type::BitsetGlb() const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // Fast case.
   if (IsBitset()) {
     return AsBitset();
@@ -112,7 +112,7 @@ Type::bitset Type::BitsetGlb() const {
 
 // The smallest bitset subsuming this type, possibly not a proper one.
 Type::bitset Type::BitsetLub() const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (IsBitset()) return AsBitset();
   if (IsUnion()) {
     // Take the representation from the first element, which is always
@@ -153,8 +153,6 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) {
       return kString;
     case EXTERNAL_INTERNALIZED_STRING_TYPE:
     case EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
-    case UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE:
-    case UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
     case INTERNALIZED_STRING_TYPE:
     case ONE_BYTE_INTERNALIZED_STRING_TYPE:
       return kInternalizedString;
@@ -182,13 +180,23 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) {
       UNREACHABLE();
     case HEAP_NUMBER_TYPE:
       return kNumber;
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
     case JS_OBJECT_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
     case JS_ARGUMENTS_OBJECT_TYPE:
     case JS_ERROR_TYPE:
     case JS_GLOBAL_OBJECT_TYPE:
     case JS_GLOBAL_PROXY_TYPE:
     case JS_API_OBJECT_TYPE:
     case JS_SPECIAL_API_OBJECT_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
       if (map.is_undetectable()) {
         // Currently we assume that every undetectable receiver is also
         // callable, which is what we need to support document.all.  We
@@ -339,7 +347,7 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) {
 template Type::bitset BitsetType::Lub<MapRef>(const MapRef& map);
 
 Type::bitset BitsetType::Lub(double value) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (IsMinusZero(value)) return kMinusZero;
   if (std::isnan(value)) return kNaN;
   if (IsUint32Double(value) || IsInt32Double(value)) return Lub(value, value);
@@ -366,7 +374,7 @@ size_t BitsetType::BoundariesSize() {
 
 Type::bitset BitsetType::ExpandInternals(Type::bitset bits) {
   DCHECK_IMPLIES(bits & kOtherString, (bits & kString) == kString);
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (!(bits & kPlainNumber)) return bits;  // Shortcut.
   const Boundary* boundaries = Boundaries();
   for (size_t i = 0; i < BoundariesSize(); ++i) {
@@ -377,7 +385,7 @@ Type::bitset BitsetType::ExpandInternals(Type::bitset bits) {
 }
 
 Type::bitset BitsetType::Lub(double min, double max) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int lub = kNone;
   const Boundary* mins = Boundaries();
 
@@ -393,7 +401,7 @@ Type::bitset BitsetType::Lub(double min, double max) {
 Type::bitset BitsetType::NumberBits(bitset bits) { return bits & kPlainNumber; }
 
 Type::bitset BitsetType::Glb(double min, double max) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int glb = kNone;
   const Boundary* mins = Boundaries();
 
@@ -412,7 +420,7 @@ Type::bitset BitsetType::Glb(double min, double max) {
 }
 
 double BitsetType::Min(bitset bits) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DCHECK(Is(bits, kNumber));
   DCHECK(!Is(bits, kNaN));
   const Boundary* mins = Boundaries();
@@ -427,7 +435,7 @@ double BitsetType::Min(bitset bits) {
 }
 
 double BitsetType::Max(bitset bits) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DCHECK(Is(bits, kNumber));
   DCHECK(!Is(bits, kNaN));
   const Boundary* mins = Boundaries();
@@ -463,7 +471,7 @@ Handle<HeapObject> HeapConstantType::Value() const {
 // Predicates.
 
 bool Type::SimplyEquals(Type that) const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (this->IsHeapConstant()) {
     return that.IsHeapConstant() &&
            this->AsHeapConstant()->Value().address() ==
@@ -494,7 +502,7 @@ bool Type::SimplyEquals(Type that) const {
 
 // Check if [this] <= [that].
 bool Type::SlowIs(Type that) const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   // Fast bitset cases
   if (that.IsBitset()) {
@@ -532,7 +540,7 @@ bool Type::SlowIs(Type that) const {
 
 // Check if [this] and [that] overlap.
 bool Type::Maybe(Type that) const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   if (BitsetType::IsNone(this->BitsetLub() & that.BitsetLub())) return false;
 
@@ -579,7 +587,7 @@ bool Type::Maybe(Type that) const {
 
 // Return the range in [this], or [nullptr].
 Type Type::GetRange() const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (this->IsRange()) return *this;
   if (this->IsUnion() && this->AsUnion()->Get(1).IsRange()) {
     return this->AsUnion()->Get(1);
@@ -588,7 +596,7 @@ Type Type::GetRange() const {
 }
 
 bool UnionType::Wellformed() const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // This checks the invariants of the union representation:
   // 1. There are at least two elements.
   // 2. The first element is a bitset, no other element is a bitset.
@@ -915,7 +923,7 @@ Type Type::NormalizeUnion(UnionType* unioned, int size, Zone* zone) {
 }
 
 int Type::NumConstants() const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (this->IsHeapConstant() || this->IsOtherNumberConstant()) {
     return 1;
   } else if (this->IsUnion()) {
@@ -948,7 +956,7 @@ const char* BitsetType::Name(bitset bits) {
 
 void BitsetType::Print(std::ostream& os,  // NOLINT
                        bitset bits) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   const char* name = Name(bits);
   if (name != nullptr) {
     os << name;
@@ -980,7 +988,7 @@ void BitsetType::Print(std::ostream& os,  // NOLINT
 }
 
 void Type::PrintTo(std::ostream& os) const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (this->IsBitset()) {
     BitsetType::Print(os, this->AsBitset());
   } else if (this->IsHeapConstant()) {
diff --git a/deps/v8/src/compiler/verifier.cc b/deps/v8/src/compiler/verifier.cc
index b137e6711d7d8f..0960d349170f20 100644
--- a/deps/v8/src/compiler/verifier.cc
+++ b/deps/v8/src/compiler/verifier.cc
@@ -355,6 +355,7 @@ void Verifier::Visitor::Check(Node* node, const AllNodes& all) {
       break;
     case IrOpcode::kDeoptimizeIf:
     case IrOpcode::kDeoptimizeUnless:
+    case IrOpcode::kDynamicCheckMapsWithDeoptUnless:
       CheckNotTyped(node);
       break;
     case IrOpcode::kTrapIf:
diff --git a/deps/v8/src/compiler/wasm-compiler.cc b/deps/v8/src/compiler/wasm-compiler.cc
index d6b7113b2769da..3b72da176e6bb1 100644
--- a/deps/v8/src/compiler/wasm-compiler.cc
+++ b/deps/v8/src/compiler/wasm-compiler.cc
@@ -9,6 +9,7 @@
 #include "src/base/optional.h"
 #include "src/base/platform/elapsed-timer.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/base/small-vector.h"
 #include "src/base/v8-fallthrough.h"
 #include "src/codegen/assembler-inl.h"
@@ -179,6 +180,185 @@ class WasmGraphAssembler : public GraphAssembler {
  public:
   WasmGraphAssembler(MachineGraph* mcgraph, Zone* zone)
       : GraphAssembler(mcgraph, zone) {}
+
+  // Helper functions for dealing with HeapObjects.
+  // Rule of thumb: if access to a given field in an object is required in
+  // at least two places, put a helper function here.
+
+  Node* IsI31(Node* object) {
+    if (COMPRESS_POINTERS_BOOL) {
+      return Word32Equal(Word32And(object, Int32Constant(kSmiTagMask)),
+                         Int32Constant(kSmiTag));
+    } else {
+      return WordEqual(WordAnd(object, IntPtrConstant(kSmiTagMask)),
+                       IntPtrConstant(kSmiTag));
+    }
+  }
+
+  // Maps and their contents.
+
+  Node* LoadMap(Node* heap_object) {
+    return Load(MachineType::TaggedPointer(), heap_object,
+                wasm::ObjectAccess::ToTagged(HeapObject::kMapOffset));
+  }
+  Node* LoadInstanceType(Node* map) {
+    return Load(MachineType::Uint16(), map,
+                wasm::ObjectAccess::ToTagged(Map::kInstanceTypeOffset));
+  }
+  Node* LoadWasmTypeInfo(Node* map) {
+    int offset = Map::kConstructorOrBackPointerOrNativeContextOffset;
+    return Load(MachineType::TaggedPointer(), map,
+                wasm::ObjectAccess::ToTagged(offset));
+  }
+
+  Node* LoadSupertypes(Node* wasm_type_info) {
+    return Load(MachineType::TaggedPointer(), wasm_type_info,
+                wasm::ObjectAccess::ToTagged(WasmTypeInfo::kSupertypesOffset));
+  }
+
+  // FixedArrays.
+
+  Node* LoadFixedArrayLengthAsSmi(Node* fixed_array) {
+    return Load(MachineType::TaggedSigned(), fixed_array,
+                wasm::ObjectAccess::ToTagged(FixedArray::kLengthOffset));
+  }
+  Node* LoadFixedArrayElement(Node* fixed_array, int index,
+                              MachineType type = MachineType::AnyTagged()) {
+    return Load(type, fixed_array,
+                wasm::ObjectAccess::ElementOffsetInTaggedFixedArray(index));
+  }
+  Node* LoadFixedArrayElement(Node* fixed_array, Node* index_intptr,
+                              MachineType type = MachineType::AnyTagged()) {
+    Node* offset = IntAdd(
+        IntMul(index_intptr, IntPtrConstant(kTaggedSize)),
+        IntPtrConstant(wasm::ObjectAccess::ToTagged(FixedArray::kHeaderSize)));
+    return Load(type, fixed_array, offset);
+  }
+
+  // Functions, SharedFunctionInfos, FunctionData.
+
+  Node* LoadSharedFunctionInfo(Node* js_function) {
+    return Load(
+        MachineType::TaggedPointer(), js_function,
+        wasm::ObjectAccess::SharedFunctionInfoOffsetInTaggedJSFunction());
+  }
+  Node* LoadContextFromJSFunction(Node* js_function) {
+    return Load(MachineType::TaggedPointer(), js_function,
+                wasm::ObjectAccess::ContextOffsetInTaggedJSFunction());
+  }
+
+  Node* LoadFunctionDataFromJSFunction(Node* js_function) {
+    Node* shared = LoadSharedFunctionInfo(js_function);
+    return Load(
+        MachineType::TaggedPointer(), shared,
+        wasm::ObjectAccess::ToTagged(SharedFunctionInfo::kFunctionDataOffset));
+  }
+
+  Node* LoadExportedFunctionIndexAsSmi(Node* exported_function_data) {
+    return Load(MachineType::TaggedSigned(), exported_function_data,
+                wasm::ObjectAccess::ToTagged(
+                    WasmExportedFunctionData::kFunctionIndexOffset));
+  }
+  Node* LoadExportedFunctionInstance(Node* exported_function_data) {
+    return Load(MachineType::TaggedPointer(), exported_function_data,
+                wasm::ObjectAccess::ToTagged(
+                    WasmExportedFunctionData::kInstanceOffset));
+  }
+
+  // JavaScript objects.
+
+  Node* LoadJSArrayElements(Node* js_array) {
+    return Load(MachineType::AnyTagged(), js_array,
+                wasm::ObjectAccess::ToTagged(JSObject::kElementsOffset));
+  }
+
+  // WasmGC objects.
+
+  MachineType FieldType(const wasm::StructType* type, uint32_t field_index,
+                        bool is_signed) {
+    return MachineType::TypeForRepresentation(
+        type->field(field_index).machine_representation(), is_signed);
+  }
+
+  Node* FieldOffset(const wasm::StructType* type, uint32_t field_index) {
+    return IntPtrConstant(wasm::ObjectAccess::ToTagged(
+        WasmStruct::kHeaderSize + type->field_offset(field_index)));
+  }
+
+  // It's guaranteed that struct/array fields are aligned to min(field_size,
+  // kTaggedSize), with the latter being 4 or 8 depending on platform and
+  // pointer compression. So on our most common configurations, 8-byte types
+  // must use unaligned loads/stores.
+  Node* LoadWithTaggedAlignment(MachineType type, Node* base, Node* offset) {
+    if (ElementSizeInBytes(type.representation()) > kTaggedSize) {
+      return LoadUnaligned(type, base, offset);
+    } else {
+      return Load(type, base, offset);
+    }
+  }
+
+  // Same alignment considerations as above.
+  Node* StoreWithTaggedAlignment(Node* base, Node* offset, Node* value,
+                                 wasm::ValueType type) {
+    MachineRepresentation rep = type.machine_representation();
+    if (ElementSizeInBytes(rep) > kTaggedSize) {
+      return StoreUnaligned(rep, base, offset, value);
+    } else {
+      WriteBarrierKind write_barrier =
+          type.is_reference_type() ? kPointerWriteBarrier : kNoWriteBarrier;
+      StoreRepresentation store_rep(rep, write_barrier);
+      return Store(store_rep, base, offset, value);
+    }
+  }
+
+  Node* StoreStructField(Node* struct_object, const wasm::StructType* type,
+                         uint32_t field_index, Node* value) {
+    return StoreWithTaggedAlignment(struct_object,
+                                    FieldOffset(type, field_index), value,
+                                    type->field(field_index));
+  }
+
+  Node* WasmArrayElementOffset(Node* index, wasm::ValueType element_type) {
+    return Int32Add(
+        Int32Constant(wasm::ObjectAccess::ToTagged(WasmArray::kHeaderSize)),
+        Int32Mul(index, Int32Constant(element_type.element_size_bytes())));
+  }
+
+  Node* LoadWasmArrayLength(Node* array) {
+    return Load(MachineType::Uint32(), array,
+                wasm::ObjectAccess::ToTagged(WasmArray::kLengthOffset));
+  }
+
+  Node* IsDataRefMap(Node* map) {
+    Node* instance_type = LoadInstanceType(map);
+    // We're going to test a range of instance types with a single unsigned
+    // comparison. Statically assert that this is safe, i.e. that there are
+    // no instance types between array and struct types that might possibly
+    // occur (i.e. internal types are OK, types of Wasm objects are not).
+    // At the time of this writing:
+    // WASM_ARRAY_TYPE = 180
+    // WASM_CAPI_FUNCTION_DATA_TYPE = 181
+    // WASM_STRUCT_TYPE = 182
+    // The specific values don't matter; the relative order does.
+    static_assert(
+        WASM_STRUCT_TYPE == static_cast<InstanceType>(WASM_ARRAY_TYPE + 2),
+        "Relying on specific InstanceType values here");
+    static_assert(WASM_CAPI_FUNCTION_DATA_TYPE ==
+                      static_cast<InstanceType>(WASM_ARRAY_TYPE + 1),
+                  "Relying on specific InstanceType values here");
+    Node* comparison_value =
+        Int32Sub(instance_type, Int32Constant(WASM_ARRAY_TYPE));
+    return Uint32LessThanOrEqual(
+        comparison_value, Int32Constant(WASM_STRUCT_TYPE - WASM_ARRAY_TYPE));
+  }
+
+  // Generic HeapObject helpers.
+
+  Node* HasInstanceType(Node* heap_object, InstanceType type) {
+    Node* map = LoadMap(heap_object);
+    Node* instance_type = LoadInstanceType(map);
+    return Word32Equal(instance_type, Int32Constant(type));
+  }
 };
 
 WasmGraphBuilder::WasmGraphBuilder(
@@ -201,8 +381,6 @@ WasmGraphBuilder::WasmGraphBuilder(
 // available.
 WasmGraphBuilder::~WasmGraphBuilder() = default;
 
-Node* WasmGraphBuilder::Error() { return mcgraph()->Dead(); }
-
 Node* WasmGraphBuilder::Start(unsigned params) {
   Node* start = graph()->NewNode(mcgraph()->common()->Start(params));
   graph()->SetStart(start);
@@ -225,6 +403,23 @@ Node* WasmGraphBuilder::TerminateLoop(Node* effect, Node* control) {
   return terminate;
 }
 
+Node* WasmGraphBuilder::LoopExit(Node* loop_node) {
+  DCHECK(loop_node->opcode() == IrOpcode::kLoop);
+  Node* loop_exit =
+      graph()->NewNode(mcgraph()->common()->LoopExit(), control(), loop_node);
+  Node* loop_exit_effect = graph()->NewNode(
+      mcgraph()->common()->LoopExitEffect(), effect(), loop_exit);
+  SetEffectControl(loop_exit_effect, loop_exit);
+  return loop_exit;
+}
+
+Node* WasmGraphBuilder::LoopExitValue(Node* value,
+                                      MachineRepresentation representation) {
+  DCHECK(control()->opcode() == IrOpcode::kLoopExit);
+  return graph()->NewNode(mcgraph()->common()->LoopExitValue(representation),
+                          value, control());
+}
+
 Node* WasmGraphBuilder::TerminateThrow(Node* effect, Node* control) {
   Node* terminate =
       graph()->NewNode(mcgraph()->common()->Throw(), effect, control);
@@ -273,6 +468,7 @@ Node* WasmGraphBuilder::Merge(unsigned count, Node** controls) {
 Node* WasmGraphBuilder::Phi(wasm::ValueType type, unsigned count,
                             Node** vals_and_control) {
   DCHECK(IrOpcode::IsMergeOpcode(vals_and_control[count]->opcode()));
+  DCHECK_EQ(vals_and_control[count]->op()->ControlInputCount(), count);
   return graph()->NewNode(
       mcgraph()->common()->Phi(type.machine_representation(), count), count + 1,
       vals_and_control);
@@ -336,10 +532,8 @@ void WasmGraphBuilder::StackCheck(wasm::WasmCodePosition position) {
     return;
   }
 
-  Node* limit_address = graph()->NewNode(
-      mcgraph()->machine()->Load(MachineType::Pointer()), instance_node_.get(),
-      mcgraph()->Int32Constant(WASM_INSTANCE_OBJECT_OFFSET(StackLimitAddress)),
-      effect(), control());
+  Node* limit_address =
+      LOAD_INSTANCE_FIELD(StackLimitAddress, MachineType::Pointer());
   Node* limit = SetEffect(graph()->NewNode(
       mcgraph()->machine()->Load(MachineType::Pointer()), limit_address,
       mcgraph()->IntPtrConstant(0), limit_address, control()));
@@ -996,12 +1190,6 @@ Node* WasmGraphBuilder::BranchNoHint(Node* cond, Node** true_node,
                 BranchHint::kNone);
 }
 
-Node* WasmGraphBuilder::BranchExpectTrue(Node* cond, Node** true_node,
-                                         Node** false_node) {
-  return Branch(mcgraph(), cond, true_node, false_node, control(),
-                BranchHint::kTrue);
-}
-
 Node* WasmGraphBuilder::BranchExpectFalse(Node* cond, Node** true_node,
                                           Node** false_node) {
   return Branch(mcgraph(), cond, true_node, false_node, control(),
@@ -1114,7 +1302,7 @@ Node* WasmGraphBuilder::Return(Vector<Node*> vals) {
 
   buf[0] = mcgraph()->Int32Constant(0);
   if (count > 0) {
-    memcpy(buf.data() + 1, vals.begin(), sizeof(void*) * count);
+    base::Memcpy(buf.data() + 1, vals.begin(), sizeof(void*) * count);
   }
   buf[count + 1] = effect();
   buf[count + 2] = control();
@@ -2222,10 +2410,7 @@ Node* WasmGraphBuilder::LoadExceptionTagFromTable(uint32_t exception_index) {
   return tag;
 }
 
-Node* WasmGraphBuilder::GetExceptionTag(Node* except_obj,
-                                        wasm::WasmCodePosition position) {
-  TrapIfTrue(wasm::kTrapBrOnExnNull, gasm_->WordEqual(RefNull(), except_obj),
-             position);
+Node* WasmGraphBuilder::GetExceptionTag(Node* except_obj) {
   return CALL_BUILTIN(
       WasmGetOwnProperty, except_obj,
       LOAD_FULL_POINTER(
@@ -2365,7 +2550,7 @@ Node* WasmGraphBuilder::BuildI32AsmjsDivS(Node* left, Node* right) {
   // asm.js semantics return 0 on divide or mod by zero.
   if (m->Int32DivIsSafe()) {
     // The hardware instruction does the right thing (e.g. arm).
-    return graph()->NewNode(m->Int32Div(), left, right, graph()->start());
+    return graph()->NewNode(m->Int32Div(), left, right, control());
   }
 
   // Check denominator for zero.
@@ -2373,20 +2558,22 @@ Node* WasmGraphBuilder::BuildI32AsmjsDivS(Node* left, Node* right) {
       graph(), mcgraph()->common(),
       graph()->NewNode(m->Word32Equal(), right, mcgraph()->Int32Constant(0)),
       BranchHint::kFalse);
+  z.Chain(control());
 
-  // Check numerator for -1. (avoid minint / -1 case).
+  // Check denominator for -1. (avoid minint / -1 case).
   Diamond n(
       graph(), mcgraph()->common(),
       graph()->NewNode(m->Word32Equal(), right, mcgraph()->Int32Constant(-1)),
       BranchHint::kFalse);
+  n.Chain(z.if_false);
+
+  Node* div = graph()->NewNode(m->Int32Div(), left, right, n.if_false);
 
-  Node* div = graph()->NewNode(m->Int32Div(), left, right, z.if_false);
   Node* neg =
       graph()->NewNode(m->Int32Sub(), mcgraph()->Int32Constant(0), left);
 
-  return n.Phi(
-      MachineRepresentation::kWord32, neg,
-      z.Phi(MachineRepresentation::kWord32, mcgraph()->Int32Constant(0), div));
+  return z.Phi(MachineRepresentation::kWord32, mcgraph()->Int32Constant(0),
+               n.Phi(MachineRepresentation::kWord32, neg, div));
 }
 
 Node* WasmGraphBuilder::BuildI32AsmjsRemS(Node* left, Node* right) {
@@ -2429,7 +2616,7 @@ Node* WasmGraphBuilder::BuildI32AsmjsRemS(Node* left, Node* right) {
 
   Node* check0 = graph()->NewNode(m->Int32LessThan(), zero, right);
   Node* branch0 =
-      graph()->NewNode(c->Branch(BranchHint::kTrue), check0, graph()->start());
+      graph()->NewNode(c->Branch(BranchHint::kTrue), check0, control());
 
   Node* if_true0 = graph()->NewNode(c->IfTrue(), branch0);
   Node* true0;
@@ -2492,7 +2679,7 @@ Node* WasmGraphBuilder::BuildI32AsmjsDivU(Node* left, Node* right) {
   // asm.js semantics return 0 on divide or mod by zero.
   if (m->Uint32DivIsSafe()) {
     // The hardware instruction does the right thing (e.g. arm).
-    return graph()->NewNode(m->Uint32Div(), left, right, graph()->start());
+    return graph()->NewNode(m->Uint32Div(), left, right, control());
   }
 
   // Explicit check for x % 0.
@@ -2500,6 +2687,7 @@ Node* WasmGraphBuilder::BuildI32AsmjsDivU(Node* left, Node* right) {
       graph(), mcgraph()->common(),
       graph()->NewNode(m->Word32Equal(), right, mcgraph()->Int32Constant(0)),
       BranchHint::kFalse);
+  z.Chain(control());
 
   return z.Phi(MachineRepresentation::kWord32, mcgraph()->Int32Constant(0),
                graph()->NewNode(mcgraph()->machine()->Uint32Div(), left, right,
@@ -2514,6 +2702,7 @@ Node* WasmGraphBuilder::BuildI32AsmjsRemU(Node* left, Node* right) {
       graph(), mcgraph()->common(),
       graph()->NewNode(m->Word32Equal(), right, mcgraph()->Int32Constant(0)),
       BranchHint::kFalse);
+  z.Chain(control());
 
   Node* rem = graph()->NewNode(mcgraph()->machine()->Uint32Mod(), left, right,
                                z.if_false);
@@ -2647,7 +2836,7 @@ Node* WasmGraphBuilder::BuildCallNode(const wasm::FunctionSig* sig,
   // Make room for the instance_node parameter at index 1, just after code.
   inputs[0] = args[0];  // code
   inputs[1] = instance_node;
-  if (params > 0) memcpy(&inputs[2], &args[1], params * sizeof(Node*));
+  if (params > 0) base::Memcpy(&inputs[2], &args[1], params * sizeof(Node*));
 
   // Add effect and control inputs.
   inputs[params + 2] = effect();
@@ -2744,29 +2933,14 @@ Node* WasmGraphBuilder::BuildImportCall(const wasm::FunctionSig* sig,
   Node* imported_function_refs =
       LOAD_INSTANCE_FIELD(ImportedFunctionRefs, MachineType::TaggedPointer());
   // Access fixed array at {header_size - tag + func_index * kTaggedSize}.
-  Node* imported_instances_data = graph()->NewNode(
-      mcgraph()->machine()->IntAdd(), imported_function_refs,
-      mcgraph()->IntPtrConstant(
-          wasm::ObjectAccess::ElementOffsetInTaggedFixedArray(0)));
-  Node* func_index_times_tagged_size = graph()->NewNode(
-      mcgraph()->machine()->IntMul(), Uint32ToUintptr(func_index),
-      mcgraph()->Int32Constant(kTaggedSize));
-  Node* ref_node =
-      gasm_->Load(MachineType::TaggedPointer(), imported_instances_data,
-                  func_index_times_tagged_size);
+  Node* func_index_intptr = Uint32ToUintptr(func_index);
+  Node* ref_node = gasm_->LoadFixedArrayElement(
+      imported_function_refs, func_index_intptr, MachineType::TaggedPointer());
 
   // Load the target from the imported_targets array at the offset of
   // {func_index}.
-  Node* func_index_times_pointersize;
-  if (kSystemPointerSize == kTaggedSize) {
-    func_index_times_pointersize = func_index_times_tagged_size;
-
-  } else {
-    DCHECK_EQ(kSystemPointerSize, kTaggedSize + kTaggedSize);
-    func_index_times_pointersize = graph()->NewNode(
-        mcgraph()->machine()->Int32Add(), func_index_times_tagged_size,
-        func_index_times_tagged_size);
-  }
+  Node* func_index_times_pointersize = gasm_->IntMul(
+      func_index_intptr, gasm_->IntPtrConstant(kSystemPointerSize));
   Node* imported_targets =
       LOAD_INSTANCE_FIELD(ImportedFunctionTargets, MachineType::Pointer());
   Node* target_node = SetEffect(graph()->NewNode(
@@ -2914,28 +3088,13 @@ Node* WasmGraphBuilder::BuildIndirectCall(uint32_t table_index,
     TrapIfTrue(wasm::kTrapNullDereference, function_is_null, position);
   }
 
-  Node* tagged_scaled_key;
-  if (kTaggedSize == kInt32Size) {
-    tagged_scaled_key = int32_scaled_key;
-  } else {
-    DCHECK_EQ(kTaggedSize, kInt32Size * 2);
-    tagged_scaled_key = graph()->NewNode(machine->Int32Add(), int32_scaled_key,
-                                         int32_scaled_key);
-  }
+  Node* key_intptr = Uint32ToUintptr(key);
 
-  Node* target_instance = gasm_->Load(
-      MachineType::TaggedPointer(),
-      graph()->NewNode(machine->IntAdd(), ift_instances, tagged_scaled_key),
-      wasm::ObjectAccess::ElementOffsetInTaggedFixedArray(0));
+  Node* target_instance = gasm_->LoadFixedArrayElement(
+      ift_instances, key_intptr, MachineType::TaggedPointer());
 
-  Node* intptr_scaled_key;
-  if (kSystemPointerSize == kTaggedSize) {
-    intptr_scaled_key = tagged_scaled_key;
-  } else {
-    DCHECK_EQ(kSystemPointerSize, kTaggedSize + kTaggedSize);
-    intptr_scaled_key = graph()->NewNode(machine->Int32Add(), tagged_scaled_key,
-                                         tagged_scaled_key);
-  }
+  Node* intptr_scaled_key =
+      gasm_->IntMul(key_intptr, gasm_->IntPtrConstant(kSystemPointerSize));
 
   Node* target = SetEffect(
       graph()->NewNode(machine->Load(MachineType::Pointer()), ift_targets,
@@ -2955,41 +3114,16 @@ Node* WasmGraphBuilder::BuildIndirectCall(uint32_t table_index,
   }
 }
 
-Node* WasmGraphBuilder::BuildLoadFunctionDataFromJSFunction(Node* js_function) {
-  Node* shared = gasm_->Load(
-      MachineType::AnyTagged(), js_function,
-      wasm::ObjectAccess::SharedFunctionInfoOffsetInTaggedJSFunction());
-  return gasm_->Load(MachineType::AnyTagged(), shared,
-                     SharedFunctionInfo::kFunctionDataOffset - kHeapObjectTag);
-}
-
 Node* WasmGraphBuilder::BuildLoadJumpTableOffsetFromExportedFunctionData(
     Node* function_data) {
-  Node* jump_table_offset_smi = gasm_->Load(
-      MachineType::TaggedSigned(), function_data,
-      WasmExportedFunctionData::kJumpTableOffsetOffset - kHeapObjectTag);
+  Node* jump_table_offset_smi =
+      gasm_->Load(MachineType::TaggedSigned(), function_data,
+                  wasm::ObjectAccess::ToTagged(
+                      WasmExportedFunctionData::kJumpTableOffsetOffset));
   return BuildChangeSmiToIntPtr(jump_table_offset_smi);
 }
 
-Node* WasmGraphBuilder::BuildLoadFunctionIndexFromExportedFunctionData(
-    Node* function_data) {
-  Node* function_index_smi = gasm_->Load(
-      MachineType::TaggedSigned(), function_data,
-      WasmExportedFunctionData::kFunctionIndexOffset - kHeapObjectTag);
-  Node* function_index = BuildChangeSmiToInt32(function_index_smi);
-  return function_index;
-}
-
-Node* HasInstanceType(WasmGraphAssembler* gasm, Node* object,
-                      InstanceType type) {
-  Node* map = gasm->Load(MachineType::TaggedPointer(), object,
-                         wasm::ObjectAccess::ToTagged(HeapObject::kMapOffset));
-  Node* instance_type =
-      gasm->Load(MachineType::Uint16(), map,
-                 wasm::ObjectAccess::ToTagged(Map::kInstanceTypeOffset));
-  return gasm->Word32Equal(instance_type, gasm->Int32Constant(type));
-}
-
+// TODO(9495): Support CAPI function refs.
 Node* WasmGraphBuilder::BuildCallRef(uint32_t sig_index, Vector<Node*> args,
                                      Vector<Node*> rets,
                                      CheckForNull null_check,
@@ -3002,10 +3136,10 @@ Node* WasmGraphBuilder::BuildCallRef(uint32_t sig_index, Vector<Node*> args,
 
   const wasm::FunctionSig* sig = env_->module->signature(sig_index);
 
-  Node* function_data = BuildLoadFunctionDataFromJSFunction(args[0]);
+  Node* function_data = gasm_->LoadFunctionDataFromJSFunction(args[0]);
 
   Node* is_js_function =
-      HasInstanceType(gasm_.get(), function_data, WASM_JS_FUNCTION_DATA_TYPE);
+      gasm_->HasInstanceType(function_data, WASM_JS_FUNCTION_DATA_TYPE);
 
   auto js_label = gasm_->MakeLabel();
   auto end_label = gasm_->MakeLabel(MachineRepresentation::kTaggedPointer,
@@ -3016,15 +3150,8 @@ Node* WasmGraphBuilder::BuildCallRef(uint32_t sig_index, Vector<Node*> args,
   {
     // Call to a WasmExportedFunction.
     // Load instance object corresponding to module where callee is defined.
-    Node* callee_instance =
-        gasm_->Load(MachineType::TaggedPointer(), function_data,
-                    wasm::ObjectAccess::ToTagged(
-                        WasmExportedFunctionData::kInstanceOffset));
-
-    Node* function_index =
-        gasm_->Load(MachineType::TaggedPointer(), function_data,
-                    wasm::ObjectAccess::ToTagged(
-                        WasmExportedFunctionData::kFunctionIndexOffset));
+    Node* callee_instance = gasm_->LoadExportedFunctionInstance(function_data);
+    Node* function_index = gasm_->LoadExportedFunctionIndexAsSmi(function_data);
 
     auto imported_label = gasm_->MakeLabel();
 
@@ -3034,8 +3161,7 @@ Node* WasmGraphBuilder::BuildCallRef(uint32_t sig_index, Vector<Node*> args,
                     wasm::ObjectAccess::ToTagged(
                         WasmInstanceObject::kImportedFunctionRefsOffset));
     Node* imported_functions_num =
-        gasm_->Load(MachineType::TaggedPointer(), imported_function_refs,
-                    wasm::ObjectAccess::ToTagged(FixedArray::kLengthOffset));
+        gasm_->LoadFixedArrayLengthAsSmi(imported_function_refs);
     gasm_->GotoIf(gasm_->SmiLessThan(function_index, imported_functions_num),
                   &imported_label);
     {
@@ -3056,13 +3182,11 @@ Node* WasmGraphBuilder::BuildCallRef(uint32_t sig_index, Vector<Node*> args,
     {
       // Function imported to module.
       gasm_->Bind(&imported_label);
+      Node* function_index_intptr = BuildChangeSmiToIntPtr(function_index);
 
-      Node* imported_instance = gasm_->Load(
-          MachineType::TaggedPointer(), imported_function_refs,
-          gasm_->Int32Add(
-              gasm_->Int32Mul(BuildChangeSmiToInt32(function_index),
-                              gasm_->Int32Constant(kTaggedSize)),
-              gasm_->Int32Constant(FixedArray::kHeaderSize - kHeapObjectTag)));
+      Node* imported_instance = gasm_->LoadFixedArrayElement(
+          imported_function_refs, function_index_intptr,
+          MachineType::TaggedPointer());
 
       Node* imported_function_targets =
           gasm_->Load(MachineType::Pointer(), callee_instance,
@@ -3071,7 +3195,7 @@ Node* WasmGraphBuilder::BuildCallRef(uint32_t sig_index, Vector<Node*> args,
 
       Node* target_node =
           gasm_->Load(MachineType::Pointer(), imported_function_targets,
-                      gasm_->IntMul(BuildChangeSmiToIntPtr(function_index),
+                      gasm_->IntMul(function_index_intptr,
                                     gasm_->IntPtrConstant(kSystemPointerSize)));
 
       gasm_->Goto(&end_label, target_node, imported_instance);
@@ -3393,12 +3517,8 @@ void WasmGraphBuilder::SetEffectControl(Node* effect, Node* control) {
 Node* WasmGraphBuilder::GetImportedMutableGlobals() {
   if (imported_mutable_globals_ == nullptr) {
     // Load imported_mutable_globals_ from the instance object at runtime.
-    imported_mutable_globals_ = graph()->NewNode(
-        mcgraph()->machine()->Load(MachineType::UintPtr()),
-        instance_node_.get(),
-        mcgraph()->Int32Constant(
-            WASM_INSTANCE_OBJECT_OFFSET(ImportedMutableGlobals)),
-        graph()->start(), graph()->start());
+    imported_mutable_globals_ =
+        LOAD_INSTANCE_FIELD(ImportedMutableGlobals, MachineType::UintPtr());
   }
   return imported_mutable_globals_.get();
 }
@@ -3460,7 +3580,7 @@ void WasmGraphBuilder::GetBaseAndOffsetForImportedMutableExternRefGlobal(
                        mcgraph()->Int32Constant(global.index * sizeof(Address)),
                        effect(), control()));
 
-  // From the index, calculate the actual offset in the FixeArray. This
+  // From the index, calculate the actual offset in the FixedArray. This
   // is kHeaderSize + (index * kTaggedSize). kHeaderSize can be acquired with
   // wasm::ObjectAccess::ElementOffsetInTaggedFixedArray(0).
   Node* index_times_tagged_size =
@@ -3674,7 +3794,7 @@ Node* WasmGraphBuilder::BoundsCheckMem(uint8_t access_size, Node* index,
                                        wasm::WasmCodePosition position,
                                        EnforceBoundsCheck enforce_check) {
   DCHECK_LE(1, access_size);
-  index = Uint32ToUintptr(index);
+  if (!env_->module->is_memory64) index = Uint32ToUintptr(index);
   if (!FLAG_wasm_bounds_checks) return index;
 
   if (use_trap_handler() && enforce_check == kCanOmitBoundsCheck) {
@@ -3693,6 +3813,16 @@ Node* WasmGraphBuilder::BoundsCheckMem(uint8_t access_size, Node* index,
   uintptr_t end_offset = offset + access_size - 1u;
   Node* end_offset_node = mcgraph_->UintPtrConstant(end_offset);
 
+  // In memory64 mode on 32-bit systems, the upper 32 bits need to be zero to
+  // succeed the bounds check.
+  if (kSystemPointerSize == kInt32Size && env_->module->is_memory64) {
+    Node* high_word = gasm_->TruncateInt64ToInt32(
+        gasm_->Word64Shr(index, gasm_->Int32Constant(32)));
+    TrapIfTrue(wasm::kTrapMemOutOfBounds, high_word, position);
+    // Only use the low word for the following bounds check.
+    index = gasm_->TruncateInt64ToInt32(index);
+  }
+
   // The accessed memory is [index + offset, index + end_offset].
   // Check that the last read byte (at {index + end_offset}) is in bounds.
   // 1) Check that {end_offset < mem_size}. This also ensures that we can safely
@@ -3703,13 +3833,13 @@ Node* WasmGraphBuilder::BoundsCheckMem(uint8_t access_size, Node* index,
   //    - checking that {index < effective_size}.
 
   Node* mem_size = instance_cache_->mem_size;
-  if (end_offset >= env_->min_memory_size) {
+  if (end_offset > env_->min_memory_size) {
     // The end offset is larger than the smallest memory.
     // Dynamically check the end offset against the dynamic memory size.
     Node* cond = gasm_->UintLessThan(end_offset_node, mem_size);
     TrapIfFalse(wasm::kTrapMemOutOfBounds, cond, position);
   } else {
-    // The end offset is smaller than the smallest memory, so only one check is
+    // The end offset is <= the smallest memory, so only one check is
     // required. Check to see if the index is also a constant.
     UintPtrMatcher match(index);
     if (match.HasResolvedValue()) {
@@ -3722,7 +3852,7 @@ Node* WasmGraphBuilder::BoundsCheckMem(uint8_t access_size, Node* index,
     }
   }
 
-  // This produces a positive number, since {end_offset < min_size <= mem_size}.
+  // This produces a positive number since {end_offset <= min_size <= mem_size}.
   Node* effective_size = gasm_->IntSub(mem_size, end_offset_node);
 
   // Introduce the actual bounds check.
@@ -3738,34 +3868,6 @@ Node* WasmGraphBuilder::BoundsCheckMem(uint8_t access_size, Node* index,
   return index;
 }
 
-Node* WasmGraphBuilder::BoundsCheckRange(Node* start, Node** size, Node* max,
-                                         wasm::WasmCodePosition position) {
-  auto m = mcgraph()->machine();
-  // The region we are trying to access is [start, start+size). If
-  // {start} > {max}, none of this region is valid, so we trap. Otherwise,
-  // there may be a subset of the region that is valid. {max - start} is the
-  // maximum valid size, so if {max - start < size}, then the region is
-  // partially out-of-bounds.
-  TrapIfTrue(wasm::kTrapMemOutOfBounds,
-             graph()->NewNode(m->Uint32LessThan(), max, start), position);
-  Node* sub = graph()->NewNode(m->Int32Sub(), max, start);
-  Node* fail = graph()->NewNode(m->Uint32LessThan(), sub, *size);
-  Diamond d(graph(), mcgraph()->common(), fail, BranchHint::kFalse);
-  d.Chain(control());
-  *size = d.Phi(MachineRepresentation::kWord32, sub, *size);
-  return fail;
-}
-
-Node* WasmGraphBuilder::BoundsCheckMemRange(Node** start, Node** size,
-                                            wasm::WasmCodePosition position) {
-  // TODO(binji): Support trap handler and no bounds check mode.
-  Node* fail =
-      BoundsCheckRange(*start, size, instance_cache_->mem_size, position);
-  *start = graph()->NewNode(mcgraph()->machine()->IntAdd(), MemBuffer(0),
-                            Uint32ToUintptr(*start));
-  return fail;
-}
-
 const Operator* WasmGraphBuilder::GetSafeLoadOperator(int offset,
                                                       wasm::ValueType type) {
   int alignment = offset % type.element_size_bytes();
@@ -4003,8 +4105,9 @@ Node* WasmGraphBuilder::LoadTransformBigEndian(
 }
 #endif
 
-Node* WasmGraphBuilder::LoadLane(MachineType memtype, Node* value, Node* index,
-                                 uint32_t offset, uint8_t laneidx,
+Node* WasmGraphBuilder::LoadLane(wasm::ValueType type, MachineType memtype,
+                                 Node* value, Node* index, uint64_t offset,
+                                 uint32_t alignment, uint8_t laneidx,
                                  wasm::WasmCodePosition position) {
   has_simd_ = true;
   Node* load;
@@ -4012,19 +4115,39 @@ Node* WasmGraphBuilder::LoadLane(MachineType memtype, Node* value, Node* index,
   index =
       BoundsCheckMem(access_size, index, offset, position, kCanOmitBoundsCheck);
 
+  // {offset} is validated to be within uintptr_t range in {BoundsCheckMem}.
+  uintptr_t capped_offset = static_cast<uintptr_t>(offset);
+#if defined(V8_TARGET_BIG_ENDIAN) || defined(V8_TARGET_ARCH_S390_LE_SIM)
+  load = LoadMem(type, memtype, index, offset, alignment, position);
+  if (memtype == MachineType::Int8()) {
+    load = graph()->NewNode(mcgraph()->machine()->I8x16ReplaceLane(laneidx),
+                            value, load);
+  } else if (memtype == MachineType::Int16()) {
+    load = graph()->NewNode(mcgraph()->machine()->I16x8ReplaceLane(laneidx),
+                            value, load);
+  } else if (memtype == MachineType::Int32()) {
+    load = graph()->NewNode(mcgraph()->machine()->I32x4ReplaceLane(laneidx),
+                            value, load);
+  } else if (memtype == MachineType::Int64()) {
+    load = graph()->NewNode(mcgraph()->machine()->I64x2ReplaceLane(laneidx),
+                            value, load);
+  } else {
+    UNREACHABLE();
+  }
+#else
   MemoryAccessKind load_kind =
       GetMemoryAccessKind(mcgraph(), memtype, use_trap_handler());
 
   load = SetEffect(graph()->NewNode(
       mcgraph()->machine()->LoadLane(load_kind, memtype, laneidx),
-      MemBuffer(offset), index, value, effect(), control()));
+      MemBuffer(capped_offset), index, value, effect(), control()));
 
   if (load_kind == MemoryAccessKind::kProtected) {
     SetSourcePosition(load, position);
   }
-
+#endif
   if (FLAG_trace_wasm_memory) {
-    TraceMemoryOperation(false, memtype.representation(), index, offset,
+    TraceMemoryOperation(false, memtype.representation(), index, capped_offset,
                          position);
   }
 
@@ -4080,6 +4203,17 @@ Node* WasmGraphBuilder::LoadTransform(wasm::ValueType type, MachineType memtype,
   return load;
 }
 
+Node* WasmGraphBuilder::Prefetch(Node* index, uint64_t offset,
+                                 uint32_t alignment, bool temporal) {
+  uintptr_t capped_offset = static_cast<uintptr_t>(offset);
+  const Operator* prefetchOp =
+      temporal ? mcgraph()->machine()->PrefetchTemporal()
+               : mcgraph()->machine()->PrefetchNonTemporal();
+  Node* prefetch = SetEffect(graph()->NewNode(
+      prefetchOp, MemBuffer(capped_offset), index, effect(), control()));
+  return prefetch;
+}
+
 Node* WasmGraphBuilder::LoadMem(wasm::ValueType type, MachineType memtype,
                                 Node* index, uint64_t offset,
                                 uint32_t alignment,
@@ -4132,7 +4266,7 @@ Node* WasmGraphBuilder::LoadMem(wasm::ValueType type, MachineType memtype,
 }
 
 Node* WasmGraphBuilder::StoreLane(MachineRepresentation mem_rep, Node* index,
-                                  uint32_t offset, uint32_t alignment,
+                                  uint64_t offset, uint32_t alignment,
                                   Node* val, uint8_t laneidx,
                                   wasm::WasmCodePosition position,
                                   wasm::ValueType type) {
@@ -4141,13 +4275,31 @@ Node* WasmGraphBuilder::StoreLane(MachineRepresentation mem_rep, Node* index,
   index = BoundsCheckMem(i::ElementSizeInBytes(mem_rep), index, offset,
                          position, kCanOmitBoundsCheck);
 
+  // {offset} is validated to be within uintptr_t range in {BoundsCheckMem}.
+  uintptr_t capped_offset = static_cast<uintptr_t>(offset);
+#if defined(V8_TARGET_BIG_ENDIAN) || defined(V8_TARGET_ARCH_S390_LE_SIM)
+  Node* output;
+  if (mem_rep == MachineRepresentation::kWord8) {
+    output =
+        graph()->NewNode(mcgraph()->machine()->I8x16ExtractLaneS(laneidx), val);
+  } else if (mem_rep == MachineRepresentation::kWord16) {
+    output =
+        graph()->NewNode(mcgraph()->machine()->I16x8ExtractLaneS(laneidx), val);
+  } else if (mem_rep == MachineRepresentation::kWord32) {
+    output =
+        graph()->NewNode(mcgraph()->machine()->I32x4ExtractLane(laneidx), val);
+  } else if (mem_rep == MachineRepresentation::kWord64) {
+    output =
+        graph()->NewNode(mcgraph()->machine()->I64x2ExtractLane(laneidx), val);
+  } else {
+    UNREACHABLE();
+  }
+  store = StoreMem(mem_rep, index, offset, alignment, output, position, type);
+#else
   MachineType memtype = MachineType(mem_rep, MachineSemantic::kNone);
   MemoryAccessKind load_kind =
       GetMemoryAccessKind(mcgraph(), memtype, use_trap_handler());
 
-  // {offset} is validated to be within uintptr_t range in {BoundsCheckMem}.
-  uintptr_t capped_offset = static_cast<uintptr_t>(offset);
-
   store = SetEffect(graph()->NewNode(
       mcgraph()->machine()->StoreLane(load_kind, mem_rep, laneidx),
       MemBuffer(capped_offset), index, val, effect(), control()));
@@ -4155,7 +4307,7 @@ Node* WasmGraphBuilder::StoreLane(MachineRepresentation mem_rep, Node* index,
   if (load_kind == MemoryAccessKind::kProtected) {
     SetSourcePosition(store, position);
   }
-
+#endif
   if (FLAG_trace_wasm_memory) {
     TraceMemoryOperation(true, mem_rep, index, capped_offset, position);
   }
@@ -5499,84 +5651,12 @@ Node* WasmGraphBuilder::TableFill(uint32_t table_index, Node* start,
   return BuildCallToRuntime(Runtime::kWasmTableFill, args, arraysize(args));
 }
 
-namespace {
-
-MachineType FieldType(const wasm::StructType* type, uint32_t field_index,
-                      bool is_signed) {
-  return MachineType::TypeForRepresentation(
-      type->field(field_index).machine_representation(), is_signed);
-}
-
-Node* FieldOffset(MachineGraph* graph, const wasm::StructType* type,
-                  uint32_t field_index) {
-  int offset = WasmStruct::kHeaderSize + type->field_offset(field_index) -
-               kHeapObjectTag;
-  return graph->IntPtrConstant(offset);
-}
-
-// It's guaranteed that struct/array fields are aligned to min(field_size,
-// kTaggedSize), with the latter being 4 or 8 depending on platform and
-// pointer compression. So on our most common configurations, 8-byte types
-// must use unaligned loads/stores.
-Node* LoadWithTaggedAlignment(WasmGraphAssembler* gasm, MachineType type,
-                              Node* base, Node* offset) {
-  if (ElementSizeInBytes(type.representation()) > kTaggedSize) {
-    return gasm->LoadUnaligned(type, base, offset);
-  } else {
-    return gasm->Load(type, base, offset);
-  }
-}
-
-// Same alignment considerations as above.
-Node* StoreWithTaggedAlignment(WasmGraphAssembler* gasm, Node* base,
-                               Node* offset, Node* value,
-                               wasm::ValueType type) {
-  MachineRepresentation rep = type.machine_representation();
-  if (ElementSizeInBytes(rep) > kTaggedSize) {
-    return gasm->StoreUnaligned(rep, base, offset, value);
-  } else {
-    WriteBarrierKind write_barrier =
-        type.is_reference_type() ? kPointerWriteBarrier : kNoWriteBarrier;
-    StoreRepresentation store_rep(rep, write_barrier);
-    return gasm->Store(store_rep, base, offset, value);
-  }
-}
-
-// Set a field of a struct, without checking if the struct is null.
-// Helper method for StructNewWithRtt and StructSet.
-Node* StoreStructFieldUnchecked(MachineGraph* graph, WasmGraphAssembler* gasm,
-                                Node* struct_object,
-                                const wasm::StructType* type,
-                                uint32_t field_index, Node* value) {
-  return StoreWithTaggedAlignment(gasm, struct_object,
-                                  FieldOffset(graph, type, field_index), value,
-                                  type->field(field_index));
-}
-
-Node* ArrayElementOffset(GraphAssembler* gasm, Node* index,
-                         wasm::ValueType element_type) {
-  return gasm->Int32Add(
-      gasm->Int32Constant(WasmArray::kHeaderSize - kHeapObjectTag),
-      gasm->Int32Mul(index,
-                     gasm->Int32Constant(element_type.element_size_bytes())));
-}
-
-Node* ArrayLength(GraphAssembler* gasm, Node* array) {
-  return gasm->Load(
-      MachineType::Uint32(), array,
-      gasm->Int32Constant(WasmArray::kLengthOffset - kHeapObjectTag));
-}
-
-}  // namespace
-
 Node* WasmGraphBuilder::StructNewWithRtt(uint32_t struct_index,
                                          const wasm::StructType* type,
                                          Node* rtt, Vector<Node*> fields) {
-  Node* s = CALL_BUILTIN(
-      WasmAllocateStructWithRtt, rtt,
-      LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer()));
+  Node* s = CALL_BUILTIN(WasmAllocateStructWithRtt, rtt);
   for (uint32_t i = 0; i < type->field_count(); i++) {
-    StoreStructFieldUnchecked(mcgraph(), gasm_.get(), s, type, i, fields[i]);
+    gasm_->StoreStructField(s, type, i, fields[i]);
   }
   return s;
 }
@@ -5584,34 +5664,33 @@ Node* WasmGraphBuilder::StructNewWithRtt(uint32_t struct_index,
 Node* WasmGraphBuilder::ArrayNewWithRtt(uint32_t array_index,
                                         const wasm::ArrayType* type,
                                         Node* length, Node* initial_value,
-                                        Node* rtt) {
+                                        Node* rtt,
+                                        wasm::WasmCodePosition position) {
+  TrapIfFalse(wasm::kTrapArrayOutOfBounds,
+              gasm_->Uint32LessThanOrEqual(
+                  length, gasm_->Uint32Constant(wasm::kV8MaxWasmArrayLength)),
+              position);
   wasm::ValueType element_type = type->element_type();
-  Node* a = CALL_BUILTIN(
-      WasmAllocateArrayWithRtt, rtt, BuildChangeUint31ToSmi(length),
-      graph()->NewNode(mcgraph()->common()->NumberConstant(
-          element_type.element_size_bytes())),
-      LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer()));
+  Node* a = CALL_BUILTIN(WasmAllocateArrayWithRtt, rtt, length,
+                         graph()->NewNode(mcgraph()->common()->Int32Constant(
+                             element_type.element_size_bytes())));
   auto loop = gasm_->MakeLoopLabel(MachineRepresentation::kWord32);
   auto done = gasm_->MakeLabel();
-  Node* start_offset =
-      gasm_->Int32Constant(WasmArray::kHeaderSize - kHeapObjectTag);
+  Node* start_offset = gasm_->Int32Constant(
+      wasm::ObjectAccess::ToTagged(WasmArray::kHeaderSize));
   Node* element_size = gasm_->Int32Constant(element_type.element_size_bytes());
   Node* end_offset =
       gasm_->Int32Add(start_offset, gasm_->Int32Mul(element_size, length));
-  // "Goto" requires the graph's end to have been set up.
-  // TODO(jkummerow): Figure out if there's a more elegant solution.
-  Graph* g = mcgraph()->graph();
-  if (!g->end()) {
-    g->SetEnd(g->NewNode(mcgraph()->common()->End(0)));
-  }
+  // Loops need the graph's end to have been set up.
+  EnsureEnd(mcgraph());
   gasm_->Goto(&loop, start_offset);
   gasm_->Bind(&loop);
   {
     Node* offset = loop.PhiAt(0);
     Node* check = gasm_->Uint32LessThan(offset, end_offset);
     gasm_->GotoIfNot(check, &done);
-    StoreWithTaggedAlignment(gasm_.get(), a, offset, initial_value,
-                             type->element_type());
+    gasm_->StoreWithTaggedAlignment(a, offset, initial_value,
+                                    type->element_type());
     offset = gasm_->Int32Add(offset, element_size);
     gasm_->Goto(&loop, offset);
   }
@@ -5620,52 +5699,41 @@ Node* WasmGraphBuilder::ArrayNewWithRtt(uint32_t array_index,
 }
 
 Node* WasmGraphBuilder::RttCanon(wasm::HeapType type) {
-  if (type.is_generic()) {
-    switch (type.representation()) {
-      case wasm::HeapType::kEq:
-        return LOAD_FULL_POINTER(
-            BuildLoadIsolateRoot(),
-            IsolateData::root_slot_offset(RootIndex::kWasmRttEqrefMap));
-      case wasm::HeapType::kExtern:
-        return LOAD_FULL_POINTER(
-            BuildLoadIsolateRoot(),
-            IsolateData::root_slot_offset(RootIndex::kWasmRttExternrefMap));
-      case wasm::HeapType::kFunc:
-        return LOAD_FULL_POINTER(
-            BuildLoadIsolateRoot(),
-            IsolateData::root_slot_offset(RootIndex::kWasmRttFuncrefMap));
-      case wasm::HeapType::kI31:
-        return LOAD_FULL_POINTER(
-            BuildLoadIsolateRoot(),
-            IsolateData::root_slot_offset(RootIndex::kWasmRttI31refMap));
-      default:
-        UNREACHABLE();
+  RootIndex index;
+  switch (type.representation()) {
+    case wasm::HeapType::kEq:
+      index = RootIndex::kWasmRttEqrefMap;
+      break;
+    case wasm::HeapType::kExtern:
+      index = RootIndex::kWasmRttExternrefMap;
+      break;
+    case wasm::HeapType::kFunc:
+      index = RootIndex::kWasmRttFuncrefMap;
+      break;
+    case wasm::HeapType::kI31:
+      index = RootIndex::kWasmRttI31refMap;
+      break;
+    case wasm::HeapType::kAny:
+      index = RootIndex::kWasmRttAnyrefMap;
+      break;
+    case wasm::HeapType::kBottom:
+      UNREACHABLE();
+    default: {
+      // User-defined type.
+      Node* maps_list =
+          LOAD_INSTANCE_FIELD(ManagedObjectMaps, MachineType::TaggedPointer());
+      return LOAD_FIXED_ARRAY_SLOT_PTR(maps_list, type.ref_index());
     }
   }
-  Node* maps_list =
-      LOAD_INSTANCE_FIELD(ManagedObjectMaps, MachineType::TaggedPointer());
-  return LOAD_FIXED_ARRAY_SLOT_PTR(maps_list, type.ref_index());
+  return LOAD_FULL_POINTER(BuildLoadIsolateRoot(),
+                           IsolateData::root_slot_offset(index));
 }
 
 Node* WasmGraphBuilder::RttSub(wasm::HeapType type, Node* parent_rtt) {
-  return CALL_BUILTIN(
-      WasmAllocateRtt,
-      graph()->NewNode(
-          mcgraph()->common()->NumberConstant(type.representation())),
-      parent_rtt,
-      LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer()));
-}
-
-Node* IsI31(GraphAssembler* gasm, Node* object) {
-  if (COMPRESS_POINTERS_BOOL) {
-    return gasm->Word32Equal(
-        gasm->Word32And(object, gasm->Int32Constant(kSmiTagMask)),
-        gasm->Int32Constant(kSmiTag));
-  } else {
-    return gasm->WordEqual(
-        gasm->WordAnd(object, gasm->IntPtrConstant(kSmiTagMask)),
-        gasm->IntPtrConstant(kSmiTag));
-  }
+  return CALL_BUILTIN(WasmAllocateRtt,
+                      graph()->NewNode(mcgraph()->common()->Int32Constant(
+                          type.representation())),
+                      parent_rtt);
 }
 
 void AssertFalse(MachineGraph* mcgraph, GraphAssembler* gasm, Node* condition) {
@@ -5681,136 +5749,180 @@ void AssertFalse(MachineGraph* mcgraph, GraphAssembler* gasm, Node* condition) {
 }
 
 Node* WasmGraphBuilder::RefTest(Node* object, Node* rtt,
-                                CheckForNull null_check, CheckForI31 i31_check,
-                                RttIsI31 rtt_is_i31) {
+                                ObjectReferenceKnowledge config) {
   auto done = gasm_->MakeLabel(MachineRepresentation::kWord32);
-  bool need_done_label = false;
-  if (i31_check == kWithI31Check) {
-    if (rtt_is_i31 == kRttIsI31) {
-      return IsI31(gasm_.get(), object);
+  if (config.object_can_be_i31) {
+    if (config.rtt_is_i31) {
+      return gasm_->IsI31(object);
     }
-    gasm_->GotoIf(IsI31(gasm_.get(), object), &done, gasm_->Int32Constant(0));
-    need_done_label = true;
+    gasm_->GotoIf(gasm_->IsI31(object), &done, gasm_->Int32Constant(0));
   } else {
-    AssertFalse(mcgraph(), gasm_.get(), IsI31(gasm_.get(), object));
+    AssertFalse(mcgraph(), gasm_.get(), gasm_->IsI31(object));
   }
-  if (null_check == kWithNullCheck) {
+  if (config.object_can_be_null) {
     gasm_->GotoIf(gasm_->WordEqual(object, RefNull()), &done,
                   gasm_->Int32Constant(0));
-    need_done_label = true;
   }
 
-  Node* map = gasm_->Load(MachineType::TaggedPointer(), object,
-                          HeapObject::kMapOffset - kHeapObjectTag);
-  // TODO(7748): Add a fast path for map == rtt.
-  Node* subtype_check = BuildChangeSmiToInt32(CALL_BUILTIN(
-      WasmIsRttSubtype, map, rtt,
-      LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer())));
+  Node* map = gasm_->LoadMap(object);
+  gasm_->GotoIf(gasm_->TaggedEqual(map, rtt), &done, gasm_->Int32Constant(1));
 
-  if (need_done_label) {
-    gasm_->Goto(&done, subtype_check);
-    gasm_->Bind(&done);
-    subtype_check = done.PhiAt(0);
+  if (!config.object_must_be_data_ref) {
+    gasm_->GotoIfNot(gasm_->IsDataRefMap(map), &done, gasm_->Int32Constant(0));
   }
-  return subtype_check;
+  Node* type_info = gasm_->LoadWasmTypeInfo(map);
+  Node* supertypes = gasm_->LoadSupertypes(type_info);
+  Node* length =
+      BuildChangeSmiToInt32(gasm_->LoadFixedArrayLengthAsSmi(supertypes));
+  gasm_->GotoIfNot(
+      gasm_->Uint32LessThan(gasm_->Int32Constant(config.rtt_depth), length),
+      &done, gasm_->Int32Constant(0));
+  Node* maybe_match = gasm_->LoadFixedArrayElement(
+      supertypes, config.rtt_depth, MachineType::TaggedPointer());
+  gasm_->Goto(&done, gasm_->TaggedEqual(maybe_match, rtt));
+  gasm_->Bind(&done);
+
+  return done.PhiAt(0);
 }
 
 Node* WasmGraphBuilder::RefCast(Node* object, Node* rtt,
-                                CheckForNull null_check, CheckForI31 i31_check,
-                                RttIsI31 rtt_is_i31,
+                                ObjectReferenceKnowledge config,
                                 wasm::WasmCodePosition position) {
-  if (i31_check == kWithI31Check) {
-    if (rtt_is_i31 == kRttIsI31) {
-      TrapIfFalse(wasm::kTrapIllegalCast, IsI31(gasm_.get(), object), position);
+  if (config.object_can_be_i31) {
+    if (config.rtt_is_i31) {
+      TrapIfFalse(wasm::kTrapIllegalCast, gasm_->IsI31(object), position);
       return object;
     } else {
-      TrapIfTrue(wasm::kTrapIllegalCast, IsI31(gasm_.get(), object), position);
+      TrapIfTrue(wasm::kTrapIllegalCast, gasm_->IsI31(object), position);
     }
   } else {
-    AssertFalse(mcgraph(), gasm_.get(), IsI31(gasm_.get(), object));
+    AssertFalse(mcgraph(), gasm_.get(), gasm_->IsI31(object));
   }
-  if (null_check == kWithNullCheck) {
+  if (config.object_can_be_null) {
     TrapIfTrue(wasm::kTrapIllegalCast, gasm_->WordEqual(object, RefNull()),
                position);
   }
-  Node* map = gasm_->Load(MachineType::TaggedPointer(), object,
-                          HeapObject::kMapOffset - kHeapObjectTag);
-  // TODO(7748): Add a fast path for map == rtt.
-  Node* check_result = BuildChangeSmiToInt32(CALL_BUILTIN(
-      WasmIsRttSubtype, map, rtt,
-      LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer())));
-  TrapIfFalse(wasm::kTrapIllegalCast, check_result, position);
+  Node* map = gasm_->LoadMap(object);
+  auto done = gasm_->MakeLabel();
+  gasm_->GotoIf(gasm_->TaggedEqual(map, rtt), &done);
+  if (!config.object_must_be_data_ref) {
+    TrapIfFalse(wasm::kTrapIllegalCast, gasm_->IsDataRefMap(map), position);
+  }
+  Node* type_info = gasm_->LoadWasmTypeInfo(map);
+  Node* supertypes = gasm_->LoadSupertypes(type_info);
+  Node* length =
+      BuildChangeSmiToInt32(gasm_->LoadFixedArrayLengthAsSmi(supertypes));
+  TrapIfFalse(
+      wasm::kTrapIllegalCast,
+      gasm_->Uint32LessThan(gasm_->Int32Constant(config.rtt_depth), length),
+      position);
+  Node* maybe_match = gasm_->LoadFixedArrayElement(
+      supertypes, config.rtt_depth, MachineType::TaggedPointer());
+  TrapIfFalse(wasm::kTrapIllegalCast, gasm_->TaggedEqual(maybe_match, rtt),
+              position);
+  gasm_->Goto(&done);
+  gasm_->Bind(&done);
   return object;
 }
 
 Node* WasmGraphBuilder::BrOnCast(Node* object, Node* rtt,
-                                 CheckForNull null_check, CheckForI31 i31_check,
-                                 RttIsI31 rtt_is_i31, Node** match_control,
-                                 Node** match_effect, Node** no_match_control,
+                                 ObjectReferenceKnowledge config,
+                                 Node** match_control, Node** match_effect,
+                                 Node** no_match_control,
                                  Node** no_match_effect) {
-  // We have up to 3 control nodes to merge; the EffectPhi needs an additional
+  // We have up to 5 control nodes to merge; the EffectPhi needs an additional
   // input.
-  base::SmallVector<Node*, 3> merge_controls;
-  base::SmallVector<Node*, 4> merge_effects;
-
-  Node* is_i31 = IsI31(gasm_.get(), object);
-  if (i31_check == kWithI31Check) {
-    if (rtt_is_i31 == kRttIsI31) {
+  base::SmallVector<Node*, 5> no_match_controls;
+  base::SmallVector<Node*, 6> no_match_effects;
+  // We always have 2 match_controls; use the same mechanism for uniformity.
+  base::SmallVector<Node*, 2> match_controls;
+  base::SmallVector<Node*, 3> match_effects;
+
+  Node* is_i31 = gasm_->IsI31(object);
+  if (config.object_can_be_i31) {
+    if (config.rtt_is_i31) {
       BranchExpectFalse(is_i31, match_control, no_match_control);
       return nullptr;
     } else {
       Node* i31_branch = graph()->NewNode(
           mcgraph()->common()->Branch(BranchHint::kFalse), is_i31, control());
       SetControl(graph()->NewNode(mcgraph()->common()->IfFalse(), i31_branch));
-      merge_controls.emplace_back(
+      no_match_controls.emplace_back(
           graph()->NewNode(mcgraph()->common()->IfTrue(), i31_branch));
-      merge_effects.emplace_back(effect());
+      no_match_effects.emplace_back(effect());
     }
   } else {
     AssertFalse(mcgraph(), gasm_.get(), is_i31);
   }
 
-  if (null_check == kWithNullCheck) {
+  if (config.object_can_be_null) {
     Node* null_branch =
         graph()->NewNode(mcgraph()->common()->Branch(BranchHint::kFalse),
                          gasm_->WordEqual(object, RefNull()), control());
     SetControl(graph()->NewNode(mcgraph()->common()->IfFalse(), null_branch));
-    merge_controls.emplace_back(
+    no_match_controls.emplace_back(
         graph()->NewNode(mcgraph()->common()->IfTrue(), null_branch));
-    merge_effects.emplace_back(effect());
+    no_match_effects.emplace_back(effect());
   }
 
   // At this point, {object} is neither null nor an i31ref/Smi.
-  Node* map = gasm_->Load(MachineType::TaggedPointer(), object,
-                          HeapObject::kMapOffset - kHeapObjectTag);
-  // TODO(7748): Add a fast path for map == rtt.
-  Node* subtype_check = BuildChangeSmiToInt32(CALL_BUILTIN(
-      WasmIsRttSubtype, map, rtt,
-      LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer())));
-  Node* cast_branch =
-      graph()->NewNode(mcgraph()->common()->Branch(BranchHint::kFalse),
-                       subtype_check, control());
-  *match_control = graph()->NewNode(mcgraph()->common()->IfTrue(), cast_branch);
-  *match_effect = effect();
-  Node* not_subtype =
-      graph()->NewNode(mcgraph()->common()->IfFalse(), cast_branch);
-
-  // Wire up the "cast attempt was unsuccessful" control nodes: merge them if
-  // there is more than one.
-  if (merge_controls.size() > 0) {
-    merge_controls.emplace_back(not_subtype);
-    merge_effects.emplace_back(effect());
-    // Range is 1..3, so casting to int is safe.
-    DCHECK_EQ(merge_controls.size(), merge_effects.size());
-    unsigned count = static_cast<unsigned>(merge_controls.size());
-    *no_match_control = Merge(count, merge_controls.data());
-    // EffectPhis need their control dependency as an additional input.
-    merge_effects.emplace_back(*no_match_control);
-    *no_match_effect = EffectPhi(count, merge_effects.data());
-  } else {
-    *no_match_control = not_subtype;
-    *no_match_effect = effect();
-  }
+  Node* map = gasm_->LoadMap(object);
+  Node* exact_match =
+      graph()->NewNode(mcgraph()->common()->Branch(BranchHint::kTrue),
+                       gasm_->TaggedEqual(map, rtt), control());
+  match_controls.emplace_back(
+      graph()->NewNode(mcgraph()->common()->IfTrue(), exact_match));
+  match_effects.emplace_back(effect());
+  SetControl(graph()->NewNode(mcgraph()->common()->IfFalse(), exact_match));
+  if (!config.object_must_be_data_ref) {
+    Node* is_data_ref =
+        graph()->NewNode(mcgraph()->common()->Branch(BranchHint::kTrue),
+                         gasm_->IsDataRefMap(map), control());
+    no_match_controls.emplace_back(
+        graph()->NewNode(mcgraph()->common()->IfFalse(), is_data_ref));
+    no_match_effects.emplace_back(effect());
+    SetControl(graph()->NewNode(mcgraph()->common()->IfTrue(), is_data_ref));
+  }
+  Node* type_info = gasm_->LoadWasmTypeInfo(map);
+  Node* supertypes = gasm_->LoadSupertypes(type_info);
+  Node* length =
+      BuildChangeSmiToInt32(gasm_->LoadFixedArrayLengthAsSmi(supertypes));
+  Node* length_sufficient = graph()->NewNode(
+      mcgraph()->common()->Branch(BranchHint::kTrue),
+      gasm_->Uint32LessThan(gasm_->Int32Constant(config.rtt_depth), length),
+      control());
+  no_match_controls.emplace_back(
+      graph()->NewNode(mcgraph()->common()->IfFalse(), length_sufficient));
+  no_match_effects.emplace_back(effect());
+  SetControl(
+      graph()->NewNode(mcgraph()->common()->IfTrue(), length_sufficient));
+  Node* maybe_match = gasm_->LoadFixedArrayElement(
+      supertypes, config.rtt_depth, MachineType::TaggedPointer());
+  Node* supertype_match =
+      graph()->NewNode(mcgraph()->common()->Branch(BranchHint::kTrue),
+                       gasm_->TaggedEqual(maybe_match, rtt), control());
+  match_controls.emplace_back(
+      graph()->NewNode(mcgraph()->common()->IfTrue(), supertype_match));
+  match_effects.emplace_back(effect());
+  no_match_controls.emplace_back(
+      graph()->NewNode(mcgraph()->common()->IfFalse(), supertype_match));
+  no_match_effects.emplace_back(effect());
+
+  // Wire up the control/effect nodes.
+  unsigned count = static_cast<unsigned>(match_controls.size());
+  DCHECK_EQ(2, count);
+  *match_control = Merge(count, match_controls.data());
+  // EffectPhis need their control dependency as an additional input.
+  match_effects.emplace_back(*match_control);
+  *match_effect = EffectPhi(count, match_effects.data());
+  DCHECK_EQ(no_match_controls.size(), no_match_effects.size());
+  // Range is 2..4, so casting to unsigned is safe.
+  count = static_cast<unsigned>(no_match_controls.size());
+  *no_match_control = Merge(count, no_match_controls.data());
+  // EffectPhis need their control dependency as an additional input.
+  no_match_effects.emplace_back(*no_match_control);
+  *no_match_effect = EffectPhi(count, no_match_effects.data());
+
   // Return value is not used, but we need it for compatibility
   // with graph-builder-interface.
   return nullptr;
@@ -5825,10 +5937,10 @@ Node* WasmGraphBuilder::StructGet(Node* struct_object,
     TrapIfTrue(wasm::kTrapNullDereference,
                gasm_->WordEqual(struct_object, RefNull()), position);
   }
-  MachineType machine_type = FieldType(struct_type, field_index, is_signed);
-  Node* offset = FieldOffset(mcgraph(), struct_type, field_index);
-  return LoadWithTaggedAlignment(gasm_.get(), machine_type, struct_object,
-                                 offset);
+  MachineType machine_type =
+      gasm_->FieldType(struct_type, field_index, is_signed);
+  Node* offset = gasm_->FieldOffset(struct_type, field_index);
+  return gasm_->LoadWithTaggedAlignment(machine_type, struct_object, offset);
 }
 
 Node* WasmGraphBuilder::StructSet(Node* struct_object,
@@ -5840,13 +5952,13 @@ Node* WasmGraphBuilder::StructSet(Node* struct_object,
     TrapIfTrue(wasm::kTrapNullDereference,
                gasm_->WordEqual(struct_object, RefNull()), position);
   }
-  return StoreStructFieldUnchecked(mcgraph(), gasm_.get(), struct_object,
-                                   struct_type, field_index, field_value);
+  return gasm_->StoreStructField(struct_object, struct_type, field_index,
+                                 field_value);
 }
 
 void WasmGraphBuilder::BoundsCheck(Node* array, Node* index,
                                    wasm::WasmCodePosition position) {
-  Node* length = ArrayLength(gasm_.get(), array);
+  Node* length = gasm_->LoadWasmArrayLength(array);
   TrapIfFalse(wasm::kTrapArrayOutOfBounds, gasm_->Uint32LessThan(index, length),
               position);
 }
@@ -5862,9 +5974,8 @@ Node* WasmGraphBuilder::ArrayGet(Node* array_object,
   BoundsCheck(array_object, index, position);
   MachineType machine_type = MachineType::TypeForRepresentation(
       type->element_type().machine_representation(), is_signed);
-  Node* offset = ArrayElementOffset(gasm_.get(), index, type->element_type());
-  return LoadWithTaggedAlignment(gasm_.get(), machine_type, array_object,
-                                 offset);
+  Node* offset = gasm_->WasmArrayElementOffset(index, type->element_type());
+  return gasm_->LoadWithTaggedAlignment(machine_type, array_object, offset);
 }
 
 Node* WasmGraphBuilder::ArraySet(Node* array_object,
@@ -5876,16 +5987,18 @@ Node* WasmGraphBuilder::ArraySet(Node* array_object,
                gasm_->WordEqual(array_object, RefNull()), position);
   }
   BoundsCheck(array_object, index, position);
-  Node* offset = ArrayElementOffset(gasm_.get(), index, type->element_type());
-  return StoreWithTaggedAlignment(gasm_.get(), array_object, offset, value,
-                                  type->element_type());
+  Node* offset = gasm_->WasmArrayElementOffset(index, type->element_type());
+  return gasm_->StoreWithTaggedAlignment(array_object, offset, value,
+                                         type->element_type());
 }
 
-Node* WasmGraphBuilder::ArrayLen(Node* array_object,
+Node* WasmGraphBuilder::ArrayLen(Node* array_object, CheckForNull null_check,
                                  wasm::WasmCodePosition position) {
-  TrapIfTrue(wasm::kTrapNullDereference,
-             gasm_->WordEqual(array_object, RefNull()), position);
-  return ArrayLength(gasm_.get(), array_object);
+  if (null_check == kWithNullCheck) {
+    TrapIfTrue(wasm::kTrapNullDereference,
+               gasm_->WordEqual(array_object, RefNull()), position);
+  }
+  return gasm_->LoadWasmArrayLength(array_object);
 }
 
 // 1 bit V8 Smi tag, 31 bits V8 Smi shift, 1 bit i31ref high-bit truncation.
@@ -5997,16 +6110,12 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
 
   Node* BuildLoadUndefinedValueFromInstance() {
     if (undefined_value_node_ == nullptr) {
-      Node* isolate_root = graph()->NewNode(
-          mcgraph()->machine()->Load(MachineType::Pointer()),
-          instance_node_.get(),
-          mcgraph()->Int32Constant(WASM_INSTANCE_OBJECT_OFFSET(IsolateRoot)),
-          graph()->start(), graph()->start());
-      undefined_value_node_ = graph()->NewNode(
-          mcgraph()->machine()->Load(MachineType::Pointer()), isolate_root,
+      Node* isolate_root =
+          LOAD_INSTANCE_FIELD(IsolateRoot, MachineType::Pointer());
+      undefined_value_node_ = gasm_->Load(
+          MachineType::Pointer(), isolate_root,
           mcgraph()->Int32Constant(
-              IsolateData::root_slot_offset(RootIndex::kUndefinedValue)),
-          isolate_root, graph()->start());
+              IsolateData::root_slot_offset(RootIndex::kUndefinedValue)));
     }
     return undefined_value_node_.get();
   }
@@ -6056,12 +6165,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
     auto builtin = gasm_->MakeDeferredLabel();
     auto done = gasm_->MakeLabel(MachineRepresentation::kWord32);
 
-    // Test if value is a Smi.
-    Node* is_smi =
-        gasm_->Word32Equal(gasm_->Word32And(BuildTruncateIntPtrToInt32(value),
-                                            gasm_->Int32Constant(kSmiTagMask)),
-                           gasm_->Int32Constant(0));
-    gasm_->GotoIfNot(is_smi, &builtin);
+    gasm_->GotoIfNot(IsSmi(value), &builtin);
 
     // If Smi, convert to int32.
     Node* smi = BuildChangeSmiToInt32(value);
@@ -6147,7 +6251,6 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
       case wasm::ValueType::kS128:
         UNREACHABLE();
       case wasm::ValueType::kI64: {
-        DCHECK(enabled_features_.has_bigint());
         return BuildChangeInt64ToBigInt(node);
       }
       case wasm::ValueType::kF32:
@@ -6163,14 +6266,26 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
           return node;
         }
         if (representation == wasm::HeapType::kEq) {
+          // TODO(7748): Update this when JS interop is settled.
           return BuildAllocateObjectWrapper(node);
         }
+        if (representation == wasm::HeapType::kAny) {
+          // Only wrap {node} if it is an array or struct.
+          // TODO(7748): Update this when JS interop is settled.
+          auto done = gasm_->MakeLabel(MachineRepresentation::kTaggedPointer);
+          gasm_->GotoIfNot(gasm_->IsDataRefMap(gasm_->LoadMap(node)), &done,
+                           node);
+          Node* wrapped = BuildAllocateObjectWrapper(node);
+          gasm_->Goto(&done, wrapped);
+          gasm_->Bind(&done);
+          return done.PhiAt(0);
+        }
         if (type.has_index() && module_->has_signature(type.ref_index())) {
           // Typed function
           return node;
         }
-        // TODO(7748): Figure out a JS interop story for arrays and structs.
         // If this is reached, then IsJSCompatibleSignature() is too permissive.
+        // TODO(7748): Figure out a JS interop story for arrays and structs.
         UNREACHABLE();
       }
       case wasm::ValueType::kRtt:
@@ -6193,7 +6308,9 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
         LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer()));
   }
 
-  Node* BuildUnpackObjectWrapper(Node* input) {
+  enum UnpackFailureBehavior : bool { kReturnInput, kReturnNull };
+
+  Node* BuildUnpackObjectWrapper(Node* input, UnpackFailureBehavior failure) {
     Node* obj = CALL_BUILTIN(
         WasmGetOwnProperty, input,
         LOAD_FULL_POINTER(BuildLoadIsolateRoot(),
@@ -6201,15 +6318,15 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
                               RootIndex::kwasm_wrapped_object_symbol)),
         LOAD_INSTANCE_FIELD(NativeContext, MachineType::TaggedPointer()));
     // Invalid object wrappers (i.e. any other JS object that doesn't have the
-    // magic hidden property) will return {undefined}. Map that to {null}.
-    Node* undefined = LOAD_FULL_POINTER(
-        BuildLoadIsolateRoot(),
-        IsolateData::root_slot_offset(RootIndex::kUndefinedValue));
+    // magic hidden property) will return {undefined}. Map that to {null} or
+    // {input}, depending on the value of {failure}.
+    Node* undefined = BuildLoadUndefinedValueFromInstance();
     Node* is_undefined = gasm_->WordEqual(obj, undefined);
     Diamond check(graph(), mcgraph()->common(), is_undefined,
                   BranchHint::kFalse);
     check.Chain(control());
-    return check.Phi(MachineRepresentation::kTagged, RefNull(), obj);
+    return check.Phi(MachineRepresentation::kTagged,
+                     failure == kReturnInput ? input : RefNull(), obj);
   }
 
   Node* BuildChangeInt64ToBigInt(Node* input) {
@@ -6285,12 +6402,17 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
           case wasm::HeapType::kExtern:
           case wasm::HeapType::kExn:
             return input;
+          case wasm::HeapType::kAny:
+            // If this is a wrapper for arrays/structs, unpack it.
+            // TODO(7748): Update this when JS interop has settled.
+            return BuildUnpackObjectWrapper(input, kReturnInput);
           case wasm::HeapType::kFunc:
             BuildCheckValidRefValue(input, js_context, type);
             return input;
           case wasm::HeapType::kEq:
+            // TODO(7748): Update this when JS interop has settled.
             BuildCheckValidRefValue(input, js_context, type);
-            return BuildUnpackObjectWrapper(input);
+            return BuildUnpackObjectWrapper(input, kReturnNull);
           case wasm::HeapType::kI31:
             // If this is reached, then IsJSCompatibleSignature() is too
             // permissive.
@@ -6318,7 +6440,6 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
 
       case wasm::ValueType::kI64:
         // i64 values can only come from BigInt.
-        DCHECK(enabled_features_.has_bigint());
         return BuildChangeBigIntToInt64(input, js_context);
 
       case wasm::ValueType::kRtt:  // TODO(7748): Implement.
@@ -6429,12 +6550,6 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
         mcgraph()->Int32Constant(new_value ? 1 : 0), effect(), control()));
   }
 
-  Node* BuildLoadInstanceFromExportedFunctionData(Node* function_data) {
-    return gasm_->Load(
-        MachineType::AnyTagged(), function_data,
-        WasmExportedFunctionData::kInstanceOffset - kHeapObjectTag);
-  }
-
   Node* BuildMultiReturnFixedArrayFromIterable(const wasm::FunctionSig* sig,
                                                Node* iterable, Node* context) {
     Node* length = BuildChangeUint31ToSmi(
@@ -6442,13 +6557,6 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
     return CALL_BUILTIN(IterableToFixedArrayForWasm, iterable, length, context);
   }
 
-  // Extract the FixedArray implementing
-  // the backing storage of a JavaScript array.
-  Node* BuildLoadArrayBackingStorage(Node* js_array) {
-    return gasm_->Load(MachineType::AnyTagged(), js_array,
-                       JSObject::kElementsOffset - kHeapObjectTag);
-  }
-
   // Generate a call to the AllocateJSArray builtin.
   Node* BuildCallAllocateJSArray(Node* array_length, Node* context) {
     // Since we don't check that args will fit in an array,
@@ -6470,8 +6578,8 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
     if (is_import) {
       // Call to an imported function.
       // Load function index from {WasmExportedFunctionData}.
-      Node* function_index =
-          BuildLoadFunctionIndexFromExportedFunctionData(function_data);
+      Node* function_index = BuildChangeSmiToInt32(
+          gasm_->LoadExportedFunctionIndexAsSmi(function_data));
       BuildImportCall(sig_, VectorOf(args), VectorOf(rets),
                       wasm::kNoCodePosition, function_index, kCallContinues);
     } else {
@@ -6494,7 +6602,14 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
 
     Node* jsval;
     if (sig_->return_count() == 0) {
-      jsval = BuildLoadUndefinedValueFromInstance();
+      // We do not use {BuildLoadUndefinedValueFromInstance} here because it
+      // would create an invalid graph.
+      Node* isolate_root =
+          LOAD_INSTANCE_FIELD(IsolateRoot, MachineType::Pointer());
+      jsval = gasm_->Load(
+          MachineType::Pointer(), isolate_root,
+          mcgraph()->Int32Constant(
+              IsolateData::root_slot_offset(RootIndex::kUndefinedValue)));
     } else if (sig_->return_count() == 1) {
       jsval = ToJS(rets[0], sig_->GetReturn());
     } else {
@@ -6504,7 +6619,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
 
       jsval = BuildCallAllocateJSArray(size, js_context);
 
-      Node* fixed_array = BuildLoadArrayBackingStorage(jsval);
+      Node* fixed_array = gasm_->LoadJSArrayElements(jsval);
 
       for (int i = 0; i < return_count; ++i) {
         Node* value = ToJS(rets[i], sig_->GetReturn(i));
@@ -6542,7 +6657,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
     return gasm_->Word32Equal(
         gasm_->Word32And(BuildTruncateIntPtrToInt32(input),
                          gasm_->Int32Constant(kSmiTagMask)),
-        gasm_->Int32Constant(0));
+        gasm_->Int32Constant(kSmiTag));
   }
 
   void CanTransformFast(
@@ -6603,9 +6718,8 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
     // an actual reference to an instance or a placeholder reference,
     // called {WasmExportedFunction} via the {WasmExportedFunctionData}
     // structure.
-    Node* function_data = BuildLoadFunctionDataFromJSFunction(js_closure);
-    instance_node_.set(
-        BuildLoadInstanceFromExportedFunctionData(function_data));
+    Node* function_data = gasm_->LoadFunctionDataFromJSFunction(js_closure);
+    instance_node_.set(gasm_->LoadExportedFunctionInstance(function_data));
 
     if (!wasm::IsJSCompatibleSignature(sig_, module_, enabled_features_)) {
       // Throw a TypeError. Use the js_context of the calling javascript
@@ -6675,9 +6789,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
   Node* BuildReceiverNode(Node* callable_node, Node* native_context,
                           Node* undefined_node) {
     // Check function strict bit.
-    Node* shared_function_info = gasm_->Load(
-        MachineType::TaggedPointer(), callable_node,
-        wasm::ObjectAccess::SharedFunctionInfoOffsetInTaggedJSFunction());
+    Node* shared_function_info = gasm_->LoadSharedFunctionInfo(callable_node);
     Node* flags =
         gasm_->Load(MachineType::Int32(), shared_function_info,
                     wasm::ObjectAccess::FlagsOffsetInSharedFunctionInfo());
@@ -6738,8 +6850,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
         base::SmallVector<Node*, 16> args(wasm_count + 7);
         int pos = 0;
         Node* function_context =
-            gasm_->Load(MachineType::TaggedPointer(), callable_node,
-                        wasm::ObjectAccess::ContextOffsetInTaggedJSFunction());
+            gasm_->LoadContextFromJSFunction(callable_node);
         args[pos++] = callable_node;  // target callable.
 
         // Determine receiver at runtime.
@@ -6786,8 +6897,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
         args[pos++] = mcgraph()->Int32Constant(wasm_count);  // argument count
 
         Node* function_context =
-            gasm_->Load(MachineType::TaggedPointer(), callable_node,
-                        wasm::ObjectAccess::ContextOffsetInTaggedJSFunction());
+            gasm_->LoadContextFromJSFunction(callable_node);
         args[pos++] = function_context;
         args[pos++] = effect();
         args[pos++] = control();
@@ -6807,8 +6917,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
         base::SmallVector<Node*, 16> args(wasm_count + 9);
         int pos = 0;
         Node* function_context =
-            gasm_->Load(MachineType::TaggedPointer(), callable_node,
-                        wasm::ObjectAccess::ContextOffsetInTaggedJSFunction());
+            gasm_->LoadContextFromJSFunction(callable_node);
         args[pos++] =
             GetBuiltinPointerTarget(Builtins::kArgumentsAdaptorTrampoline);
         args[pos++] = callable_node;                         // target callable
@@ -6816,16 +6925,12 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
         args[pos++] = mcgraph()->Int32Constant(wasm_count);  // argument count
 
         // Load shared function info, and then the formal parameter count.
-        Node* shared_function_info = gasm_->Load(
-            MachineType::TaggedPointer(), callable_node,
-            wasm::ObjectAccess::SharedFunctionInfoOffsetInTaggedJSFunction());
-        Node* formal_param_count = SetEffect(graph()->NewNode(
-            mcgraph()->machine()->Load(MachineType::Uint16()),
-            shared_function_info,
-            mcgraph()->Int32Constant(
-                wasm::ObjectAccess::
-                    FormalParameterCountOffsetInSharedFunctionInfo()),
-            effect(), control()));
+        Node* shared_function_info =
+            gasm_->LoadSharedFunctionInfo(callable_node);
+        Node* formal_param_count =
+            gasm_->Load(MachineType::Uint16(), shared_function_info,
+                        wasm::ObjectAccess::
+                            FormalParameterCountOffsetInSharedFunctionInfo());
         args[pos++] = formal_param_count;
 
         // Determine receiver at runtime.
@@ -6944,15 +7049,11 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
     }
     // The function is passed as the last parameter, after Wasm arguments.
     Node* function_node = Param(param_count + 1);
-    Node* shared = gasm_->Load(
-        MachineType::AnyTagged(), function_node,
-        wasm::ObjectAccess::SharedFunctionInfoOffsetInTaggedJSFunction());
-    Node* sfi_data =
-        gasm_->Load(MachineType::AnyTagged(), shared,
-                    SharedFunctionInfo::kFunctionDataOffset - kHeapObjectTag);
+    Node* sfi_data = gasm_->LoadFunctionDataFromJSFunction(function_node);
     Node* host_data_foreign =
         gasm_->Load(MachineType::AnyTagged(), sfi_data,
-                    WasmCapiFunctionData::kEmbedderDataOffset - kHeapObjectTag);
+                    wasm::ObjectAccess::ToTagged(
+                        WasmCapiFunctionData::kEmbedderDataOffset));
 
     BuildModifyThreadInWasmFlag(false);
     Node* isolate_root = BuildLoadIsolateRoot();
@@ -7042,12 +7143,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
     }
 
     // Load the original callable from the closure.
-    Node* shared = LOAD_TAGGED_ANY(
-        closure,
-        wasm::ObjectAccess::ToTagged(JSFunction::kSharedFunctionInfoOffset));
-    Node* func_data = LOAD_TAGGED_ANY(
-        shared,
-        wasm::ObjectAccess::ToTagged(SharedFunctionInfo::kFunctionDataOffset));
+    Node* func_data = gasm_->LoadFunctionDataFromJSFunction(closure);
     Node* callable = LOAD_TAGGED_ANY(
         func_data,
         wasm::ObjectAccess::ToTagged(WasmJSFunctionData::kCallableOffset));
@@ -7093,7 +7189,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
       Node* size =
           graph()->NewNode(mcgraph()->common()->NumberConstant(return_count));
       jsval = BuildCallAllocateJSArray(size, context);
-      Node* result_fixed_array = BuildLoadArrayBackingStorage(jsval);
+      Node* result_fixed_array = gasm_->LoadJSArrayElements(jsval);
       for (unsigned i = 0; i < sig_->return_count(); ++i) {
         const auto& type = sig_->GetReturn(i);
         Node* elem = LOAD_FIXED_ARRAY_SLOT_ANY(fixed_array, i);
@@ -7229,12 +7325,7 @@ std::unique_ptr<OptimizedCompilationJob> NewJSToWasmCompilationJob(
   //----------------------------------------------------------------------------
   // Create the compilation job.
   //----------------------------------------------------------------------------
-  constexpr size_t kMaxNameLen = 128;
-  constexpr size_t kNamePrefixLen = 11;
-  auto name_buffer = std::unique_ptr<char[]>(new char[kMaxNameLen]);
-  memcpy(name_buffer.get(), "js-to-wasm:", kNamePrefixLen);
-  PrintSignature(VectorOf(name_buffer.get(), kMaxNameLen) + kNamePrefixLen,
-                 sig);
+  std::unique_ptr<char[]> debug_name = WasmExportedFunction::GetDebugName(sig);
 
   int params = static_cast<int>(sig->parameter_count());
   CallDescriptor* incoming = Linkage::GetJSCallDescriptor(
@@ -7242,7 +7333,7 @@ std::unique_ptr<OptimizedCompilationJob> NewJSToWasmCompilationJob(
 
   return Pipeline::NewWasmHeapStubCompilationJob(
       isolate, wasm_engine, incoming, std::move(zone), graph,
-      CodeKind::JS_TO_WASM_FUNCTION, std::move(name_buffer),
+      CodeKind::JS_TO_WASM_FUNCTION, std::move(debug_name),
       WasmAssemblerOptions());
 }
 
@@ -7610,7 +7701,7 @@ MaybeHandle<Code> CompileWasmToJSWrapper(Isolate* isolate,
   constexpr size_t kMaxNameLen = 128;
   constexpr size_t kNamePrefixLen = 11;
   auto name_buffer = std::unique_ptr<char[]>(new char[kMaxNameLen]);
-  memcpy(name_buffer.get(), "wasm-to-js:", kNamePrefixLen);
+  base::Memcpy(name_buffer.get(), "wasm-to-js:", kNamePrefixLen);
   PrintSignature(VectorOf(name_buffer.get(), kMaxNameLen) + kNamePrefixLen,
                  sig);
 
@@ -7662,7 +7753,7 @@ MaybeHandle<Code> CompileJSToJSWrapper(Isolate* isolate,
   constexpr size_t kMaxNameLen = 128;
   constexpr size_t kNamePrefixLen = 9;
   auto name_buffer = std::unique_ptr<char[]>(new char[kMaxNameLen]);
-  memcpy(name_buffer.get(), "js-to-js:", kNamePrefixLen);
+  base::Memcpy(name_buffer.get(), "js-to-js:", kNamePrefixLen);
   PrintSignature(VectorOf(name_buffer.get(), kMaxNameLen) + kNamePrefixLen,
                  sig);
 
@@ -7717,7 +7808,7 @@ Handle<Code> CompileCWasmEntry(Isolate* isolate, const wasm::FunctionSig* sig,
   constexpr size_t kMaxNameLen = 128;
   constexpr size_t kNamePrefixLen = 13;
   auto name_buffer = std::unique_ptr<char[]>(new char[kMaxNameLen]);
-  memcpy(name_buffer.get(), "c-wasm-entry:", kNamePrefixLen);
+  base::Memcpy(name_buffer.get(), "c-wasm-entry:", kNamePrefixLen);
   PrintSignature(VectorOf(name_buffer.get(), kMaxNameLen) + kNamePrefixLen,
                  sig);
 
@@ -7819,7 +7910,7 @@ Vector<const char> GetDebugName(Zone* zone, int index) {
   DCHECK(name_len > 0 && name_len < name_vector.length());
 
   char* index_name = zone->NewArray<char>(name_len);
-  memcpy(index_name, name_vector.begin(), name_len);
+  base::Memcpy(index_name, name_vector.begin(), name_len);
   return Vector<const char>(index_name, name_len);
 }
 
diff --git a/deps/v8/src/compiler/wasm-compiler.h b/deps/v8/src/compiler/wasm-compiler.h
index c431f53efead65..00ec7a9f8b6715 100644
--- a/deps/v8/src/compiler/wasm-compiler.h
+++ b/deps/v8/src/compiler/wasm-compiler.h
@@ -162,6 +162,13 @@ struct WasmInstanceCacheNodes {
 // the wasm decoder from the internal details of TurboFan.
 class WasmGraphBuilder {
  public:
+  struct ObjectReferenceKnowledge {
+    bool object_can_be_null;
+    bool object_must_be_data_ref;
+    bool object_can_be_i31;
+    bool rtt_is_i31;
+    uint8_t rtt_depth;
+  };
   enum EnforceBoundsCheck : bool {  // --
     kNeedsBoundsCheck = true,
     kCanOmitBoundsCheck = false
@@ -174,14 +181,6 @@ class WasmGraphBuilder {
     kWithNullCheck = true,
     kWithoutNullCheck = false
   };
-  enum CheckForI31 : bool {  // --
-    kWithI31Check = true,
-    kNoI31Check = false
-  };
-  enum RttIsI31 : bool {  // --
-    kRttIsI31 = true,
-    kRttIsNotI31 = false
-  };
 
   V8_EXPORT_PRIVATE WasmGraphBuilder(
       wasm::CompilationEnv* env, Zone* zone, MachineGraph* mcgraph,
@@ -193,11 +192,13 @@ class WasmGraphBuilder {
   //-----------------------------------------------------------------------
   // Operations independent of {control} or {effect}.
   //-----------------------------------------------------------------------
-  Node* Error();
   Node* Start(unsigned params);
   Node* Param(unsigned index);
   Node* Loop(Node* entry);
   Node* TerminateLoop(Node* effect, Node* control);
+  Node* LoopExit(Node* loop_node);
+  // Assumes current control() is the corresponding loop exit.
+  Node* LoopExitValue(Node* value, MachineRepresentation representation);
   Node* TerminateThrow(Node* effect, Node* control);
   Node* Merge(unsigned count, Node** controls);
   Node* Phi(wasm::ValueType type, unsigned count, Node** vals_and_control);
@@ -223,7 +224,7 @@ class WasmGraphBuilder {
   Node* Rethrow(Node* except_obj);
   Node* ExceptionTagEqual(Node* caught_tag, Node* expected_tag);
   Node* LoadExceptionTagFromTable(uint32_t exception_index);
-  Node* GetExceptionTag(Node* except_obj, wasm::WasmCodePosition);
+  Node* GetExceptionTag(Node* except_obj);
   Node* GetExceptionValues(Node* except_obj,
                            const wasm::WasmException* exception,
                            Vector<Node*> values_out);
@@ -240,7 +241,6 @@ class WasmGraphBuilder {
   // Operations that read and/or write {control} and {effect}.
   //-----------------------------------------------------------------------
   Node* BranchNoHint(Node* cond, Node** true_node, Node** false_node);
-  Node* BranchExpectTrue(Node* cond, Node** true_node, Node** false_node);
   Node* BranchExpectFalse(Node* cond, Node** true_node, Node** false_node);
 
   Node* TrapIfTrue(wasm::TrapReason reason, Node* cond,
@@ -304,6 +304,8 @@ class WasmGraphBuilder {
   Node* CurrentMemoryPages();
   Node* TraceMemoryOperation(bool is_store, MachineRepresentation, Node* index,
                              uintptr_t offset, wasm::WasmCodePosition);
+  Node* Prefetch(Node* index, uint64_t offset, uint32_t alignment,
+                 bool temporal);
   Node* LoadMem(wasm::ValueType type, MachineType memtype, Node* index,
                 uint64_t offset, uint32_t alignment,
                 wasm::WasmCodePosition position);
@@ -317,12 +319,13 @@ class WasmGraphBuilder {
                       wasm::LoadTransformationKind transform, Node* index,
                       uint64_t offset, uint32_t alignment,
                       wasm::WasmCodePosition position);
-  Node* LoadLane(MachineType memtype, Node* value, Node* index, uint32_t offset,
+  Node* LoadLane(wasm::ValueType type, MachineType memtype, Node* value,
+                 Node* index, uint64_t offset, uint32_t alignment,
                  uint8_t laneidx, wasm::WasmCodePosition position);
   Node* StoreMem(MachineRepresentation mem_rep, Node* index, uint64_t offset,
                  uint32_t alignment, Node* val, wasm::WasmCodePosition position,
                  wasm::ValueType type);
-  Node* StoreLane(MachineRepresentation mem_rep, Node* index, uint32_t offset,
+  Node* StoreLane(MachineRepresentation mem_rep, Node* index, uint64_t offset,
                   uint32_t alignment, Node* val, uint8_t laneidx,
                   wasm::WasmCodePosition position, wasm::ValueType type);
   static void PrintDebugName(Node* node);
@@ -417,7 +420,8 @@ class WasmGraphBuilder {
                   uint32_t field_index, Node* value, CheckForNull null_check,
                   wasm::WasmCodePosition position);
   Node* ArrayNewWithRtt(uint32_t array_index, const wasm::ArrayType* type,
-                        Node* length, Node* initial_value, Node* rtt);
+                        Node* length, Node* initial_value, Node* rtt,
+                        wasm::WasmCodePosition position);
   void BoundsCheck(Node* array, Node* index, wasm::WasmCodePosition position);
   Node* ArrayGet(Node* array_object, const wasm::ArrayType* type, Node* index,
                  CheckForNull null_check, bool is_signed,
@@ -425,19 +429,17 @@ class WasmGraphBuilder {
   Node* ArraySet(Node* array_object, const wasm::ArrayType* type, Node* index,
                  Node* value, CheckForNull null_check,
                  wasm::WasmCodePosition position);
-  Node* ArrayLen(Node* array_object, wasm::WasmCodePosition position);
+  Node* ArrayLen(Node* array_object, CheckForNull null_check,
+                 wasm::WasmCodePosition position);
   Node* I31New(Node* input);
   Node* I31GetS(Node* input);
   Node* I31GetU(Node* input);
   Node* RttCanon(wasm::HeapType type);
   Node* RttSub(wasm::HeapType type, Node* parent_rtt);
-  Node* RefTest(Node* object, Node* rtt, CheckForNull null_check,
-                CheckForI31 i31_check, RttIsI31 rtt_is_i31);
-  Node* RefCast(Node* object, Node* rtt, CheckForNull null_check,
-                CheckForI31 i31_check, RttIsI31 rtt_is_i31,
+  Node* RefTest(Node* object, Node* rtt, ObjectReferenceKnowledge config);
+  Node* RefCast(Node* object, Node* rtt, ObjectReferenceKnowledge config,
                 wasm::WasmCodePosition position);
-  Node* BrOnCast(Node* object, Node* rtt, CheckForNull null_check,
-                 CheckForI31 i31_check, RttIsI31 rtt_is_i31,
+  Node* BrOnCast(Node* object, Node* rtt, ObjectReferenceKnowledge config,
                  Node** match_control, Node** match_effect,
                  Node** no_match_control, Node** no_match_effect);
 
@@ -467,16 +469,6 @@ class WasmGraphBuilder {
   // BoundsCheckMem receives a uint32 {index} node and returns a ptrsize index.
   Node* BoundsCheckMem(uint8_t access_size, Node* index, uint64_t offset,
                        wasm::WasmCodePosition, EnforceBoundsCheck);
-  // Check that the range [start, start + size) is in the range [0, max).
-  // Also updates *size with the valid range. Returns true if the range is
-  // partially out-of-bounds, traps if it is completely out-of-bounds.
-  Node* BoundsCheckRange(Node* start, Node** size, Node* max,
-                         wasm::WasmCodePosition);
-  // BoundsCheckMemRange receives a uint32 {start} and {size}, and checks if it
-  // is in bounds. Also updates *size with the valid range, and converts *start
-  // to a pointer into memory at that index. Returns true if the range is
-  // partially out-of-bounds, traps if it is completely out-of-bounds.
-  Node* BoundsCheckMemRange(Node** start, Node** size, wasm::WasmCodePosition);
 
   Node* CheckBoundsAndAlignment(int8_t access_size, Node* index,
                                 uint64_t offset, wasm::WasmCodePosition);
@@ -620,9 +612,7 @@ class WasmGraphBuilder {
   Node* BuildMultiReturnFixedArrayFromIterable(const wasm::FunctionSig* sig,
                                                Node* iterable, Node* context);
 
-  Node* BuildLoadFunctionDataFromJSFunction(Node* closure);
   Node* BuildLoadJumpTableOffsetFromExportedFunctionData(Node* function_data);
-  Node* BuildLoadFunctionIndexFromExportedFunctionData(Node* function_data);
 
   //-----------------------------------------------------------------------
   // Operations involving the CEntry, a dependency we want to remove
diff --git a/deps/v8/src/compiler/zone-stats.h b/deps/v8/src/compiler/zone-stats.h
index 8e0f4fa72a3dcc..c69c00f9a0a900 100644
--- a/deps/v8/src/compiler/zone-stats.h
+++ b/deps/v8/src/compiler/zone-stats.h
@@ -18,7 +18,7 @@ namespace compiler {
 
 class V8_EXPORT_PRIVATE ZoneStats final {
  public:
-  class Scope final {
+  class V8_NODISCARD Scope final {
    public:
     explicit Scope(ZoneStats* zone_stats, const char* zone_name,
                    bool support_zone_compression = false)
@@ -51,7 +51,7 @@ class V8_EXPORT_PRIVATE ZoneStats final {
     const bool support_zone_compression_;
   };
 
-  class V8_EXPORT_PRIVATE StatsScope final {
+  class V8_EXPORT_PRIVATE V8_NODISCARD StatsScope final {
    public:
     explicit StatsScope(ZoneStats* zone_stats);
     ~StatsScope();
diff --git a/deps/v8/src/d8/OWNERS b/deps/v8/src/d8/OWNERS
index d57b8cb7791f8f..03aa62dda98ed4 100644
--- a/deps/v8/src/d8/OWNERS
+++ b/deps/v8/src/d8/OWNERS
@@ -1,5 +1,6 @@
 binji@chromium.org
 bmeurer@chromium.org
+cbruni@chromium.org
 clemensb@chromium.org
 ulan@chromium.org
 verwaest@chromium.org
diff --git a/deps/v8/src/d8/async-hooks-wrapper.cc b/deps/v8/src/d8/async-hooks-wrapper.cc
index fc58db9bd8fbd7..2538e78acbc088 100644
--- a/deps/v8/src/d8/async-hooks-wrapper.cc
+++ b/deps/v8/src/d8/async-hooks-wrapper.cc
@@ -52,7 +52,7 @@ static AsyncHooksWrap* UnwrapHook(
     return nullptr;
   }
 
-  Local<External> wrap = Local<External>::Cast(hook->GetInternalField(0));
+  Local<External> wrap = hook->GetInternalField(0).As<External>();
   void* ptr = wrap->Value();
   return static_cast<AsyncHooksWrap*>(ptr);
 }
diff --git a/deps/v8/src/d8/cov.cc b/deps/v8/src/d8/cov.cc
index d95134a99586b0..26b4b830a67203 100644
--- a/deps/v8/src/d8/cov.cc
+++ b/deps/v8/src/d8/cov.cc
@@ -14,6 +14,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "src/base/platform/wrappers.h"
+
 #define SHM_SIZE 0x100000
 #define MAX_EDGES ((SHM_SIZE - 4) * 8)
 
@@ -40,7 +42,7 @@ extern "C" void __sanitizer_cov_trace_pc_guard_init(uint32_t* start,
   const char* shm_key = getenv("SHM_ID");
   if (!shm_key) {
     puts("[COV] no shared memory bitmap available, skipping");
-    shmem = (struct shmem_data*)malloc(SHM_SIZE);
+    shmem = (struct shmem_data*)v8::base::Malloc(SHM_SIZE);
   } else {
     int fd = shm_open(shm_key, O_RDWR, S_IREAD | S_IWRITE);
     if (fd <= -1) {
diff --git a/deps/v8/src/d8/d8-platforms.cc b/deps/v8/src/d8/d8-platforms.cc
index e42ee60a16828a..40cba2c69e2a19 100644
--- a/deps/v8/src/d8/d8-platforms.cc
+++ b/deps/v8/src/d8/d8-platforms.cc
@@ -23,6 +23,9 @@ class PredictablePlatform final : public Platform {
     DCHECK_NOT_NULL(platform_);
   }
 
+  PredictablePlatform(const PredictablePlatform&) = delete;
+  PredictablePlatform& operator=(const PredictablePlatform&) = delete;
+
   PageAllocator* GetPageAllocator() override {
     return platform_->GetPageAllocator();
   }
@@ -85,8 +88,6 @@ class PredictablePlatform final : public Platform {
  private:
   double synthetic_time_in_sec_ = 0.0;
   std::unique_ptr<Platform> platform_;
-
-  DISALLOW_COPY_AND_ASSIGN(PredictablePlatform);
 };
 
 std::unique_ptr<Platform> MakePredictablePlatform(
@@ -107,6 +108,9 @@ class DelayedTasksPlatform final : public Platform {
     DCHECK_NOT_NULL(platform_);
   }
 
+  DelayedTasksPlatform(const DelayedTasksPlatform&) = delete;
+  DelayedTasksPlatform& operator=(const DelayedTasksPlatform&) = delete;
+
   ~DelayedTasksPlatform() override {
     // When the platform shuts down, all task runners must be freed.
     DCHECK_EQ(0, delayed_task_runners_.size());
@@ -318,8 +322,6 @@ class DelayedTasksPlatform final : public Platform {
     return std::make_unique<DelayedJob>(std::move(task),
                                         GetRandomDelayInMilliseconds());
   }
-
-  DISALLOW_COPY_AND_ASSIGN(DelayedTasksPlatform);
 };
 
 std::unique_ptr<Platform> MakeDelayedTasksPlatform(
diff --git a/deps/v8/src/d8/d8-posix.cc b/deps/v8/src/d8/d8-posix.cc
index c7313b44356d24..047b62ef2c4d02 100644
--- a/deps/v8/src/d8/d8-posix.cc
+++ b/deps/v8/src/d8/d8-posix.cc
@@ -16,6 +16,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "src/base/platform/wrappers.h"
 #include "src/d8/d8.h"
 
 namespace v8 {
@@ -316,7 +317,7 @@ static Local<Value> GetStdout(Isolate* isolate, int child_fd,
               .ToLocalChecked();
       accumulator = String::Concat(isolate, accumulator, addition);
       fullness = bytes_read + fullness - length;
-      memcpy(buffer, buffer + length, fullness);
+      base::Memcpy(buffer, buffer + length, fullness);
     }
   } while (bytes_read != 0);
   return accumulator;
@@ -422,7 +423,7 @@ void Shell::System(const v8::FunctionCallbackInfo<v8::Value>& args) {
           args.GetIsolate(), "system: Argument 2 must be an array"));
       return;
     }
-    command_args = Local<Array>::Cast(args[1]);
+    command_args = args[1].As<Array>();
   } else {
     command_args = Array::New(args.GetIsolate(), 0);
   }
diff --git a/deps/v8/src/d8/d8.cc b/deps/v8/src/d8/d8.cc
index da7f0e4dd14211..578d887b2cc629 100644
--- a/deps/v8/src/d8/d8.cc
+++ b/deps/v8/src/d8/d8.cc
@@ -13,6 +13,7 @@
 #include <iterator>
 #include <string>
 #include <tuple>
+#include <type_traits>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@@ -30,6 +31,7 @@
 #include "src/base/logging.h"
 #include "src/base/platform/platform.h"
 #include "src/base/platform/time.h"
+#include "src/base/platform/wrappers.h"
 #include "src/base/sys-info.h"
 #include "src/d8/d8-console.h"
 #include "src/d8/d8-platforms.h"
@@ -395,7 +397,7 @@ class TraceConfigParser {
     Local<String> source =
         String::NewFromUtf8(isolate, json_str).ToLocalChecked();
     Local<Value> result = JSON::Parse(context, source).ToLocalChecked();
-    Local<v8::Object> trace_config_object = Local<v8::Object>::Cast(result);
+    Local<v8::Object> trace_config_object = result.As<v8::Object>();
 
     UpdateIncludedCategoriesList(isolate, context, trace_config_object,
                                  trace_config);
@@ -408,7 +410,7 @@ class TraceConfigParser {
     Local<Value> value =
         GetValue(isolate, context, object, kIncludedCategoriesParam);
     if (value->IsArray()) {
-      Local<Array> v8_array = Local<Array>::Cast(value);
+      Local<Array> v8_array = value.As<Array>();
       for (int i = 0, length = v8_array->Length(); i < length; ++i) {
         Local<Value> v = v8_array->Get(context, i)
                              .ToLocalChecked()
@@ -463,6 +465,7 @@ base::LazyMutex Shell::workers_mutex_;
 bool Shell::allow_new_workers_ = true;
 std::unordered_set<std::shared_ptr<Worker>> Shell::running_workers_;
 std::atomic<bool> Shell::script_executed_{false};
+std::atomic<bool> Shell::valid_fuzz_script_{false};
 base::LazyMutex Shell::isolate_status_lock_;
 std::map<v8::Isolate*, bool> Shell::isolate_status_;
 std::map<v8::Isolate*, int> Shell::isolate_running_streaming_tasks_;
@@ -487,7 +490,7 @@ ScriptCompiler::CachedData* Shell::LookupCodeCache(Isolate* isolate,
   if (entry != cached_code_map_.end() && entry->second) {
     int length = entry->second->length;
     uint8_t* cache = new uint8_t[length];
-    memcpy(cache, entry->second->data, length);
+    base::Memcpy(cache, entry->second->data, length);
     ScriptCompiler::CachedData* cached_data = new ScriptCompiler::CachedData(
         cache, length, ScriptCompiler::CachedData::BufferOwned);
     return cached_data;
@@ -504,7 +507,7 @@ void Shell::StoreInCodeCache(Isolate* isolate, Local<Value> source,
   DCHECK(*key);
   int length = cache_data->length;
   uint8_t* cache = new uint8_t[length];
-  memcpy(cache, cache_data->data, length);
+  base::Memcpy(cache, cache_data->data, length);
   cached_code_map_[*key] = std::unique_ptr<ScriptCompiler::CachedData>(
       new ScriptCompiler::CachedData(cache, length,
                                      ScriptCompiler::CachedData::BufferOwned));
@@ -538,10 +541,11 @@ class DummySourceStream : public v8::ScriptCompiler::ExternalSourceStream {
 class StreamingCompileTask final : public v8::Task {
  public:
   StreamingCompileTask(Isolate* isolate,
-                       v8::ScriptCompiler::StreamedSource* streamed_source)
+                       v8::ScriptCompiler::StreamedSource* streamed_source,
+                       v8::ScriptType type)
       : isolate_(isolate),
-        script_streaming_task_(
-            v8::ScriptCompiler::StartStreaming(isolate, streamed_source)) {
+        script_streaming_task_(v8::ScriptCompiler::StartStreaming(
+            isolate, streamed_source, type)) {
     Shell::NotifyStartStreamingTask(isolate_);
   }
 
@@ -565,6 +569,80 @@ class StreamingCompileTask final : public v8::Task {
       script_streaming_task_;
 };
 
+namespace {
+template <class T>
+MaybeLocal<T> CompileStreamed(Local<Context> context,
+                              ScriptCompiler::StreamedSource* v8_source,
+                              Local<String> full_source_string,
+                              const ScriptOrigin& origin) {}
+
+template <>
+MaybeLocal<Script> CompileStreamed(Local<Context> context,
+                                   ScriptCompiler::StreamedSource* v8_source,
+                                   Local<String> full_source_string,
+                                   const ScriptOrigin& origin) {
+  return ScriptCompiler::Compile(context, v8_source, full_source_string,
+                                 origin);
+}
+
+template <>
+MaybeLocal<Module> CompileStreamed(Local<Context> context,
+                                   ScriptCompiler::StreamedSource* v8_source,
+                                   Local<String> full_source_string,
+                                   const ScriptOrigin& origin) {
+  return ScriptCompiler::CompileModule(context, v8_source, full_source_string,
+                                       origin);
+}
+
+template <class T>
+MaybeLocal<T> Compile(Local<Context> context, ScriptCompiler::Source* source,
+                      ScriptCompiler::CompileOptions options) {}
+template <>
+MaybeLocal<Script> Compile(Local<Context> context,
+                           ScriptCompiler::Source* source,
+                           ScriptCompiler::CompileOptions options) {
+  return ScriptCompiler::Compile(context, source, options);
+}
+
+template <>
+MaybeLocal<Module> Compile(Local<Context> context,
+                           ScriptCompiler::Source* source,
+                           ScriptCompiler::CompileOptions options) {
+  return ScriptCompiler::CompileModule(context->GetIsolate(), source, options);
+}
+
+}  // namespace
+
+template <class T>
+MaybeLocal<T> Shell::CompileString(Isolate* isolate, Local<Context> context,
+                                   Local<String> source,
+                                   const ScriptOrigin& origin) {
+  if (options.streaming_compile) {
+    v8::ScriptCompiler::StreamedSource streamed_source(
+        std::make_unique<DummySourceStream>(source),
+        v8::ScriptCompiler::StreamedSource::UTF8);
+    PostBlockingBackgroundTask(std::make_unique<StreamingCompileTask>(
+        isolate, &streamed_source,
+        std::is_same<T, Module>::value ? v8::ScriptType::kModule
+                                       : v8::ScriptType::kClassic));
+    // Pump the loop until the streaming task completes.
+    Shell::CompleteMessageLoop(isolate);
+    return CompileStreamed<T>(context, &streamed_source, source, origin);
+  }
+
+  ScriptCompiler::CachedData* cached_code = nullptr;
+  if (options.compile_options == ScriptCompiler::kConsumeCodeCache) {
+    cached_code = LookupCodeCache(isolate, source);
+  }
+  ScriptCompiler::Source script_source(source, origin, cached_code);
+  MaybeLocal<T> result =
+      Compile<T>(context, &script_source,
+                 cached_code ? ScriptCompiler::kConsumeCodeCache
+                             : ScriptCompiler::kNoCompileOptions);
+  if (cached_code) CHECK(!cached_code->rejected);
+  return result;
+}
+
 // Executes a string within the current v8 context.
 bool Shell::ExecuteString(Isolate* isolate, Local<String> source,
                           Local<Value> name, PrintResult print_result,
@@ -618,40 +696,9 @@ bool Shell::ExecuteString(Isolate* isolate, Local<String> source,
     Local<Context> context(isolate->GetCurrentContext());
     ScriptOrigin origin(name);
 
-    if (options.compile_options == ScriptCompiler::kConsumeCodeCache) {
-      ScriptCompiler::CachedData* cached_code =
-          LookupCodeCache(isolate, source);
-      if (cached_code != nullptr) {
-        ScriptCompiler::Source script_source(source, origin, cached_code);
-        maybe_script = ScriptCompiler::Compile(context, &script_source,
-                                               options.compile_options);
-        CHECK(!cached_code->rejected);
-      } else {
-        ScriptCompiler::Source script_source(source, origin);
-        maybe_script = ScriptCompiler::Compile(
-            context, &script_source, ScriptCompiler::kNoCompileOptions);
-      }
-    } else if (options.streaming_compile) {
-      v8::ScriptCompiler::StreamedSource streamed_source(
-          std::make_unique<DummySourceStream>(source),
-          v8::ScriptCompiler::StreamedSource::UTF8);
-
-      PostBlockingBackgroundTask(
-          std::make_unique<StreamingCompileTask>(isolate, &streamed_source));
-
-      // Pump the loop until the streaming task completes.
-      Shell::CompleteMessageLoop(isolate);
-
-      maybe_script =
-          ScriptCompiler::Compile(context, &streamed_source, source, origin);
-    } else {
-      ScriptCompiler::Source script_source(source, origin);
-      maybe_script = ScriptCompiler::Compile(context, &script_source,
-                                             options.compile_options);
-    }
-
     Local<Script> script;
-    if (!maybe_script.ToLocal(&script)) {
+    if (!CompileString<Script>(isolate, context, source, origin)
+             .ToLocal(&script)) {
       return false;
     }
 
@@ -820,7 +867,9 @@ void DisposeModuleEmbedderData(Local<Context> context) {
 
 MaybeLocal<Module> ResolveModuleCallback(Local<Context> context,
                                          Local<String> specifier,
+                                         Local<FixedArray> import_assertions,
                                          Local<Module> referrer) {
+  // TODO(v8:11189) Consider JSON modules support in d8.
   Isolate* isolate = context->GetIsolate();
   ModuleEmbedderData* d = GetModuleDataFromContext(context);
   auto specifier_it =
@@ -863,12 +912,13 @@ MaybeLocal<Module> Shell::FetchModuleTree(Local<Module> referrer,
     return MaybeLocal<Module>();
   }
   ScriptOrigin origin(
-      String::NewFromUtf8(isolate, file_name.c_str()).ToLocalChecked(),
-      Local<Integer>(), Local<Integer>(), Local<Boolean>(), Local<Integer>(),
-      Local<Value>(), Local<Boolean>(), Local<Boolean>(), True(isolate));
+      String::NewFromUtf8(isolate, file_name.c_str()).ToLocalChecked(), 0, 0,
+      false, -1, Local<Value>(), false, false, true);
   ScriptCompiler::Source source(source_text, origin);
+
   Local<Module> module;
-  if (!ScriptCompiler::CompileModule(isolate, &source).ToLocal(&module)) {
+  if (!CompileString<Module>(isolate, context, source_text, origin)
+           .ToLocal(&module)) {
     return MaybeLocal<Module>();
   }
 
@@ -881,8 +931,11 @@ MaybeLocal<Module> Shell::FetchModuleTree(Local<Module> referrer,
 
   std::string dir_name = DirName(file_name);
 
-  for (int i = 0, length = module->GetModuleRequestsLength(); i < length; ++i) {
-    Local<String> name = module->GetModuleRequest(i);
+  Local<FixedArray> module_requests = module->GetModuleRequests();
+  for (int i = 0, length = module_requests->Length(); i < length; ++i) {
+    Local<ModuleRequest> module_request =
+        module_requests->Get(context, i).As<ModuleRequest>();
+    Local<String> name = module_request->GetSpecifier();
     std::string absolute_path =
         NormalizePath(ToSTLString(isolate, name), dir_name);
     if (d->specifier_to_module_map.count(absolute_path)) continue;
@@ -894,8 +947,6 @@ MaybeLocal<Module> Shell::FetchModuleTree(Local<Module> referrer,
   return module;
 }
 
-namespace {
-
 struct DynamicImportData {
   DynamicImportData(Isolate* isolate_, Local<String> referrer_,
                     Local<String> specifier_,
@@ -912,6 +963,7 @@ struct DynamicImportData {
   Global<Promise::Resolver> resolver;
 };
 
+namespace {
 struct ModuleResolutionData {
   ModuleResolutionData(Isolate* isolate_, Local<Value> module_namespace_,
                        Local<Promise::Resolver> resolver_)
@@ -976,8 +1028,8 @@ MaybeLocal<Promise> Shell::HostImportModuleDynamically(
   Local<Promise::Resolver> resolver;
   if (maybe_resolver.ToLocal(&resolver)) {
     DynamicImportData* data = new DynamicImportData(
-        isolate, Local<String>::Cast(referrer->GetResourceName()), specifier,
-        resolver);
+        isolate, referrer->GetResourceName().As<String>(), specifier, resolver);
+    PerIsolateData::Get(isolate)->AddDynamicImportData(data);
     isolate->EnqueueMicrotask(Shell::DoHostImportModuleDynamically, data);
     return resolver->GetPromise();
   }
@@ -1004,8 +1056,9 @@ void Shell::HostInitializeImportMetaObject(Local<Context> context,
 }
 
 void Shell::DoHostImportModuleDynamically(void* import_data) {
-  std::unique_ptr<DynamicImportData> import_data_(
-      static_cast<DynamicImportData*>(import_data));
+  DynamicImportData* import_data_ =
+      static_cast<DynamicImportData*>(import_data);
+
   Isolate* isolate(import_data_->isolate);
   HandleScope handle_scope(isolate);
 
@@ -1014,6 +1067,8 @@ void Shell::DoHostImportModuleDynamically(void* import_data) {
   Local<Promise::Resolver> resolver(import_data_->resolver.Get(isolate));
 
   PerIsolateData* data = PerIsolateData::Get(isolate);
+  PerIsolateData::Get(isolate)->DeleteDynamicImportData(import_data_);
+
   Local<Context> realm = data->realms_[data->realm_current_].Get(isolate);
   Context::Scope context_scope(realm);
 
@@ -1055,7 +1110,7 @@ void Shell::DoHostImportModuleDynamically(void* import_data) {
 
   Local<Value> module_namespace = root_module->GetModuleNamespace();
   if (i::FLAG_harmony_top_level_await) {
-    Local<Promise> result_promise(Local<Promise>::Cast(result));
+    Local<Promise> result_promise(result.As<Promise>());
     if (result_promise->State() == Promise::kRejected) {
       resolver->Reject(realm, result_promise->Result()).ToChecked();
       return;
@@ -1123,7 +1178,7 @@ bool Shell::ExecuteModule(Isolate* isolate, const char* file_name) {
     // Loop until module execution finishes
     // TODO(cbruni): This is a bit wonky. "Real" engines would not be
     // able to just busy loop waiting for execution to finish.
-    Local<Promise> result_promise(Local<Promise>::Cast(result));
+    Local<Promise> result_promise(result.As<Promise>());
     while (result_promise->State() == Promise::kPending) {
       isolate->PerformMicrotaskCheckpoint();
     }
@@ -1161,6 +1216,11 @@ PerIsolateData::~PerIsolateData() {
   if (i::FLAG_expose_async_hooks) {
     delete async_hooks_wrapper_;  // This uses the isolate
   }
+#if defined(LEAK_SANITIZER)
+  for (DynamicImportData* data : import_data_) {
+    delete data;
+  }
+#endif
 }
 
 void PerIsolateData::SetTimeout(Local<Function> callback,
@@ -1224,6 +1284,18 @@ int PerIsolateData::HandleUnhandledPromiseRejections() {
   return static_cast<int>(i);
 }
 
+void PerIsolateData::AddDynamicImportData(DynamicImportData* data) {
+#if defined(LEAK_SANITIZER)
+  import_data_.insert(data);
+#endif
+}
+void PerIsolateData::DeleteDynamicImportData(DynamicImportData* data) {
+#if defined(LEAK_SANITIZER)
+  import_data_.erase(data);
+#endif
+  delete data;
+}
+
 PerIsolateData::RealmScope::RealmScope(PerIsolateData* data) : data_(data) {
   data_->realm_count_ = 1;
   data_->realm_current_ = 0;
@@ -1540,11 +1612,14 @@ void Shell::LogGetAndStop(const v8::FunctionCallbackInfo<v8::Value>& args) {
 
   std::string raw_log;
   FILE* log_file = i_isolate->logger()->TearDownAndGetLogFile();
-  CHECK_NOT_NULL(log_file);
+  if (!log_file) {
+    Throw(isolate, "Log file does not exist.");
+    return;
+  }
 
   bool exists = false;
   raw_log = i::ReadFile(log_file, &exists, true);
-  fclose(log_file);
+  base::Fclose(log_file);
 
   if (!exists) {
     Throw(isolate, "Unable to read log file.");
@@ -1600,7 +1675,7 @@ void WriteToFile(FILE* file, const v8::FunctionCallbackInfo<v8::Value>& args) {
     Local<String> str_obj;
 
     if (arg->IsSymbol()) {
-      arg = Local<Symbol>::Cast(arg)->Description();
+      arg = arg.As<Symbol>()->Description();
     }
     if (!arg->ToString(args.GetIsolate()->GetCurrentContext())
              .ToLocal(&str_obj)) {
@@ -1723,7 +1798,7 @@ void Shell::SetTimeout(const v8::FunctionCallbackInfo<v8::Value>& args) {
   Isolate* isolate = args.GetIsolate();
   args.GetReturnValue().Set(v8::Number::New(isolate, 0));
   if (args.Length() == 0 || !args[0]->IsFunction()) return;
-  Local<Function> callback = Local<Function>::Cast(args[0]);
+  Local<Function> callback = args[0].As<Function>();
   Local<Context> context = isolate->GetCurrentContext();
   PerIsolateData::Get(isolate)->SetTimeout(callback, context);
 }
@@ -1826,7 +1901,7 @@ void Shell::WorkerPostMessage(const v8::FunctionCallbackInfo<v8::Value>& args) {
 
   Local<Value> message = args[0];
   Local<Value> transfer =
-      args.Length() >= 2 ? args[1] : Local<Value>::Cast(Undefined(isolate));
+      args.Length() >= 2 ? args[1] : Undefined(isolate).As<Value>();
   std::unique_ptr<SerializationData> data =
       Shell::SerializeValue(isolate, message, transfer);
   if (data) {
@@ -2012,8 +2087,7 @@ void Shell::ReportException(Isolate* isolate, Local<v8::Message> message,
   if (v8::TryCatch::StackTrace(context, exception_obj)
           .ToLocal(&stack_trace_string) &&
       stack_trace_string->IsString()) {
-    v8::String::Utf8Value stack_trace(isolate,
-                                      Local<String>::Cast(stack_trace_string));
+    v8::String::Utf8Value stack_trace(isolate, stack_trace_string.As<String>());
     printf("%s\n", ToCString(stack_trace));
   }
   printf("\n");
@@ -2348,13 +2422,10 @@ void Shell::PromiseRejectCallback(v8::PromiseRejectMessage data) {
   }
   if (!exception->IsNativeError() &&
       (message.IsEmpty() || message->GetStackTrace().IsEmpty())) {
-    // If there is no real Error object, manually throw and catch a stack trace.
-    v8::TryCatch try_catch(isolate);
-    try_catch.SetVerbose(true);
-    isolate->ThrowException(v8::Exception::Error(
-        v8::String::NewFromUtf8Literal(isolate, "Unhandled Promise.")));
-    message = try_catch.Message();
-    exception = try_catch.Exception();
+    // If there is no real Error object, manually create a stack trace.
+    exception = v8::Exception::Error(
+        v8::String::NewFromUtf8Literal(isolate, "Unhandled Promise."));
+    message = Exception::CreateMessage(isolate, exception);
   }
   isolate->SetCaptureStackTraceForUncaughtExceptions(capture_exceptions);
 
@@ -2592,6 +2663,84 @@ void Shell::OnExit(v8::Isolate* isolate) {
 
   delete counters_file_;
   delete counter_map_;
+
+  if (options.simulate_errors && is_valid_fuzz_script()) {
+    // Simulate several errors detectable by fuzzers behind a flag if the
+    // minimum file size for fuzzing was executed.
+    FuzzerMonitor::SimulateErrors();
+  }
+}
+
+void Dummy(char* arg) {}
+
+V8_NOINLINE void FuzzerMonitor::SimulateErrors() {
+  // Initialize a fresh RNG to not interfere with JS execution.
+  std::unique_ptr<base::RandomNumberGenerator> rng;
+  int64_t seed = internal::FLAG_random_seed;
+  if (seed != 0) {
+    rng = std::make_unique<base::RandomNumberGenerator>(seed);
+  } else {
+    rng = std::make_unique<base::RandomNumberGenerator>();
+  }
+
+  double p = rng->NextDouble();
+  if (p < 0.1) {
+    ControlFlowViolation();
+  } else if (p < 0.2) {
+    DCheck();
+  } else if (p < 0.3) {
+    Fatal();
+  } else if (p < 0.4) {
+    ObservableDifference();
+  } else if (p < 0.5) {
+    UndefinedBehavior();
+  } else if (p < 0.6) {
+    UseAfterFree();
+  } else if (p < 0.7) {
+    UseOfUninitializedValue();
+  }
+}
+
+V8_NOINLINE void FuzzerMonitor::ControlFlowViolation() {
+  // Control flow violation caught by CFI.
+  void (*func)() = (void (*)()) & Dummy;
+  func();
+}
+
+V8_NOINLINE void FuzzerMonitor::DCheck() {
+  // Caught in debug builds.
+  DCHECK(false);
+}
+
+V8_NOINLINE void FuzzerMonitor::Fatal() {
+  // Caught in all build types.
+  FATAL("Fake error.");
+}
+
+V8_NOINLINE void FuzzerMonitor::ObservableDifference() {
+  // Observable difference caught by differential fuzzing.
+  printf("___fake_difference___\n");
+}
+
+V8_NOINLINE void FuzzerMonitor::UndefinedBehavior() {
+  // Caught by UBSAN.
+  int32_t val = -1;
+  USE(val << 8);
+}
+
+V8_NOINLINE void FuzzerMonitor::UseAfterFree() {
+  // Use-after-free caught by ASAN.
+  std::vector<bool>* storage = new std::vector<bool>(3);
+  delete storage;
+  USE(storage->at(1));
+}
+
+V8_NOINLINE void FuzzerMonitor::UseOfUninitializedValue() {
+// Use-of-uninitialized-value caught by MSAN.
+#if defined(__clang__)
+  int uninitialized[1];
+  if (uninitialized[0]) USE(uninitialized);
+#endif
 }
 
 static FILE* FOpen(const char* path, const char* mode) {
@@ -2603,13 +2752,13 @@ static FILE* FOpen(const char* path, const char* mode) {
     return nullptr;
   }
 #else
-  FILE* file = fopen(path, mode);
+  FILE* file = base::Fopen(path, mode);
   if (file == nullptr) return nullptr;
   struct stat file_stat;
   if (fstat(fileno(file), &file_stat) != 0) return nullptr;
   bool is_regular_file = ((file_stat.st_mode & S_IFREG) != 0);
   if (is_regular_file) return file;
-  fclose(file);
+  base::Fclose(file);
   return nullptr;
 #endif
 }
@@ -2631,12 +2780,12 @@ static char* ReadChars(const char* name, int* size_out) {
   for (size_t i = 0; i < size;) {
     i += fread(&chars[i], 1, size - i, file);
     if (ferror(file)) {
-      fclose(file);
+      base::Fclose(file);
       delete[] chars;
       return nullptr;
     }
   }
-  fclose(file);
+  base::Fclose(file);
   *size_out = static_cast<int>(size);
   return chars;
 }
@@ -2757,11 +2906,10 @@ class InspectorFrontend final : public v8_inspector::V8Inspector::Channel {
     if (callback->IsFunction()) {
       v8::TryCatch try_catch(isolate_);
       Local<Value> args[] = {message};
-      USE(Local<Function>::Cast(callback)->Call(context, Undefined(isolate_), 1,
-                                                args));
+      USE(callback.As<Function>()->Call(context, Undefined(isolate_), 1, args));
 #ifdef DEBUG
       if (try_catch.HasCaught()) {
-        Local<Object> exception = Local<Object>::Cast(try_catch.Exception());
+        Local<Object> exception = try_catch.Exception().As<Object>();
         Local<String> key = v8::String::NewFromUtf8Literal(
             isolate_, "message", NewStringType::kInternalized);
         Local<String> expected = v8::String::NewFromUtf8Literal(
@@ -2816,8 +2964,7 @@ class InspectorClient : public v8_inspector::V8InspectorClient {
     is_paused = true;
 
     while (is_paused) {
-      USE(Local<Function>::Cast(callback)->Call(context, Undefined(isolate_), 0,
-                                                {}));
+      USE(callback.As<Function>()->Call(context, Undefined(isolate_), 0, {}));
       if (try_catch.HasCaught()) {
         is_paused = false;
       }
@@ -2965,6 +3112,7 @@ bool SourceGroup::Execute(Isolate* isolate) {
       base::OS::ExitProcess(1);
     }
     Shell::set_script_executed();
+    Shell::update_script_size(source->Length());
     if (!Shell::ExecuteString(isolate, source, file_name, Shell::kNoPrintResult,
                               Shell::kReportExceptions,
                               Shell::kProcessMessageQueue)) {
@@ -3192,7 +3340,7 @@ void Worker::ProcessMessage(std::unique_ptr<SerializationData> data) {
   if (!onmessage->IsFunction()) {
     return;
   }
-  Local<Function> onmessage_fun = Local<Function>::Cast(onmessage);
+  Local<Function> onmessage_fun = onmessage.As<Function>();
 
   v8::TryCatch try_catch(isolate_);
   try_catch.SetVerbose(true);
@@ -3318,7 +3466,7 @@ void Worker::PostMessageOut(const v8::FunctionCallbackInfo<v8::Value>& args) {
       Shell::SerializeValue(isolate, message, transfer);
   if (data) {
     DCHECK(args.Data()->IsExternal());
-    Local<External> this_value = Local<External>::Cast(args.Data());
+    Local<External> this_value = args.Data().As<External>();
     Worker* worker = static_cast<Worker*>(this_value->Value());
     worker->out_queue_.Enqueue(std::move(data));
     worker->out_semaphore_.Signal();
@@ -3339,6 +3487,9 @@ bool Shell::SetOptions(int argc, char* argv[]) {
     } else if (strcmp(argv[i], "--no-arguments") == 0) {
       options.include_arguments = false;
       argv[i] = nullptr;
+    } else if (strcmp(argv[i], "--simulate-errors") == 0) {
+      options.simulate_errors = true;
+      argv[i] = nullptr;
     } else if (strcmp(argv[i], "--stress-opt") == 0) {
       options.stress_opt = true;
       argv[i] = nullptr;
@@ -3511,6 +3662,12 @@ bool Shell::SetOptions(int argc, char* argv[]) {
     } else if (strcmp(argv[i], "--fuzzy-module-file-extensions") == 0) {
       options.fuzzy_module_file_extensions = true;
       argv[i] = nullptr;
+#ifdef V8_ENABLE_SYSTEM_INSTRUMENTATION
+    } else if (strcmp(argv[i], "--enable-system-instrumentation") == 0) {
+      options.enable_system_instrumentation = true;
+      options.trace_enabled = true;
+      argv[i] = nullptr;
+#endif
     }
   }
 
@@ -3549,7 +3706,9 @@ bool Shell::SetOptions(int argc, char* argv[]) {
     } else if (strcmp(str, "--module") == 0) {
       // Pass on to SourceGroup, which understands this option.
     } else if (strncmp(str, "--", 2) == 0) {
-      printf("Warning: unknown flag %s.\nTry --help for options\n", str);
+      if (!i::FLAG_correctness_fuzzer_suppressions) {
+        printf("Warning: unknown flag %s.\nTry --help for options\n", str);
+      }
     } else if (strcmp(str, "-e") == 0 && i + 1 < argc) {
       set_script_executed();
     } else if (strncmp(str, "-", 1) != 0) {
@@ -3760,6 +3919,9 @@ class Serializer : public ValueSerializer::Delegate {
         serializer_(isolate, this),
         current_memory_usage_(0) {}
 
+  Serializer(const Serializer&) = delete;
+  Serializer& operator=(const Serializer&) = delete;
+
   Maybe<bool> WriteValue(Local<Context> context, Local<Value> value,
                          Local<Value> transfer) {
     bool ok;
@@ -3837,17 +3999,17 @@ class Serializer : public ValueSerializer::Delegate {
     current_memory_usage_ += size;
     if (current_memory_usage_ > kMaxSerializerMemoryUsage) return nullptr;
 
-    void* result = realloc(old_buffer, size);
+    void* result = base::Realloc(old_buffer, size);
     *actual_size = result ? size : 0;
     return result;
   }
 
-  void FreeBufferMemory(void* buffer) override { free(buffer); }
+  void FreeBufferMemory(void* buffer) override { base::Free(buffer); }
 
  private:
   Maybe<bool> PrepareTransfer(Local<Context> context, Local<Value> transfer) {
     if (transfer->IsArray()) {
-      Local<Array> transfer_array = Local<Array>::Cast(transfer);
+      Local<Array> transfer_array = transfer.As<Array>();
       uint32_t length = transfer_array->Length();
       for (uint32_t i = 0; i < length; ++i) {
         Local<Value> element;
@@ -3857,7 +4019,7 @@ class Serializer : public ValueSerializer::Delegate {
             return Nothing<bool>();
           }
 
-          Local<ArrayBuffer> array_buffer = Local<ArrayBuffer>::Cast(element);
+          Local<ArrayBuffer> array_buffer = element.As<ArrayBuffer>();
 
           if (std::find(array_buffers_.begin(), array_buffers_.end(),
                         array_buffer) != array_buffers_.end()) {
@@ -3907,8 +4069,6 @@ class Serializer : public ValueSerializer::Delegate {
   std::vector<Global<WasmModuleObject>> wasm_modules_;
   std::vector<std::shared_ptr<v8::BackingStore>> backing_stores_;
   size_t current_memory_usage_;
-
-  DISALLOW_COPY_AND_ASSIGN(Serializer);
 };
 
 class Deserializer : public ValueDeserializer::Delegate {
@@ -3920,6 +4080,9 @@ class Deserializer : public ValueDeserializer::Delegate {
     deserializer_.SetSupportsLegacyWireFormat(true);
   }
 
+  Deserializer(const Deserializer&) = delete;
+  Deserializer& operator=(const Deserializer&) = delete;
+
   MaybeLocal<Value> ReadValue(Local<Context> context) {
     bool read_header;
     if (!deserializer_.ReadHeader(context).To(&read_header)) {
@@ -3958,8 +4121,6 @@ class Deserializer : public ValueDeserializer::Delegate {
   Isolate* isolate_;
   ValueDeserializer deserializer_;
   std::unique_ptr<SerializationData> data_;
-
-  DISALLOW_COPY_AND_ASSIGN(Deserializer);
 };
 
 class D8Testing {
@@ -4078,8 +4239,8 @@ int Shell::Main(int argc, char* argv[]) {
           ? v8::platform::InProcessStackDumping::kDisabled
           : v8::platform::InProcessStackDumping::kEnabled;
 
-  std::unique_ptr<platform::tracing::TracingController> tracing;
   std::ofstream trace_file;
+  std::unique_ptr<platform::tracing::TracingController> tracing;
   if (options.trace_enabled && !i::FLAG_verify_predictable) {
     tracing = std::make_unique<platform::tracing::TracingController>();
     const char* trace_path =
@@ -4100,10 +4261,23 @@ int Shell::Main(int argc, char* argv[]) {
 
     tracing->InitializeForPerfetto(&trace_file);
 #else
-    platform::tracing::TraceBuffer* trace_buffer =
-        platform::tracing::TraceBuffer::CreateTraceBufferRingBuffer(
-            platform::tracing::TraceBuffer::kRingBufferChunks,
-            platform::tracing::TraceWriter::CreateJSONTraceWriter(trace_file));
+    platform::tracing::TraceBuffer* trace_buffer = nullptr;
+#if defined(V8_ENABLE_SYSTEM_INSTRUMENTATION)
+    if (options.enable_system_instrumentation) {
+      trace_buffer =
+          platform::tracing::TraceBuffer::CreateTraceBufferRingBuffer(
+              platform::tracing::TraceBuffer::kRingBufferChunks,
+              platform::tracing::TraceWriter::
+                  CreateSystemInstrumentationTraceWriter());
+    }
+#endif  // V8_ENABLE_SYSTEM_INSTRUMENTATION
+    if (!trace_buffer) {
+      trace_buffer =
+          platform::tracing::TraceBuffer::CreateTraceBufferRingBuffer(
+              platform::tracing::TraceBuffer::kRingBufferChunks,
+              platform::tracing::TraceWriter::CreateJSONTraceWriter(
+                  trace_file));
+    }
     tracing->Initialize(trace_buffer);
 #endif  // V8_USE_PERFETTO
   }
@@ -4220,6 +4394,9 @@ int Shell::Main(int argc, char* argv[]) {
         } else {
           trace_config =
               platform::tracing::TraceConfig::CreateDefaultTraceConfig();
+          if (options.enable_system_instrumentation) {
+            trace_config->AddIncludedCategory("disabled-by-default-v8.compile");
+          }
         }
         tracing_controller->StartTracing(trace_config);
       }
diff --git a/deps/v8/src/d8/d8.h b/deps/v8/src/d8/d8.h
index e0fb8d58923315..a6a1037cff1c9c 100644
--- a/deps/v8/src/d8/d8.h
+++ b/deps/v8/src/d8/d8.h
@@ -16,6 +16,7 @@
 
 #include "src/base/once.h"
 #include "src/base/platform/time.h"
+#include "src/base/platform/wrappers.h"
 #include "src/d8/async-hooks-wrapper.h"
 #include "src/strings/string-hasher.h"
 #include "src/utils/allocation.h"
@@ -29,6 +30,8 @@ namespace internal {
 class CancelableTaskManager;
 }  // namespace internal
 
+struct DynamicImportData;
+
 // A single counter in a counter collection.
 class Counter {
  public:
@@ -119,7 +122,9 @@ class SourceGroup {
 
 class SerializationData {
  public:
-  SerializationData() : size_(0) {}
+  SerializationData() = default;
+  SerializationData(const SerializationData&) = delete;
+  SerializationData& operator=(const SerializationData&) = delete;
 
   uint8_t* data() { return data_.get(); }
   size_t size() { return size_; }
@@ -135,19 +140,17 @@ class SerializationData {
 
  private:
   struct DataDeleter {
-    void operator()(uint8_t* p) const { free(p); }
+    void operator()(uint8_t* p) const { base::Free(p); }
   };
 
   std::unique_ptr<uint8_t, DataDeleter> data_;
-  size_t size_;
+  size_t size_ = 0;
   std::vector<std::shared_ptr<v8::BackingStore>> backing_stores_;
   std::vector<std::shared_ptr<v8::BackingStore>> sab_backing_stores_;
   std::vector<CompiledWasmModule> compiled_wasm_modules_;
 
  private:
   friend class Serializer;
-
-  DISALLOW_COPY_AND_ASSIGN(SerializationData);
 };
 
 class SerializationDataQueue {
@@ -241,7 +244,7 @@ class PerIsolateData {
     return reinterpret_cast<PerIsolateData*>(isolate->GetData(0));
   }
 
-  class RealmScope {
+  class V8_NODISCARD RealmScope {
    public:
     explicit RealmScope(PerIsolateData* data);
     ~RealmScope();
@@ -261,6 +264,11 @@ class PerIsolateData {
                            Local<Value> exception);
   int HandleUnhandledPromiseRejections();
 
+  // Keep track of DynamicImportData so we can properly free it on shutdown
+  // when LEAK_SANITIZER is active.
+  void AddDynamicImportData(DynamicImportData*);
+  void DeleteDynamicImportData(DynamicImportData*);
+
  private:
   friend class Shell;
   friend class RealmScope;
@@ -276,6 +284,9 @@ class PerIsolateData {
   std::vector<std::tuple<Global<Promise>, Global<Message>, Global<Value>>>
       unhandled_promises_;
   AsyncHooks* async_hooks_wrapper_;
+#if defined(LEAK_SANITIZER)
+  std::unordered_set<DynamicImportData*> import_data_;
+#endif
 
   int RealmIndexOrThrow(const v8::FunctionCallbackInfo<v8::Value>& args,
                         int arg_offset);
@@ -342,6 +353,7 @@ class ShellOptions {
   DisallowReassignment<bool> omit_quit = {"omit-quit", false};
   DisallowReassignment<bool> wait_for_background_tasks = {
       "wait-for-background-tasks", true};
+  DisallowReassignment<bool> simulate_errors = {"simulate-errors", false};
   DisallowReassignment<bool> stress_opt = {"stress-opt", false};
   DisallowReassignment<int> stress_runs = {"stress-runs", 1};
   DisallowReassignment<bool> stress_snapshot = {"stress-snapshot", false};
@@ -385,6 +397,8 @@ class ShellOptions {
   DisallowReassignment<bool> cpu_profiler_print = {"cpu-profiler-print", false};
   DisallowReassignment<bool> fuzzy_module_file_extensions = {
       "fuzzy-module-file-extensions", true};
+  DisallowReassignment<bool> enable_system_instrumentation = {
+      "enable-system-instrumentation", false};
 };
 
 class Shell : public i::AllStatic {
@@ -556,6 +570,11 @@ class Shell : public i::AllStatic {
            !options.test_shell;
   }
 
+  static void update_script_size(int size) {
+    if (size > 0) valid_fuzz_script_.store(true);
+  }
+  static bool is_valid_fuzz_script() { return valid_fuzz_script_.load(); }
+
   static void WaitForRunningWorkers();
   static void AddRunningWorker(std::shared_ptr<Worker> worker);
   static void RemoveRunningWorker(const std::shared_ptr<Worker>& worker);
@@ -583,8 +602,9 @@ class Shell : public i::AllStatic {
   static bool allow_new_workers_;
   static std::unordered_set<std::shared_ptr<Worker>> running_workers_;
 
-  // Multiple isolates may update this flag concurrently.
+  // Multiple isolates may update these flags concurrently.
   static std::atomic<bool> script_executed_;
+  static std::atomic<bool> valid_fuzz_script_;
 
   static void WriteIgnitionDispatchCountersFile(v8::Isolate* isolate);
   // Append LCOV coverage data to file.
@@ -611,6 +631,12 @@ class Shell : public i::AllStatic {
   static MaybeLocal<Module> FetchModuleTree(v8::Local<v8::Module> origin_module,
                                             v8::Local<v8::Context> context,
                                             const std::string& file_name);
+
+  template <class T>
+  static MaybeLocal<T> CompileString(Isolate* isolate, Local<Context> context,
+                                     Local<String> source,
+                                     const ScriptOrigin& origin);
+
   static ScriptCompiler::CachedData* LookupCodeCache(Isolate* isolate,
                                                      Local<Value> name);
   static void StoreInCodeCache(Isolate* isolate, Local<Value> name,
@@ -627,6 +653,20 @@ class Shell : public i::AllStatic {
   static std::atomic<int> unhandled_promise_rejections_;
 };
 
+class FuzzerMonitor : public i::AllStatic {
+ public:
+  static void SimulateErrors();
+
+ private:
+  static void ControlFlowViolation();
+  static void DCheck();
+  static void Fatal();
+  static void ObservableDifference();
+  static void UndefinedBehavior();
+  static void UseAfterFree();
+  static void UseOfUninitializedValue();
+};
+
 }  // namespace v8
 
 #endif  // V8_D8_D8_H_
diff --git a/deps/v8/src/debug/debug-coverage.cc b/deps/v8/src/debug/debug-coverage.cc
index bee41222835fdc..e352acc846946b 100644
--- a/deps/v8/src/debug/debug-coverage.cc
+++ b/deps/v8/src/debug/debug-coverage.cc
@@ -44,7 +44,7 @@ class SharedToCounterMap
     return static_cast<uint32_t>(key.ptr());
   }
 
-  DisallowHeapAllocation no_gc;
+  DISALLOW_GARBAGE_COLLECTION(no_gc)
 };
 
 namespace {
@@ -568,11 +568,11 @@ void CollectAndMaybeResetCounts(Isolate* isolate,
 // A {SFI, count} tuple is used to sort by source range (stored on
 // the SFI) and call count (in the counter map).
 struct SharedFunctionInfoAndCount {
-  SharedFunctionInfoAndCount(SharedFunctionInfo info, uint32_t count)
+  SharedFunctionInfoAndCount(Handle<SharedFunctionInfo> info, uint32_t count)
       : info(info),
         count(count),
-        start(StartPosition(info)),
-        end(info.EndPosition()) {}
+        start(StartPosition(*info)),
+        end(info->EndPosition()) {}
 
   // Sort by:
   // - start, ascending.
@@ -582,13 +582,13 @@ struct SharedFunctionInfoAndCount {
   bool operator<(const SharedFunctionInfoAndCount& that) const {
     if (this->start != that.start) return this->start < that.start;
     if (this->end != that.end) return this->end > that.end;
-    if (this->info.is_toplevel() != that.info.is_toplevel()) {
-      return this->info.is_toplevel();
+    if (this->info->is_toplevel() != that.info->is_toplevel()) {
+      return this->info->is_toplevel();
     }
     return this->count > that.count;
   }
 
-  SharedFunctionInfo info;
+  Handle<SharedFunctionInfo> info;
   uint32_t count;
   int start;
   int end;
@@ -623,24 +623,27 @@ std::unique_ptr<Coverage> Coverage::Collect(
   // Iterate shared function infos of every script and build a mapping
   // between source ranges and invocation counts.
   std::unique_ptr<Coverage> result(new Coverage());
-  Script::Iterator scripts(isolate);
-  for (Script script = scripts.Next(); !script.is_null();
-       script = scripts.Next()) {
-    if (!script.IsUserJavaScript()) continue;
 
+  std::vector<Handle<Script>> scripts;
+  Script::Iterator scriptIt(isolate);
+  for (Script script = scriptIt.Next(); !script.is_null();
+       script = scriptIt.Next()) {
+    if (script.IsUserJavaScript()) scripts.push_back(handle(script, isolate));
+  }
+
+  for (Handle<Script> script : scripts) {
     // Create and add new script data.
-    Handle<Script> script_handle(script, isolate);
-    result->emplace_back(script_handle);
+    result->emplace_back(script);
     std::vector<CoverageFunction>* functions = &result->back().functions;
 
     std::vector<SharedFunctionInfoAndCount> sorted;
 
     {
       // Sort functions by start position, from outer to inner functions.
-      SharedFunctionInfo::ScriptIterator infos(isolate, *script_handle);
+      SharedFunctionInfo::ScriptIterator infos(isolate, *script);
       for (SharedFunctionInfo info = infos.Next(); !info.is_null();
            info = infos.Next()) {
-        sorted.emplace_back(info, counter_map.Get(info));
+        sorted.emplace_back(handle(info, isolate), counter_map.Get(info));
       }
       std::sort(sorted.begin(), sorted.end());
     }
@@ -650,7 +653,7 @@ std::unique_ptr<Coverage> Coverage::Collect(
 
     // Use sorted list to reconstruct function nesting.
     for (const SharedFunctionInfoAndCount& v : sorted) {
-      SharedFunctionInfo info = v.info;
+      Handle<SharedFunctionInfo> info = v.info;
       int start = v.start;
       int end = v.end;
       uint32_t count = v.count;
@@ -692,8 +695,8 @@ std::unique_ptr<Coverage> Coverage::Collect(
             break;
           case v8::debug::CoverageMode::kBlockBinary:
           case v8::debug::CoverageMode::kPreciseBinary:
-            count = info.has_reported_binary_coverage() ? 0 : 1;
-            info.set_has_reported_binary_coverage(true);
+            count = info->has_reported_binary_coverage() ? 0 : 1;
+            info->set_has_reported_binary_coverage(true);
             break;
           case v8::debug::CoverageMode::kBestEffort:
             count = 1;
@@ -701,11 +704,11 @@ std::unique_ptr<Coverage> Coverage::Collect(
         }
       }
 
-      Handle<String> name(info.DebugName(), isolate);
+      Handle<String> name = SharedFunctionInfo::DebugName(info);
       CoverageFunction function(start, end, count, name);
 
-      if (IsBlockMode(collectionMode) && info.HasCoverageInfo()) {
-        CollectBlockCoverage(&function, info, collectionMode);
+      if (IsBlockMode(collectionMode) && info->HasCoverageInfo()) {
+        CollectBlockCoverage(&function, *info, collectionMode);
       }
 
       // Only include a function range if itself or its parent function is
@@ -727,7 +730,7 @@ std::unique_ptr<Coverage> Coverage::Collect(
       }
 
       if (FLAG_trace_block_coverage) {
-        PrintBlockCoverage(&function, info, has_nonempty_source_range,
+        PrintBlockCoverage(&function, *info, has_nonempty_source_range,
                            function_is_relevant);
       }
     }
diff --git a/deps/v8/src/debug/debug-evaluate.cc b/deps/v8/src/debug/debug-evaluate.cc
index 7fb0b3723f7507..77683fde1ef043 100644
--- a/deps/v8/src/debug/debug-evaluate.cc
+++ b/deps/v8/src/debug/debug-evaluate.cc
@@ -10,6 +10,7 @@
 #include "src/common/globals.h"
 #include "src/debug/debug-frames.h"
 #include "src/debug/debug-scopes.h"
+#include "src/debug/debug-wasm-support.h"
 #include "src/debug/debug.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate-inl.h"
@@ -17,8 +18,6 @@
 #include "src/interpreter/bytecodes.h"
 #include "src/objects/contexts.h"
 #include "src/snapshot/snapshot.h"
-#include "src/wasm/wasm-debug.h"
-#include "src/wasm/wasm-js.h"
 
 namespace v8 {
 namespace internal {
@@ -55,8 +54,7 @@ MaybeHandle<Object> DebugEvaluate::Global(Isolate* isolate,
 
   Handle<Context> context = isolate->native_context();
   Handle<JSFunction> fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(shared_info,
-                                                            context);
+      Factory::JSFunctionBuilder{isolate, shared_info, context}.Build();
   if (mode == debug::EvaluateGlobalMode::kDisableBreaksAndThrowOnSideEffect) {
     isolate->debug()->StartSideEffectCheckMode();
   }
@@ -79,58 +77,37 @@ MaybeHandle<Object> DebugEvaluate::Local(Isolate* isolate,
 
   // Get the frame where the debugging is performed.
   StackTraceFrameIterator it(isolate, frame_id);
-  if (!it.is_javascript()) return isolate->factory()->undefined_value();
-  JavaScriptFrame* frame = it.javascript_frame();
+  if (it.is_javascript()) {
+    JavaScriptFrame* frame = it.javascript_frame();
+    // This is not a lot different than DebugEvaluate::Global, except that
+    // variables accessible by the function we are evaluating from are
+    // materialized and included on top of the native context. Changes to
+    // the materialized object are written back afterwards.
+    // Note that the native context is taken from the original context chain,
+    // which may not be the current native context of the isolate.
+    ContextBuilder context_builder(isolate, frame, inlined_jsframe_index);
+    if (isolate->has_pending_exception()) return {};
 
-  // This is not a lot different than DebugEvaluate::Global, except that
-  // variables accessible by the function we are evaluating from are
-  // materialized and included on top of the native context. Changes to
-  // the materialized object are written back afterwards.
-  // Note that the native context is taken from the original context chain,
-  // which may not be the current native context of the isolate.
-  ContextBuilder context_builder(isolate, frame, inlined_jsframe_index);
-  if (isolate->has_pending_exception()) return MaybeHandle<Object>();
-
-  Handle<Context> context = context_builder.evaluation_context();
-  Handle<JSObject> receiver(context->global_proxy(), isolate);
-  MaybeHandle<Object> maybe_result =
-      Evaluate(isolate, context_builder.outer_info(), context, receiver, source,
-               throw_on_side_effect);
-  if (!maybe_result.is_null()) context_builder.UpdateValues();
-  return maybe_result;
-}
-
-V8_EXPORT MaybeHandle<Object> DebugEvaluate::WebAssembly(
-    Handle<WasmInstanceObject> instance, StackFrameId frame_id,
-    Handle<String> source, bool throw_on_side_effect) {
-  Isolate* isolate = instance->GetIsolate();
-
-  StackTraceFrameIterator it(isolate, frame_id);
-  if (!it.is_wasm()) return isolate->factory()->undefined_value();
-  WasmFrame* frame = WasmFrame::cast(it.frame());
-
-  Handle<JSProxy> context_extension = WasmJs::GetJSDebugProxy(frame);
-
-  DisableBreak disable_break_scope(isolate->debug(), /*disable=*/true);
-
-  Handle<SharedFunctionInfo> shared_info;
-  if (!GetFunctionInfo(isolate, source, REPLMode::kNo).ToHandle(&shared_info)) {
-    return {};
-  }
-
-  Handle<ScopeInfo> scope_info =
-      ScopeInfo::CreateForWithScope(isolate, Handle<ScopeInfo>::null());
-  Handle<Context> context = isolate->factory()->NewWithContext(
-      isolate->native_context(), scope_info, context_extension);
-
-  Handle<Object> result;
-  if (!DebugEvaluate::Evaluate(isolate, shared_info, context, context_extension,
-                               source, throw_on_side_effect)
-           .ToHandle(&result)) {
-    return {};
+    Handle<Context> context = context_builder.evaluation_context();
+    Handle<JSObject> receiver(context->global_proxy(), isolate);
+    MaybeHandle<Object> maybe_result =
+        Evaluate(isolate, context_builder.outer_info(), context, receiver,
+                 source, throw_on_side_effect);
+    if (!maybe_result.is_null()) context_builder.UpdateValues();
+    return maybe_result;
+  } else {
+    CHECK(it.is_wasm());
+    WasmFrame* frame = WasmFrame::cast(it.frame());
+    Handle<SharedFunctionInfo> outer_info(
+        isolate->native_context()->empty_function().shared(), isolate);
+    Handle<JSObject> context_extension = GetWasmDebugProxy(frame);
+    Handle<ScopeInfo> scope_info =
+        ScopeInfo::CreateForWithScope(isolate, Handle<ScopeInfo>::null());
+    Handle<Context> context = isolate->factory()->NewWithContext(
+        isolate->native_context(), scope_info, context_extension);
+    return Evaluate(isolate, outer_info, context, context_extension, source,
+                    throw_on_side_effect);
   }
-
-  return result;
 }
 
 MaybeHandle<Object> DebugEvaluate::WithTopmostArguments(Isolate* isolate,
@@ -336,7 +313,6 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) {
   V(StringReplaceOneCharWithString)           \
   V(StringSubstring)                          \
   V(StringToNumber)                           \
-  V(StringTrim)                               \
   /* BigInts */                               \
   V(BigIntEqualToBigInt)                      \
   V(BigIntToBoolean)                          \
@@ -347,6 +323,7 @@ bool IntrinsicHasNoSideEffect(Runtime::FunctionId id) {
   V(CreateObjectLiteral)                      \
   V(CreateObjectLiteralWithoutAllocationSite) \
   V(CreateRegExpLiteral)                      \
+  V(DefineClass)                              \
   /* Called from builtins */                  \
   V(AllocateInYoungGeneration)                \
   V(AllocateInOldGeneration)                  \
@@ -568,6 +545,7 @@ DebugInfo::SideEffectState BuiltinGetSideEffectState(Builtins::Name id) {
     case Builtins::kArrayIndexOf:
     case Builtins::kArrayPrototypeValues:
     case Builtins::kArrayIncludes:
+    case Builtins::kArrayPrototypeAt:
     case Builtins::kArrayPrototypeEntries:
     case Builtins::kArrayPrototypeFill:
     case Builtins::kArrayPrototypeFind:
@@ -593,6 +571,8 @@ DebugInfo::SideEffectState BuiltinGetSideEffectState(Builtins::Name id) {
     case Builtins::kTrace:
     // TypedArray builtins.
     case Builtins::kTypedArrayConstructor:
+    case Builtins::kTypedArrayOf:
+    case Builtins::kTypedArrayPrototypeAt:
     case Builtins::kTypedArrayPrototypeBuffer:
     case Builtins::kTypedArrayPrototypeByteLength:
     case Builtins::kTypedArrayPrototypeByteOffset:
@@ -760,6 +740,7 @@ DebugInfo::SideEffectState BuiltinGetSideEffectState(Builtins::Name id) {
     case Builtins::kStringFromCodePoint:
     case Builtins::kStringConstructor:
     case Builtins::kStringPrototypeAnchor:
+    case Builtins::kStringPrototypeAt:
     case Builtins::kStringPrototypeBig:
     case Builtins::kStringPrototypeBlink:
     case Builtins::kStringPrototypeBold:
@@ -783,6 +764,7 @@ DebugInfo::SideEffectState BuiltinGetSideEffectState(Builtins::Name id) {
     case Builtins::kStringPrototypeSlice:
     case Builtins::kStringPrototypeSmall:
     case Builtins::kStringPrototypeStartsWith:
+    case Builtins::kStringSlowFlatten:
     case Builtins::kStringPrototypeStrike:
     case Builtins::kStringPrototypeSub:
     case Builtins::kStringPrototypeSubstr:
@@ -900,14 +882,15 @@ DebugInfo::SideEffectState DebugEvaluate::FunctionGetSideEffectState(
     Isolate* isolate, Handle<SharedFunctionInfo> info) {
   if (FLAG_trace_side_effect_free_debug_evaluate) {
     PrintF("[debug-evaluate] Checking function %s for side effect.\n",
-           info->DebugName().ToCString().get());
+           info->DebugNameCStr().get());
   }
 
   DCHECK(info->is_compiled());
   DCHECK(!info->needs_script_context());
   if (info->HasBytecodeArray()) {
     // Check bytecodes against allowlist.
-    Handle<BytecodeArray> bytecode_array(info->GetBytecodeArray(), isolate);
+    Handle<BytecodeArray> bytecode_array(info->GetBytecodeArray(isolate),
+                                         isolate);
     if (FLAG_trace_side_effect_free_debug_evaluate) {
       bytecode_array->Print();
     }
diff --git a/deps/v8/src/debug/debug-evaluate.h b/deps/v8/src/debug/debug-evaluate.h
index 2f4cc2da4eee3f..03836dd6dadfcd 100644
--- a/deps/v8/src/debug/debug-evaluate.h
+++ b/deps/v8/src/debug/debug-evaluate.h
@@ -32,15 +32,14 @@ class DebugEvaluate : public AllStatic {
   // - Parameters and stack-allocated locals need to be materialized.  Altered
   //   values need to be written back to the stack afterwards.
   // - The arguments object needs to materialized.
+  // The stack frame can be either a JavaScript stack frame or a Wasm
+  // stack frame. In the latter case, a special Debug Proxy API is
+  // provided to peek into the Wasm state.
   static MaybeHandle<Object> Local(Isolate* isolate, StackFrameId frame_id,
                                    int inlined_jsframe_index,
                                    Handle<String> source,
                                    bool throw_on_side_effect);
 
-  static V8_EXPORT MaybeHandle<Object> WebAssembly(
-      Handle<WasmInstanceObject> instance, StackFrameId frame_id,
-      Handle<String> source, bool throw_on_side_effect);
-
   // This is used for break-at-entry for builtins and API functions.
   // Evaluate a piece of JavaScript in the native context, but with the
   // materialized arguments object and receiver of the current call.
diff --git a/deps/v8/src/debug/debug-frames.cc b/deps/v8/src/debug/debug-frames.cc
index 4c8da809bb24c3..cd3c7624fed95b 100644
--- a/deps/v8/src/debug/debug-frames.cc
+++ b/deps/v8/src/debug/debug-frames.cc
@@ -105,7 +105,7 @@ void RedirectActiveFunctions::VisitThread(Isolate* isolate,
         reinterpret_cast<InterpretedFrame*>(frame);
     BytecodeArray bytecode = mode_ == Mode::kUseDebugBytecode
                                  ? shared_.GetDebugInfo().DebugBytecodeArray()
-                                 : shared_.GetBytecodeArray();
+                                 : shared_.GetBytecodeArray(isolate);
     interpreted_frame->PatchBytecodeArray(bytecode);
   }
 }
diff --git a/deps/v8/src/debug/debug-frames.h b/deps/v8/src/debug/debug-frames.h
index c554ca17b50dfe..25e050b52f8eb8 100644
--- a/deps/v8/src/debug/debug-frames.h
+++ b/deps/v8/src/debug/debug-frames.h
@@ -22,6 +22,8 @@ class WasmFrame;
 class FrameInspector {
  public:
   FrameInspector(CommonFrame* frame, int inlined_frame_index, Isolate* isolate);
+  FrameInspector(const FrameInspector&) = delete;
+  FrameInspector& operator=(const FrameInspector&) = delete;
 
   ~FrameInspector();
 
@@ -60,8 +62,6 @@ class FrameInspector {
   bool is_interpreted_ = false;
   bool has_adapted_arguments_ = false;
   bool is_constructor_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(FrameInspector);
 };
 
 class RedirectActiveFunctions : public ThreadVisitor {
@@ -78,7 +78,7 @@ class RedirectActiveFunctions : public ThreadVisitor {
  private:
   SharedFunctionInfo shared_;
   Mode mode_;
-  DisallowHeapAllocation no_gc_;
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/debug/debug-interface.h b/deps/v8/src/debug/debug-interface.h
index ded8a316391b48..3e41e2affd155b 100644
--- a/deps/v8/src/debug/debug-interface.h
+++ b/deps/v8/src/debug/debug-interface.h
@@ -110,7 +110,7 @@ V8_EXPORT_PRIVATE void BreakRightNow(Isolate* isolate);
 // the isolate to be entered for further JavaScript execution.
 V8_EXPORT_PRIVATE void SetTerminateOnResume(Isolate* isolate);
 
-bool AllFramesOnStackAreBlackboxed(Isolate* isolate);
+bool CanBreakProgram(Isolate* isolate);
 
 class Script;
 
@@ -423,6 +423,8 @@ class V8_EXPORT_PRIVATE ScopeIterator {
 
   ScopeIterator() = default;
   virtual ~ScopeIterator() = default;
+  ScopeIterator(const ScopeIterator&) = delete;
+  ScopeIterator& operator=(const ScopeIterator&) = delete;
 
   enum ScopeType {
     ScopeTypeGlobal = 0,
@@ -449,18 +451,16 @@ class V8_EXPORT_PRIVATE ScopeIterator {
 
   virtual bool SetVariableValue(v8::Local<v8::String> name,
                                 v8::Local<v8::Value> value) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScopeIterator);
 };
 
 class V8_EXPORT_PRIVATE StackTraceIterator {
  public:
-  static bool SupportsWasmDebugEvaluate();
   static std::unique_ptr<StackTraceIterator> Create(Isolate* isolate,
                                                     int index = 0);
   StackTraceIterator() = default;
   virtual ~StackTraceIterator() = default;
+  StackTraceIterator(const StackTraceIterator&) = delete;
+  StackTraceIterator& operator=(const StackTraceIterator&) = delete;
 
   virtual bool Done() const = 0;
   virtual void Advance() = 0;
@@ -477,11 +477,6 @@ class V8_EXPORT_PRIVATE StackTraceIterator {
   virtual bool Restart() = 0;
   virtual v8::MaybeLocal<v8::Value> Evaluate(v8::Local<v8::String> source,
                                              bool throw_on_side_effect) = 0;
-  virtual v8::MaybeLocal<v8::String> EvaluateWasm(
-      internal::Vector<const internal::byte> source, int frame_index) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StackTraceIterator);
 };
 
 class QueryObjectPredicate {
@@ -533,7 +528,7 @@ void ForceGarbageCollection(
     v8::Isolate* isolate,
     v8::EmbedderHeapTracer::EmbedderStackState embedder_stack_state);
 
-class PostponeInterruptsScope {
+class V8_NODISCARD PostponeInterruptsScope {
  public:
   explicit PostponeInterruptsScope(v8::Isolate* isolate);
   ~PostponeInterruptsScope();
@@ -542,7 +537,7 @@ class PostponeInterruptsScope {
   std::unique_ptr<i::PostponeInterruptsScope> scope_;
 };
 
-class DisableBreakScope {
+class V8_NODISCARD DisableBreakScope {
  public:
   explicit DisableBreakScope(v8::Isolate* isolate);
   ~DisableBreakScope();
@@ -616,23 +611,6 @@ class PropertyIterator {
   virtual bool is_array_index() = 0;
 };
 
-// Wrapper around v8::internal::WasmValue.
-class V8_EXPORT_PRIVATE WasmValue : public v8::Value {
- public:
-  WasmValue() = delete;
-  static bool IsWasmValue(v8::Local<v8::Value> obj);
-  V8_INLINE static WasmValue* Cast(v8::Value* obj);
-  int value_type();
-  // Get the underlying values as a byte array, this is only valid if value_type
-  // is i32, i64, f32, f64, or s128.
-  v8::Local<v8::Array> bytes();
-  // Get the underlying externref, only valid if value_type is externref.
-  v8::Local<v8::Value> ref();
-
- private:
-  static void CheckCast(v8::Value* obj);
-};
-
 AccessorPair* AccessorPair::Cast(v8::Value* value) {
 #ifdef V8_ENABLE_CHECKS
   CheckCast(value);
@@ -640,13 +618,6 @@ AccessorPair* AccessorPair::Cast(v8::Value* value) {
   return static_cast<AccessorPair*>(value);
 }
 
-WasmValue* WasmValue::Cast(v8::Value* value) {
-#ifdef V8_ENABLE_CHECKS
-  CheckCast(value);
-#endif
-  return static_cast<WasmValue*>(value);
-}
-
 MaybeLocal<Message> GetMessageFromPromise(Local<Promise> promise);
 
 }  // namespace debug
diff --git a/deps/v8/src/debug/debug-property-iterator.h b/deps/v8/src/debug/debug-property-iterator.h
index 67d3cb85cb1d98..393af4c0eef967 100644
--- a/deps/v8/src/debug/debug-property-iterator.h
+++ b/deps/v8/src/debug/debug-property-iterator.h
@@ -21,6 +21,8 @@ class DebugPropertyIterator final : public debug::PropertyIterator {
  public:
   DebugPropertyIterator(Isolate* isolate, Handle<JSReceiver> receiver);
   ~DebugPropertyIterator() override = default;
+  DebugPropertyIterator(const DebugPropertyIterator&) = delete;
+  DebugPropertyIterator& operator=(const DebugPropertyIterator&) = delete;
 
   bool Done() const override;
   void Advance() override;
@@ -53,8 +55,6 @@ class DebugPropertyIterator final : public debug::PropertyIterator {
   bool calculated_native_accessor_flags_ = false;
   int native_accessor_flags_ = 0;
   bool is_own_ = true;
-
-  DISALLOW_COPY_AND_ASSIGN(DebugPropertyIterator);
 };
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/debug/debug-scope-iterator.cc b/deps/v8/src/debug/debug-scope-iterator.cc
index ab3191d11d2fd3..3260650bd85708 100644
--- a/deps/v8/src/debug/debug-scope-iterator.cc
+++ b/deps/v8/src/debug/debug-scope-iterator.cc
@@ -10,8 +10,6 @@
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate.h"
 #include "src/objects/js-generator-inl.h"
-#include "src/wasm/wasm-debug.h"
-#include "src/wasm/wasm-objects-inl.h"
 
 namespace v8 {
 
@@ -128,93 +126,5 @@ bool DebugScopeIterator::SetVariableValue(v8::Local<v8::String> name,
                                     Utils::OpenHandle(*value));
 }
 
-DebugWasmScopeIterator::DebugWasmScopeIterator(Isolate* isolate,
-                                               WasmFrame* frame)
-    : isolate_(isolate),
-      frame_(frame),
-      type_(debug::ScopeIterator::ScopeTypeModule) {}
-
-bool DebugWasmScopeIterator::Done() {
-  return type_ == debug::ScopeIterator::ScopeTypeWith;
-}
-
-void DebugWasmScopeIterator::Advance() {
-  DCHECK(!Done());
-  switch (type_) {
-    case ScopeTypeModule:
-      // Skip local scope and expression stack scope if the frame is not
-      // inspectable.
-      type_ = frame_->is_inspectable() ? debug::ScopeIterator::ScopeTypeLocal
-                                       : debug::ScopeIterator::ScopeTypeWith;
-      break;
-    case ScopeTypeLocal:
-      type_ = debug::ScopeIterator::ScopeTypeWasmExpressionStack;
-      break;
-    case ScopeTypeWasmExpressionStack:
-      // We use ScopeTypeWith type as marker for done.
-      type_ = debug::ScopeIterator::ScopeTypeWith;
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-v8::debug::ScopeIterator::ScopeType DebugWasmScopeIterator::GetType() {
-  DCHECK(!Done());
-  return type_;
-}
-
-v8::Local<v8::Object> DebugWasmScopeIterator::GetObject() {
-  DCHECK(!Done());
-  switch (type_) {
-    case debug::ScopeIterator::ScopeTypeModule: {
-      Handle<WasmInstanceObject> instance =
-          FrameSummary::GetTop(frame_).AsWasm().wasm_instance();
-      return Utils::ToLocal(wasm::GetModuleScopeObject(instance));
-    }
-    case debug::ScopeIterator::ScopeTypeLocal: {
-      DCHECK(frame_->is_wasm());
-      wasm::DebugInfo* debug_info = frame_->native_module()->GetDebugInfo();
-      return Utils::ToLocal(debug_info->GetLocalScopeObject(
-          isolate_, frame_->pc(), frame_->fp(), frame_->callee_fp()));
-    }
-    case debug::ScopeIterator::ScopeTypeWasmExpressionStack: {
-      DCHECK(frame_->is_wasm());
-      wasm::DebugInfo* debug_info = frame_->native_module()->GetDebugInfo();
-      return Utils::ToLocal(debug_info->GetStackScopeObject(
-          isolate_, frame_->pc(), frame_->fp(), frame_->callee_fp()));
-    }
-    default:
-      return {};
-  }
-}
-
-int DebugWasmScopeIterator::GetScriptId() {
-  DCHECK(!Done());
-  return -1;
-}
-
-v8::Local<v8::Value> DebugWasmScopeIterator::GetFunctionDebugName() {
-  DCHECK(!Done());
-  return Utils::ToLocal(isolate_->factory()->empty_string());
-}
-
-bool DebugWasmScopeIterator::HasLocationInfo() { return false; }
-
-debug::Location DebugWasmScopeIterator::GetStartLocation() {
-  DCHECK(!Done());
-  return debug::Location();
-}
-
-debug::Location DebugWasmScopeIterator::GetEndLocation() {
-  DCHECK(!Done());
-  return debug::Location();
-}
-
-bool DebugWasmScopeIterator::SetVariableValue(v8::Local<v8::String> name,
-                                              v8::Local<v8::Value> value) {
-  DCHECK(!Done());
-  return false;
-}
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/debug/debug-scope-iterator.h b/deps/v8/src/debug/debug-scope-iterator.h
index a2b5ebcdf818fe..6607467a02dbd6 100644
--- a/deps/v8/src/debug/debug-scope-iterator.h
+++ b/deps/v8/src/debug/debug-scope-iterator.h
@@ -37,27 +37,6 @@ class DebugScopeIterator final : public debug::ScopeIterator {
   v8::internal::ScopeIterator iterator_;
 };
 
-class DebugWasmScopeIterator final : public debug::ScopeIterator {
- public:
-  DebugWasmScopeIterator(Isolate* isolate, WasmFrame* frame);
-
-  bool Done() override;
-  void Advance() override;
-  ScopeType GetType() override;
-  v8::Local<v8::Object> GetObject() override;
-  v8::Local<v8::Value> GetFunctionDebugName() override;
-  int GetScriptId() override;
-  bool HasLocationInfo() override;
-  debug::Location GetStartLocation() override;
-  debug::Location GetEndLocation() override;
-
-  bool SetVariableValue(v8::Local<v8::String> name,
-                        v8::Local<v8::Value> value) override;
- private:
-  Isolate* isolate_;
-  WasmFrame* frame_;
-  ScopeType type_;
-};
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/debug/debug-scopes.cc b/deps/v8/src/debug/debug-scopes.cc
index 3142240aad0069..30b46b19875794 100644
--- a/deps/v8/src/debug/debug-scopes.cc
+++ b/deps/v8/src/debug/debug-scopes.cc
@@ -47,7 +47,7 @@ Handle<Object> ScopeIterator::GetFunctionDebugName() const {
   if (!function_.is_null()) return JSFunction::GetDebugName(function_);
 
   if (!context_->IsNativeContext()) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     ScopeInfo closure_info = context_->closure_context().scope_info();
     Handle<String> debug_name(closure_info.FunctionDebugName(), isolate_);
     if (debug_name->length() > 0) return debug_name;
@@ -257,6 +257,7 @@ void ScopeIterator::TryParseAndRetrieveScopes(ReparseStrategy strategy) {
     // Retrieve it from shared function info.
     flags.set_outer_language_mode(shared_info->language_mode());
   } else if (scope_info->scope_type() == MODULE_SCOPE) {
+    DCHECK(script->origin_options().IsModule());
     DCHECK(flags.is_module());
   } else {
     DCHECK(scope_info->scope_type() == SCRIPT_SCOPE ||
@@ -1049,7 +1050,7 @@ bool ScopeIterator::SetContextExtensionValue(Handle<String> variable_name,
 
 bool ScopeIterator::SetContextVariableValue(Handle<String> variable_name,
                                             Handle<Object> new_value) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   VariableMode mode;
   InitializationFlag flag;
   MaybeAssignedFlag maybe_assigned_flag;
@@ -1065,7 +1066,7 @@ bool ScopeIterator::SetContextVariableValue(Handle<String> variable_name,
 
 bool ScopeIterator::SetModuleVariableValue(Handle<String> variable_name,
                                            Handle<Object> new_value) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int cell_index;
   VariableMode mode;
   InitializationFlag init_flag;
diff --git a/deps/v8/src/debug/debug-stack-trace-iterator.cc b/deps/v8/src/debug/debug-stack-trace-iterator.cc
index ea0f4d3fc96fd1..782b0c7ddad1b1 100644
--- a/deps/v8/src/debug/debug-stack-trace-iterator.cc
+++ b/deps/v8/src/debug/debug-stack-trace-iterator.cc
@@ -6,22 +6,15 @@
 
 #include "src/api/api-inl.h"
 #include "src/debug/debug-evaluate.h"
-#include "src/debug/debug-interface.h"
 #include "src/debug/debug-scope-iterator.h"
+#include "src/debug/debug-wasm-support.h"
 #include "src/debug/debug.h"
 #include "src/debug/liveedit.h"
 #include "src/execution/frames-inl.h"
-#include "src/execution/frames.h"
 #include "src/execution/isolate.h"
-#include "src/wasm/wasm-debug-evaluate.h"
-#include "src/wasm/wasm-debug.h"
 
 namespace v8 {
 
-bool debug::StackTraceIterator::SupportsWasmDebugEvaluate() {
-  return i::FLAG_wasm_expose_debug_eval;
-}
-
 std::unique_ptr<debug::StackTraceIterator> debug::StackTraceIterator::Create(
     v8::Isolate* isolate, int index) {
   return std::unique_ptr<debug::StackTraceIterator>(
@@ -103,7 +96,7 @@ v8::MaybeLocal<v8::Value> DebugStackTraceIterator::GetReceiver() const {
     if (!scope_iterator.ClosureScopeHasThisReference()) {
       return v8::MaybeLocal<v8::Value>();
     }
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     VariableMode mode;
     InitializationFlag flag;
     MaybeAssignedFlag maybe_assigned_flag;
@@ -168,8 +161,7 @@ DebugStackTraceIterator::GetScopeIterator() const {
   DCHECK(!Done());
   CommonFrame* frame = iterator_.frame();
   if (frame->is_wasm()) {
-    return std::make_unique<DebugWasmScopeIterator>(isolate_,
-                                                    WasmFrame::cast(frame));
+    return GetWasmScopeIterator(WasmFrame::cast(frame));
   }
   return std::make_unique<DebugScopeIterator>(isolate_, frame_inspector_.get());
 }
@@ -186,48 +178,15 @@ v8::MaybeLocal<v8::Value> DebugStackTraceIterator::Evaluate(
   Handle<Object> value;
 
   i::SafeForInterruptsScope safe_for_interrupt_scope(isolate_);
-  bool success = false;
-  if (iterator_.is_wasm()) {
-    FrameSummary summary = FrameSummary::Get(iterator_.frame(), 0);
-    const FrameSummary::WasmFrameSummary& wasmSummary = summary.AsWasm();
-    Handle<WasmInstanceObject> instance = wasmSummary.wasm_instance();
-
-    success = DebugEvaluate::WebAssembly(instance, iterator_.frame()->id(),
-                                         Utils::OpenHandle(*source),
-                                         throw_on_side_effect)
-                  .ToHandle(&value);
-  } else {
-    success = DebugEvaluate::Local(
-                  isolate_, iterator_.frame()->id(), inlined_frame_index_,
-                  Utils::OpenHandle(*source), throw_on_side_effect)
-                  .ToHandle(&value);
-  }
-  if (!success) {
+  if (!DebugEvaluate::Local(isolate_, iterator_.frame()->id(),
+                            inlined_frame_index_, Utils::OpenHandle(*source),
+                            throw_on_side_effect)
+           .ToHandle(&value)) {
     isolate_->OptionalRescheduleException(false);
     return v8::MaybeLocal<v8::Value>();
   }
   return Utils::ToLocal(value);
 }
 
-v8::MaybeLocal<v8::String> DebugStackTraceIterator::EvaluateWasm(
-    internal::Vector<const internal::byte> source, int frame_index) {
-  DCHECK(!Done());
-  if (!i::FLAG_wasm_expose_debug_eval || !iterator_.is_wasm()) {
-    return v8::MaybeLocal<v8::String>();
-  }
-  Handle<String> value;
-  i::SafeForInterruptsScope safe_for_interrupt_scope(isolate_);
-
-  FrameSummary summary = FrameSummary::Get(iterator_.frame(), 0);
-  const FrameSummary::WasmFrameSummary& wasmSummary = summary.AsWasm();
-  Handle<WasmInstanceObject> instance = wasmSummary.wasm_instance();
-
-  if (!v8::internal::wasm::DebugEvaluate(source, instance, iterator_.frame())
-           .ToHandle(&value)) {
-    isolate_->OptionalRescheduleException(false);
-    return v8::MaybeLocal<v8::String>();
-  }
-  return Utils::ToLocal(value);
-}
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/debug/debug-stack-trace-iterator.h b/deps/v8/src/debug/debug-stack-trace-iterator.h
index 2317af35f5ac01..3319bc15f50ade 100644
--- a/deps/v8/src/debug/debug-stack-trace-iterator.h
+++ b/deps/v8/src/debug/debug-stack-trace-iterator.h
@@ -34,8 +34,6 @@ class DebugStackTraceIterator final : public debug::StackTraceIterator {
   bool Restart() override;
   v8::MaybeLocal<v8::Value> Evaluate(v8::Local<v8::String> source,
                                      bool throw_on_side_effect) override;
-  v8::MaybeLocal<v8::String> EvaluateWasm(
-      internal::Vector<const internal::byte> source, int frame_index) override;
 
  private:
   Isolate* isolate_;
diff --git a/deps/v8/src/debug/debug-type-profile.cc b/deps/v8/src/debug/debug-type-profile.cc
index c0ba96c2484bc6..a4cae83e3b710d 100644
--- a/deps/v8/src/debug/debug-type-profile.cc
+++ b/deps/v8/src/debug/debug-type-profile.cc
@@ -52,7 +52,6 @@ std::unique_ptr<TypeProfile> TypeProfile::Collect(Isolate* isolate) {
       }
       FeedbackSlot slot = vector.GetTypeProfileSlot();
       FeedbackNexus nexus(vector, slot);
-      Handle<String> name(info.DebugName(), isolate);
       std::vector<int> source_positions = nexus.GetSourcePositions();
       for (int position : source_positions) {
         DCHECK_GE(position, 0);
diff --git a/deps/v8/src/debug/debug-wasm-support.cc b/deps/v8/src/debug/debug-wasm-support.cc
new file mode 100644
index 00000000000000..59b8ad8c353698
--- /dev/null
+++ b/deps/v8/src/debug/debug-wasm-support.cc
@@ -0,0 +1,787 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "src/debug/debug-wasm-support.h"
+
+#include "src/api/api-inl.h"
+#include "src/api/api-natives.h"
+#include "src/execution/frames-inl.h"
+#include "src/objects/property-descriptor.h"
+#include "src/wasm/wasm-debug.h"
+#include "src/wasm/wasm-objects-inl.h"
+#include "src/wasm/wasm-value.h"
+
+namespace v8 {
+namespace internal {
+namespace {
+
+// Convert a WasmValue to an appropriate JS representation.
+Handle<Object> WasmValueToObject(Isolate* isolate, wasm::WasmValue value) {
+  auto* factory = isolate->factory();
+  switch (value.type().kind()) {
+    case wasm::ValueType::kI32:
+      return factory->NewNumberFromInt(value.to_i32());
+    case wasm::ValueType::kI64:
+      return BigInt::FromInt64(isolate, value.to_i64());
+    case wasm::ValueType::kF32:
+      return factory->NewNumber(value.to_f32());
+    case wasm::ValueType::kF64:
+      return factory->NewNumber(value.to_f64());
+    case wasm::ValueType::kS128: {
+      wasm::Simd128 s128 = value.to_s128();
+      Handle<JSArrayBuffer> buffer;
+      if (!factory
+               ->NewJSArrayBufferAndBackingStore(
+                   kSimd128Size, InitializedFlag::kUninitialized)
+               .ToHandle(&buffer)) {
+        isolate->FatalProcessOutOfHeapMemory(
+            "failed to allocate backing store");
+      }
+
+      base::Memcpy(buffer->allocation_base(), s128.bytes(),
+                   buffer->byte_length());
+      auto array = factory->NewJSTypedArray(kExternalUint8Array, buffer, 0,
+                                            kSimd128Size);
+      JSObject::SetPrototype(array, factory->null_value(), false, kDontThrow)
+          .Check();
+      return array;
+    }
+    case wasm::ValueType::kRef:
+      return value.to_externref();
+    default:
+      break;
+  }
+  return factory->undefined_value();
+}
+
+}  // namespace
+
+namespace {
+
+// Helper for unpacking a maybe name that makes a default with an index if
+// the name is empty. If the name is not empty, it's prefixed with a $.
+Handle<String> GetNameOrDefault(Isolate* isolate,
+                                MaybeHandle<String> maybe_name,
+                                const char* default_name_prefix,
+                                uint32_t index) {
+  Handle<String> name;
+  if (maybe_name.ToHandle(&name)) {
+    name = isolate->factory()
+               ->NewConsString(
+                   isolate->factory()->NewStringFromAsciiChecked("$"), name)
+               .ToHandleChecked();
+    return isolate->factory()->InternalizeString(name);
+  }
+  EmbeddedVector<char, 64> value;
+  int len = SNPrintF(value, "%s%u", default_name_prefix, index);
+  return isolate->factory()->InternalizeString(value.SubVector(0, len));
+}
+
+enum DebugProxyId {
+  kFunctionsProxy,
+  kGlobalsProxy,
+  kMemoriesProxy,
+  kTablesProxy,
+  kLastInstanceProxyId = kTablesProxy,
+
+  kContextProxy,
+  kLocalsProxy,
+  kStackProxy,
+  kLastProxyId = kStackProxy,
+
+  kNumProxies = kLastProxyId + 1,
+  kNumInstanceProxies = kLastInstanceProxyId + 1
+};
+
+// Creates a FixedArray with the given |length| as cache on-demand on
+// the |object|, stored under the |wasm_debug_proxy_cache_symbol|.
+// This is currently used to cache the debug proxy object maps on the
+// JSGlobalObject (per native context), and various debug proxy objects
+// (functions, globals, tables, and memories) on the WasmInstanceObject.
+Handle<FixedArray> GetOrCreateDebugProxyCache(Isolate* isolate,
+                                              Handle<Object> object,
+                                              int length) {
+  Handle<Object> cache;
+  Handle<Symbol> symbol = isolate->factory()->wasm_debug_proxy_cache_symbol();
+  if (!Object::GetProperty(isolate, object, symbol).ToHandle(&cache) ||
+      cache->IsUndefined(isolate)) {
+    cache = isolate->factory()->NewFixedArrayWithHoles(length);
+    Object::SetProperty(isolate, object, symbol, cache).Check();
+  } else {
+    DCHECK_EQ(length, Handle<FixedArray>::cast(cache)->length());
+  }
+  return Handle<FixedArray>::cast(cache);
+}
+
+// Creates a Map for the given debug proxy |id| using the |create_template_fn|
+// on-demand and caches this map in the global object. The map is derived from
+// the FunctionTemplate returned by |create_template_fn| and has it's prototype
+// set to |null| and is marked non-extensible.
+Handle<Map> GetOrCreateDebugProxyMap(
+    Isolate* isolate, DebugProxyId id,
+    v8::Local<v8::FunctionTemplate> (*create_template_fn)(v8::Isolate*)) {
+  Handle<FixedArray> maps = GetOrCreateDebugProxyCache(
+      isolate, isolate->global_object(), kNumProxies);
+  if (!maps->is_the_hole(isolate, id)) {
+    return handle(Map::cast(maps->get(id)), isolate);
+  }
+  auto tmp = (*create_template_fn)(reinterpret_cast<v8::Isolate*>(isolate));
+  auto fun = ApiNatives::InstantiateFunction(Utils::OpenHandle(*tmp))
+                 .ToHandleChecked();
+  auto map = JSFunction::GetDerivedMap(isolate, fun, fun).ToHandleChecked();
+  Map::SetPrototype(isolate, map, isolate->factory()->null_value());
+  map->set_is_extensible(false);
+  maps->set(id, *map);
+  return map;
+}
+
+// Base class for debug proxies, offers indexed access. The subclasses
+// need to implement |Count| and |Get| methods appropriately.
+template <typename T, DebugProxyId id, typename Provider>
+struct IndexedDebugProxy {
+  static constexpr DebugProxyId kId = id;
+
+  static Handle<JSObject> Create(Isolate* isolate, Handle<Provider> provider) {
+    auto object_map =
+        GetOrCreateDebugProxyMap(isolate, kId, &T::CreateTemplate);
+    auto object = isolate->factory()->NewJSObjectFromMap(object_map);
+    object->SetEmbedderField(kProviderField, *provider);
+    return object;
+  }
+
+  enum {
+    kProviderField,
+    kFieldCount,
+  };
+
+  static v8::Local<v8::FunctionTemplate> CreateTemplate(v8::Isolate* isolate) {
+    Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(isolate);
+    templ->SetClassName(
+        v8::String::NewFromUtf8(isolate, T::kClassName).ToLocalChecked());
+    templ->InstanceTemplate()->SetInternalFieldCount(T::kFieldCount);
+    templ->InstanceTemplate()->SetHandler(
+        v8::IndexedPropertyHandlerConfiguration(
+            &T::IndexedGetter, {}, &T::IndexedQuery, {}, &T::IndexedEnumerator,
+            {}, &T::IndexedDescriptor, {},
+            v8::PropertyHandlerFlags::kHasNoSideEffect));
+    return templ;
+  }
+
+  template <typename V>
+  static Isolate* GetIsolate(const PropertyCallbackInfo<V>& info) {
+    return reinterpret_cast<Isolate*>(info.GetIsolate());
+  }
+
+  template <typename V>
+  static Handle<JSObject> GetHolder(const PropertyCallbackInfo<V>& info) {
+    return Handle<JSObject>::cast(Utils::OpenHandle(*info.Holder()));
+  }
+
+  static Handle<Provider> GetProvider(Handle<JSObject> holder,
+                                      Isolate* isolate) {
+    return handle(Provider::cast(holder->GetEmbedderField(kProviderField)),
+                  isolate);
+  }
+
+  template <typename V>
+  static Handle<Provider> GetProvider(const PropertyCallbackInfo<V>& info) {
+    return GetProvider(GetHolder(info), GetIsolate(info));
+  }
+
+  static void IndexedGetter(uint32_t index,
+                            const PropertyCallbackInfo<v8::Value>& info) {
+    auto isolate = GetIsolate(info);
+    auto provider = GetProvider(info);
+    if (index < T::Count(isolate, provider)) {
+      auto value = T::Get(isolate, provider, index);
+      info.GetReturnValue().Set(Utils::ToLocal(value));
+    }
+  }
+
+  static void IndexedDescriptor(uint32_t index,
+                                const PropertyCallbackInfo<v8::Value>& info) {
+    auto isolate = GetIsolate(info);
+    auto provider = GetProvider(info);
+    if (index < T::Count(isolate, provider)) {
+      PropertyDescriptor descriptor;
+      descriptor.set_configurable(false);
+      descriptor.set_enumerable(true);
+      descriptor.set_writable(false);
+      descriptor.set_value(T::Get(isolate, provider, index));
+      info.GetReturnValue().Set(Utils::ToLocal(descriptor.ToObject(isolate)));
+    }
+  }
+
+  static void IndexedQuery(uint32_t index,
+                           const PropertyCallbackInfo<v8::Integer>& info) {
+    if (index < T::Count(GetIsolate(info), GetProvider(info))) {
+      info.GetReturnValue().Set(Integer::New(
+          info.GetIsolate(),
+          PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly));
+    }
+  }
+
+  static void IndexedEnumerator(const PropertyCallbackInfo<v8::Array>& info) {
+    auto isolate = GetIsolate(info);
+    auto count = T::Count(isolate, GetProvider(info));
+    auto indices = isolate->factory()->NewFixedArray(count);
+    for (uint32_t index = 0; index < count; ++index) {
+      indices->set(index, Smi::FromInt(index));
+    }
+    info.GetReturnValue().Set(
+        Utils::ToLocal(isolate->factory()->NewJSArrayWithElements(
+            indices, PACKED_SMI_ELEMENTS)));
+  }
+};
+
+// Extends |IndexedDebugProxy| with named access, where the names are computed
+// on-demand, and all names are assumed to start with a dollar char ($). This
+// is important in order to scale to Wasm modules with hundreds of thousands
+// of functions in them.
+template <typename T, DebugProxyId id, typename Provider = WasmInstanceObject>
+struct NamedDebugProxy : IndexedDebugProxy<T, id, Provider> {
+  enum {
+    kProviderField,
+    kNameTableField,
+    kFieldCount,
+  };
+
+  static v8::Local<v8::FunctionTemplate> CreateTemplate(v8::Isolate* isolate) {
+    auto templ = IndexedDebugProxy<T, id, Provider>::CreateTemplate(isolate);
+    templ->InstanceTemplate()->SetHandler(v8::NamedPropertyHandlerConfiguration(
+        &T::NamedGetter, {}, &T::NamedQuery, {}, &T::NamedEnumerator, {},
+        &T::NamedDescriptor, {}, v8::PropertyHandlerFlags::kHasNoSideEffect));
+    return templ;
+  }
+
+  static void IndexedEnumerator(const PropertyCallbackInfo<v8::Array>& info) {
+    info.GetReturnValue().Set(v8::Array::New(info.GetIsolate()));
+  }
+
+  static Handle<NameDictionary> GetNameTable(Handle<JSObject> holder,
+                                             Isolate* isolate) {
+    Handle<Object> table_or_undefined(holder->GetEmbedderField(kNameTableField),
+                                      isolate);
+    if (!table_or_undefined->IsUndefined(isolate)) {
+      return Handle<NameDictionary>::cast(table_or_undefined);
+    }
+    auto provider = T::GetProvider(holder, isolate);
+    auto count = T::Count(isolate, provider);
+    auto table = NameDictionary::New(isolate, count);
+    for (uint32_t index = 0; index < count; ++index) {
+      HandleScope scope(isolate);
+      auto key = T::GetName(isolate, provider, index);
+      if (table->FindEntry(isolate, key).is_found()) continue;
+      Handle<Smi> value(Smi::FromInt(index), isolate);
+      table = NameDictionary::Add(isolate, table, key, value,
+                                  PropertyDetails::Empty());
+    }
+    holder->SetEmbedderField(kNameTableField, *table);
+    return table;
+  }
+
+  template <typename V>
+  static base::Optional<uint32_t> FindName(
+      Local<v8::Name> name, const PropertyCallbackInfo<V>& info) {
+    if (!name->IsString()) return {};
+    auto name_str = Utils::OpenHandle(*name.As<v8::String>());
+    if (name_str->length() == 0 || name_str->Get(0) != '$') return {};
+    auto isolate = T::GetIsolate(info);
+    auto table = GetNameTable(T::GetHolder(info), isolate);
+    auto entry = table->FindEntry(isolate, name_str);
+    if (entry.is_found()) return Smi::ToInt(table->ValueAt(entry));
+    return {};
+  }
+
+  static void NamedGetter(Local<v8::Name> name,
+                          const PropertyCallbackInfo<v8::Value>& info) {
+    if (auto index = FindName(name, info)) T::IndexedGetter(*index, info);
+  }
+
+  static void NamedQuery(Local<v8::Name> name,
+                         const PropertyCallbackInfo<v8::Integer>& info) {
+    if (auto index = FindName(name, info)) T::IndexedQuery(*index, info);
+  }
+
+  static void NamedDescriptor(Local<v8::Name> name,
+                              const PropertyCallbackInfo<v8::Value>& info) {
+    if (auto index = FindName(name, info)) T::IndexedDescriptor(*index, info);
+  }
+
+  static void NamedEnumerator(const PropertyCallbackInfo<v8::Array>& info) {
+    auto isolate = T::GetIsolate(info);
+    auto table = GetNameTable(T::GetHolder(info), isolate);
+    auto names = NameDictionary::IterationIndices(isolate, table);
+    for (int i = 0; i < names->length(); ++i) {
+      InternalIndex entry(Smi::ToInt(names->get(i)));
+      names->set(i, table->NameAt(entry));
+    }
+    info.GetReturnValue().Set(Utils::ToLocal(
+        isolate->factory()->NewJSArrayWithElements(names, PACKED_ELEMENTS)));
+  }
+};
+
+// This class implements the "functions" proxy.
+struct FunctionsProxy : NamedDebugProxy<FunctionsProxy, kFunctionsProxy> {
+  static constexpr char const* kClassName = "Functions";
+
+  static uint32_t Count(Isolate* isolate, Handle<WasmInstanceObject> instance) {
+    return static_cast<uint32_t>(instance->module()->functions.size());
+  }
+
+  static Handle<Object> Get(Isolate* isolate,
+                            Handle<WasmInstanceObject> instance,
+                            uint32_t index) {
+    return WasmInstanceObject::GetOrCreateWasmExternalFunction(isolate,
+                                                               instance, index);
+  }
+
+  static Handle<String> GetName(Isolate* isolate,
+                                Handle<WasmInstanceObject> instance,
+                                uint32_t index) {
+    wasm::ModuleWireBytes wire_bytes(
+        instance->module_object().native_module()->wire_bytes());
+    auto* module = instance->module();
+    wasm::WireBytesRef name_ref =
+        module->lazily_generated_names.LookupFunctionName(
+            wire_bytes, index, VectorOf(module->export_table));
+    Vector<const char> name_vec = wire_bytes.GetNameOrNull(name_ref);
+    return GetNameOrDefault(
+        isolate,
+        name_vec.empty() ? MaybeHandle<String>()
+                         : isolate->factory()->NewStringFromUtf8(name_vec),
+        "$func", index);
+  }
+};
+
+// This class implements the "globals" proxy.
+struct GlobalsProxy : NamedDebugProxy<GlobalsProxy, kGlobalsProxy> {
+  static constexpr char const* kClassName = "Globals";
+
+  static uint32_t Count(Isolate* isolate, Handle<WasmInstanceObject> instance) {
+    return static_cast<uint32_t>(instance->module()->globals.size());
+  }
+
+  static Handle<Object> Get(Isolate* isolate,
+                            Handle<WasmInstanceObject> instance,
+                            uint32_t index) {
+    return WasmValueToObject(isolate,
+                             WasmInstanceObject::GetGlobalValue(
+                                 instance, instance->module()->globals[index]));
+  }
+
+  static Handle<String> GetName(Isolate* isolate,
+                                Handle<WasmInstanceObject> instance,
+                                uint32_t index) {
+    return GetNameOrDefault(
+        isolate,
+        WasmInstanceObject::GetGlobalNameOrNull(isolate, instance, index),
+        "$global", index);
+  }
+};
+
+// This class implements the "memories" proxy.
+struct MemoriesProxy : NamedDebugProxy<MemoriesProxy, kMemoriesProxy> {
+  static constexpr char const* kClassName = "Memories";
+
+  static uint32_t Count(Isolate* isolate, Handle<WasmInstanceObject> instance) {
+    return instance->has_memory_object() ? 1 : 0;
+  }
+
+  static Handle<Object> Get(Isolate* isolate,
+                            Handle<WasmInstanceObject> instance,
+                            uint32_t index) {
+    return handle(instance->memory_object(), isolate);
+  }
+
+  static Handle<String> GetName(Isolate* isolate,
+                                Handle<WasmInstanceObject> instance,
+                                uint32_t index) {
+    return GetNameOrDefault(
+        isolate,
+        WasmInstanceObject::GetMemoryNameOrNull(isolate, instance, index),
+        "$memory", index);
+  }
+};
+
+// This class implements the "tables" proxy.
+struct TablesProxy : NamedDebugProxy<TablesProxy, kTablesProxy> {
+  static constexpr char const* kClassName = "Tables";
+
+  static uint32_t Count(Isolate* isolate, Handle<WasmInstanceObject> instance) {
+    return instance->tables().length();
+  }
+
+  static Handle<Object> Get(Isolate* isolate,
+                            Handle<WasmInstanceObject> instance,
+                            uint32_t index) {
+    return handle(instance->tables().get(index), isolate);
+  }
+
+  static Handle<String> GetName(Isolate* isolate,
+                                Handle<WasmInstanceObject> instance,
+                                uint32_t index) {
+    return GetNameOrDefault(
+        isolate,
+        WasmInstanceObject::GetTableNameOrNull(isolate, instance, index),
+        "$table", index);
+  }
+};
+
+// This class implements the "locals" proxy.
+struct LocalsProxy : NamedDebugProxy<LocalsProxy, kLocalsProxy, FixedArray> {
+  static constexpr char const* kClassName = "Locals";
+
+  static Handle<JSObject> Create(WasmFrame* frame) {
+    auto isolate = frame->isolate();
+    auto debug_info = frame->native_module()->GetDebugInfo();
+    // TODO(bmeurer): Check if pc is inspectable.
+    int count = debug_info->GetNumLocals(frame->pc());
+    auto function = debug_info->GetFunctionAtAddress(frame->pc());
+    auto values = isolate->factory()->NewFixedArray(count + 2);
+    for (int i = 0; i < count; ++i) {
+      auto value = WasmValueToObject(
+          isolate, debug_info->GetLocalValue(i, frame->pc(), frame->fp(),
+                                             frame->callee_fp()));
+      values->set(i, *value);
+    }
+    values->set(count + 0, frame->wasm_instance().module_object());
+    values->set(count + 1, Smi::FromInt(function.func_index));
+    return NamedDebugProxy::Create(isolate, values);
+  }
+
+  static uint32_t Count(Isolate* isolate, Handle<FixedArray> values) {
+    return values->length() - 2;
+  }
+
+  static Handle<Object> Get(Isolate* isolate, Handle<FixedArray> values,
+                            uint32_t index) {
+    return handle(values->get(index), isolate);
+  }
+
+  static Handle<String> GetName(Isolate* isolate, Handle<FixedArray> values,
+                                uint32_t index) {
+    uint32_t count = Count(isolate, values);
+    auto native_module =
+        WasmModuleObject::cast(values->get(count + 0)).native_module();
+    auto function_index = Smi::ToInt(Smi::cast(values->get(count + 1)));
+    wasm::ModuleWireBytes module_wire_bytes(native_module->wire_bytes());
+    auto name_vec = module_wire_bytes.GetNameOrNull(
+        native_module->GetDebugInfo()->GetLocalName(function_index, index));
+    return GetNameOrDefault(
+        isolate,
+        name_vec.empty() ? MaybeHandle<String>()
+                         : isolate->factory()->NewStringFromUtf8(name_vec),
+        "$var", index);
+  }
+};
+
+// This class implements the "stack" proxy (which offers only indexed access).
+struct StackProxy : IndexedDebugProxy<StackProxy, kStackProxy, FixedArray> {
+  static constexpr char const* kClassName = "Stack";
+
+  static Handle<JSObject> Create(WasmFrame* frame) {
+    auto isolate = frame->isolate();
+    auto debug_info =
+        frame->wasm_instance().module_object().native_module()->GetDebugInfo();
+    int count = debug_info->GetStackDepth(frame->pc());
+    auto values = isolate->factory()->NewFixedArray(count);
+    for (int i = 0; i < count; ++i) {
+      auto value = WasmValueToObject(
+          isolate, debug_info->GetStackValue(i, frame->pc(), frame->fp(),
+                                             frame->callee_fp()));
+      values->set(i, *value);
+    }
+    return IndexedDebugProxy::Create(isolate, values);
+  }
+
+  static uint32_t Count(Isolate* isolate, Handle<FixedArray> values) {
+    return values->length();
+  }
+
+  static Handle<Object> Get(Isolate* isolate, Handle<FixedArray> values,
+                            uint32_t index) {
+    return handle(values->get(index), isolate);
+  }
+};
+
+// Creates an instance of the |Proxy| on-demand and caches that on the
+// |instance|.
+template <typename Proxy>
+Handle<JSObject> GetOrCreateInstanceProxy(Isolate* isolate,
+                                          Handle<WasmInstanceObject> instance) {
+  STATIC_ASSERT(Proxy::kId < kNumInstanceProxies);
+  Handle<FixedArray> proxies =
+      GetOrCreateDebugProxyCache(isolate, instance, kNumInstanceProxies);
+  if (!proxies->is_the_hole(isolate, Proxy::kId)) {
+    return handle(JSObject::cast(proxies->get(Proxy::kId)), isolate);
+  }
+  Handle<JSObject> proxy = Proxy::Create(isolate, instance);
+  proxies->set(Proxy::kId, *proxy);
+  return proxy;
+}
+
+// This class implements the debug proxy for a given Wasm frame. The debug
+// proxy is used when evaluating JavaScript expressions on a wasm frame via
+// the inspector |Runtime.evaluateOnCallFrame()| API and enables developers
+// and extensions to inspect the WebAssembly engine state from JavaScript.
+// The proxy provides the following interface:
+//
+// type WasmSimdValue = Uint8Array;
+// type WasmValue = number | bigint | object | WasmSimdValue;
+// type WasmFunction = (... args : WasmValue[]) = > WasmValue;
+// interface WasmInterface {
+//   $globalX: WasmValue;
+//   $varX: WasmValue;
+//   $funcX(a : WasmValue /*, ...*/) : WasmValue;
+//   readonly $memoryX : WebAssembly.Memory;
+//   readonly $tableX : WebAssembly.Table;
+//
+//   readonly instance : WebAssembly.Instance;
+//   readonly module : WebAssembly.Module;
+//
+//   readonly memories : {[nameOrIndex:string | number] : WebAssembly.Memory};
+//   readonly tables : {[nameOrIndex:string | number] : WebAssembly.Table};
+//   readonly stack : WasmValue[];
+//   readonly globals : {[nameOrIndex:string | number] : WasmValue};
+//   readonly locals : {[nameOrIndex:string | number] : WasmValue};
+//   readonly functions : {[nameOrIndex:string | number] : WasmFunction};
+// }
+//
+// The wasm index spaces memories, tables, stack, globals, locals, and
+// functions are JSObjects with interceptors that lazily produce values
+// either by index or by name (except for stack).
+// Only the names are reported by APIs such as Object.keys() and
+// Object.getOwnPropertyNames(), since the indices are not meant to be
+// used interactively by developers (in Chrome DevTools), but are provided
+// for WebAssembly language extensions. Also note that these JSObjects
+// all have null prototypes, to not confuse context lookup and to make
+// their purpose as dictionaries clear.
+//
+// See http://doc/1VZOJrU2VsqOZe3IUzbwQWQQSZwgGySsm5119Ust1gUA and
+// http://bit.ly/devtools-wasm-entities for more details.
+class ContextProxy {
+ public:
+  static Handle<JSObject> Create(WasmFrame* frame) {
+    Isolate* isolate = frame->isolate();
+    auto object_map =
+        GetOrCreateDebugProxyMap(isolate, kContextProxy, &CreateTemplate);
+    auto object = isolate->factory()->NewJSObjectFromMap(object_map);
+    Handle<WasmInstanceObject> instance(frame->wasm_instance(), isolate);
+    object->SetEmbedderField(kInstanceField, *instance);
+    Handle<JSObject> locals = LocalsProxy::Create(frame);
+    object->SetEmbedderField(kLocalsField, *locals);
+    Handle<JSObject> stack = StackProxy::Create(frame);
+    object->SetEmbedderField(kStackField, *stack);
+    return object;
+  }
+
+ private:
+  enum {
+    kInstanceField,
+    kLocalsField,
+    kStackField,
+    kFieldCount,
+  };
+
+  static v8::Local<v8::FunctionTemplate> CreateTemplate(v8::Isolate* isolate) {
+    Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(isolate);
+    templ->InstanceTemplate()->SetInternalFieldCount(kFieldCount);
+    templ->InstanceTemplate()->SetHandler(v8::NamedPropertyHandlerConfiguration(
+        &NamedGetter, {}, {}, {}, {}, {}, {}, {},
+        static_cast<v8::PropertyHandlerFlags>(
+            static_cast<unsigned>(
+                v8::PropertyHandlerFlags::kOnlyInterceptStrings) |
+            static_cast<unsigned>(
+                v8::PropertyHandlerFlags::kHasNoSideEffect))));
+    return templ;
+  }
+
+  static MaybeHandle<Object> GetNamedProperty(Isolate* isolate,
+                                              Handle<JSObject> holder,
+                                              Handle<String> name) {
+    if (name->length() == 0) return {};
+    Handle<WasmInstanceObject> instance(
+        WasmInstanceObject::cast(holder->GetEmbedderField(kInstanceField)),
+        isolate);
+    if (name->IsOneByteEqualTo(StaticCharVector("instance"))) {
+      return instance;
+    }
+    if (name->IsOneByteEqualTo(StaticCharVector("module"))) {
+      return handle(instance->module_object(), isolate);
+    }
+    if (name->IsOneByteEqualTo(StaticCharVector("locals"))) {
+      return handle(holder->GetEmbedderField(kLocalsField), isolate);
+    }
+    if (name->IsOneByteEqualTo(StaticCharVector("stack"))) {
+      return handle(holder->GetEmbedderField(kStackField), isolate);
+    }
+    if (name->IsOneByteEqualTo(StaticCharVector("memories"))) {
+      return GetOrCreateInstanceProxy<MemoriesProxy>(isolate, instance);
+    }
+    if (name->IsOneByteEqualTo(StaticCharVector("tables"))) {
+      return GetOrCreateInstanceProxy<TablesProxy>(isolate, instance);
+    }
+    if (name->IsOneByteEqualTo(StaticCharVector("globals"))) {
+      return GetOrCreateInstanceProxy<GlobalsProxy>(isolate, instance);
+    }
+    if (name->IsOneByteEqualTo(StaticCharVector("functions"))) {
+      return GetOrCreateInstanceProxy<FunctionsProxy>(isolate, instance);
+    }
+    if (name->Get(0) == '$') {
+      const char* kDelegateNames[] = {"memories", "locals", "tables",
+                                      "functions", "globals"};
+      for (auto delegate_name : kDelegateNames) {
+        Handle<Object> delegate;
+        ASSIGN_RETURN_ON_EXCEPTION(
+            isolate, delegate,
+            JSObject::GetProperty(isolate, holder, delegate_name), Object);
+        if (!delegate->IsUndefined(isolate)) {
+          Handle<Object> value;
+          ASSIGN_RETURN_ON_EXCEPTION(
+              isolate, value, Object::GetProperty(isolate, delegate, name),
+              Object);
+          if (!value->IsUndefined(isolate)) return value;
+        }
+      }
+    }
+    return {};
+  }
+
+  static void NamedGetter(Local<v8::Name> name,
+                          const PropertyCallbackInfo<v8::Value>& info) {
+    auto name_string = Handle<String>::cast(Utils::OpenHandle(*name));
+    auto isolate = reinterpret_cast<Isolate*>(info.GetIsolate());
+    auto holder = Handle<JSObject>::cast(Utils::OpenHandle(*info.Holder()));
+    Handle<Object> value;
+    if (GetNamedProperty(isolate, holder, name_string).ToHandle(&value)) {
+      info.GetReturnValue().Set(Utils::ToLocal(value));
+    }
+  }
+};
+
+Handle<JSObject> GetModuleScopeObject(Handle<WasmInstanceObject> instance) {
+  Isolate* isolate = instance->GetIsolate();
+  Handle<JSObject> module_scope_object =
+      isolate->factory()->NewJSObjectWithNullProto();
+
+  Handle<String> instance_name =
+      isolate->factory()->InternalizeString(StaticCharVector("instance"));
+  JSObject::AddProperty(isolate, module_scope_object, instance_name, instance,
+                        NONE);
+
+  Handle<WasmModuleObject> module_object(instance->module_object(), isolate);
+  Handle<String> module_name =
+      isolate->factory()->InternalizeString(StaticCharVector("module"));
+  JSObject::AddProperty(isolate, module_scope_object, module_name,
+                        module_object, NONE);
+
+  uint32_t memory_count = MemoriesProxy::Count(isolate, instance);
+  for (uint32_t memory_index = 0; memory_index < memory_count; ++memory_index) {
+    auto memory_name = MemoriesProxy::GetName(isolate, instance, memory_index);
+    auto memory_value = MemoriesProxy::Get(isolate, instance, memory_index);
+    JSObject::AddProperty(isolate, module_scope_object, memory_name,
+                          memory_value, NONE);
+  }
+
+  if (GlobalsProxy::Count(isolate, instance) != 0) {
+    Handle<JSObject> globals_obj =
+        GetOrCreateInstanceProxy<GlobalsProxy>(isolate, instance);
+    Handle<String> globals_name =
+        isolate->factory()->InternalizeString(StaticCharVector("globals"));
+    JSObject::AddProperty(isolate, module_scope_object, globals_name,
+                          globals_obj, NONE);
+  }
+
+  return module_scope_object;
+}
+
+class DebugWasmScopeIterator final : public debug::ScopeIterator {
+ public:
+  explicit DebugWasmScopeIterator(WasmFrame* frame)
+      : frame_(frame),
+        type_(debug::ScopeIterator::ScopeTypeWasmExpressionStack) {
+    // Skip local scope and expression stack scope if the frame is not
+    // inspectable.
+    if (!frame->is_inspectable()) {
+      type_ = debug::ScopeIterator::ScopeTypeModule;
+    }
+  }
+
+  bool Done() override { return type_ == ScopeTypeWith; }
+
+  void Advance() override {
+    DCHECK(!Done());
+    switch (type_) {
+      case ScopeTypeWasmExpressionStack:
+        type_ = debug::ScopeIterator::ScopeTypeLocal;
+        break;
+      case ScopeTypeLocal:
+        type_ = debug::ScopeIterator::ScopeTypeModule;
+        break;
+      case ScopeTypeModule:
+        // We use ScopeTypeWith type as marker for done.
+        type_ = debug::ScopeIterator::ScopeTypeWith;
+        break;
+      default:
+        UNREACHABLE();
+    }
+  }
+
+  ScopeType GetType() override { return type_; }
+
+  v8::Local<v8::Object> GetObject() override {
+    DCHECK(!Done());
+    switch (type_) {
+      case debug::ScopeIterator::ScopeTypeModule: {
+        Handle<WasmInstanceObject> instance =
+            FrameSummary::GetTop(frame_).AsWasm().wasm_instance();
+        return Utils::ToLocal(GetModuleScopeObject(instance));
+      }
+      case debug::ScopeIterator::ScopeTypeLocal: {
+        DCHECK(frame_->is_inspectable());
+        return Utils::ToLocal(LocalsProxy::Create(frame_));
+      }
+      case debug::ScopeIterator::ScopeTypeWasmExpressionStack: {
+        DCHECK(frame_->is_inspectable());
+        return Utils::ToLocal(StackProxy::Create(frame_));
+      }
+      default:
+        return {};
+    }
+  }
+  v8::Local<v8::Value> GetFunctionDebugName() override {
+    return Utils::ToLocal(frame_->isolate()->factory()->empty_string());
+  }
+
+  int GetScriptId() override { return -1; }
+
+  bool HasLocationInfo() override { return false; }
+
+  debug::Location GetStartLocation() override { return {}; }
+
+  debug::Location GetEndLocation() override { return {}; }
+
+  bool SetVariableValue(v8::Local<v8::String> name,
+                        v8::Local<v8::Value> value) override {
+    return false;
+  }
+
+ private:
+  WasmFrame* const frame_;
+  ScopeType type_;
+};
+
+}  // namespace
+
+Handle<JSObject> GetWasmDebugProxy(WasmFrame* frame) {
+  return ContextProxy::Create(frame);
+}
+
+std::unique_ptr<debug::ScopeIterator> GetWasmScopeIterator(WasmFrame* frame) {
+  return std::make_unique<DebugWasmScopeIterator>(frame);
+}
+
+}  // namespace internal
+}  // namespace v8
diff --git a/deps/v8/src/debug/debug-wasm-support.h b/deps/v8/src/debug/debug-wasm-support.h
new file mode 100644
index 00000000000000..fba5759a77373f
--- /dev/null
+++ b/deps/v8/src/debug/debug-wasm-support.h
@@ -0,0 +1,29 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_DEBUG_DEBUG_WASM_SUPPORT_H_
+#define V8_DEBUG_DEBUG_WASM_SUPPORT_H_
+
+#include <memory>
+
+namespace v8 {
+namespace debug {
+class ScopeIterator;
+}  // namespace debug
+
+namespace internal {
+
+template <typename T>
+class Handle;
+class JSObject;
+class WasmFrame;
+
+Handle<JSObject> GetWasmDebugProxy(WasmFrame* frame);
+
+std::unique_ptr<debug::ScopeIterator> GetWasmScopeIterator(WasmFrame* frame);
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_DEBUG_DEBUG_WASM_SUPPORT_H_
diff --git a/deps/v8/src/debug/debug.cc b/deps/v8/src/debug/debug.cc
index a65c1b3bfd323d..8dce71960fcc77 100644
--- a/deps/v8/src/debug/debug.cc
+++ b/deps/v8/src/debug/debug.cc
@@ -47,8 +47,13 @@ class Debug::TemporaryObjectsTracker : public HeapObjectAllocationTracker {
  public:
   TemporaryObjectsTracker() = default;
   ~TemporaryObjectsTracker() override = default;
+  TemporaryObjectsTracker(const TemporaryObjectsTracker&) = delete;
+  TemporaryObjectsTracker& operator=(const TemporaryObjectsTracker&) = delete;
 
-  void AllocationEvent(Address addr, int) override { objects_.insert(addr); }
+  void AllocationEvent(Address addr, int) override {
+    if (disabled) return;
+    objects_.insert(addr);
+  }
 
   void MoveEvent(Address from, Address to, int) override {
     if (from == to) return;
@@ -77,10 +82,11 @@ class Debug::TemporaryObjectsTracker : public HeapObjectAllocationTracker {
     return objects_.find(obj->address()) != objects_.end();
   }
 
+  bool disabled = false;
+
  private:
   std::unordered_set<Address> objects_;
   base::Mutex mutex_;
-  DISALLOW_COPY_AND_ASSIGN(TemporaryObjectsTracker);
 };
 
 Debug::Debug(Isolate* isolate)
@@ -228,7 +234,7 @@ int BreakIterator::BreakIndexFromPosition(int source_position) {
 }
 
 void BreakIterator::Next() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(!Done());
   bool first = break_index_ == -1;
   while (!Done()) {
@@ -393,14 +399,23 @@ char* Debug::RestoreDebug(char* storage) {
 
 int Debug::ArchiveSpacePerThread() { return sizeof(ThreadLocal); }
 
-void Debug::Iterate(RootVisitor* v) {
+void Debug::Iterate(RootVisitor* v) { Iterate(v, &thread_local_); }
+
+char* Debug::Iterate(RootVisitor* v, char* thread_storage) {
+  ThreadLocal* thread_local_data =
+      reinterpret_cast<ThreadLocal*>(thread_storage);
+  Iterate(v, thread_local_data);
+  return thread_storage + ArchiveSpacePerThread();
+}
+
+void Debug::Iterate(RootVisitor* v, ThreadLocal* thread_local_data) {
   v->VisitRootPointer(Root::kDebug, nullptr,
-                      FullObjectSlot(&thread_local_.return_value_));
+                      FullObjectSlot(&thread_local_data->return_value_));
   v->VisitRootPointer(Root::kDebug, nullptr,
-                      FullObjectSlot(&thread_local_.suspended_generator_));
+                      FullObjectSlot(&thread_local_data->suspended_generator_));
   v->VisitRootPointer(
       Root::kDebug, nullptr,
-      FullObjectSlot(&thread_local_.ignore_step_into_function_));
+      FullObjectSlot(&thread_local_data->ignore_step_into_function_));
 }
 
 DebugInfoListNode::DebugInfoListNode(Isolate* isolate, DebugInfo debug_info)
@@ -692,7 +707,7 @@ int Debug::FindBreakablePosition(Handle<DebugInfo> debug_info,
 }
 
 void Debug::ApplyBreakPoints(Handle<DebugInfo> debug_info) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (debug_info->CanBreakAtEntry()) {
     debug_info->SetBreakAtEntry();
   } else {
@@ -722,7 +737,7 @@ void Debug::ClearBreakPoints(Handle<DebugInfo> debug_info) {
       return;
     }
 
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     for (BreakIterator it(debug_info); !it.Done(); it.Next()) {
       it.ClearDebugBreak();
     }
@@ -800,7 +815,7 @@ void Debug::RecordWasmScriptWithBreakpoints(Handle<Script> script) {
         isolate_->global_handles()->Create(*new_list);
   }
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     for (int idx = wasm_scripts_with_breakpoints_->length() - 1; idx >= 0;
          --idx) {
       HeapObject wasm_script;
@@ -829,7 +844,7 @@ void Debug::ClearAllBreakPoints() {
   });
   // Clear all wasm breakpoints.
   if (!wasm_scripts_with_breakpoints_.is_null()) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     for (int idx = wasm_scripts_with_breakpoints_->length() - 1; idx >= 0;
          --idx) {
       HeapObject raw_wasm_script;
@@ -1086,16 +1101,17 @@ void Debug::PrepareStep(StepAction step_action) {
     thread_local_.last_frame_count_ = current_frame_count;
     // No longer perform the current async step.
     clear_suspended_generator();
-  } else if (frame->is_wasm()) {
-    // Handle stepping in Liftoff code.
+  } else if (frame->is_wasm() && step_action != StepOut) {
+    // Handle stepping in wasm.
     WasmFrame* wasm_frame = WasmFrame::cast(frame);
-    wasm::WasmCodeRefScope code_ref_scope;
-    wasm::WasmCode* code = wasm_frame->wasm_code();
-    if (code->is_liftoff()) {
-      wasm_frame->native_module()->GetDebugInfo()->PrepareStep(isolate_,
-                                                               frame_id);
+    auto* debug_info = wasm_frame->native_module()->GetDebugInfo();
+    if (debug_info->PrepareStep(wasm_frame)) {
+      UpdateHookOnFunctionCall();
+      return;
     }
-    // In case the wasm code returns, prepare the next frame (if JS) to break.
+    // If the wasm code is not debuggable or will return after this step
+    // (indicated by {PrepareStep} returning false), then step out of that frame
+    // instead.
     step_action = StepOut;
     UpdateHookOnFunctionCall();
   }
@@ -1121,8 +1137,15 @@ void Debug::PrepareStep(StepAction step_action) {
       bool in_current_frame = true;
       for (; !frames_it.done(); frames_it.Advance()) {
         if (frames_it.frame()->is_wasm()) {
-          in_current_frame = false;
-          continue;
+          if (in_current_frame) {
+            in_current_frame = false;
+            continue;
+          }
+          // Handle stepping out into Wasm.
+          WasmFrame* wasm_frame = WasmFrame::cast(frames_it.frame());
+          auto* debug_info = wasm_frame->native_module()->GetDebugInfo();
+          debug_info->PrepareStepOutTo(wasm_frame);
+          return;
         }
         JavaScriptFrame* frame = JavaScriptFrame::cast(frames_it.frame());
         if (last_step_action() == StepIn) {
@@ -1136,7 +1159,7 @@ void Debug::PrepareStep(StepAction step_action) {
           Handle<SharedFunctionInfo> info = infos.back();
           infos.pop_back();
           if (in_current_frame) {
-            // We want to skip out, so skip the current frame.
+            // We want to step out, so skip the current frame.
             in_current_frame = false;
             continue;
           }
@@ -1152,7 +1175,6 @@ void Debug::PrepareStep(StepAction step_action) {
       thread_local_.target_frame_count_ = current_frame_count;
       V8_FALLTHROUGH;
     case StepIn:
-      // TODO(clemensb): Implement stepping from JS into wasm.
       FloodWithOneShot(shared);
       break;
   }
@@ -1249,19 +1271,9 @@ void Debug::PrepareFunctionForDebugExecution(
   Handle<DebugInfo> debug_info = GetOrCreateDebugInfo(shared);
   if (debug_info->flags() & DebugInfo::kPreparedForDebugExecution) return;
 
-  // Make a copy of the bytecode array if available.
-  Handle<HeapObject> maybe_original_bytecode_array =
-      isolate_->factory()->undefined_value();
   if (shared->HasBytecodeArray()) {
-    Handle<BytecodeArray> original_bytecode_array =
-        handle(shared->GetBytecodeArray(), isolate_);
-    Handle<BytecodeArray> debug_bytecode_array =
-        isolate_->factory()->CopyBytecodeArray(original_bytecode_array);
-    debug_info->set_debug_bytecode_array(*debug_bytecode_array);
-    shared->SetDebugBytecodeArray(*debug_bytecode_array);
-    maybe_original_bytecode_array = original_bytecode_array;
+    SharedFunctionInfo::InstallDebugBytecode(shared, isolate_);
   }
-  debug_info->set_original_bytecode_array(*maybe_original_bytecode_array);
 
   if (debug_info->CanBreakAtEntry()) {
     // Deopt everything in case the function is inlined anywhere.
@@ -1519,7 +1531,7 @@ class SharedFunctionInfoFinder {
   JSFunction current_candidate_closure_;
   int current_start_position_;
   int target_position_;
-  DisallowHeapAllocation no_gc_;
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 };
 
 
@@ -1557,7 +1569,7 @@ Handle<Object> Debug::FindSharedFunctionInfoInScript(Handle<Script> script,
         // be no JSFunction referencing it. We can anticipate creating a debug
         // info while bypassing PrepareFunctionForDebugExecution.
         if (iteration > 1) {
-          AllowHeapAllocation allow_before_return;
+          AllowGarbageCollection allow_before_return;
           CreateBreakInfo(shared_handle);
         }
         return shared_handle;
@@ -2157,7 +2169,7 @@ void Debug::PrintBreakLocation() {
                                  isolate_);
     int line_start = line == 0 ? 0 : Smi::ToInt(line_ends->get(line - 1)) + 1;
     int line_end = Smi::ToInt(line_ends->get(line));
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent content = source->GetFlatContent(no_gc);
     if (content.IsOneByte()) {
       PrintF("[debug] %.*s\n", line_end - line_start,
@@ -2336,7 +2348,7 @@ bool Debug::PerformSideEffectCheck(Handle<JSFunction> function,
     case DebugInfo::kHasSideEffects:
       if (FLAG_trace_side_effect_free_debug_evaluate) {
         PrintF("[debug-evaluate] Function %s failed side effect check.\n",
-               function->shared().DebugName().ToCString().get());
+               function->shared().DebugNameCStr().get());
       }
       side_effect_check_failed_ = true;
       // Throw an uncatchable termination exception.
@@ -2429,7 +2441,7 @@ bool Debug::PerformSideEffectCheckAtBytecode(InterpretedFrame* frame) {
 
   DCHECK_EQ(isolate_->debug_execution_mode(), DebugInfo::kSideEffects);
   SharedFunctionInfo shared = frame->function().shared();
-  BytecodeArray bytecode_array = shared.GetBytecodeArray();
+  BytecodeArray bytecode_array = shared.GetBytecodeArray(isolate_);
   int offset = frame->GetBytecodeOffset();
   interpreter::BytecodeArrayAccessor bytecode_accessor(
       handle(bytecode_array, isolate_), offset);
@@ -2468,5 +2480,19 @@ bool Debug::PerformSideEffectCheckForObject(Handle<Object> object) {
   isolate_->TerminateExecution();
   return false;
 }
+
+void Debug::SetTemporaryObjectTrackingDisabled(bool disabled) {
+  if (temporary_objects_) {
+    temporary_objects_->disabled = disabled;
+  }
+}
+
+bool Debug::GetTemporaryObjectTrackingDisabled() const {
+  if (temporary_objects_) {
+    return temporary_objects_->disabled;
+  }
+  return false;
+}
+
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/debug/debug.h b/deps/v8/src/debug/debug.h
index c95affc57e3a94..ef5402c143bdd5 100644
--- a/deps/v8/src/debug/debug.h
+++ b/deps/v8/src/debug/debug.h
@@ -39,10 +39,7 @@ enum StepAction : int8_t {
 };
 
 // Type of exception break. NOTE: These values are in macros.py as well.
-enum ExceptionBreakType {
-  BreakException = 0,
-  BreakUncaughtException = 1
-};
+enum ExceptionBreakType { BreakException = 0, BreakUncaughtException = 1 };
 
 enum DebugBreakType {
   NOT_DEBUG_BREAK,
@@ -129,6 +126,8 @@ class BreakLocation {
 class V8_EXPORT_PRIVATE BreakIterator {
  public:
   explicit BreakIterator(Handle<DebugInfo> debug_info);
+  BreakIterator(const BreakIterator&) = delete;
+  BreakIterator& operator=(const BreakIterator&) = delete;
 
   BreakLocation GetBreakLocation();
   bool Done() const { return source_position_iterator_.done(); }
@@ -159,9 +158,7 @@ class V8_EXPORT_PRIVATE BreakIterator {
   int position_;
   int statement_position_;
   SourcePositionTableIterator source_position_iterator_;
-  DisallowHeapAllocation no_gc_;
-
-  DISALLOW_COPY_AND_ASSIGN(BreakIterator);
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 };
 
 // Linked list holding debug info objects. The debug info objects are kept as
@@ -204,7 +201,6 @@ class DebugFeatureTracker {
   uint32_t bitfield_;
 };
 
-
 // This class contains the debugger support. The main purpose is to handle
 // setting break points in the code.
 //
@@ -214,6 +210,9 @@ class DebugFeatureTracker {
 // DebugInfo.
 class V8_EXPORT_PRIVATE Debug {
  public:
+  Debug(const Debug&) = delete;
+  Debug& operator=(const Debug&) = delete;
+
   // Debug event triggers.
   void OnDebugBreak(Handle<FixedArray> break_points_hit, StepAction stepAction);
 
@@ -317,7 +316,7 @@ class V8_EXPORT_PRIVATE Debug {
   char* ArchiveDebug(char* to);
   char* RestoreDebug(char* from);
   static int ArchiveSpacePerThread();
-  void FreeThreadResources() { }
+  void FreeThreadResources() {}
   void Iterate(RootVisitor* v);
   void InitThread(const ExecutionAccess& lock) { ThreadInit(); }
 
@@ -358,9 +357,7 @@ class V8_EXPORT_PRIVATE Debug {
   void set_return_value(Object value) { thread_local_.return_value_ = value; }
 
   // Support for embedding into generated code.
-  Address is_active_address() {
-    return reinterpret_cast<Address>(&is_active_);
-  }
+  Address is_active_address() { return reinterpret_cast<Address>(&is_active_); }
 
   Address hook_on_function_call_address() {
     return reinterpret_cast<Address>(&hook_on_function_call_);
@@ -392,6 +389,8 @@ class V8_EXPORT_PRIVATE Debug {
 
   void RemoveBreakInfoAndMaybeFree(Handle<DebugInfo> debug_info);
 
+  static char* Iterate(RootVisitor* v, char* thread_storage);
+
  private:
   explicit Debug(Isolate* isolate);
   ~Debug();
@@ -449,9 +448,7 @@ class V8_EXPORT_PRIVATE Debug {
   // on whether this is a regular break location or a break at function entry.
   bool CheckBreakPoint(Handle<BreakPoint> break_point, bool is_break_at_entry);
 
-  inline void AssertDebugContext() {
-    DCHECK(in_debug_scope());
-  }
+  inline void AssertDebugContext() { DCHECK(in_debug_scope()); }
 
   void ThreadInit();
 
@@ -467,6 +464,9 @@ class V8_EXPORT_PRIVATE Debug {
                      DebugInfoListNode** curr);
   void FreeDebugInfoListNode(DebugInfoListNode* prev, DebugInfoListNode* node);
 
+  void SetTemporaryObjectTrackingDisabled(bool disabled);
+  bool GetTemporaryObjectTrackingDisabled() const;
+
   debug::DebugDelegate* debug_delegate_ = nullptr;
 
   // Debugger is active, i.e. there is a debug event listener attached.
@@ -546,6 +546,8 @@ class V8_EXPORT_PRIVATE Debug {
     bool break_on_next_function_call_;
   };
 
+  static void Iterate(RootVisitor* v, ThreadLocal* thread_local_data);
+
   // Storage location for registers when handling debug break calls
   ThreadLocal thread_local_;
 
@@ -557,18 +559,17 @@ class V8_EXPORT_PRIVATE Debug {
   friend class Isolate;
   friend class DebugScope;
   friend class DisableBreak;
+  friend class DisableTemporaryObjectTracking;
   friend class LiveEdit;
   friend class SuppressDebug;
 
   friend Handle<FixedArray> GetDebuggedFunctions();  // In test-debug.cc
   friend void CheckDebuggerUnloaded();               // In test-debug.cc
-
-  DISALLOW_COPY_AND_ASSIGN(Debug);
 };
 
 // This scope is used to load and enter the debug context and create a new
 // break state.  Leaving the scope will restore the previous state.
-class DebugScope {
+class V8_NODISCARD DebugScope {
  public:
   explicit DebugScope(Debug* debug);
   ~DebugScope();
@@ -579,8 +580,8 @@ class DebugScope {
   Isolate* isolate() { return debug_->isolate_; }
 
   Debug* debug_;
-  DebugScope* prev_;               // Previous scope if entered recursively.
-  StackFrameId break_frame_id_;    // Previous break frame id.
+  DebugScope* prev_;             // Previous scope if entered recursively.
+  StackFrameId break_frame_id_;  // Previous break frame id.
   PostponeInterruptsScope no_interrupts_;
   // This is used as a boolean.
   bool terminate_on_resume_ = false;
@@ -590,7 +591,7 @@ class DebugScope {
 // When there are nested debug breaks, we use this to restore the return
 // value to the previous state. This is not merged with DebugScope because
 // return_value_ will not be cleared when we use DebugScope.
-class ReturnValueScope {
+class V8_NODISCARD ReturnValueScope {
  public:
   explicit ReturnValueScope(Debug* debug);
   ~ReturnValueScope();
@@ -607,14 +608,35 @@ class DisableBreak {
       : debug_(debug), previous_break_disabled_(debug->break_disabled_) {
     debug_->break_disabled_ = disable;
   }
-  ~DisableBreak() {
-    debug_->break_disabled_ = previous_break_disabled_;
-  }
+  ~DisableBreak() { debug_->break_disabled_ = previous_break_disabled_; }
+  DisableBreak(const DisableBreak&) = delete;
+  DisableBreak& operator=(const DisableBreak&) = delete;
 
  private:
   Debug* debug_;
   bool previous_break_disabled_;
-  DISALLOW_COPY_AND_ASSIGN(DisableBreak);
+};
+
+// Stack allocated class for disabling temporary object tracking.
+class DisableTemporaryObjectTracking {
+ public:
+  explicit DisableTemporaryObjectTracking(Debug* debug)
+      : debug_(debug),
+        previous_tracking_disabled_(
+            debug->GetTemporaryObjectTrackingDisabled()) {
+    debug_->SetTemporaryObjectTrackingDisabled(true);
+  }
+  ~DisableTemporaryObjectTracking() {
+    debug_->SetTemporaryObjectTrackingDisabled(previous_tracking_disabled_);
+  }
+  DisableTemporaryObjectTracking(const DisableTemporaryObjectTracking&) =
+      delete;
+  DisableTemporaryObjectTracking& operator=(
+      const DisableTemporaryObjectTracking&) = delete;
+
+ private:
+  Debug* debug_;
+  bool previous_tracking_disabled_;
 };
 
 class SuppressDebug {
@@ -624,11 +646,12 @@ class SuppressDebug {
     debug_->is_suppressed_ = true;
   }
   ~SuppressDebug() { debug_->is_suppressed_ = old_state_; }
+  SuppressDebug(const SuppressDebug&) = delete;
+  SuppressDebug& operator=(const SuppressDebug&) = delete;
 
  private:
   Debug* debug_;
   bool old_state_;
-  DISALLOW_COPY_AND_ASSIGN(SuppressDebug);
 };
 
 // Code generator routines.
@@ -650,7 +673,6 @@ class DebugCodegen : public AllStatic {
   static void GenerateDebugBreakTrampoline(MacroAssembler* masm);
 };
 
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/debug/liveedit.cc b/deps/v8/src/debug/liveedit.cc
index 981692c3bb2f3f..7d740336e87ec1 100644
--- a/deps/v8/src/debug/liveedit.cc
+++ b/deps/v8/src/debug/liveedit.cc
@@ -1044,7 +1044,7 @@ void UpdatePositions(Isolate* isolate, Handle<SharedFunctionInfo> sfi,
                                 new_start_position);
   if (sfi->HasBytecodeArray()) {
     TranslateSourcePositionTable(
-        isolate, handle(sfi->GetBytecodeArray(), isolate), diffs);
+        isolate, handle(sfi->GetBytecodeArray(isolate), isolate), diffs);
   }
 }
 }  // anonymous namespace
@@ -1159,7 +1159,7 @@ void LiveEdit::PatchScript(Isolate* isolate, Handle<Script> script,
     }
 
     if (!sfi->HasBytecodeArray()) continue;
-    FixedArray constants = sfi->GetBytecodeArray().constant_pool();
+    FixedArray constants = sfi->GetBytecodeArray(isolate).constant_pool();
     for (int i = 0; i < constants.length(); ++i) {
       if (!constants.get(i).IsSharedFunctionInfo()) continue;
       FunctionData* data = nullptr;
@@ -1204,7 +1204,7 @@ void LiveEdit::PatchScript(Isolate* isolate, Handle<Script> script,
   SharedFunctionInfo::ScriptIterator it(isolate, *new_script);
   for (SharedFunctionInfo sfi = it.Next(); !sfi.is_null(); sfi = it.Next()) {
     if (!sfi.HasBytecodeArray()) continue;
-    FixedArray constants = sfi.GetBytecodeArray().constant_pool();
+    FixedArray constants = sfi.GetBytecodeArray(isolate).constant_pool();
     for (int i = 0; i < constants.length(); ++i) {
       if (!constants.get(i).IsSharedFunctionInfo()) continue;
       SharedFunctionInfo inner_sfi = SharedFunctionInfo::cast(constants.get(i));
@@ -1233,7 +1233,7 @@ void LiveEdit::PatchScript(Isolate* isolate, Handle<Script> script,
     // Check that all the functions in the new script are valid, that their
     // function literals match what is expected, and that start positions are
     // unique.
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
 
     SharedFunctionInfo::ScriptIterator it(isolate, *new_script);
     std::set<int> start_positions;
@@ -1252,7 +1252,7 @@ void LiveEdit::PatchScript(Isolate* isolate, Handle<Script> script,
       // Check that all the functions in this function's constant pool are also
       // on the new script, and that their id matches their index in the new
       // scripts function list.
-      FixedArray constants = sfi.GetBytecodeArray().constant_pool();
+      FixedArray constants = sfi.GetBytecodeArray(isolate).constant_pool();
       for (int i = 0; i < constants.length(); ++i) {
         if (!constants.get(i).IsSharedFunctionInfo()) continue;
         SharedFunctionInfo inner_sfi =
diff --git a/deps/v8/src/debug/s390/debug-s390.cc b/deps/v8/src/debug/s390/debug-s390.cc
index 7d08e1367863af..c618491366e0c2 100644
--- a/deps/v8/src/debug/s390/debug-s390.cc
+++ b/deps/v8/src/debug/s390/debug-s390.cc
@@ -35,14 +35,14 @@ void DebugCodegen::GenerateFrameDropperTrampoline(MacroAssembler* masm) {
   // - Leave the frame.
   // - Restart the frame by calling the function.
 
-  __ LoadRR(fp, r3);
-  __ LoadP(r3, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
+  __ mov(fp, r3);
+  __ LoadU64(r3, MemOperand(fp, StandardFrameConstants::kFunctionOffset));
   __ LeaveFrame(StackFrame::INTERNAL);
   __ LoadTaggedPointerField(
       r2, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
-  __ LoadLogicalHalfWordP(
+  __ LoadU16(
       r2, FieldMemOperand(r2, SharedFunctionInfo::kFormalParameterCountOffset));
-  __ LoadRR(r4, r2);
+  __ mov(r4, r2);
 
   __ InvokeFunction(r3, r4, r2, JUMP_FUNCTION);
 }
diff --git a/deps/v8/src/debug/wasm/gdb-server/gdb-server-thread.h b/deps/v8/src/debug/wasm/gdb-server/gdb-server-thread.h
index cca1e4a6de09c3..3d9a01a3a51c9c 100644
--- a/deps/v8/src/debug/wasm/gdb-server/gdb-server-thread.h
+++ b/deps/v8/src/debug/wasm/gdb-server/gdb-server-thread.h
@@ -22,6 +22,8 @@ class GdbServer;
 class GdbServerThread : public v8::base::Thread {
  public:
   explicit GdbServerThread(GdbServer* gdb_server);
+  GdbServerThread(const GdbServerThread&) = delete;
+  GdbServerThread& operator=(const GdbServerThread&) = delete;
 
   // base::Thread
   void Run() override;
@@ -51,8 +53,6 @@ class GdbServerThread : public v8::base::Thread {
   // Protected by {mutex_}:
   std::unique_ptr<TransportBase> transport_;
   std::unique_ptr<Target> target_;
-
-  DISALLOW_COPY_AND_ASSIGN(GdbServerThread);
 };
 
 }  // namespace gdb_server
diff --git a/deps/v8/src/debug/wasm/gdb-server/gdb-server.cc b/deps/v8/src/debug/wasm/gdb-server/gdb-server.cc
index 96e2308cee7e75..91b531f41fc27c 100644
--- a/deps/v8/src/debug/wasm/gdb-server/gdb-server.cc
+++ b/deps/v8/src/debug/wasm/gdb-server/gdb-server.cc
@@ -51,6 +51,9 @@ class TaskRunner {
         nested_loop_count_(0),
         is_terminated_(false) {}
 
+  TaskRunner(const TaskRunner&) = delete;
+  TaskRunner& operator=(const TaskRunner&) = delete;
+
   // Starts the task runner. All tasks posted are run, in order, in the thread
   // that calls this function.
   void Run() {
@@ -100,11 +103,11 @@ class TaskRunner {
   v8::base::Semaphore process_queue_semaphore_;
   int nested_loop_count_;
   std::atomic<bool> is_terminated_;
-
-  DISALLOW_COPY_AND_ASSIGN(TaskRunner);
 };
 
-GdbServer::GdbServer() { task_runner_ = std::make_unique<TaskRunner>(); }
+GdbServer::GdbServer() : has_module_list_changed_(false) {
+  task_runner_ = std::make_unique<TaskRunner>();
+}
 
 template <typename Functor>
 auto GdbServer::RunSyncTask(Functor&& callback) const {
@@ -146,17 +149,20 @@ void GdbServer::RunMessageLoopOnPause() { task_runner_->Run(); }
 
 void GdbServer::QuitMessageLoopOnPause() { task_runner_->Terminate(); }
 
-std::vector<GdbServer::WasmModuleInfo> GdbServer::GetLoadedModules() {
+std::vector<GdbServer::WasmModuleInfo> GdbServer::GetLoadedModules(
+    bool clear_module_list_changed_flag) {
   // Executed in the GDBServerThread.
   std::vector<GdbServer::WasmModuleInfo> modules;
 
-  RunSyncTask([this, &modules]() {
+  RunSyncTask([this, &modules, clear_module_list_changed_flag]() {
     // Executed in the isolate thread.
     for (const auto& pair : scripts_) {
       uint32_t module_id = pair.first;
       const WasmModuleDebug& module_debug = pair.second;
       modules.push_back({module_id, module_debug.GetModuleName()});
     }
+
+    if (clear_module_list_changed_flag) has_module_list_changed_ = false;
   });
   return modules;
 }
@@ -215,14 +221,32 @@ bool GdbServer::GetWasmStackValue(uint32_t frame_index, uint32_t index,
   return result;
 }
 
-uint32_t GdbServer::GetWasmMemory(uint32_t frame_index, uint32_t offset,
+uint32_t GdbServer::GetWasmMemory(uint32_t module_id, uint32_t offset,
                                   uint8_t* buffer, uint32_t size) {
   // Executed in the GDBServerThread.
   uint32_t bytes_read = 0;
-  RunSyncTask([this, &bytes_read, frame_index, offset, buffer, size]() {
+  RunSyncTask([this, &bytes_read, module_id, offset, buffer, size]() {
     // Executed in the isolate thread.
-    bytes_read = WasmModuleDebug::GetWasmMemory(
-        GetTarget().GetCurrentIsolate(), frame_index, offset, buffer, size);
+    WasmModuleDebug* module_debug = nullptr;
+    if (GetModuleDebugHandler(module_id, &module_debug)) {
+      bytes_read = module_debug->GetWasmMemory(GetTarget().GetCurrentIsolate(),
+                                               offset, buffer, size);
+    }
+  });
+  return bytes_read;
+}
+
+uint32_t GdbServer::GetWasmData(uint32_t module_id, uint32_t offset,
+                                uint8_t* buffer, uint32_t size) {
+  // Executed in the GDBServerThread.
+  uint32_t bytes_read = 0;
+  RunSyncTask([this, &bytes_read, module_id, offset, buffer, size]() {
+    // Executed in the isolate thread.
+    WasmModuleDebug* module_debug = nullptr;
+    if (GetModuleDebugHandler(module_id, &module_debug)) {
+      bytes_read = module_debug->GetWasmData(GetTarget().GetCurrentIsolate(),
+                                             offset, buffer, size);
+    }
   });
   return bytes_read;
 }
@@ -304,6 +328,7 @@ void GdbServer::RemoveIsolate(Isolate* isolate) {
     for (auto it = scripts_.begin(); it != scripts_.end();) {
       if (it->second.GetIsolate() == isolate) {
         it = scripts_.erase(it);
+        has_module_list_changed_ = true;
       } else {
         ++it;
       }
@@ -350,6 +375,7 @@ void GdbServer::AddWasmModule(uint32_t module_id,
   v8::Isolate* isolate = wasm_script->GetIsolate();
   scripts_.insert(
       std::make_pair(module_id, WasmModuleDebug(isolate, wasm_script)));
+  has_module_list_changed_ = true;
 
   if (FLAG_wasm_pause_waiting_for_debugger && scripts_.size() == 1) {
     TRACE_GDB_REMOTE("Paused, waiting for a debugger to attach...\n");
diff --git a/deps/v8/src/debug/wasm/gdb-server/gdb-server.h b/deps/v8/src/debug/wasm/gdb-server/gdb-server.h
index 50939af69cc93b..91a4d65473b28a 100644
--- a/deps/v8/src/debug/wasm/gdb-server/gdb-server.h
+++ b/deps/v8/src/debug/wasm/gdb-server/gdb-server.h
@@ -24,6 +24,9 @@ class TaskRunner;
 // the Wasm engine.
 class GdbServer {
  public:
+  GdbServer(const GdbServer&) = delete;
+  GdbServer& operator=(const GdbServer&) = delete;
+
   // Factory method: creates and returns a GdbServer. Spawns a "GDB-remote"
   // thread that will be used to communicate with the debugger.
   // May return null on failure.
@@ -41,7 +44,10 @@ class GdbServer {
     uint32_t module_id;
     std::string module_name;
   };
-  std::vector<WasmModuleInfo> GetLoadedModules();
+  std::vector<WasmModuleInfo> GetLoadedModules(
+      bool clear_module_list_changed_flag = false);
+
+  bool HasModuleListChanged() const { return has_module_list_changed_; }
 
   // Queries the value of the {index} global value in the Wasm module identified
   // by {frame_index}.
@@ -61,13 +67,21 @@ class GdbServer {
                          uint32_t buffer_size, uint32_t* size);
 
   // Reads {size} bytes, starting from {offset}, from the Memory instance
-  // associated to the Wasm module identified by {frame_index}.
+  // associated to the Wasm module identified by {module_id}.
   // Returns the number of bytes copied to {buffer}, or 0 is case of error.
   // Note: only one Memory for Module is currently supported.
   //
-  uint32_t GetWasmMemory(uint32_t frame_index, uint32_t offset, uint8_t* buffer,
+  uint32_t GetWasmMemory(uint32_t module_id, uint32_t offset, uint8_t* buffer,
                          uint32_t size);
 
+  // Reads {size} bytes, starting from {offset}, from the first Data segment
+  // in the Wasm module identified by {module_id}.
+  // Returns the number of bytes copied to {buffer}, or 0 is case of error.
+  // Note: only one Memory for Module is currently supported.
+  //
+  uint32_t GetWasmData(uint32_t module_id, uint32_t offset, uint8_t* buffer,
+                       uint32_t size);
+
   // Reads {size} bytes, starting from the low dword of {address}, from the Code
   // space of th Wasm module identified by high dword of {address}.
   // Returns the number of bytes copied to {buffer}, or 0 is case of error.
@@ -173,6 +187,8 @@ class GdbServer {
   // tasks executed in the main (isolate) thread.
   std::unique_ptr<TaskRunner> task_runner_;
 
+  std::atomic<bool> has_module_list_changed_;
+
   //////////////////////////////////////////////////////////////////////////////
   // Always accessed in the isolate thread.
 
@@ -189,8 +205,6 @@ class GdbServer {
 
   // End of fields always accessed in the isolate thread.
   //////////////////////////////////////////////////////////////////////////////
-
-  DISALLOW_COPY_AND_ASSIGN(GdbServer);
 };
 
 }  // namespace gdb_server
diff --git a/deps/v8/src/debug/wasm/gdb-server/session.h b/deps/v8/src/debug/wasm/gdb-server/session.h
index d7c22638e61466..ba052cab57592c 100644
--- a/deps/v8/src/debug/wasm/gdb-server/session.h
+++ b/deps/v8/src/debug/wasm/gdb-server/session.h
@@ -19,6 +19,8 @@ class TransportBase;
 class V8_EXPORT_PRIVATE Session {
  public:
   explicit Session(TransportBase* transport);
+  Session(const Session&) = delete;
+  Session& operator=(const Session&) = delete;
 
   // Attempt to send a packet and optionally wait for an ACK from the receiver.
   bool SendPacket(Packet* packet, bool expect_ack = true);
@@ -61,8 +63,6 @@ class V8_EXPORT_PRIVATE Session {
   TransportBase* io_;  // Transport object not owned by the Session.
   bool connected_;     // Is the connection still valid.
   bool ack_enabled_;   // If true, emit or wait for '+' from RSP stream.
-
-  DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace gdb_server
diff --git a/deps/v8/src/debug/wasm/gdb-server/target.cc b/deps/v8/src/debug/wasm/gdb-server/target.cc
index 6992fd1192d439..a47242eea16a40 100644
--- a/deps/v8/src/debug/wasm/gdb-server/target.cc
+++ b/deps/v8/src/debug/wasm/gdb-server/target.cc
@@ -37,7 +37,7 @@ Target::Target(GdbServer* gdb_server)
 void Target::InitQueryPropertyMap() {
   // Request LLDB to send packets up to 4000 bytes for bulk transfers.
   query_properties_["Supported"] =
-      "PacketSize=1000;vContSupported-;qXfer:libraries:read+;";
+      "PacketSize=1000;vContSupported-;qXfer:libraries:read+;wasm+;";
 
   query_properties_["Attached"] = "1";
 
@@ -486,7 +486,7 @@ Target::ErrorCode Target::ProcessQueryPacket(const Packet* pkt_in,
   std::string tmp = "Xfer:libraries:read";
   if (!strncmp(str, tmp.data(), tmp.length())) {
     std::vector<GdbServer::WasmModuleInfo> modules =
-        gdb_server_->GetLoadedModules();
+        gdb_server_->GetLoadedModules(true);
     std::string result("l<library-list>");
     for (const auto& module : modules) {
       wasm_addr_t address(module.module_id, 0);
@@ -583,23 +583,44 @@ Target::ErrorCode Target::ProcessQueryPacket(const Packet* pkt_in,
     return ErrorCode::BadFormat;
   }
 
-  // Read Wasm memory.
-  // IN : $qWasmMem:frame_index;addr;len
+  // Read Wasm Memory.
+  // IN : $qWasmMem:module_id;addr;len
   // OUT: $xx..xx
   if (toks[0] == "WasmMem") {
     if (toks.size() == 4) {
-      uint32_t frame_index =
-          static_cast<uint32_t>(strtol(toks[1].data(), nullptr, 10));
-      uint32_t address =
-          static_cast<uint32_t>(strtol(toks[2].data(), nullptr, 16));
-      uint32_t length =
-          static_cast<uint32_t>(strtol(toks[3].data(), nullptr, 16));
+      uint32_t module_id = strtoul(toks[1].data(), nullptr, 10);
+      uint32_t address = strtoul(toks[2].data(), nullptr, 16);
+      uint32_t length = strtoul(toks[3].data(), nullptr, 16);
+      if (length > Transport::kBufSize / 2) {
+        return ErrorCode::BadArgs;
+      }
+      uint8_t buff[Transport::kBufSize];
+      uint32_t read =
+          gdb_server_->GetWasmMemory(module_id, address, buff, length);
+      if (read > 0) {
+        pkt_out->AddBlock(buff, read);
+        return ErrorCode::None;
+      } else {
+        return ErrorCode::Failed;
+      }
+    }
+    return ErrorCode::BadFormat;
+  }
+
+  // Read Wasm Data.
+  // IN : $qWasmData:module_id;addr;len
+  // OUT: $xx..xx
+  if (toks[0] == "WasmData") {
+    if (toks.size() == 4) {
+      uint32_t module_id = strtoul(toks[1].data(), nullptr, 10);
+      uint32_t address = strtoul(toks[2].data(), nullptr, 16);
+      uint32_t length = strtoul(toks[3].data(), nullptr, 16);
       if (length > Transport::kBufSize / 2) {
         return ErrorCode::BadArgs;
       }
       uint8_t buff[Transport::kBufSize];
       uint32_t read =
-          gdb_server_->GetWasmMemory(frame_index, address, buff, length);
+          gdb_server_->GetWasmData(module_id, address, buff, length);
       if (read > 0) {
         pkt_out->AddBlock(buff, read);
         return ErrorCode::None;
@@ -640,6 +661,10 @@ void Target::SetStopReply(Packet* pkt_out) const {
   // Adds 'thread:<tid>;' pair. Note that a terminating ';' is required.
   pkt_out->AddString("thread:");
   pkt_out->AddNumberSep(kThreadId, ';');
+
+  // If the loaded modules have changed since the last stop packet, signals
+  // that.
+  if (gdb_server_->HasModuleListChanged()) pkt_out->AddString("library:;");
 }
 
 void Target::SetStatus(Status status, int8_t signal,
diff --git a/deps/v8/src/debug/wasm/gdb-server/target.h b/deps/v8/src/debug/wasm/gdb-server/target.h
index 1af81d3dbecc3e..cc10707be4aecc 100644
--- a/deps/v8/src/debug/wasm/gdb-server/target.h
+++ b/deps/v8/src/debug/wasm/gdb-server/target.h
@@ -26,6 +26,8 @@ class Target {
  public:
   // Contruct a Target object.
   explicit Target(GdbServer* gdb_server);
+  Target(const Target&) = delete;
+  Target& operator=(const Target&) = delete;
 
   // This function spin on a debugging session, until it closes.
   void Run(Session* ses);
@@ -128,8 +130,6 @@ class Target {
 
   // End of fields protected by {mutex_}.
   //////////////////////////////////////////////////////////////////////////////
-
-  DISALLOW_COPY_AND_ASSIGN(Target);
 };
 
 }  // namespace gdb_server
diff --git a/deps/v8/src/debug/wasm/gdb-server/transport.cc b/deps/v8/src/debug/wasm/gdb-server/transport.cc
index f1aed96e5b23a5..79ed63ac9e36fd 100644
--- a/deps/v8/src/debug/wasm/gdb-server/transport.cc
+++ b/deps/v8/src/debug/wasm/gdb-server/transport.cc
@@ -3,8 +3,11 @@
 // found in the LICENSE file.
 
 #include "src/debug/wasm/gdb-server/transport.h"
+
 #include <fcntl.h>
 
+#include "src/base/platform/wrappers.h"
+
 #ifndef SD_BOTH
 #define SD_BOTH 2
 #endif
@@ -116,7 +119,7 @@ Transport::~Transport() {
 
 void Transport::CopyFromBuffer(char** dst, int32_t* len) {
   int32_t copy_bytes = std::min(*len, size_ - pos_);
-  memcpy(*dst, buf_.get() + pos_, copy_bytes);
+  base::Memcpy(*dst, buf_.get() + pos_, copy_bytes);
   pos_ += copy_bytes;
   *len -= copy_bytes;
   *dst += copy_bytes;
diff --git a/deps/v8/src/debug/wasm/gdb-server/transport.h b/deps/v8/src/debug/wasm/gdb-server/transport.h
index 42bf4383bbc99b..9d44f81acb6a18 100644
--- a/deps/v8/src/debug/wasm/gdb-server/transport.h
+++ b/deps/v8/src/debug/wasm/gdb-server/transport.h
@@ -146,6 +146,8 @@ class SocketTransport : public Transport {
  public:
   explicit SocketTransport(SocketHandle s);
   ~SocketTransport() override;
+  SocketTransport(const SocketTransport&) = delete;
+  SocketTransport& operator=(const SocketTransport&) = delete;
 
   // TransportBase
   bool AcceptConnection() override;
@@ -158,8 +160,6 @@ class SocketTransport : public Transport {
 
   HANDLE socket_event_;
   HANDLE faulted_thread_event_;
-
-  DISALLOW_COPY_AND_ASSIGN(SocketTransport);
 };
 
 #else  // _WIN32
@@ -168,6 +168,8 @@ class SocketTransport : public Transport {
  public:
   explicit SocketTransport(SocketHandle s);
   ~SocketTransport() override;
+  SocketTransport(const SocketTransport&) = delete;
+  SocketTransport& operator=(const SocketTransport&) = delete;
 
   // TransportBase
   bool AcceptConnection() override;
@@ -179,8 +181,6 @@ class SocketTransport : public Transport {
 
   int faulted_thread_fd_read_;
   int faulted_thread_fd_write_;
-
-  DISALLOW_COPY_AND_ASSIGN(SocketTransport);
 };
 
 #endif  // _WIN32
diff --git a/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.cc b/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.cc
index f0b77bc0965a8a..2f307dd5c04c82 100644
--- a/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.cc
+++ b/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.cc
@@ -6,9 +6,11 @@
 
 #include "src/api/api-inl.h"
 #include "src/api/api.h"
+#include "src/base/platform/wrappers.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/frames.h"
 #include "src/objects/script.h"
+#include "src/wasm/module-instantiate.h"
 #include "src/wasm/wasm-debug.h"
 #include "src/wasm/wasm-value.h"
 
@@ -236,10 +238,10 @@ bool WasmModuleDebug::GetWasmLocal(Isolate* isolate, uint32_t frame_index,
                                              isolate);
       wasm::NativeModule* native_module = module_object->native_module();
       DebugInfo* debug_info = native_module->GetDebugInfo();
-      if (static_cast<uint32_t>(debug_info->GetNumLocals(
-              isolate, frame_it.frame()->pc())) > index) {
+      if (static_cast<uint32_t>(
+              debug_info->GetNumLocals(frame_it.frame()->pc())) > index) {
         wasm::WasmValue wasm_value = debug_info->GetLocalValue(
-            index, isolate, frame_it.frame()->pc(), frame_it.frame()->fp(),
+            index, frame_it.frame()->pc(), frame_it.frame()->fp(),
             frame_it.frame()->callee_fp());
         return GetWasmValue(wasm_value, buffer, buffer_size, size);
       }
@@ -269,10 +271,10 @@ bool WasmModuleDebug::GetWasmStackValue(Isolate* isolate, uint32_t frame_index,
                                              isolate);
       wasm::NativeModule* native_module = module_object->native_module();
       DebugInfo* debug_info = native_module->GetDebugInfo();
-      if (static_cast<uint32_t>(debug_info->GetStackDepth(
-              isolate, frame_it.frame()->pc())) > index) {
+      if (static_cast<uint32_t>(
+              debug_info->GetStackDepth(frame_it.frame()->pc())) > index) {
         WasmValue wasm_value = debug_info->GetStackValue(
-            index, isolate, frame_it.frame()->pc(), frame_it.frame()->fp(),
+            index, frame_it.frame()->pc(), frame_it.frame()->fp(),
             frame_it.frame()->callee_fp());
         return GetWasmValue(wasm_value, buffer, buffer_size, size);
       }
@@ -281,23 +283,49 @@ bool WasmModuleDebug::GetWasmStackValue(Isolate* isolate, uint32_t frame_index,
   return false;
 }
 
-// static
-uint32_t WasmModuleDebug::GetWasmMemory(Isolate* isolate, uint32_t frame_index,
-                                        uint32_t offset, uint8_t* buffer,
-                                        uint32_t size) {
+uint32_t WasmModuleDebug::GetWasmMemory(Isolate* isolate, uint32_t offset,
+                                        uint8_t* buffer, uint32_t size) {
   HandleScope handles(isolate);
 
   uint32_t bytes_read = 0;
-  Handle<WasmInstanceObject> instance = GetWasmInstance(isolate, frame_index);
+  Handle<WasmInstanceObject> instance = GetFirstWasmInstance();
   if (!instance.is_null()) {
     uint8_t* mem_start = instance->memory_start();
     size_t mem_size = instance->memory_size();
     if (static_cast<uint64_t>(offset) + size <= mem_size) {
-      memcpy(buffer, mem_start + offset, size);
+      base::Memcpy(buffer, mem_start + offset, size);
       bytes_read = size;
     } else if (offset < mem_size) {
       bytes_read = static_cast<uint32_t>(mem_size) - offset;
-      memcpy(buffer, mem_start + offset, bytes_read);
+      base::Memcpy(buffer, mem_start + offset, bytes_read);
+    }
+  }
+  return bytes_read;
+}
+
+uint32_t WasmModuleDebug::GetWasmData(Isolate* isolate, uint32_t offset,
+                                      uint8_t* buffer, uint32_t size) {
+  HandleScope handles(isolate);
+
+  uint32_t bytes_read = 0;
+  Handle<WasmInstanceObject> instance = GetFirstWasmInstance();
+  if (!instance.is_null()) {
+    Handle<WasmModuleObject> module_object(instance->module_object(), isolate);
+    const wasm::WasmModule* module = module_object->module();
+    if (!module->data_segments.empty()) {
+      const WasmDataSegment& segment = module->data_segments[0];
+      uint32_t data_offset = EvalUint32InitExpr(instance, segment.dest_addr);
+      offset += data_offset;
+
+      uint8_t* mem_start = instance->memory_start();
+      size_t mem_size = instance->memory_size();
+      if (static_cast<uint64_t>(offset) + size <= mem_size) {
+        memcpy(buffer, mem_start + offset, size);
+        bytes_read = size;
+      } else if (offset < mem_size) {
+        bytes_read = static_cast<uint32_t>(mem_size) - offset;
+        memcpy(buffer, mem_start + offset, bytes_read);
+      }
     }
   }
   return bytes_read;
@@ -317,7 +345,7 @@ uint32_t WasmModuleDebug::GetWasmModuleBytes(wasm_addr_t wasm_addr,
     if (offset < wire_bytes.length()) {
       uint32_t module_size = static_cast<uint32_t>(wire_bytes.length());
       bytes_read = module_size - offset >= size ? size : module_size - offset;
-      memcpy(buffer, wire_bytes.start() + offset, bytes_read);
+      base::Memcpy(buffer, wire_bytes.start() + offset, bytes_read);
     }
   }
   return bytes_read;
@@ -350,7 +378,7 @@ bool StoreValue(const T& value, uint8_t* buffer, uint32_t buffer_size,
                 uint32_t* size) {
   *size = sizeof(value);
   if (*size > buffer_size) return false;
-  memcpy(buffer, &value, *size);
+  base::Memcpy(buffer, &value, *size);
   return true;
 }
 
@@ -372,8 +400,6 @@ bool WasmModuleDebug::GetWasmValue(const wasm::WasmValue& wasm_value,
 
     case wasm::kWasmStmt.kind():
     case wasm::kWasmExternRef.kind():
-    case wasm::kWasmFuncRef.kind():
-    case wasm::kWasmExnRef.kind():
     case wasm::kWasmBottom.kind():
     default:
       // Not supported
diff --git a/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.h b/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.h
index 10e6a5da161822..0aa8ee9841f1f5 100644
--- a/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.h
+++ b/deps/v8/src/debug/wasm/gdb-server/wasm-module-debug.h
@@ -49,9 +49,15 @@ class WasmModuleDebug {
   // associated to this module.
   // Returns the number of byte copied to {buffer}, or 0 is case of error.
   // Note: only one Memory for Module is currently supported.
-  static uint32_t GetWasmMemory(Isolate* isolate, uint32_t frame_index,
-                                uint32_t offset, uint8_t* buffer,
-                                uint32_t size);
+  uint32_t GetWasmMemory(Isolate* isolate, uint32_t offset, uint8_t* buffer,
+                         uint32_t size);
+
+  // Reads {size} bytes, starting from {offset}, from the first segment
+  // associated to this module.
+  // Returns the number of byte copied to {buffer}, or 0 is case of error.
+  // Note: only one Memory for Module is currently supported.
+  uint32_t GetWasmData(Isolate* isolate, uint32_t offset, uint8_t* buffer,
+                       uint32_t size);
 
   // Gets {size} bytes, starting from {offset}, from the Code space of this
   // module.
diff --git a/deps/v8/src/deoptimizer/arm/deoptimizer-arm.cc b/deps/v8/src/deoptimizer/arm/deoptimizer-arm.cc
index 27684d9e391518..f3353b5689ce4b 100644
--- a/deps/v8/src/deoptimizer/arm/deoptimizer-arm.cc
+++ b/deps/v8/src/deoptimizer/arm/deoptimizer-arm.cc
@@ -10,6 +10,12 @@ namespace internal {
 const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
 const int Deoptimizer::kNonLazyDeoptExitSize = 2 * kInstrSize;
 const int Deoptimizer::kLazyDeoptExitSize = 2 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 3 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = kInstrSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
+    kInstrSize + kSystemPointerSize;
 
 Float32 RegisterValues::GetFloatRegister(unsigned n) const {
   const int kShift = n % 2 == 0 ? 0 : 32;
diff --git a/deps/v8/src/deoptimizer/arm64/deoptimizer-arm64.cc b/deps/v8/src/deoptimizer/arm64/deoptimizer-arm64.cc
index c695347a0bf09e..d7b36e942d4e93 100644
--- a/deps/v8/src/deoptimizer/arm64/deoptimizer-arm64.cc
+++ b/deps/v8/src/deoptimizer/arm64/deoptimizer-arm64.cc
@@ -16,6 +16,12 @@ const int Deoptimizer::kLazyDeoptExitSize = 2 * kInstrSize;
 #else
 const int Deoptimizer::kLazyDeoptExitSize = 1 * kInstrSize;
 #endif
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 2 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = kInstrSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
+    kInstrSize + kSystemPointerSize;
 
 Float32 RegisterValues::GetFloatRegister(unsigned n) const {
   return Float32::FromBits(
diff --git a/deps/v8/src/deoptimizer/deoptimize-reason.h b/deps/v8/src/deoptimizer/deoptimize-reason.h
index 592051fbd21c62..3dc0f0599b21b3 100644
--- a/deps/v8/src/deoptimizer/deoptimize-reason.h
+++ b/deps/v8/src/deoptimizer/deoptimize-reason.h
@@ -17,6 +17,7 @@ namespace internal {
   V(CouldNotGrowElements, "failed to grow elements store")                     \
   V(DeoptimizeNow, "%_DeoptimizeNow")                                          \
   V(DivisionByZero, "division by zero")                                        \
+  V(DynamicCheckMaps, "dynamic check maps failed")                             \
   V(Hole, "hole")                                                              \
   V(InstanceMigrationFailed, "instance migration failed")                      \
   V(InsufficientTypeFeedbackForCall, "Insufficient type feedback for call")    \
diff --git a/deps/v8/src/deoptimizer/deoptimizer.cc b/deps/v8/src/deoptimizer/deoptimizer.cc
index 63b44311281eff..b1ad9c19b9bd9a 100644
--- a/deps/v8/src/deoptimizer/deoptimizer.cc
+++ b/deps/v8/src/deoptimizer/deoptimizer.cc
@@ -267,6 +267,7 @@ class ActivationsFinder : public ThreadVisitor {
           SafepointEntry safepoint = code.GetSafepointEntry(it.frame()->pc());
           int trampoline_pc = safepoint.trampoline_pc();
           DCHECK_IMPLIES(code == topmost_, safe_to_deopt_);
+          STATIC_ASSERT(SafepointEntry::kNoTrampolinePC == -1);
           CHECK_GE(trampoline_pc, 0);
           // Replace the current pc on the stack with the trampoline.
           // TODO(v8:10026): avoid replacing a signed pointer.
@@ -292,7 +293,7 @@ class ActivationsFinder : public ThreadVisitor {
 // and replace pc on the stack for codes marked for deoptimization.
 // static
 void Deoptimizer::DeoptimizeMarkedCodeForContext(NativeContext native_context) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   Isolate* isolate = native_context.GetIsolate();
   Code topmost_optimized_code;
@@ -385,7 +386,7 @@ void Deoptimizer::DeoptimizeAll(Isolate* isolate) {
   TRACE_EVENT0("v8", "V8.DeoptimizeCode");
   TraceDeoptAll(isolate);
   isolate->AbortConcurrentOptimization(BlockingBehavior::kBlock);
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // For all contexts, mark all code, then deoptimize.
   Object context = isolate->heap()->native_contexts_list();
   while (!context.IsUndefined(isolate)) {
@@ -403,7 +404,7 @@ void Deoptimizer::DeoptimizeMarkedCode(Isolate* isolate) {
   TimerEventScope<TimerEventDeoptimizeCode> timer(isolate);
   TRACE_EVENT0("v8", "V8.DeoptimizeCode");
   TraceDeoptMarked(isolate);
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // For all contexts, deoptimize code already marked.
   Object context = isolate->heap()->native_contexts_list();
   while (!context.IsUndefined(isolate)) {
@@ -471,6 +472,8 @@ const char* Deoptimizer::MessageFor(DeoptimizeKind kind, bool reuse_code) {
       return "deopt-lazy";
     case DeoptimizeKind::kBailout:
       return "bailout";
+    case DeoptimizeKind::kEagerWithResume:
+      return "eager-with-resume";
   }
 }
 
@@ -523,7 +526,6 @@ Deoptimizer::Deoptimizer(Isolate* isolate, JSFunction function,
 
   DCHECK(function.IsJSFunction());
 #ifdef DEBUG
-  DCHECK(AllowHeapAllocation::IsAllowed());
   DCHECK(AllowGarbageCollection::IsAllowed());
   disallow_garbage_collection_ = new DisallowGarbageCollection();
 #endif  // DEBUG
@@ -553,25 +555,42 @@ Deoptimizer::Deoptimizer(Isolate* isolate, JSFunction function,
         DeoptimizationData::cast(compiled_code_.deoptimization_data());
     Address deopt_start = compiled_code_.raw_instruction_start() +
                           deopt_data.DeoptExitStart().value();
-    int non_lazy_deopt_count = deopt_data.NonLazyDeoptCount().value();
+    int eager_soft_and_bailout_deopt_count =
+        deopt_data.EagerSoftAndBailoutDeoptCount().value();
     Address lazy_deopt_start =
-        deopt_start + non_lazy_deopt_count * kNonLazyDeoptExitSize;
-    // The deoptimization exits are sorted so that lazy deopt exits appear last.
-    static_assert(DeoptimizeKind::kLazy == kLastDeoptimizeKind,
-                  "lazy deopts are expected to be emitted last");
+        deopt_start +
+        eager_soft_and_bailout_deopt_count * kNonLazyDeoptExitSize;
+    int lazy_deopt_count = deopt_data.LazyDeoptCount().value();
+    Address eager_with_resume_deopt_start =
+        lazy_deopt_start + lazy_deopt_count * kLazyDeoptExitSize;
+    // The deoptimization exits are sorted so that lazy deopt exits appear after
+    // eager deopts, and eager with resume deopts appear last.
+    static_assert(DeoptimizeKind::kEagerWithResume == kLastDeoptimizeKind,
+                  "eager with resume deopts are expected to be emitted last");
+    static_assert(static_cast<int>(DeoptimizeKind::kLazy) ==
+                      static_cast<int>(kLastDeoptimizeKind) - 1,
+                  "lazy deopts are expected to be emitted second from last");
     // from_ is the value of the link register after the call to the
     // deoptimizer, so for the last lazy deopt, from_ points to the first
-    // non-lazy deopt, so we use <=.
+    // non-lazy deopt, so we use <=, similarly for the last non-lazy deopt and
+    // the first deopt with resume entry.
     if (from_ <= lazy_deopt_start) {
       int offset =
           static_cast<int>(from_ - kNonLazyDeoptExitSize - deopt_start);
       DCHECK_EQ(0, offset % kNonLazyDeoptExitSize);
       bailout_id_ = offset / kNonLazyDeoptExitSize;
-    } else {
+    } else if (from_ <= eager_with_resume_deopt_start) {
       int offset =
           static_cast<int>(from_ - kLazyDeoptExitSize - lazy_deopt_start);
       DCHECK_EQ(0, offset % kLazyDeoptExitSize);
-      bailout_id_ = non_lazy_deopt_count + (offset / kLazyDeoptExitSize);
+      bailout_id_ =
+          eager_soft_and_bailout_deopt_count + (offset / kLazyDeoptExitSize);
+    } else {
+      int offset = static_cast<int>(from_ - kNonLazyDeoptExitSize -
+                                    eager_with_resume_deopt_start);
+      DCHECK_EQ(0, offset % kEagerWithResumeDeoptExitSize);
+      bailout_id_ = eager_soft_and_bailout_deopt_count + lazy_deopt_count +
+                    (offset / kEagerWithResumeDeoptExitSize);
     }
   }
 }
@@ -616,8 +635,16 @@ void Deoptimizer::DeleteFrameDescriptions() {
 #endif  // DEBUG
 }
 
-Builtins::Name Deoptimizer::GetDeoptimizationEntry(Isolate* isolate,
-                                                   DeoptimizeKind kind) {
+Builtins::Name Deoptimizer::GetDeoptWithResumeBuiltin(DeoptimizeReason reason) {
+  switch (reason) {
+    case DeoptimizeReason::kDynamicCheckMaps:
+      return Builtins::kDynamicCheckMapsTrampoline;
+    default:
+      UNREACHABLE();
+  }
+}
+
+Builtins::Name Deoptimizer::GetDeoptimizationEntry(DeoptimizeKind kind) {
   switch (kind) {
     case DeoptimizeKind::kEager:
       return Builtins::kDeoptimizationEntry_Eager;
@@ -627,6 +654,11 @@ Builtins::Name Deoptimizer::GetDeoptimizationEntry(Isolate* isolate,
       return Builtins::kDeoptimizationEntry_Bailout;
     case DeoptimizeKind::kLazy:
       return Builtins::kDeoptimizationEntry_Lazy;
+    case DeoptimizeKind::kEagerWithResume:
+      // EagerWithResume deopts will call a special builtin (specified by
+      // GetDeoptWithResumeBuiltin) which will itself select the deoptimization
+      // entry builtin if it decides to deopt instead of resuming execution.
+      UNREACHABLE();
   }
 }
 
@@ -678,12 +710,13 @@ int Deoptimizer::GetDeoptimizedCodeCount(Isolate* isolate) {
 
 namespace {
 
-int LookupCatchHandler(TranslatedFrame* translated_frame, int* data_out) {
+int LookupCatchHandler(Isolate* isolate, TranslatedFrame* translated_frame,
+                       int* data_out) {
   switch (translated_frame->kind()) {
     case TranslatedFrame::kInterpretedFunction: {
       int bytecode_offset = translated_frame->node_id().ToInt();
       HandlerTable table(
-          translated_frame->raw_shared_info().GetBytecodeArray());
+          translated_frame->raw_shared_info().GetBytecodeArray(isolate));
       return table.LookupRange(bytecode_offset, data_out, nullptr);
     }
     case TranslatedFrame::kJavaScriptBuiltinContinuationWithCatch: {
@@ -731,9 +764,9 @@ void Deoptimizer::TraceDeoptEnd(double deopt_duration) {
 
 // static
 void Deoptimizer::TraceMarkForDeoptimization(Code code, const char* reason) {
-  if (!FLAG_trace_deopt_verbose) return;
+  if (!FLAG_trace_deopt) return;
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Isolate* isolate = code.GetIsolate();
   Object maybe_data = code.deoptimization_data();
   if (maybe_data == ReadOnlyRoots(isolate).empty_fixed_array()) return;
@@ -745,8 +778,9 @@ void Deoptimizer::TraceMarkForDeoptimization(Code code, const char* reason) {
   deopt_data.SharedFunctionInfo().ShortPrint(scope.file());
   PrintF(") (opt id %d) for deoptimization, reason: %s]\n",
          deopt_data.OptimizationId().value(), reason);
+
+  no_gc.Release();
   {
-    AllowHeapAllocation yes_gc;
     HandleScope scope(isolate);
     PROFILE(
         isolate,
@@ -763,7 +797,7 @@ void Deoptimizer::TraceEvictFromOptimizedCodeCache(SharedFunctionInfo sfi,
                                                    const char* reason) {
   if (!FLAG_trace_deopt_verbose) return;
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CodeTracer::Scope scope(sfi.GetIsolate()->GetCodeTracer());
   PrintF(scope.file(),
          "[evicting optimized code marked for deoptimization (%s) for ",
@@ -869,7 +903,7 @@ void Deoptimizer::DoComputeOutputFrames() {
     size_t catch_handler_frame_index = count;
     for (size_t i = count; i-- > 0;) {
       catch_handler_pc_offset_ = LookupCatchHandler(
-          &(translated_state_.frames()[i]), &catch_handler_data_);
+          isolate(), &(translated_state_.frames()[i]), &catch_handler_data_);
       if (catch_handler_pc_offset_ >= 0) {
         catch_handler_frame_index = i;
         break;
@@ -984,7 +1018,7 @@ void Deoptimizer::DoComputeInterpretedFrame(TranslatedFrame* translated_frame,
   TranslatedFrame::iterator function_iterator = value_iterator++;
   if (verbose_tracing_enabled()) {
     PrintF(trace_scope()->file(), "  translating interpreted frame ");
-    std::unique_ptr<char[]> name = shared.DebugName().ToCString();
+    std::unique_ptr<char[]> name = shared.DebugNameCStr();
     PrintF(trace_scope()->file(), "%s", name.get());
     PrintF(trace_scope()->file(),
            " => bytecode_offset=%d, variable_frame_size=%d, frame_size=%d%s\n",
@@ -1107,7 +1141,7 @@ void Deoptimizer::DoComputeInterpretedFrame(TranslatedFrame* translated_frame,
   // Set the bytecode array pointer.
   Object bytecode_array = shared.HasBreakInfo()
                               ? shared.GetDebugInfo().DebugBytecodeArray()
-                              : shared.GetBytecodeArray();
+                              : shared.GetBytecodeArray(isolate());
   frame_writer.PushRawObject(bytecode_array, "bytecode array\n");
 
   // The bytecode offset was mentioned explicitly in the BEGIN_FRAME.
@@ -2429,7 +2463,7 @@ DeoptimizedFrameInfo::DeoptimizedFrameInfo(TranslatedState* state,
 
   DCHECK_EQ(TranslatedFrame::kInterpretedFunction, frame_it->kind());
   source_position_ = Deoptimizer::ComputeSourcePositionFromBytecodeArray(
-      *frame_it->shared_info(), frame_it->node_id());
+      isolate, *frame_it->shared_info(), frame_it->node_id());
 
   DCHECK_EQ(parameter_count,
             function_->shared().internal_formal_parameter_count());
@@ -2491,9 +2525,9 @@ Deoptimizer::DeoptInfo Deoptimizer::GetDeoptInfo(Code code, Address pc) {
 
 // static
 int Deoptimizer::ComputeSourcePositionFromBytecodeArray(
-    SharedFunctionInfo shared, BailoutId node_id) {
+    Isolate* isolate, SharedFunctionInfo shared, BailoutId node_id) {
   DCHECK(shared.HasBytecodeArray());
-  return AbstractCode::cast(shared.GetBytecodeArray())
+  return AbstractCode::cast(shared.GetBytecodeArray(isolate))
       .SourcePosition(node_id.ToInt());
 }
 
@@ -2924,7 +2958,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
       int return_value_offset = iterator->Next();
       int return_value_count = iterator->Next();
       if (trace_file != nullptr) {
-        std::unique_ptr<char[]> name = shared_info.DebugName().ToCString();
+        std::unique_ptr<char[]> name = shared_info.DebugNameCStr();
         PrintF(trace_file, "  reading input frame %s", name.get());
         int arg_count = InternalFormalParameterCountWithReceiver(shared_info);
         PrintF(trace_file,
@@ -2943,7 +2977,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
           SharedFunctionInfo::cast(literal_array.get(iterator->Next()));
       int height = iterator->Next();
       if (trace_file != nullptr) {
-        std::unique_ptr<char[]> name = shared_info.DebugName().ToCString();
+        std::unique_ptr<char[]> name = shared_info.DebugNameCStr();
         PrintF(trace_file, "  reading arguments adaptor frame %s", name.get());
         PrintF(trace_file, " => height=%d; inputs:\n", height);
       }
@@ -2956,7 +2990,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
           SharedFunctionInfo::cast(literal_array.get(iterator->Next()));
       int height = iterator->Next();
       if (trace_file != nullptr) {
-        std::unique_ptr<char[]> name = shared_info.DebugName().ToCString();
+        std::unique_ptr<char[]> name = shared_info.DebugNameCStr();
         PrintF(trace_file, "  reading construct stub frame %s", name.get());
         PrintF(trace_file, " => bailout_id=%d, height=%d; inputs:\n",
                bailout_id.ToInt(), height);
@@ -2971,7 +3005,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
           SharedFunctionInfo::cast(literal_array.get(iterator->Next()));
       int height = iterator->Next();
       if (trace_file != nullptr) {
-        std::unique_ptr<char[]> name = shared_info.DebugName().ToCString();
+        std::unique_ptr<char[]> name = shared_info.DebugNameCStr();
         PrintF(trace_file, "  reading builtin continuation frame %s",
                name.get());
         PrintF(trace_file, " => bailout_id=%d, height=%d; inputs:\n",
@@ -2987,7 +3021,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
           SharedFunctionInfo::cast(literal_array.get(iterator->Next()));
       int height = iterator->Next();
       if (trace_file != nullptr) {
-        std::unique_ptr<char[]> name = shared_info.DebugName().ToCString();
+        std::unique_ptr<char[]> name = shared_info.DebugNameCStr();
         PrintF(trace_file, "  reading JavaScript builtin continuation frame %s",
                name.get());
         PrintF(trace_file, " => bailout_id=%d, height=%d; inputs:\n",
@@ -3002,7 +3036,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame(
           SharedFunctionInfo::cast(literal_array.get(iterator->Next()));
       int height = iterator->Next();
       if (trace_file != nullptr) {
-        std::unique_ptr<char[]> name = shared_info.DebugName().ToCString();
+        std::unique_ptr<char[]> name = shared_info.DebugNameCStr();
         PrintF(trace_file,
                "  reading JavaScript builtin continuation frame with catch %s",
                name.get());
@@ -3599,7 +3633,7 @@ TranslatedValue* TranslatedState::GetValueByObjectIndex(int object_index) {
 Handle<HeapObject> TranslatedState::InitializeObjectAt(TranslatedValue* slot) {
   slot = ResolveCapturedObject(slot);
 
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (slot->materialization_state() != TranslatedValue::kFinished) {
     std::stack<int> worklist;
     worklist.push(slot->object_index());
@@ -3608,7 +3642,7 @@ Handle<HeapObject> TranslatedState::InitializeObjectAt(TranslatedValue* slot) {
     while (!worklist.empty()) {
       int index = worklist.top();
       worklist.pop();
-      InitializeCapturedObjectAt(index, &worklist, no_allocation);
+      InitializeCapturedObjectAt(index, &worklist, no_gc);
     }
   }
   return slot->storage();
@@ -3616,7 +3650,7 @@ Handle<HeapObject> TranslatedState::InitializeObjectAt(TranslatedValue* slot) {
 
 void TranslatedState::InitializeCapturedObjectAt(
     int object_index, std::stack<int>* worklist,
-    const DisallowHeapAllocation& no_allocation) {
+    const DisallowGarbageCollection& no_gc) {
   CHECK_LT(static_cast<size_t>(object_index), object_positions_.size());
   TranslatedState::ObjectPosition pos = object_positions_[object_index];
   int value_index = pos.value_index_;
@@ -3683,13 +3717,12 @@ void TranslatedState::InitializeCapturedObjectAt(
     case PROPERTY_ARRAY_TYPE:
     case SCRIPT_CONTEXT_TABLE_TYPE:
     case SLOPPY_ARGUMENTS_ELEMENTS_TYPE:
-      InitializeObjectWithTaggedFieldsAt(frame, &value_index, slot, map,
-                                         no_allocation);
+      InitializeObjectWithTaggedFieldsAt(frame, &value_index, slot, map, no_gc);
       break;
 
     default:
       CHECK(map->IsJSObjectMap());
-      InitializeJSObjectAt(frame, &value_index, slot, map, no_allocation);
+      InitializeJSObjectAt(frame, &value_index, slot, map, no_gc);
       break;
   }
   CHECK_EQ(value_index, children_init_index);
@@ -4007,7 +4040,7 @@ Handle<Object> TranslatedState::GetValueAndAdvance(TranslatedFrame* frame,
 
 void TranslatedState::InitializeJSObjectAt(
     TranslatedFrame* frame, int* value_index, TranslatedValue* slot,
-    Handle<Map> map, const DisallowHeapAllocation& no_allocation) {
+    Handle<Map> map, const DisallowGarbageCollection& no_gc) {
   Handle<HeapObject> object_storage = Handle<HeapObject>::cast(slot->storage_);
   DCHECK_EQ(TranslatedValue::kCapturedObject, slot->kind());
 
@@ -4015,7 +4048,7 @@ void TranslatedState::InitializeJSObjectAt(
   CHECK_GE(slot->GetChildrenCount(), 2);
 
   // Notify the concurrent marker about the layout change.
-  isolate()->heap()->NotifyObjectLayoutChange(*object_storage, no_allocation);
+  isolate()->heap()->NotifyObjectLayoutChange(*object_storage, no_gc);
 
   // Fill the property array field.
   {
@@ -4058,7 +4091,7 @@ void TranslatedState::InitializeJSObjectAt(
 
 void TranslatedState::InitializeObjectWithTaggedFieldsAt(
     TranslatedFrame* frame, int* value_index, TranslatedValue* slot,
-    Handle<Map> map, const DisallowHeapAllocation& no_allocation) {
+    Handle<Map> map, const DisallowGarbageCollection& no_gc) {
   Handle<HeapObject> object_storage = Handle<HeapObject>::cast(slot->storage_);
 
   // Skip the writes if we already have the canonical empty fixed array.
@@ -4070,7 +4103,7 @@ void TranslatedState::InitializeObjectWithTaggedFieldsAt(
   }
 
   // Notify the concurrent marker about the layout change.
-  isolate()->heap()->NotifyObjectLayoutChange(*object_storage, no_allocation);
+  isolate()->heap()->NotifyObjectLayoutChange(*object_storage, no_gc);
 
   // Write the fields to the object.
   for (int i = 1; i < slot->GetChildrenCount(); i++) {
diff --git a/deps/v8/src/deoptimizer/deoptimizer.h b/deps/v8/src/deoptimizer/deoptimizer.h
index df13009acd3653..efc37b59508a7e 100644
--- a/deps/v8/src/deoptimizer/deoptimizer.h
+++ b/deps/v8/src/deoptimizer/deoptimizer.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/label.h"
 #include "src/codegen/register-arch.h"
 #include "src/codegen/source-position.h"
@@ -385,13 +386,13 @@ class TranslatedState {
                                        std::stack<int>* worklist);
   Handle<HeapObject> InitializeObjectAt(TranslatedValue* slot);
   void InitializeCapturedObjectAt(int object_index, std::stack<int>* worklist,
-                                  const DisallowHeapAllocation& no_allocation);
+                                  const DisallowGarbageCollection& no_gc);
   void InitializeJSObjectAt(TranslatedFrame* frame, int* value_index,
                             TranslatedValue* slot, Handle<Map> map,
-                            const DisallowHeapAllocation& no_allocation);
+                            const DisallowGarbageCollection& no_gc);
   void InitializeObjectWithTaggedFieldsAt(
       TranslatedFrame* frame, int* value_index, TranslatedValue* slot,
-      Handle<Map> map, const DisallowHeapAllocation& no_allocation);
+      Handle<Map> map, const DisallowGarbageCollection& no_gc);
 
   void ReadUpdateFeedback(TranslationIterator* iterator,
                           FixedArray literal_array, FILE* trace_file);
@@ -446,7 +447,8 @@ class Deoptimizer : public Malloced {
 
   static DeoptInfo GetDeoptInfo(Code code, Address from);
 
-  static int ComputeSourcePositionFromBytecodeArray(SharedFunctionInfo shared,
+  static int ComputeSourcePositionFromBytecodeArray(Isolate* isolate,
+                                                    SharedFunctionInfo shared,
                                                     BailoutId node_id);
 
   static const char* MessageFor(DeoptimizeKind kind, bool reuse_code);
@@ -500,8 +502,13 @@ class Deoptimizer : public Malloced {
 
   static void ComputeOutputFrames(Deoptimizer* deoptimizer);
 
+  // Returns the builtin that will perform a check and either eagerly deopt with
+  // |reason| or resume execution in the optimized code.
+  V8_EXPORT_PRIVATE static Builtins::Name GetDeoptWithResumeBuiltin(
+      DeoptimizeReason reason);
+
   V8_EXPORT_PRIVATE static Builtins::Name GetDeoptimizationEntry(
-      Isolate* isolate, DeoptimizeKind kind);
+      DeoptimizeKind kind);
 
   // Returns true if {addr} is a deoptimization entry and stores its type in
   // {type_out}. Returns false if {addr} is not a deoptimization entry.
@@ -541,6 +548,10 @@ class Deoptimizer : public Malloced {
   // kSupportsFixedDeoptExitSizes is true.
   V8_EXPORT_PRIVATE static const int kNonLazyDeoptExitSize;
   V8_EXPORT_PRIVATE static const int kLazyDeoptExitSize;
+  V8_EXPORT_PRIVATE static const int kEagerWithResumeBeforeArgsSize;
+  V8_EXPORT_PRIVATE static const int kEagerWithResumeDeoptExitSize;
+  V8_EXPORT_PRIVATE static const int kEagerWithResumeImmedArgs1PcOffset;
+  V8_EXPORT_PRIVATE static const int kEagerWithResumeImmedArgs2PcOffset;
 
   // Tracing.
   static void TraceMarkForDeoptimization(Code code, const char* reason);
@@ -695,12 +706,14 @@ class FrameDescription {
   void* operator new(size_t size, uint32_t frame_size) {
     // Subtracts kSystemPointerSize, as the member frame_content_ already
     // supplies the first element of the area to store the frame.
-    return malloc(size + frame_size - kSystemPointerSize);
+    return base::Malloc(size + frame_size - kSystemPointerSize);
   }
 
-  void operator delete(void* pointer, uint32_t frame_size) { free(pointer); }
+  void operator delete(void* pointer, uint32_t frame_size) {
+    base::Free(pointer);
+  }
 
-  void operator delete(void* description) { free(description); }
+  void operator delete(void* description) { base::Free(description); }
 
   uint32_t GetFrameSize() const {
     USE(frame_content_);
diff --git a/deps/v8/src/deoptimizer/ia32/deoptimizer-ia32.cc b/deps/v8/src/deoptimizer/ia32/deoptimizer-ia32.cc
index 4fcb22c209e817..9fba75d4ab3b5d 100644
--- a/deps/v8/src/deoptimizer/ia32/deoptimizer-ia32.cc
+++ b/deps/v8/src/deoptimizer/ia32/deoptimizer-ia32.cc
@@ -12,6 +12,12 @@ namespace internal {
 const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
 const int Deoptimizer::kNonLazyDeoptExitSize = 5;
 const int Deoptimizer::kLazyDeoptExitSize = 5;
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 10;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = 5;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
+    5 + kSystemPointerSize;
 
 Float32 RegisterValues::GetFloatRegister(unsigned n) const {
   return Float32::FromBits(
diff --git a/deps/v8/src/deoptimizer/mips/deoptimizer-mips.cc b/deps/v8/src/deoptimizer/mips/deoptimizer-mips.cc
index 532f7a9b54c59e..3f38ba71087444 100644
--- a/deps/v8/src/deoptimizer/mips/deoptimizer-mips.cc
+++ b/deps/v8/src/deoptimizer/mips/deoptimizer-mips.cc
@@ -10,6 +10,12 @@ namespace internal {
 const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
 const int Deoptimizer::kNonLazyDeoptExitSize = 3 * kInstrSize;
 const int Deoptimizer::kLazyDeoptExitSize = 3 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 5 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = 2 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
+    2 * kInstrSize + kSystemPointerSize;
 
 // Maximum size of a table entry generated below.
 #ifdef _MIPS_ARCH_MIPS32R6
diff --git a/deps/v8/src/deoptimizer/mips64/deoptimizer-mips64.cc b/deps/v8/src/deoptimizer/mips64/deoptimizer-mips64.cc
index 227c002b8866e6..5bea7ccefbc827 100644
--- a/deps/v8/src/deoptimizer/mips64/deoptimizer-mips64.cc
+++ b/deps/v8/src/deoptimizer/mips64/deoptimizer-mips64.cc
@@ -10,6 +10,12 @@ namespace internal {
 const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
 const int Deoptimizer::kNonLazyDeoptExitSize = 3 * kInstrSize;
 const int Deoptimizer::kLazyDeoptExitSize = 3 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 5 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = 2 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
+    2 * kInstrSize + kSystemPointerSize;
 
 // Maximum size of a table entry generated below.
 #ifdef _MIPS_ARCH_MIPS64R6
diff --git a/deps/v8/src/deoptimizer/ppc/deoptimizer-ppc.cc b/deps/v8/src/deoptimizer/ppc/deoptimizer-ppc.cc
index 817c30143113e3..cde68050628267 100644
--- a/deps/v8/src/deoptimizer/ppc/deoptimizer-ppc.cc
+++ b/deps/v8/src/deoptimizer/ppc/deoptimizer-ppc.cc
@@ -14,6 +14,12 @@ namespace internal {
 const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
 const int Deoptimizer::kNonLazyDeoptExitSize = 3 * kInstrSize;
 const int Deoptimizer::kLazyDeoptExitSize = 3 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 4 * kInstrSize;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = kInstrSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
+    kInstrSize + kSystemPointerSize;
 
 Float32 RegisterValues::GetFloatRegister(unsigned n) const {
   float float_val = static_cast<float>(double_registers_[n].get_scalar());
diff --git a/deps/v8/src/deoptimizer/s390/deoptimizer-s390.cc b/deps/v8/src/deoptimizer/s390/deoptimizer-s390.cc
index 358450c091e83a..54e450f3e88e4a 100644
--- a/deps/v8/src/deoptimizer/s390/deoptimizer-s390.cc
+++ b/deps/v8/src/deoptimizer/s390/deoptimizer-s390.cc
@@ -10,6 +10,12 @@ namespace internal {
 const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
 const int Deoptimizer::kNonLazyDeoptExitSize = 6 + 2;
 const int Deoptimizer::kLazyDeoptExitSize = 6 + 2;
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 6 + 2 + 6;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = 6;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset =
+    6 + kSystemPointerSize;
 
 Float32 RegisterValues::GetFloatRegister(unsigned n) const {
   return Float32::FromBits(
diff --git a/deps/v8/src/deoptimizer/x64/deoptimizer-x64.cc b/deps/v8/src/deoptimizer/x64/deoptimizer-x64.cc
index 6f621ed34eeb1d..8a95afdc35c378 100644
--- a/deps/v8/src/deoptimizer/x64/deoptimizer-x64.cc
+++ b/deps/v8/src/deoptimizer/x64/deoptimizer-x64.cc
@@ -12,6 +12,11 @@ namespace internal {
 const bool Deoptimizer::kSupportsFixedDeoptExitSizes = true;
 const int Deoptimizer::kNonLazyDeoptExitSize = 7;
 const int Deoptimizer::kLazyDeoptExitSize = 7;
+const int Deoptimizer::kEagerWithResumeBeforeArgsSize = 12;
+const int Deoptimizer::kEagerWithResumeDeoptExitSize =
+    kEagerWithResumeBeforeArgsSize + 2 * kSystemPointerSize;
+const int Deoptimizer::kEagerWithResumeImmedArgs1PcOffset = 5;
+const int Deoptimizer::kEagerWithResumeImmedArgs2PcOffset = 13;
 
 Float32 RegisterValues::GetFloatRegister(unsigned n) const {
   return Float32::FromBits(
diff --git a/deps/v8/src/diagnostics/arm/disasm-arm.cc b/deps/v8/src/diagnostics/arm/disasm-arm.cc
index 83cdca3c0369de..1e909ff564be67 100644
--- a/deps/v8/src/diagnostics/arm/disasm-arm.cc
+++ b/deps/v8/src/diagnostics/arm/disasm-arm.cc
@@ -54,6 +54,8 @@ class Decoder {
   }
 
   ~Decoder() {}
+  Decoder(const Decoder&) = delete;
+  Decoder& operator=(const Decoder&) = delete;
 
   // Writes one disassembled instruction into 'buffer' (0-terminated).
   // Returns the length of the disassembled machine instruction in bytes.
@@ -134,8 +136,6 @@ class Decoder {
   const disasm::NameConverter& converter_;
   Vector<char> out_buffer_;
   int out_buffer_pos_;
-
-  DISALLOW_COPY_AND_ASSIGN(Decoder);
 };
 
 // Support for assertions in the Decoder formatting functions.
@@ -585,11 +585,14 @@ int Decoder::FormatOption(Instruction* instr, const char* format) {
             Print("s");
           }
           return 4;
-        } else {  // 'size, for Advanced SIMD instructions
-          DCHECK(STRING_STARTS_WITH(format, "size"));
-          int sz = 8 << instr->Bits(21, 20);
+        } else {
+          // 'size2 or 'size3, for Advanced SIMD instructions, 2 or 3 registers.
+          DCHECK(STRING_STARTS_WITH(format, "size2") ||
+                 STRING_STARTS_WITH(format, "size3"));
+          int sz = 8 << (format[4] == '2' ? instr->Bits(19, 18)
+                                          : instr->Bits(21, 20));
           out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_, "%d", sz);
-          return 4;
+          return 5;
         }
       } else if (format[1] == 'p') {
         if (format[8] == '_') {  // 'spec_reg_fields
@@ -2041,7 +2044,7 @@ void Decoder::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
     int sz = instr->Bits(21, 20);
 
     if (!u && opc == 0 && op1) {
-      Format(instr, "vqadd.s'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vqadd.s'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 1 && sz == 2 && q && op1) {
       if (Vm == Vn) {
         Format(instr, "vmov 'Qd, 'Qm");
@@ -2053,29 +2056,31 @@ void Decoder::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
     } else if (!u && opc == 1 && sz == 0 && q && op1) {
       Format(instr, "vand 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 2 && op1) {
-      Format(instr, "vqsub.s'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vqsub.s'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 3 && op1) {
-      Format(instr, "vcge.s'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vcge.s'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 3 && !op1) {
-      Format(instr, "vcgt.s'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vcgt.s'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 4 && !op1) {
-      Format(instr, "vshl.s'size 'Qd, 'Qm, 'Qn");
+      Format(instr, "vshl.s'size3 'Qd, 'Qm, 'Qn");
     } else if (!u && opc == 6 && op1) {
-      Format(instr, "vmin.s'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vmin.s'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 6 && !op1) {
-      Format(instr, "vmax.s'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vmax.s'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 8 && op1) {
-      Format(instr, "vtst.i'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vtst.i'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 8 && !op1) {
-      Format(instr, "vadd.i'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vadd.i'size3 'Qd, 'Qn, 'Qm");
     } else if (opc == 9 && op1) {
-      Format(instr, "vmul.i'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vmul.i'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 0xA && op1) {
-      Format(instr, "vpmin.s'size 'Dd, 'Dn, 'Dm");
+      Format(instr, "vpmin.s'size3 'Dd, 'Dn, 'Dm");
     } else if (!u && opc == 0xA && !op1) {
-      Format(instr, "vpmax.s'size 'Dd, 'Dn, 'Dm");
+      Format(instr, "vpmax.s'size3 'Dd, 'Dn, 'Dm");
+    } else if (u && opc == 0XB) {
+      Format(instr, "vqrdmulh.s'size3 'Qd, 'Qn, 'Qm");
     } else if (!u && opc == 0xB) {
-      Format(instr, "vpadd.i'size 'Dd, 'Dn, 'Dm");
+      Format(instr, "vpadd.i'size3 'Dd, 'Dn, 'Dm");
     } else if (!u && !(sz >> 1) && opc == 0xD && !op1) {
       Format(instr, "vadd.f32 'Qd, 'Qn, 'Qm");
     } else if (!u && (sz >> 1) && opc == 0xD && !op1) {
@@ -2091,7 +2096,7 @@ void Decoder::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
     } else if (!u && (sz >> 1) && opc == 0xF && !op1) {
       Format(instr, "vmin.f32 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 0 && op1) {
-      Format(instr, "vqadd.u'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vqadd.u'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 1 && sz == 1 && op1) {
       Format(instr, "vbsl 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 1 && sz == 0 && q && op1) {
@@ -2099,27 +2104,27 @@ void Decoder::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
     } else if (u && opc == 1 && sz == 0 && !q && op1) {
       Format(instr, "veor 'Dd, 'Dn, 'Dm");
     } else if (u && opc == 1 && !op1) {
-      Format(instr, "vrhadd.u'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vrhadd.u'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 2 && op1) {
-      Format(instr, "vqsub.u'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vqsub.u'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 3 && op1) {
-      Format(instr, "vcge.u'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vcge.u'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 3 && !op1) {
-      Format(instr, "vcgt.u'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vcgt.u'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 4 && !op1) {
-      Format(instr, "vshl.u'size 'Qd, 'Qm, 'Qn");
+      Format(instr, "vshl.u'size3 'Qd, 'Qm, 'Qn");
     } else if (u && opc == 6 && op1) {
-      Format(instr, "vmin.u'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vmin.u'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 6 && !op1) {
-      Format(instr, "vmax.u'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vmax.u'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 8 && op1) {
-      Format(instr, "vceq.i'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vceq.i'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 8 && !op1) {
-      Format(instr, "vsub.i'size 'Qd, 'Qn, 'Qm");
+      Format(instr, "vsub.i'size3 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 0xA && op1) {
-      Format(instr, "vpmin.u'size 'Dd, 'Dn, 'Dm");
+      Format(instr, "vpmin.u'size3 'Dd, 'Dn, 'Dm");
     } else if (u && opc == 0xA && !op1) {
-      Format(instr, "vpmax.u'size 'Dd, 'Dn, 'Dm");
+      Format(instr, "vpmax.u'size3 'Dd, 'Dn, 'Dm");
     } else if (u && opc == 0xD && sz == 0 && q && op1) {
       Format(instr, "vmul.f32 'Qd, 'Qn, 'Qm");
     } else if (u && opc == 0xD && sz == 0 && !q && !op1) {
@@ -2153,11 +2158,38 @@ void Decoder::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
         int imm7 = (l << 6) | instr->Bits(21, 16);
         int size = base::bits::RoundDownToPowerOfTwo32(imm7);
         int shift = 2 * size - imm7;
-        int Vd = instr->VFPDRegValue(kSimd128Precision);
-        int Vm = instr->VFPMRegValue(kSimd128Precision);
-        out_buffer_pos_ +=
-            SNPrintF(out_buffer_ + out_buffer_pos_, "vshr.%s%d q%d, q%d, #%d",
-                     u ? "u" : "s", size, Vd, Vm, shift);
+        if (q) {
+          int Vd = instr->VFPDRegValue(kSimd128Precision);
+          int Vm = instr->VFPMRegValue(kSimd128Precision);
+          out_buffer_pos_ +=
+              SNPrintF(out_buffer_ + out_buffer_pos_, "vshr.%s%d q%d, q%d, #%d",
+                       u ? "u" : "s", size, Vd, Vm, shift);
+        } else {
+          int Vd = instr->VFPDRegValue(kDoublePrecision);
+          int Vm = instr->VFPMRegValue(kDoublePrecision);
+          out_buffer_pos_ +=
+              SNPrintF(out_buffer_ + out_buffer_pos_, "vshr.%s%d d%d, d%d, #%d",
+                       u ? "u" : "s", size, Vd, Vm, shift);
+        }
+      } else if (imm3H_L != 0 && opc == 1) {
+        // vsra.<type><size> Qd, Qm, shift
+        // vsra.<type><size> Dd, Dm, shift
+        int imm7 = (l << 6) | instr->Bits(21, 16);
+        int size = base::bits::RoundDownToPowerOfTwo32(imm7);
+        int shift = 2 * size - imm7;
+        if (q) {
+          int Vd = instr->VFPDRegValue(kSimd128Precision);
+          int Vm = instr->VFPMRegValue(kSimd128Precision);
+          out_buffer_pos_ +=
+              SNPrintF(out_buffer_ + out_buffer_pos_, "vsra.%s%d q%d, q%d, #%d",
+                       u ? "u" : "s", size, Vd, Vm, shift);
+        } else {
+          int Vd = instr->VFPDRegValue(kDoublePrecision);
+          int Vm = instr->VFPMRegValue(kDoublePrecision);
+          out_buffer_pos_ +=
+              SNPrintF(out_buffer_ + out_buffer_pos_, "vsra.%s%d d%d, d%d, #%d",
+                       u ? "u" : "s", size, Vd, Vm, shift);
+        }
       } else if (imm3H_L != 0 && imm3L == 0 && opc == 0b1010 && !q) {
         // vmovl
         if ((instr->VdValue() & 1) != 0) Unknown(instr);
@@ -2223,15 +2255,8 @@ void Decoder::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
     int opc1 = instr->Bits(17, 16);
     int opc2 = instr->Bits(10, 7);
     int q = instr->Bit(6);
-
-    int Vd, Vm;
-    if (q) {
-      Vd = instr->VFPDRegValue(kSimd128Precision);
-      Vm = instr->VFPMRegValue(kSimd128Precision);
-    } else {
-      Vd = instr->VFPDRegValue(kDoublePrecision);
-      Vm = instr->VFPMRegValue(kDoublePrecision);
-    }
+    int Vd = instr->VFPDRegValue(q ? kSimd128Precision : kDoublePrecision);
+    int Vm = instr->VFPMRegValue(q ? kSimd128Precision : kDoublePrecision);
 
     int esize = kBitsPerByte * (1 << size);
     if (opc1 == 0 && (opc2 >> 2) == 0) {
@@ -2239,41 +2264,35 @@ void Decoder::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
       // vrev<op>.<esize> Qd, Qm.
       out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
                                   "vrev%d.%d q%d, q%d", op, esize, Vd, Vm);
+    } else if (opc1 == 0 && opc2 == 0b0100) {
+      Format(instr, q ? "vpaddl.s'size2 'Qd, 'Qm" : "vpaddl.s'size2 'Dd, 'Dm");
+    } else if (opc1 == 0 && opc2 == 0b0101) {
+      Format(instr, q ? "vpaddl.u'size2 'Qd, 'Qm" : "vpaddl.u'size2 'Dd, 'Dm");
     } else if (size == 0 && opc1 == 0b10 && opc2 == 0) {
       Format(instr, q ? "vswp 'Qd, 'Qm" : "vswp 'Dd, 'Dm");
+    } else if (opc1 == 0 && opc2 == 0b1010) {
+      DCHECK_EQ(0, size);
+      Format(instr, q ? "vcnt.8 'Qd, 'Qm" : "vcnt.8 'Dd, 'Dm");
     } else if (opc1 == 0 && opc2 == 0b1011) {
       Format(instr, "vmvn 'Qd, 'Qm");
-    } else if (opc1 == 0b01 && (opc2 & 0b0111) == 0b110) {
-      // vabs<type>.<esize> Qd, Qm.
-      char type = instr->Bit(10) != 0 ? 'f' : 's';
-      out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
-                                  "vabs.%c%d q%d, q%d", type, esize, Vd, Vm);
-    } else if (opc1 == 0b01 && (opc2 & 0b0111) == 0b111) {
-      // vneg<type>.<esize> Qd, Qm.
-      char type = instr->Bit(10) != 0 ? 'f' : 's';
-      out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
-                                  "vneg.%c%d q%d, q%d", type, esize, Vd, Vm);
+    } else if (opc1 == 0b01 && opc2 == 0b0100) {
+      DCHECK_NE(0b11, size);
+      Format(instr,
+             q ? "vclt.s'size2 'Qd, 'Qm, #0" : "vclt.s.'size2 'Dd, 'Dm, #0");
+    } else if (opc1 == 0b01 && opc2 == 0b0110) {
+      Format(instr, q ? "vabs.s'size2 'Qd, 'Qm" : "vabs.s.'size2 'Dd, 'Dm");
+    } else if (opc1 == 0b01 && opc2 == 0b1110) {
+      Format(instr, q ? "vabs.f'size2 'Qd, 'Qm" : "vabs.f.'size2 'Dd, 'Dm");
+    } else if (opc1 == 0b01 && opc2 == 0b0111) {
+      Format(instr, q ? "vneg.s'size2 'Qd, 'Qm" : "vneg.s.'size2 'Dd, 'Dm");
+    } else if (opc1 == 0b01 && opc2 == 0b1111) {
+      Format(instr, q ? "vneg.f'size2 'Qd, 'Qm" : "vneg.f.'size2 'Dd, 'Dm");
     } else if (opc1 == 0b10 && opc2 == 0b0001) {
-      if (q) {
-        // vtrn.<esize> Qd, Qm.
-        out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
-                                    "vtrn.%d q%d, q%d", esize, Vd, Vm);
-      } else {
-        // vtrn.<esize> Dd, Dm.
-        out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
-                                    "vtrn.%d d%d, d%d", esize, Vd, Vm);
-      }
-    } else if (opc1 == 0b10 && (opc2 & 0b1110) == 0b0010) {
-      const char* op = instr->Bit(7) != 0 ? "vzip" : "vuzp";
-      if (q) {
-        // vzip/vuzp.<esize> Qd, Qm.
-        out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
-                                    "%s.%d q%d, q%d", op, esize, Vd, Vm);
-      } else {
-        // vzip/vuzp.<esize> Dd, Dm.
-        out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
-                                    "%s.%d d%d, d%d", op, esize, Vd, Vm);
-      }
+      Format(instr, q ? "vtrn.'size2 'Qd, 'Qm" : "vtrn.'size2 'Dd, 'Dm");
+    } else if (opc1 == 0b10 && opc2 == 0b0010) {
+      Format(instr, q ? "vuzp.'size2 'Qd, 'Qm" : "vuzp.'size2 'Dd, 'Dm");
+    } else if (opc1 == 0b10 && opc2 == 0b0011) {
+      Format(instr, q ? "vzip.'size2 'Qd, 'Qm" : "vzip.'size2 'Dd, 'Dm");
     } else if (opc1 == 0b10 && (opc2 & 0b1110) == 0b0100) {
       // vqmov{u}n.<type><esize> Dd, Qm.
       int Vd = instr->VFPDRegValue(kDoublePrecision);
@@ -2364,22 +2383,11 @@ void Decoder::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
     int u = instr->Bit(24);
     int opc = instr->Bits(11, 8);
     if (opc == 0b1000) {
-      // vmlal.u<esize> <Qd>, <Dn>, <Dm>
-      int Vd = instr->VFPDRegValue(kSimd128Precision);
-      int Vn = instr->VFPNRegValue(kDoublePrecision);
-      int Vm = instr->VFPMRegValue(kDoublePrecision);
-      int esize = 8 << instr->Bits(21, 20);
-      out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_,
-                                  "vmlal.u%d q%d, d%d, d%d", esize, Vd, Vn, Vm);
+      Format(instr,
+             u ? "vmlal.u'size3 'Qd, 'Dn, 'Dm" : "vmlal.s'size3 'Qd, 'Dn, 'Dm");
     } else if (opc == 0b1100) {
-      // vmull.s/u<esize> Qd, Dn, Dm
-      int Vd = instr->VFPDRegValue(kSimd128Precision);
-      int Vn = instr->VFPNRegValue(kDoublePrecision);
-      int Vm = instr->VFPMRegValue(kDoublePrecision);
-      int esize = 8 << instr->Bits(21, 20);
-      out_buffer_pos_ +=
-          SNPrintF(out_buffer_ + out_buffer_pos_, "vmull.%s%d q%d, d%d, d%d",
-                   u ? "u" : "s", esize, Vd, Vn, Vm);
+      Format(instr,
+             u ? "vmull.u'size3 'Qd, 'Dn, 'Dm" : "vmull.s'size3 'Qd, 'Dn, 'Dm");
     }
   } else if (op1 != 0b11 && op3) {
     // The instructions specified by this encoding are not used in V8.
@@ -2442,7 +2450,7 @@ void Decoder::DecodeAdvancedSIMDElementOrStructureLoadStore(
   if (op0 == 0) {
     // Advanced SIMD load/store multiple structures.
     int itype = instr->Bits(11, 8);
-    if (itype == 0b0010) {
+    if (itype == nlt_1 || itype == nlt_2 || itype == nlt_3 || itype == nlt_4) {
       // vld1/vst1
       int size = instr->Bits(7, 6);
       int align = instr->Bits(5, 4);
@@ -2474,14 +2482,15 @@ void Decoder::DecodeAdvancedSIMDElementOrStructureLoadStore(
   } else if (op1 != 0b11) {
     // Advanced SIMD load/store single structure to one lane.
     int size = op1;  // size and op1 occupy the same bits in decoding.
-    if (l && n == 0b00) {
-      // VLD1 (single element to one lane) - A1, A2, A3
-      int index_align = instr->Bits(7, 4);
-      int index = index_align >> (size + 1);
+    int index_align = instr->Bits(7, 4);
+    int index = index_align >> (size + 1);
+    if (n == 0b00) {
+      // vld1 (single element to one lane) - A1, A2, A3.
+      // vst1 (single element to one lane) - A1, A2, A3.
       // Omit alignment.
       out_buffer_pos_ +=
-          SNPrintF(out_buffer_ + out_buffer_pos_, "vld1.%d {d%d[%d]}",
-                   (1 << size) << 3, Vd, index);
+          SNPrintF(out_buffer_ + out_buffer_pos_, "v%s1.%d {d%d[%d]}",
+                   (l ? "ld" : "st"), (1 << size) << 3, Vd, index);
       Print(", ");
       FormatNeonMemory(Rn, 0, Rm);
     } else {
diff --git a/deps/v8/src/diagnostics/arm64/disasm-arm64.cc b/deps/v8/src/diagnostics/arm64/disasm-arm64.cc
index 7ee499c183fd98..456f0b5f66241d 100644
--- a/deps/v8/src/diagnostics/arm64/disasm-arm64.cc
+++ b/deps/v8/src/diagnostics/arm64/disasm-arm64.cc
@@ -7,9 +7,12 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <bitset>
+
 #if V8_TARGET_ARCH_ARM64
 
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/arm64/decoder-arm64-inl.h"
 #include "src/codegen/arm64/utils-arm64.h"
 #include "src/diagnostics/arm64/disasm-arm64.h"
@@ -20,7 +23,7 @@ namespace internal {
 
 DisassemblingDecoder::DisassemblingDecoder() {
   buffer_size_ = 256;
-  buffer_ = reinterpret_cast<char*>(malloc(buffer_size_));
+  buffer_ = reinterpret_cast<char*>(base::Malloc(buffer_size_));
   buffer_pos_ = 0;
   own_buffer_ = true;
 }
@@ -34,7 +37,7 @@ DisassemblingDecoder::DisassemblingDecoder(char* text_buffer, int buffer_size) {
 
 DisassemblingDecoder::~DisassemblingDecoder() {
   if (own_buffer_) {
-    free(buffer_);
+    base::Free(buffer_);
   }
 }
 
@@ -4265,12 +4268,19 @@ int DisassemblingDecoder::SubstitutePrefetchField(Instruction* instr,
   USE(format);
 
   int prefetch_mode = instr->PrefetchMode();
+  const std::array<std::string, 3> hints = {"ld", "li", "st"};
+  unsigned hint = instr->PrefetchHint();
+  unsigned target = instr->PrefetchTarget() + 1;
+
+  if (hint >= hints.size() || target > 3) {
+    std::bitset<5> prefetch_mode(instr->ImmPrefetchOperation());
+    AppendToOutput("#0b%s", prefetch_mode.to_string().c_str());
+  } else {
+    const char* ks = (prefetch_mode & 1) ? "strm" : "keep";
 
-  const char* ls = (prefetch_mode & 0x10) ? "st" : "ld";
-  int level = (prefetch_mode >> 1) + 1;
-  const char* ks = (prefetch_mode & 1) ? "strm" : "keep";
+    AppendToOutput("p%sl%d%s", hints[hint].c_str(), target, ks);
+  }
 
-  AppendToOutput("p%sl%d%s", ls, level, ks);
   return 6;
 }
 
diff --git a/deps/v8/src/diagnostics/basic-block-profiler.cc b/deps/v8/src/diagnostics/basic-block-profiler.cc
index 22ba4c6da19ec3..eff80e6fca76dc 100644
--- a/deps/v8/src/diagnostics/basic-block-profiler.cc
+++ b/deps/v8/src/diagnostics/basic-block-profiler.cc
@@ -59,58 +59,60 @@ Handle<String> CopyStringToJSHeap(const std::string& source, Isolate* isolate) {
                                                        AllocationType::kOld);
 }
 
-// Size of entries in both block_ids and counts.
-constexpr int kBasicBlockSlotSize = kInt32Size;
+constexpr int kBlockIdSlotSize = kInt32Size;
+constexpr int kBlockCountSlotSize = kDoubleSize;
 }  // namespace
 
 BasicBlockProfilerData::BasicBlockProfilerData(
     Handle<OnHeapBasicBlockProfilerData> js_heap_data, Isolate* isolate) {
-  function_name_ = js_heap_data->name().ToCString().get();
-  schedule_ = js_heap_data->schedule().ToCString().get();
-  code_ = js_heap_data->code().ToCString().get();
-  Handle<ByteArray> counts(js_heap_data->counts(), isolate);
-  for (int i = 0; i < counts->length() / kBasicBlockSlotSize; ++i) {
-    counts_.push_back(counts->get_uint32(i));
-  }
-  Handle<ByteArray> block_ids(js_heap_data->block_ids(), isolate);
-  for (int i = 0; i < block_ids->length() / kBasicBlockSlotSize; ++i) {
-    block_ids_.push_back(block_ids->get_int(i));
-  }
-  CHECK_EQ(block_ids_.size(), counts_.size());
-  hash_ = js_heap_data->hash();
+  DisallowHeapAllocation no_gc;
+  CopyFromJSHeap(*js_heap_data);
 }
 
 BasicBlockProfilerData::BasicBlockProfilerData(
     OnHeapBasicBlockProfilerData js_heap_data) {
+  CopyFromJSHeap(js_heap_data);
+}
+
+void BasicBlockProfilerData::CopyFromJSHeap(
+    OnHeapBasicBlockProfilerData js_heap_data) {
   function_name_ = js_heap_data.name().ToCString().get();
   schedule_ = js_heap_data.schedule().ToCString().get();
   code_ = js_heap_data.code().ToCString().get();
   ByteArray counts(js_heap_data.counts());
-  for (int i = 0; i < counts.length() / kBasicBlockSlotSize; ++i) {
-    counts_.push_back(counts.get_uint32(i));
+  for (int i = 0; i < counts.length() / kBlockCountSlotSize; ++i) {
+    counts_.push_back(
+        reinterpret_cast<double*>(counts.GetDataStartAddress())[i]);
   }
   ByteArray block_ids(js_heap_data.block_ids());
-  for (int i = 0; i < block_ids.length() / kBasicBlockSlotSize; ++i) {
+  for (int i = 0; i < block_ids.length() / kBlockIdSlotSize; ++i) {
     block_ids_.push_back(block_ids.get_int(i));
   }
   CHECK_EQ(block_ids_.size(), counts_.size());
+  hash_ = js_heap_data.hash();
 }
 
 Handle<OnHeapBasicBlockProfilerData> BasicBlockProfilerData::CopyToJSHeap(
     Isolate* isolate) {
-  int array_size_in_bytes = static_cast<int>(n_blocks() * kBasicBlockSlotSize);
-  CHECK(array_size_in_bytes >= 0 &&
-        static_cast<size_t>(array_size_in_bytes) / kBasicBlockSlotSize ==
+  int id_array_size_in_bytes = static_cast<int>(n_blocks() * kBlockIdSlotSize);
+  CHECK(id_array_size_in_bytes >= 0 &&
+        static_cast<size_t>(id_array_size_in_bytes) / kBlockIdSlotSize ==
             n_blocks());  // Overflow
   Handle<ByteArray> block_ids = isolate->factory()->NewByteArray(
-      array_size_in_bytes, AllocationType::kOld);
+      id_array_size_in_bytes, AllocationType::kOld);
   for (int i = 0; i < static_cast<int>(n_blocks()); ++i) {
     block_ids->set_int(i, block_ids_[i]);
   }
+
+  int counts_array_size_in_bytes =
+      static_cast<int>(n_blocks() * kBlockCountSlotSize);
+  CHECK(counts_array_size_in_bytes >= 0 &&
+        static_cast<size_t>(counts_array_size_in_bytes) / kBlockCountSlotSize ==
+            n_blocks());  // Overflow
   Handle<ByteArray> counts = isolate->factory()->NewByteArray(
-      array_size_in_bytes, AllocationType::kOld);
+      counts_array_size_in_bytes, AllocationType::kOld);
   for (int i = 0; i < static_cast<int>(n_blocks()); ++i) {
-    counts->set_uint32(i, counts_[i]);
+    reinterpret_cast<double*>(counts->GetDataStartAddress())[i] = counts_[i];
   }
   Handle<String> name = CopyStringToJSHeap(function_name_, isolate);
   Handle<String> schedule = CopyStringToJSHeap(schedule_, isolate);
@@ -130,8 +132,8 @@ void BasicBlockProfiler::ResetCounts(Isolate* isolate) {
   for (int i = 0; i < list->Length(); ++i) {
     Handle<ByteArray> counts(
         OnHeapBasicBlockProfilerData::cast(list->Get(i)).counts(), isolate);
-    for (int j = 0; j < counts->length() / kBasicBlockSlotSize; ++j) {
-      counts->set_uint32(j, 0);
+    for (int j = 0; j < counts->length() / kBlockCountSlotSize; ++j) {
+      reinterpret_cast<double*>(counts->GetDataStartAddress())[j] = 0;
     }
   }
 }
@@ -166,7 +168,7 @@ void BasicBlockProfiler::Print(std::ostream& os, Isolate* isolate) {
 }
 
 std::vector<bool> BasicBlockProfiler::GetCoverageBitmap(Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   ArrayList list(isolate->heap()->basic_block_profiling_data());
   std::vector<bool> out;
   int list_length = list.Length();
@@ -195,7 +197,8 @@ void BasicBlockProfilerData::Log(Isolate* isolate) {
 }
 
 std::ostream& operator<<(std::ostream& os, const BasicBlockProfilerData& d) {
-  int block_count_sum = std::accumulate(d.counts_.begin(), d.counts_.end(), 0);
+  double block_count_sum =
+      std::accumulate(d.counts_.begin(), d.counts_.end(), 0);
   if (block_count_sum == 0) return os;
   const char* name = "unknown function";
   if (!d.function_name_.empty()) {
@@ -207,14 +210,14 @@ std::ostream& operator<<(std::ostream& os, const BasicBlockProfilerData& d) {
     os << d.schedule_.c_str() << std::endl;
   }
   os << "block counts for " << name << ":" << std::endl;
-  std::vector<std::pair<size_t, uint32_t>> pairs;
+  std::vector<std::pair<size_t, double>> pairs;
   pairs.reserve(d.n_blocks());
   for (size_t i = 0; i < d.n_blocks(); ++i) {
     pairs.push_back(std::make_pair(i, d.counts_[i]));
   }
   std::sort(
       pairs.begin(), pairs.end(),
-      [=](std::pair<size_t, uint32_t> left, std::pair<size_t, uint32_t> right) {
+      [=](std::pair<size_t, double> left, std::pair<size_t, double> right) {
         if (right.second == left.second) return left.first < right.first;
         return right.second < left.second;
       });
diff --git a/deps/v8/src/diagnostics/basic-block-profiler.h b/deps/v8/src/diagnostics/basic-block-profiler.h
index 706505939b8b35..9753dcc3a128cd 100644
--- a/deps/v8/src/diagnostics/basic-block-profiler.h
+++ b/deps/v8/src/diagnostics/basic-block-profiler.h
@@ -29,11 +29,14 @@ class BasicBlockProfilerData {
   V8_EXPORT_PRIVATE BasicBlockProfilerData(
       OnHeapBasicBlockProfilerData js_heap_data);
 
+  BasicBlockProfilerData(const BasicBlockProfilerData&) = delete;
+  BasicBlockProfilerData& operator=(const BasicBlockProfilerData&) = delete;
+
   size_t n_blocks() const {
     DCHECK_EQ(block_ids_.size(), counts_.size());
     return block_ids_.size();
   }
-  const uint32_t* counts() const { return &counts_[0]; }
+  const double* counts() const { return &counts_[0]; }
 
   void SetCode(const std::ostringstream& os);
   void SetFunctionName(std::unique_ptr<char[]> name);
@@ -55,14 +58,15 @@ class BasicBlockProfilerData {
 
   V8_EXPORT_PRIVATE void ResetCounts();
 
+  void CopyFromJSHeap(OnHeapBasicBlockProfilerData js_heap_data);
+
   // These vectors are indexed by reverse post-order block number.
   std::vector<int32_t> block_ids_;
-  std::vector<uint32_t> counts_;
+  std::vector<double> counts_;
   std::string function_name_;
   std::string schedule_;
   std::string code_;
-  int hash_;
-  DISALLOW_COPY_AND_ASSIGN(BasicBlockProfilerData);
+  int hash_ = 0;
 };
 
 class BasicBlockProfiler {
@@ -71,6 +75,8 @@ class BasicBlockProfiler {
 
   BasicBlockProfiler() = default;
   ~BasicBlockProfiler() = default;
+  BasicBlockProfiler(const BasicBlockProfiler&) = delete;
+  BasicBlockProfiler& operator=(const BasicBlockProfiler&) = delete;
 
   V8_EXPORT_PRIVATE static BasicBlockProfiler* Get();
   BasicBlockProfilerData* NewData(size_t n_blocks);
@@ -79,7 +85,7 @@ class BasicBlockProfiler {
   V8_EXPORT_PRIVATE void Print(std::ostream& os, Isolate* isolate);
 
   // Coverage bitmap in this context includes only on heap BasicBlockProfiler
-  // data It is used to export coverage of builtins function loaded from
+  // data. It is used to export coverage of builtins function loaded from
   // snapshot.
   V8_EXPORT_PRIVATE std::vector<bool> GetCoverageBitmap(Isolate* isolate);
 
@@ -88,8 +94,6 @@ class BasicBlockProfiler {
  private:
   DataList data_list_;
   base::Mutex data_list_mutex_;
-
-  DISALLOW_COPY_AND_ASSIGN(BasicBlockProfiler);
 };
 
 std::ostream& operator<<(std::ostream& os, const BasicBlockProfilerData& s);
diff --git a/deps/v8/src/diagnostics/code-tracer.h b/deps/v8/src/diagnostics/code-tracer.h
index 194d3cbe6671cf..b859953933380b 100644
--- a/deps/v8/src/diagnostics/code-tracer.h
+++ b/deps/v8/src/diagnostics/code-tracer.h
@@ -6,6 +6,7 @@
 #define V8_DIAGNOSTICS_CODE_TRACER_H_
 
 #include "src/base/optional.h"
+#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/flags/flags.h"
 #include "src/utils/allocation.h"
@@ -36,7 +37,7 @@ class CodeTracer final : public Malloced {
     WriteChars(filename_.begin(), "", 0, false);
   }
 
-  class Scope {
+  class V8_NODISCARD Scope {
    public:
     explicit Scope(CodeTracer* tracer) : tracer_(tracer) { tracer->OpenFile(); }
     ~Scope() { tracer_->CloseFile(); }
@@ -47,7 +48,7 @@ class CodeTracer final : public Malloced {
     CodeTracer* tracer_;
   };
 
-  class StreamScope : public Scope {
+  class V8_NODISCARD StreamScope : public Scope {
    public:
     explicit StreamScope(CodeTracer* tracer) : Scope(tracer) {
       FILE* file = this->file();
@@ -91,7 +92,7 @@ class CodeTracer final : public Malloced {
 
     if (--scope_depth_ == 0) {
       DCHECK_NOT_NULL(file_);
-      fclose(file_);
+      base::Fclose(file_);
       file_ = nullptr;
     }
   }
diff --git a/deps/v8/src/diagnostics/compilation-statistics.h b/deps/v8/src/diagnostics/compilation-statistics.h
index 8cc8e424ce7aa6..d14e108d078e05 100644
--- a/deps/v8/src/diagnostics/compilation-statistics.h
+++ b/deps/v8/src/diagnostics/compilation-statistics.h
@@ -25,6 +25,8 @@ struct AsPrintableStatistics {
 class CompilationStatistics final : public Malloced {
  public:
   CompilationStatistics() = default;
+  CompilationStatistics(const CompilationStatistics&) = delete;
+  CompilationStatistics& operator=(const CompilationStatistics&) = delete;
 
   class BasicStats {
    public:
@@ -81,8 +83,6 @@ class CompilationStatistics final : public Malloced {
   PhaseKindMap phase_kind_map_;
   PhaseMap phase_map_;
   base::Mutex record_mutex_;
-
-  DISALLOW_COPY_AND_ASSIGN(CompilationStatistics);
 };
 
 std::ostream& operator<<(std::ostream& os, const AsPrintableStatistics& s);
diff --git a/deps/v8/src/diagnostics/disassembler.cc b/deps/v8/src/diagnostics/disassembler.cc
index a26a4134c2cbdc..70b958871dc600 100644
--- a/deps/v8/src/diagnostics/disassembler.cc
+++ b/deps/v8/src/diagnostics/disassembler.cc
@@ -431,7 +431,7 @@ int Disassembler::Decode(Isolate* isolate, std::ostream* os, byte* begin,
   if (isolate) {
     // We have an isolate, so support external reference names.
     SealHandleScope shs(isolate);
-    DisallowHeapAllocation no_alloc;
+    DisallowGarbageCollection no_alloc;
     ExternalReferenceEncoder ref_encoder(isolate);
     return DecodeIt(isolate, &ref_encoder, os, code, v8NameConverter, begin,
                     end, current_pc);
diff --git a/deps/v8/src/diagnostics/eh-frame.cc b/deps/v8/src/diagnostics/eh-frame.cc
index 35cb529f09458f..ccafd23cb70d9b 100644
--- a/deps/v8/src/diagnostics/eh-frame.cc
+++ b/deps/v8/src/diagnostics/eh-frame.cc
@@ -466,7 +466,7 @@ int32_t EhFrameIterator::DecodeSLeb128(const byte* encoded, int* encoded_size) {
 
 namespace {
 
-class StreamModifiersScope final {
+class V8_NODISCARD StreamModifiersScope final {
  public:
   explicit StreamModifiersScope(std::ostream* stream)
       : stream_(stream), flags_(stream->flags()) {}
diff --git a/deps/v8/src/diagnostics/eh-frame.h b/deps/v8/src/diagnostics/eh-frame.h
index 17ef8c0ad5be28..9a22a97d58e9f5 100644
--- a/deps/v8/src/diagnostics/eh-frame.h
+++ b/deps/v8/src/diagnostics/eh-frame.h
@@ -72,6 +72,8 @@ class V8_EXPORT_PRIVATE EhFrameConstants final
 class V8_EXPORT_PRIVATE EhFrameWriter {
  public:
   explicit EhFrameWriter(Zone* zone);
+  EhFrameWriter(const EhFrameWriter&) = delete;
+  EhFrameWriter& operator=(const EhFrameWriter&) = delete;
 
   // The empty frame is a hack to trigger fp-based unwinding in Linux perf
   // compiled with libunwind support when processing DWARF-based call graphs.
@@ -206,8 +208,6 @@ class V8_EXPORT_PRIVATE EhFrameWriter {
   Register base_register_;
   int base_offset_;
   ZoneVector<byte> eh_frame_buffer_;
-
-  DISALLOW_COPY_AND_ASSIGN(EhFrameWriter);
 };
 
 class V8_EXPORT_PRIVATE EhFrameIterator {
@@ -290,6 +290,8 @@ class EhFrameDisassembler final {
       : start_(start), end_(end) {
     DCHECK_LT(start, end);
   }
+  EhFrameDisassembler(const EhFrameDisassembler&) = delete;
+  EhFrameDisassembler& operator=(const EhFrameDisassembler&) = delete;
 
   void DisassembleToStream(std::ostream& stream);  // NOLINT
 
@@ -301,8 +303,6 @@ class EhFrameDisassembler final {
 
   const byte* start_;
   const byte* end_;
-
-  DISALLOW_COPY_AND_ASSIGN(EhFrameDisassembler);
 };
 
 #endif
diff --git a/deps/v8/src/diagnostics/gdb-jit.cc b/deps/v8/src/diagnostics/gdb-jit.cc
index c9180fbaf50bf0..7b212f3a03969a 100644
--- a/deps/v8/src/diagnostics/gdb-jit.cc
+++ b/deps/v8/src/diagnostics/gdb-jit.cc
@@ -12,6 +12,7 @@
 #include "src/base/bits.h"
 #include "src/base/hashmap.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/frames.h"
 #include "src/handles/global-handles.h"
@@ -47,9 +48,9 @@ class Writer {
       : debug_object_(debug_object),
         position_(0),
         capacity_(1024),
-        buffer_(reinterpret_cast<byte*>(malloc(capacity_))) {}
+        buffer_(reinterpret_cast<byte*>(base::Malloc(capacity_))) {}
 
-  ~Writer() { free(buffer_); }
+  ~Writer() { base::Free(buffer_); }
 
   uintptr_t position() const { return position_; }
 
@@ -98,7 +99,7 @@ class Writer {
   void Ensure(uintptr_t pos) {
     if (capacity_ < pos) {
       while (capacity_ < pos) capacity_ *= 2;
-      buffer_ = reinterpret_cast<byte*>(realloc(buffer_, capacity_));
+      buffer_ = reinterpret_cast<byte*>(base::Realloc(buffer_, capacity_));
     }
   }
 
@@ -628,7 +629,7 @@ class ELF {
 #else
 #error Unsupported target architecture.
 #endif
-    memcpy(header->ident, ident, 16);
+    base::Memcpy(header->ident, ident, 16);
     header->type = 1;
 #if V8_TARGET_ARCH_IA32
     header->machine = 3;
@@ -1741,8 +1742,8 @@ void __gdb_print_v8_object(Object object) {
 
 static JITCodeEntry* CreateCodeEntry(Address symfile_addr,
                                      uintptr_t symfile_size) {
-  JITCodeEntry* entry =
-      static_cast<JITCodeEntry*>(malloc(sizeof(JITCodeEntry) + symfile_size));
+  JITCodeEntry* entry = static_cast<JITCodeEntry*>(
+      base::Malloc(sizeof(JITCodeEntry) + symfile_size));
 
   entry->symfile_addr_ = reinterpret_cast<Address>(entry + 1);
   entry->symfile_size_ = symfile_size;
@@ -1754,7 +1755,7 @@ static JITCodeEntry* CreateCodeEntry(Address symfile_addr,
   return entry;
 }
 
-static void DestroyCodeEntry(JITCodeEntry* entry) { free(entry); }
+static void DestroyCodeEntry(JITCodeEntry* entry) { base::Free(entry); }
 
 static void RegisterCodeEntry(JITCodeEntry* entry) {
   entry->next_ = __jit_debug_descriptor.first_entry_;
@@ -1977,7 +1978,7 @@ static void AddJITCodeEntry(CodeMap* map, const AddressRange& range,
 
 static void AddCode(const char* name, Code code, SharedFunctionInfo shared,
                     LineInfo* lineinfo) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   CodeMap* code_map = GetCodeMap();
   AddressRange range;
diff --git a/deps/v8/src/diagnostics/ia32/disasm-ia32.cc b/deps/v8/src/diagnostics/ia32/disasm-ia32.cc
index 3dbde536de3669..659e1d8aca267f 100644
--- a/deps/v8/src/diagnostics/ia32/disasm-ia32.cc
+++ b/deps/v8/src/diagnostics/ia32/disasm-ia32.cc
@@ -856,6 +856,24 @@ int DisassemblerIA32::AVXInstruction(byte* data) {
         AppendToBuffer(",%d", Imm8(current));
         current++;
         break;
+      case 0x4A:
+        AppendToBuffer("vblendvps %s,%s,", NameOfXMMRegister(regop),
+                       NameOfXMMRegister(vvvv));
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(*current >> 4));
+        break;
+      case 0x4B:
+        AppendToBuffer("vblendvps %s,%s,", NameOfXMMRegister(regop),
+                       NameOfXMMRegister(vvvv));
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(*current >> 4));
+        break;
+      case 0x4C:
+        AppendToBuffer("vpblendvb %s,%s,", NameOfXMMRegister(regop),
+                       NameOfXMMRegister(vvvv));
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(*current >> 4));
+        break;
       default:
         UnimplementedInstruction();
     }
@@ -863,6 +881,16 @@ int DisassemblerIA32::AVXInstruction(byte* data) {
     int mod, regop, rm, vvvv = vex_vreg();
     get_modrm(*current, &mod, &regop, &rm);
     switch (opcode) {
+      case 0x10:
+        AppendToBuffer("vmovsd %s,%s,", NameOfXMMRegister(regop),
+                       NameOfXMMRegister(vvvv));
+        current += PrintRightXMMOperand(current);
+        break;
+      case 0x11:
+        AppendToBuffer("vmovsd ");
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(regop));
+        break;
       case 0x12:
         AppendToBuffer("vmovddup %s,", NameOfXMMRegister(regop));
         current += PrintRightXMMOperand(current);
@@ -920,6 +948,20 @@ int DisassemblerIA32::AVXInstruction(byte* data) {
     int mod, regop, rm, vvvv = vex_vreg();
     get_modrm(*current, &mod, &regop, &rm);
     switch (opcode) {
+      case 0x10:
+        AppendToBuffer("vmovss %s,%s,", NameOfXMMRegister(regop),
+                       NameOfXMMRegister(vvvv));
+        current += PrintRightXMMOperand(current);
+        break;
+      case 0x11:
+        AppendToBuffer("vmovss ");
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(regop));
+        break;
+      case 0x16:
+        AppendToBuffer("vmovshdup %s,", NameOfXMMRegister(regop));
+        current += PrintRightXMMOperand(current);
+        break;
       case 0x51:
         AppendToBuffer("vsqrtss %s,%s,", NameOfXMMRegister(regop),
                        NameOfXMMRegister(vvvv));
@@ -1078,6 +1120,35 @@ int DisassemblerIA32::AVXInstruction(byte* data) {
         AppendToBuffer("vmovups %s,", NameOfXMMRegister(regop));
         current += PrintRightXMMOperand(current);
         break;
+      case 0x11:
+        AppendToBuffer("vmovups ");
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(regop));
+        break;
+      case 0x12:
+        if (mod == 0b11) {
+          AppendToBuffer("vmovhlps %s,%s,", NameOfXMMRegister(regop),
+                         NameOfXMMRegister(vvvv));
+        } else {
+          AppendToBuffer("vmovlps %s,%s,", NameOfXMMRegister(regop),
+                         NameOfXMMRegister(vvvv));
+        }
+        current += PrintRightXMMOperand(current);
+        break;
+      case 0x13:
+        AppendToBuffer("vmovlps ");
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(regop));
+        break;
+      case 0x16:
+        AppendToBuffer("vmovhps %s,", NameOfXMMRegister(regop));
+        current += PrintRightXMMOperand(current);
+        break;
+      case 0x17:
+        AppendToBuffer("vmovhps ");
+        current += PrintRightXMMOperand(current);
+        AppendToBuffer(",%s", NameOfXMMRegister(regop));
+        break;
       case 0x28:
         AppendToBuffer("vmovaps %s,", NameOfXMMRegister(regop));
         current += PrintRightXMMOperand(current);
@@ -1185,6 +1256,11 @@ int DisassemblerIA32::AVXInstruction(byte* data) {
         AppendToBuffer("vmovapd %s,", NameOfXMMRegister(regop));
         current += PrintRightXMMOperand(current);
         break;
+      case 0x50:
+        AppendToBuffer("vmovmskpd %s,%s", NameOfCPURegister(regop),
+                       NameOfXMMRegister(rm));
+        current++;
+        break;
       case 0x54:
         AppendToBuffer("vandpd %s,%s,", NameOfXMMRegister(regop),
                        NameOfXMMRegister(vvvv));
@@ -1791,10 +1867,34 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
       case 0x0F: {
         byte f0byte = data[1];
         const char* f0mnem = F0Mnem(f0byte);
-        if (f0byte == 0x18) {
+        int mod, regop, rm;
+        // Not every instruction use this, and it is safe to index data+2 as all
+        // instructions are at least 3 bytes with operands.
+        get_modrm(*(data + 2), &mod, &regop, &rm);
+        if (f0byte == 0x12) {
+          data += 2;
+          if (mod == 0b11) {
+            AppendToBuffer("movhlps %s,", NameOfXMMRegister(regop));
+          } else {
+            AppendToBuffer("movlps %s,", NameOfXMMRegister(regop));
+          }
+          data += PrintRightXMMOperand(data);
+        } else if (f0byte == 0x13) {
+          data += 2;
+          AppendToBuffer("movlps ");
+          data += PrintRightXMMOperand(data);
+          AppendToBuffer(",%s", NameOfXMMRegister(regop));
+        } else if (f0byte == 0x16) {
+          data += 2;
+          AppendToBuffer("movhps %s,", NameOfXMMRegister(regop));
+          data += PrintRightXMMOperand(data);
+        } else if (f0byte == 0x17) {
+          data += 2;
+          AppendToBuffer("movhps ");
+          data += PrintRightXMMOperand(data);
+          AppendToBuffer(",%s", NameOfXMMRegister(regop));
+        } else if (f0byte == 0x18) {
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           const char* suffix[] = {"nta", "1", "2", "3"};
           AppendToBuffer("%s%s ", f0mnem, suffix[regop & 0x03]);
           data += PrintRightOperand(data);
@@ -1822,8 +1922,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           data += 2;
         } else if (f0byte == 0x28) {
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           AppendToBuffer("movaps %s,%s", NameOfXMMRegister(regop),
                          NameOfXMMRegister(rm));
           data++;
@@ -1831,8 +1929,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           data += 2;
           // movups xmm, xmm/m128
           // movups xmm/m128, xmm
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           AppendToBuffer("movups ");
           if (f0byte == 0x11) {
             data += PrintRightXMMOperand(data);
@@ -1843,8 +1939,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           }
         } else if (f0byte == 0x2E) {
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           AppendToBuffer("ucomiss %s,", NameOfXMMRegister(regop));
           data += PrintRightXMMOperand(data);
         } else if (f0byte >= 0x51 && f0byte <= 0x5F) {
@@ -1855,15 +1949,11 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           };
 
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           AppendToBuffer("%s %s,", pseudo_op[f0byte - 0x51],
                          NameOfXMMRegister(regop));
           data += PrintRightXMMOperand(data);
         } else if (f0byte == 0x50) {
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           AppendToBuffer("movmskps %s,%s", NameOfCPURegister(regop),
                          NameOfXMMRegister(rm));
           data++;
@@ -1875,8 +1965,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           data += PrintOperands("xadd", OPER_REG_OP_ORDER, data);
         } else if (f0byte == 0xC2) {
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           const char* const pseudo_op[] = {"eq",  "lt",  "le",  "unord",
                                            "neq", "nlt", "nle", "ord"};
           AppendToBuffer("cmpps %s, ", NameOfXMMRegister(regop));
@@ -1886,8 +1974,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
         } else if (f0byte == 0xC6) {
           // shufps xmm, xmm/m128, imm8
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           int8_t imm8 = static_cast<int8_t>(data[1]);
           AppendToBuffer("shufps %s,%s,%d", NameOfXMMRegister(rm),
                          NameOfXMMRegister(regop), static_cast<int>(imm8));
@@ -1911,8 +1997,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           // shld, shrd
           data += 2;
           AppendToBuffer("%s ", f0mnem);
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           int8_t imm8 = static_cast<int8_t>(data[1]);
           data += 2;
           AppendToBuffer("%s,%s,%d", NameOfCPURegister(rm),
@@ -1921,8 +2005,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           // shrd_cl, shld_cl, bts
           data += 2;
           AppendToBuffer("%s ", f0mnem);
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           data += PrintRightOperand(data);
           if (f0byte == 0xAB) {
             AppendToBuffer(",%s", NameOfCPURegister(regop));
@@ -1933,8 +2015,6 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           // cmpxchg_b
           data += 2;
           AppendToBuffer("%s ", f0mnem);
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           data += PrintRightOperand(data);
           AppendToBuffer(",%s", NameOfByteCPURegister(regop));
         } else if (f0byte == 0xB1) {
@@ -1943,22 +2023,16 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
           data += PrintOperands(f0mnem, OPER_REG_OP_ORDER, data);
         } else if (f0byte == 0xBC) {
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           AppendToBuffer("%s %s,", f0mnem, NameOfCPURegister(regop));
           data += PrintRightOperand(data);
         } else if (f0byte == 0xBD) {
           data += 2;
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           AppendToBuffer("%s %s,", f0mnem, NameOfCPURegister(regop));
           data += PrintRightOperand(data);
         } else if (f0byte == 0xC7) {
           // cmpxchg8b
           data += 2;
           AppendToBuffer("%s ", f0mnem);
-          int mod, regop, rm;
-          get_modrm(*data, &mod, &regop, &rm);
           data += PrintRightOperand(data);
         } else if (f0byte == 0xAE && (data[2] & 0xF8) == 0xF0) {
           AppendToBuffer("mfence");
@@ -2147,6 +2221,21 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
               SSE4_INSTRUCTION_LIST(SSE34_DIS_CASE)
               SSE4_RM_INSTRUCTION_LIST(SSE34_DIS_CASE)
 #undef SSE34_DIS_CASE
+              case 0x10:
+                AppendToBuffer("pblendvb %s,", NameOfXMMRegister(regop));
+                data += PrintRightXMMOperand(data);
+                AppendToBuffer(",xmm0");
+                break;
+              case 0x14:
+                AppendToBuffer("blendvps %s,", NameOfXMMRegister(regop));
+                data += PrintRightXMMOperand(data);
+                AppendToBuffer(",xmm0");
+                break;
+              case 0x15:
+                AppendToBuffer("blendvps %s,", NameOfXMMRegister(regop));
+                data += PrintRightXMMOperand(data);
+                AppendToBuffer(",xmm0");
+                break;
               default:
                 UnimplementedInstruction();
             }
@@ -2592,6 +2681,12 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
             get_modrm(*data, &mod, &regop, &rm);
             AppendToBuffer("movss %s,", NameOfXMMRegister(regop));
             data += PrintRightXMMOperand(data);
+          } else if (b2 == 0x16) {
+            data += 3;
+            int mod, regop, rm;
+            get_modrm(*data, &mod, &regop, &rm);
+            AppendToBuffer("movshdup %s,", NameOfXMMRegister(regop));
+            data += PrintRightXMMOperand(data);
           } else if (b2 == 0x5A) {
             data += 3;
             int mod, regop, rm;
@@ -2719,6 +2814,7 @@ int DisassemblerIA32::InstructionDecode(v8::internal::Vector<char> out_buffer,
 
       default:
         UnimplementedInstruction();
+        data++;
     }
   }
 
diff --git a/deps/v8/src/diagnostics/mips/disasm-mips.cc b/deps/v8/src/diagnostics/mips/disasm-mips.cc
index ac26d65db2ebf8..28207cef546514 100644
--- a/deps/v8/src/diagnostics/mips/disasm-mips.cc
+++ b/deps/v8/src/diagnostics/mips/disasm-mips.cc
@@ -52,6 +52,9 @@ class Decoder {
 
   ~Decoder() {}
 
+  Decoder(const Decoder&) = delete;
+  Decoder& operator=(const Decoder&) = delete;
+
   // Writes one disassembled instruction into 'buffer' (0-terminated).
   // Returns the length of the disassembled machine instruction in bytes.
   int InstructionDecode(byte* instruction);
@@ -150,8 +153,6 @@ class Decoder {
   const disasm::NameConverter& converter_;
   v8::internal::Vector<char> out_buffer_;
   int out_buffer_pos_;
-
-  DISALLOW_COPY_AND_ASSIGN(Decoder);
 };
 
 // Support for assertions in the Decoder formatting functions.
diff --git a/deps/v8/src/diagnostics/mips64/disasm-mips64.cc b/deps/v8/src/diagnostics/mips64/disasm-mips64.cc
index 5edb7836b579ee..c116f55918b399 100644
--- a/deps/v8/src/diagnostics/mips64/disasm-mips64.cc
+++ b/deps/v8/src/diagnostics/mips64/disasm-mips64.cc
@@ -52,6 +52,9 @@ class Decoder {
 
   ~Decoder() {}
 
+  Decoder(const Decoder&) = delete;
+  Decoder& operator=(const Decoder&) = delete;
+
   // Writes one disassembled instruction into 'buffer' (0-terminated).
   // Returns the length of the disassembled machine instruction in bytes.
   int InstructionDecode(byte* instruction);
@@ -162,8 +165,6 @@ class Decoder {
   const disasm::NameConverter& converter_;
   v8::internal::Vector<char> out_buffer_;
   int out_buffer_pos_;
-
-  DISALLOW_COPY_AND_ASSIGN(Decoder);
 };
 
 // Support for assertions in the Decoder formatting functions.
diff --git a/deps/v8/src/diagnostics/objects-debug.cc b/deps/v8/src/diagnostics/objects-debug.cc
index 6ee2d39f45cf97..23ad5ebd27e3e8 100644
--- a/deps/v8/src/diagnostics/objects-debug.cc
+++ b/deps/v8/src/diagnostics/objects-debug.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "src/codegen/assembler-inl.h"
+#include "src/common/globals.h"
 #include "src/date/date.h"
 #include "src/diagnostics/disasm.h"
 #include "src/diagnostics/disassembler.h"
@@ -75,7 +76,6 @@
 #include "src/utils/ostreams.h"
 #include "src/wasm/wasm-objects-inl.h"
 #include "torque-generated/class-verifiers.h"
-#include "torque-generated/runtime-macros.h"
 
 namespace v8 {
 namespace internal {
@@ -214,11 +214,21 @@ void HeapObject::HeapObjectVerify(Isolate* isolate) {
     case CODE_TYPE:
       Code::cast(*this).CodeVerify(isolate);
       break;
-    case JS_OBJECT_TYPE:
-    case JS_ERROR_TYPE:
     case JS_API_OBJECT_TYPE:
-    case JS_SPECIAL_API_OBJECT_TYPE:
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
     case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
+    case JS_ERROR_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
+    case JS_OBJECT_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
+    case JS_SPECIAL_API_OBJECT_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
       JSObject::cast(*this).JSObjectVerify(isolate);
       break;
     case WASM_INSTANCE_OBJECT_TYPE:
@@ -278,7 +288,7 @@ void HeapObject::VerifyHeapPointer(Isolate* isolate, Object p) {
 void Symbol::SymbolVerify(Isolate* isolate) {
   TorqueGeneratedClassVerifiers::SymbolVerify(*this, isolate);
   CHECK(HasHashCode());
-  CHECK_GT(Hash(), 0);
+  CHECK_GT(hash(), 0);
   CHECK(description().IsUndefined(isolate) || description().IsString());
   CHECK_IMPLIES(IsPrivateName(), IsPrivate());
   CHECK_IMPLIES(IsPrivateBrand(), IsPrivateName());
@@ -474,7 +484,7 @@ void Map::MapVerify(Isolate* isolate) {
     }
   }
   SLOW_DCHECK(instance_descriptors(kRelaxedLoad).IsSortedNoDuplicates());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   SLOW_DCHECK(
       TransitionsAccessor(isolate, *this, &no_gc).IsSortedNoDuplicates());
   SLOW_DCHECK(TransitionsAccessor(isolate, *this, &no_gc)
@@ -826,7 +836,7 @@ void SharedFunctionInfo::SharedFunctionInfoVerify(LocalIsolate* isolate) {
 void SharedFunctionInfo::SharedFunctionInfoVerify(ReadOnlyRoots roots) {
   Object value = name_or_scope_info(kAcquireLoad);
   if (value.IsScopeInfo()) {
-    CHECK_LT(0, ScopeInfo::cast(value).length());
+    CHECK(!ScopeInfo::cast(value).IsEmpty());
     CHECK_NE(value, roots.empty_scope_info());
   }
 
@@ -854,7 +864,7 @@ void SharedFunctionInfo::SharedFunctionInfoVerify(ReadOnlyRoots roots) {
       language_mode(), kind(), HasSharedName(), needs_home_object());
   CHECK_EQ(expected_map_index, function_map_index());
 
-  if (scope_info().length() > 0) {
+  if (!scope_info().IsEmpty()) {
     ScopeInfo info = scope_info();
     CHECK(kind() == info.function_kind());
     CHECK_EQ(internal::IsModule(kind()), info.scope_type() == MODULE_SCOPE);
@@ -884,7 +894,8 @@ void JSGlobalProxy::JSGlobalProxyVerify(Isolate* isolate) {
 void JSGlobalObject::JSGlobalObjectVerify(Isolate* isolate) {
   CHECK(IsJSGlobalObject());
   // Do not check the dummy global object for the builtins.
-  if (global_dictionary().NumberOfElements() == 0 && elements().length() == 0) {
+  if (global_dictionary(kAcquireLoad).NumberOfElements() == 0 &&
+      elements().length() == 0) {
     return;
   }
   JSObjectVerify(isolate);
@@ -937,7 +948,13 @@ void Oddball::OddballVerify(Isolate* isolate) {
   }
 }
 
-USE_TORQUE_VERIFIER(PropertyCell)
+void PropertyCell::PropertyCellVerify(Isolate* isolate) {
+  // TODO(torque): replace with USE_TORQUE_VERIFIER(PropertyCell) once
+  // it supports UniqueName type.
+  TorqueGeneratedClassVerifiers::PropertyCellVerify(*this, isolate);
+
+  CHECK(name().IsUniqueName());
+}
 
 void CodeDataContainer::CodeDataContainerVerify(Isolate* isolate) {
   CHECK(IsCodeDataContainer());
@@ -1387,9 +1404,11 @@ void Module::ModuleVerify(Isolate* isolate) {
 
 void ModuleRequest::ModuleRequestVerify(Isolate* isolate) {
   TorqueGeneratedClassVerifiers::ModuleRequestVerify(*this, isolate);
-  CHECK_EQ(0, import_assertions().length() % 3);
+  CHECK_EQ(0,
+           import_assertions().length() % ModuleRequest::kAssertionEntrySize);
 
-  for (int i = 0; i < import_assertions().length(); i += 3) {
+  for (int i = 0; i < import_assertions().length();
+       i += ModuleRequest::kAssertionEntrySize) {
     CHECK(import_assertions().get(i).IsString());      // Assertion key
     CHECK(import_assertions().get(i + 1).IsString());  // Assertion value
     CHECK(import_assertions().get(i + 2).IsSmi());     // Assertion location
@@ -1400,7 +1419,7 @@ void SourceTextModule::SourceTextModuleVerify(Isolate* isolate) {
   TorqueGeneratedClassVerifiers::SourceTextModuleVerify(*this, isolate);
 
   if (status() == kErrored) {
-    CHECK(code().IsSourceTextModuleInfo());
+    CHECK(code().IsSharedFunctionInfo());
   } else if (status() == kEvaluating || status() == kEvaluated) {
     CHECK(code().IsJSGeneratorObject());
   } else {
@@ -1627,7 +1646,13 @@ void JSObject::IncrementSpillStatistics(Isolate* isolate,
     info->number_of_fast_used_fields_ += map().NextFreePropertyIndex();
     info->number_of_fast_unused_fields_ += map().UnusedPropertyFields();
   } else if (IsJSGlobalObject()) {
-    GlobalDictionary dict = JSGlobalObject::cast(*this).global_dictionary();
+    GlobalDictionary dict =
+        JSGlobalObject::cast(*this).global_dictionary(kAcquireLoad);
+    info->number_of_slow_used_properties_ += dict.NumberOfElements();
+    info->number_of_slow_unused_properties_ +=
+        dict.Capacity() - dict.NumberOfElements();
+  } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    OrderedNameDictionary dict = property_dictionary_ordered();
     info->number_of_slow_used_properties_ += dict.NumberOfElements();
     info->number_of_slow_unused_properties_ +=
         dict.Capacity() - dict.NumberOfElements();
diff --git a/deps/v8/src/diagnostics/objects-printer.cc b/deps/v8/src/diagnostics/objects-printer.cc
index d65c0eeb4b269c..94acb12d09acd1 100644
--- a/deps/v8/src/diagnostics/objects-printer.cc
+++ b/deps/v8/src/diagnostics/objects-printer.cc
@@ -65,6 +65,24 @@ void PrintHeapObjectHeaderWithoutMap(HeapObject object, std::ostream& os,
   }
 }
 
+template <typename T>
+void PrintDictionaryContents(std::ostream& os, T dict) {
+  DisallowGarbageCollection no_gc;
+  ReadOnlyRoots roots = dict.GetReadOnlyRoots();
+
+  for (InternalIndex i : dict.IterateEntries()) {
+    Object k;
+    if (!dict.ToKey(roots, i, &k)) continue;
+    os << "\n   ";
+    if (k.IsString()) {
+      String::cast(k).PrintUC16(os);
+    } else {
+      os << Brief(k);
+    }
+    os << ": " << Brief(dict.ValueAt(i)) << " ";
+    dict.DetailsAt(i).PrintAsSlowTo(os, !T::kIsOrderedDictionaryType);
+  }
+}
 }  // namespace
 
 void HeapObject::PrintHeader(std::ostream& os, const char* id) {  // NOLINT
@@ -104,10 +122,20 @@ void HeapObject::HeapObjectPrint(std::ostream& os) {  // NOLINT
       ObjectHashTable::cast(*this).ObjectHashTablePrint(os);
       break;
     case ORDERED_HASH_MAP_TYPE:
+      OrderedHashMap::cast(*this).OrderedHashMapPrint(os);
+      break;
     case ORDERED_HASH_SET_TYPE:
+      OrderedHashSet::cast(*this).OrderedHashSetPrint(os);
+      break;
     case ORDERED_NAME_DICTIONARY_TYPE:
+      OrderedNameDictionary::cast(*this).OrderedNameDictionaryPrint(os);
+      break;
     case NAME_DICTIONARY_TYPE:
+      NameDictionary::cast(*this).NameDictionaryPrint(os);
+      break;
     case GLOBAL_DICTIONARY_TYPE:
+      GlobalDictionary::cast(*this).GlobalDictionaryPrint(os);
+      break;
     case SIMPLE_NUMBER_DICTIONARY_TYPE:
       FixedArray::cast(*this).FixedArrayPrint(os);
       break;
@@ -131,11 +159,21 @@ void HeapObject::HeapObjectPrint(std::ostream& os) {  // NOLINT
     case FILLER_TYPE:
       os << "filler";
       break;
-    case JS_OBJECT_TYPE:  // fall through
     case JS_API_OBJECT_TYPE:
-    case JS_SPECIAL_API_OBJECT_TYPE:
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
     case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
     case JS_ERROR_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
+    case JS_OBJECT_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
+    case JS_SPECIAL_API_OBJECT_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
       JSObject::cast(*this).JSObjectPrint(os);
       break;
     case WASM_INSTANCE_OBJECT_TYPE:
@@ -194,8 +232,6 @@ void HeapObject::HeapObjectPrint(std::ostream& os) {  // NOLINT
     case EXTERNAL_INTERNALIZED_STRING_TYPE:
     case ONE_BYTE_INTERNALIZED_STRING_TYPE:
     case EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
-    case UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE:
-    case UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
     case STRING_TYPE:
     case CONS_STRING_TYPE:
     case EXTERNAL_STRING_TYPE:
@@ -270,11 +306,12 @@ bool JSObject::PrintProperties(std::ostream& os) {  // NOLINT
     }
     return map().NumberOfOwnDescriptors() > 0;
   } else if (IsJSGlobalObject()) {
-    JSGlobalObject::cast(*this).global_dictionary().Print(os);
+    PrintDictionaryContents(
+        os, JSGlobalObject::cast(*this).global_dictionary(kAcquireLoad));
   } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
-    property_dictionary_ordered().Print(os);
+    PrintDictionaryContents(os, property_dictionary_ordered());
   } else {
-    property_dictionary().Print(os);
+    PrintDictionaryContents(os, property_dictionary());
   }
   return true;
 }
@@ -394,7 +431,7 @@ void PrintDictionaryElements(std::ostream& os, FixedArrayBase elements) {
   } else {
     os << "\n   - max_number_key: " << dict.max_number_key();
   }
-  dict.Print(os);
+  PrintDictionaryContents(os, dict);
 }
 
 void PrintSloppyArgumentElements(std::ostream& os, ElementsKind kind,
@@ -426,7 +463,7 @@ void PrintSloppyArgumentElements(std::ostream& os, ElementsKind kind,
 
 void PrintEmbedderData(IsolateRoot isolate, std::ostream& os,
                        EmbedderDataSlot slot) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object value = slot.load_tagged();
   os << Brief(value);
   void* raw_pointer;
@@ -579,7 +616,7 @@ void JSGeneratorObject::JSGeneratorObjectPrint(std::ostream& os) {  // NOLINT
   if (is_executing()) os << " (executing)";
   if (is_suspended()) os << " (suspended)";
   if (is_suspended()) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     SharedFunctionInfo fun_info = function().shared();
     if (fun_info.HasSourceCode()) {
       Script script = Script::cast(fun_info.script());
@@ -590,8 +627,9 @@ void JSGeneratorObject::JSGeneratorObjectPrint(std::ostream& os) {  // NOLINT
       os << "\n - source position: ";
       // Can't collect source positions here if not available as that would
       // allocate memory.
+      Isolate* isolate = GetIsolate();
       if (fun_info.HasBytecodeArray() &&
-          fun_info.GetBytecodeArray().HasSourcePositionTable()) {
+          fun_info.GetBytecodeArray(isolate).HasSourcePositionTable()) {
         os << source_position();
         os << " (";
         script_name.PrintUC16(os);
@@ -648,7 +686,7 @@ void JSRegExpStringIterator::JSRegExpStringIteratorPrint(
 
 void Symbol::SymbolPrint(std::ostream& os) {  // NOLINT
   PrintHeader(os, "Symbol");
-  os << "\n - hash: " << Hash();
+  os << "\n - hash: " << hash();
   os << "\n - description: " << Brief(description());
   if (description().IsUndefined()) {
     os << " (" << PrivateSymbolToName() << ")";
@@ -684,23 +722,6 @@ void PrintFixedArrayWithHeader(std::ostream& os, FixedArray array,
   os << "\n";
 }
 
-template <typename T>
-void PrintHashTableWithHeader(std::ostream& os, T table, const char* type) {
-  table.PrintHeader(os, type);
-  os << "\n - length: " << table.length();
-  os << "\n - elements: " << table.NumberOfElements();
-  os << "\n - deleted: " << table.NumberOfDeletedElements();
-  os << "\n - capacity: " << table.Capacity();
-
-  os << "\n - elements: {";
-  for (InternalIndex i : table.IterateEntries()) {
-    os << '\n'
-       << std::setw(12) << i.as_int() << ": " << Brief(table.KeyAt(i)) << " -> "
-       << Brief(table.ValueAt(i));
-  }
-  os << "\n }\n";
-}
-
 template <typename T>
 void PrintWeakArrayElements(std::ostream& os, T* array) {
   // Print in array notation for non-sparse arrays.
@@ -728,6 +749,11 @@ void PrintWeakArrayElements(std::ostream& os, T* array) {
 
 }  // namespace
 
+void ObjectBoilerplateDescription::ObjectBoilerplateDescriptionPrint(
+    std::ostream& os) {
+  PrintFixedArrayWithHeader(os, *this, "ObjectBoilerplateDescription");
+}
+
 void EmbedderDataArray::EmbedderDataArrayPrint(std::ostream& os) {
   IsolateRoot isolate = GetIsolateForPtrCompr(*this);
   PrintHeader(os, "EmbedderDataArray");
@@ -767,21 +793,157 @@ void NativeContext::NativeContextPrint(std::ostream& os) {
   os << " - microtask_queue: " << microtask_queue() << "\n";
 }
 
+namespace {
+using DataPrinter = std::function<void(InternalIndex)>;
+
+// Prints the data associated with each key (but no headers or other meta
+// data) in a hash table. Works on different hash table types, like the
+// subtypes of HashTable and OrderedHashTable. |print_data_at| is given an
+// index into the table (where a valid key resides) and prints the data at
+// that index, like just the value (in case of a hash map), or value and
+// property details (in case of a property dictionary). No leading space
+// required or trailing newline required. It can be null/non-callable
+// std::function to indicate that there is no associcated data to be printed
+// (for example in case of a hash set).
+template <typename T>
+void PrintTableContentsGeneric(std::ostream& os, T dict,
+                               DataPrinter print_data_at) {
+  DisallowGarbageCollection no_gc;
+  ReadOnlyRoots roots = dict.GetReadOnlyRoots();
+
+  for (InternalIndex i : dict.IterateEntries()) {
+    Object k;
+    if (!dict.ToKey(roots, i, &k)) continue;
+    os << "\n   " << std::setw(12) << i.as_int() << ": ";
+    if (k.IsString()) {
+      String::cast(k).PrintUC16(os);
+    } else {
+      os << Brief(k);
+    }
+    if (print_data_at) {
+      os << " -> ";
+      print_data_at(i);
+    }
+  }
+}
+
+// Used for ordered and unordered dictionaries.
+template <typename T>
+void PrintDictionaryContentsFull(std::ostream& os, T dict) {
+  os << "\n - elements: {";
+  auto print_value_and_property_details = [&](InternalIndex i) {
+    os << Brief(dict.ValueAt(i)) << " ";
+    dict.DetailsAt(i).PrintAsSlowTo(os, !T::kIsOrderedDictionaryType);
+  };
+  PrintTableContentsGeneric(os, dict, print_value_and_property_details);
+  os << "\n }\n";
+}
+
+// Used for ordered and unordered hash maps.
+template <typename T>
+void PrintHashMapContentsFull(std::ostream& os, T dict) {
+  os << "\n - elements: {";
+  auto print_value = [&](InternalIndex i) { os << Brief(dict.ValueAt(i)); };
+  PrintTableContentsGeneric(os, dict, print_value);
+  os << "\n }\n";
+}
+
+// Used for ordered and unordered hash sets.
+template <typename T>
+void PrintHashSetContentsFull(std::ostream& os, T dict) {
+  os << "\n - elements: {";
+  // Passing non-callable std::function as there are no values to print.
+  PrintTableContentsGeneric(os, dict, nullptr);
+  os << "\n }\n";
+}
+
+// Used for subtypes of OrderedHashTable.
+template <typename T>
+void PrintOrderedHashTableHeaderAndBuckets(std::ostream& os, T table,
+                                           const char* type) {
+  DisallowGarbageCollection no_gc;
+
+  PrintHeapObjectHeaderWithoutMap(table, os, type);
+  os << "\n - FixedArray length: " << table.length();
+  os << "\n - elements: " << table.NumberOfElements();
+  os << "\n - deleted: " << table.NumberOfDeletedElements();
+  os << "\n - buckets: " << table.NumberOfBuckets();
+  os << "\n - capacity: " << table.Capacity();
+
+  os << "\n - buckets: {";
+  for (int bucket = 0; bucket < table.NumberOfBuckets(); bucket++) {
+    Object entry = table.get(T::HashTableStartIndex() + bucket);
+    DCHECK(entry.IsSmi());
+    os << "\n   " << std::setw(12) << bucket << ": " << Brief(entry);
+  }
+  os << "\n }";
+}
+
+// Used for subtypes of HashTable.
+template <typename T>
+void PrintHashTableHeader(std::ostream& os, T table, const char* type) {
+  PrintHeapObjectHeaderWithoutMap(table, os, type);
+  os << "\n - FixedArray length: " << table.length();
+  os << "\n - elements: " << table.NumberOfElements();
+  os << "\n - deleted: " << table.NumberOfDeletedElements();
+  os << "\n - capacity: " << table.Capacity();
+}
+}  // namespace
+
 void ObjectHashTable::ObjectHashTablePrint(std::ostream& os) {
-  PrintHashTableWithHeader(os, *this, "ObjectHashTable");
+  PrintHashTableHeader(os, *this, "ObjectHashTable");
+  PrintHashMapContentsFull(os, *this);
 }
 
 void NumberDictionary::NumberDictionaryPrint(std::ostream& os) {
-  PrintHashTableWithHeader(os, *this, "NumberDictionary");
+  PrintHashTableHeader(os, *this, "NumberDictionary");
+  PrintDictionaryContentsFull(os, *this);
 }
 
 void EphemeronHashTable::EphemeronHashTablePrint(std::ostream& os) {
-  PrintHashTableWithHeader(os, *this, "EphemeronHashTable");
+  PrintHashTableHeader(os, *this, "EphemeronHashTable");
+  PrintHashMapContentsFull(os, *this);
 }
 
-void ObjectBoilerplateDescription::ObjectBoilerplateDescriptionPrint(
+void NameDictionary::NameDictionaryPrint(std::ostream& os) {
+  PrintHashTableHeader(os, *this, "NameDictionary");
+  PrintDictionaryContentsFull(os, *this);
+}
+
+void GlobalDictionary::GlobalDictionaryPrint(std::ostream& os) {
+  PrintHashTableHeader(os, *this, "GlobalDictionary");
+  PrintDictionaryContentsFull(os, *this);
+}
+
+void SmallOrderedHashSet::SmallOrderedHashSetPrint(std::ostream& os) {
+  PrintHeader(os, "SmallOrderedHashSet");
+  // TODO(tebbi): Print all fields.
+}
+
+void SmallOrderedHashMap::SmallOrderedHashMapPrint(std::ostream& os) {
+  PrintHeader(os, "SmallOrderedHashMap");
+  // TODO(tebbi): Print all fields.
+}
+
+void SmallOrderedNameDictionary::SmallOrderedNameDictionaryPrint(
     std::ostream& os) {
-  PrintFixedArrayWithHeader(os, *this, "ObjectBoilerplateDescription");
+  PrintHeader(os, "SmallOrderedNameDictionary");
+  // TODO(tebbi): Print all fields.
+}
+
+void OrderedHashSet::OrderedHashSetPrint(std::ostream& os) {
+  PrintOrderedHashTableHeaderAndBuckets(os, *this, "OrderedHashSet");
+  PrintHashSetContentsFull(os, *this);
+}
+
+void OrderedHashMap::OrderedHashMapPrint(std::ostream& os) {
+  PrintOrderedHashTableHeaderAndBuckets(os, *this, "OrderedHashMap");
+  PrintHashMapContentsFull(os, *this);
+}
+
+void OrderedNameDictionary::OrderedNameDictionaryPrint(std::ostream& os) {
+  PrintOrderedHashTableHeaderAndBuckets(os, *this, "OrderedNameDictionary");
+  PrintDictionaryContentsFull(os, *this);
 }
 
 void PropertyArray::PropertyArrayPrint(std::ostream& os) {  // NOLINT
@@ -1245,7 +1407,7 @@ void JSFunction::JSFunctionPrint(std::ostream& os) {  // NOLINT
   } else if (ActiveTierIsIgnition()) {
     os << "\n - interpreted";
     if (shared().HasBytecodeArray()) {
-      os << "\n - bytecode: " << shared().GetBytecodeArray();
+      os << "\n - bytecode: " << shared().GetBytecodeArray(isolate);
     }
   }
   if (WasmExportedFunction::IsWasmExportedFunction(*this)) {
@@ -1281,22 +1443,6 @@ void SharedFunctionInfo::PrintSourceCode(std::ostream& os) {
   }
 }
 
-void SmallOrderedHashSet::SmallOrderedHashSetPrint(std::ostream& os) {
-  PrintHeader(os, "SmallOrderedHashSet");
-  // TODO(tebbi): Print all fields.
-}
-
-void SmallOrderedHashMap::SmallOrderedHashMapPrint(std::ostream& os) {
-  PrintHeader(os, "SmallOrderedHashMap");
-  // TODO(tebbi): Print all fields.
-}
-
-void SmallOrderedNameDictionary::SmallOrderedNameDictionaryPrint(
-    std::ostream& os) {
-  PrintHeader(os, "SmallOrderedNameDictionary");
-  // TODO(tebbi): Print all fields.
-}
-
 void SharedFunctionInfo::SharedFunctionInfoPrint(std::ostream& os) {  // NOLINT
   PrintHeader(os, "SharedFunctionInfo");
   os << "\n - name: ";
@@ -1374,47 +1520,9 @@ void PropertyCell::PropertyCellPrint(std::ostream& os) {  // NOLINT
   name().NamePrint(os);
   os << "\n - value: " << Brief(value());
   os << "\n - details: ";
-  property_details().PrintAsSlowTo(os);
+  property_details().PrintAsSlowTo(os, true);
   PropertyCellType cell_type = property_details().cell_type();
-  os << "\n - cell_type: ";
-  if (value().IsTheHole()) {
-    switch (cell_type) {
-      case PropertyCellType::kUninitialized:
-        os << "Uninitialized";
-        break;
-      case PropertyCellType::kInvalidated:
-        os << "Invalidated";
-        break;
-      default:
-        os << "??? " << static_cast<int>(cell_type);
-        break;
-    }
-  } else {
-    switch (cell_type) {
-      case PropertyCellType::kUndefined:
-        os << "Undefined";
-        break;
-      case PropertyCellType::kConstant:
-        os << "Constant";
-        break;
-      case PropertyCellType::kConstantType:
-        os << "ConstantType"
-           << " (";
-        switch (GetConstantType()) {
-          case PropertyCellConstantType::kSmi:
-            os << "Smi";
-            break;
-          case PropertyCellConstantType::kStableMap:
-            os << "StableMap";
-            break;
-        }
-        os << ")";
-        break;
-      case PropertyCellType::kMutable:
-        os << "Mutable";
-        break;
-    }
-  }
+  os << "\n - cell_type: " << cell_type;
   os << "\n";
 }
 
@@ -1552,11 +1660,13 @@ void Module::ModulePrint(std::ostream& os) {  // NOLINT
 void SourceTextModule::SourceTextModulePrint(std::ostream& os) {  // NOLINT
   PrintHeader(os, "SourceTextModule");
   PrintModuleFields(*this, os);
-  os << "\n - origin: " << Brief(script().GetNameOrSourceURL());
-  os << "\n - code: " << Brief(code());
+  os << "\n - sfi/code/info: " << Brief(code());
+  Script script = GetScript();
+  os << "\n - script: " << Brief(script);
+  os << "\n - origin: " << Brief(script.GetNameOrSourceURL());
   os << "\n - requested_modules: " << Brief(requested_modules());
-  os << "\n - script: " << Brief(script());
   os << "\n - import_meta: " << Brief(import_meta());
+  os << "\n - cycle_root: " << Brief(cycle_root());
   os << "\n";
 }
 
@@ -1564,6 +1674,7 @@ void SyntheticModule::SyntheticModulePrint(std::ostream& os) {  // NOLINT
   PrintHeader(os, "SyntheticModule");
   PrintModuleFields(*this, os);
   os << "\n - export_names: " << Brief(export_names());
+  os << "\n - name: " << Brief(name());
   os << "\n";
 }
 
@@ -1643,7 +1754,7 @@ void WasmStruct::WasmStructPrint(std::ostream& os) {  // NOLINT
       case wasm::ValueType::kRtt:
       case wasm::ValueType::kBottom:
       case wasm::ValueType::kStmt:
-        UNIMPLEMENTED();  // TODO(7748): Implement.
+        os << "UNIMPLEMENTED";  // TODO(7748): Implement.
         break;
     }
   }
@@ -1682,7 +1793,8 @@ void WasmArray::WasmArrayPrint(std::ostream& os) {  // NOLINT
     case wasm::ValueType::kRtt:
     case wasm::ValueType::kBottom:
     case wasm::ValueType::kStmt:
-      UNIMPLEMENTED();  // TODO(7748): Implement.
+      os << "\n   Printing elements of this type is unimplemented, sorry";
+      // TODO(7748): Implement.
       break;
   }
   os << "\n";
@@ -1941,6 +2053,7 @@ void Script::ScriptPrint(std::ostream& os) {  // NOLINT
   PrintHeader(os, "Script");
   os << "\n - source: " << Brief(source());
   os << "\n - name: " << Brief(name());
+  os << "\n - source_url: " << Brief(source_url());
   os << "\n - line_offset: " << line_offset();
   os << "\n - column_offset: " << column_offset();
   os << "\n - type: " << type();
@@ -2228,23 +2341,6 @@ void PreparseData::PreparseDataPrint(std::ostream& os) {  // NOLINT
   os << "\n";
 }
 
-void UncompiledDataWithoutPreparseData::UncompiledDataWithoutPreparseDataPrint(
-    std::ostream& os) {  // NOLINT
-  PrintHeader(os, "UncompiledDataWithoutPreparseData");
-  os << "\n - start position: " << start_position();
-  os << "\n - end position: " << end_position();
-  os << "\n";
-}
-
-void UncompiledDataWithPreparseData::UncompiledDataWithPreparseDataPrint(
-    std::ostream& os) {  // NOLINT
-  PrintHeader(os, "UncompiledDataWithPreparseData");
-  os << "\n - start position: " << start_position();
-  os << "\n - end position: " << end_position();
-  os << "\n - preparse_data: " << Brief(preparse_data());
-  os << "\n";
-}
-
 void InterpreterData::InterpreterDataPrint(std::ostream& os) {  // NOLINT
   PrintHeader(os, "InterpreterData");
   os << "\n - bytecode_array: " << Brief(bytecode_array());
@@ -2335,7 +2431,7 @@ int Name::NameShortPrint(Vector<char> str) {
 }
 
 void Map::PrintMapDetails(std::ostream& os) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   this->MapPrint(os);
   instance_descriptors(kRelaxedLoad).PrintDescriptors(os);
 }
@@ -2401,7 +2497,7 @@ void Map::MapPrint(std::ostream& os) {  // NOLINT
   // the isolate to iterate over the transitions.
   if (!IsReadOnlyHeapObject(*this)) {
     Isolate* isolate = GetIsolateFromWritableObject(*this);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     TransitionsAccessor transitions(isolate, *this, &no_gc);
     int nof_transitions = transitions.NumberOfTransitions();
     if (nof_transitions > 0) {
@@ -2546,13 +2642,13 @@ void TransitionsAccessor::PrintTransitions(std::ostream& os) {  // NOLINT
 void TransitionsAccessor::PrintTransitionTree() {
   StdoutStream os;
   os << "map= " << Brief(map_);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   PrintTransitionTree(os, 0, &no_gc);
   os << "\n" << std::flush;
 }
 
-void TransitionsAccessor::PrintTransitionTree(std::ostream& os, int level,
-                                              DisallowHeapAllocation* no_gc) {
+void TransitionsAccessor::PrintTransitionTree(
+    std::ostream& os, int level, DisallowGarbageCollection* no_gc) {
   ReadOnlyRoots roots = ReadOnlyRoots(isolate_);
   int num_transitions = NumberOfTransitions();
   if (num_transitions == 0) return;
@@ -2595,7 +2691,7 @@ void TransitionsAccessor::PrintTransitionTree(std::ostream& os, int level,
 }
 
 void JSObject::PrintTransitions(std::ostream& os) {  // NOLINT
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   TransitionsAccessor ta(GetIsolate(), map(), &no_gc);
   if (ta.NumberOfTransitions() == 0) return;
   os << "\n - transitions";
@@ -2695,7 +2791,7 @@ V8_EXPORT_PRIVATE extern void _v8_internal_Print_TransitionTree(void* object) {
     printf("Please provide a valid Map\n");
   } else {
 #if defined(DEBUG) || defined(OBJECT_PRINT)
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     i::Map map = i::Map::unchecked_cast(o);
     i::TransitionsAccessor transitions(i::Isolate::Current(), map, &no_gc);
     transitions.PrintTransitionTree();
diff --git a/deps/v8/src/diagnostics/perf-jit.cc b/deps/v8/src/diagnostics/perf-jit.cc
index 4b83325f1a8902..822e690bb00afa 100644
--- a/deps/v8/src/diagnostics/perf-jit.cc
+++ b/deps/v8/src/diagnostics/perf-jit.cc
@@ -33,8 +33,10 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <unistd.h>
+
 #include <memory>
 
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler.h"
 #include "src/codegen/source-position-table.h"
 #include "src/diagnostics/eh-frame.h"
@@ -109,6 +111,8 @@ const char PerfJitLogger::kFilenameFormatString[] = "./jit-%d.dump";
 // Extra padding for the PID in the filename
 const int PerfJitLogger::kFilenameBufferPadding = 16;
 
+static const char kStringTerminator[] = "\0";
+
 base::LazyRecursiveMutex PerfJitLogger::file_mutex_;
 // The following static variables are protected by PerfJitLogger::file_mutex_.
 uint64_t PerfJitLogger::reference_count_ = 0;
@@ -145,7 +149,7 @@ void PerfJitLogger::OpenJitDumpFile() {
 
 void PerfJitLogger::CloseJitDumpFile() {
   if (perf_output_handle_ == nullptr) return;
-  fclose(perf_output_handle_);
+  base::Fclose(perf_output_handle_);
   perf_output_handle_ = nullptr;
 }
 
@@ -222,7 +226,7 @@ void PerfJitLogger::LogRecordedBuffer(
 
   // Debug info has to be emitted first.
   Handle<SharedFunctionInfo> shared;
-  if (FLAG_perf_prof && !maybe_shared.ToHandle(&shared)) {
+  if (FLAG_perf_prof && maybe_shared.ToHandle(&shared)) {
     // TODO(herhut): This currently breaks for js2wasm/wasm2js functions.
     if (code->kind() != CodeKind::JS_TO_WASM_FUNCTION &&
         code->kind() != CodeKind::WASM_TO_JS_FUNCTION) {
@@ -257,8 +261,6 @@ void PerfJitLogger::LogRecordedBuffer(const wasm::WasmCode* code,
 void PerfJitLogger::WriteJitCodeLoadEntry(const uint8_t* code_pointer,
                                           uint32_t code_size, const char* name,
                                           int name_length) {
-  static const char string_terminator[] = "\0";
-
   PerfJitCodeLoad code_load;
   code_load.event_ = PerfJitCodeLoad::kLoad;
   code_load.size_ = sizeof(code_load) + name_length + 1 + code_size;
@@ -275,7 +277,7 @@ void PerfJitLogger::WriteJitCodeLoadEntry(const uint8_t* code_pointer,
 
   LogWriteBytes(reinterpret_cast<const char*>(&code_load), sizeof(code_load));
   LogWriteBytes(name, name_length);
-  LogWriteBytes(string_terminator, 1);
+  LogWriteBytes(kStringTerminator, 1);
   LogWriteBytes(reinterpret_cast<const char*>(code_pointer), code_size);
 }
 
@@ -301,7 +303,7 @@ size_t GetScriptNameLength(const SourcePositionInfo& info) {
 
 Vector<const char> GetScriptName(const SourcePositionInfo& info,
                                  std::unique_ptr<char[]>* storage,
-                                 const DisallowHeapAllocation& no_gc) {
+                                 const DisallowGarbageCollection& no_gc) {
   if (!info.script.is_null()) {
     Object name_or_url = info.script->GetNameOrSourceURL();
     if (name_or_url.IsSeqOneByteString()) {
@@ -322,7 +324,7 @@ SourcePositionInfo GetSourcePositionInfo(Handle<Code> code,
                                          Handle<SharedFunctionInfo> function,
                                          SourcePosition pos) {
   if (code->is_turbofanned()) {
-    DisallowHeapAllocation disallow;
+    DisallowGarbageCollection disallow;
     return pos.InliningStack(code)[0];
   } else {
     return SourcePositionInfo(pos, function);
@@ -382,11 +384,12 @@ void PerfJitLogger::LogWriteDebugInfo(Handle<Code> code,
     entry.column_ = info.column + 1;
     LogWriteBytes(reinterpret_cast<const char*>(&entry), sizeof(entry));
     // The extracted name may point into heap-objects, thus disallow GC.
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     std::unique_ptr<char[]> name_storage;
     Vector<const char> name_string = GetScriptName(info, &name_storage, no_gc);
     LogWriteBytes(name_string.begin(),
-                  static_cast<uint32_t>(name_string.size()) + 1);
+                  static_cast<uint32_t>(name_string.size()));
+    LogWriteBytes(kStringTerminator, 1);
   }
   char padding_bytes[8] = {0};
   LogWriteBytes(padding_bytes, padding);
@@ -451,8 +454,8 @@ void PerfJitLogger::LogWriteDebugInfo(const wasm::WasmCode* code) {
     entry.column_ = 1;
     LogWriteBytes(reinterpret_cast<const char*>(&entry), sizeof(entry));
     std::string name_string = source_map->GetFilename(offset);
-    LogWriteBytes(name_string.c_str(),
-                  static_cast<int>(name_string.size() + 1));
+    LogWriteBytes(name_string.c_str(), static_cast<int>(name_string.size()));
+    LogWriteBytes(kStringTerminator, 1);
   }
 
   char padding_bytes[8] = {0};
diff --git a/deps/v8/src/diagnostics/ppc/disasm-ppc.cc b/deps/v8/src/diagnostics/ppc/disasm-ppc.cc
index 354fc411c4dc3b..37f8ddc0407a06 100644
--- a/deps/v8/src/diagnostics/ppc/disasm-ppc.cc
+++ b/deps/v8/src/diagnostics/ppc/disasm-ppc.cc
@@ -52,6 +52,9 @@ class Decoder {
 
   ~Decoder() {}
 
+  Decoder(const Decoder&) = delete;
+  Decoder& operator=(const Decoder&) = delete;
+
   // Writes one disassembled instruction into 'buffer' (0-terminated).
   // Returns the length of the disassembled machine instruction in bytes.
   int InstructionDecode(byte* instruction);
@@ -64,8 +67,11 @@ class Decoder {
   // Printing of common values.
   void PrintRegister(int reg);
   void PrintDRegister(int reg);
+  void PrintVectorRegister(int reg);
   int FormatFPRegister(Instruction* instr, const char* format);
+  int FormatVectorRegister(Instruction* instr, const char* format);
   void PrintSoftwareInterrupt(SoftwareInterruptCodes svc);
+  const char* NameOfVectorRegister(int reg) const;
 
   // Handle formatting of instructions and their options.
   int FormatRegister(Instruction* instr, const char* option);
@@ -85,8 +91,6 @@ class Decoder {
   const disasm::NameConverter& converter_;
   Vector<char> out_buffer_;
   int out_buffer_pos_;
-
-  DISALLOW_COPY_AND_ASSIGN(Decoder);
 };
 
 // Support for assertions in the Decoder formatting functions.
@@ -116,6 +120,11 @@ void Decoder::PrintDRegister(int reg) {
   Print(RegisterName(DoubleRegister::from_code(reg)));
 }
 
+// Print the Simd128 register name according to the active name converter.
+void Decoder::PrintVectorRegister(int reg) {
+  Print(RegisterName(Simd128Register::from_code(reg)));
+}
+
 // Print SoftwareInterrupt codes. Factoring this out reduces the complexity of
 // the FormatOption method.
 void Decoder::PrintSoftwareInterrupt(SoftwareInterruptCodes svc) {
@@ -162,11 +171,11 @@ int Decoder::FormatRegister(Instruction* instr, const char* format) {
 // Handle all FP register based formatting in this function to reduce the
 // complexity of FormatOption.
 int Decoder::FormatFPRegister(Instruction* instr, const char* format) {
-  DCHECK_EQ(format[0], 'D');
+  DCHECK(format[0] == 'D' || format[0] == 'X');
 
   int retval = 2;
   int reg = -1;
-  if (format[1] == 't') {
+  if (format[1] == 't' || format[1] == 's') {
     reg = instr->RTValue();
   } else if (format[1] == 'a') {
     reg = instr->RAValue();
@@ -183,6 +192,26 @@ int Decoder::FormatFPRegister(Instruction* instr, const char* format) {
   return retval;
 }
 
+int Decoder::FormatVectorRegister(Instruction* instr, const char* format) {
+  int retval = 2;
+  int reg = -1;
+  if (format[1] == 't' || format[1] == 's') {
+    reg = instr->RTValue();
+  } else if (format[1] == 'a') {
+    reg = instr->RAValue();
+  } else if (format[1] == 'b') {
+    reg = instr->RBValue();
+  } else if (format[1] == 'c') {
+    reg = instr->RCValue();
+  } else {
+    UNREACHABLE();
+  }
+
+  PrintVectorRegister(reg);
+
+  return retval;
+}
+
 // FormatOption takes a formatting string and interprets it based on
 // the current instructions. The format string points to the first
 // character of the option string (the option escape has already been
@@ -210,11 +239,27 @@ int Decoder::FormatOption(Instruction* instr, const char* format) {
     case 'D': {
       return FormatFPRegister(instr, format);
     }
+    case 'X': {
+      // Check the TX/SX value, if set then it's a Vector register.
+      if (instr->Bit(0) == 1) {
+        return FormatVectorRegister(instr, format);
+      }
+      // Double (VSX) register.
+      return FormatFPRegister(instr, format);
+    }
+    case 'V': {
+      return FormatVectorRegister(instr, format);
+    }
     case 'i': {  // int16
       int32_t value = (instr->Bits(15, 0) << 16) >> 16;
       out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_, "%d", value);
       return 5;
     }
+    case 'I': {  // IMM8
+      int8_t value = instr->Bits(18, 11);
+      out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_, "%d", value);
+      return 4;
+    }
     case 'u': {  // uint16
       int32_t value = instr->Bits(15, 0);
       out_buffer_pos_ += SNPrintF(out_buffer_ + out_buffer_pos_, "%d", value);
@@ -360,104 +405,36 @@ void Decoder::UnknownFormat(Instruction* instr, const char* name) {
 void Decoder::DecodeExt0(Instruction* instr) {
   // Some encodings are 5-0 bits, handle those first
   switch (EXT0 | (instr->BitField(5, 0))) {
-    case VPERM: {
-      Format(instr, "vperm   'Dt, 'Da, 'Db, 'Dc");
-      return;
-    }
-    case VMLADDUHM: {
-      Format(instr, "vmladduhm 'Dt, 'Da, 'Db, 'Dc");
-      return;
-    }
+#define DECODE_VA_A_FORM__INSTRUCTIONS(name, opcode_name, opcode_value) \
+  case opcode_name: {                                                   \
+    Format(instr, #name " 'Vt, 'Va, 'Vb, 'Vc");                         \
+    return;                                                             \
+  }
+    PPC_VA_OPCODE_A_FORM_LIST(DECODE_VA_A_FORM__INSTRUCTIONS)
+#undef DECODE_VA_A_FORM__INSTRUCTIONS
   }
   switch (EXT0 | (instr->BitField(10, 0))) {
-    case VSPLTB: {
-      Format(instr, "vspltb  'Dt, 'Db, 'UIM");
-      break;
-    }
-    case VSPLTW: {
-      Format(instr, "vspltw  'Dt, 'Db, 'UIM");
-      break;
-    }
-    case VSPLTH: {
-      Format(instr, "vsplth  'Dt, 'Db, 'UIM");
-      break;
-    }
-    case VSRO: {
-      Format(instr, "vsro    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VOR: {
-      Format(instr, "vor     'Dt, 'Da, 'Db");
-      break;
-    }
-    case VXOR: {
-      Format(instr, "vxor    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VNOR: {
-      Format(instr, "vnor    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VSLO: {
-      Format(instr, "vslo    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VADDUDM: {
-      Format(instr, "vaddudm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VADDUWM: {
-      Format(instr, "vadduwm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VADDUHM: {
-      Format(instr, "vadduhm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VADDUBM: {
-      Format(instr, "vaddubm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VADDFP: {
-      Format(instr, "vaddfp    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VSUBFP: {
-      Format(instr, "vsubfp    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VSUBUDM: {
-      Format(instr, "vsubudm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VSUBUWM: {
-      Format(instr, "vsubuwm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VSUBUHM: {
-      Format(instr, "vsubuhm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VSUBUBM: {
-      Format(instr, "vsububm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VMULUWM: {
-      Format(instr, "vmuluwm    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VPKUHUM: {
-      Format(instr, "vpkuhum    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VMULEUB: {
-      Format(instr, "vmuleub    'Dt, 'Da, 'Db");
-      break;
-    }
-    case VMULOUB: {
-      Format(instr, "vmuloub    'Dt, 'Da, 'Db");
-      break;
-    }
+#define DECODE_VX_A_FORM__INSTRUCTIONS(name, opcode_name, opcode_value) \
+  case opcode_name: {                                                   \
+    Format(instr, #name " 'Vt, 'Vb, 'UIM");                             \
+    return;                                                             \
+  }
+    PPC_VX_OPCODE_A_FORM_LIST(DECODE_VX_A_FORM__INSTRUCTIONS)
+#undef DECODE_VX_A_FORM__INSTRUCTIONS
+#define DECODE_VX_B_FORM__INSTRUCTIONS(name, opcode_name, opcode_value) \
+  case opcode_name: {                                                   \
+    Format(instr, #name " 'Vt, 'Va, 'Vb");                              \
+    return;                                                             \
+  }
+    PPC_VX_OPCODE_B_FORM_LIST(DECODE_VX_B_FORM__INSTRUCTIONS)
+#undef DECODE_VX_B_FORM__INSTRUCTIONS
+#define DECODE_VX_C_FORM__INSTRUCTIONS(name, opcode_name, opcode_value) \
+  case opcode_name: {                                                   \
+    Format(instr, #name " 'Vt, 'Vb");                                   \
+    return;                                                             \
+  }
+    PPC_VX_OPCODE_C_FORM_LIST(DECODE_VX_C_FORM__INSTRUCTIONS)
+#undef DECODE_VX_C_FORM__INSTRUCTIONS
   }
 }
 
@@ -635,19 +612,51 @@ void Decoder::DecodeExt2(Instruction* instr) {
   // Some encodings are 10-1 bits, handle those first
   switch (EXT2 | (instr->BitField(10, 1))) {
     case LVX: {
-      Format(instr, "lvx     'Dt, 'ra, 'rb");
+      Format(instr, "lvx     'Vt, 'ra, 'rb");
       return;
     }
     case STVX: {
-      Format(instr, "stvx    'Dt, 'ra, 'rb");
+      Format(instr, "stvx    'Vs, 'ra, 'rb");
       return;
     }
     case LXVD: {
-      Format(instr, "lxvd    'Dt, 'ra, 'rb");
+      Format(instr, "lxvd    'Xt, 'ra, 'rb");
+      return;
+    }
+    case LXSDX: {
+      Format(instr, "lxsdx    'Xt, 'ra, 'rb");
+      return;
+    }
+    case LXSIBZX: {
+      Format(instr, "lxsibzx  'Xt, 'ra, 'rb");
+      return;
+    }
+    case LXSIHZX: {
+      Format(instr, "lxsihzx  'Xt, 'ra, 'rb");
+      return;
+    }
+    case LXSIWZX: {
+      Format(instr, "lxsiwzx  'Xt, 'ra, 'rb");
       return;
     }
     case STXVD: {
-      Format(instr, "stxvd   'Dt, 'ra, 'rb");
+      Format(instr, "stxvd   'Xs, 'ra, 'rb");
+      return;
+    }
+    case STXSDX: {
+      Format(instr, "stxsdx  'Xs, 'ra, 'rb");
+      return;
+    }
+    case STXSIBX: {
+      Format(instr, "stxsibx 'Xs, 'ra, 'rb");
+      return;
+    }
+    case STXSIHX: {
+      Format(instr, "stxsihx 'Xs, 'ra, 'rb");
+      return;
+    }
+    case STXSIWX: {
+      Format(instr, "stxsiwx 'Xs, 'ra, 'rb");
       return;
     }
     case SRWX: {
@@ -1024,7 +1033,7 @@ void Decoder::DecodeExt2(Instruction* instr) {
       return;
     }
     case MFVSRD: {
-      Format(instr, "mffprd  'ra, 'Dt");
+      Format(instr, "mfvsrd  'ra, 'Xs");
       return;
     }
     case MFVSRWZ: {
@@ -1032,7 +1041,7 @@ void Decoder::DecodeExt2(Instruction* instr) {
       return;
     }
     case MTVSRD: {
-      Format(instr, "mtfprd  'Dt, 'ra");
+      Format(instr, "mtvsrd  'Xt, 'ra");
       return;
     }
     case MTVSRWA: {
@@ -1043,6 +1052,10 @@ void Decoder::DecodeExt2(Instruction* instr) {
       Format(instr, "mtfprwz 'Dt, 'ra");
       return;
     }
+    case MTVSRDD: {
+      Format(instr, "mtvsrwz 'Xt, 'ra");
+      return;
+    }
 #endif
   }
 
@@ -1241,24 +1254,30 @@ void Decoder::DecodeExt5(Instruction* instr) {
 }
 
 void Decoder::DecodeExt6(Instruction* instr) {
+  switch (EXT6 | (instr->BitField(10, 1))) {
+    case XXSPLTIB: {
+      Format(instr, "xxspltib  'Xt, 'IMM8");
+      return;
+    }
+  }
   switch (EXT6 | (instr->BitField(10, 3))) {
 #define DECODE_XX3_INSTRUCTIONS(name, opcode_name, opcode_value) \
   case opcode_name: {                                            \
-    Format(instr, #name " 'Dt, 'Da, 'Db");                       \
+    Format(instr, #name " 'Xt, 'Xa, 'Xb");                       \
     return;                                                      \
   }
     PPC_XX3_OPCODE_LIST(DECODE_XX3_INSTRUCTIONS)
 #undef DECODE_XX3_INSTRUCTIONS
   }
   switch (EXT6 | (instr->BitField(10, 2))) {
-#define DECODE_XX2_INSTRUCTIONS(name, opcode_name, opcode_value) \
-  case opcode_name: {                                            \
-    Format(instr, #name " 'Dt, 'Db");                            \
-    return;                                                      \
+#define DECODE_XX2_A_INSTRUCTIONS(name, opcode_name, opcode_value) \
+  case opcode_name: {                                              \
+    Format(instr, #name " 'Xt, 'Xb");                              \
+    return;                                                        \
   }
-    PPC_XX2_OPCODE_LIST(DECODE_XX2_INSTRUCTIONS)
+    PPC_XX2_OPCODE_A_FORM_LIST(DECODE_XX2_A_INSTRUCTIONS)
   }
-#undef DECODE_XX2_INSTRUCTIONS
+#undef DECODE_XX2_A_INSTRUCTIONS
   Unknown(instr);  // not used by V8
 }
 
diff --git a/deps/v8/src/diagnostics/s390/disasm-s390.cc b/deps/v8/src/diagnostics/s390/disasm-s390.cc
index 5bb771fc37c006..15d86b94b3a414 100644
--- a/deps/v8/src/diagnostics/s390/disasm-s390.cc
+++ b/deps/v8/src/diagnostics/s390/disasm-s390.cc
@@ -52,6 +52,9 @@ class Decoder {
 
   ~Decoder() {}
 
+  Decoder(const Decoder&) = delete;
+  Decoder& operator=(const Decoder&) = delete;
+
   // Writes one disassembled instruction into 'buffer' (0-terminated).
   // Returns the length of the disassembled machine instruction in bytes.
   int InstructionDecode(byte* instruction);
@@ -83,8 +86,6 @@ class Decoder {
   const disasm::NameConverter& converter_;
   Vector<char> out_buffer_;
   int out_buffer_pos_;
-
-  DISALLOW_COPY_AND_ASSIGN(Decoder);
 };
 
 // Support for assertions in the Decoder formatting functions.
diff --git a/deps/v8/src/diagnostics/unwinding-info-win64.cc b/deps/v8/src/diagnostics/unwinding-info-win64.cc
index c39adcf7108289..9a5f7069e75ace 100644
--- a/deps/v8/src/diagnostics/unwinding-info-win64.cc
+++ b/deps/v8/src/diagnostics/unwinding-info-win64.cc
@@ -10,43 +10,13 @@
 #if defined(V8_OS_WIN_X64)
 #include "src/codegen/x64/assembler-x64.h"
 #elif defined(V8_OS_WIN_ARM64)
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/arm64/assembler-arm64-inl.h"
 #include "src/codegen/arm64/macro-assembler-arm64-inl.h"
 #else
 #error "Unsupported OS"
 #endif  // V8_OS_WIN_X64
 
-// Forward declaration to keep this independent of Win8
-NTSYSAPI
-DWORD
-NTAPI
-RtlAddGrowableFunctionTable(
-    _Out_ PVOID* DynamicTable,
-    _In_reads_(MaximumEntryCount) PRUNTIME_FUNCTION FunctionTable,
-    _In_ DWORD EntryCount,
-    _In_ DWORD MaximumEntryCount,
-    _In_ ULONG_PTR RangeBase,
-    _In_ ULONG_PTR RangeEnd
-    );
-
-
-NTSYSAPI
-void
-NTAPI
-RtlGrowFunctionTable(
-    _Inout_ PVOID DynamicTable,
-    _In_ DWORD NewEntryCount
-    );
-
-
-NTSYSAPI
-void
-NTAPI
-RtlDeleteGrowableFunctionTable(
-    _In_ PVOID DynamicTable
-    );
-
-
 namespace v8 {
 namespace internal {
 namespace win64_unwindinfo {
@@ -201,8 +171,8 @@ void InitUnwindingRecord(Record* record, size_t code_size_in_bytes) {
   masm.movq(rax, reinterpret_cast<uint64_t>(&CRASH_HANDLER_FUNCTION_NAME));
   masm.jmp(rax);
   DCHECK_LE(masm.instruction_size(), sizeof(record->exception_thunk));
-  memcpy(&record->exception_thunk[0], masm.buffer_start(),
-         masm.instruction_size());
+  base::Memcpy(&record->exception_thunk[0], masm.buffer_start(),
+               masm.instruction_size());
 }
 
 #elif defined(V8_OS_WIN_ARM64)
@@ -479,8 +449,8 @@ void InitUnwindingRecord(Record* record, size_t code_size_in_bytes) {
            Operand(reinterpret_cast<uint64_t>(&CRASH_HANDLER_FUNCTION_NAME)));
   masm.Br(x16);
   DCHECK_LE(masm.instruction_size(), sizeof(record->exception_thunk));
-  memcpy(&record->exception_thunk[0], masm.buffer_start(),
-         masm.instruction_size());
+  base::Memcpy(&record->exception_thunk[0], masm.buffer_start(),
+               masm.instruction_size());
 }
 
 #endif  // V8_OS_WIN_X64
diff --git a/deps/v8/src/diagnostics/x64/disasm-x64.cc b/deps/v8/src/diagnostics/x64/disasm-x64.cc
index 7ae330c3eac667..25b16df6dfb2b9 100644
--- a/deps/v8/src/diagnostics/x64/disasm-x64.cc
+++ b/deps/v8/src/diagnostics/x64/disasm-x64.cc
@@ -243,6 +243,9 @@ static const InstructionDesc cmov_instructions[16] = {
     {"cmovle", TWO_OPERANDS_INSTR, REG_OPER_OP_ORDER, false},
     {"cmovg", TWO_OPERANDS_INSTR, REG_OPER_OP_ORDER, false}};
 
+static const char* const cmp_pseudo_op[8] = {"eq",  "lt",  "le",  "unord",
+                                             "neq", "nlt", "nle", "ord"};
+
 namespace {
 int8_t Imm8(const uint8_t* data) {
   return *reinterpret_cast<const int8_t*>(data);
@@ -968,6 +971,14 @@ int DisassemblerX64::AVXInstruction(byte* data) {
         SSE4_UNOP_INSTRUCTION_LIST(DECLARE_SSE_UNOP_AVX_DIS_CASE)
 #undef DECLARE_SSE_UNOP_AVX_DIS_CASE
 
+#define DISASSEMBLE_AVX2_BROADCAST(instruction, _1, _2, _3, code)     \
+  case 0x##code:                                                      \
+    AppendToBuffer("" #instruction " %s,", NameOfXMMRegister(regop)); \
+    current += PrintRightXMMOperand(current);                         \
+    break;
+        AVX2_BROADCAST_LIST(DISASSEMBLE_AVX2_BROADCAST)
+#undef DISASSEMBLE_AVX2_BROADCAST
+
       default:
         UnimplementedInstruction();
     }
@@ -1090,6 +1101,10 @@ int DisassemblerX64::AVXInstruction(byte* data) {
         }
         AppendToBuffer(",%s", NameOfXMMRegister(regop));
         break;
+      case 0x16:
+        AppendToBuffer("vmovshdup %s,", NameOfXMMRegister(regop));
+        current += PrintRightXMMOperand(current);
+        break;
       case 0x2A:
         AppendToBuffer("%s %s,%s,", vex_w() ? "vcvtqsi2ss" : "vcvtlsi2ss",
                        NameOfXMMRegister(regop), NameOfXMMRegister(vvvv));
@@ -1378,9 +1393,15 @@ int DisassemblerX64::AVXInstruction(byte* data) {
         AppendToBuffer(",%s", NameOfXMMRegister(regop));
         break;
       case 0x12:
-        AppendToBuffer("vmovlps %s,%s,", NameOfXMMRegister(regop),
-                       NameOfXMMRegister(vvvv));
-        current += PrintRightXMMOperand(current);
+        if (mod == 0b11) {
+          AppendToBuffer("vmovhlps %s,%s,", NameOfXMMRegister(regop),
+                         NameOfXMMRegister(vvvv));
+          current += PrintRightXMMOperand(current);
+        } else {
+          AppendToBuffer("vmovlps %s,%s,", NameOfXMMRegister(regop),
+                         NameOfXMMRegister(vvvv));
+          current += PrintRightXMMOperand(current);
+        }
         break;
       case 0x13:
         AppendToBuffer("vmovlps ");
@@ -1463,9 +1484,7 @@ int DisassemblerX64::AVXInstruction(byte* data) {
         AppendToBuffer("vcmpps %s,%s,", NameOfXMMRegister(regop),
                        NameOfXMMRegister(vvvv));
         current += PrintRightXMMOperand(current);
-        const char* const pseudo_op[] = {"eq",  "lt",  "le",  "unord",
-                                         "neq", "nlt", "nle", "ord"};
-        AppendToBuffer(", (%s)", pseudo_op[*current]);
+        AppendToBuffer(", (%s)", cmp_pseudo_op[*current]);
         current += 1;
         break;
       }
@@ -1501,10 +1520,6 @@ int DisassemblerX64::AVXInstruction(byte* data) {
         current += PrintRightXMMOperand(current);
         AppendToBuffer(",%s", NameOfXMMRegister(regop));
         break;
-      case 0x2E:
-        AppendToBuffer("vucomisd %s,", NameOfXMMRegister(regop));
-        current += PrintRightXMMOperand(current);
-        break;
       case 0x50:
         AppendToBuffer("vmovmskpd %s,", NameOfCPURegister(regop));
         current += PrintRightXMMOperand(current);
@@ -1514,6 +1529,10 @@ int DisassemblerX64::AVXInstruction(byte* data) {
                        NameOfXMMRegister(regop));
         current += PrintRightOperand(current);
         break;
+      case 0x6F:
+        AppendToBuffer("vmovdqa %s,", NameOfXMMRegister(regop));
+        current += PrintRightXMMOperand(current);
+        break;
       case 0x70:
         AppendToBuffer("vpshufd %s,", NameOfXMMRegister(regop));
         current += PrintRightXMMOperand(current);
@@ -1546,9 +1565,7 @@ int DisassemblerX64::AVXInstruction(byte* data) {
         AppendToBuffer("vcmppd %s,%s,", NameOfXMMRegister(regop),
                        NameOfXMMRegister(vvvv));
         current += PrintRightXMMOperand(current);
-        const char* const pseudo_op[] = {"eq",  "lt",  "le",  "unord",
-                                         "neq", "nlt", "nle", "ord"};
-        AppendToBuffer(", (%s)", pseudo_op[*current]);
+        AppendToBuffer(", (%s)", cmp_pseudo_op[*current]);
         current += 1;
         break;
       }
@@ -1904,13 +1921,13 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
     } else if (opcode == 0x29) {
       current += PrintOperands("movapd", XMMOPER_XMMREG_OP_ORDER, current);
     } else if (opcode == 0x6E) {
-      current += PrintOperands(rex_w() ? "movq" : "movd",
-                               XMMREG_XMMOPER_OP_ORDER, current);
+      current += PrintOperands(rex_w() ? "movq" : "movd", XMMREG_OPER_OP_ORDER,
+                               current);
     } else if (opcode == 0x6F) {
       current += PrintOperands("movdqa", XMMREG_XMMOPER_OP_ORDER, current);
     } else if (opcode == 0x7E) {
-      current += PrintOperands(rex_w() ? "movq" : "movd",
-                               XMMOPER_XMMREG_OP_ORDER, current);
+      current += PrintOperands(rex_w() ? "movq" : "movd", OPER_XMMREG_OP_ORDER,
+                               current);
     } else if (opcode == 0x7F) {
       current += PrintOperands("movdqa", XMMOPER_XMMREG_OP_ORDER, current);
     } else if (opcode == 0xD6) {
@@ -1938,163 +1955,29 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
       current += 1;
     } else if (opcode == 0xB1) {
       current += PrintOperands("cmpxchg", OPER_REG_OP_ORDER, current);
+    } else if (opcode == 0xC2) {
+      AppendToBuffer("cmppd %s,", NameOfXMMRegister(regop));
+      current += PrintRightXMMOperand(current);
+      AppendToBuffer(", (%s)", cmp_pseudo_op[*current++]);
     } else if (opcode == 0xC4) {
       current += PrintOperands("pinsrw", XMMREG_OPER_OP_ORDER, current);
       AppendToBuffer(",0x%x", (*current++) & 7);
+    } else if (opcode == 0xD7) {
+      current += PrintOperands("pmovmskb", OPER_XMMREG_OP_ORDER, current);
     } else {
       const char* mnemonic;
-      if (opcode == 0x51) {
-        mnemonic = "sqrtpd";
-      } else if (opcode == 0x54) {
-        mnemonic = "andpd";
-      } else if (opcode == 0x55) {
-        mnemonic = "andnpd";
-      } else if (opcode == 0x56) {
-        mnemonic = "orpd";
-      } else if (opcode == 0x57) {
-        mnemonic = "xorpd";
-      } else if (opcode == 0x58) {
-        mnemonic = "addpd";
-      } else if (opcode == 0x59) {
-        mnemonic = "mulpd";
-      } else if (opcode == 0x5B) {
-        mnemonic = "cvtps2dq";
-      } else if (opcode == 0x5C) {
-        mnemonic = "subpd";
-      } else if (opcode == 0x5D) {
-        mnemonic = "minpd";
-      } else if (opcode == 0x5E) {
-        mnemonic = "divpd";
-      } else if (opcode == 0x5F) {
-        mnemonic = "maxpd";
-      } else if (opcode == 0x60) {
-        mnemonic = "punpcklbw";
-      } else if (opcode == 0x61) {
-        mnemonic = "punpcklwd";
-      } else if (opcode == 0x62) {
-        mnemonic = "punpckldq";
-      } else if (opcode == 0x63) {
-        mnemonic = "packsswb";
-      } else if (opcode == 0x64) {
-        mnemonic = "pcmpgtb";
-      } else if (opcode == 0x65) {
-        mnemonic = "pcmpgtw";
-      } else if (opcode == 0x66) {
-        mnemonic = "pcmpgtd";
-      } else if (opcode == 0x67) {
-        mnemonic = "packuswb";
-      } else if (opcode == 0x68) {
-        mnemonic = "punpckhbw";
-      } else if (opcode == 0x69) {
-        mnemonic = "punpckhwd";
-      } else if (opcode == 0x6A) {
-        mnemonic = "punpckhdq";
-      } else if (opcode == 0x6B) {
-        mnemonic = "packssdw";
-      } else if (opcode == 0x6C) {
-        mnemonic = "punpcklqdq";
-      } else if (opcode == 0x6D) {
-        mnemonic = "punpckhqdq";
-      } else if (opcode == 0x2E) {
-        mnemonic = "ucomisd";
-      } else if (opcode == 0x2F) {
-        mnemonic = "comisd";
-      } else if (opcode == 0x74) {
-        mnemonic = "pcmpeqb";
-      } else if (opcode == 0x75) {
-        mnemonic = "pcmpeqw";
-      } else if (opcode == 0x76) {
-        mnemonic = "pcmpeqd";
-      } else if (opcode == 0xC2) {
-        mnemonic = "cmppd";
-      } else if (opcode == 0xD1) {
-        mnemonic = "psrlw";
-      } else if (opcode == 0xD2) {
-        mnemonic = "psrld";
-      } else if (opcode == 0xD3) {
-        mnemonic = "psrlq";
-      } else if (opcode == 0xD4) {
-        mnemonic = "paddq";
-      } else if (opcode == 0xD5) {
-        mnemonic = "pmullw";
-      } else if (opcode == 0xD7) {
-        mnemonic = "pmovmskb";
-      } else if (opcode == 0xD8) {
-        mnemonic = "psubusb";
-      } else if (opcode == 0xD9) {
-        mnemonic = "psubusw";
-      } else if (opcode == 0xDA) {
-        mnemonic = "pminub";
-      } else if (opcode == 0xDB) {
-        mnemonic = "pand";
-      } else if (opcode == 0xDC) {
-        mnemonic = "paddusb";
-      } else if (opcode == 0xDD) {
-        mnemonic = "paddusw";
-      } else if (opcode == 0xDE) {
-        mnemonic = "pmaxub";
-      } else if (opcode == 0xE0) {
-        mnemonic = "pavgb";
-      } else if (opcode == 0xE1) {
-        mnemonic = "psraw";
-      } else if (opcode == 0xE2) {
-        mnemonic = "psrad";
-      } else if (opcode == 0xE3) {
-        mnemonic = "pavgw";
-      } else if (opcode == 0xE8) {
-        mnemonic = "psubsb";
-      } else if (opcode == 0xE9) {
-        mnemonic = "psubsw";
-      } else if (opcode == 0xEA) {
-        mnemonic = "pminsw";
-      } else if (opcode == 0xEB) {
-        mnemonic = "por";
-      } else if (opcode == 0xEC) {
-        mnemonic = "paddsb";
-      } else if (opcode == 0xED) {
-        mnemonic = "paddsw";
-      } else if (opcode == 0xEE) {
-        mnemonic = "pmaxsw";
-      } else if (opcode == 0xEF) {
-        mnemonic = "pxor";
-      } else if (opcode == 0xF1) {
-        mnemonic = "psllw";
-      } else if (opcode == 0xF2) {
-        mnemonic = "pslld";
-      } else if (opcode == 0xF3) {
-        mnemonic = "psllq";
-      } else if (opcode == 0xF4) {
-        mnemonic = "pmuludq";
-      } else if (opcode == 0xF5) {
-        mnemonic = "pmaddwd";
-      } else if (opcode == 0xF8) {
-        mnemonic = "psubb";
-      } else if (opcode == 0xF9) {
-        mnemonic = "psubw";
-      } else if (opcode == 0xFA) {
-        mnemonic = "psubd";
-      } else if (opcode == 0xFB) {
-        mnemonic = "psubq";
-      } else if (opcode == 0xFC) {
-        mnemonic = "paddb";
-      } else if (opcode == 0xFD) {
-        mnemonic = "paddw";
-      } else if (opcode == 0xFE) {
-        mnemonic = "paddd";
-      } else {
-        UnimplementedInstruction();
+#define SSE2_CASE(instruction, notUsed1, notUsed2, opcode) \
+  case 0x##opcode:                                         \
+    mnemonic = "" #instruction;                            \
+    break;
+
+      switch (opcode) {
+        SSE2_INSTRUCTION_LIST(SSE2_CASE)
+        SSE2_UNOP_INSTRUCTION_LIST(SSE2_CASE)
       }
-      // Not every opcode here has an XMM register as the dst operand.
-      const char* regop_reg =
-          opcode == 0xD7 ? NameOfCPURegister(regop) : NameOfXMMRegister(regop);
-      AppendToBuffer("%s %s,", mnemonic, regop_reg);
+#undef SSE2_CASE
+      AppendToBuffer("%s %s,", mnemonic, NameOfXMMRegister(regop));
       current += PrintRightXMMOperand(current);
-      if (opcode == 0xC2) {
-        const char* const pseudo_op[] = {"eq",  "lt",  "le",  "unord",
-                                         "neq", "nlt", "nle", "ord"};
-        AppendToBuffer(", (%s)", pseudo_op[*current]);
-        current += 1;
-      }
     }
   } else if (group_1_prefix_ == 0xF2) {
     // Beginning of instructions with prefix 0xF2.
@@ -2132,11 +2015,7 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
       current += PrintOperands("pshuflw", XMMREG_XMMOPER_OP_ORDER, current);
       AppendToBuffer(",%d", (*current++) & 7);
     } else if (opcode == 0xC2) {
-      // Intel manual 2A, Table 3-18.
-      const char* const pseudo_op[] = {"cmpeqsd",    "cmpltsd",  "cmplesd",
-                                       "cmpunordsd", "cmpneqsd", "cmpnltsd",
-                                       "cmpnlesd",   "cmpordsd"};
-      AppendToBuffer("%s %s,%s", pseudo_op[current[1]],
+      AppendToBuffer("cmp%ssd %s,%s", cmp_pseudo_op[current[1]],
                      NameOfXMMRegister(regop), NameOfXMMRegister(rm));
       current += 2;
     } else if (opcode == 0xF0) {
@@ -2153,6 +2032,8 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
       current += PrintOperands("movss", XMMREG_OPER_OP_ORDER, current);
     } else if (opcode == 0x11) {
       current += PrintOperands("movss", OPER_XMMREG_OP_ORDER, current);
+    } else if (opcode == 0x16) {
+      current += PrintOperands("movshdup", XMMREG_XMMOPER_OP_ORDER, current);
     } else if (opcode == 0x2A) {
       // CVTSI2SS: integer to XMM single conversion.
       current += PrintOperands(mnemonic, XMMREG_OPER_OP_ORDER, current);
@@ -2187,11 +2068,7 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
                      NameOfCPURegister(regop));
       current += PrintRightOperand(current);
     } else if (opcode == 0xC2) {
-      // Intel manual 2A, Table 3-18.
-      const char* const pseudo_op[] = {"cmpeqss",    "cmpltss",  "cmpless",
-                                       "cmpunordss", "cmpneqss", "cmpnltss",
-                                       "cmpnless",   "cmpordss"};
-      AppendToBuffer("%s %s,%s", pseudo_op[current[1]],
+      AppendToBuffer("cmp%sss %s,%s", cmp_pseudo_op[current[1]],
                      NameOfXMMRegister(regop), NameOfXMMRegister(rm));
       current += 2;
     } else {
@@ -2204,28 +2081,24 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
     // movups xmm/m128, xmm
     current += PrintOperands("movups", XMMOPER_XMMREG_OP_ORDER, current);
   } else if (opcode == 0x12) {
+    // movhlps xmm1, xmm2
     // movlps xmm1, m64
-    current += PrintOperands("movlps", XMMREG_OPER_OP_ORDER, current);
+    if (mod == 0b11) {
+      current += PrintOperands("movhlps", XMMREG_XMMOPER_OP_ORDER, current);
+    } else {
+      current += PrintOperands("movlps", XMMREG_OPER_OP_ORDER, current);
+    }
   } else if (opcode == 0x13) {
     // movlps m64, xmm1
-    AppendToBuffer("movlps ");
-    current += PrintRightXMMOperand(current);
-    AppendToBuffer(",%s", NameOfXMMRegister(regop));
+    current += PrintOperands("movlps", XMMOPER_XMMREG_OP_ORDER, current);
   } else if (opcode == 0x16) {
-    // movlhps xmm1, xmm2
-    // movhps xmm1, m64
     if (mod == 0b11) {
-      AppendToBuffer("movlhps ");
+      current += PrintOperands("movlhps", XMMREG_XMMOPER_OP_ORDER, current);
     } else {
-      AppendToBuffer("movhps ");
+      current += PrintOperands("movhps", XMMREG_XMMOPER_OP_ORDER, current);
     }
-    AppendToBuffer("%s,", NameOfXMMRegister(regop));
-    current += PrintRightXMMOperand(current);
   } else if (opcode == 0x17) {
-    // movhps m64, xmm1
-    AppendToBuffer("movhps ");
-    current += PrintRightXMMOperand(current);
-    AppendToBuffer(",%s", NameOfXMMRegister(regop));
+    current += PrintOperands("movhps", XMMOPER_XMMREG_OP_ORDER, current);
   } else if (opcode == 0x1F) {
     // NOP
     current++;
@@ -2240,19 +2113,11 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
     AppendToBuffer("nop");
 
   } else if (opcode == 0x28) {
-    // movaps xmm, xmm/m128
-    AppendToBuffer("movaps %s,", NameOfXMMRegister(regop));
-    current += PrintRightXMMOperand(current);
-
+    current += PrintOperands("movaps", XMMREG_XMMOPER_OP_ORDER, current);
   } else if (opcode == 0x29) {
-    // movaps xmm/m128, xmm
-    AppendToBuffer("movaps ");
-    current += PrintRightXMMOperand(current);
-    AppendToBuffer(",%s", NameOfXMMRegister(regop));
-
+    current += PrintOperands("movaps", XMMOPER_XMMREG_OP_ORDER, current);
   } else if (opcode == 0x2E) {
-    AppendToBuffer("ucomiss %s,", NameOfXMMRegister(regop));
-    current += PrintRightXMMOperand(current);
+    current += PrintOperands("ucomiss", XMMREG_XMMOPER_OP_ORDER, current);
   } else if (opcode == 0xA2) {
     // CPUID
     AppendToBuffer("%s", mnemonic);
@@ -2262,17 +2127,14 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
     const InstructionDesc& idesc = cmov_instructions[condition];
     byte_size_operand_ = idesc.byte_size_operation;
     current += PrintOperands(idesc.mnem, idesc.op_order_, current);
-
   } else if (opcode >= 0x51 && opcode <= 0x5F) {
     const char* const pseudo_op[] = {
         "sqrtps",   "rsqrtps", "rcpps", "andps", "andnps",
         "orps",     "xorps",   "addps", "mulps", "cvtps2pd",
         "cvtdq2ps", "subps",   "minps", "divps", "maxps",
     };
-    AppendToBuffer("%s %s,", pseudo_op[opcode - 0x51],
-                   NameOfXMMRegister(regop));
-    current += PrintRightXMMOperand(current);
-
+    current += PrintOperands(pseudo_op[opcode - 0x51], XMMREG_XMMOPER_OP_ORDER,
+                             current);
   } else if (opcode == 0xC0) {
     byte_size_operand_ = true;
     current += PrintOperands("xadd", OPER_REG_OP_ORDER, current);
@@ -2280,11 +2142,9 @@ int DisassemblerX64::TwoByteOpcodeInstruction(byte* data) {
     current += PrintOperands("xadd", OPER_REG_OP_ORDER, current);
   } else if (opcode == 0xC2) {
     // cmpps xmm, xmm/m128, imm8
-    const char* const pseudo_op[] = {"eq",  "lt",  "le",  "unord",
-                                     "neq", "nlt", "nle", "ord"};
     AppendToBuffer("cmpps %s, ", NameOfXMMRegister(regop));
     current += PrintRightXMMOperand(current);
-    AppendToBuffer(", %s", pseudo_op[*current]);
+    AppendToBuffer(", %s", cmp_pseudo_op[*current]);
     current += 1;
   } else if (opcode == 0xC6) {
     // shufps xmm, xmm/m128, imm8
@@ -2368,14 +2228,12 @@ int DisassemblerX64::ThreeByteOpcodeInstruction(byte* data) {
   if (second_byte == 0x38) {
     switch (third_byte) {
       case 0x10: {
-        AppendToBuffer("pblendvb %s,", NameOfXMMRegister(regop));
-        current += PrintRightXMMOperand(current);
+        current += PrintOperands("pblendvb", XMMREG_XMMOPER_OP_ORDER, current);
         AppendToBuffer(",<xmm0>");
         break;
       }
       case 0x14: {
-        AppendToBuffer("blendvps %s,", NameOfXMMRegister(regop));
-        current += PrintRightXMMOperand(current);
+        current += PrintOperands("blendvps", XMMREG_XMMOPER_OP_ORDER, current);
         AppendToBuffer(",<xmm0>");
         break;
       }
diff --git a/deps/v8/src/execution/arm/simulator-arm.cc b/deps/v8/src/execution/arm/simulator-arm.cc
index 3df283e2fd6d70..dc2dc7952d939d 100644
--- a/deps/v8/src/execution/arm/simulator-arm.cc
+++ b/deps/v8/src/execution/arm/simulator-arm.cc
@@ -4,16 +4,21 @@
 
 #include "src/execution/arm/simulator-arm.h"
 
+#include "src/base/logging.h"
+
 #if defined(USE_SIMULATOR)
 
 #include <stdarg.h>
 #include <stdlib.h>
+
 #include <cmath>
 
 #include "src/base/bits.h"
 #include "src/base/lazy-instance.h"
 #include "src/base/memory.h"
 #include "src/base/overflowing-math.h"
+#include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/arm/constants-arm.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
@@ -76,6 +81,17 @@ void Simulator::DebugAtNextPC() {
   ArmDebugger(this).Debug();
 }
 
+void Simulator::AdvancedSIMDElementOrStructureLoadStoreWriteback(int Rn, int Rm,
+                                                                 int ebytes) {
+  if (Rm != 15) {
+    if (Rm == 13) {
+      set_register(Rn, get_register(Rn) + ebytes);
+    } else {
+      set_register(Rn, get_register(Rn) + get_register(Rm));
+    }
+  }
+}
+
 int32_t ArmDebugger::GetRegisterValue(int regnum) {
   if (regnum == kPCRegister) {
     return sim_->get_pc();
@@ -631,7 +647,7 @@ void Simulator::CheckICache(base::CustomMatcherHashMap* i_cache,
                        cache_page->CachedData(offset), kInstrSize));
   } else {
     // Cache miss.  Load memory into the cache.
-    memcpy(cached_line, line, CachePage::kLineLength);
+    base::Memcpy(cached_line, line, CachePage::kLineLength);
     *cache_valid_byte = CachePage::LINE_VALID;
   }
 }
@@ -640,7 +656,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
   // Set up simulator support first. Some of this information is needed to
   // setup the architecture state.
   size_t stack_size = 1 * 1024 * 1024;  // allocate 1MB for stack
-  stack_ = reinterpret_cast<char*>(malloc(stack_size));
+  stack_ = reinterpret_cast<char*>(base::Malloc(stack_size));
   pc_modified_ = false;
   icount_ = 0;
   break_pc_ = nullptr;
@@ -690,7 +706,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
 
 Simulator::~Simulator() {
   GlobalMonitor::Get()->RemoveProcessor(&global_monitor_processor_);
-  free(stack_);
+  base::Free(stack_);
 }
 
 // Get the active Simulator for the current thread.
@@ -736,14 +752,14 @@ double Simulator::get_double_from_register_pair(int reg) {
   // Read the bits from the unsigned integer register_[] array
   // into the double precision floating point value and return it.
   char buffer[2 * sizeof(vfp_registers_[0])];
-  memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
-  memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
+  base::Memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
+  base::Memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
   return (dm_val);
 }
 
 void Simulator::set_register_pair_from_double(int reg, double* value) {
   DCHECK((reg >= 0) && (reg < num_registers) && ((reg % 2) == 0));
-  memcpy(registers_ + reg, value, sizeof(*value));
+  base::Memcpy(registers_ + reg, value, sizeof(*value));
 }
 
 void Simulator::set_dw_register(int dreg, const int* dbl) {
@@ -754,22 +770,22 @@ void Simulator::set_dw_register(int dreg, const int* dbl) {
 
 void Simulator::get_d_register(int dreg, uint64_t* value) {
   DCHECK((dreg >= 0) && (dreg < DwVfpRegister::SupportedRegisterCount()));
-  memcpy(value, vfp_registers_ + dreg * 2, sizeof(*value));
+  base::Memcpy(value, vfp_registers_ + dreg * 2, sizeof(*value));
 }
 
 void Simulator::set_d_register(int dreg, const uint64_t* value) {
   DCHECK((dreg >= 0) && (dreg < DwVfpRegister::SupportedRegisterCount()));
-  memcpy(vfp_registers_ + dreg * 2, value, sizeof(*value));
+  base::Memcpy(vfp_registers_ + dreg * 2, value, sizeof(*value));
 }
 
 void Simulator::get_d_register(int dreg, uint32_t* value) {
   DCHECK((dreg >= 0) && (dreg < DwVfpRegister::SupportedRegisterCount()));
-  memcpy(value, vfp_registers_ + dreg * 2, sizeof(*value) * 2);
+  base::Memcpy(value, vfp_registers_ + dreg * 2, sizeof(*value) * 2);
 }
 
 void Simulator::set_d_register(int dreg, const uint32_t* value) {
   DCHECK((dreg >= 0) && (dreg < DwVfpRegister::SupportedRegisterCount()));
-  memcpy(vfp_registers_ + dreg * 2, value, sizeof(*value) * 2);
+  base::Memcpy(vfp_registers_ + dreg * 2, value, sizeof(*value) * 2);
 }
 
 template <typename T, int SIZE>
@@ -777,7 +793,7 @@ void Simulator::get_neon_register(int reg, T (&value)[SIZE / sizeof(T)]) {
   DCHECK(SIZE == kSimd128Size || SIZE == kDoubleSize);
   DCHECK_LE(0, reg);
   DCHECK_GT(SIZE == kSimd128Size ? num_q_registers : num_d_registers, reg);
-  memcpy(value, vfp_registers_ + reg * (SIZE / 4), SIZE);
+  base::Memcpy(value, vfp_registers_ + reg * (SIZE / 4), SIZE);
 }
 
 template <typename T, int SIZE>
@@ -785,7 +801,7 @@ void Simulator::set_neon_register(int reg, const T (&value)[SIZE / sizeof(T)]) {
   DCHECK(SIZE == kSimd128Size || SIZE == kDoubleSize);
   DCHECK_LE(0, reg);
   DCHECK_GT(SIZE == kSimd128Size ? num_q_registers : num_d_registers, reg);
-  memcpy(vfp_registers_ + reg * (SIZE / 4), value, SIZE);
+  base::Memcpy(vfp_registers_ + reg * (SIZE / 4), value, SIZE);
 }
 
 // Raw access to the PC register.
@@ -821,7 +837,7 @@ void Simulator::SetVFPRegister(int reg_index, const InputType& value) {
   if (register_size == 2)
     DCHECK(reg_index < DwVfpRegister::SupportedRegisterCount());
 
-  memcpy(&vfp_registers_[reg_index * register_size], &value, bytes);
+  base::Memcpy(&vfp_registers_[reg_index * register_size], &value, bytes);
 }
 
 template <class ReturnType, int register_size>
@@ -834,7 +850,7 @@ ReturnType Simulator::GetFromVFPRegister(int reg_index) {
     DCHECK(reg_index < DwVfpRegister::SupportedRegisterCount());
 
   ReturnType value;
-  memcpy(&value, &vfp_registers_[register_size * reg_index], bytes);
+  base::Memcpy(&value, &vfp_registers_[register_size * reg_index], bytes);
   return value;
 }
 
@@ -888,14 +904,14 @@ void Simulator::GetFpArgs(double* x, double* y, int32_t* z) {
 void Simulator::SetFpResult(const double& result) {
   if (use_eabi_hardfloat()) {
     char buffer[2 * sizeof(vfp_registers_[0])];
-    memcpy(buffer, &result, sizeof(buffer));
+    base::Memcpy(buffer, &result, sizeof(buffer));
     // Copy result to d0.
-    memcpy(vfp_registers_, buffer, sizeof(buffer));
+    base::Memcpy(vfp_registers_, buffer, sizeof(buffer));
   } else {
     char buffer[2 * sizeof(registers_[0])];
-    memcpy(buffer, &result, sizeof(buffer));
+    base::Memcpy(buffer, &result, sizeof(buffer));
     // Copy result to r0 and r1.
-    memcpy(registers_, buffer, sizeof(buffer));
+    base::Memcpy(registers_, buffer, sizeof(buffer));
   }
 }
 
@@ -1097,7 +1113,7 @@ int Simulator::WriteExDW(int32_t addr, int32_t value1, int32_t value2) {
 uintptr_t Simulator::StackLimit(uintptr_t c_limit) const {
   // The simulator uses a separate JS stack. If we have exhausted the C stack,
   // we also drop down the JS limit to reflect the exhaustion on the JS stack.
-  if (GetCurrentStackPosition() < c_limit) {
+  if (base::Stack::GetCurrentStackPosition() < c_limit) {
     return reinterpret_cast<uintptr_t>(get_sp());
   }
 
@@ -2337,7 +2353,7 @@ void Simulator::DecodeType01(Instruction* instr) {
     int rn = instr->RnValue();
     int32_t rn_val = get_register(rn);
     int32_t shifter_operand = 0;
-    bool shifter_carry_out = 0;
+    bool shifter_carry_out = false;
     if (type == 0) {
       shifter_operand = GetShiftRm(instr, &shifter_carry_out);
     } else {
@@ -2630,7 +2646,7 @@ void Simulator::DecodeType3(Instruction* instr) {
   int rd = instr->RdValue();
   int rn = instr->RnValue();
   int32_t rn_val = get_register(rn);
-  bool shifter_carry_out = 0;
+  bool shifter_carry_out = false;
   int32_t shifter_operand = GetShiftRm(instr, &shifter_carry_out);
   int32_t addr = 0;
   switch (instr->PUField()) {
@@ -3413,8 +3429,9 @@ void Simulator::DecodeTypeVFP(Instruction* instr) {
       get_d_register(vn, &data);
       if ((opc1_opc2 & 0xB) == 0) {
         // NeonS32 / NeonU32
+        DCHECK_EQ(0, instr->Bit(23));
         int32_t int_data[2];
-        memcpy(int_data, &data, sizeof(int_data));
+        base::Memcpy(int_data, &data, sizeof(int_data));
         set_register(rt, int_data[instr->Bit(21)]);
       } else {
         uint64_t data;
@@ -3880,28 +3897,28 @@ void Simulator::DecodeType6CoprocessorIns(Instruction* instr) {
 
 // Helper functions for implementing NEON ops. Unop applies a unary op to each
 // lane. Binop applies a binary operation to matching input lanes.
-template <typename T>
+template <typename T, int SIZE = kSimd128Size>
 void Unop(Simulator* simulator, int Vd, int Vm, std::function<T(T)> unop) {
-  static const int kLanes = 16 / sizeof(T);
+  static const int kLanes = SIZE / sizeof(T);
   T src[kLanes];
-  simulator->get_neon_register(Vm, src);
+  simulator->get_neon_register<T, SIZE>(Vm, src);
   for (int i = 0; i < kLanes; i++) {
     src[i] = unop(src[i]);
   }
-  simulator->set_neon_register(Vd, src);
+  simulator->set_neon_register<T, SIZE>(Vd, src);
 }
 
-template <typename T>
+template <typename T, int SIZE = kSimd128Size>
 void Binop(Simulator* simulator, int Vd, int Vm, int Vn,
            std::function<T(T, T)> binop) {
-  static const int kLanes = 16 / sizeof(T);
+  static const int kLanes = SIZE / sizeof(T);
   T src1[kLanes], src2[kLanes];
-  simulator->get_neon_register(Vn, src1);
-  simulator->get_neon_register(Vm, src2);
+  simulator->get_neon_register<T, SIZE>(Vn, src1);
+  simulator->get_neon_register<T, SIZE>(Vm, src2);
   for (int i = 0; i < kLanes; i++) {
     src1[i] = binop(src1[i], src2[i]);
   }
-  simulator->set_neon_register(Vd, src1);
+  simulator->set_neon_register<T, SIZE>(Vd, src1);
 }
 
 // Templated operations for NEON instructions.
@@ -4080,7 +4097,7 @@ void VmovImmediate(Simulator* simulator, Instruction* instr) {
       // Set all bytes of register.
       std::fill_n(imms, kSimd128Size, imm);
       uint64_t imm64;
-      memcpy(&imm64, imms, 8);
+      base::Memcpy(&imm64, imms, 8);
       for (int r = 0; r < regs; r++) {
         simulator->set_d_register(vd + r, &imm64);
       }
@@ -4111,15 +4128,41 @@ void ShiftLeft(Simulator* simulator, int Vd, int Vm, int shift) {
 }
 
 template <typename T, int SIZE>
-void ShiftRight(Simulator* simulator, int Vd, int Vm, int shift) {
-  Unop<T>(simulator, Vd, Vm, [shift](T x) { return x >> shift; });
+void LogicalShiftRight(Simulator* simulator, int Vd, int Vm, int shift) {
+  Unop<T, SIZE>(simulator, Vd, Vm, [shift](T x) { return x >> shift; });
 }
 
 template <typename T, int SIZE>
 void ArithmeticShiftRight(Simulator* simulator, int Vd, int Vm, int shift) {
   auto shift_fn =
       std::bind(ArithmeticShiftRight<T>, std::placeholders::_1, shift);
-  Unop<T>(simulator, Vd, Vm, shift_fn);
+  Unop<T, SIZE>(simulator, Vd, Vm, shift_fn);
+}
+
+template <typename T, int SIZE>
+void ShiftRight(Simulator* simulator, int Vd, int Vm, int shift,
+                bool is_unsigned) {
+  if (is_unsigned) {
+    using unsigned_T = typename std::make_unsigned<T>::type;
+    LogicalShiftRight<unsigned_T, SIZE>(simulator, Vd, Vm, shift);
+  } else {
+    ArithmeticShiftRight<T, SIZE>(simulator, Vd, Vm, shift);
+  }
+}
+
+template <typename T, int SIZE>
+void ShiftRightAccumulate(Simulator* simulator, int Vd, int Vm, int shift) {
+  Binop<T, SIZE>(simulator, Vd, Vm, Vd,
+                 [shift](T a, T x) { return a + (x >> shift); });
+}
+
+template <typename T, int SIZE>
+void ArithmeticShiftRightAccumulate(Simulator* simulator, int Vd, int Vm,
+                                    int shift) {
+  Binop<T, SIZE>(simulator, Vd, Vm, Vd, [shift](T a, T x) {
+    T result = ArithmeticShiftRight<T>(x, shift);
+    return a + result;
+  });
 }
 
 template <typename T, int SIZE>
@@ -4245,6 +4288,20 @@ void PairwiseAdd(Simulator* simulator, int Vd, int Vm, int Vn) {
   simulator->set_neon_register<T, kDoubleSize>(Vd, dst);
 }
 
+template <typename NarrowType, typename WideType, int SIZE = kSimd128Size>
+void PairwiseAddLong(Simulator* simulator, int Vd, int Vm) {
+  DCHECK_EQ(sizeof(WideType), 2 * sizeof(NarrowType));
+  static constexpr int kSElems = SIZE / sizeof(NarrowType);
+  static constexpr int kTElems = SIZE / sizeof(WideType);
+  NarrowType src[kSElems];
+  WideType dst[kTElems];
+  simulator->get_neon_register<NarrowType, SIZE>(Vm, src);
+  for (int i = 0; i < kTElems; i++) {
+    dst[i] = WideType{src[i * 2]} + WideType{src[i * 2 + 1]};
+  }
+  simulator->set_neon_register<WideType, SIZE>(Vd, dst);
+}
+
 template <typename T, int SIZE = kSimd128Size>
 void RoundingAverageUnsigned(Simulator* simulator, int Vd, int Vm, int Vn) {
   static_assert(std::is_unsigned<T>::value,
@@ -4263,9 +4320,9 @@ void MultiplyLong(Simulator* simulator, int Vd, int Vn, int Vm) {
   // underlying datatype easily.
   uint64_t tmp;
   simulator->get_d_register(Vn, &tmp);
-  memcpy(src1, &tmp, sizeof(tmp));
+  base::Memcpy(src1, &tmp, sizeof(tmp));
   simulator->get_d_register(Vm, &tmp);
-  memcpy(src2, &tmp, sizeof(tmp));
+  base::Memcpy(src2, &tmp, sizeof(tmp));
 
   for (int i = 0; i < kElems; i++) {
     dst[i] = WideType{src1[i]} * WideType{src2[i]};
@@ -4411,6 +4468,28 @@ void Simulator::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
           UNREACHABLE();
           break;
       }
+    } else if (opc1 == 0 && (opc2 == 0b0100 || opc2 == 0b0101)) {
+      DCHECK_EQ(1, instr->Bit(6));  // Only support Q regs.
+      int Vd = instr->VFPDRegValue(kSimd128Precision);
+      int Vm = instr->VFPMRegValue(kSimd128Precision);
+      int is_signed = instr->Bit(7) == 0;
+      // vpaddl Qd, Qm.
+      switch (size) {
+        case Neon8:
+          is_signed ? PairwiseAddLong<int8_t, int16_t>(this, Vd, Vm)
+                    : PairwiseAddLong<uint8_t, uint16_t>(this, Vd, Vm);
+          break;
+        case Neon16:
+          is_signed ? PairwiseAddLong<int16_t, int32_t>(this, Vd, Vm)
+                    : PairwiseAddLong<uint16_t, uint32_t>(this, Vd, Vm);
+          break;
+        case Neon32:
+          is_signed ? PairwiseAddLong<int32_t, int64_t>(this, Vd, Vm)
+                    : PairwiseAddLong<uint32_t, uint64_t>(this, Vd, Vm);
+          break;
+        case Neon64:
+          UNREACHABLE();
+      }
     } else if (size == 0 && opc1 == 0b10 && opc2 == 0) {
       if (instr->Bit(6) == 0) {
         // vswp Dd, Dm.
@@ -4431,6 +4510,17 @@ void Simulator::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
         set_neon_register(vm, dval);
         set_neon_register(vd, mval);
       }
+    } else if (opc1 == 0 && opc2 == 0b1010) {
+      // vcnt Qd, Qm.
+      DCHECK_EQ(0, size);
+      int vd = instr->VFPDRegValue(q ? kSimd128Precision : kDoublePrecision);
+      int vm = instr->VFPMRegValue(q ? kSimd128Precision : kDoublePrecision);
+      uint8_t q_data[16];
+      get_neon_register(vm, q_data);
+      for (int i = 0; i < 16; i++) {
+        q_data[i] = base::bits::CountPopulation(q_data[i]);
+      }
+      set_neon_register(vd, q_data);
     } else if (opc1 == 0 && opc2 == 0b1011) {
       // vmvn Qd, Qm.
       int vd = instr->VFPDRegValue(kSimd128Precision);
@@ -4439,6 +4529,24 @@ void Simulator::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
       get_neon_register(vm, q_data);
       for (int i = 0; i < 4; i++) q_data[i] = ~q_data[i];
       set_neon_register(vd, q_data);
+    } else if (opc1 == 0b01 && opc2 == 0b0100) {
+      // vclt.<dt> Qd, Qm, #0 (signed integers).
+      int Vd = instr->VFPDRegValue(kSimd128Precision);
+      int Vm = instr->VFPMRegValue(kSimd128Precision);
+      switch (size) {
+        case Neon8:
+          Unop<int8_t>(this, Vd, Vm, [](int8_t x) { return x < 0 ? -1 : 0; });
+          break;
+        case Neon16:
+          Unop<int16_t>(this, Vd, Vm, [](int16_t x) { return x < 0 ? -1 : 0; });
+          break;
+        case Neon32:
+          Unop<int32_t>(this, Vd, Vm, [](int32_t x) { return x < 0 ? -1 : 0; });
+          break;
+        case Neon64:
+          UNREACHABLE();
+      }
+
     } else if (opc1 == 0b01 && (opc2 & 0b0111) == 0b110) {
       // vabs<type>.<size> Qd, Qm
       int Vd = instr->VFPDRegValue(kSimd128Precision);
@@ -4649,8 +4757,8 @@ void Simulator::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
           }
           break;
         }
-        default:
-          UNIMPLEMENTED();
+        case Neon64:
+          UNREACHABLE();
           break;
       }
     } else if (opc1 == 0b10 && instr->Bit(10) == 1) {
@@ -4744,6 +4852,8 @@ void Simulator::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
         }
       }
       set_neon_register(Vd, q_data);
+    } else {
+      UNIMPLEMENTED();
     }
   } else if (op0 && op1 == 0b11 && op2 == 0b10) {
     // vtb[l,x] Dd, <list>, Dm.
@@ -4812,9 +4922,9 @@ void Simulator::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
     // Advanced SIMD three registers of different lengths.
     int u = instr->Bit(24);
     int opc = instr->Bits(11, 8);
+    NeonSize size = static_cast<NeonSize>(instr->Bits(21, 20));
     if (opc == 0b1000) {
       // vmlal.u<size> Qd, Dn, Dm
-      NeonSize size = static_cast<NeonSize>(instr->Bits(21, 20));
       if (size != Neon32) UNIMPLEMENTED();
 
       int Vd = instr->VFPDRegValue(kSimd128Precision);
@@ -4829,33 +4939,46 @@ void Simulator::DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr) {
       dst[1] += (src1 >> 32) * (src2 >> 32);
       set_neon_register<uint64_t>(Vd, dst);
     } else if (opc == 0b1100) {
+      int Vd = instr->VFPDRegValue(kSimd128Precision);
+      int Vn = instr->VFPNRegValue(kDoublePrecision);
+      int Vm = instr->VFPMRegValue(kDoublePrecision);
       if (u) {
         // vmull.u<size> Qd, Dn, Dm
-        NeonSize size = static_cast<NeonSize>(instr->Bits(21, 20));
-        int Vd = instr->VFPDRegValue(kSimd128Precision);
-        int Vn = instr->VFPNRegValue(kDoublePrecision);
-        int Vm = instr->VFPMRegValue(kDoublePrecision);
         switch (size) {
+          case Neon8: {
+            MultiplyLong<uint8_t, uint16_t>(this, Vd, Vn, Vm);
+            break;
+          }
+          case Neon16: {
+            MultiplyLong<uint16_t, uint32_t>(this, Vd, Vn, Vm);
+            break;
+          }
           case Neon32: {
             MultiplyLong<uint32_t, uint64_t>(this, Vd, Vn, Vm);
             break;
           }
-          default:
+          case Neon64: {
             UNIMPLEMENTED();
+          }
         }
       } else {
         // vmull.s<size> Qd, Dn, Dm
-        NeonSize size = static_cast<NeonSize>(instr->Bits(21, 20));
-        int Vd = instr->VFPDRegValue(kSimd128Precision);
-        int Vn = instr->VFPNRegValue(kDoublePrecision);
-        int Vm = instr->VFPMRegValue(kDoublePrecision);
         switch (size) {
+          case Neon8: {
+            MultiplyLong<int8_t, int16_t>(this, Vd, Vn, Vm);
+            break;
+          }
           case Neon16: {
             MultiplyLong<int16_t, int32_t>(this, Vd, Vn, Vm);
             break;
           }
-          default:
+          case Neon32: {
+            MultiplyLong<int32_t, int64_t>(this, Vd, Vn, Vm);
+            break;
+          }
+          case Neon64: {
             UNIMPLEMENTED();
+          }
         }
       }
     }
@@ -5362,6 +5485,15 @@ void Simulator::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
         }
       }
       set_neon_register(Vd, dst);
+    } else if (u && opc == 0xB) {
+      // vqrdmulh.<dt> Qd, Qm, Qn
+      NeonSize size = static_cast<NeonSize>(instr->Bits(21, 20));
+      if (size == Neon16) {
+        Binop<int16_t>(this, Vd, Vm, Vn, SaturateRoundingQMul<int16_t>);
+      } else {
+        DCHECK_EQ(Neon32, size);
+        Binop<int32_t>(this, Vd, Vm, Vn, SaturateRoundingQMul<int32_t>);
+      }
     } else {
       UNIMPLEMENTED();
     }
@@ -5381,45 +5513,73 @@ void Simulator::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
       int l = instr->Bit(7);
       int q = instr->Bit(6);
       int imm3H_L = imm3H << 1 | l;
+      int imm7 = instr->Bits(21, 16);
+      imm7 += (l << 6);
+      int size = base::bits::RoundDownToPowerOfTwo32(imm7);
+      NeonSize ns =
+          static_cast<NeonSize>(base::bits::WhichPowerOfTwo(size >> 3));
 
       if (imm3H_L != 0 && opc == 0) {
-        // vshr.s<size> Qd, Qm, shift
-        int imm7 = instr->Bits(21, 16);
-        if (instr->Bit(7) != 0) imm7 += 64;
-        int size = base::bits::RoundDownToPowerOfTwo32(imm7);
+        // vshr.s/u<size> Qd, Qm, shift
         int shift = 2 * size - imm7;
-        int Vd = instr->VFPDRegValue(kSimd128Precision);
-        int Vm = instr->VFPMRegValue(kSimd128Precision);
-        NeonSize ns =
-            static_cast<NeonSize>(base::bits::WhichPowerOfTwo(size >> 3));
+        int Vd = instr->VFPDRegValue(q ? kSimd128Precision : kDoublePrecision);
+        int Vm = instr->VFPMRegValue(q ? kSimd128Precision : kDoublePrecision);
+        switch (ns) {
+          case Neon8:
+            q ? ShiftRight<int8_t, kSimd128Size>(this, Vd, Vm, shift, u)
+              : ShiftRight<int8_t, kDoubleSize>(this, Vd, Vm, shift, u);
+            break;
+          case Neon16:
+            q ? ShiftRight<int16_t, kSimd128Size>(this, Vd, Vm, shift, u)
+              : ShiftRight<int16_t, kDoubleSize>(this, Vd, Vm, shift, u);
+            break;
+          case Neon32:
+            q ? ShiftRight<int32_t, kSimd128Size>(this, Vd, Vm, shift, u)
+              : ShiftRight<int32_t, kDoubleSize>(this, Vd, Vm, shift, u);
+            break;
+          case Neon64:
+            q ? ShiftRight<int64_t, kSimd128Size>(this, Vd, Vm, shift, u)
+              : ShiftRight<int64_t, kDoubleSize>(this, Vd, Vm, shift, u);
+            break;
+        }
+      } else if (imm3H_L != 0 && opc == 1) {
+        // vsra Dd, Dm, #imm
+        DCHECK(!q);  // Unimplemented for now.
+        int shift = 2 * size - imm7;
+        int Vd = instr->VFPDRegValue(kDoublePrecision);
+        int Vm = instr->VFPMRegValue(kDoublePrecision);
         if (u) {
           switch (ns) {
             case Neon8:
-              ShiftRight<uint8_t, kSimd128Size>(this, Vd, Vm, shift);
+              ShiftRightAccumulate<uint8_t, kDoubleSize>(this, Vd, Vm, shift);
               break;
             case Neon16:
-              ShiftRight<uint16_t, kSimd128Size>(this, Vd, Vm, shift);
+              ShiftRightAccumulate<uint16_t, kDoubleSize>(this, Vd, Vm, shift);
               break;
             case Neon32:
-              ShiftRight<uint32_t, kSimd128Size>(this, Vd, Vm, shift);
+              ShiftRightAccumulate<uint32_t, kDoubleSize>(this, Vd, Vm, shift);
               break;
             case Neon64:
-              ShiftRight<uint64_t, kSimd128Size>(this, Vd, Vm, shift);
+              ShiftRightAccumulate<uint64_t, kDoubleSize>(this, Vd, Vm, shift);
               break;
           }
         } else {
           switch (ns) {
             case Neon8:
-              ArithmeticShiftRight<int8_t, kSimd128Size>(this, Vd, Vm, shift);
+              ArithmeticShiftRightAccumulate<int8_t, kDoubleSize>(this, Vd, Vm,
+                                                                  shift);
               break;
             case Neon16:
-              ArithmeticShiftRight<int16_t, kSimd128Size>(this, Vd, Vm, shift);
+              ArithmeticShiftRightAccumulate<int16_t, kDoubleSize>(this, Vd, Vm,
+                                                                   shift);
               break;
             case Neon32:
-              ArithmeticShiftRight<int32_t, kSimd128Size>(this, Vd, Vm, shift);
+              ArithmeticShiftRightAccumulate<int32_t, kDoubleSize>(this, Vd, Vm,
+                                                                   shift);
               break;
             case Neon64:
-              ArithmeticShiftRight<int64_t, kSimd128Size>(this, Vd, Vm, shift);
+              ArithmeticShiftRightAccumulate<int64_t, kDoubleSize>(this, Vd, Vm,
+                                                                   shift);
               break;
           }
         }
@@ -5429,8 +5589,7 @@ void Simulator::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
           if ((instr->VdValue() & 1) != 0) UNIMPLEMENTED();
           int Vd = instr->VFPDRegValue(kSimd128Precision);
           int Vm = instr->VFPMRegValue(kDoublePrecision);
-          int imm3 = instr->Bits(21, 19);
-          switch (imm3) {
+          switch (imm3H) {
             case 1:
               Widen<uint8_t, uint16_t>(this, Vd, Vm);
               break;
@@ -5449,8 +5608,7 @@ void Simulator::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
           if ((instr->VdValue() & 1) != 0) UNIMPLEMENTED();
           int Vd = instr->VFPDRegValue(kSimd128Precision);
           int Vm = instr->VFPMRegValue(kDoublePrecision);
-          int imm3 = instr->Bits(21, 19);
-          switch (imm3) {
+          switch (imm3H) {
             case 1:
               Widen<int8_t, int16_t>(this, Vd, Vm);
               break;
@@ -5467,9 +5625,6 @@ void Simulator::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
         }
       } else if (!u && imm3H_L != 0 && opc == 0b0101) {
         // vshl.i<size> Qd, Qm, shift
-        int imm7 = instr->Bits(21, 16);
-        if (instr->Bit(7) != 0) imm7 += 64;
-        int size = base::bits::RoundDownToPowerOfTwo32(imm7);
         int shift = imm7 - size;
         int Vd = instr->VFPDRegValue(kSimd128Precision);
         int Vm = instr->VFPMRegValue(kSimd128Precision);
@@ -5491,9 +5646,6 @@ void Simulator::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
         }
       } else if (u && imm3H_L != 0 && opc == 0b0100) {
         // vsri.<size> Dd, Dm, shift
-        int imm7 = instr->Bits(21, 16);
-        if (instr->Bit(7) != 0) imm7 += 64;
-        int size = base::bits::RoundDownToPowerOfTwo32(imm7);
         int shift = 2 * size - imm7;
         int Vd = instr->VFPDRegValue(kDoublePrecision);
         int Vm = instr->VFPMRegValue(kDoublePrecision);
@@ -5516,9 +5668,6 @@ void Simulator::DecodeAdvancedSIMDDataProcessing(Instruction* instr) {
         }
       } else if (u && imm3H_L != 0 && opc == 0b0101) {
         // vsli.<size> Dd, Dm, shift
-        int imm7 = instr->Bits(21, 16);
-        if (instr->Bit(7) != 0) imm7 += 64;
-        int size = base::bits::RoundDownToPowerOfTwo32(imm7);
         int shift = imm7 - size;
         int Vd = instr->VFPDRegValue(kDoublePrecision);
         int Vm = instr->VFPMRegValue(kDoublePrecision);
@@ -5566,200 +5715,197 @@ void Simulator::DecodeMemoryHintsAndBarriers(Instruction* instr) {
 
 void Simulator::DecodeAdvancedSIMDElementOrStructureLoadStore(
     Instruction* instr) {
-  switch (instr->SpecialValue()) {
-    case 8:
-      if (instr->Bits(21, 20) == 0) {
-        // vst1
-        int Vd = (instr->Bit(22) << 4) | instr->VdValue();
-        int Rn = instr->VnValue();
-        int type = instr->Bits(11, 8);
-        int Rm = instr->VmValue();
-        int32_t address = get_register(Rn);
-        int regs = 0;
-        switch (type) {
-          case nlt_1:
-            regs = 1;
-            break;
-          case nlt_2:
-            regs = 2;
-            break;
-          case nlt_3:
-            regs = 3;
-            break;
-          case nlt_4:
-            regs = 4;
-            break;
-          default:
-            UNIMPLEMENTED();
-            break;
-        }
-        int r = 0;
-        while (r < regs) {
-          uint32_t data[2];
-          get_d_register(Vd + r, data);
-          WriteW(address, data[0]);
-          WriteW(address + 4, data[1]);
-          address += 8;
-          r++;
-        }
-        if (Rm != 15) {
-          if (Rm == 13) {
-            set_register(Rn, address);
-          } else {
-            set_register(Rn, get_register(Rn) + get_register(Rm));
-          }
-        }
-      } else if (instr->Bits(21, 20) == 2) {
-        // vld1
-        int Vd = (instr->Bit(22) << 4) | instr->VdValue();
-        int Rn = instr->VnValue();
-        int type = instr->Bits(11, 8);
-        int Rm = instr->VmValue();
-        int32_t address = get_register(Rn);
-        int regs = 0;
-        switch (type) {
-          case nlt_1:
-            regs = 1;
-            break;
-          case nlt_2:
-            regs = 2;
-            break;
-          case nlt_3:
-            regs = 3;
-            break;
-          case nlt_4:
-            regs = 4;
-            break;
-          default:
-            UNIMPLEMENTED();
-            break;
+  int op0 = instr->Bit(23);
+  int op1 = instr->Bits(11, 10);
+
+  if (!op0) {
+    DecodeAdvancedSIMDLoadStoreMultipleStructures(instr);
+  } else if (op1 == 0b11) {
+    DecodeAdvancedSIMDLoadSingleStructureToAllLanes(instr);
+  } else {
+    DecodeAdvancedSIMDLoadStoreSingleStructureToOneLane(instr);
+  }
+}
+
+void Simulator::DecodeAdvancedSIMDLoadStoreMultipleStructures(
+    Instruction* instr) {
+  int Vd = instr->VFPDRegValue(kDoublePrecision);
+  int Rn = instr->VnValue();
+  int Rm = instr->VmValue();
+  int type = instr->Bits(11, 8);
+  int32_t address = get_register(Rn);
+  int regs = 0;
+  switch (type) {
+    case nlt_1:
+      regs = 1;
+      break;
+    case nlt_2:
+      regs = 2;
+      break;
+    case nlt_3:
+      regs = 3;
+      break;
+    case nlt_4:
+      regs = 4;
+      break;
+    default:
+      UNIMPLEMENTED();
+      break;
+  }
+  if (instr->Bit(21)) {
+    // vld1
+    int r = 0;
+    while (r < regs) {
+      uint32_t data[2];
+      data[0] = ReadW(address);
+      data[1] = ReadW(address + 4);
+      set_d_register(Vd + r, data);
+      address += 8;
+      r++;
+    }
+  } else {
+    // vst1
+    int r = 0;
+    while (r < regs) {
+      uint32_t data[2];
+      get_d_register(Vd + r, data);
+      WriteW(address, data[0]);
+      WriteW(address + 4, data[1]);
+      address += 8;
+      r++;
+    }
+  }
+  AdvancedSIMDElementOrStructureLoadStoreWriteback(Rn, Rm, 8 * regs);
+}
+
+void Simulator::DecodeAdvancedSIMDLoadSingleStructureToAllLanes(
+    Instruction* instr) {
+  DCHECK_NE(0, instr->Bit(21));
+  int N = instr->Bits(9, 8);
+
+  int Vd = instr->VFPDRegValue(kDoublePrecision);
+  int Rn = instr->VnValue();
+  int Rm = instr->VmValue();
+  int32_t address = get_register(Rn);
+
+  if (!N) {
+    // vld1 (single element to all lanes).
+    int regs = instr->Bit(5) + 1;
+    int size = instr->Bits(7, 6);
+    uint32_t q_data[2];
+    switch (size) {
+      case Neon8: {
+        uint8_t data = ReadBU(address);
+        uint8_t* dst = reinterpret_cast<uint8_t*>(q_data);
+        for (int i = 0; i < 8; i++) {
+          dst[i] = data;
         }
-        int r = 0;
-        while (r < regs) {
-          uint32_t data[2];
-          data[0] = ReadW(address);
-          data[1] = ReadW(address + 4);
-          set_d_register(Vd + r, data);
-          address += 8;
-          r++;
+        break;
+      }
+      case Neon16: {
+        uint16_t data = ReadHU(address);
+        uint16_t* dst = reinterpret_cast<uint16_t*>(q_data);
+        for (int i = 0; i < 4; i++) {
+          dst[i] = data;
         }
-        if (Rm != 15) {
-          if (Rm == 13) {
-            set_register(Rn, address);
-          } else {
-            set_register(Rn, get_register(Rn) + get_register(Rm));
-          }
+        break;
+      }
+      case Neon32: {
+        uint32_t data = ReadW(address);
+        for (int i = 0; i < 2; i++) {
+          q_data[i] = data;
         }
-      } else {
-        UNIMPLEMENTED();
+        break;
       }
-      break;
-    case 9: {
-      if (instr->Bits(21, 20) == 2) {
-        // Bits(11, 8) is the B field in A7.7 Advanced SIMD element or structure
-        // load/store instructions. See table A7-21.
-        if (instr->Bits(11, 8) == 0xC) {
-          // vld1 (single element to all lanes).
-          DCHECK_EQ(instr->Bits(11, 8), 0b1100);  // Type field.
-          int Vd = (instr->Bit(22) << 4) | instr->VdValue();
-          int Rn = instr->VnValue();
-          int Rm = instr->VmValue();
-          int32_t address = get_register(Rn);
-          int regs = instr->Bit(5) + 1;
-          int size = instr->Bits(7, 6);
-          uint32_t q_data[2];
-          switch (size) {
-            case Neon8: {
-              uint8_t data = ReadBU(address);
-              uint8_t* dst = reinterpret_cast<uint8_t*>(q_data);
-              for (int i = 0; i < 8; i++) {
-                dst[i] = data;
-              }
-              break;
-            }
-            case Neon16: {
-              uint16_t data = ReadHU(address);
-              uint16_t* dst = reinterpret_cast<uint16_t*>(q_data);
-              for (int i = 0; i < 4; i++) {
-                dst[i] = data;
-              }
-              break;
-            }
-            case Neon32: {
-              uint32_t data = ReadW(address);
-              for (int i = 0; i < 2; i++) {
-                q_data[i] = data;
-              }
-              break;
-            }
-          }
-          for (int r = 0; r < regs; r++) {
-            set_neon_register<uint32_t, kDoubleSize>(Vd + r, q_data);
-          }
-          if (Rm != 15) {
-            if (Rm == 13) {
-              set_register(Rn, address);
-            } else {
-              set_register(Rn, get_register(Rn) + get_register(Rm));
-            }
-          }
-        } else if (instr->Bits(11, 8) == 8 ||
-                   ((instr->Bits(11, 8) & 0b1011) == 0)) {
-          // vld1 (single element to one lane)
-          int Vd = (instr->Bit(22) << 4) | instr->VdValue();
-          int Rn = instr->VnValue();
-          int Rm = instr->VmValue();
-          int32_t address = get_register(Rn);
-          int size = instr->Bits(11, 10);
-          uint64_t dreg;
-          get_d_register(Vd, &dreg);
-          switch (size) {
-            case Neon8: {
-              uint64_t data = ReadBU(address);
-              DCHECK_EQ(0, instr->Bit(4));
-              int i = instr->Bits(7, 5) * 8;
-              dreg = (dreg & ~(uint64_t{0xff} << i)) | (data << i);
-              break;
-            }
-            case Neon16: {
-              DCHECK_EQ(0, instr->Bits(5, 4));  // Alignment not supported.
-              uint64_t data = ReadHU(address);
-              int i = instr->Bits(7, 6) * 16;
-              dreg = (dreg & ~(uint64_t{0xffff} << i)) | (data << i);
-              break;
-            }
-            case Neon32: {
-              DCHECK_EQ(0, instr->Bits(6, 4));  // Alignment not supported.
-              uint64_t data = static_cast<unsigned>(ReadW(address));
-              int i = instr->Bit(7) * 32;
-              dreg = (dreg & ~(uint64_t{0xffffffff} << i)) | (data << i);
-              break;
-            }
-            case Neon64: {
-              // Should have been handled by vld1 (single element to all lanes).
-              UNREACHABLE();
-            }
-          }
-          set_d_register(Vd, &dreg);
+    }
+    for (int r = 0; r < regs; r++) {
+      set_neon_register<uint32_t, kDoubleSize>(Vd + r, q_data);
+    }
+    AdvancedSIMDElementOrStructureLoadStoreWriteback(Rn, Rm, 1 << size);
+  } else {
+    UNIMPLEMENTED();
+  }
+}
 
-          // write back
-          if (Rm != 15) {
-            if (Rm == 13) {
-              set_register(Rn, address);
-            } else {
-              set_register(Rn, get_register(Rn) + get_register(Rm));
-            }
-          }
-        } else {
-          UNIMPLEMENTED();
-        }
-      } else {
-        UNIMPLEMENTED();
+void Simulator::DecodeAdvancedSIMDLoadStoreSingleStructureToOneLane(
+    Instruction* instr) {
+  int L = instr->Bit(21);
+  int size = instr->Bits(11, 10);
+  int N = instr->Bits(9, 8);
+  int Vd = instr->VFPDRegValue(kDoublePrecision);
+  int Rn = instr->VnValue();
+  int Rm = instr->VmValue();
+  int32_t address = get_register(Rn);
+
+  if (L && N == 0) {
+    // vld1 (single element to one lane)
+    DCHECK_NE(3, size);
+    uint64_t dreg;
+    get_d_register(Vd, &dreg);
+    switch (size) {
+      case Neon8: {
+        uint64_t data = ReadBU(address);
+        DCHECK_EQ(0, instr->Bit(4));
+        int i = instr->Bits(7, 5) * 8;
+        dreg = (dreg & ~(uint64_t{0xff} << i)) | (data << i);
+        break;
+      }
+      case Neon16: {
+        DCHECK_EQ(0, instr->Bits(5, 4));  // Alignment not supported.
+        uint64_t data = ReadHU(address);
+        int i = instr->Bits(7, 6) * 16;
+        dreg = (dreg & ~(uint64_t{0xffff} << i)) | (data << i);
+        break;
+      }
+      case Neon32: {
+        DCHECK_EQ(0, instr->Bits(6, 4));  // Alignment not supported.
+        uint64_t data = static_cast<unsigned>(ReadW(address));
+        int i = instr->Bit(7) * 32;
+        dreg = (dreg & ~(uint64_t{0xffffffff} << i)) | (data << i);
+        break;
+      }
+      case Neon64: {
+        // Should have been handled by vld1 (single element to all lanes).
+        UNREACHABLE();
       }
-      break;
     }
-    default:
-      UNIMPLEMENTED();
+    set_d_register(Vd, &dreg);
+    AdvancedSIMDElementOrStructureLoadStoreWriteback(Rn, Rm, 1 << size);
+  } else if (!L && N == 0) {
+    // vst1s (single element from one lane).
+    DCHECK_NE(3, size);
+    uint64_t dreg;
+    get_d_register(Vd, &dreg);
+    switch (size) {
+      case Neon8: {
+        DCHECK_EQ(0, instr->Bit(4));
+        int i = instr->Bits(7, 5) * 8;
+        dreg = (dreg >> i) & 0xff;
+        WriteB(address, static_cast<uint8_t>(dreg));
+        break;
+      }
+      case Neon16: {
+        DCHECK_EQ(0, instr->Bits(5, 4));  // Alignment not supported.
+        int i = instr->Bits(7, 6) * 16;
+        dreg = (dreg >> i) & 0xffff;
+        WriteH(address, static_cast<uint16_t>(dreg));
+        break;
+      }
+      case Neon32: {
+        DCHECK_EQ(0, instr->Bits(6, 4));  // Alignment not supported.
+        int i = instr->Bit(7) * 32;
+        dreg = (dreg >> i) & 0xffffffff;
+        WriteW(address, bit_cast<int>(static_cast<uint32_t>(dreg)));
+        break;
+      }
+      case Neon64: {
+        // Should have been handled by vst1 (single element to all lanes).
+        UNREACHABLE();
+      }
+    }
+    AdvancedSIMDElementOrStructureLoadStoreWriteback(Rn, Rm, 1 << size);
+  } else {
+    UNIMPLEMENTED();
   }
 }
 
@@ -6116,8 +6262,9 @@ intptr_t Simulator::CallImpl(Address entry, int argument_count,
     entry_stack &= -base::OS::ActivationFrameAlignment();
   }
   // Store remaining arguments on stack, from low to high memory.
-  memcpy(reinterpret_cast<intptr_t*>(entry_stack), arguments + reg_arg_count,
-         (argument_count - reg_arg_count) * sizeof(*arguments));
+  base::Memcpy(reinterpret_cast<intptr_t*>(entry_stack),
+               arguments + reg_arg_count,
+               (argument_count - reg_arg_count) * sizeof(*arguments));
   set_register(sp, entry_stack);
 
   CallInternal(entry);
diff --git a/deps/v8/src/execution/arm/simulator-arm.h b/deps/v8/src/execution/arm/simulator-arm.h
index 84f857d5daaa61..a4570ff47df35c 100644
--- a/deps/v8/src/execution/arm/simulator-arm.h
+++ b/deps/v8/src/execution/arm/simulator-arm.h
@@ -332,6 +332,10 @@ class Simulator : public SimulatorBase {
   void SoftwareInterrupt(Instruction* instr);
   void DebugAtNextPC();
 
+  // Helper to write back values to register.
+  void AdvancedSIMDElementOrStructureLoadStoreWriteback(int Rn, int Rm,
+                                                        int ebytes);
+
   // Stop helper functions.
   inline bool isWatchedStop(uint32_t bkpt_code);
   inline bool isEnabledStop(uint32_t bkpt_code);
@@ -391,6 +395,9 @@ class Simulator : public SimulatorBase {
   void DecodeAdvancedSIMDDataProcessing(Instruction* instr);
   void DecodeMemoryHintsAndBarriers(Instruction* instr);
   void DecodeAdvancedSIMDElementOrStructureLoadStore(Instruction* instr);
+  void DecodeAdvancedSIMDLoadStoreMultipleStructures(Instruction* instr);
+  void DecodeAdvancedSIMDLoadSingleStructureToAllLanes(Instruction* instr);
+  void DecodeAdvancedSIMDLoadStoreSingleStructureToOneLane(Instruction* instr);
   void DecodeAdvancedSIMDTwoOrThreeRegisters(Instruction* instr);
 
   void DecodeVMOVBetweenCoreAndSinglePrecisionRegisters(Instruction* instr);
diff --git a/deps/v8/src/execution/arm64/pointer-authentication-arm64.h b/deps/v8/src/execution/arm64/pointer-authentication-arm64.h
index ec7f8d1850d4b1..6af8974788c22e 100644
--- a/deps/v8/src/execution/arm64/pointer-authentication-arm64.h
+++ b/deps/v8/src/execution/arm64/pointer-authentication-arm64.h
@@ -24,7 +24,7 @@ namespace internal {
 V8_INLINE Address PointerAuthentication::AuthenticatePC(
     Address* pc_address, unsigned offset_from_sp) {
   uint64_t sp = reinterpret_cast<uint64_t>(pc_address) + offset_from_sp;
-  uint64_t pc = reinterpret_cast<uint64_t>(*pc_address);
+  uint64_t pc = static_cast<uint64_t>(*pc_address);
 #ifdef USE_SIMULATOR
   pc = Simulator::AuthPAC(pc, sp, Simulator::kPACKeyIB,
                           Simulator::kInstructionPointer);
@@ -67,7 +67,7 @@ V8_INLINE void PointerAuthentication::ReplacePC(Address* pc_address,
                                                 Address new_pc,
                                                 int offset_from_sp) {
   uint64_t sp = reinterpret_cast<uint64_t>(pc_address) + offset_from_sp;
-  uint64_t old_pc = reinterpret_cast<uint64_t>(*pc_address);
+  uint64_t old_pc = static_cast<uint64_t>(*pc_address);
 #ifdef USE_SIMULATOR
   uint64_t auth_old_pc = Simulator::AuthPAC(old_pc, sp, Simulator::kPACKeyIB,
                                             Simulator::kInstructionPointer);
diff --git a/deps/v8/src/execution/arm64/simulator-arm64.cc b/deps/v8/src/execution/arm64/simulator-arm64.cc
index 4d9205f05377af..7b49ee46735b51 100644
--- a/deps/v8/src/execution/arm64/simulator-arm64.cc
+++ b/deps/v8/src/execution/arm64/simulator-arm64.cc
@@ -7,12 +7,15 @@
 #if defined(USE_SIMULATOR)
 
 #include <stdlib.h>
+
 #include <cmath>
 #include <cstdarg>
 #include <type_traits>
 
 #include "src/base/lazy-instance.h"
 #include "src/base/overflowing-math.h"
+#include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/arm64/decoder-arm64-inl.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
@@ -140,7 +143,7 @@ void Simulator::CallImpl(Address entry, CallArgument* args) {
   char* stack = reinterpret_cast<char*>(entry_stack);
   std::vector<int64_t>::const_iterator it;
   for (it = stack_args.begin(); it != stack_args.end(); it++) {
-    memcpy(stack, &(*it), sizeof(*it));
+    base::Memcpy(stack, &(*it), sizeof(*it));
     stack += sizeof(*it);
   }
 
@@ -263,9 +266,9 @@ uintptr_t Simulator::PushAddress(uintptr_t address) {
   DCHECK(sizeof(uintptr_t) < 2 * kXRegSize);
   intptr_t new_sp = sp() - 2 * kXRegSize;
   uintptr_t* alignment_slot = reinterpret_cast<uintptr_t*>(new_sp + kXRegSize);
-  memcpy(alignment_slot, &kSlotsZapValue, kSystemPointerSize);
+  base::Memcpy(alignment_slot, &kSlotsZapValue, kSystemPointerSize);
   uintptr_t* stack_slot = reinterpret_cast<uintptr_t*>(new_sp);
-  memcpy(stack_slot, &address, kSystemPointerSize);
+  base::Memcpy(stack_slot, &address, kSystemPointerSize);
   set_sp(new_sp);
   return new_sp;
 }
@@ -283,7 +286,7 @@ uintptr_t Simulator::PopAddress() {
 uintptr_t Simulator::StackLimit(uintptr_t c_limit) const {
   // The simulator uses a separate JS stack. If we have exhausted the C stack,
   // we also drop down the JS limit to reflect the exhaustion on the JS stack.
-  if (GetCurrentStackPosition() < c_limit) {
+  if (base::Stack::GetCurrentStackPosition() < c_limit) {
     return get_sp();
   }
 
@@ -1796,14 +1799,17 @@ void Simulator::LoadStoreHelper(Instruction* instr, int64_t offset,
   unsigned addr_reg = instr->Rn();
   uintptr_t address = LoadStoreAddress(addr_reg, offset, addrmode);
   uintptr_t stack = 0;
+  LoadStoreOp op = static_cast<LoadStoreOp>(instr->Mask(LoadStoreMask));
 
   {
     base::MutexGuard lock_guard(&GlobalMonitor::Get()->mutex);
     if (instr->IsLoad()) {
       local_monitor_.NotifyLoad();
-    } else {
+    } else if (instr->IsStore()) {
       local_monitor_.NotifyStore();
       GlobalMonitor::Get()->NotifyStore_Locked(&global_monitor_processor_);
+    } else {
+      DCHECK_EQ(op, PRFM);
     }
   }
 
@@ -1822,7 +1828,6 @@ void Simulator::LoadStoreHelper(Instruction* instr, int64_t offset,
     stack = sp();
   }
 
-  LoadStoreOp op = static_cast<LoadStoreOp>(instr->Mask(LoadStoreMask));
   switch (op) {
     // Use _no_log variants to suppress the register trace (LOG_REGS,
     // LOG_VREGS). We will print a more detailed log.
@@ -1897,6 +1902,10 @@ void Simulator::LoadStoreHelper(Instruction* instr, int64_t offset,
       MemoryWrite<qreg_t>(address, qreg(srcdst));
       break;
 
+    // Do nothing for prefetch.
+    case PRFM:
+      break;
+
     default:
       UNIMPLEMENTED();
   }
@@ -1912,7 +1921,7 @@ void Simulator::LoadStoreHelper(Instruction* instr, int64_t offset,
     } else {
       LogRead(address, srcdst, GetPrintRegisterFormatForSize(access_size));
     }
-  } else {
+  } else if (instr->IsStore()) {
     if ((op == STR_s) || (op == STR_d)) {
       LogVWrite(address, srcdst, GetPrintRegisterFormatForSizeFP(access_size));
     } else if ((op == STR_b) || (op == STR_h) || (op == STR_q)) {
@@ -1920,6 +1929,8 @@ void Simulator::LoadStoreHelper(Instruction* instr, int64_t offset,
     } else {
       LogWrite(address, srcdst, GetPrintRegisterFormatForSize(access_size));
     }
+  } else {
+    DCHECK_EQ(op, PRFM);
   }
 
   // Handle the writeback for loads after the load to ensure safe pop
@@ -3591,9 +3602,10 @@ void Simulator::VisitException(Instruction* instr) {
         uint32_t code;
         uint32_t parameters;
 
-        memcpy(&code, pc_->InstructionAtOffset(kDebugCodeOffset), sizeof(code));
-        memcpy(&parameters, pc_->InstructionAtOffset(kDebugParamsOffset),
-               sizeof(parameters));
+        base::Memcpy(&code, pc_->InstructionAtOffset(kDebugCodeOffset),
+                     sizeof(code));
+        base::Memcpy(&parameters, pc_->InstructionAtOffset(kDebugParamsOffset),
+                     sizeof(parameters));
         char const* message = reinterpret_cast<char const*>(
             pc_->InstructionAtOffset(kDebugMessageOffset));
 
@@ -5812,9 +5824,9 @@ void Simulator::DoPrintf(Instruction* instr) {
   uint32_t arg_count;
   uint32_t arg_pattern_list;
   STATIC_ASSERT(sizeof(*instr) == 1);
-  memcpy(&arg_count, instr + kPrintfArgCountOffset, sizeof(arg_count));
-  memcpy(&arg_pattern_list, instr + kPrintfArgPatternListOffset,
-         sizeof(arg_pattern_list));
+  base::Memcpy(&arg_count, instr + kPrintfArgCountOffset, sizeof(arg_count));
+  base::Memcpy(&arg_pattern_list, instr + kPrintfArgPatternListOffset,
+               sizeof(arg_pattern_list));
 
   DCHECK_LE(arg_count, kPrintfMaxArgCount);
   DCHECK_EQ(arg_pattern_list >> (kPrintfArgPatternBits * arg_count), 0);
diff --git a/deps/v8/src/execution/arm64/simulator-arm64.h b/deps/v8/src/execution/arm64/simulator-arm64.h
index ee6d6341825b93..6098a74776e93f 100644
--- a/deps/v8/src/execution/arm64/simulator-arm64.h
+++ b/deps/v8/src/execution/arm64/simulator-arm64.h
@@ -11,9 +11,11 @@
 #if defined(USE_SIMULATOR)
 
 #include <stdarg.h>
+
 #include <vector>
 
 #include "src/base/compiler-specific.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/arm64/assembler-arm64.h"
 #include "src/codegen/arm64/decoder-arm64.h"
 #include "src/codegen/assembler.h"
@@ -249,7 +251,7 @@ class SimMemory {
     DCHECK((sizeof(value) == 1) || (sizeof(value) == 2) ||
            (sizeof(value) == 4) || (sizeof(value) == 8) ||
            (sizeof(value) == 16));
-    memcpy(&value, reinterpret_cast<const char*>(address), sizeof(value));
+    base::Memcpy(&value, reinterpret_cast<const char*>(address), sizeof(value));
     return value;
   }
 
@@ -259,7 +261,7 @@ class SimMemory {
     DCHECK((sizeof(value) == 1) || (sizeof(value) == 2) ||
            (sizeof(value) == 4) || (sizeof(value) == 8) ||
            (sizeof(value) == 16));
-    memcpy(reinterpret_cast<char*>(address), &value, sizeof(value));
+    base::Memcpy(reinterpret_cast<char*>(address), &value, sizeof(value));
   }
 };
 
@@ -325,7 +327,7 @@ class SimRegisterBase {
       // All AArch64 registers are zero-extending.
       memset(value_ + sizeof(new_value), 0, kSizeInBytes - sizeof(new_value));
     }
-    memcpy(&value_, &new_value, sizeof(T));
+    base::Memcpy(&value_, &new_value, sizeof(T));
     NotifyRegisterWrite();
   }
 
@@ -338,7 +340,8 @@ class SimRegisterBase {
     DCHECK_GE(lane, 0);
     DCHECK_LE(sizeof(new_value) + (lane * sizeof(new_value)),
               static_cast<unsigned>(kSizeInBytes));
-    memcpy(&value_[lane * sizeof(new_value)], &new_value, sizeof(new_value));
+    base::Memcpy(&value_[lane * sizeof(new_value)], &new_value,
+                 sizeof(new_value));
     NotifyRegisterWrite();
   }
 
@@ -348,7 +351,7 @@ class SimRegisterBase {
     DCHECK_GE(lane, 0);
     DCHECK_LE(sizeof(result) + (lane * sizeof(result)),
               static_cast<unsigned>(kSizeInBytes));
-    memcpy(&result, &value_[lane * sizeof(result)], sizeof(result));
+    base::Memcpy(&result, &value_[lane * sizeof(result)], sizeof(result));
     return result;
   }
 
@@ -436,7 +439,7 @@ class LogicVRegister {
   int64_t IntLeftJustified(VectorFormat vform, int index) const {
     uint64_t value = UintLeftJustified(vform, index);
     int64_t result;
-    memcpy(&result, &value, sizeof(result));
+    base::Memcpy(&result, &value, sizeof(result));
     return result;
   }
 
@@ -672,13 +675,13 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
     explicit CallArgument(T argument) {
       bits_ = 0;
       DCHECK(sizeof(argument) <= sizeof(bits_));
-      memcpy(&bits_, &argument, sizeof(argument));
+      base::Memcpy(&bits_, &argument, sizeof(argument));
       type_ = X_ARG;
     }
 
     explicit CallArgument(double argument) {
       DCHECK(sizeof(argument) == sizeof(bits_));
-      memcpy(&bits_, &argument, sizeof(argument));
+      base::Memcpy(&bits_, &argument, sizeof(argument));
       type_ = D_ARG;
     }
 
@@ -689,10 +692,10 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
       // Make the D register a NaN to try to trap errors if the callee expects a
       // double. If it expects a float, the callee should ignore the top word.
       DCHECK(sizeof(kFP64SignallingNaN) == sizeof(bits_));
-      memcpy(&bits_, &kFP64SignallingNaN, sizeof(kFP64SignallingNaN));
+      base::Memcpy(&bits_, &kFP64SignallingNaN, sizeof(kFP64SignallingNaN));
       // Write the float payload to the S register.
       DCHECK(sizeof(argument) <= sizeof(bits_));
-      memcpy(&bits_, &argument, sizeof(argument));
+      base::Memcpy(&bits_, &argument, sizeof(argument));
       type_ = D_ARG;
     }
 
@@ -755,7 +758,7 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
   template <typename T>
   void set_pc(T new_pc) {
     DCHECK(sizeof(T) == sizeof(pc_));
-    memcpy(&pc_, &new_pc, sizeof(T));
+    base::Memcpy(&pc_, &new_pc, sizeof(T));
     pc_modified_ = true;
   }
   Instruction* pc() { return pc_; }
@@ -1047,7 +1050,7 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
     static_assert(sizeof(result) <= sizeof(raw),
                   "Template type must be <= 64 bits.");
     // Copy the result and truncate to fit. This assumes a little-endian host.
-    memcpy(&result, &raw, sizeof(result));
+    base::Memcpy(&result, &raw, sizeof(result));
     return result;
   }
 
@@ -1502,7 +1505,7 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
     STATIC_ASSERT((sizeof(value) == 1) || (sizeof(value) == 2) ||
                   (sizeof(value) == 4) || (sizeof(value) == 8) ||
                   (sizeof(value) == 16));
-    memcpy(&value, reinterpret_cast<const void*>(address), sizeof(value));
+    base::Memcpy(&value, reinterpret_cast<const void*>(address), sizeof(value));
     return value;
   }
 
@@ -1512,7 +1515,7 @@ class Simulator : public DecoderVisitor, public SimulatorBase {
     STATIC_ASSERT((sizeof(value) == 1) || (sizeof(value) == 2) ||
                   (sizeof(value) == 4) || (sizeof(value) == 8) ||
                   (sizeof(value) == 16));
-    memcpy(reinterpret_cast<void*>(address), &value, sizeof(value));
+    base::Memcpy(reinterpret_cast<void*>(address), &value, sizeof(value));
   }
 
   template <typename T>
diff --git a/deps/v8/src/execution/external-pointer-table.cc b/deps/v8/src/execution/external-pointer-table.cc
index 5b199ae3cf7d5e..70361069365577 100644
--- a/deps/v8/src/execution/external-pointer-table.cc
+++ b/deps/v8/src/execution/external-pointer-table.cc
@@ -4,6 +4,8 @@
 
 #include "src/execution/external-pointer-table.h"
 
+#include "src/base/platform/wrappers.h"
+
 namespace v8 {
 namespace internal {
 
@@ -11,7 +13,7 @@ void ExternalPointerTable::GrowTable(ExternalPointerTable* table) {
   // TODO(v8:10391, saelo): overflow check here and in the multiplication below
   uint32_t new_capacity = table->capacity_ + table->capacity_ / 2;
   table->buffer_ = reinterpret_cast<Address*>(
-      realloc(table->buffer_, new_capacity * sizeof(Address)));
+      base::Realloc(table->buffer_, new_capacity * sizeof(Address)));
   CHECK(table->buffer_);
   memset(&table->buffer_[table->capacity_], 0,
          (new_capacity - table->capacity_) * sizeof(Address));
diff --git a/deps/v8/src/execution/external-pointer-table.h b/deps/v8/src/execution/external-pointer-table.h
index 7774a39248f587..243682b36cfcaf 100644
--- a/deps/v8/src/execution/external-pointer-table.h
+++ b/deps/v8/src/execution/external-pointer-table.h
@@ -5,6 +5,7 @@
 #ifndef V8_EXECUTION_EXTERNAL_POINTER_TABLE_H_
 #define V8_EXECUTION_EXTERNAL_POINTER_TABLE_H_
 
+#include "src/base/platform/wrappers.h"
 #include "src/common/external-pointer.h"
 #include "src/utils/utils.h"
 
@@ -16,8 +17,8 @@ class V8_EXPORT_PRIVATE ExternalPointerTable {
   static const int kExternalPointerTableInitialCapacity = 1024;
 
   ExternalPointerTable()
-      : buffer_(reinterpret_cast<Address*>(
-            calloc(kExternalPointerTableInitialCapacity, sizeof(Address)))),
+      : buffer_(reinterpret_cast<Address*>(base::Calloc(
+            kExternalPointerTableInitialCapacity, sizeof(Address)))),
         length_(1),
         capacity_(kExternalPointerTableInitialCapacity),
         freelist_head_(0) {
diff --git a/deps/v8/src/execution/frames-inl.h b/deps/v8/src/execution/frames-inl.h
index 3cee9d58556796..b394c7b614c801 100644
--- a/deps/v8/src/execution/frames-inl.h
+++ b/deps/v8/src/execution/frames-inl.h
@@ -27,6 +27,9 @@ class InnerPointerToCodeCache {
     Flush();
   }
 
+  InnerPointerToCodeCache(const InnerPointerToCodeCache&) = delete;
+  InnerPointerToCodeCache& operator=(const InnerPointerToCodeCache&) = delete;
+
   void Flush() { memset(static_cast<void*>(&cache_[0]), 0, sizeof(cache_)); }
 
   InnerPointerToCodeCacheEntry* GetCacheEntry(Address inner_pointer);
@@ -38,8 +41,6 @@ class InnerPointerToCodeCache {
 
   static const int kInnerPointerToCodeCacheSize = 1024;
   InnerPointerToCodeCacheEntry cache_[kInnerPointerToCodeCacheSize];
-
-  DISALLOW_COPY_AND_ASSIGN(InnerPointerToCodeCache);
 };
 
 inline Address StackHandler::address() const {
diff --git a/deps/v8/src/execution/frames.cc b/deps/v8/src/execution/frames.cc
index 3288f53c8dffac..64ac998c28af90 100644
--- a/deps/v8/src/execution/frames.cc
+++ b/deps/v8/src/execution/frames.cc
@@ -8,6 +8,7 @@
 #include <sstream>
 
 #include "src/base/bits.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/interface-descriptors.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/register-configuration.h"
@@ -300,13 +301,13 @@ SafeStackFrameIterator::SafeStackFrameIterator(Isolate* isolate, Address pc,
     frame_ = nullptr;
     return;
   }
-  // 'Fast C calls' are a special type of C call where we call directly from JS
-  // to C without an exit frame inbetween. The CEntryStub is responsible for
-  // setting Isolate::c_entry_fp, meaning that it won't be set for fast C calls.
-  // To keep the stack iterable, we store the FP and PC of the caller of the
-  // fast C call on the isolate. This is guaranteed to be the topmost JS frame,
-  // because fast C calls cannot call back into JS. We start iterating the stack
-  // from this topmost JS frame.
+  // 'Fast C calls' are a special type of C call where we call directly from
+  // JS to C without an exit frame inbetween. The CEntryStub is responsible
+  // for setting Isolate::c_entry_fp, meaning that it won't be set for fast C
+  // calls. To keep the stack iterable, we store the FP and PC of the caller
+  // of the fast C call on the isolate. This is guaranteed to be the topmost
+  // JS frame, because fast C calls cannot call back into JS. We start
+  // iterating the stack from this topmost JS frame.
   if (fast_c_fp) {
     DCHECK_NE(kNullAddress, isolate->isolate_data()->fast_c_call_caller_pc());
     type = StackFrame::Type::OPTIMIZED;
@@ -401,6 +402,7 @@ void SafeStackFrameIterator::AdvanceOneFrame() {
   DCHECK(!done());
   StackFrame* last_frame = frame_;
   Address last_sp = last_frame->sp(), last_fp = last_frame->fp();
+
   // Before advancing to the next stack frame, perform pointer validity tests.
   if (!IsValidFrame(last_frame) || !IsValidCaller(last_frame)) {
     frame_ = nullptr;
@@ -827,7 +829,7 @@ const char* StringForStackFrameType(StackFrame::Type type) {
 
 void StackFrame::Print(StringStream* accumulator, PrintMode mode,
                        int index) const {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   PrintIndex(accumulator, mode, index);
   accumulator->Add(StringForStackFrameType(type()));
   accumulator->Add(" [pc: %p]\n", reinterpret_cast<void*>(pc()));
@@ -835,7 +837,7 @@ void StackFrame::Print(StringStream* accumulator, PrintMode mode,
 
 void BuiltinExitFrame::Print(StringStream* accumulator, PrintMode mode,
                              int index) const {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object receiver = this->receiver();
   JSFunction function = this->function();
 
@@ -1187,7 +1189,7 @@ void JavaScriptFrame::PrintFunctionAndOffset(JSFunction function,
                                              AbstractCode code, int code_offset,
                                              FILE* file,
                                              bool print_line_number) {
-  PrintF(file, "%s", CodeKindIsOptimizedJSFunction(code.kind()) ? "*" : "~");
+  PrintF(file, "%s", CodeKindToMarker(code.kind()));
   function.PrintName(file);
   PrintF(file, "+%d", code_offset);
   if (print_line_number) {
@@ -1215,7 +1217,7 @@ void JavaScriptFrame::PrintFunctionAndOffset(JSFunction function,
 void JavaScriptFrame::PrintTop(Isolate* isolate, FILE* file, bool print_args,
                                bool print_line_number) {
   // constructor calls
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   JavaScriptFrameIterator it(isolate);
   while (!it.done()) {
     if (it.frame()->is_java_script()) {
@@ -1230,8 +1232,8 @@ void JavaScriptFrame::PrintTop(Isolate* isolate, FILE* file, bool print_args,
         Code code = frame->unchecked_code();
         code_offset = static_cast<int>(frame->pc() - code.InstructionStart());
       }
-      PrintFunctionAndOffset(function, function.abstract_code(), code_offset,
-                             file, print_line_number);
+      PrintFunctionAndOffset(function, function.abstract_code(isolate),
+                             code_offset, file, print_line_number);
       if (print_args) {
         // function arguments
         // (we are intentionally only printing the actually
@@ -1376,8 +1378,10 @@ void FrameSummary::JavaScriptFrameSummary::EnsureSourcePositionsAvailable() {
 }
 
 bool FrameSummary::JavaScriptFrameSummary::AreSourcePositionsAvailable() const {
-  return !FLAG_enable_lazy_source_positions ||
-         function()->shared().GetBytecodeArray().HasSourcePositionTable();
+  return !FLAG_enable_lazy_source_positions || function()
+                                                   ->shared()
+                                                   .GetBytecodeArray(isolate())
+                                                   .HasSourcePositionTable();
 }
 
 bool FrameSummary::JavaScriptFrameSummary::is_subject_to_debugging() const {
@@ -1572,7 +1576,8 @@ void OptimizedFrame::Summarize(std::vector<FrameSummary>* frames) const {
       } else {
         DCHECK_EQ(it->kind(), TranslatedFrame::kInterpretedFunction);
         code_offset = it->node_id().ToInt();  // Points to current bytecode.
-        abstract_code = handle(shared_info->abstract_code(), isolate());
+        abstract_code =
+            handle(shared_info->abstract_code(isolate()), isolate());
       }
 
       // Append full summary of the encountered JS frame.
@@ -1648,7 +1653,7 @@ void OptimizedFrame::GetFunctions(
     return JavaScriptFrame::GetFunctions(functions);
   }
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int deopt_index = Safepoint::kNoDeoptimizationIndex;
   DeoptimizationData const data = GetDeoptimizationData(&deopt_index);
   DCHECK(!data.is_null());
@@ -1817,7 +1822,7 @@ void WasmFrame::Print(StringStream* accumulator, PrintMode mode,
   const int kMaxPrintedFunctionName = 64;
   char func_name[kMaxPrintedFunctionName + 1];
   int func_name_len = std::min(kMaxPrintedFunctionName, raw_func_name.length());
-  memcpy(func_name, raw_func_name.begin(), func_name_len);
+  base::Memcpy(func_name, raw_func_name.begin(), func_name_len);
   func_name[func_name_len] = '\0';
   int pos = position();
   const wasm::WasmModule* module = wasm_instance().module_object().module();
@@ -2001,7 +2006,7 @@ void JavaScriptFrame::Print(StringStream* accumulator, PrintMode mode,
   Handle<SharedFunctionInfo> shared = handle(function().shared(), isolate());
   SharedFunctionInfo::EnsureSourcePositionsAvailable(isolate(), shared);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object receiver = this->receiver();
   JSFunction function = this->function();
 
diff --git a/deps/v8/src/execution/frames.h b/deps/v8/src/execution/frames.h
index 43f9d383c2ed81..7a86dfa641d6c0 100644
--- a/deps/v8/src/execution/frames.h
+++ b/deps/v8/src/execution/frames.h
@@ -1175,6 +1175,9 @@ class JavaScriptBuiltinContinuationWithCatchFrame
 
 class StackFrameIteratorBase {
  public:
+  StackFrameIteratorBase(const StackFrameIteratorBase&) = delete;
+  StackFrameIteratorBase& operator=(const StackFrameIteratorBase&) = delete;
+
   Isolate* isolate() const { return isolate_; }
 
   bool done() const { return frame_ == nullptr; }
@@ -1203,7 +1206,6 @@ class StackFrameIteratorBase {
 
  private:
   friend class StackFrame;
-  DISALLOW_COPY_AND_ASSIGN(StackFrameIteratorBase);
 };
 
 class StackFrameIterator : public StackFrameIteratorBase {
@@ -1213,6 +1215,9 @@ class StackFrameIterator : public StackFrameIteratorBase {
   // An iterator that iterates over a given thread's stack.
   V8_EXPORT_PRIVATE StackFrameIterator(Isolate* isolate, ThreadLocalTop* t);
 
+  StackFrameIterator(const StackFrameIterator&) = delete;
+  StackFrameIterator& operator=(const StackFrameIterator&) = delete;
+
   StackFrame* frame() const {
     DCHECK(!done());
     return frame_;
@@ -1222,8 +1227,6 @@ class StackFrameIterator : public StackFrameIteratorBase {
  private:
   // Go back to the first frame.
   void Reset(ThreadLocalTop* top);
-
-  DISALLOW_COPY_AND_ASSIGN(StackFrameIterator);
 };
 
 // Iterator that supports iterating through all JavaScript frames.
diff --git a/deps/v8/src/execution/futex-emulation.cc b/deps/v8/src/execution/futex-emulation.cc
index 033edffc851e68..f93eaacf03c460 100644
--- a/deps/v8/src/execution/futex-emulation.cc
+++ b/deps/v8/src/execution/futex-emulation.cc
@@ -27,6 +27,8 @@ using AtomicsWaitEvent = v8::Isolate::AtomicsWaitEvent;
 class FutexWaitList {
  public:
   FutexWaitList() = default;
+  FutexWaitList(const FutexWaitList&) = delete;
+  FutexWaitList& operator=(const FutexWaitList&) = delete;
 
   void AddNode(FutexWaitListNode* node);
   void RemoveNode(FutexWaitListNode* node);
@@ -95,8 +97,6 @@ class FutexWaitList {
   // Isolate* -> linked list of Nodes which are waiting for their Promises to
   // be resolved.
   std::map<Isolate*, HeadAndTail> isolate_promises_to_resolve_;
-
-  DISALLOW_COPY_AND_ASSIGN(FutexWaitList);
 };
 
 namespace {
@@ -130,7 +130,7 @@ void FutexWaitListNode::NotifyWake() {
   // variable. The mutex will not be locked if FutexEmulation::Wait hasn't
   // locked it yet. In that case, we set the interrupted_
   // flag to true, which will be tested after the mutex locked by a future wait.
-  NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+  NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
   // if not waiting, this will not have any effect.
   cond_.NotifyOne();
@@ -247,7 +247,7 @@ void AtomicsWaitWakeHandle::Wake() {
   // The split lock by itself isn’t an issue, as long as the caller properly
   // synchronizes this with the closing `AtomicsWaitCallback`.
   {
-    NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+    NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
     stopped_ = true;
   }
   isolate_->futex_wait_list_node()->NotifyWake();
@@ -380,7 +380,7 @@ Object FutexEmulation::WaitSync(Isolate* isolate,
   AtomicsWaitEvent callback_result = AtomicsWaitEvent::kWokenUp;
 
   do {  // Not really a loop, just makes it easier to break out early.
-    NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+    NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
     std::shared_ptr<BackingStore> backing_store =
         array_buffer->GetBackingStore();
@@ -586,7 +586,7 @@ Object FutexEmulation::WaitAsync(Isolate* isolate,
       new FutexWaitListNode(backing_store, addr, promise_capability, isolate);
 
   {
-    NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+    NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
     g_wait_list.Pointer()->AddNode(node);
   }
   if (use_timeout) {
@@ -619,7 +619,7 @@ Object FutexEmulation::Wake(Handle<JSArrayBuffer> array_buffer, size_t addr,
   std::shared_ptr<BackingStore> backing_store = array_buffer->GetBackingStore();
   auto wait_location = FutexWaitList::ToWaitLocation(backing_store.get(), addr);
 
-  NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+  NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
   auto& location_lists = g_wait_list.Pointer()->location_lists_;
   auto it = location_lists.find(wait_location);
@@ -783,7 +783,7 @@ void FutexEmulation::ResolveAsyncWaiterPromises(Isolate* isolate) {
 
   FutexWaitListNode* node;
   {
-    NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+    NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
     auto& isolate_map = g_wait_list.Pointer()->isolate_promises_to_resolve_;
     auto it = isolate_map.find(isolate);
@@ -817,7 +817,7 @@ void FutexEmulation::HandleAsyncWaiterTimeout(FutexWaitListNode* node) {
   DCHECK(node->IsAsync());
 
   {
-    NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+    NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
     node->timeout_task_id_ = CancelableTaskManager::kInvalidTaskId;
     if (!node->waiting_) {
@@ -838,7 +838,7 @@ void FutexEmulation::HandleAsyncWaiterTimeout(FutexWaitListNode* node) {
 }
 
 void FutexEmulation::IsolateDeinit(Isolate* isolate) {
-  NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+  NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
   // Iterate all locations to find nodes belonging to "isolate" and delete them.
   // The Isolate is going away; don't bother cleaning up the Promises in the
@@ -883,7 +883,7 @@ Object FutexEmulation::NumWaitersForTesting(Handle<JSArrayBuffer> array_buffer,
   DCHECK_LT(addr, array_buffer->byte_length());
   std::shared_ptr<BackingStore> backing_store = array_buffer->GetBackingStore();
 
-  NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+  NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
   auto wait_location = FutexWaitList::ToWaitLocation(backing_store.get(), addr);
   auto& location_lists = g_wait_list.Pointer()->location_lists_;
@@ -907,7 +907,7 @@ Object FutexEmulation::NumWaitersForTesting(Handle<JSArrayBuffer> array_buffer,
 }
 
 Object FutexEmulation::NumAsyncWaitersForTesting(Isolate* isolate) {
-  NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+  NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
   int waiters = 0;
   for (const auto& it : g_wait_list.Pointer()->location_lists_) {
@@ -928,7 +928,7 @@ Object FutexEmulation::NumUnresolvedAsyncPromisesForTesting(
   DCHECK_LT(addr, array_buffer->byte_length());
   std::shared_ptr<BackingStore> backing_store = array_buffer->GetBackingStore();
 
-  NoHeapAllocationMutexGuard lock_guard(g_mutex.Pointer());
+  NoGarbageCollectionMutexGuard lock_guard(g_mutex.Pointer());
 
   int waiters = 0;
   auto& isolate_map = g_wait_list.Pointer()->isolate_promises_to_resolve_;
diff --git a/deps/v8/src/execution/futex-emulation.h b/deps/v8/src/execution/futex-emulation.h
index 480be2a45ef112..cf8a9fd0796529 100644
--- a/deps/v8/src/execution/futex-emulation.h
+++ b/deps/v8/src/execution/futex-emulation.h
@@ -65,6 +65,8 @@ class FutexWaitListNode {
                     size_t wait_addr, Handle<JSObject> promise_capability,
                     Isolate* isolate);
   ~FutexWaitListNode();
+  FutexWaitListNode(const FutexWaitListNode&) = delete;
+  FutexWaitListNode& operator=(const FutexWaitListNode&) = delete;
 
   void NotifyWake();
 
@@ -73,15 +75,15 @@ class FutexWaitListNode {
   // Returns false if the cancelling failed, true otherwise.
   bool CancelTimeoutTask();
 
-  class ResetWaitingOnScopeExit {
+  class V8_NODISCARD ResetWaitingOnScopeExit {
    public:
     explicit ResetWaitingOnScopeExit(FutexWaitListNode* node) : node_(node) {}
     ~ResetWaitingOnScopeExit() { node_->waiting_ = false; }
+    ResetWaitingOnScopeExit(const ResetWaitingOnScopeExit&) = delete;
+    ResetWaitingOnScopeExit& operator=(const ResetWaitingOnScopeExit&) = delete;
 
    private:
     FutexWaitListNode* node_;
-
-    DISALLOW_COPY_AND_ASSIGN(ResetWaitingOnScopeExit);
   };
 
  private:
@@ -132,8 +134,6 @@ class FutexWaitListNode {
 
   CancelableTaskManager::Id timeout_task_id_ =
       CancelableTaskManager::kInvalidTaskId;
-
-  DISALLOW_COPY_AND_ASSIGN(FutexWaitListNode);
 };
 
 class FutexEmulation : public AllStatic {
diff --git a/deps/v8/src/execution/interrupts-scope.h b/deps/v8/src/execution/interrupts-scope.h
index 6419ee2d99ffa9..19611142b08eda 100644
--- a/deps/v8/src/execution/interrupts-scope.h
+++ b/deps/v8/src/execution/interrupts-scope.h
@@ -14,7 +14,7 @@ class Isolate;
 
 // Scope intercepts only interrupt which is part of its interrupt_mask and does
 // not affect other interrupts.
-class InterruptsScope {
+class V8_NODISCARD InterruptsScope {
  public:
   enum Mode { kPostponeInterrupts, kRunInterrupts, kNoop };
 
@@ -45,7 +45,7 @@ class InterruptsScope {
 // postpone scope is left the interrupts will be re-enabled and any
 // interrupts that occurred while in the scope will be taken into
 // account.
-class PostponeInterruptsScope : public InterruptsScope {
+class V8_NODISCARD PostponeInterruptsScope : public InterruptsScope {
  public:
   PostponeInterruptsScope(Isolate* isolate,
                           int intercept_mask = StackGuard::ALL_INTERRUPTS)
@@ -57,7 +57,7 @@ class PostponeInterruptsScope : public InterruptsScope {
 // Support for overriding PostponeInterruptsScope. Interrupt is not ignored if
 // innermost scope is SafeForInterruptsScope ignoring any outer
 // PostponeInterruptsScopes.
-class SafeForInterruptsScope : public InterruptsScope {
+class V8_NODISCARD SafeForInterruptsScope : public InterruptsScope {
  public:
   SafeForInterruptsScope(Isolate* isolate,
                          int intercept_mask = StackGuard::ALL_INTERRUPTS)
diff --git a/deps/v8/src/execution/isolate-data.h b/deps/v8/src/execution/isolate-data.h
index c875d92f096f27..7315837b7e2966 100644
--- a/deps/v8/src/execution/isolate-data.h
+++ b/deps/v8/src/execution/isolate-data.h
@@ -31,6 +31,9 @@ class IsolateData final {
  public:
   explicit IsolateData(Isolate* isolate) : stack_guard_(isolate) {}
 
+  IsolateData(const IsolateData&) = delete;
+  IsolateData& operator=(const IsolateData&) = delete;
+
   static constexpr intptr_t kIsolateRootBias = kRootRegisterBias;
 
   // The value of the kRootRegister.
@@ -75,6 +78,10 @@ class IsolateData final {
     return kFastCCallCallerPCOffset - kIsolateRootBias;
   }
 
+  static constexpr int fast_api_call_target_offset() {
+    return kFastApiCallTargetOffset - kIsolateRootBias;
+  }
+
   // Root-register-relative offset of the given builtin table entry.
   // TODO(ishell): remove in favour of typified id version.
   static int builtin_slot_offset(int builtin_index) {
@@ -90,10 +97,14 @@ class IsolateData final {
   // The FP and PC that are saved right before TurboAssembler::CallCFunction.
   Address* fast_c_call_caller_fp_address() { return &fast_c_call_caller_fp_; }
   Address* fast_c_call_caller_pc_address() { return &fast_c_call_caller_pc_; }
+  // The address of the fast API callback right before it's executed from
+  // generated code.
+  Address* fast_api_call_target_address() { return &fast_api_call_target_; }
   StackGuard* stack_guard() { return &stack_guard_; }
   uint8_t* stack_is_iterable_address() { return &stack_is_iterable_; }
   Address fast_c_call_caller_fp() { return fast_c_call_caller_fp_; }
   Address fast_c_call_caller_pc() { return fast_c_call_caller_pc_; }
+  Address fast_api_call_target() { return fast_api_call_target_; }
   uint8_t stack_is_iterable() { return stack_is_iterable_; }
 
   // Returns true if this address points to data stored in this instance.
@@ -130,6 +141,7 @@ class IsolateData final {
   V(kEmbedderDataOffset, Internals::kNumIsolateDataSlots* kSystemPointerSize) \
   V(kFastCCallCallerFPOffset, kSystemPointerSize)                             \
   V(kFastCCallCallerPCOffset, kSystemPointerSize)                             \
+  V(kFastApiCallTargetOffset, kSystemPointerSize)                             \
   V(kStackGuardOffset, StackGuard::kSizeInBytes)                              \
   V(kRootsTableOffset, RootsTable::kEntriesCount* kSystemPointerSize)         \
   V(kExternalReferenceTableOffset, ExternalReferenceTable::kSizeInBytes)      \
@@ -166,9 +178,10 @@ class IsolateData final {
   // instruction in compiled code.
   Address fast_c_call_caller_fp_ = kNullAddress;
   Address fast_c_call_caller_pc_ = kNullAddress;
+  Address fast_api_call_target_ = kNullAddress;
 
-  // Fields related to the system and JS stack. In particular, this contains the
-  // stack limit used by stack checks in generated code.
+  // Fields related to the system and JS stack. In particular, this contains
+  // the stack limit used by stack checks in generated code.
   StackGuard stack_guard_;
 
   RootsTable roots_;
@@ -209,8 +222,6 @@ class IsolateData final {
   friend class Heap;
   FRIEND_TEST(HeapTest, ExternalLimitDefault);
   FRIEND_TEST(HeapTest, ExternalLimitStaysAboveDefaultForExplicitHandling);
-
-  DISALLOW_COPY_AND_ASSIGN(IsolateData);
 };
 
 // IsolateData object must have "predictable" layout which does not change when
@@ -232,6 +243,8 @@ void IsolateData::AssertPredictableLayout() {
                 kFastCCallCallerFPOffset);
   STATIC_ASSERT(offsetof(IsolateData, fast_c_call_caller_pc_) ==
                 kFastCCallCallerPCOffset);
+  STATIC_ASSERT(offsetof(IsolateData, fast_api_call_target_) ==
+                kFastApiCallTargetOffset);
   STATIC_ASSERT(offsetof(IsolateData, stack_guard_) == kStackGuardOffset);
 #ifdef V8_HEAP_SANDBOX
   STATIC_ASSERT(offsetof(IsolateData, external_pointer_table_) ==
diff --git a/deps/v8/src/execution/isolate-inl.h b/deps/v8/src/execution/isolate-inl.h
index 42f534c23ed0f7..aa477913b6dd13 100644
--- a/deps/v8/src/execution/isolate-inl.h
+++ b/deps/v8/src/execution/isolate-inl.h
@@ -84,7 +84,7 @@ bool Isolate::is_catchable_by_wasm(Object exception) {
   if (!is_catchable_by_javascript(exception)) return false;
   if (!exception.IsJSObject()) return true;
   // We don't allocate, but the LookupIterator interface expects a handle.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   HandleScope handle_scope(this);
   LookupIterator it(this, handle(JSReceiver::cast(exception), this),
                     factory()->wasm_uncatchable_symbol(),
diff --git a/deps/v8/src/execution/isolate.cc b/deps/v8/src/execution/isolate.cc
index 1c1380061b3060..f6f47a75cc52b9 100644
--- a/deps/v8/src/execution/isolate.cc
+++ b/deps/v8/src/execution/isolate.cc
@@ -39,6 +39,7 @@
 #include "src/diagnostics/compilation-statistics.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/isolate-inl.h"
+#include "src/execution/local-isolate.h"
 #include "src/execution/messages.h"
 #include "src/execution/microtask-queue.h"
 #include "src/execution/protectors-inl.h"
@@ -103,6 +104,7 @@
 #endif  // V8_OS_WIN64
 
 #ifdef V8_ENABLE_CONSERVATIVE_STACK_SCANNING
+#include "src/base/platform/wrappers.h"
 #include "src/heap/conservative-stack-visitor.h"
 #endif
 
@@ -378,7 +380,7 @@ size_t Isolate::HashIsolateForEmbeddedBlob() {
   DCHECK(builtins_.is_initialized());
   DCHECK(Builtins::AllBuiltinsAreIsolateIndependent());
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   static constexpr size_t kSeed = 0;
   size_t hash = kSeed;
@@ -636,7 +638,7 @@ class FrameArrayBuilder {
         break;
     }
 
-    elements_ = isolate->factory()->NewFrameArray(Min(limit, 10));
+    elements_ = isolate->factory()->NewFrameArray(std::min(limit, 10));
   }
 
   void AppendAsyncFrame(Handle<JSGeneratorObject> generator_object) {
@@ -648,7 +650,8 @@ class FrameArrayBuilder {
 
     Handle<Object> receiver(generator_object->receiver(), isolate_);
     Handle<AbstractCode> code(
-        AbstractCode::cast(function->shared().GetBytecodeArray()), isolate_);
+        AbstractCode::cast(function->shared().GetBytecodeArray(isolate_)),
+        isolate_);
     int offset = Smi::ToInt(generator_object->input_or_debug_pos());
     // The stored bytecode offset is relative to a different base than what
     // is used in the source position table, hence the subtraction.
@@ -878,7 +881,7 @@ bool GetStackTraceLimit(Isolate* isolate, int* result) {
   if (!stack_trace_limit->IsNumber()) return false;
 
   // Ensure that limit is not negative.
-  *result = Max(FastD2IChecked(stack_trace_limit->Number()), 0);
+  *result = std::max(FastD2IChecked(stack_trace_limit->Number()), 0);
 
   if (*result != FLAG_stack_trace_limit) {
     isolate->CountUsage(v8::Isolate::kErrorStackTraceLimit);
@@ -1259,7 +1262,7 @@ Address Isolate::GetAbstractPC(int* line, int* column) {
 Handle<FixedArray> Isolate::CaptureCurrentStackTrace(
     int frame_limit, StackTrace::StackTraceOptions stack_trace_options) {
   CaptureStackTraceOptions options;
-  options.limit = Max(frame_limit, 0);  // Ensure no negative values.
+  options.limit = std::max(frame_limit, 0);  // Ensure no negative values.
   options.skip_mode = SKIP_NONE;
   options.capture_builtin_exit_frames = false;
   options.async_stack_trace = false;
@@ -1341,10 +1344,10 @@ void Isolate::ReportFailedAccessCheck(Handle<JSObject> receiver) {
   HandleScope scope(this);
   Handle<Object> data;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     AccessCheckInfo access_check_info = AccessCheckInfo::Get(this, receiver);
     if (access_check_info.is_null()) {
-      AllowHeapAllocation doesnt_matter_anymore;
+      no_gc.Release();
       return ScheduleThrow(
           *factory()->NewTypeError(MessageTemplate::kNoAccess));
     }
@@ -1367,7 +1370,7 @@ bool Isolate::MayAccess(Handle<Context> accessing_context,
   // During bootstrapping, callback functions are not enabled yet.
   if (bootstrapper()->IsActive()) return true;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
 
     if (receiver->IsJSGlobalProxy()) {
       Object receiver_context = JSGlobalProxy::cast(*receiver).native_context();
@@ -1389,7 +1392,7 @@ bool Isolate::MayAccess(Handle<Context> accessing_context,
   Handle<Object> data;
   v8::AccessCheckCallback callback = nullptr;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     AccessCheckInfo access_check_info = AccessCheckInfo::Get(this, receiver);
     if (access_check_info.is_null()) return false;
     Object fun_obj = access_check_info.callback();
@@ -1612,8 +1615,7 @@ Object Isolate::ThrowInternal(Object raw_exception, MessageLocation* location) {
 // Script::GetLineNumber and Script::GetColumnNumber can allocate on the heap to
 // initialize the line_ends array, so be careful when calling them.
 #ifdef DEBUG
-      if (AllowHeapAllocation::IsAllowed() &&
-          AllowGarbageCollection::IsAllowed()) {
+      if (AllowGarbageCollection::IsAllowed()) {
 #else
       if ((false)) {
 #endif
@@ -2231,7 +2233,7 @@ bool Isolate::ComputeLocationFromStackTrace(MessageLocation* target,
       const int code_offset = elements->Offset(i).value();
       Handle<Script> casted_script(Script::cast(script), this);
       if (shared->HasBytecodeArray() &&
-          shared->GetBytecodeArray().HasSourcePositionTable()) {
+          shared->GetBytecodeArray(this).HasSourcePositionTable()) {
         int pos = abstract_code.SourcePosition(code_offset);
         *target = MessageLocation(casted_script, pos, pos + 1, shared);
       } else {
@@ -2910,6 +2912,7 @@ void Isolate::Delete(Isolate* isolate) {
   Isolate* saved_isolate = reinterpret_cast<Isolate*>(
       base::Thread::GetThreadLocal(isolate->isolate_key_));
   SetIsolateThreadLocals(isolate, nullptr);
+  isolate->set_thread_id(ThreadId::Current());
 
   isolate->Deinit();
 
@@ -3108,9 +3111,14 @@ void Isolate::Deinit() {
   // This stops cancelable tasks (i.e. concurrent marking tasks)
   cancelable_task_manager()->CancelAndWait();
 
+  main_thread_local_isolate_->heap()->FreeLinearAllocationArea();
+
   heap_.TearDown();
+
+  main_thread_local_isolate_.reset();
+
   FILE* logfile = logger_->TearDownAndGetLogFile();
-  if (logfile != nullptr) fclose(logfile);
+  if (logfile != nullptr) base::Fclose(logfile);
 
   if (wasm_engine_) {
     wasm_engine_->RemoveIsolate(this);
@@ -3539,6 +3547,10 @@ bool Isolate::Init(SnapshotData* startup_snapshot_data,
   ReadOnlyHeap::SetUp(this, read_only_snapshot_data, can_rehash);
   heap_.SetUpSpaces();
 
+  // Create LocalIsolate/LocalHeap for the main thread and set state to Running.
+  main_thread_local_isolate_.reset(new LocalIsolate(this, ThreadKind::kMain));
+  main_thread_local_heap()->Unpark();
+
   isolate_data_.external_reference_table()->Init(this);
 
   // Setup the wasm engine.
@@ -3839,7 +3851,7 @@ void Isolate::DumpAndResetStats() {
 
 void Isolate::AbortConcurrentOptimization(BlockingBehavior behavior) {
   if (concurrent_recompilation_enabled()) {
-    DisallowHeapAllocation no_recursive_gc;
+    DisallowGarbageCollection no_recursive_gc;
     optimizing_compile_dispatcher()->Flush(behavior);
   }
 }
@@ -3939,7 +3951,7 @@ Isolate::KnownPrototype Isolate::IsArrayOrObjectOrStringPrototype(
 }
 
 bool Isolate::IsInAnyContext(Object object, uint32_t index) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object context = heap()->native_contexts_list();
   while (!context.IsUndefined(this)) {
     Context current_context = Context::cast(context);
@@ -3952,7 +3964,7 @@ bool Isolate::IsInAnyContext(Object object, uint32_t index) {
 }
 
 void Isolate::UpdateNoElementsProtectorOnSetElement(Handle<JSObject> object) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (!object->map().is_prototype_map()) return;
   if (!Protectors::IsNoElementsIntact(this)) return;
   KnownPrototype obj_type = IsArrayOrObjectOrStringPrototype(*object);
@@ -3966,7 +3978,7 @@ void Isolate::UpdateNoElementsProtectorOnSetElement(Handle<JSObject> object) {
 }
 
 bool Isolate::IsAnyInitialArrayPrototype(Handle<JSArray> array) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return IsInAnyContext(*array, Context::INITIAL_ARRAY_PROTOTYPE_INDEX);
 }
 
@@ -4543,7 +4555,7 @@ void Isolate::CollectSourcePositionsForAllBytecodeArrays() {
   HandleScope scope(this);
   std::vector<Handle<SharedFunctionInfo>> sfis;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     HeapObjectIterator iterator(heap());
     for (HeapObject obj = iterator.Next(); !obj.is_null();
          obj = iterator.Next()) {
@@ -4561,13 +4573,41 @@ void Isolate::CollectSourcePositionsForAllBytecodeArrays() {
 }
 
 #ifdef V8_INTL_SUPPORT
-icu::UMemory* Isolate::get_cached_icu_object(ICUObjectCacheType cache_type) {
-  return icu_object_cache_[cache_type].get();
+namespace {
+std::string GetStringFromLocale(Handle<Object> locales_obj) {
+  DCHECK(locales_obj->IsString() || locales_obj->IsUndefined());
+  if (locales_obj->IsString()) {
+    return std::string(String::cast(*locales_obj).ToCString().get());
+  }
+
+  return "";
+}
+}  // namespace
+
+icu::UMemory* Isolate::get_cached_icu_object(ICUObjectCacheType cache_type,
+                                             Handle<Object> locales_obj) {
+  std::string locale = GetStringFromLocale(locales_obj);
+  auto value = icu_object_cache_.find(cache_type);
+  if (value == icu_object_cache_.end()) return nullptr;
+
+  ICUCachePair pair = value->second;
+  if (pair.first != locale) return nullptr;
+
+  return pair.second.get();
 }
 
-void Isolate::set_icu_object_in_cache(ICUObjectCacheType cache_type,
-                                      std::shared_ptr<icu::UMemory> obj) {
-  icu_object_cache_[cache_type] = obj;
+void Isolate::set_icu_object_in_cache(
+    ICUObjectCacheType cache_type, Handle<Object> locales_obj,
+    std::shared_ptr<icu::UMemory> icu_formatter) {
+  std::string locale = GetStringFromLocale(locales_obj);
+  ICUCachePair pair = std::make_pair(locale, icu_formatter);
+
+  auto it = icu_object_cache_.find(cache_type);
+  if (it == icu_object_cache_.end()) {
+    icu_object_cache_.insert({cache_type, pair});
+  } else {
+    it->second = pair;
+  }
 }
 
 void Isolate::clear_cached_icu_object(ICUObjectCacheType cache_type) {
@@ -4727,6 +4767,15 @@ void Isolate::RemoveContextIdCallback(const v8::WeakCallbackInfo<void>& data) {
   isolate->recorder_context_id_map_.erase(context_id);
 }
 
+LocalHeap* Isolate::main_thread_local_heap() {
+  return main_thread_local_isolate()->heap();
+}
+
+LocalHeap* Isolate::CurrentLocalHeap() {
+  LocalHeap* local_heap = LocalHeap::Current();
+  return local_heap ? local_heap : main_thread_local_heap();
+}
+
 // |chunk| is either a Page or an executable LargePage.
 void Isolate::RemoveCodeMemoryChunk(MemoryChunk* chunk) {
   // We only keep track of individual code pages/allocations if we are on arm32,
diff --git a/deps/v8/src/execution/isolate.h b/deps/v8/src/execution/isolate.h
index 18fb4b6417e2c5..9dbe897ffd6891 100644
--- a/deps/v8/src/execution/isolate.h
+++ b/deps/v8/src/execution/isolate.h
@@ -27,6 +27,7 @@
 #include "src/execution/futex-emulation.h"
 #include "src/execution/isolate-data.h"
 #include "src/execution/messages.h"
+#include "src/execution/shared-mutex-guard-if-off-thread.h"
 #include "src/execution/stack-guard.h"
 #include "src/handles/handles.h"
 #include "src/heap/factory.h"
@@ -483,6 +484,9 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   class EntryStackItem;
 
  public:
+  Isolate(const Isolate&) = delete;
+  Isolate& operator=(const Isolate&) = delete;
+
   using HandleScopeType = HandleScope;
   void* operator new(size_t) = delete;
   void operator delete(void*) = delete;
@@ -504,6 +508,8 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
     {
     }
     ~PerIsolateThreadData();
+    PerIsolateThreadData(const PerIsolateThreadData&) = delete;
+    PerIsolateThreadData& operator=(const PerIsolateThreadData&) = delete;
     Isolate* isolate() const { return isolate_; }
     ThreadId thread_id() const { return thread_id_; }
 
@@ -531,8 +537,6 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
     friend class Isolate;
     friend class ThreadDataTable;
     friend class EntryStackItem;
-
-    DISALLOW_COPY_AND_ASSIGN(PerIsolateThreadData);
   };
 
   static void InitializeOncePerProcess();
@@ -639,6 +643,11 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
     return &transition_array_access_;
   }
 
+  // Shared mutex for allowing concurrent read/writes to SharedFunctionInfos.
+  base::SharedMutex* shared_function_info_access() {
+    return &shared_function_info_access_;
+  }
+
   // The isolate's string table.
   StringTable* string_table() { return string_table_.get(); }
 
@@ -650,7 +659,12 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   Context* context_address() { return &thread_local_top()->context_; }
 
   // Access to current thread id.
-  THREAD_LOCAL_TOP_ACCESSOR(ThreadId, thread_id)
+  inline void set_thread_id(ThreadId id) {
+    thread_local_top()->thread_id_.store(id, std::memory_order_relaxed);
+  }
+  inline ThreadId thread_id() const {
+    return thread_local_top()->thread_id_.load(std::memory_order_relaxed);
+  }
 
   // Interface to pending exception.
   inline Object pending_exception();
@@ -774,7 +788,7 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   // Heuristically guess whether a Promise is handled by user catch handler
   bool PromiseHasUserDefinedRejectHandler(Handle<JSPromise> promise);
 
-  class ExceptionScope {
+  class V8_NODISCARD ExceptionScope {
    public:
     // Scope currently can only be used for regular exceptions,
     // not termination exception.
@@ -987,6 +1001,7 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   }
   StackGuard* stack_guard() { return isolate_data()->stack_guard(); }
   Heap* heap() { return &heap_; }
+  const Heap* heap() const { return &heap_; }
   ReadOnlyHeap* read_only_heap() const { return read_only_heap_; }
   static Isolate* FromHeap(Heap* heap) {
     return reinterpret_cast<Isolate*>(reinterpret_cast<Address>(heap) -
@@ -1258,8 +1273,10 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
       kDefaultCollator, kDefaultNumberFormat, kDefaultSimpleDateFormat,
       kDefaultSimpleDateFormatForTime, kDefaultSimpleDateFormatForDate};
 
-  icu::UMemory* get_cached_icu_object(ICUObjectCacheType cache_type);
+  icu::UMemory* get_cached_icu_object(ICUObjectCacheType cache_type,
+                                      Handle<Object> locales);
   void set_icu_object_in_cache(ICUObjectCacheType cache_type,
+                               Handle<Object> locale,
                                std::shared_ptr<icu::UMemory> obj);
   void clear_cached_icu_object(ICUObjectCacheType cache_type);
   void ClearCachedIcuObjects();
@@ -1574,6 +1591,14 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   void set_allow_atomics_wait(bool set) { allow_atomics_wait_ = set; }
   bool allow_atomics_wait() { return allow_atomics_wait_; }
 
+  void set_supported_import_assertions(
+      const std::vector<std::string>& supported_import_assertions) {
+    supported_import_assertions_ = supported_import_assertions;
+  }
+  const std::vector<std::string>& supported_import_assertions() const {
+    return supported_import_assertions_;
+  }
+
   // Register a finalizer to be called at isolate teardown.
   void RegisterManagedPtrDestructor(ManagedPtrDestructor* finalizer);
 
@@ -1617,6 +1642,13 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   MaybeLocal<v8::Context> GetContextFromRecorderContextId(
       v8::metrics::Recorder::ContextId id);
 
+  LocalIsolate* main_thread_local_isolate() {
+    return main_thread_local_isolate_.get();
+  }
+
+  LocalHeap* main_thread_local_heap();
+  LocalHeap* CurrentLocalHeap();
+
 #ifdef V8_HEAP_SANDBOX
   ExternalPointerTable& external_pointer_table() {
     return isolate_data_.external_pointer_table_;
@@ -1678,14 +1710,13 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
           previous_thread_data(previous_thread_data),
           previous_isolate(previous_isolate),
           previous_item(previous_item) {}
+    EntryStackItem(const EntryStackItem&) = delete;
+    EntryStackItem& operator=(const EntryStackItem&) = delete;
 
     int entry_count;
     PerIsolateThreadData* previous_thread_data;
     Isolate* previous_isolate;
     EntryStackItem* previous_item;
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(EntryStackItem);
   };
 
   static base::Thread::LocalStorageKey per_isolate_thread_data_key_;
@@ -1758,6 +1789,7 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   base::SharedMutex feedback_vector_access_;
   base::SharedMutex string_access_;
   base::SharedMutex transition_array_access_;
+  base::SharedMutex shared_function_info_access_;
   Logger* logger_ = nullptr;
   StubCache* load_stub_cache_ = nullptr;
   StubCache* store_stub_cache_ = nullptr;
@@ -1800,6 +1832,7 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   PromiseHook promise_hook_ = nullptr;
   HostImportModuleDynamicallyCallback host_import_module_dynamically_callback_ =
       nullptr;
+  std::vector<std::string> supported_import_assertions_;
   HostInitializeImportMetaObjectCallback
       host_initialize_import_meta_object_callback_ = nullptr;
   base::Mutex rail_mutex_;
@@ -1813,10 +1846,9 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
       return static_cast<std::size_t>(a);
     }
   };
-  std::unordered_map<ICUObjectCacheType, std::shared_ptr<icu::UMemory>,
-                     ICUObjectCacheTypeHash>
+  typedef std::pair<std::string, std::shared_ptr<icu::UMemory>> ICUCachePair;
+  std::unordered_map<ICUObjectCacheType, ICUCachePair, ICUObjectCacheTypeHash>
       icu_object_cache_;
-
 #endif  // V8_INTL_SUPPORT
 
   // true if being profiled. Causes collection of extra compile info.
@@ -1954,6 +1986,8 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
   bool promise_hook_or_debug_is_active_or_async_event_delegate_ = false;
   int async_task_count_ = 0;
 
+  std::unique_ptr<LocalIsolate> main_thread_local_isolate_;
+
   v8::Isolate::AbortOnUncaughtExceptionCallback
       abort_on_uncaught_exception_callback_ = nullptr;
 
@@ -2001,8 +2035,6 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
 
   friend class heap::HeapTester;
   friend class TestSerializer;
-
-  DISALLOW_COPY_AND_ASSIGN(Isolate);
 };
 
 #undef FIELD_ACCESSOR
@@ -2048,7 +2080,7 @@ class V8_EXPORT_PRIVATE SaveAndSwitchContext : public SaveContext {
 
 // A scope which sets the given isolate's context to null for its lifetime to
 // ensure that code does not make assumptions on a context being available.
-class NullContextScope : public SaveAndSwitchContext {
+class V8_NODISCARD NullContextScope : public SaveAndSwitchContext {
  public:
   explicit NullContextScope(Isolate* isolate)
       : SaveAndSwitchContext(isolate, Context()) {}
@@ -2144,6 +2176,20 @@ class StackTraceFailureMessage {
   uintptr_t end_marker_ = kEndMarker;
 };
 
+template <base::MutexSharedType kIsShared>
+class V8_NODISCARD SharedMutexGuardIfOffThread<Isolate, kIsShared> final {
+ public:
+  SharedMutexGuardIfOffThread(base::SharedMutex* mutex, Isolate* isolate) {
+    DCHECK_NOT_NULL(mutex);
+    DCHECK_NOT_NULL(isolate);
+    DCHECK_EQ(ThreadId::Current(), isolate->thread_id());
+  }
+
+  SharedMutexGuardIfOffThread(const SharedMutexGuardIfOffThread&) = delete;
+  SharedMutexGuardIfOffThread& operator=(const SharedMutexGuardIfOffThread&) =
+      delete;
+};
+
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/execution/local-isolate.cc b/deps/v8/src/execution/local-isolate.cc
index 77733907f82234..c79c8ac75c4b8f 100644
--- a/deps/v8/src/execution/local-isolate.cc
+++ b/deps/v8/src/execution/local-isolate.cc
@@ -20,7 +20,8 @@ LocalIsolate::LocalIsolate(Isolate* isolate, ThreadKind kind)
       thread_id_(ThreadId::Current()),
       stack_limit_(kind == ThreadKind::kMain
                        ? isolate->stack_guard()->real_climit()
-                       : GetCurrentStackPosition() - FLAG_stack_size * KB) {}
+                       : GetCurrentStackPosition() - FLAG_stack_size * KB),
+      supported_import_assertions_(isolate->supported_import_assertions()) {}
 
 LocalIsolate::~LocalIsolate() = default;
 
diff --git a/deps/v8/src/execution/local-isolate.h b/deps/v8/src/execution/local-isolate.h
index 7cfa156fb7400d..f978c1a2dc92ad 100644
--- a/deps/v8/src/execution/local-isolate.h
+++ b/deps/v8/src/execution/local-isolate.h
@@ -6,6 +6,7 @@
 #define V8_EXECUTION_LOCAL_ISOLATE_H_
 
 #include "src/base/macros.h"
+#include "src/execution/shared-mutex-guard-if-off-thread.h"
 #include "src/execution/thread-id.h"
 #include "src/handles/handles.h"
 #include "src/handles/local-handles.h"
@@ -52,6 +53,7 @@ class V8_EXPORT_PRIVATE LocalIsolate final : private HiddenLocalFactory {
   inline Object root(RootIndex index) const;
 
   StringTable* string_table() const { return isolate_->string_table(); }
+  base::SharedMutex* string_access() { return isolate_->string_access(); }
 
   v8::internal::LocalFactory* factory() {
     // Upcast to the privately inherited base-class using c-style casts to avoid
@@ -81,6 +83,12 @@ class V8_EXPORT_PRIVATE LocalIsolate final : private HiddenLocalFactory {
   ThreadId thread_id() const { return thread_id_; }
   Address stack_limit() const { return stack_limit_; }
 
+  bool is_main_thread() const { return heap_.is_main_thread(); }
+
+  const std::vector<std::string>& supported_import_assertions() const {
+    return supported_import_assertions_;
+  }
+
  private:
   friend class v8::internal::LocalFactory;
 
@@ -93,6 +101,25 @@ class V8_EXPORT_PRIVATE LocalIsolate final : private HiddenLocalFactory {
   std::unique_ptr<LocalLogger> logger_;
   ThreadId const thread_id_;
   Address const stack_limit_;
+  std::vector<std::string> supported_import_assertions_;
+};
+
+template <base::MutexSharedType kIsShared>
+class V8_NODISCARD SharedMutexGuardIfOffThread<LocalIsolate, kIsShared> final {
+ public:
+  SharedMutexGuardIfOffThread(base::SharedMutex* mutex, LocalIsolate* isolate) {
+    DCHECK_NOT_NULL(mutex);
+    DCHECK_NOT_NULL(isolate);
+    DCHECK(!isolate->is_main_thread());
+    mutex_guard_.emplace(mutex);
+  }
+
+  SharedMutexGuardIfOffThread(const SharedMutexGuardIfOffThread&) = delete;
+  SharedMutexGuardIfOffThread& operator=(const SharedMutexGuardIfOffThread&) =
+      delete;
+
+ private:
+  base::Optional<base::SharedMutexGuard<kIsShared>> mutex_guard_;
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/execution/messages.cc b/deps/v8/src/execution/messages.cc
index 343711b7651eb6..75426223b60670 100644
--- a/deps/v8/src/execution/messages.cc
+++ b/deps/v8/src/execution/messages.cc
@@ -836,7 +836,7 @@ MaybeHandle<Object> AppendErrorString(Isolate* isolate, Handle<Object> error,
   return error;
 }
 
-class PrepareStackTraceScope {
+class V8_NODISCARD PrepareStackTraceScope {
  public:
   explicit PrepareStackTraceScope(Isolate* isolate) : isolate_(isolate) {
     DCHECK(!isolate_->formatting_stack_trace());
@@ -845,10 +845,11 @@ class PrepareStackTraceScope {
 
   ~PrepareStackTraceScope() { isolate_->set_formatting_stack_trace(false); }
 
+  PrepareStackTraceScope(const PrepareStackTraceScope&) = delete;
+  PrepareStackTraceScope& operator=(const PrepareStackTraceScope&) = delete;
+
  private:
   Isolate* isolate_;
-
-  DISALLOW_COPY_AND_ASSIGN(PrepareStackTraceScope);
 };
 
 }  // namespace
diff --git a/deps/v8/src/execution/mips/simulator-mips.cc b/deps/v8/src/execution/mips/simulator-mips.cc
index 76b65f404a8af4..ca402dca0403c9 100644
--- a/deps/v8/src/execution/mips/simulator-mips.cc
+++ b/deps/v8/src/execution/mips/simulator-mips.cc
@@ -10,10 +10,13 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
+
 #include <cmath>
 
 #include "src/base/bits.h"
 #include "src/base/lazy-instance.h"
+#include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/mips/constants-mips.h"
@@ -847,7 +850,7 @@ void Simulator::CheckICache(base::CustomMatcherHashMap* i_cache,
                        cache_page->CachedData(offset), kInstrSize));
   } else {
     // Cache miss.  Load memory into the cache.
-    memcpy(cached_line, line, CachePage::kLineLength);
+    base::Memcpy(cached_line, line, CachePage::kLineLength);
     *cache_valid_byte = CachePage::LINE_VALID;
   }
 }
@@ -856,7 +859,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
   // Set up simulator support first. Some of this information is needed to
   // setup the architecture state.
   stack_size_ = FLAG_sim_stack_size * KB;
-  stack_ = reinterpret_cast<char*>(malloc(stack_size_));
+  stack_ = reinterpret_cast<char*>(base::Malloc(stack_size_));
   pc_modified_ = false;
   icount_ = 0;
   break_count_ = 0;
@@ -893,7 +896,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
 
 Simulator::~Simulator() {
   GlobalMonitor::Get()->RemoveLinkedAddress(&global_monitor_thread_);
-  free(stack_);
+  base::Free(stack_);
 }
 
 // Get the active Simulator for the current thread.
@@ -987,8 +990,8 @@ double Simulator::get_double_from_register_pair(int reg) {
   // Read the bits from the unsigned integer register_[] array
   // into the double precision floating point value and return it.
   char buffer[2 * sizeof(registers_[0])];
-  memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
-  memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
+  base::Memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
+  base::Memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
   return (dm_val);
 }
 
@@ -1041,13 +1044,13 @@ double Simulator::get_fpu_register_double(int fpureg) const {
 template <typename T>
 void Simulator::get_msa_register(int wreg, T* value) {
   DCHECK((wreg >= 0) && (wreg < kNumMSARegisters));
-  memcpy(value, FPUregisters_ + wreg * 2, kSimd128Size);
+  base::Memcpy(value, FPUregisters_ + wreg * 2, kSimd128Size);
 }
 
 template <typename T>
 void Simulator::set_msa_register(int wreg, const T* value) {
   DCHECK((wreg >= 0) && (wreg < kNumMSARegisters));
-  memcpy(FPUregisters_ + wreg * 2, value, kSimd128Size);
+  base::Memcpy(FPUregisters_ + wreg * 2, value, kSimd128Size);
 }
 
 // Runtime FP routines take up to two double arguments and zero
@@ -1068,14 +1071,14 @@ void Simulator::GetFpArgs(double* x, double* y, int32_t* z) {
     // Registers a0 and a1 -> x.
     reg_buffer[0] = get_register(a0);
     reg_buffer[1] = get_register(a1);
-    memcpy(x, buffer, sizeof(buffer));
+    base::Memcpy(x, buffer, sizeof(buffer));
     // Registers a2 and a3 -> y.
     reg_buffer[0] = get_register(a2);
     reg_buffer[1] = get_register(a3);
-    memcpy(y, buffer, sizeof(buffer));
+    base::Memcpy(y, buffer, sizeof(buffer));
     // Register 2 -> z.
     reg_buffer[0] = get_register(a2);
-    memcpy(z, buffer, sizeof(*z));
+    base::Memcpy(z, buffer, sizeof(*z));
   }
 }
 
@@ -1086,7 +1089,7 @@ void Simulator::SetFpResult(const double& result) {
   } else {
     char buffer[2 * sizeof(registers_[0])];
     int32_t* reg_buffer = reinterpret_cast<int32_t*>(buffer);
-    memcpy(buffer, &result, sizeof(buffer));
+    base::Memcpy(buffer, &result, sizeof(buffer));
     // Copy result to v0 and v1.
     set_register(v0, reg_buffer[0]);
     set_register(v1, reg_buffer[1]);
@@ -1104,6 +1107,10 @@ void Simulator::set_fcsr_bit(uint32_t cc, bool value) {
 
 bool Simulator::test_fcsr_bit(uint32_t cc) { return FCSR_ & (1 << cc); }
 
+void Simulator::clear_fcsr_cause() {
+  FCSR_ &= ~kFCSRCauseMask;
+}
+
 void Simulator::set_fcsr_rounding_mode(FPURoundingMode mode) {
   FCSR_ |= mode & kFPURoundingModeMask;
 }
@@ -1244,24 +1251,31 @@ bool Simulator::set_fcsr_round_error(double original, double rounded) {
   double max_int32 = std::numeric_limits<int32_t>::max();
   double min_int32 = std::numeric_limits<int32_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < DBL_MIN && rounded > -DBL_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded > max_int32 || rounded < min_int32) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1277,24 +1291,31 @@ bool Simulator::set_fcsr_round64_error(double original, double rounded) {
   double max_int64 = std::numeric_limits<int64_t>::max();
   double min_int64 = std::numeric_limits<int64_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < DBL_MIN && rounded > -DBL_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded >= max_int64 || rounded < min_int64) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1308,24 +1329,31 @@ bool Simulator::set_fcsr_round_error(float original, float rounded) {
   double max_int32 = std::numeric_limits<int32_t>::max();
   double min_int32 = std::numeric_limits<int32_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < FLT_MIN && rounded > -FLT_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded > max_int32 || rounded < min_int32) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1341,24 +1369,31 @@ bool Simulator::set_fcsr_round64_error(float original, float rounded) {
   double max_int64 = std::numeric_limits<int64_t>::max();
   double min_int64 = std::numeric_limits<int64_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < FLT_MIN && rounded > -FLT_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded >= max_int64 || rounded < min_int64) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1653,7 +1688,7 @@ void Simulator::TraceMSARegWr(T* value, TraceType t) {
       float f[4];
       double df[2];
     } v;
-    memcpy(v.b, value, kSimd128Size);
+    base::Memcpy(v.b, value, kSimd128Size);
     switch (t) {
       case BYTE:
         SNPrintF(trace_buf_,
@@ -1706,7 +1741,7 @@ void Simulator::TraceMSARegWr(T* value) {
       float f[kMSALanesWord];
       double df[kMSALanesDword];
     } v;
-    memcpy(v.b, value, kMSALanesByte);
+    base::Memcpy(v.b, value, kMSALanesByte);
 
     if (std::is_same<T, int32_t>::value) {
       SNPrintF(trace_buf_,
@@ -2135,7 +2170,7 @@ void Simulator::WriteMem(int32_t addr, T value, Instruction* instr) {
 uintptr_t Simulator::StackLimit(uintptr_t c_limit) const {
   // The simulator uses a separate JS stack. If we have exhausted the C stack,
   // we also drop down the JS limit to reflect the exhaustion on the JS stack.
-  if (GetCurrentStackPosition() < c_limit) {
+  if (base::Stack::GetCurrentStackPosition() < c_limit) {
     return reinterpret_cast<uintptr_t>(get_sp());
   }
 
@@ -4403,16 +4438,16 @@ T Simulator::MsaI5InstrHelper(uint32_t opcode, T ws, int32_t i5) {
       res = static_cast<T>(ws - ui5);
       break;
     case MAXI_S:
-      res = static_cast<T>(Max(ws, static_cast<T>(i5)));
+      res = static_cast<T>(std::max(ws, static_cast<T>(i5)));
       break;
     case MINI_S:
-      res = static_cast<T>(Min(ws, static_cast<T>(i5)));
+      res = static_cast<T>(std::min(ws, static_cast<T>(i5)));
       break;
     case MAXI_U:
-      res = static_cast<T>(Max(ws_u64, ui5_u64));
+      res = static_cast<T>(std::max(ws_u64, ui5_u64));
       break;
     case MINI_U:
-      res = static_cast<T>(Min(ws_u64, ui5_u64));
+      res = static_cast<T>(std::min(ws_u64, ui5_u64));
       break;
     case CEQI:
       res = static_cast<T>(!Compare(ws, static_cast<T>(i5)) ? -1ull : 0ull);
@@ -4901,16 +4936,16 @@ T Simulator::Msa3RInstrHelper(uint32_t opcode, T wd, T ws, T wt) {
       res = ws - wt;
       break;
     case MAX_S:
-      res = Max(ws, wt);
+      res = std::max(ws, wt);
       break;
     case MAX_U:
-      res = static_cast<T>(Max(static_cast<uT>(ws), static_cast<uT>(wt)));
+      res = static_cast<T>(std::max(static_cast<uT>(ws), static_cast<uT>(wt)));
       break;
     case MIN_S:
-      res = Min(ws, wt);
+      res = std::min(ws, wt);
       break;
     case MIN_U:
-      res = static_cast<T>(Min(static_cast<uT>(ws), static_cast<uT>(wt)));
+      res = static_cast<T>(std::min(static_cast<uT>(ws), static_cast<uT>(wt)));
       break;
     case MAX_A:
       // We use negative abs in order to avoid problems
@@ -7028,8 +7063,8 @@ intptr_t Simulator::CallImpl(Address entry, int argument_count,
   }
   // Store remaining arguments on stack, from low to high memory.
   intptr_t* stack_argument = reinterpret_cast<intptr_t*>(entry_stack);
-  memcpy(stack_argument + kCArgSlotCount, arguments + reg_arg_count,
-         (argument_count - reg_arg_count) * sizeof(*arguments));
+  base::Memcpy(stack_argument + kCArgSlotCount, arguments + reg_arg_count,
+               (argument_count - reg_arg_count) * sizeof(*arguments));
   set_register(sp, entry_stack);
 
   CallInternal(entry);
@@ -7048,9 +7083,9 @@ double Simulator::CallFP(Address entry, double d0, double d1) {
   } else {
     int buffer[2];
     DCHECK(sizeof(buffer[0]) * 2 == sizeof(d0));
-    memcpy(buffer, &d0, sizeof(d0));
+    base::Memcpy(buffer, &d0, sizeof(d0));
     set_dw_register(a0, buffer);
-    memcpy(buffer, &d1, sizeof(d1));
+    base::Memcpy(buffer, &d1, sizeof(d1));
     set_dw_register(a2, buffer);
   }
   CallInternal(entry);
diff --git a/deps/v8/src/execution/mips/simulator-mips.h b/deps/v8/src/execution/mips/simulator-mips.h
index 162ab4aa7fd381..16f9a1ceadf69a 100644
--- a/deps/v8/src/execution/mips/simulator-mips.h
+++ b/deps/v8/src/execution/mips/simulator-mips.h
@@ -267,6 +267,7 @@ class Simulator : public SimulatorBase {
   void set_msa_register(int wreg, const T* value);
   void set_fcsr_bit(uint32_t cc, bool value);
   bool test_fcsr_bit(uint32_t cc);
+  void clear_fcsr_cause();
   void set_fcsr_rounding_mode(FPURoundingMode mode);
   void set_msacsr_rounding_mode(FPURoundingMode mode);
   unsigned int get_fcsr_rounding_mode();
diff --git a/deps/v8/src/execution/mips64/simulator-mips64.cc b/deps/v8/src/execution/mips64/simulator-mips64.cc
index 72f283632927ff..198022b3a4e412 100644
--- a/deps/v8/src/execution/mips64/simulator-mips64.cc
+++ b/deps/v8/src/execution/mips64/simulator-mips64.cc
@@ -10,9 +10,12 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
+
 #include <cmath>
 
 #include "src/base/bits.h"
+#include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/mips64/constants-mips64.h"
@@ -788,7 +791,7 @@ void Simulator::CheckICache(base::CustomMatcherHashMap* i_cache,
                        cache_page->CachedData(offset), kInstrSize));
   } else {
     // Cache miss.  Load memory into the cache.
-    memcpy(cached_line, line, CachePage::kLineLength);
+    base::Memcpy(cached_line, line, CachePage::kLineLength);
     *cache_valid_byte = CachePage::LINE_VALID;
   }
 }
@@ -797,7 +800,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
   // Set up simulator support first. Some of this information is needed to
   // setup the architecture state.
   stack_size_ = FLAG_sim_stack_size * KB;
-  stack_ = reinterpret_cast<char*>(malloc(stack_size_));
+  stack_ = reinterpret_cast<char*>(base::Malloc(stack_size_));
   pc_modified_ = false;
   icount_ = 0;
   break_count_ = 0;
@@ -835,7 +838,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
 
 Simulator::~Simulator() {
   GlobalMonitor::Get()->RemoveLinkedAddress(&global_monitor_thread_);
-  free(stack_);
+  base::Free(stack_);
 }
 
 // Get the active Simulator for the current thread.
@@ -929,8 +932,8 @@ double Simulator::get_double_from_register_pair(int reg) {
   // Read the bits from the unsigned integer register_[] array
   // into the double precision floating point value and return it.
   char buffer[sizeof(registers_[0])];
-  memcpy(buffer, &registers_[reg], sizeof(registers_[0]));
-  memcpy(&dm_val, buffer, sizeof(registers_[0]));
+  base::Memcpy(buffer, &registers_[reg], sizeof(registers_[0]));
+  base::Memcpy(&dm_val, buffer, sizeof(registers_[0]));
   return (dm_val);
 }
 
@@ -967,13 +970,13 @@ double Simulator::get_fpu_register_double(int fpureg) const {
 template <typename T>
 void Simulator::get_msa_register(int wreg, T* value) {
   DCHECK((wreg >= 0) && (wreg < kNumMSARegisters));
-  memcpy(value, FPUregisters_ + wreg * 2, kSimd128Size);
+  base::Memcpy(value, FPUregisters_ + wreg * 2, kSimd128Size);
 }
 
 template <typename T>
 void Simulator::set_msa_register(int wreg, const T* value) {
   DCHECK((wreg >= 0) && (wreg < kNumMSARegisters));
-  memcpy(FPUregisters_ + wreg * 2, value, kSimd128Size);
+  base::Memcpy(FPUregisters_ + wreg * 2, value, kSimd128Size);
 }
 
 // Runtime FP routines take up to two double arguments and zero
@@ -995,14 +998,14 @@ void Simulator::GetFpArgs(double* x, double* y, int32_t* z) {
     // Registers a0 and a1 -> x.
     reg_buffer[0] = get_register(a0);
     reg_buffer[1] = get_register(a1);
-    memcpy(x, buffer, sizeof(buffer));
+    base::Memcpy(x, buffer, sizeof(buffer));
     // Registers a2 and a3 -> y.
     reg_buffer[0] = get_register(a2);
     reg_buffer[1] = get_register(a3);
-    memcpy(y, buffer, sizeof(buffer));
+    base::Memcpy(y, buffer, sizeof(buffer));
     // Register 2 -> z.
     reg_buffer[0] = get_register(a2);
-    memcpy(z, buffer, sizeof(*z));
+    base::Memcpy(z, buffer, sizeof(*z));
   }
 }
 
@@ -1013,7 +1016,7 @@ void Simulator::SetFpResult(const double& result) {
   } else {
     char buffer[2 * sizeof(registers_[0])];
     int64_t* reg_buffer = reinterpret_cast<int64_t*>(buffer);
-    memcpy(buffer, &result, sizeof(buffer));
+    base::Memcpy(buffer, &result, sizeof(buffer));
     // Copy result to v0 and v1.
     set_register(v0, reg_buffer[0]);
     set_register(v1, reg_buffer[1]);
@@ -1031,6 +1034,10 @@ void Simulator::set_fcsr_bit(uint32_t cc, bool value) {
 
 bool Simulator::test_fcsr_bit(uint32_t cc) { return FCSR_ & (1 << cc); }
 
+void Simulator::clear_fcsr_cause() {
+  FCSR_ &= ~kFCSRCauseMask;
+}
+
 void Simulator::set_fcsr_rounding_mode(FPURoundingMode mode) {
   FCSR_ |= mode & kFPURoundingModeMask;
 }
@@ -1054,24 +1061,31 @@ bool Simulator::set_fcsr_round_error(double original, double rounded) {
   double max_int32 = std::numeric_limits<int32_t>::max();
   double min_int32 = std::numeric_limits<int32_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < DBL_MIN && rounded > -DBL_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded > max_int32 || rounded < min_int32) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1087,24 +1101,31 @@ bool Simulator::set_fcsr_round64_error(double original, double rounded) {
   double max_int64 = std::numeric_limits<int64_t>::max();
   double min_int64 = std::numeric_limits<int64_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < DBL_MIN && rounded > -DBL_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded >= max_int64 || rounded < min_int64) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1118,24 +1139,31 @@ bool Simulator::set_fcsr_round_error(float original, float rounded) {
   double max_int32 = std::numeric_limits<int32_t>::max();
   double min_int32 = std::numeric_limits<int32_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < FLT_MIN && rounded > -FLT_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded > max_int32 || rounded < min_int32) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1268,24 +1296,31 @@ bool Simulator::set_fcsr_round64_error(float original, float rounded) {
   double max_int64 = std::numeric_limits<int64_t>::max();
   double min_int64 = std::numeric_limits<int64_t>::min();
 
+  clear_fcsr_cause();
+
   if (!std::isfinite(original) || !std::isfinite(rounded)) {
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
   if (original != rounded) {
     set_fcsr_bit(kFCSRInexactFlagBit, true);
+    set_fcsr_bit(kFCSRInexactCauseBit, true);
   }
 
   if (rounded < FLT_MIN && rounded > -FLT_MIN && rounded != 0) {
     set_fcsr_bit(kFCSRUnderflowFlagBit, true);
+    set_fcsr_bit(kFCSRUnderflowCauseBit, true);
     ret = true;
   }
 
   if (rounded >= max_int64 || rounded < min_int64) {
     set_fcsr_bit(kFCSROverflowFlagBit, true);
+    set_fcsr_bit(kFCSROverflowCauseBit, true);
     // The reference is not really clear but it seems this is required:
     set_fcsr_bit(kFCSRInvalidOpFlagBit, true);
+    set_fcsr_bit(kFCSRInvalidOpCauseBit, true);
     ret = true;
   }
 
@@ -1590,7 +1625,7 @@ void Simulator::TraceMSARegWr(T* value, TraceType t) {
       float f[4];
       double df[2];
     } v;
-    memcpy(v.b, value, kSimd128Size);
+    base::Memcpy(v.b, value, kSimd128Size);
     switch (t) {
       case BYTE:
         SNPrintF(trace_buf_,
@@ -1643,7 +1678,7 @@ void Simulator::TraceMSARegWr(T* value) {
       float f[kMSALanesWord];
       double df[kMSALanesDword];
     } v;
-    memcpy(v.b, value, kMSALanesByte);
+    base::Memcpy(v.b, value, kMSALanesByte);
 
     if (std::is_same<T, int32_t>::value) {
       SNPrintF(trace_buf_,
@@ -2140,7 +2175,7 @@ void Simulator::WriteMem(int64_t addr, T value, Instruction* instr) {
 uintptr_t Simulator::StackLimit(uintptr_t c_limit) const {
   // The simulator uses a separate JS stack. If we have exhausted the C stack,
   // we also drop down the JS limit to reflect the exhaustion on the JS stack.
-  if (GetCurrentStackPosition() < c_limit) {
+  if (base::Stack::GetCurrentStackPosition() < c_limit) {
     return reinterpret_cast<uintptr_t>(get_sp());
   }
 
@@ -4662,16 +4697,16 @@ T Simulator::MsaI5InstrHelper(uint32_t opcode, T ws, int32_t i5) {
       res = static_cast<T>(ws - ui5);
       break;
     case MAXI_S:
-      res = static_cast<T>(Max(ws, static_cast<T>(i5)));
+      res = static_cast<T>(std::max(ws, static_cast<T>(i5)));
       break;
     case MINI_S:
-      res = static_cast<T>(Min(ws, static_cast<T>(i5)));
+      res = static_cast<T>(std::min(ws, static_cast<T>(i5)));
       break;
     case MAXI_U:
-      res = static_cast<T>(Max(ws_u64, ui5_u64));
+      res = static_cast<T>(std::max(ws_u64, ui5_u64));
       break;
     case MINI_U:
-      res = static_cast<T>(Min(ws_u64, ui5_u64));
+      res = static_cast<T>(std::min(ws_u64, ui5_u64));
       break;
     case CEQI:
       res = static_cast<T>(!Compare(ws, static_cast<T>(i5)) ? -1ull : 0ull);
@@ -5174,16 +5209,16 @@ T Simulator::Msa3RInstrHelper(uint32_t opcode, T wd, T ws, T wt) {
       res = ws - wt;
       break;
     case MAX_S:
-      res = Max(ws, wt);
+      res = std::max(ws, wt);
       break;
     case MAX_U:
-      res = static_cast<T>(Max(static_cast<uT>(ws), static_cast<uT>(wt)));
+      res = static_cast<T>(std::max(static_cast<uT>(ws), static_cast<uT>(wt)));
       break;
     case MIN_S:
-      res = Min(ws, wt);
+      res = std::min(ws, wt);
       break;
     case MIN_U:
-      res = static_cast<T>(Min(static_cast<uT>(ws), static_cast<uT>(wt)));
+      res = static_cast<T>(std::min(static_cast<uT>(ws), static_cast<uT>(wt)));
       break;
     case MAX_A:
       // We use negative abs in order to avoid problems
@@ -7447,8 +7482,8 @@ intptr_t Simulator::CallImpl(Address entry, int argument_count,
   }
   // Store remaining arguments on stack, from low to high memory.
   intptr_t* stack_argument = reinterpret_cast<intptr_t*>(entry_stack);
-  memcpy(stack_argument + kCArgSlotCount, arguments + reg_arg_count,
-         stack_args_count * sizeof(*arguments));
+  base::Memcpy(stack_argument + kCArgSlotCount, arguments + reg_arg_count,
+               stack_args_count * sizeof(*arguments));
   set_register(sp, entry_stack);
 
   CallInternal(entry);
@@ -7468,9 +7503,9 @@ double Simulator::CallFP(Address entry, double d0, double d1) {
   } else {
     int buffer[2];
     DCHECK(sizeof(buffer[0]) * 2 == sizeof(d0));
-    memcpy(buffer, &d0, sizeof(d0));
+    base::Memcpy(buffer, &d0, sizeof(d0));
     set_dw_register(a0, buffer);
-    memcpy(buffer, &d1, sizeof(d1));
+    base::Memcpy(buffer, &d1, sizeof(d1));
     set_dw_register(a2, buffer);
   }
   CallInternal(entry);
diff --git a/deps/v8/src/execution/mips64/simulator-mips64.h b/deps/v8/src/execution/mips64/simulator-mips64.h
index 56e25ef2134d43..bb1adb02d3cb5e 100644
--- a/deps/v8/src/execution/mips64/simulator-mips64.h
+++ b/deps/v8/src/execution/mips64/simulator-mips64.h
@@ -283,6 +283,7 @@ class Simulator : public SimulatorBase {
   template <typename T_fp, typename T_int>
   void round_according_to_msacsr(T_fp toRound, T_fp* rounded,
                                  T_int* rounded_int);
+  void clear_fcsr_cause();
   void set_fcsr_rounding_mode(FPURoundingMode mode);
   void set_msacsr_rounding_mode(FPURoundingMode mode);
   unsigned int get_fcsr_rounding_mode();
diff --git a/deps/v8/src/execution/ppc/simulator-ppc.cc b/deps/v8/src/execution/ppc/simulator-ppc.cc
index 8e7070e5dc8715..50a47de9aaadc7 100644
--- a/deps/v8/src/execution/ppc/simulator-ppc.cc
+++ b/deps/v8/src/execution/ppc/simulator-ppc.cc
@@ -8,10 +8,13 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
+
 #include <cmath>
 
 #include "src/base/bits.h"
 #include "src/base/lazy-instance.h"
+#include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/ppc/constants-ppc.h"
@@ -712,7 +715,7 @@ void Simulator::CheckICache(base::CustomMatcherHashMap* i_cache,
                        cache_page->CachedData(offset), kInstrSize));
   } else {
     // Cache miss.  Load memory into the cache.
-    memcpy(cached_line, line, CachePage::kLineLength);
+    base::Memcpy(cached_line, line, CachePage::kLineLength);
     *cache_valid_byte = CachePage::LINE_VALID;
   }
 }
@@ -726,7 +729,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
   size_t stack_size = MB;  // allocate 1MB for stack
 #endif
   stack_size += 2 * stack_protection_size_;
-  stack_ = reinterpret_cast<char*>(malloc(stack_size));
+  stack_ = reinterpret_cast<char*>(base::Malloc(stack_size));
   pc_modified_ = false;
   icount_ = 0;
   break_pc_ = nullptr;
@@ -757,7 +760,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
   last_debugger_input_ = nullptr;
 }
 
-Simulator::~Simulator() { free(stack_); }
+Simulator::~Simulator() { base::Free(stack_); }
 
 // Get the active Simulator for the current thread.
 Simulator* Simulator::current(Isolate* isolate) {
@@ -798,8 +801,8 @@ double Simulator::get_double_from_register_pair(int reg) {
   // Read the bits from the unsigned integer register_[] array
   // into the double precision floating point value and return it.
   char buffer[sizeof(fp_registers_[0])];
-  memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
-  memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
+  base::Memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
+  base::Memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
 #endif
   return (dm_val);
 }
@@ -869,7 +872,7 @@ RW_VAR_LIST(GENERATE_RW_FUNC)
 uintptr_t Simulator::StackLimit(uintptr_t c_limit) const {
   // The simulator uses a separate JS stack. If we have exhausted the C stack,
   // we also drop down the JS limit to reflect the exhaustion on the JS stack.
-  if (GetCurrentStackPosition() < c_limit) {
+  if (base::Stack::GetCurrentStackPosition() < c_limit) {
     return reinterpret_cast<uintptr_t>(get_sp());
   }
 
@@ -1191,8 +1194,8 @@ void Simulator::SoftwareInterrupt(Instruction* instr) {
             set_register(r3, x);
             set_register(r4, y);
           } else {
-            memcpy(reinterpret_cast<void*>(result_buffer), &result,
-                   sizeof(ObjectPair));
+            base::Memcpy(reinterpret_cast<void*>(result_buffer), &result,
+                         sizeof(ObjectPair));
             set_register(r3, result_buffer);
           }
         } else {
@@ -3923,8 +3926,8 @@ intptr_t Simulator::CallImpl(Address entry, int argument_count,
   // +2 is a hack for the LR slot + old SP on PPC
   intptr_t* stack_argument =
       reinterpret_cast<intptr_t*>(entry_stack) + kStackFrameExtraParamSlot;
-  memcpy(stack_argument, arguments + reg_arg_count,
-         stack_arg_count * sizeof(*arguments));
+  base::Memcpy(stack_argument, arguments + reg_arg_count,
+               stack_arg_count * sizeof(*arguments));
   set_register(sp, entry_stack);
 
   CallInternal(entry);
diff --git a/deps/v8/src/execution/ppc/simulator-ppc.h b/deps/v8/src/execution/ppc/simulator-ppc.h
index acdf7c290be5c9..83b61091d76397 100644
--- a/deps/v8/src/execution/ppc/simulator-ppc.h
+++ b/deps/v8/src/execution/ppc/simulator-ppc.h
@@ -18,14 +18,14 @@
 #if defined(USE_SIMULATOR)
 // Running with a simulator.
 
+#include "src/base/hashmap.h"
 #include "src/base/lazy-instance.h"
 #include "src/base/platform/mutex.h"
-#include "src/utils/allocation.h"
-
-#include "src/base/hashmap.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler.h"
 #include "src/codegen/ppc/constants-ppc.h"
 #include "src/execution/simulator-base.h"
+#include "src/utils/allocation.h"
 
 namespace v8 {
 namespace internal {
@@ -253,7 +253,7 @@ class Simulator : public SimulatorBase {
   template <typename T>
   inline void Read(uintptr_t address, T* value) {
     base::MutexGuard lock_guard(&GlobalMonitor::Get()->mutex);
-    memcpy(value, reinterpret_cast<const char*>(address), sizeof(T));
+    base::Memcpy(value, reinterpret_cast<const char*>(address), sizeof(T));
   }
 
   template <typename T>
@@ -262,7 +262,7 @@ class Simulator : public SimulatorBase {
     GlobalMonitor::Get()->NotifyLoadExcl(
         address, static_cast<TransactionSize>(sizeof(T)),
         isolate_->thread_id());
-    memcpy(value, reinterpret_cast<const char*>(address), sizeof(T));
+    base::Memcpy(value, reinterpret_cast<const char*>(address), sizeof(T));
   }
 
   template <typename T>
@@ -271,7 +271,7 @@ class Simulator : public SimulatorBase {
     GlobalMonitor::Get()->NotifyStore(address,
                                       static_cast<TransactionSize>(sizeof(T)),
                                       isolate_->thread_id());
-    memcpy(reinterpret_cast<char*>(address), &value, sizeof(T));
+    base::Memcpy(reinterpret_cast<char*>(address), &value, sizeof(T));
   }
 
   template <typename T>
@@ -280,7 +280,7 @@ class Simulator : public SimulatorBase {
     if (GlobalMonitor::Get()->NotifyStoreExcl(
             address, static_cast<TransactionSize>(sizeof(T)),
             isolate_->thread_id())) {
-      memcpy(reinterpret_cast<char*>(address), &value, sizeof(T));
+      base::Memcpy(reinterpret_cast<char*>(address), &value, sizeof(T));
       return 0;
     } else {
       return 1;
diff --git a/deps/v8/src/execution/runtime-profiler.cc b/deps/v8/src/execution/runtime-profiler.cc
index b7b8f5963c0737..8ee053da755d7d 100644
--- a/deps/v8/src/execution/runtime-profiler.cc
+++ b/deps/v8/src/execution/runtime-profiler.cc
@@ -22,7 +22,7 @@ namespace internal {
 
 // Number of times a function has to be seen on the stack before it is
 // optimized.
-static const int kProfilerTicksBeforeOptimization = 2;
+static const int kProfilerTicksBeforeOptimization = 3;
 
 // The number of ticks required for optimizing a function increases with
 // the size of the bytecode. This is in addition to the
@@ -30,7 +30,7 @@ static const int kProfilerTicksBeforeOptimization = 2;
 static const int kBytecodeSizeAllowancePerTick = 1200;
 
 // Maximum size in bytes of generate code for a function to allow OSR.
-static const int kOSRBytecodeSizeAllowanceBase = 180;
+static const int kOSRBytecodeSizeAllowanceBase = 132;
 
 static const int kOSRBytecodeSizeAllowancePerTick = 48;
 
@@ -42,9 +42,11 @@ static const int kMaxBytecodeSizeForEarlyOpt = 90;
 // OSRed in TurboProp
 // This value is chosen so TurboProp OSRs at similar time as TurboFan. The
 // current interrupt budger of TurboFan is approximately 10 times that of
-// TurboProp and we wait for 3 ticks (2 for marking for optimization and an
-// additional tick to mark it for OSR) and hence this is set to 3 * 10.
-static const int kProfilerTicksForTurboPropOSR = 3 * 10;
+// TurboProp and we wait for 4 ticks (3 for marking for optimization and an
+// additional tick to mark it for OSR) and hence this is set to 4 * 10.
+// TODO(mythria): This value should be based on
+// FLAG_ticks_scale_factor_for_top_tier.
+static const int kProfilerTicksForTurboPropOSR = 4 * 10;
 
 #define OPTIMIZATION_REASON_LIST(V)   \
   V(DoNotOptimize, "do not optimize") \
@@ -151,8 +153,8 @@ void RuntimeProfiler::AttemptOnStackReplacement(InterpretedFrame* frame,
 
   DCHECK_EQ(StackFrame::INTERPRETED, frame->type());
   int level = frame->GetBytecodeArray().osr_loop_nesting_level();
-  frame->GetBytecodeArray().set_osr_loop_nesting_level(
-      Min(level + loop_nesting_levels, AbstractCode::kMaxLoopNestingMarker));
+  frame->GetBytecodeArray().set_osr_loop_nesting_level(std::min(
+      {level + loop_nesting_levels, AbstractCode::kMaxLoopNestingMarker}));
 }
 
 void RuntimeProfiler::MaybeOptimizeFrame(JSFunction function,
@@ -187,7 +189,7 @@ void RuntimeProfiler::MaybeOptimizeFrame(JSFunction function,
   }
 
   OptimizationReason reason =
-      ShouldOptimize(function, function.shared().GetBytecodeArray());
+      ShouldOptimize(function, function.shared().GetBytecodeArray(isolate_));
 
   if (reason != OptimizationReason::kDoNotOptimize) {
     Optimize(function, reason, code_kind);
@@ -201,6 +203,11 @@ bool RuntimeProfiler::MaybeOSR(JSFunction function, InterpretedFrame* frame) {
 
   // Turboprop optimizes quite early. So don't attempt to OSR if the loop isn't
   // hot enough.
+  // TODO(mythria): We should decide when to OSR based on number of ticks
+  // instead of checking if it has been marked for optimization. That will allow
+  // us to unify OSR decisions from different tiers and we can remove this
+  // special case here for Turboprop. If we do that also remove the code to
+  // reset the marker in Runtime_CompileForOnStackReplacement.
   if (FLAG_turboprop && ticks < kProfilerTicksForTurboPropOSR) {
     return false;
   }
@@ -210,13 +217,14 @@ bool RuntimeProfiler::MaybeOSR(JSFunction function, InterpretedFrame* frame) {
       function.HasAvailableOptimizedCode()) {
     // Attempt OSR if we are still running interpreted code even though the
     // the function has long been marked or even already been optimized.
-    // TODO(turboprop, mythria): Currently we don't tier up from Turboprop code
-    // to Turbofan OSR code. When we start supporting this, the ticks have to be
-    // scaled accordingly
-    int64_t allowance =
-        kOSRBytecodeSizeAllowanceBase +
-        static_cast<int64_t>(ticks) * kOSRBytecodeSizeAllowancePerTick;
-    if (function.shared().GetBytecodeArray().length() <= allowance) {
+    // OSR should happen roughly at the same with or without FLAG_turboprop.
+    // Turboprop has much lower interrupt budget so scale the ticks accordingly.
+    int scale_factor =
+        FLAG_turboprop ? FLAG_ticks_scale_factor_for_top_tier : 1;
+    int64_t scaled_ticks = static_cast<int64_t>(ticks) / scale_factor;
+    int64_t allowance = kOSRBytecodeSizeAllowanceBase +
+                        scaled_ticks * kOSRBytecodeSizeAllowancePerTick;
+    if (function.shared().GetBytecodeArray(isolate_).length() <= allowance) {
       AttemptOnStackReplacement(frame);
     }
     return true;
@@ -224,6 +232,27 @@ bool RuntimeProfiler::MaybeOSR(JSFunction function, InterpretedFrame* frame) {
   return false;
 }
 
+namespace {
+
+bool ShouldOptimizeAsSmallFunction(int bytecode_size, int ticks,
+                                   bool any_ic_changed,
+                                   bool active_tier_is_turboprop) {
+  if (any_ic_changed || bytecode_size >= kMaxBytecodeSizeForEarlyOpt)
+    return false;
+  // Without turboprop we always allow early optimizations for small functions
+  if (!FLAG_turboprop) return true;
+  // For turboprop, we only do small function optimizations when tiering up from
+  // TP-> TF. We should also scale the ticks, so we optimize small functions
+  // when reaching one tick for top tier.
+  // TODO(turboprop, mythria): Investigate if small function optimization is
+  // required at all and avoid this if possible by changing the heuristics to
+  // take function size into account.
+  return active_tier_is_turboprop &&
+         ticks > FLAG_ticks_scale_factor_for_top_tier;
+}
+
+}  // namespace
+
 OptimizationReason RuntimeProfiler::ShouldOptimize(JSFunction function,
                                                    BytecodeArray bytecode) {
   if (function.ActiveTierIsTurbofan()) {
@@ -233,20 +262,18 @@ OptimizationReason RuntimeProfiler::ShouldOptimize(JSFunction function,
     return OptimizationReason::kDoNotOptimize;
   }
   int ticks = function.feedback_vector().profiler_ticks();
-  int scale_factor = function.ActiveTierIsMidtierTurboprop()
-                         ? FLAG_ticks_scale_factor_for_top_tier
-                         : 1;
+  bool active_tier_is_turboprop = function.ActiveTierIsMidtierTurboprop();
+  int scale_factor =
+      active_tier_is_turboprop ? FLAG_ticks_scale_factor_for_top_tier : 1;
   int ticks_for_optimization =
       kProfilerTicksBeforeOptimization +
       (bytecode.length() / kBytecodeSizeAllowancePerTick);
   ticks_for_optimization *= scale_factor;
   if (ticks >= ticks_for_optimization) {
     return OptimizationReason::kHotAndStable;
-  } else if (!any_ic_changed_ &&
-             bytecode.length() < kMaxBytecodeSizeForEarlyOpt) {
-    // TODO(turboprop, mythria): Do we need to support small function
-    // optimization for TP->TF tier up. If so, do we want to scale the bytecode
-    // size?
+  } else if (ShouldOptimizeAsSmallFunction(bytecode.length(), ticks,
+                                           any_ic_changed_,
+                                           active_tier_is_turboprop)) {
     // If no IC was patched since the last tick and this function is very
     // small, optimistically optimize it now.
     return OptimizationReason::kSmallFunction;
@@ -276,51 +303,35 @@ RuntimeProfiler::MarkCandidatesForOptimizationScope::
   profiler_->any_ic_changed_ = false;
 }
 
-void RuntimeProfiler::MarkCandidatesForOptimizationFromBytecode() {
+void RuntimeProfiler::MarkCandidatesForOptimization(JavaScriptFrame* frame) {
   if (!isolate_->use_optimizer()) return;
   MarkCandidatesForOptimizationScope scope(this);
-  int i = 0;
-  for (JavaScriptFrameIterator it(isolate_); i < FLAG_frame_count && !it.done();
-       i++, it.Advance()) {
-    JavaScriptFrame* frame = it.frame();
-    if (!frame->is_interpreted()) continue;
 
-    JSFunction function = frame->function();
-    DCHECK(function.shared().is_compiled());
-    if (!function.shared().IsInterpreted()) continue;
+  JSFunction function = frame->function();
+  CodeKind code_kind = frame->is_interpreted() ? CodeKind::INTERPRETED_FUNCTION
+                                               : function.code().kind();
 
-    if (!function.has_feedback_vector()) continue;
+  DCHECK(function.shared().is_compiled());
+  DCHECK(function.shared().IsInterpreted());
 
-    MaybeOptimizeFrame(function, frame, CodeKind::INTERPRETED_FUNCTION);
+  DCHECK_IMPLIES(CodeKindIsOptimizedJSFunction(code_kind),
+                 function.has_feedback_vector());
+  if (!function.has_feedback_vector()) return;
 
-    // TODO(leszeks): Move this increment to before the maybe optimize checks,
-    // and update the tests to assume the increment has already happened.
-    function.feedback_vector().SaturatingIncrementProfilerTicks();
-  }
+  function.feedback_vector().SaturatingIncrementProfilerTicks();
+  MaybeOptimizeFrame(function, frame, code_kind);
 }
 
-void RuntimeProfiler::MarkCandidatesForOptimizationFromCode() {
-  if (!isolate_->use_optimizer()) return;
-  MarkCandidatesForOptimizationScope scope(this);
-  int i = 0;
-  for (JavaScriptFrameIterator it(isolate_); i < FLAG_frame_count && !it.done();
-       i++, it.Advance()) {
-    JavaScriptFrame* frame = it.frame();
-    if (!frame->is_optimized()) continue;
-
-    JSFunction function = frame->function();
-    auto code_kind = function.code().kind();
-    if (!CodeKindIsOptimizedAndCanTierUp(code_kind)) {
-      continue;
-    }
-
-    DCHECK(function.shared().is_compiled());
-    DCHECK(function.has_feedback_vector());
-
-    function.feedback_vector().SaturatingIncrementProfilerTicks();
+void RuntimeProfiler::MarkCandidatesForOptimizationFromBytecode() {
+  JavaScriptFrameIterator it(isolate_);
+  DCHECK(it.frame()->is_interpreted());
+  MarkCandidatesForOptimization(it.frame());
+}
 
-    MaybeOptimizeFrame(function, frame, code_kind);
-  }
+void RuntimeProfiler::MarkCandidatesForOptimizationFromCode() {
+  JavaScriptFrameIterator it(isolate_);
+  DCHECK(it.frame()->is_optimized());
+  MarkCandidatesForOptimization(it.frame());
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/execution/runtime-profiler.h b/deps/v8/src/execution/runtime-profiler.h
index b4207d03f9e43b..c985a3d1fdfac4 100644
--- a/deps/v8/src/execution/runtime-profiler.h
+++ b/deps/v8/src/execution/runtime-profiler.h
@@ -35,6 +35,9 @@ class RuntimeProfiler {
                                  int nesting_levels = 1);
 
  private:
+  // Helper function called from MarkCandidatesForOptimization*
+  void MarkCandidatesForOptimization(JavaScriptFrame* frame);
+
   // Make the decision whether to optimize the given function, and mark it for
   // optimization if the decision was 'yes'.
   void MaybeOptimizeFrame(JSFunction function, JavaScriptFrame* frame,
@@ -49,7 +52,7 @@ class RuntimeProfiler {
                 CodeKind code_kind);
   void Baseline(JSFunction function, OptimizationReason reason);
 
-  class MarkCandidatesForOptimizationScope final {
+  class V8_NODISCARD MarkCandidatesForOptimizationScope final {
    public:
     explicit MarkCandidatesForOptimizationScope(RuntimeProfiler* profiler);
     ~MarkCandidatesForOptimizationScope();
@@ -57,7 +60,7 @@ class RuntimeProfiler {
    private:
     HandleScope handle_scope_;
     RuntimeProfiler* const profiler_;
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
   };
 
   Isolate* isolate_;
diff --git a/deps/v8/src/execution/s390/simulator-s390.cc b/deps/v8/src/execution/s390/simulator-s390.cc
index a9fc318e4bb993..774cd75e221d04 100644
--- a/deps/v8/src/execution/s390/simulator-s390.cc
+++ b/deps/v8/src/execution/s390/simulator-s390.cc
@@ -9,10 +9,13 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
+
 #include <cmath>
 
 #include "src/base/bits.h"
 #include "src/base/once.h"
+#include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/register-configuration.h"
@@ -85,11 +88,11 @@ double S390Debugger::GetRegisterPairDoubleValue(int regnum) {
 }
 
 double S390Debugger::GetFPDoubleRegisterValue(int regnum) {
-  return sim_->get_double_from_d_register(regnum);
+  return sim_->get_fpr<double>(regnum);
 }
 
 float S390Debugger::GetFPFloatRegisterValue(int regnum) {
-  return sim_->get_float32_from_d_register(regnum);
+  return sim_->get_fpr<float>(regnum);
 }
 
 bool S390Debugger::GetValue(const char* desc, intptr_t* value) {
@@ -112,7 +115,7 @@ bool S390Debugger::GetValue(const char* desc, intptr_t* value) {
 bool S390Debugger::GetFPDoubleValue(const char* desc, double* value) {
   int regnum = DoubleRegisters::Number(desc);
   if (regnum != kNoRegister) {
-    *value = sim_->get_double_from_d_register(regnum);
+    *value = sim_->get_fpr<double>(regnum);
     return true;
   }
   return false;
@@ -732,7 +735,7 @@ void Simulator::CheckICache(base::CustomMatcherHashMap* i_cache,
              0);
   } else {
     // Cache miss.  Load memory into the cache.
-    memcpy(cached_line, line, CachePage::kLineLength);
+    base::Memcpy(cached_line, line, CachePage::kLineLength);
     *cache_valid_byte = CachePage::LINE_VALID;
   }
 }
@@ -762,7 +765,9 @@ void Simulator::EvalTableInit() {
   V(vs, VS, 0xE7F7)       /* type = VRR_C VECTOR SUBTRACT  */                  \
   V(vml, VML, 0xE7A2)     /* type = VRR_C VECTOR MULTIPLY LOW  */              \
   V(vme, VME, 0xE7A6)     /* type = VRR_C VECTOR MULTIPLY EVEN  */             \
+  V(vmle, VMLE, 0xE7A4)   /* type = VRR_C VECTOR MULTIPLY EVEN LOGICAL */      \
   V(vmo, VMO, 0xE7A7)     /* type = VRR_C VECTOR MULTIPLY ODD  */              \
+  V(vmlo, VMLO, 0xE7A75)  /* type = VRR_C VECTOR MULTIPLY LOGICAL ODD */       \
   V(vnc, VNC, 0xE769)     /* type = VRR_C VECTOR AND WITH COMPLEMENT */        \
   V(vsum, VSUM, 0xE764)   /* type = VRR_C VECTOR SUM ACROSS WORD  */           \
   V(vsumg, VSUMG, 0xE765) /* type = VRR_C VECTOR SUM ACROSS DOUBLEWORD  */     \
@@ -1561,7 +1566,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
   size_t stack_size = MB;  // allocate 1MB for stack
 #endif
   stack_size += 2 * stack_protection_size_;
-  stack_ = reinterpret_cast<char*>(malloc(stack_size));
+  stack_ = reinterpret_cast<char*>(base::Malloc(stack_size));
   pc_modified_ = false;
   icount_ = 0;
   break_pc_ = nullptr;
@@ -1596,7 +1601,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
   last_debugger_input_ = nullptr;
 }
 
-Simulator::~Simulator() { free(stack_); }
+Simulator::~Simulator() { base::Free(stack_); }
 
 // Get the active Simulator for the current thread.
 Simulator* Simulator::current(Isolate* isolate) {
@@ -1672,8 +1677,8 @@ double Simulator::get_double_from_register_pair(int reg) {
   // Read the bits from the unsigned integer register_[] array
   // into the double precision floating point value and return it.
   char buffer[sizeof(fp_registers_[0])];
-  memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
-  memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
+  base::Memcpy(buffer, &registers_[reg], 2 * sizeof(registers_[0]));
+  base::Memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
 #endif
   return (dm_val);
 }
@@ -1696,15 +1701,13 @@ intptr_t Simulator::get_pc() const { return special_reg_pc_; }
 // - one double argument and zero or one integer arguments.
 // All are consructed here from d1, d2 and r2.
 void Simulator::GetFpArgs(double* x, double* y, intptr_t* z) {
-  *x = get_double_from_d_register(0);
-  *y = get_double_from_d_register(2);
+  *x = get_fpr<double>(0);
+  *y = get_fpr<double>(2);
   *z = get_register(2);
 }
 
 // The return value is in d0.
-void Simulator::SetFpResult(const double& result) {
-  set_d_register_from_double(0, result);
-}
+void Simulator::SetFpResult(const double& result) { set_fpr(0, result); }
 
 void Simulator::TrashCallerSaveRegisters() {
 // We don't trash the registers with the return value.
@@ -1812,7 +1815,7 @@ float Simulator::ReadFloat(intptr_t addr) {
 uintptr_t Simulator::StackLimit(uintptr_t c_limit) const {
   // The simulator uses a separate JS stack. If we have exhausted the C stack,
   // we also drop down the JS limit to reflect the exhaustion on the JS stack.
-  if (GetCurrentStackPosition() < c_limit) {
+  if (base::Stack::GetCurrentStackPosition() < c_limit) {
     return reinterpret_cast<uintptr_t>(get_sp());
   }
 
@@ -2140,8 +2143,8 @@ void Simulator::SoftwareInterrupt(Instruction* instr) {
             set_register(r2, x);
             set_register(r3, y);
           } else {
-            memcpy(reinterpret_cast<void*>(result_buffer), &result,
-                   sizeof(ObjectPair));
+            base::Memcpy(reinterpret_cast<void*>(result_buffer), &result,
+                         sizeof(ObjectPair));
             set_register(r2, result_buffer);
           }
         } else {
@@ -2346,34 +2349,6 @@ void Simulator::PrintStopInfo(uint32_t code) {
 #define CheckOverflowForShiftLeft(src1, src2) \
   (((src1) << (src2)) >> (src2) != (src1))
 
-int16_t Simulator::ByteReverse(int16_t hword) {
-#if defined(__GNUC__)
-  return __builtin_bswap16(hword);
-#else
-  return (hword << 8) | ((hword >> 8) & 0x00FF);
-#endif
-}
-
-int32_t Simulator::ByteReverse(int32_t word) {
-#if defined(__GNUC__)
-  return __builtin_bswap32(word);
-#else
-  int32_t result = word << 24;
-  result |= (word << 8) & 0x00FF0000;
-  result |= (word >> 8) & 0x0000FF00;
-  result |= (word >> 24) & 0x00000FF;
-  return result;
-#endif
-}
-
-int64_t Simulator::ByteReverse(int64_t dword) {
-#if defined(__GNUC__)
-  return __builtin_bswap64(dword);
-#else
-#error unsupport __builtin_bswap64
-#endif
-}
-
 int Simulator::DecodeInstruction(Instruction* instr) {
   Opcode op = instr->S390OpcodeValue();
   DCHECK_NOT_NULL(EvalTable[op]);
@@ -2570,8 +2545,8 @@ intptr_t Simulator::CallImpl(Address entry, int argument_count,
   // Store remaining arguments on stack, from low to high memory.
   intptr_t* stack_argument =
       reinterpret_cast<intptr_t*>(entry_stack + kCalleeRegisterSaveAreaSize);
-  memcpy(stack_argument, arguments + reg_arg_count,
-         stack_arg_count * sizeof(*arguments));
+  base::Memcpy(stack_argument, arguments + reg_arg_count,
+               stack_arg_count * sizeof(*arguments));
   set_register(sp, entry_stack);
 
 // Prepare to execute the code at entry
@@ -2656,8 +2631,8 @@ intptr_t Simulator::CallImpl(Address entry, int argument_count,
 }
 
 void Simulator::CallFP(Address entry, double d0, double d1) {
-  set_d_register_from_double(0, d0);
-  set_d_register_from_double(1, d1);
+  set_fpr(0, d0);
+  set_fpr(1, d1);
   CallInternal(entry);
 }
 
@@ -2669,7 +2644,7 @@ int32_t Simulator::CallFPReturnsInt(Address entry, double d0, double d1) {
 
 double Simulator::CallFPReturnsDouble(Address entry, double d0, double d1) {
   CallFP(entry, d0, d1);
-  return get_double_from_d_register(0);
+  return get_fpr<double>(0);
 }
 
 uintptr_t Simulator::PushAddress(uintptr_t address) {
@@ -2940,7 +2915,7 @@ EVALUATE(VST) {
 }
 
 EVALUATE(VL) {
-  DCHECK(VL);
+  DCHECK_OPCODE(VL);
   DECODE_VRX_INSTRUCTION(r1, x2, b2, d2, m3);
   USE(m3);
   intptr_t addr = GET_ADDRESS(x2, b2, d2);
@@ -2957,7 +2932,7 @@ EVALUATE(VL) {
         r1, i, abs(get_simd_register_by_lane<type>(r2, i)));            \
   }
 EVALUATE(VLP) {
-  DCHECK(VL);
+  DCHECK_OPCODE(VLP);
   DECODE_VRR_A_INSTRUCTION(r1, r2, m5, m4, m3);
   USE(m5);
   USE(m4);
@@ -2994,7 +2969,7 @@ EVALUATE(VLP) {
         r1, i, (static_cast<type>(src0) + static_cast<type>(src1) + 1) >> 1); \
   }
 EVALUATE(VAVGL) {
-  DCHECK(VL);
+  DCHECK_OPCODE(VAVGL);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m6);
   USE(m5);
@@ -3028,10 +3003,19 @@ EVALUATE(VLGV) {
   DECODE_VRS_INSTRUCTION(r1, r3, b2, d2, m4);
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t index = b2_val + d2;
-  const int size_by_byte = 1 << m4;
-  int8_t* src = get_simd_register(r3).int8 + index * size_by_byte;
-  set_register(r1, 0);
-  memcpy(&get_register(r1), src, size_by_byte);
+#define CASE(i, type)                                             \
+  case i:                                                         \
+    set_register(r1, get_simd_register_by_lane<type>(r3, index)); \
+    break;
+  switch (m4) {
+    CASE(0, uint8_t);
+    CASE(1, uint16_t);
+    CASE(2, uint32_t);
+    CASE(3, uint64_t);
+    default:
+      UNREACHABLE();
+  }
+#undef CASE
   return length;
 }
 
@@ -3040,9 +3024,20 @@ EVALUATE(VLVG) {
   DECODE_VRS_INSTRUCTION(r1, r3, b2, d2, m4);
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t index = b2_val + d2;
-  const int size_by_byte = 1 << m4;
-  int8_t* dst = get_simd_register(r1).int8 + index * size_by_byte;
-  memcpy(dst, &get_register(r3), size_by_byte);
+#define CASE(i, type)                                                     \
+  case i:                                                                 \
+    set_simd_register_by_lane<type>(r1, index,                            \
+                                    static_cast<type>(get_register(r3))); \
+    break;
+  switch (m4) {
+    CASE(0, uint8_t);
+    CASE(1, uint16_t);
+    CASE(2, uint32_t);
+    CASE(3, uint64_t);
+    default:
+      UNREACHABLE();
+  }
+#undef CASE
   return length;
 }
 
@@ -3054,16 +3049,29 @@ EVALUATE(VLVGP) {
   return length;
 }
 
+#define FOR_EACH_LANE(i, type) \
+  for (uint32_t i = 0; i < kSimd128Size / sizeof(type); i++)
+
 EVALUATE(VREP) {
   DCHECK_OPCODE(VREP);
   DECODE_VRI_C_INSTRUCTION(r1, r3, i2, m4);
-  const int size_by_byte = 1 << m4;
-  DCHECK(i2 >= 0 && i2 < kSimd128Size / size_by_byte);
-  int8_t* src = get_simd_register(r3).int8;
-  int8_t* dst = get_simd_register(r1).int8;
-  for (int i = 0; i < kSimd128Size; i += size_by_byte) {
-    memcpy(dst + i, src + i2 * size_by_byte, size_by_byte);
+#define CASE(i, type)                                      \
+  case i: {                                                \
+    FOR_EACH_LANE(j, type) {                               \
+      set_simd_register_by_lane<type>(                     \
+          r1, j, get_simd_register_by_lane<type>(r3, i2)); \
+    }                                                      \
+    break;                                                 \
+  }
+  switch (m4) {
+    CASE(0, uint8_t);
+    CASE(1, uint16_t);
+    CASE(2, uint32_t);
+    CASE(3, uint64_t);
+    default:
+      UNREACHABLE();
   }
+#undef CASE
   return length;
 }
 
@@ -3071,26 +3079,44 @@ EVALUATE(VLREP) {
   DCHECK_OPCODE(VLREP);
   DECODE_VRX_INSTRUCTION(r1, x2, b2, d2, m3);
   intptr_t addr = GET_ADDRESS(x2, b2, d2);
-  const int size_by_byte = 1 << m3;
-  int8_t* dst = get_simd_register(r1).int8;
-  int8_t* src = reinterpret_cast<int8_t*>(addr);
-  set_simd_register(r1, fp_zero);
-  for (int i = 0; i < kSimd128Size; i += size_by_byte) {
-    memcpy(dst + i, src, size_by_byte);
+#define CASE(i, type)                                                         \
+  case i: {                                                                   \
+    FOR_EACH_LANE(j, type) {                                                  \
+      set_simd_register_by_lane<type>(r1, j, *reinterpret_cast<type*>(addr)); \
+    }                                                                         \
+    break;                                                                    \
+  }
+  switch (m3) {
+    CASE(0, uint8_t);
+    CASE(1, uint16_t);
+    CASE(2, uint32_t);
+    CASE(3, uint64_t);
+    default:
+      UNREACHABLE();
   }
+#undef CASE
   return length;
 }
 
 EVALUATE(VREPI) {
   DCHECK_OPCODE(VREPI);
   DECODE_VRI_A_INSTRUCTION(r1, i2, m3);
-  const int size_by_byte = 1 << m3;
-  int8_t* dst = get_simd_register(r1).int8;
-  uint64_t immediate = static_cast<uint64_t>(i2);
-  set_simd_register(r1, fp_zero);
-  for (int i = 0; i < kSimd128Size; i += size_by_byte) {
-    memcpy(dst + i, &immediate, size_by_byte);
+#define CASE(i, type)                                                \
+  case i: {                                                          \
+    FOR_EACH_LANE(j, type) {                                         \
+      set_simd_register_by_lane<type>(r1, j, static_cast<type>(i2)); \
+    }                                                                \
+    break;                                                           \
   }
+  switch (m3) {
+    CASE(0, int8_t);
+    CASE(1, int16_t);
+    CASE(2, int32_t);
+    CASE(3, int64_t);
+    default:
+      UNREACHABLE();
+  }
+#undef CASE
   return length;
 }
 
@@ -3122,25 +3148,20 @@ EVALUATE(VLEF) {
   return length;
 }
 
+// TODO(john): unify most fp binary operations
 template <class T, class Operation>
-inline static void VectorBinaryOp(void* dst, void* src1, void* src2,
+inline static void VectorBinaryOp(Simulator* sim, int dst, int src1, int src2,
                                   Operation op) {
-  int8_t* src1_ptr = reinterpret_cast<int8_t*>(src1);
-  int8_t* src2_ptr = reinterpret_cast<int8_t*>(src2);
-  int8_t* dst_ptr = reinterpret_cast<int8_t*>(dst);
-  for (int i = 0; i < kSimd128Size; i += sizeof(T)) {
-    T& dst_val = *reinterpret_cast<T*>(dst_ptr + i);
-    T& src1_val = *reinterpret_cast<T*>(src1_ptr + i);
-    T& src2_val = *reinterpret_cast<T*>(src2_ptr + i);
-    dst_val = op(src1_val, src2_val);
-    memcpy(dst_ptr + i, &dst_val, sizeof(T));
+  FOR_EACH_LANE(i, T) {
+    T src1_val = sim->get_simd_register_by_lane<T>(src1, i);
+    T src2_val = sim->get_simd_register_by_lane<T>(src2, i);
+    T dst_val = op(src1_val, src2_val);
+    sim->set_simd_register_by_lane<T>(dst, i, dst_val);
   }
 }
 
-#define VECTOR_BINARY_OP_FOR_TYPE(type, op)                            \
-  VectorBinaryOp<type>(&get_simd_register(r1), &get_simd_register(r2), \
-                       &get_simd_register(r3),                         \
-                       [](type a, type b) { return a op b; });
+#define VECTOR_BINARY_OP_FOR_TYPE(type, op) \
+  VectorBinaryOp<type>(this, r1, r2, r3, [](type a, type b) { return a op b; });
 
 #define VECTOR_BINARY_OP(op)                 \
   switch (m4) {                              \
@@ -3162,7 +3183,7 @@ inline static void VectorBinaryOp(void* dst, void* src1, void* src2,
   }
 
 EVALUATE(VA) {
-  DCHECK(VA);
+  DCHECK_OPCODE(VA);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m5);
   USE(m6);
@@ -3201,29 +3222,32 @@ EVALUATE(VML) {
     input_type src1 = get_simd_register_by_lane<input_type>(r3, i);        \
     set_simd_register_by_lane<result_type>(r1, k, src0 * src1);            \
   }
-#define VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, is_odd)                      \
-  switch (m4) {                                                           \
-    case 0: {                                                             \
-      VECTOR_MULTIPLY_EVEN_ODD_TYPE(r1, r2, r3, int8_t, int16_t, is_odd)  \
-      break;                                                              \
-    }                                                                     \
-    case 1: {                                                             \
-      VECTOR_MULTIPLY_EVEN_ODD_TYPE(r1, r2, r3, int16_t, int32_t, is_odd) \
-      break;                                                              \
-    }                                                                     \
-    case 2: {                                                             \
-      VECTOR_MULTIPLY_EVEN_ODD_TYPE(r1, r2, r3, int32_t, int64_t, is_odd) \
-      break;                                                              \
-    }                                                                     \
-    default:                                                              \
-      UNREACHABLE();                                                      \
+#define VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, is_odd, sign)                    \
+  switch (m4) {                                                               \
+    case 0: {                                                                 \
+      VECTOR_MULTIPLY_EVEN_ODD_TYPE(r1, r2, r3, sign##int8_t, sign##int16_t,  \
+                                    is_odd)                                   \
+      break;                                                                  \
+    }                                                                         \
+    case 1: {                                                                 \
+      VECTOR_MULTIPLY_EVEN_ODD_TYPE(r1, r2, r3, sign##int16_t, sign##int32_t, \
+                                    is_odd)                                   \
+      break;                                                                  \
+    }                                                                         \
+    case 2: {                                                                 \
+      VECTOR_MULTIPLY_EVEN_ODD_TYPE(r1, r2, r3, sign##int32_t, sign##int64_t, \
+                                    is_odd)                                   \
+      break;                                                                  \
+    }                                                                         \
+    default:                                                                  \
+      UNREACHABLE();                                                          \
   }
 EVALUATE(VME) {
   DCHECK_OPCODE(VME);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m5);
   USE(m6);
-  VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, false)
+  VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, false, )
   return length;
 }
 
@@ -3232,14 +3256,31 @@ EVALUATE(VMO) {
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m5);
   USE(m6);
-  VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, true)
+  VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, true, )
+  return length;
+}
+EVALUATE(VMLE) {
+  DCHECK_OPCODE(VMLE);
+  DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
+  USE(m5);
+  USE(m6);
+  VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, false, u)
+  return length;
+}
+
+EVALUATE(VMLO) {
+  DCHECK_OPCODE(VMLO);
+  DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
+  USE(m5);
+  USE(m6);
+  VECTOR_MULTIPLY_EVEN_ODD(r1, r2, r3, true, u)
   return length;
 }
 #undef VECTOR_MULTIPLY_EVEN_ODD
 #undef VECTOR_MULTIPLY_EVEN_ODD_TYPE
 
 EVALUATE(VNC) {
-  DCHECK(VNC);
+  DCHECK_OPCODE(VNC);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m6);
   USE(m5);
@@ -3253,33 +3294,31 @@ EVALUATE(VNC) {
 }
 
 template <class S, class D>
-void VectorSum(void* dst, void* src1, void* src2) {
+void VectorSum(Simulator* sim, int dst, int src1, int src2) {
   D value = 0;
-  for (size_t i = 0; i < kSimd128Size / sizeof(S); i++) {
-    value += *(reinterpret_cast<S*>(src1) + i);
+  FOR_EACH_LANE(i, S) {
+    value += sim->get_simd_register_by_lane<S>(src1, i);
     if ((i + 1) % (sizeof(D) / sizeof(S)) == 0) {
-      value += *(reinterpret_cast<S*>(src2) + i);
-      memcpy(reinterpret_cast<D*>(dst) + i / (sizeof(D) / sizeof(S)), &value,
-             sizeof(D));
+      value += sim->get_simd_register_by_lane<S>(src2, i);
+      sim->set_simd_register_by_lane<D>(dst, i / (sizeof(D) / sizeof(S)),
+                                        value);
       value = 0;
     }
   }
 }
 
+#define CASE(i, S, D)                  \
+  case i:                              \
+    VectorSum<S, D>(this, r1, r2, r3); \
+    break;
 EVALUATE(VSUM) {
   DCHECK_OPCODE(VSUM);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m6);
   USE(m5);
-  fpr_t src1 = get_simd_register(r2);
-  fpr_t src2 = get_simd_register(r3);
   switch (m4) {
-    case 0:
-      VectorSum<int8_t, int32_t>(&get_simd_register(r1), &src1, &src2);
-      break;
-    case 1:
-      VectorSum<int16_t, int32_t>(&get_simd_register(r1), &src1, &src2);
-      break;
+    CASE(0, uint8_t, uint32_t);
+    CASE(1, uint16_t, uint32_t);
     default:
       UNREACHABLE();
   }
@@ -3291,60 +3330,54 @@ EVALUATE(VSUMG) {
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m6);
   USE(m5);
-  fpr_t src1 = get_simd_register(r2);
-  fpr_t src2 = get_simd_register(r3);
   switch (m4) {
-    case 1:
-      VectorSum<int16_t, int64_t>(&get_simd_register(r1), &src1, &src2);
-      break;
-    case 2:
-      VectorSum<int32_t, int64_t>(&get_simd_register(r1), &src1, &src2);
-      break;
+    CASE(1, uint16_t, uint64_t);
+    CASE(2, uint32_t, uint64_t);
     default:
       UNREACHABLE();
   }
   return length;
 }
+#undef CASE
 
 template <class S, class D>
-void VectorPack(void* dst, void* src1, void* src2, bool saturate,
+void VectorPack(Simulator* sim, int dst, int src1, int src2, bool saturate,
                 const D& max = 0, const D& min = 0) {
-  S* src = reinterpret_cast<S*>(src1);
+  int src = src1;
   int count = 0;
   S value = 0;
+  // Setup a temp array to avoid overwriting dst mid loop.
+  D temps[kSimd128Size / sizeof(D)] = {0};
   for (size_t i = 0; i < kSimd128Size / sizeof(D); i++, count++) {
     if (count == kSimd128Size / sizeof(S)) {
-      src = reinterpret_cast<S*>(src2);
+      src = src2;
       count = 0;
     }
-    memcpy(&value, src + count, sizeof(S));
+    value = sim->get_simd_register_by_lane<S>(src, count);
     if (saturate) {
       if (value > max)
         value = max;
       else if (value < min)
         value = min;
     }
-    memcpy(reinterpret_cast<D*>(dst) + i, &value, sizeof(D));
+    temps[i] = value;
   }
+  FOR_EACH_LANE(i, D) { sim->set_simd_register_by_lane<D>(dst, i, temps[i]); }
 }
 
+#define CASE(i, S, D, SAT, MAX, MIN)                   \
+  case i:                                              \
+    VectorPack<S, D>(this, r1, r2, r3, SAT, MAX, MIN); \
+    break;
 EVALUATE(VPK) {
   DCHECK_OPCODE(VPK);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m6);
   USE(m5);
-  fpr_t src1 = get_simd_register(r2);
-  fpr_t src2 = get_simd_register(r3);
   switch (m4) {
-    case 1:
-      VectorPack<int16_t, int8_t>(&get_simd_register(r1), &src1, &src2, false);
-      break;
-    case 2:
-      VectorPack<int32_t, int16_t>(&get_simd_register(r1), &src1, &src2, false);
-      break;
-    case 3:
-      VectorPack<int64_t, int32_t>(&get_simd_register(r1), &src1, &src2, false);
-      break;
+    CASE(1, uint16_t, uint8_t, false, 0, 0);
+    CASE(2, uint32_t, uint16_t, false, 0, 0);
+    CASE(3, uint64_t, uint32_t, false, 0, 0);
     default:
       UNREACHABLE();
   }
@@ -3356,21 +3389,10 @@ EVALUATE(VPKS) {
   DECODE_VRR_B_INSTRUCTION(r1, r2, r3, m5, m4);
   USE(m5);
   USE(m4);
-  fpr_t src1 = get_simd_register(r2);
-  fpr_t src2 = get_simd_register(r3);
   switch (m4) {
-    case 1:
-      VectorPack<int16_t, int8_t>(&get_simd_register(r1), &src1, &src2, true,
-                                  INT8_MAX, INT8_MIN);
-      break;
-    case 2:
-      VectorPack<int32_t, int16_t>(&get_simd_register(r1), &src1, &src2, true,
-                                   INT16_MAX, INT16_MIN);
-      break;
-    case 3:
-      VectorPack<int64_t, int32_t>(&get_simd_register(r1), &src1, &src2, true,
-                                   INT32_MAX, INT32_MIN);
-      break;
+    CASE(1, int16_t, int8_t, true, INT8_MAX, INT8_MIN);
+    CASE(2, int32_t, int16_t, true, INT16_MAX, INT16_MIN);
+    CASE(3, int64_t, int32_t, true, INT32_MAX, INT32_MIN);
     default:
       UNREACHABLE();
   }
@@ -3382,55 +3404,41 @@ EVALUATE(VPKLS) {
   DECODE_VRR_B_INSTRUCTION(r1, r2, r3, m5, m4);
   USE(m5);
   USE(m4);
-  fpr_t src1 = get_simd_register(r2);
-  fpr_t src2 = get_simd_register(r3);
   switch (m4) {
-    case 1:
-      VectorPack<uint16_t, uint8_t>(&get_simd_register(r1), &src1, &src2, true,
-                                    UINT8_MAX, 0);
-      break;
-    case 2:
-      VectorPack<uint32_t, uint16_t>(&get_simd_register(r1), &src1, &src2, true,
-                                     UINT16_MAX, 0);
-      break;
-    case 3:
-      VectorPack<uint64_t, uint32_t>(&get_simd_register(r1), &src1, &src2, true,
-                                     UINT32_MAX, 0);
-      break;
+    CASE(1, uint16_t, uint8_t, true, UINT8_MAX, 0);
+    CASE(2, uint32_t, uint16_t, true, UINT16_MAX, 0);
+    CASE(3, uint64_t, uint32_t, true, UINT32_MAX, 0);
     default:
       UNREACHABLE();
   }
   return length;
 }
 
+#undef CASE
 template <class S, class D>
-void VectorUnpackHigh(void* dst, void* src) {
+void VectorUnpackHigh(Simulator* sim, int dst, int src) {
   constexpr size_t kItemCount = kSimd128Size / sizeof(D);
   D value = 0;
   for (size_t i = 0; i < kItemCount; i++) {
-    value = *(reinterpret_cast<S*>(src) + i + kItemCount);
-    memcpy(reinterpret_cast<D*>(dst) + i, &value, sizeof(D));
+    value = sim->get_simd_register_by_lane<S>(src, i + kItemCount);
+    sim->set_simd_register_by_lane<D>(dst, i, value);
   }
 }
 
+#define CASE(i, S, D)                     \
+  case i:                                 \
+    VectorUnpackHigh<S, D>(this, r1, r2); \
+    break;
+
 EVALUATE(VUPH) {
   DCHECK_OPCODE(VUPH);
   DECODE_VRR_A_INSTRUCTION(r1, r2, m5, m4, m3);
   USE(m5);
   USE(m4);
   switch (m3) {
-    case 0:
-      VectorUnpackHigh<int8_t, int16_t>(&get_simd_register(r1),
-                                        &get_simd_register(r2));
-      break;
-    case 1:
-      VectorUnpackHigh<int16_t, int32_t>(&get_simd_register(r1),
-                                         &get_simd_register(r2));
-      break;
-    case 2:
-      VectorUnpackHigh<int32_t, int64_t>(&get_simd_register(r1),
-                                         &get_simd_register(r2));
-      break;
+    CASE(0, int8_t, int16_t);
+    CASE(1, int16_t, int32_t);
+    CASE(2, int32_t, int64_t);
     default:
       UNREACHABLE();
   }
@@ -3443,55 +3451,38 @@ EVALUATE(VUPLH) {
   USE(m5);
   USE(m4);
   switch (m3) {
-    case 0:
-      VectorUnpackHigh<uint8_t, uint16_t>(&get_simd_register(r1),
-                                          &get_simd_register(r2));
-      break;
-    case 1:
-      VectorUnpackHigh<uint16_t, uint32_t>(&get_simd_register(r1),
-                                           &get_simd_register(r2));
-      break;
-    case 2:
-      VectorUnpackHigh<uint32_t, uint64_t>(&get_simd_register(r1),
-                                           &get_simd_register(r2));
-      break;
+    CASE(0, uint8_t, uint16_t);
+    CASE(1, uint16_t, uint32_t);
+    CASE(2, uint32_t, uint64_t);
     default:
       UNREACHABLE();
   }
   return length;
 }
+#undef CASE
 
 template <class S, class D>
-void VectorUnpackLow(void* dst, void* src) {
+void VectorUnpackLow(Simulator* sim, int dst, int src) {
   constexpr size_t kItemCount = kSimd128Size / sizeof(D);
   D temps[kItemCount] = {0};
   // About overwriting if src and dst are the same register.
-  for (size_t i = 0; i < kItemCount; i++) {
-    temps[i] = static_cast<D>(*(reinterpret_cast<S*>(src) + i));
-  }
-  for (size_t i = 0; i < kItemCount; i++) {
-    memcpy(reinterpret_cast<D*>(dst) + i, &temps[i], sizeof(D));
-  }
+  FOR_EACH_LANE(i, D) { temps[i] = sim->get_simd_register_by_lane<S>(src, i); }
+  FOR_EACH_LANE(i, D) { sim->set_simd_register_by_lane<D>(dst, i, temps[i]); }
 }
 
+#define CASE(i, S, D)                    \
+  case i:                                \
+    VectorUnpackLow<S, D>(this, r1, r2); \
+    break;
 EVALUATE(VUPL) {
   DCHECK_OPCODE(VUPL);
   DECODE_VRR_A_INSTRUCTION(r1, r2, m5, m4, m3);
   USE(m5);
   USE(m4);
   switch (m3) {
-    case 0:
-      VectorUnpackLow<int8_t, int16_t>(&get_simd_register(r1),
-                                       &get_simd_register(r2));
-      break;
-    case 1:
-      VectorUnpackLow<int16_t, int32_t>(&get_simd_register(r1),
-                                        &get_simd_register(r2));
-      break;
-    case 2:
-      VectorUnpackLow<int32_t, int64_t>(&get_simd_register(r1),
-                                        &get_simd_register(r2));
-      break;
+    CASE(0, int8_t, int16_t);
+    CASE(1, int16_t, int32_t);
+    CASE(2, int32_t, int64_t);
     default:
       UNREACHABLE();
   }
@@ -3504,27 +3495,18 @@ EVALUATE(VUPLL) {
   USE(m5);
   USE(m4);
   switch (m3) {
-    case 0:
-      VectorUnpackLow<uint8_t, uint16_t>(&get_simd_register(r1),
-                                         &get_simd_register(r2));
-      break;
-    case 1:
-      VectorUnpackLow<uint16_t, uint32_t>(&get_simd_register(r1),
-                                          &get_simd_register(r2));
-      break;
-    case 2:
-      VectorUnpackLow<uint32_t, uint64_t>(&get_simd_register(r1),
-                                          &get_simd_register(r2));
-      break;
+    CASE(0, uint8_t, uint16_t);
+    CASE(1, uint16_t, uint32_t);
+    CASE(2, uint32_t, uint64_t);
     default:
       UNREACHABLE();
   }
   return length;
 }
+#undef CASE
 
-#define VECTOR_MAX_MIN_FOR_TYPE(type, op)                              \
-  VectorBinaryOp<type>(&get_simd_register(r1), &get_simd_register(r2), \
-                       &get_simd_register(r3),                         \
+#define VECTOR_MAX_MIN_FOR_TYPE(type, op) \
+  VectorBinaryOp<type>(this, r1, r2, r3,  \
                        [](type a, type b) { return (a op b) ? a : b; });
 
 #define VECTOR_MAX_MIN(op, sign)                 \
@@ -3582,9 +3564,8 @@ EVALUATE(VMNL) {
   return length;
 }
 
-#define VECTOR_COMPARE_FOR_TYPE(type, op)                              \
-  VectorBinaryOp<type>(&get_simd_register(r1), &get_simd_register(r2), \
-                       &get_simd_register(r3),                         \
+#define VECTOR_COMPARE_FOR_TYPE(type, op) \
+  VectorBinaryOp<type>(this, r1, r2, r3,  \
                        [](type a, type b) { return (a op b) ? -1 : 0; });
 
 #define VECTOR_COMPARE(op, sign)                 \
@@ -3670,7 +3651,7 @@ EVALUATE(VX) {
     set_simd_register_by_lane<type>(r1, i, ~(src0 | src1));             \
   }
 EVALUATE(VNO) {
-  DCHECK(VL);
+  DCHECK_OPCODE(VNO);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
   USE(m6);
   USE(m5);
@@ -3700,14 +3681,10 @@ EVALUATE(VNO) {
 #undef VECTOR_NOR
 
 template <class T>
-void VectorLoadComplement(void* dst, void* src) {
-  int8_t* src_ptr = reinterpret_cast<int8_t*>(src);
-  int8_t* dst_ptr = reinterpret_cast<int8_t*>(dst);
-  for (int i = 0; i < kSimd128Size; i += sizeof(T)) {
-    T& src_val = *reinterpret_cast<T*>(src_ptr + i);
-    T& dst_val = *reinterpret_cast<T*>(dst_ptr + i);
-    dst_val = -(uint64_t)src_val;
-    memcpy(dst_ptr + i, &dst_val, sizeof(T));
+void VectorLoadComplement(Simulator* sim, int dst, int src) {
+  FOR_EACH_LANE(i, T) {
+    T src_val = sim->get_simd_register_by_lane<T>(src, i);
+    sim->set_simd_register_by_lane<T>(dst, i, -src_val);
   }
 }
 
@@ -3717,24 +3694,17 @@ EVALUATE(VLC) {
   USE(m5);
   USE(m4);
   switch (m3) {
-    case 0:
-      VectorLoadComplement<int8_t>(&get_simd_register(r1),
-                                   &get_simd_register(r2));
-      break;
-    case 1:
-      VectorLoadComplement<int16_t>(&get_simd_register(r1),
-                                    &get_simd_register(r2));
-      break;
-    case 2:
-      VectorLoadComplement<int32_t>(&get_simd_register(r1),
-                                    &get_simd_register(r2));
-      break;
-    case 3:
-      VectorLoadComplement<int64_t>(&get_simd_register(r1),
-                                    &get_simd_register(r2));
-      break;
+#define CASE(i, type)                         \
+  case i:                                     \
+    VectorLoadComplement<type>(this, r1, r2); \
+    break;
+    CASE(0, int8_t);
+    CASE(1, int16_t);
+    CASE(2, int32_t);
+    CASE(3, int64_t);
     default:
       UNREACHABLE();
+#undef CASE
   }
   return length;
 }
@@ -3766,11 +3736,11 @@ EVALUATE(VBPERM) {
   USE(m5);
   USE(m6);
   uint16_t result_bits = 0;
+  unsigned __int128 src_bits =
+      *(reinterpret_cast<__int128*>(get_simd_register(r2).int8));
   for (int i = 0; i < kSimd128Size; i++) {
     result_bits <<= 1;
     uint8_t selected_bit_index = get_simd_register_by_lane<uint8_t>(r3, i);
-    unsigned __int128 src_bits =
-        *(reinterpret_cast<__int128*>(get_simd_register(r2).int8));
     if (selected_bit_index < (kSimd128Size * kBitsPerByte)) {
       unsigned __int128 bit_value =
           (src_bits << selected_bit_index) >> (kSimd128Size * kBitsPerByte - 1);
@@ -3805,19 +3775,17 @@ EVALUATE(VSEL) {
 }
 
 template <class T, class Operation>
-void VectorShift(void* dst, void* src, unsigned int shift, Operation op) {
-  int8_t* src_ptr = reinterpret_cast<int8_t*>(src);
-  int8_t* dst_ptr = reinterpret_cast<int8_t*>(dst);
-  for (int i = 0; i < kSimd128Size; i += sizeof(T)) {
-    T& dst_val = *reinterpret_cast<T*>(dst_ptr + i);
-    T& src_val = *reinterpret_cast<T*>(src_ptr + i);
-    dst_val = op(src_val, shift);
-    memcpy(dst_ptr + i, &dst_val, sizeof(T));
+void VectorShift(Simulator* sim, int dst, int src, unsigned int shift,
+                 Operation op) {
+  FOR_EACH_LANE(i, T) {
+    T src_val = sim->get_simd_register_by_lane<T>(src, i);
+    T dst_val = op(src_val, shift);
+    sim->set_simd_register_by_lane<T>(dst, i, dst_val);
   }
 }
 
-#define VECTOR_SHIFT_FOR_TYPE(type, op, shift)                             \
-  VectorShift<type>(&get_simd_register(r1), &get_simd_register(r3), shift, \
+#define VECTOR_SHIFT_FOR_TYPE(type, op, shift) \
+  VectorShift<type>(this, r1, r3, shift,       \
                     [](type a, unsigned int shift) { return a op shift; });
 
 #define VECTOR_SHIFT(op, sign)                        \
@@ -4061,68 +4029,112 @@ EVALUATE(VFNMS) {
 #undef VECTOR_FP_MULTIPLY_QFMS
 #undef VECTOR_FP_MULTIPLY_QFMS_OPERATION
 
-template <class T, class Operation>
-void VectorFPMaxMin(void* dst, void* src1, void* src2, int mode, Operation op) {
-  T* dst_ptr = reinterpret_cast<T*>(dst);
-  T* src1_ptr = reinterpret_cast<T*>(src1);
-  T* src2_ptr = reinterpret_cast<T*>(src2);
-  for (size_t i = 0; i < kSimd128Size / sizeof(T); i++) {
-    T src1_val = *(src1_ptr + i);
-    T src2_val = *(src2_ptr + i);
-    T value = op(src1_val, src2_val, mode);
-    memcpy(dst_ptr + i, &value, sizeof(T));
-  }
-}
-
-#define VECTOR_FP_MAX_MIN_FOR_TYPE(type, op, std_op)                   \
-  VectorFPMaxMin<type>(&get_simd_register(r1), &get_simd_register(r2), \
-                       &get_simd_register(r3), m6,                     \
-                       [](type a, type b, int mode) {                  \
-                         if (mode == 3) {                              \
-                           return std::std_op(a, b);                   \
-                         }                                             \
-                         if (isnan(a) || isnan(b))                     \
-                           return static_cast<type>(NAN);              \
-                         else if (signbit(b) op signbit(a))            \
-                           return a;                                   \
-                         else if (signbit(b) != signbit(a))            \
-                           return b;                                   \
-                         return (a op b) ? a : b;                      \
-                       });
-
-#define VECTOR_FP_MAX_MIN(op, std_op)                                          \
-  switch (m4) {                                                                \
-    case 2:                                                                    \
-      if (m5 == 8) {                                                           \
-        float src1 = get_simd_register_by_lane<float>(r2, 0);                  \
-        float src2 = get_simd_register_by_lane<float>(r3, 0);                  \
-        set_simd_register_by_lane<float>(r1, 0, (src1 op src2) ? src1 : src2); \
-      } else {                                                                 \
-        DCHECK_EQ(m5, 0);                                                      \
-        VECTOR_FP_MAX_MIN_FOR_TYPE(float, op, std_op)                          \
-      }                                                                        \
-      break;                                                                   \
-    case 3:                                                                    \
-      if (m5 == 8) {                                                           \
-        double src1 = get_simd_register_by_lane<double>(r2, 0);                \
-        double src2 = get_simd_register_by_lane<double>(r3, 0);                \
-        set_simd_register_by_lane<double>(r1, 0,                               \
-                                          (src1 op src2) ? src1 : src2);       \
-      } else {                                                                 \
-        DCHECK_EQ(m5, 0);                                                      \
-        VECTOR_FP_MAX_MIN_FOR_TYPE(double, op, std_op)                         \
-      }                                                                        \
-      break;                                                                   \
-    default:                                                                   \
-      UNREACHABLE();                                                           \
-      break;                                                                   \
+template <class FP_Type>
+static FP_Type JavaMathMax(FP_Type x, FP_Type y) {
+  if (std::isnan(x) || std::isnan(y)) return NAN;
+  if (std::signbit(x) < std::signbit(y)) return x;
+  return x > y ? x : y;
+}
+
+template <class FP_Type>
+static FP_Type IEEE_maxNum(FP_Type x, FP_Type y) {
+  if (x > y) return x;
+  if (x < y) return y;
+  if (x == y) return x;
+  if (!std::isnan(x)) return x;
+  if (!std::isnan(y)) return y;
+  return NAN;
+}
+
+template <class FP_Type>
+static FP_Type FPMax(int m6, FP_Type lhs, FP_Type rhs) {
+  switch (m6) {
+    case 0:
+      return IEEE_maxNum(lhs, rhs);
+    case 1:
+      return JavaMathMax(lhs, rhs);
+    case 3:
+      return std::max(lhs, rhs);
+    case 4:
+      return std::fmax(lhs, rhs);
+    default:
+      UNIMPLEMENTED();
+  }
+  return static_cast<FP_Type>(0);
+}
+
+template <class FP_Type>
+static FP_Type JavaMathMin(FP_Type x, FP_Type y) {
+  if (isnan(x) || isnan(y))
+    return NAN;
+  else if (signbit(y) < signbit(x))
+    return x;
+  else if (signbit(y) != signbit(x))
+    return y;
+  return (x < y) ? x : y;
+}
+
+template <class FP_Type>
+static FP_Type IEEE_minNum(FP_Type x, FP_Type y) {
+  if (x > y) return y;
+  if (x < y) return x;
+  if (x == y) return x;
+  if (!std::isnan(x)) return x;
+  if (!std::isnan(y)) return y;
+  return NAN;
+}
+
+template <class FP_Type>
+static FP_Type FPMin(int m6, FP_Type lhs, FP_Type rhs) {
+  switch (m6) {
+    case 0:
+      return IEEE_minNum(lhs, rhs);
+    case 1:
+      return JavaMathMin(lhs, rhs);
+    case 3:
+      return std::min(lhs, rhs);
+    case 4:
+      return std::fmin(lhs, rhs);
+    default:
+      UNIMPLEMENTED();
   }
+  return static_cast<FP_Type>(0);
+}
+
+// TODO(john.yan): use generic binary operation
+template <class FP_Type, class Operation>
+static void FPMinMaxForEachLane(Simulator* sim, Operation Op, int dst, int lhs,
+                                int rhs, int m5, int m6) {
+  DCHECK(m5 == 8 || m5 == 0);
+  if (m5 == 8) {
+    FP_Type src1 = sim->get_fpr<FP_Type>(lhs);
+    FP_Type src2 = sim->get_fpr<FP_Type>(rhs);
+    FP_Type res = Op(m6, src1, src2);
+    sim->set_fpr(dst, res);
+  } else {
+    FOR_EACH_LANE(i, FP_Type) {
+      FP_Type src1 = sim->get_simd_register_by_lane<FP_Type>(lhs, i);
+      FP_Type src2 = sim->get_simd_register_by_lane<FP_Type>(rhs, i);
+      FP_Type res = Op(m6, src1, src2);
+      sim->set_simd_register_by_lane<FP_Type>(dst, i, res);
+    }
+  }
+}
 
+#define CASE(i, type, op)                                          \
+  case i:                                                          \
+    FPMinMaxForEachLane<type>(this, op<type>, r1, r2, r3, m5, m6); \
+    break;
 EVALUATE(VFMIN) {
   DCHECK(CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1));
   DCHECK_OPCODE(VFMIN);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
-  VECTOR_FP_MAX_MIN(<, min)  // NOLINT
+  switch (m4) {
+    CASE(2, float, FPMin);
+    CASE(3, double, FPMin);
+    default:
+      UNIMPLEMENTED();
+  }
   return length;
 }
 
@@ -4130,27 +4142,31 @@ EVALUATE(VFMAX) {
   DCHECK(CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1));
   DCHECK_OPCODE(VFMAX);
   DECODE_VRR_C_INSTRUCTION(r1, r2, r3, m6, m5, m4);
-  USE(m6);
-  VECTOR_FP_MAX_MIN(>, max)  // NOLINT
+  switch (m4) {
+    CASE(2, float, FPMax);
+    CASE(3, double, FPMax);
+    default:
+      UNIMPLEMENTED();
+  }
   return length;
 }
+#undef CASE
 
 template <class S, class D, class Operation>
-void VectorFPCompare(void* dst, void* src1, void* src2, Operation op) {
-  D* dst_ptr = reinterpret_cast<D*>(dst);
-  S* src1_ptr = reinterpret_cast<S*>(src1);
-  S* src2_ptr = reinterpret_cast<S*>(src2);
-  for (size_t i = 0; i < kSimd128Size / sizeof(D); i++) {
-    S src1_val = *(src1_ptr + i);
-    S src2_val = *(src2_ptr + i);
+void VectorFPCompare(Simulator* sim, int dst, int src1, int src2,
+                     Operation op) {
+  static_assert(sizeof(S) == sizeof(D),
+                "Expect input type size == output type size");
+  FOR_EACH_LANE(i, D) {
+    S src1_val = sim->get_simd_register_by_lane<S>(src1, i);
+    S src2_val = sim->get_simd_register_by_lane<S>(src2, i);
     D value = op(src1_val, src2_val);
-    memcpy(dst_ptr + i, &value, sizeof(D));
+    sim->set_simd_register_by_lane<D>(dst, i, value);
   }
 }
 
-#define VECTOR_FP_COMPARE_FOR_TYPE(S, D, op)                            \
-  VectorFPCompare<S, D>(&get_simd_register(r1), &get_simd_register(r2), \
-                        &get_simd_register(r3),                         \
+#define VECTOR_FP_COMPARE_FOR_TYPE(S, D, op) \
+  VectorFPCompare<S, D>(this, r1, r2, r3,    \
                         [](S a, S b) { return (a op b) ? -1 : 0; });
 
 #define VECTOR_FP_COMPARE(op)                                               \
@@ -4205,142 +4221,94 @@ EVALUATE(VFCH) {
   return length;
 }
 
+// TODO(john): unify most fp unary operations
+// sec = Single Element Control mask
+template <class T, class Op>
+static void VectorUnaryOp(Simulator* sim, int dst, int src, int sec, Op op) {
+  if (sec == 8) {
+    T value = op(sim->get_fpr<T>(src));
+    sim->set_fpr(dst, value);
+  } else {
+    CHECK_EQ(sec, 0);
+    FOR_EACH_LANE(i, T) {
+      T value = op(sim->get_simd_register_by_lane<T>(src, i));
+      sim->set_simd_register_by_lane<T>(dst, i, value);
+    }
+  }
+}
+
+#define CASE(i, T, op)                       \
+  case i:                                    \
+    VectorUnaryOp<T>(sim, dst, src, m4, op); \
+    break;
+
 template <class T>
-void VectorSignOp(void* dst, void* src, int m4, int m5) {
-  T* src_ptr = reinterpret_cast<T*>(src);
-  T* dst_ptr = reinterpret_cast<T*>(dst);
+void VectorSignOp(Simulator* sim, int dst, int src, int m4, int m5) {
   switch (m5) {
-    case 0:
-      if (m4 == 8) {
-        T value = -(*src_ptr);
-        memcpy(dst_ptr, &value, sizeof(T));
-      } else {
-        for (size_t i = 0; i < kSimd128Size / sizeof(T); i++) {
-          T value = -(*(src_ptr + i));
-          memcpy(dst_ptr + i, &value, sizeof(T));
-        }
-      }
-      break;
-    case 1:
-      if (m4 == 8) {
-        T value = -abs(*src_ptr);
-        memcpy(dst_ptr, &value, sizeof(T));
-      } else {
-        for (size_t i = 0; i < kSimd128Size / sizeof(T); i++) {
-          T value = -abs(*(src_ptr + i));
-          memcpy(dst_ptr + i, &value, sizeof(T));
-        }
-      }
-      break;
-    case 2:
-      if (m4 == 8) {
-        T value = abs(*src_ptr);
-        memcpy(dst_ptr, &value, sizeof(T));
-      } else {
-        for (size_t i = 0; i < kSimd128Size / sizeof(T); i++) {
-          T value = abs(*(src_ptr + i));
-          memcpy(dst_ptr + i, &value, sizeof(T));
-        }
-      }
-      break;
+    CASE(0, T, [](T value) { return -value; });
+    CASE(1, T, [](T value) { return -std::abs(value); });
+    CASE(2, T, [](T value) { return std::abs(value); });
     default:
       UNREACHABLE();
   }
 }
+#undef CASE
 
 EVALUATE(VFPSO) {
   DCHECK_OPCODE(VFPSO);
   DECODE_VRR_A_INSTRUCTION(r1, r2, m5, m4, m3);
-  USE(m5);
-  USE(m4);
-  USE(m3);
   switch (m3) {
-    case 2:
-      DCHECK(CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1));
-      VectorSignOp<float>(&get_simd_register(r1), &get_simd_register(r2), m4,
-                          m5);
-      break;
-    case 3:
-      VectorSignOp<double>(&get_simd_register(r1), &get_simd_register(r2), m4,
-                           m5);
-      break;
+#define CASE(i, T)                         \
+  case i:                                  \
+    VectorSignOp<T>(this, r1, r2, m4, m5); \
+    break;
+    CASE(2, float);
+    CASE(3, double);
     default:
       UNREACHABLE();
+#undef CASE
   }
   return length;
 }
 
-template <class T>
-void VectorFPSqrt(void* dst, void* src) {
-  T* dst_ptr = reinterpret_cast<T*>(dst);
-  T* src_ptr = reinterpret_cast<T*>(src);
-  for (size_t i = 0; i < kSimd128Size / sizeof(T); i++) {
-    T value = sqrt(*(src_ptr + i));
-    memcpy(dst_ptr + i, &value, sizeof(T));
-  }
-}
-
 EVALUATE(VFSQ) {
   DCHECK_OPCODE(VFSQ);
   DECODE_VRR_A_INSTRUCTION(r1, r2, m5, m4, m3);
   USE(m5);
   switch (m3) {
-    case 2:
-      DCHECK(CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1));
-      if (m4 == 8) {
-        float src = get_simd_register_by_lane<float>(r2, 0);
-        set_simd_register_by_lane<float>(r1, 0, sqrt(src));
-      } else {
-        VectorFPSqrt<float>(&get_simd_register(r1), &get_simd_register(r2));
-      }
-      break;
-    case 3:
-      if (m4 == 8) {
-        double src = get_simd_register_by_lane<double>(r2, 0);
-        set_simd_register_by_lane<double>(r1, 0, sqrt(src));
-      } else {
-        VectorFPSqrt<double>(&get_simd_register(r1), &get_simd_register(r2));
-      }
-      break;
+#define CASE(i, T)                                                            \
+  case i:                                                                     \
+    VectorUnaryOp<T>(this, r1, r2, m4, [](T val) { return std::sqrt(val); }); \
+    break;
+    CASE(2, float);
+    CASE(3, double);
     default:
       UNREACHABLE();
+#undef CASE
   }
   return length;
 }
 
-#define ROUNDING_SWITCH(type)                                   \
-  switch (m5) {                                                 \
-    case 4:                                                     \
-      set_simd_register_by_lane<type>(r1, i, nearbyint(value)); \
-      break;                                                    \
-    case 5:                                                     \
-      set_simd_register_by_lane<type>(r1, i, trunc(value));     \
-      break;                                                    \
-    case 6:                                                     \
-      set_simd_register_by_lane<type>(r1, i, ceil(value));      \
-      break;                                                    \
-    case 7:                                                     \
-      set_simd_register_by_lane<type>(r1, i, floor(value));     \
-      break;                                                    \
-    default:                                                    \
-      UNREACHABLE();                                            \
-  }
 EVALUATE(VFI) {
   DCHECK_OPCODE(VFI);
   DECODE_VRR_A_INSTRUCTION(r1, r2, m5, m4, m3);
+  DCHECK_EQ(m4, 0);
   USE(m4);
+
   switch (m3) {
     case 2:
       DCHECK(CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1));
       for (int i = 0; i < 4; i++) {
         float value = get_simd_register_by_lane<float>(r2, i);
-        ROUNDING_SWITCH(float)
+        float n = ComputeRounding<float>(value, m5);
+        set_simd_register_by_lane<float>(r1, i, n);
       }
       break;
     case 3:
       for (int i = 0; i < 2; i++) {
         double value = get_simd_register_by_lane<double>(r2, i);
-        ROUNDING_SWITCH(double)
+        double n = ComputeRounding<double>(value, m5);
+        set_simd_register_by_lane<double>(r1, i, n);
       }
       break;
     default:
@@ -4348,7 +4316,6 @@ EVALUATE(VFI) {
   }
   return length;
 }
-#undef ROUNDING_SWITCH
 
 EVALUATE(DUMY) {
   DCHECK_OPCODE(DUMY);
@@ -4958,8 +4925,8 @@ EVALUATE(SLR) {
 EVALUATE(LDR) {
   DCHECK_OPCODE(LDR);
   DECODE_RR_INSTRUCTION(r1, r2);
-  int64_t r2_val = get_d_register(r2);
-  set_d_register(r1, r2_val);
+  int64_t r2_val = get_fpr<int64_t>(r2);
+  set_fpr(r1, r2_val);
   return length;
 }
 
@@ -4970,9 +4937,11 @@ EVALUATE(CDR) {
 }
 
 EVALUATE(LER) {
-  UNIMPLEMENTED();
-  USE(instr);
-  return 0;
+  DCHECK_OPCODE(LER);
+  DECODE_RR_INSTRUCTION(r1, r2);
+  int64_t r2_val = get_fpr<int64_t>(r2);
+  set_fpr(r1, r2_val);
+  return length;
 }
 
 EVALUATE(STH) {
@@ -5298,7 +5267,7 @@ EVALUATE(STD) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t addr = b2_val + x2_val + d2_val;
-  int64_t frs_val = get_d_register(r1);
+  int64_t frs_val = get_fpr<int64_t>(r1);
   WriteDW(addr, frs_val);
   return length;
 }
@@ -5310,7 +5279,7 @@ EVALUATE(LD) {
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t addr = b2_val + x2_val + d2_val;
   int64_t dbl_val = *reinterpret_cast<int64_t*>(addr);
-  set_d_register(r1, dbl_val);
+  set_fpr(r1, dbl_val);
   return length;
 }
 
@@ -5326,8 +5295,8 @@ EVALUATE(STE) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t addr = b2_val + x2_val + d2_val;
-  int64_t frs_val = get_d_register(r1) >> 32;
-  WriteW(addr, static_cast<int32_t>(frs_val), instr);
+  int32_t frs_val = get_fpr<int32_t>(r1);
+  WriteW(addr, frs_val, instr);
   return length;
 }
 
@@ -5349,7 +5318,7 @@ EVALUATE(LE) {
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t addr = b2_val + x2_val + d2_val;
   float float_val = *reinterpret_cast<float*>(addr);
-  set_d_register_from_float32(r1, float_val);
+  set_fpr(r1, float_val);
   return length;
 }
 
@@ -5948,29 +5917,35 @@ EVALUATE(OILL) {
 }
 
 EVALUATE(LLIHH) {
-  UNIMPLEMENTED();
-  USE(instr);
-  return 0;
+  DCHECK_OPCODE(LLIHL);
+  DECODE_RI_A_INSTRUCTION(instr, r1, i2);
+  uint64_t imm = static_cast<uint64_t>(i2) & 0xffff;
+  set_register(r1, imm << 48);
+  return length;
 }
 
 EVALUATE(LLIHL) {
-  UNIMPLEMENTED();
-  USE(instr);
-  return 0;
+  DCHECK_OPCODE(LLIHL);
+  DECODE_RI_A_INSTRUCTION(instr, r1, i2);
+  uint64_t imm = static_cast<uint64_t>(i2) & 0xffff;
+  set_register(r1, imm << 32);
+  return length;
 }
 
 EVALUATE(LLILH) {
   DCHECK_OPCODE(LLILH);
   DECODE_RI_A_INSTRUCTION(instr, r1, i2);
-  uint64_t imm = static_cast<uint64_t>(i2);
-  set_register(r1, (imm << 48) >> 32);
+  uint64_t imm = static_cast<uint64_t>(i2) & 0xffff;
+  set_register(r1, imm << 16);
   return length;
 }
 
 EVALUATE(LLILL) {
-  UNIMPLEMENTED();
-  USE(instr);
-  return 0;
+  DCHECK_OPCODE(LLILL);
+  DECODE_RI_A_INSTRUCTION(instr, r1, i2);
+  uint64_t imm = static_cast<uint64_t>(i2) & 0xffff;
+  set_register(r1, imm);
+  return length;
 }
 
 inline static int TestUnderMask(uint16_t val, uint16_t mask,
@@ -6837,10 +6812,10 @@ EVALUATE(TRAP4) {
 EVALUATE(LPEBR) {
   DCHECK_OPCODE(LPEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   fr1_val = std::fabs(fr2_val);
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   if (fr2_val != fr2_val) {  // input is NaN
     condition_reg_ = CC_OF;
   } else if (fr2_val == 0) {
@@ -6861,20 +6836,20 @@ EVALUATE(LNEBR) {
 EVALUATE(LTEBR) {
   DCHECK_OPCODE(LTEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  int64_t r2_val = get_d_register(r2);
-  float fr2_val = get_float32_from_d_register(r2);
+  int64_t r2_val = get_fpr<int64_t>(r2);
+  float fr2_val = get_fpr<float>(r2);
   SetS390ConditionCode<float>(fr2_val, 0.0);
-  set_d_register(r1, r2_val);
+  set_fpr(r1, r2_val);
   return length;
 }
 
 EVALUATE(LCEBR) {
   DCHECK_OPCODE(LCEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   fr1_val = -fr2_val;
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   if (fr2_val != fr2_val) {  // input is NaN
     condition_reg_ = CC_OF;
   } else if (fr2_val == 0) {
@@ -6890,9 +6865,9 @@ EVALUATE(LCEBR) {
 EVALUATE(LDEBR) {
   DCHECK_OPCODE(LDEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fp_val = get_float32_from_d_register(r2);
+  float fp_val = get_fpr<float>(r2);
   double db_val = static_cast<double>(fp_val);
-  set_d_register_from_double(r1, db_val);
+  set_fpr(r1, db_val);
   return length;
 }
 
@@ -6923,8 +6898,8 @@ EVALUATE(KEBR) {
 EVALUATE(CEBR) {
   DCHECK_OPCODE(CEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   if (isNaN(fr1_val) || isNaN(fr2_val)) {
     condition_reg_ = CC_OF;
   } else {
@@ -6937,10 +6912,10 @@ EVALUATE(CEBR) {
 EVALUATE(AEBR) {
   DCHECK_OPCODE(AEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   fr1_val += fr2_val;
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   SetS390ConditionCode<float>(fr1_val, 0);
 
   return length;
@@ -6949,10 +6924,10 @@ EVALUATE(AEBR) {
 EVALUATE(SEBR) {
   DCHECK_OPCODE(SEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   fr1_val -= fr2_val;
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   SetS390ConditionCode<float>(fr1_val, 0);
 
   return length;
@@ -6967,10 +6942,10 @@ EVALUATE(MDEBR) {
 EVALUATE(DEBR) {
   DCHECK_OPCODE(DEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   fr1_val /= fr2_val;
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   return length;
 }
 
@@ -6989,10 +6964,10 @@ EVALUATE(MSEBR) {
 EVALUATE(LPDBR) {
   DCHECK_OPCODE(LPDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   r1_val = std::fabs(r2_val);
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   if (r2_val != r2_val) {  // input is NaN
     condition_reg_ = CC_OF;
   } else if (r2_val == 0) {
@@ -7012,19 +6987,19 @@ EVALUATE(LNDBR) {
 EVALUATE(LTDBR) {
   DCHECK_OPCODE(LTDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  int64_t r2_val = get_d_register(r2);
+  int64_t r2_val = get_fpr<int64_t>(r2);
   SetS390ConditionCode<double>(bit_cast<double, int64_t>(r2_val), 0.0);
-  set_d_register(r1, r2_val);
+  set_fpr(r1, r2_val);
   return length;
 }
 
 EVALUATE(LCDBR) {
   DCHECK_OPCODE(LCDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   r1_val = -r2_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   if (r2_val != r2_val) {  // input is NaN
     condition_reg_ = CC_OF;
   } else if (r2_val == 0) {
@@ -7040,20 +7015,20 @@ EVALUATE(LCDBR) {
 EVALUATE(SQEBR) {
   DCHECK_OPCODE(SQEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   fr1_val = std::sqrt(fr2_val);
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   return length;
 }
 
 EVALUATE(SQDBR) {
   DCHECK_OPCODE(SQDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   r1_val = std::sqrt(r2_val);
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -7066,10 +7041,10 @@ EVALUATE(SQXBR) {
 EVALUATE(MEEBR) {
   DCHECK_OPCODE(MEEBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  float fr1_val = get_float32_from_d_register(r1);
-  float fr2_val = get_float32_from_d_register(r2);
+  float fr1_val = get_fpr<float>(r1);
+  float fr2_val = get_fpr<float>(r2);
   fr1_val *= fr2_val;
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   return length;
 }
 
@@ -7082,8 +7057,8 @@ EVALUATE(KDBR) {
 EVALUATE(CDBR) {
   DCHECK_OPCODE(CDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   if (isNaN(r1_val) || isNaN(r2_val)) {
     condition_reg_ = CC_OF;
   } else {
@@ -7095,10 +7070,10 @@ EVALUATE(CDBR) {
 EVALUATE(ADBR) {
   DCHECK_OPCODE(ADBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   r1_val += r2_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   SetS390ConditionCode<double>(r1_val, 0);
   return length;
 }
@@ -7106,10 +7081,10 @@ EVALUATE(ADBR) {
 EVALUATE(SDBR) {
   DCHECK_OPCODE(SDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   r1_val -= r2_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   SetS390ConditionCode<double>(r1_val, 0);
   return length;
 }
@@ -7117,31 +7092,31 @@ EVALUATE(SDBR) {
 EVALUATE(MDBR) {
   DCHECK_OPCODE(MDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   r1_val *= r2_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
 EVALUATE(DDBR) {
   DCHECK_OPCODE(DDBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
   r1_val /= r2_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
 EVALUATE(MADBR) {
   DCHECK_OPCODE(MADBR);
   DECODE_RRD_INSTRUCTION(r1, r2, r3);
-  double r1_val = get_double_from_d_register(r1);
-  double r2_val = get_double_from_d_register(r2);
-  double r3_val = get_double_from_d_register(r3);
+  double r1_val = get_fpr<double>(r1);
+  double r2_val = get_fpr<double>(r2);
+  double r3_val = get_fpr<double>(r3);
   r1_val += r2_val * r3_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   SetS390ConditionCode<double>(r1_val, 0);
   return length;
 }
@@ -7179,8 +7154,8 @@ EVALUATE(LCXBR) {
 EVALUATE(LEDBRA) {
   DCHECK_OPCODE(LEDBRA);
   DECODE_RRE_INSTRUCTION(r1, r2);
-  double r2_val = get_double_from_d_register(r2);
-  set_d_register_from_float32(r1, static_cast<float>(r2_val));
+  double r2_val = get_fpr<double>(r2);
+  set_fpr(r1, static_cast<float>(r2_val));
   return length;
 }
 
@@ -7256,31 +7231,6 @@ EVALUATE(DIEBR) {
   return 0;
 }
 
-EVALUATE(FIEBRA) {
-  DCHECK_OPCODE(FIEBRA);
-  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
-  float r2_val = get_float32_from_d_register(r2);
-  CHECK_EQ(m4, 0);
-  switch (m3) {
-    case Assembler::FIDBRA_ROUND_TO_NEAREST_AWAY_FROM_0:
-      set_d_register_from_float32(r1, round(r2_val));
-      break;
-    case Assembler::FIDBRA_ROUND_TOWARD_0:
-      set_d_register_from_float32(r1, trunc(r2_val));
-      break;
-    case Assembler::FIDBRA_ROUND_TOWARD_POS_INF:
-      set_d_register_from_float32(r1, std::ceil(r2_val));
-      break;
-    case Assembler::FIDBRA_ROUND_TOWARD_NEG_INF:
-      set_d_register_from_float32(r1, std::floor(r2_val));
-      break;
-    default:
-      UNIMPLEMENTED();
-      break;
-  }
-  return length;
-}
-
 EVALUATE(THDER) {
   UNIMPLEMENTED();
   USE(instr);
@@ -7299,31 +7249,6 @@ EVALUATE(DIDBR) {
   return 0;
 }
 
-EVALUATE(FIDBRA) {
-  DCHECK_OPCODE(FIDBRA);
-  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
-  double r2_val = get_double_from_d_register(r2);
-  CHECK_EQ(m4, 0);
-  switch (m3) {
-    case Assembler::FIDBRA_ROUND_TO_NEAREST_AWAY_FROM_0:
-      set_d_register_from_double(r1, round(r2_val));
-      break;
-    case Assembler::FIDBRA_ROUND_TOWARD_0:
-      set_d_register_from_double(r1, trunc(r2_val));
-      break;
-    case Assembler::FIDBRA_ROUND_TOWARD_POS_INF:
-      set_d_register_from_double(r1, std::ceil(r2_val));
-      break;
-    case Assembler::FIDBRA_ROUND_TOWARD_NEG_INF:
-      set_d_register_from_double(r1, std::floor(r2_val));
-      break;
-    default:
-      UNIMPLEMENTED();
-      break;
-  }
-  return length;
-}
-
 EVALUATE(LXR) {
   UNIMPLEMENTED();
   USE(instr);
@@ -7349,15 +7274,16 @@ EVALUATE(LCDFR) {
 }
 
 EVALUATE(LZER) {
-  UNIMPLEMENTED();
-  USE(instr);
-  return 0;
+  DCHECK_OPCODE(LZER);
+  DECODE_RRE_INSTRUCTION_NO_R2(r1);
+  set_fpr<float>(r1, 0.0);
+  return length;
 }
 
 EVALUATE(LZDR) {
   DCHECK_OPCODE(LZDR);
   DECODE_RRE_INSTRUCTION_NO_R2(r1);
-  set_d_register_from_double(r1, 0.0);
+  set_fpr<double>(r1, 0.0);
   return length;
 }
 
@@ -7390,7 +7316,7 @@ EVALUATE(CELFBR) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   uint32_t r2_val = get_low_register<uint32_t>(r2);
   float r1_val = static_cast<float>(r2_val);
-  set_d_register_from_float32(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -7399,7 +7325,7 @@ EVALUATE(CDLFBR) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   uint32_t r2_val = get_low_register<uint32_t>(r2);
   double r1_val = static_cast<double>(r2_val);
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -7414,7 +7340,7 @@ EVALUATE(CEFBRA) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   int32_t fr2_val = get_low_register<int32_t>(r2);
   float fr1_val = static_cast<float>(fr2_val);
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   return length;
 }
 
@@ -7423,7 +7349,7 @@ EVALUATE(CDFBRA) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   int32_t r2_val = get_low_register<int32_t>(r2);
   double r1_val = static_cast<double>(r2_val);
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -7433,216 +7359,251 @@ EVALUATE(CXFBRA) {
   return 0;
 }
 
-EVALUATE(CFEBRA) {
-  DCHECK_OPCODE(CFEBRA);
-  DECODE_RRE_INSTRUCTION_M3(r1, r2, mask_val);
-  float r2_fval = get_float32_from_d_register(r2);
-  int32_t r1_val = 0;
+EVALUATE(FIDBRA) {
+  DCHECK_OPCODE(FIDBRA);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  double a = get_fpr<double>(r2);
+  double n = ComputeRounding<double>(a, m3);
+  set_fpr(r1, n);
+  return length;
+}
 
-  SetS390RoundConditionCode(r2_fval, INT32_MAX, INT32_MIN);
+EVALUATE(FIEBRA) {
+  DCHECK_OPCODE(FIEBRA);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  float a = get_fpr<float>(r2);
+  float n = ComputeRounding<float>(a, m3);
+  set_fpr(r1, n);
+  return length;
+}
 
-  switch (mask_val) {
-    case CURRENT_ROUNDING_MODE:
-    case ROUND_TO_PREPARE_FOR_SHORTER_PRECISION: {
-      r1_val = static_cast<int32_t>(r2_fval);
-      break;
-    }
-    case ROUND_TO_NEAREST_WITH_TIES_AWAY_FROM_0: {
-      float ceil_val = std::ceil(r2_fval);
-      float floor_val = std::floor(r2_fval);
-      float sub_val1 = std::fabs(r2_fval - floor_val);
-      float sub_val2 = std::fabs(r2_fval - ceil_val);
-      if (sub_val1 > sub_val2) {
-        r1_val = static_cast<int32_t>(ceil_val);
-      } else if (sub_val1 < sub_val2) {
-        r1_val = static_cast<int32_t>(floor_val);
-      } else {  // round away from zero:
-        if (r2_fval > 0.0) {
-          r1_val = static_cast<int32_t>(ceil_val);
-        } else {
-          r1_val = static_cast<int32_t>(floor_val);
-        }
-      }
-      break;
-    }
-    case ROUND_TO_NEAREST_WITH_TIES_TO_EVEN: {
-      float ceil_val = std::ceil(r2_fval);
-      float floor_val = std::floor(r2_fval);
-      float sub_val1 = std::fabs(r2_fval - floor_val);
-      float sub_val2 = std::fabs(r2_fval - ceil_val);
-      if (sub_val1 > sub_val2) {
-        r1_val = static_cast<int32_t>(ceil_val);
-      } else if (sub_val1 < sub_val2) {
-        r1_val = static_cast<int32_t>(floor_val);
-      } else {  // check which one is even:
-        int32_t c_v = static_cast<int32_t>(ceil_val);
-        int32_t f_v = static_cast<int32_t>(floor_val);
-        if (f_v % 2 == 0)
-          r1_val = f_v;
-        else
-          r1_val = c_v;
-      }
-      break;
-    }
-    case ROUND_TOWARD_0: {
-      // check for overflow, cast r2_fval to double
-      // then check value within the range of INT_MIN and INT_MAX
-      // and set condition code accordingly
-      double temp = static_cast<double>(r2_fval);
-      if (temp < INT_MIN) {
-        r1_val = kMinInt;
-        condition_reg_ = CC_OF;
-      } else if (temp > INT_MAX) {
-        r1_val = kMaxInt;
-        condition_reg_ = CC_OF;
-      } else {
-        r1_val = static_cast<int32_t>(r2_fval);
-      }
-      break;
-    }
-    case ROUND_TOWARD_PLUS_INFINITE: {
-      r1_val = static_cast<int32_t>(std::ceil(r2_fval));
-      break;
-    }
-    case ROUND_TOWARD_MINUS_INFINITE: {
-      // check for overflow, cast r2_fval to 64bit integer
-      // then check value within the range of INT_MIN and INT_MAX
-      // and set condition code accordingly
-      int64_t temp = static_cast<int64_t>(std::floor(r2_fval));
-      if (temp < INT_MIN || temp > INT_MAX) {
-        condition_reg_ = CC_OF;
-      }
-      r1_val = static_cast<int32_t>(std::floor(r2_fval));
-      break;
-    }
-    default:
-      UNREACHABLE();
+template <class T, class R>
+static int ComputeSignedRoundingConditionCode(T a, T n) {
+  constexpr T NINF = -std::numeric_limits<T>::infinity();
+  constexpr T PINF = std::numeric_limits<T>::infinity();
+  constexpr long double MN =
+      static_cast<long double>(std::numeric_limits<R>::min());
+  constexpr long double MP =
+      static_cast<long double>(std::numeric_limits<R>::max());
+
+  if (NINF <= a && a < MN && n < MN) {
+    return 0x1;
+  } else if (NINF < a && a < MN && n == MN) {
+    return 0x4;
+  } else if (MN <= a && a < 0.0) {
+    return 0x4;
+  } else if (a == 0.0) {
+    return 0x8;
+  } else if (0.0 < a && a <= MP) {
+    return 0x2;
+  } else if (MP < a && a <= PINF && n == MP) {
+    return 0x2;
+  } else if (MP < a && a <= PINF && n > MP) {
+    return 0x1;
+  } else if (std::isnan(a)) {
+    return 0x1;
   }
-  set_low_register(r1, r1_val);
-  return length;
+  UNIMPLEMENTED();
+  return 0;
+}
+
+template <class T, class R>
+static R ComputeSignedRoundingResult(T a, T n) {
+  constexpr T NINF = -std::numeric_limits<T>::infinity();
+  constexpr T PINF = std::numeric_limits<T>::infinity();
+  constexpr long double MN =
+      static_cast<long double>(std::numeric_limits<R>::min());
+  constexpr long double MP =
+      static_cast<long double>(std::numeric_limits<R>::max());
+
+  if (NINF <= a && a < MN && n < MN) {
+    return std::numeric_limits<R>::min();
+  } else if (NINF < a && a < MN && n == MN) {
+    return std::numeric_limits<R>::min();
+  } else if (MN <= a && a < 0.0) {
+    return static_cast<R>(n);
+  } else if (a == 0.0) {
+    return 0;
+  } else if (0.0 < a && a <= MP) {
+    return static_cast<R>(n);
+  } else if (MP < a && a <= PINF && n == MP) {
+    return std::numeric_limits<R>::max();
+  } else if (MP < a && a <= PINF && n > MP) {
+    return std::numeric_limits<R>::max();
+  } else if (std::isnan(a)) {
+    return std::numeric_limits<R>::min();
+  }
+  UNIMPLEMENTED();
+  return 0;
 }
 
 EVALUATE(CFDBRA) {
   DCHECK_OPCODE(CFDBRA);
-  DECODE_RRE_INSTRUCTION_M3(r1, r2, mask_val);
-  double r2_val = get_double_from_d_register(r2);
-  int32_t r1_val = 0;
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  double a = get_fpr<double>(r2);
+  double n = ComputeRounding<double>(a, m3);
+  int32_t r1_val = ComputeSignedRoundingResult<double, int32_t>(a, n);
+  condition_reg_ = ComputeSignedRoundingConditionCode<double, int32_t>(a, n);
 
-  SetS390RoundConditionCode(r2_val, INT32_MAX, INT32_MIN);
+  set_low_register(r1, r1_val);
+  return length;
+}
+
+EVALUATE(CFEBRA) {
+  DCHECK_OPCODE(CFEBRA);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  float a = get_fpr<float>(r2);
+  float n = ComputeRounding<float>(a, m3);
+  int32_t r1_val = ComputeSignedRoundingResult<float, int32_t>(a, n);
+  condition_reg_ = ComputeSignedRoundingConditionCode<float, int32_t>(a, n);
 
-  switch (mask_val) {
-    case CURRENT_ROUNDING_MODE:
-    case ROUND_TO_PREPARE_FOR_SHORTER_PRECISION: {
-      r1_val = static_cast<int32_t>(r2_val);
-      break;
-    }
-    case ROUND_TO_NEAREST_WITH_TIES_AWAY_FROM_0: {
-      double ceil_val = std::ceil(r2_val);
-      double floor_val = std::floor(r2_val);
-      double sub_val1 = std::fabs(r2_val - floor_val);
-      double sub_val2 = std::fabs(r2_val - ceil_val);
-      if (sub_val1 > sub_val2) {
-        r1_val = static_cast<int32_t>(ceil_val);
-      } else if (sub_val1 < sub_val2) {
-        r1_val = static_cast<int32_t>(floor_val);
-      } else {  // round away from zero:
-        if (r2_val > 0.0) {
-          r1_val = static_cast<int32_t>(ceil_val);
-        } else {
-          r1_val = static_cast<int32_t>(floor_val);
-        }
-      }
-      break;
-    }
-    case ROUND_TO_NEAREST_WITH_TIES_TO_EVEN: {
-      double ceil_val = std::ceil(r2_val);
-      double floor_val = std::floor(r2_val);
-      double sub_val1 = std::fabs(r2_val - floor_val);
-      double sub_val2 = std::fabs(r2_val - ceil_val);
-      if (sub_val1 > sub_val2) {
-        r1_val = static_cast<int32_t>(ceil_val);
-      } else if (sub_val1 < sub_val2) {
-        r1_val = static_cast<int32_t>(floor_val);
-      } else {  // check which one is even:
-        int32_t c_v = static_cast<int32_t>(ceil_val);
-        int32_t f_v = static_cast<int32_t>(floor_val);
-        if (f_v % 2 == 0)
-          r1_val = f_v;
-        else
-          r1_val = c_v;
-      }
-      break;
-    }
-    case ROUND_TOWARD_0: {
-      // check for overflow, cast r2_val to 64bit integer
-      // then check value within the range of INT_MIN and INT_MAX
-      // and set condition code accordingly
-      int64_t temp = static_cast<int64_t>(r2_val);
-      if (temp < INT_MIN || temp > INT_MAX) {
-        condition_reg_ = CC_OF;
-      }
-      r1_val = static_cast<int32_t>(r2_val);
-      break;
-    }
-    case ROUND_TOWARD_PLUS_INFINITE: {
-      r1_val = static_cast<int32_t>(std::ceil(r2_val));
-      break;
-    }
-    case ROUND_TOWARD_MINUS_INFINITE: {
-      // check for overflow, cast r2_val to 64bit integer
-      // then check value within the range of INT_MIN and INT_MAX
-      // and set condition code accordingly
-      int64_t temp = static_cast<int64_t>(std::floor(r2_val));
-      if (temp < INT_MIN || temp > INT_MAX) {
-        condition_reg_ = CC_OF;
-      }
-      r1_val = static_cast<int32_t>(std::floor(r2_val));
-      break;
-    }
-    default:
-      UNREACHABLE();
-  }
   set_low_register(r1, r1_val);
   return length;
 }
 
+EVALUATE(CGEBRA) {
+  DCHECK_OPCODE(CGEBRA);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  float a = get_fpr<float>(r2);
+  float n = ComputeRounding<float>(a, m3);
+  int64_t r1_val = ComputeSignedRoundingResult<float, int64_t>(a, n);
+  condition_reg_ = ComputeSignedRoundingConditionCode<float, int64_t>(a, n);
+
+  set_register(r1, r1_val);
+  return length;
+}
+
+EVALUATE(CGDBRA) {
+  DCHECK_OPCODE(CGDBRA);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  double a = get_fpr<double>(r2);
+  double n = ComputeRounding<double>(a, m3);
+  int64_t r1_val = ComputeSignedRoundingResult<double, int64_t>(a, n);
+  condition_reg_ = ComputeSignedRoundingConditionCode<double, int64_t>(a, n);
+
+  set_register(r1, r1_val);
+  return length;
+}
+
+EVALUATE(CGXBRA) {
+  UNIMPLEMENTED();
+  USE(instr);
+  return 0;
+}
+
 EVALUATE(CFXBRA) {
   UNIMPLEMENTED();
   USE(instr);
   return 0;
 }
 
+template <class T, class R>
+static int ComputeLogicalRoundingConditionCode(T a, T n) {
+  constexpr T NINF = -std::numeric_limits<T>::infinity();
+  constexpr T PINF = std::numeric_limits<T>::infinity();
+  constexpr long double MP =
+      static_cast<long double>(std::numeric_limits<R>::max());
+
+  if (NINF <= a && a < 0.0) {
+    return (n < 0.0) ? 0x1 : 0x4;
+  } else if (a == 0.0) {
+    return 0x8;
+  } else if (0.0 < a && a <= MP) {
+    return 0x2;
+  } else if (MP < a && a <= PINF) {
+    return n == MP ? 0x2 : 0x1;
+  } else if (std::isnan(a)) {
+    return 0x1;
+  }
+  UNIMPLEMENTED();
+  return 0;
+}
+
+template <class T, class R>
+static R ComputeLogicalRoundingResult(T a, T n) {
+  constexpr T NINF = -std::numeric_limits<T>::infinity();
+  constexpr T PINF = std::numeric_limits<T>::infinity();
+  constexpr long double MP =
+      static_cast<long double>(std::numeric_limits<R>::max());
+
+  if (NINF <= a && a <= 0.0) {
+    return 0;
+  } else if (0.0 < a && a <= MP) {
+    return static_cast<R>(n);
+  } else if (MP < a && a <= PINF) {
+    return std::numeric_limits<R>::max();
+  } else if (std::isnan(a)) {
+    return 0;
+  }
+  UNIMPLEMENTED();
+  return 0;
+}
+
 EVALUATE(CLFEBR) {
   DCHECK_OPCODE(CLFEBR);
-  DECODE_RRE_INSTRUCTION(r1, r2);
-  float r2_val = get_float32_from_d_register(r2);
-  uint32_t r1_val = static_cast<uint32_t>(r2_val);
-  SetS390ConvertConditionCode<double>(r2_val, r1_val, UINT32_MAX);
-  double temp = static_cast<double>(r2_val);
-  if (temp < 0) r1_val = 0;
-  if (temp > kMaxUInt32) r1_val = kMaxUInt32;
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  float a = get_fpr<float>(r2);
+  float n = ComputeRounding<float>(a, m3);
+  uint32_t r1_val = ComputeLogicalRoundingResult<float, uint32_t>(a, n);
+  condition_reg_ = ComputeLogicalRoundingConditionCode<float, uint32_t>(a, n);
+
   set_low_register(r1, r1_val);
   return length;
 }
 
 EVALUATE(CLFDBR) {
   DCHECK_OPCODE(CLFDBR);
-  DECODE_RRE_INSTRUCTION(r1, r2);
-  double a = get_double_from_d_register(r2);
-  double n = std::round(a);
-  uint32_t r1_val = static_cast<uint32_t>(n);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  double a = get_fpr<double>(r2);
+  double n = ComputeRounding<double>(a, m3);
+  uint32_t r1_val = ComputeLogicalRoundingResult<double, uint32_t>(a, n);
+  condition_reg_ = ComputeLogicalRoundingConditionCode<double, uint32_t>(a, n);
+
   set_low_register(r1, r1_val);
-  if (std::isfinite(a) && a < 0.0) {
-    DCHECK(n <= 0.0 && std::isfinite(n));
-    condition_reg_ = (n < 0.0) ? 0x1 : 0x4;
-  } else if (a == 0.0) {
-    condition_reg_ = 0x8;
-  } else if (std::isfinite(a) && a > 0.0) {
-    DCHECK(n >= 0.0 && std::isfinite(n));
-    condition_reg_ = (n <= static_cast<double>(UINT32_MAX)) ? 0x2 : 0x1;
-  } else {
-    condition_reg_ = 0x1;
-  }
+  return length;
+}
+
+EVALUATE(CLGDBR) {
+  DCHECK_OPCODE(CLGDBR);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  double a = get_fpr<double>(r2);
+  double n = ComputeRounding<double>(a, m3);
+  uint64_t r1_val = ComputeLogicalRoundingResult<double, uint64_t>(a, n);
+  condition_reg_ = ComputeLogicalRoundingConditionCode<double, uint64_t>(a, n);
+
+  set_register(r1, r1_val);
+  return length;
+}
+
+EVALUATE(CLGEBR) {
+  DCHECK_OPCODE(CLGEBR);
+  DECODE_RRF_E_INSTRUCTION(r1, r2, m3, m4);
+  DCHECK_EQ(m4, 0);
+  USE(m4);
+  float a = get_fpr<float>(r2);
+  float n = ComputeRounding<float>(a, m3);
+  uint64_t r1_val = ComputeLogicalRoundingResult<float, uint64_t>(a, n);
+  condition_reg_ = ComputeLogicalRoundingConditionCode<float, uint64_t>(a, n);
+
+  set_register(r1, r1_val);
   return length;
 }
 
@@ -7657,7 +7618,7 @@ EVALUATE(CELGBR) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   uint64_t r2_val = get_register(r2);
   float r1_val = static_cast<float>(r2_val);
-  set_d_register_from_float32(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -7666,7 +7627,7 @@ EVALUATE(CDLGBR) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   uint64_t r2_val = get_register(r2);
   double r1_val = static_cast<double>(r2_val);
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -7681,7 +7642,7 @@ EVALUATE(CEGBRA) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   int64_t fr2_val = get_register(r2);
   float fr1_val = static_cast<float>(fr2_val);
-  set_d_register_from_float32(r1, fr1_val);
+  set_fpr(r1, fr1_val);
   return length;
 }
 
@@ -7690,7 +7651,7 @@ EVALUATE(CDGBRA) {
   DECODE_RRE_INSTRUCTION(r1, r2);
   int64_t r2_val = get_register(r2);
   double r1_val = static_cast<double>(r2_val);
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -7700,134 +7661,6 @@ EVALUATE(CXGBRA) {
   return 0;
 }
 
-EVALUATE(CGEBRA) {
-  DCHECK_OPCODE(CGEBRA);
-  DECODE_RRE_INSTRUCTION_M3(r1, r2, mask_val);
-  float r2_fval = get_float32_from_d_register(r2);
-  int64_t r1_val = 0;
-
-  SetS390RoundConditionCode(r2_fval, INT64_MAX, INT64_MIN);
-
-  switch (mask_val) {
-    case CURRENT_ROUNDING_MODE:
-    case ROUND_TO_NEAREST_WITH_TIES_AWAY_FROM_0:
-    case ROUND_TO_PREPARE_FOR_SHORTER_PRECISION: {
-      UNIMPLEMENTED();
-      break;
-    }
-    case ROUND_TO_NEAREST_WITH_TIES_TO_EVEN: {
-      float ceil_val = std::ceil(r2_fval);
-      float floor_val = std::floor(r2_fval);
-      if (std::abs(r2_fval - floor_val) > std::abs(r2_fval - ceil_val)) {
-        r1_val = static_cast<int64_t>(ceil_val);
-      } else if (std::abs(r2_fval - floor_val) < std::abs(r2_fval - ceil_val)) {
-        r1_val = static_cast<int64_t>(floor_val);
-      } else {  // check which one is even:
-        int64_t c_v = static_cast<int64_t>(ceil_val);
-        int64_t f_v = static_cast<int64_t>(floor_val);
-        if (f_v % 2 == 0)
-          r1_val = f_v;
-        else
-          r1_val = c_v;
-      }
-      break;
-    }
-    case ROUND_TOWARD_0: {
-      r1_val = static_cast<int64_t>(r2_fval);
-      break;
-    }
-    case ROUND_TOWARD_PLUS_INFINITE: {
-      r1_val = static_cast<int64_t>(std::ceil(r2_fval));
-      break;
-    }
-    case ROUND_TOWARD_MINUS_INFINITE: {
-      r1_val = static_cast<int64_t>(std::floor(r2_fval));
-      break;
-    }
-    default:
-      UNREACHABLE();
-  }
-  set_register(r1, r1_val);
-  return length;
-}
-
-EVALUATE(CGDBRA) {
-  DCHECK_OPCODE(CGDBRA);
-  DECODE_RRE_INSTRUCTION_M3(r1, r2, mask_val);
-  double r2_val = get_double_from_d_register(r2);
-  int64_t r1_val = 0;
-
-  SetS390RoundConditionCode(r2_val, INT64_MAX, INT64_MIN);
-
-  switch (mask_val) {
-    case CURRENT_ROUNDING_MODE:
-    case ROUND_TO_NEAREST_WITH_TIES_AWAY_FROM_0:
-    case ROUND_TO_PREPARE_FOR_SHORTER_PRECISION: {
-      UNIMPLEMENTED();
-      break;
-    }
-    case ROUND_TO_NEAREST_WITH_TIES_TO_EVEN: {
-      double ceil_val = std::ceil(r2_val);
-      double floor_val = std::floor(r2_val);
-      if (std::abs(r2_val - floor_val) > std::abs(r2_val - ceil_val)) {
-        r1_val = static_cast<int64_t>(ceil_val);
-      } else if (std::abs(r2_val - floor_val) < std::abs(r2_val - ceil_val)) {
-        r1_val = static_cast<int64_t>(floor_val);
-      } else {  // check which one is even:
-        int64_t c_v = static_cast<int64_t>(ceil_val);
-        int64_t f_v = static_cast<int64_t>(floor_val);
-        if (f_v % 2 == 0)
-          r1_val = f_v;
-        else
-          r1_val = c_v;
-      }
-      break;
-    }
-    case ROUND_TOWARD_0: {
-      r1_val = static_cast<int64_t>(r2_val);
-      break;
-    }
-    case ROUND_TOWARD_PLUS_INFINITE: {
-      r1_val = static_cast<int64_t>(std::ceil(r2_val));
-      break;
-    }
-    case ROUND_TOWARD_MINUS_INFINITE: {
-      r1_val = static_cast<int64_t>(std::floor(r2_val));
-      break;
-    }
-    default:
-      UNREACHABLE();
-  }
-  set_register(r1, r1_val);
-  return length;
-}
-
-EVALUATE(CGXBRA) {
-  UNIMPLEMENTED();
-  USE(instr);
-  return 0;
-}
-
-EVALUATE(CLGEBR) {
-  DCHECK_OPCODE(CLGEBR);
-  DECODE_RRE_INSTRUCTION(r1, r2);
-  float r2_val = get_float32_from_d_register(r2);
-  uint64_t r1_val = static_cast<uint64_t>(r2_val);
-  set_register(r1, r1_val);
-  SetS390ConvertConditionCode<double>(r2_val, r1_val, UINT64_MAX);
-  return length;
-}
-
-EVALUATE(CLGDBR) {
-  DCHECK_OPCODE(CLGDBR);
-  DECODE_RRE_INSTRUCTION(r1, r2);
-  double r2_val = get_double_from_d_register(r2);
-  uint64_t r1_val = static_cast<uint64_t>(r2_val);
-  set_register(r1, r1_val);
-  SetS390ConvertConditionCode<double>(r2_val, r1_val, UINT64_MAX);
-  return length;
-}
-
 EVALUATE(CFER) {
   UNIMPLEMENTED();
   USE(instr);
@@ -7851,9 +7684,7 @@ EVALUATE(LDGR) {
   // Load FPR from GPR (L <- 64)
   DECODE_RRE_INSTRUCTION(r1, r2);
   uint64_t int_val = get_register(r2);
-  // double double_val = bit_cast<double, uint64_t>(int_val);
-  // set_d_register_from_double(rreInst->R1Value(), double_val);
-  set_d_register(r1, int_val);
+  set_fpr(r1, int_val);
   return length;
 }
 
@@ -7879,7 +7710,7 @@ EVALUATE(LGDR) {
   DCHECK_OPCODE(LGDR);
   DECODE_RRE_INSTRUCTION(r1, r2);
   // Load GPR from FPR (64 <- L)
-  int64_t double_val = get_d_register(r2);
+  int64_t double_val = get_fpr<int64_t>(r2);
   set_register(r1, double_val);
   return length;
 }
@@ -10892,7 +10723,7 @@ EVALUATE(LDEB) {
   int64_t rb_val = (rb == 0) ? 0 : get_register(rb);
   int64_t rx_val = (rx == 0) ? 0 : get_register(rx);
   float fval = ReadFloat(rx_val + rb_val + offset);
-  set_d_register_from_double(r1, static_cast<double>(fval));
+  set_fpr(r1, static_cast<double>(fval));
   return length;
 }
 
@@ -10927,7 +10758,7 @@ EVALUATE(CEB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  float r1_val = get_float32_from_d_register(r1);
+  float r1_val = get_fpr<float>(r1);
   float fval = ReadFloat(b2_val + x2_val + d2_val);
   SetS390ConditionCode<float>(r1_val, fval);
   return length;
@@ -10939,10 +10770,10 @@ EVALUATE(AEB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  float r1_val = get_float32_from_d_register(r1);
+  float r1_val = get_fpr<float>(r1);
   float fval = ReadFloat(b2_val + x2_val + d2_val);
   r1_val += fval;
-  set_d_register_from_float32(r1, r1_val);
+  set_fpr(r1, r1_val);
   SetS390ConditionCode<float>(r1_val, 0);
   return length;
 }
@@ -10953,10 +10784,10 @@ EVALUATE(SEB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  float r1_val = get_float32_from_d_register(r1);
+  float r1_val = get_fpr<float>(r1);
   float fval = ReadFloat(b2_val + x2_val + d2_val);
   r1_val -= fval;
-  set_d_register_from_float32(r1, r1_val);
+  set_fpr(r1, r1_val);
   SetS390ConditionCode<float>(r1_val, 0);
   return length;
 }
@@ -10973,10 +10804,10 @@ EVALUATE(DEB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  float r1_val = get_float32_from_d_register(r1);
+  float r1_val = get_fpr<float>(r1);
   float fval = ReadFloat(b2_val + x2_val + d2_val);
   r1_val /= fval;
-  set_d_register_from_float32(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -11022,10 +10853,10 @@ EVALUATE(SQDB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  double r1_val = get_double_from_d_register(r1);
+  double r1_val = get_fpr<double>(r1);
   double dbl_val = ReadDouble(b2_val + x2_val + d2_val);
   r1_val = std::sqrt(dbl_val);
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -11035,10 +10866,10 @@ EVALUATE(MEEB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  float r1_val = get_float32_from_d_register(r1);
+  float r1_val = get_fpr<float>(r1);
   float fval = ReadFloat(b2_val + x2_val + d2_val);
   r1_val *= fval;
-  set_d_register_from_float32(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -11055,7 +10886,7 @@ EVALUATE(CDB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  double r1_val = get_double_from_d_register(r1);
+  double r1_val = get_fpr<double>(r1);
   double dbl_val = ReadDouble(b2_val + x2_val + d2_val);
   SetS390ConditionCode<double>(r1_val, dbl_val);
   return length;
@@ -11068,10 +10899,10 @@ EVALUATE(ADB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  double r1_val = get_double_from_d_register(r1);
+  double r1_val = get_fpr<double>(r1);
   double dbl_val = ReadDouble(b2_val + x2_val + d2_val);
   r1_val += dbl_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   SetS390ConditionCode<double>(r1_val, 0);
   return length;
 }
@@ -11082,10 +10913,10 @@ EVALUATE(SDB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  double r1_val = get_double_from_d_register(r1);
+  double r1_val = get_fpr<double>(r1);
   double dbl_val = ReadDouble(b2_val + x2_val + d2_val);
   r1_val -= dbl_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   SetS390ConditionCode<double>(r1_val, 0);
   return length;
 }
@@ -11096,10 +10927,10 @@ EVALUATE(MDB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  double r1_val = get_double_from_d_register(r1);
+  double r1_val = get_fpr<double>(r1);
   double dbl_val = ReadDouble(b2_val + x2_val + d2_val);
   r1_val *= dbl_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -11109,10 +10940,10 @@ EVALUATE(DDB) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   intptr_t d2_val = d2;
-  double r1_val = get_double_from_d_register(r1);
+  double r1_val = get_fpr<double>(r1);
   double dbl_val = ReadDouble(b2_val + x2_val + d2_val);
   r1_val /= dbl_val;
-  set_d_register_from_double(r1, r1_val);
+  set_fpr(r1, r1_val);
   return length;
 }
 
@@ -11196,7 +11027,7 @@ EVALUATE(LEY) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   intptr_t addr = x2_val + b2_val + d2;
   float float_val = *reinterpret_cast<float*>(addr);
-  set_d_register_from_float32(r1, float_val);
+  set_fpr(r1, float_val);
   return length;
 }
 
@@ -11208,7 +11039,7 @@ EVALUATE(LDY) {
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   intptr_t addr = x2_val + b2_val + d2;
   uint64_t dbl_val = *reinterpret_cast<uint64_t*>(addr);
-  set_d_register(r1, dbl_val);
+  set_fpr(r1, dbl_val);
   return length;
 }
 
@@ -11219,8 +11050,8 @@ EVALUATE(STEY) {
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   intptr_t addr = x2_val + b2_val + d2;
-  int64_t frs_val = get_d_register(r1) >> 32;
-  WriteW(addr, static_cast<int32_t>(frs_val), instr);
+  int32_t frs_val = get_fpr<int32_t>(r1);
+  WriteW(addr, frs_val, instr);
   return length;
 }
 
@@ -11231,7 +11062,7 @@ EVALUATE(STDY) {
   int64_t x2_val = (x2 == 0) ? 0 : get_register(x2);
   int64_t b2_val = (b2 == 0) ? 0 : get_register(b2);
   intptr_t addr = x2_val + b2_val + d2;
-  int64_t frs_val = get_d_register(r1);
+  int64_t frs_val = get_fpr<int64_t>(r1);
   WriteDW(addr, frs_val);
   return length;
 }
diff --git a/deps/v8/src/execution/s390/simulator-s390.h b/deps/v8/src/execution/s390/simulator-s390.h
index 57dbb1e3de372c..b509b9f926b314 100644
--- a/deps/v8/src/execution/s390/simulator-s390.h
+++ b/deps/v8/src/execution/s390/simulator-s390.h
@@ -53,6 +53,25 @@ class CachePage {
   char validity_map_[kValidityMapSize];  // One byte per line.
 };
 
+template <class T>
+static T ComputeRounding(T a, int mode) {
+  switch (mode) {
+    case ROUND_TO_NEAREST_AWAY_FROM_0:
+      return std::round(a);
+    case ROUND_TO_NEAREST_TO_EVEN:
+      return std::nearbyint(a);
+    case ROUND_TOWARD_0:
+      return std::trunc(a);
+    case ROUND_TOWARD_POS_INF:
+      return std::ceil(a);
+    case ROUND_TOWARD_NEG_INF:
+      return std::floor(a);
+    default:
+      UNIMPLEMENTED();
+  }
+  return 0;
+}
+
 class Simulator : public SimulatorBase {
  public:
   friend class S390Debugger;
@@ -118,40 +137,26 @@ class Simulator : public SimulatorBase {
   void set_high_register(int reg, uint32_t value);
 
   double get_double_from_register_pair(int reg);
-  void set_d_register_from_double(int dreg, const double dbl) {
-    DCHECK(dreg >= 0 && dreg < kNumFPRs);
-    set_simd_register_by_lane<double>(dreg, 0, dbl);
-  }
-
-  double get_double_from_d_register(int dreg) {
-    DCHECK(dreg >= 0 && dreg < kNumFPRs);
-    return get_simd_register_by_lane<double>(dreg, 0);
-  }
-
-  void set_d_register(int dreg, int64_t value) {
-    DCHECK(dreg >= 0 && dreg < kNumFPRs);
-    set_simd_register_by_lane<int64_t>(dreg, 0, value);
-  }
-
-  int64_t get_d_register(int dreg) {
-    DCHECK(dreg >= 0 && dreg < kNumFPRs);
-    return get_simd_register_by_lane<int64_t>(dreg, 0);
-  }
-
-  void set_d_register_from_float32(int dreg, const float f) {
+  template <class T>
+  T get_fpr(int dreg) {
     DCHECK(dreg >= 0 && dreg < kNumFPRs);
-
-    int32_t f_int = *bit_cast<int32_t*>(&f);
-    int64_t finalval = static_cast<int64_t>(f_int) << 32;
-    set_d_register(dreg, finalval);
+    if (sizeof(T) == 8) {
+      return get_simd_register_by_lane<T>(dreg, 0);
+    } else {
+      DCHECK_EQ(sizeof(T), 4);
+      return get_simd_register_by_lane<T>(dreg, 1);
+    }
   }
 
-  float get_float32_from_d_register(int dreg) {
+  template <class T>
+  void set_fpr(int dreg, const T val) {
     DCHECK(dreg >= 0 && dreg < kNumFPRs);
-
-    int64_t regval = get_d_register(dreg) >> 32;
-    int32_t regval32 = static_cast<int32_t>(regval);
-    return *bit_cast<float*>(&regval32);
+    if (sizeof(T) == 8) {
+      set_simd_register_by_lane(dreg, 0, val);
+    } else {
+      DCHECK_EQ(sizeof(T), 4);
+      set_simd_register_by_lane(dreg, 1, val);
+    }
   }
 
   // Special case of set_register and get_register to access the raw PC value.
@@ -198,7 +203,6 @@ class Simulator : public SimulatorBase {
   // below (bad_lr, end_sim_pc).
   bool has_bad_pc() const;
 
- private:
   enum special_values {
     // Known bad pc value to ensure that the simulator does not execute
     // without being properly setup.
@@ -242,9 +246,38 @@ class Simulator : public SimulatorBase {
   void PrintStopInfo(uint32_t code);
 
   // Byte Reverse
-  inline int16_t ByteReverse(int16_t hword);
-  inline int32_t ByteReverse(int32_t word);
-  inline int64_t ByteReverse(int64_t dword);
+  static inline __uint128_t __builtin_bswap128(__uint128_t v) {
+    union {
+      uint64_t u64[2];
+      __uint128_t u128;
+    } res, val;
+    val.u128 = v;
+    res.u64[0] = __builtin_bswap64(val.u64[1]);
+    res.u64[1] = __builtin_bswap64(val.u64[0]);
+    return res.u128;
+  }
+
+  template <class T>
+  static inline T ByteReverse(T val) {
+    constexpr int size = sizeof(T);
+#define CASE(type, size_in_bits)                                              \
+  case sizeof(type): {                                                        \
+    type res = __builtin_bswap##size_in_bits(*reinterpret_cast<type*>(&val)); \
+    return *reinterpret_cast<T*>(&res);                                       \
+  }
+    switch (size) {
+      case 1:
+        return val;
+        CASE(uint16_t, 16);
+        CASE(uint32_t, 32);
+        CASE(uint64_t, 64);
+        CASE(__uint128_t, 128);
+      default:
+        UNREACHABLE();
+    }
+#undef CASE
+    return val;
+  }
 
   // Read and write memory.
   inline uint8_t ReadBU(intptr_t addr);
@@ -272,66 +305,6 @@ class Simulator : public SimulatorBase {
   // S390
   void Trace(Instruction* instr);
 
-  // Used by the CL**BR instructions.
-  template <typename T1, typename T2>
-  void SetS390RoundConditionCode(T1 r2_val, T2 max, T2 min) {
-    condition_reg_ = 0;
-    double r2_dval = static_cast<double>(r2_val);
-    double dbl_min = static_cast<double>(min);
-    double dbl_max = static_cast<double>(max);
-
-    if (r2_dval == 0.0)
-      condition_reg_ = 8;
-    else if (r2_dval < 0.0 && r2_dval >= dbl_min && std::isfinite(r2_dval))
-      condition_reg_ = 4;
-    else if (r2_dval > 0.0 && r2_dval <= dbl_max && std::isfinite(r2_dval))
-      condition_reg_ = 2;
-    else
-      condition_reg_ = 1;
-  }
-
-  template <typename T1>
-  void SetS390RoundConditionCode(T1 r2_val, int64_t max, int64_t min) {
-    condition_reg_ = 0;
-    double r2_dval = static_cast<double>(r2_val);
-    double dbl_min = static_cast<double>(min);
-    double dbl_max = static_cast<double>(max);
-
-    // Note that the IEEE 754 floating-point representations (both 32 and
-    // 64 bit) cannot exactly represent INT64_MAX. The closest it can get
-    // is INT64_max + 1. IEEE 754 FP can, though, represent INT64_MIN
-    // exactly.
-
-    // This is not an issue for INT32, as IEEE754 64-bit can represent
-    // INT32_MAX and INT32_MIN with exact precision.
-
-    if (r2_dval == 0.0)
-      condition_reg_ = 8;
-    else if (r2_dval < 0.0 && r2_dval >= dbl_min && std::isfinite(r2_dval))
-      condition_reg_ = 4;
-    else if (r2_dval > 0.0 && r2_dval < dbl_max && std::isfinite(r2_dval))
-      condition_reg_ = 2;
-    else
-      condition_reg_ = 1;
-  }
-
-  // Used by the CL**BR instructions.
-  template <typename T1, typename T2, typename T3>
-  void SetS390ConvertConditionCode(T1 src, T2 dst, T3 max) {
-    condition_reg_ = 0;
-    if (src == static_cast<T1>(0.0)) {
-      condition_reg_ |= 8;
-    } else if (src < static_cast<T1>(0.0) && static_cast<T2>(src) == 0 &&
-               std::isfinite(src)) {
-      condition_reg_ |= 4;
-    } else if (src > static_cast<T1>(0.0) && std::isfinite(src) &&
-               src < static_cast<T1>(max)) {
-      condition_reg_ |= 2;
-    } else {
-      condition_reg_ |= 1;
-    }
-  }
-
   template <typename T>
   void SetS390ConditionCode(T lhs, T rhs) {
     condition_reg_ = 0;
@@ -431,24 +404,30 @@ class Simulator : public SimulatorBase {
 
   static constexpr fpr_t fp_zero = {{0}};
 
-  fpr_t& get_simd_register(int reg) { return fp_registers_[reg]; }
+  fpr_t get_simd_register(int reg) {
+    return get_simd_register_by_lane<fpr_t>(reg, 0);
+  }
 
   void set_simd_register(int reg, const fpr_t& v) {
-    get_simd_register(reg) = v;
+    set_simd_register_by_lane(reg, 0, v);
   }
 
   template <class T>
-  T& get_simd_register_by_lane(int reg, int lane) {
-    DCHECK_LE(lane, kSimd128Size / sizeof(T));
-    DCHECK_LT(reg, kNumFPRs);
-    DCHECK_GE(lane, 0);
-    DCHECK_GE(reg, 0);
-    return (reinterpret_cast<T*>(&get_simd_register(reg)))[lane];
+  T get_simd_register_by_lane(int reg, int lane) {
+    CHECK_LE(lane, kSimd128Size / sizeof(T));
+    CHECK_LT(reg, kNumFPRs);
+    CHECK_GE(lane, 0);
+    CHECK_GE(reg, 0);
+    return (reinterpret_cast<T*>(&fp_registers_[reg]))[lane];
   }
 
   template <class T>
   void set_simd_register_by_lane(int reg, int lane, const T& value) {
-    get_simd_register_by_lane<T>(reg, lane) = value;
+    CHECK_LE(lane, kSimd128Size / sizeof(T));
+    CHECK_LT(reg, kNumFPRs);
+    CHECK_GE(lane, 0);
+    CHECK_GE(reg, 0);
+    (reinterpret_cast<T*>(&fp_registers_[reg]))[lane] = value;
   }
 
   // Condition Code register. In S390, the last 4 bits are used.
diff --git a/deps/v8/src/execution/shared-mutex-guard-if-off-thread.h b/deps/v8/src/execution/shared-mutex-guard-if-off-thread.h
new file mode 100644
index 00000000000000..972f6c0c89a761
--- /dev/null
+++ b/deps/v8/src/execution/shared-mutex-guard-if-off-thread.h
@@ -0,0 +1,19 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_EXECUTION_SHARED_MUTEX_GUARD_IF_OFF_THREAD_H_
+#define V8_EXECUTION_SHARED_MUTEX_GUARD_IF_OFF_THREAD_H_
+
+#include "src/base/platform/mutex.h"
+
+namespace v8 {
+namespace internal {
+
+template <typename LocalIsolate, base::MutexSharedType kIsShared>
+class SharedMutexGuardIfOffThread;
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_EXECUTION_SHARED_MUTEX_GUARD_IF_OFF_THREAD_H_
diff --git a/deps/v8/src/execution/stack-guard.cc b/deps/v8/src/execution/stack-guard.cc
index a98fb07c93870a..941532e40db51a 100644
--- a/deps/v8/src/execution/stack-guard.cc
+++ b/deps/v8/src/execution/stack-guard.cc
@@ -231,7 +231,7 @@ bool TestAndClear(int* bitfield, int mask) {
   return result;
 }
 
-class ShouldBeZeroOnReturnScope final {
+class V8_NODISCARD ShouldBeZeroOnReturnScope final {
  public:
 #ifndef DEBUG
   explicit ShouldBeZeroOnReturnScope(int*) {}
diff --git a/deps/v8/src/execution/stack-guard.h b/deps/v8/src/execution/stack-guard.h
index b4451585579847..e8bb8aaae3ebc5 100644
--- a/deps/v8/src/execution/stack-guard.h
+++ b/deps/v8/src/execution/stack-guard.h
@@ -16,12 +16,16 @@ class ExecutionAccess;
 class InterruptsScope;
 class Isolate;
 class Object;
+class RootVisitor;
 
 // StackGuard contains the handling of the limits that are used to limit the
 // number of nested invocations of JavaScript and the stack size used in each
 // invocation.
-class V8_EXPORT_PRIVATE StackGuard final {
+class V8_EXPORT_PRIVATE V8_NODISCARD StackGuard final {
  public:
+  StackGuard(const StackGuard&) = delete;
+  StackGuard& operator=(const StackGuard&) = delete;
+
   explicit StackGuard(Isolate* isolate) : isolate_(isolate) {}
 
   // Pass the address beyond which the stack should not grow.  The stack
@@ -88,6 +92,10 @@ class V8_EXPORT_PRIVATE StackGuard final {
 
   static constexpr int kSizeInBytes = 7 * kSystemPointerSize;
 
+  static char* Iterate(RootVisitor* v, char* thread_storage) {
+    return thread_storage + ArchiveSpacePerThread();
+  }
+
  private:
   bool CheckInterrupt(InterruptFlag flag);
   void RequestInterrupt(InterruptFlag flag);
@@ -174,8 +182,6 @@ class V8_EXPORT_PRIVATE StackGuard final {
   friend class Isolate;
   friend class StackLimitCheck;
   friend class InterruptsScope;
-
-  DISALLOW_COPY_AND_ASSIGN(StackGuard);
 };
 
 STATIC_ASSERT(StackGuard::kSizeInBytes == sizeof(StackGuard));
diff --git a/deps/v8/src/execution/thread-id.cc b/deps/v8/src/execution/thread-id.cc
index a32d15e22f42f8..ec4e95ad5d8345 100644
--- a/deps/v8/src/execution/thread-id.cc
+++ b/deps/v8/src/execution/thread-id.cc
@@ -11,8 +11,7 @@ namespace internal {
 
 namespace {
 
-DEFINE_LAZY_LEAKY_OBJECT_GETTER(base::Thread::LocalStorageKey, GetThreadIdKey,
-                                base::Thread::CreateThreadLocalKey())
+thread_local int thread_id = 0;
 
 std::atomic<int> next_thread_id{1};
 
@@ -20,18 +19,14 @@ std::atomic<int> next_thread_id{1};
 
 // static
 ThreadId ThreadId::TryGetCurrent() {
-  int thread_id = base::Thread::GetThreadLocalInt(*GetThreadIdKey());
   return thread_id == 0 ? Invalid() : ThreadId(thread_id);
 }
 
 // static
 int ThreadId::GetCurrentThreadId() {
-  auto key = *GetThreadIdKey();
-  int thread_id = base::Thread::GetThreadLocalInt(key);
   if (thread_id == 0) {
     thread_id = next_thread_id.fetch_add(1);
     CHECK_LE(1, thread_id);
-    base::Thread::SetThreadLocalInt(key, thread_id);
   }
   return thread_id;
 }
diff --git a/deps/v8/src/execution/thread-local-top.cc b/deps/v8/src/execution/thread-local-top.cc
index 84d3432aec0f48..4af5dc6407fbfd 100644
--- a/deps/v8/src/execution/thread-local-top.cc
+++ b/deps/v8/src/execution/thread-local-top.cc
@@ -10,15 +10,43 @@
 namespace v8 {
 namespace internal {
 
+void ThreadLocalTop::Clear() {
+  try_catch_handler_ = nullptr;
+  isolate_ = nullptr;
+  context_ = Context();
+  thread_id_ = ThreadId();
+  pending_handler_entrypoint_ = kNullAddress;
+  pending_handler_constant_pool_ = kNullAddress;
+  pending_handler_fp_ = kNullAddress;
+  pending_handler_sp_ = kNullAddress;
+  last_api_entry_ = kNullAddress;
+  pending_message_obj_ = Object();
+  rethrowing_message_ = false;
+  external_caught_exception_ = false;
+  c_entry_fp_ = kNullAddress;
+  handler_ = kNullAddress;
+  c_function_ = kNullAddress;
+  promise_on_stack_ = nullptr;
+  simulator_ = nullptr;
+  js_entry_sp_ = kNullAddress;
+  external_callback_scope_ = nullptr;
+  current_vm_state_ = EXTERNAL;
+  failed_access_check_callback_ = nullptr;
+  thread_in_wasm_flag_address_ = kNullAddress;
+#ifdef V8_ENABLE_CONSERVATIVE_STACK_SCANNING
+  stack_ = ::heap::base::Stack(nullptr);
+#endif
+}
+
 void ThreadLocalTop::Initialize(Isolate* isolate) {
-  *this = ThreadLocalTop();
+  Clear();
   isolate_ = isolate;
-#ifdef USE_SIMULATOR
-  simulator_ = Simulator::current(isolate);
-#endif
   thread_id_ = ThreadId::Current();
   thread_in_wasm_flag_address_ = reinterpret_cast<Address>(
       trap_handler::GetThreadInWasmThreadLocalAddress());
+#ifdef USE_SIMULATOR
+  simulator_ = Simulator::current(isolate);
+#endif
 
 #ifdef V8_ENABLE_CONSERVATIVE_STACK_SCANNING
   stack_ = ::heap::base::Stack(base::Stack::GetStackStart());
diff --git a/deps/v8/src/execution/thread-local-top.h b/deps/v8/src/execution/thread-local-top.h
index d48371a362db14..27ff661fd539f0 100644
--- a/deps/v8/src/execution/thread-local-top.h
+++ b/deps/v8/src/execution/thread-local-top.h
@@ -38,7 +38,9 @@ class ThreadLocalTop {
 
   // Does early low-level initialization that does not depend on the
   // isolate being present.
-  ThreadLocalTop() = default;
+  ThreadLocalTop() { Clear(); }
+
+  void Clear();
 
   // Initialize the thread data.
   void Initialize(Isolate*);
@@ -48,7 +50,7 @@ class ThreadLocalTop {
   // This field is not guaranteed to hold an address that can be
   // used for comparison with addresses into the JS stack. If such
   // an address is needed, use try_catch_handler_address.
-  v8::TryCatch* try_catch_handler_ = nullptr;
+  v8::TryCatch* try_catch_handler_;
 
   // Get the address of the top C++ try catch handler or nullptr if
   // none are registered.
@@ -92,7 +94,7 @@ class ThreadLocalTop {
 
   void Free();
 
-  Isolate* isolate_ = nullptr;
+  Isolate* isolate_;
   // The context where the current execution method is created and for variable
   // lookups.
   // TODO(3770): This field is read/written from generated code, so it would
@@ -101,58 +103,58 @@ class ThreadLocalTop {
   // meantime, assert that the memory layout is the same.
   STATIC_ASSERT(sizeof(Context) == kSystemPointerSize);
   Context context_;
-  ThreadId thread_id_ = ThreadId::Invalid();
+  std::atomic<ThreadId> thread_id_;
   Object pending_exception_;
 
   // Communication channel between Isolate::FindHandler and the CEntry.
   Context pending_handler_context_;
-  Address pending_handler_entrypoint_ = kNullAddress;
-  Address pending_handler_constant_pool_ = kNullAddress;
-  Address pending_handler_fp_ = kNullAddress;
-  Address pending_handler_sp_ = kNullAddress;
+  Address pending_handler_entrypoint_;
+  Address pending_handler_constant_pool_;
+  Address pending_handler_fp_;
+  Address pending_handler_sp_;
 
-  Address last_api_entry_ = kNullAddress;
+  Address last_api_entry_;
 
   // Communication channel between Isolate::Throw and message consumers.
   Object pending_message_obj_;
-  bool rethrowing_message_ = false;
+  bool rethrowing_message_;
 
   // Use a separate value for scheduled exceptions to preserve the
   // invariants that hold about pending_exception.  We may want to
   // unify them later.
-  bool external_caught_exception_ = false;
+  bool external_caught_exception_;
   Object scheduled_exception_;
 
   // Stack.
   // The frame pointer of the top c entry frame.
-  Address c_entry_fp_ = kNullAddress;
+  Address c_entry_fp_;
   // Try-blocks are chained through the stack.
-  Address handler_ = kNullAddress;
+  Address handler_;
   // C function that was called at c entry.
-  Address c_function_ = kNullAddress;
+  Address c_function_;
 
   // Throwing an exception may cause a Promise rejection.  For this purpose
   // we keep track of a stack of nested promises and the corresponding
   // try-catch handlers.
-  PromiseOnStack* promise_on_stack_ = nullptr;
+  PromiseOnStack* promise_on_stack_;
 
   // Simulator field is always present to get predictable layout.
-  Simulator* simulator_ = nullptr;
+  Simulator* simulator_;
 
   // The stack pointer of the bottom JS entry frame.
-  Address js_entry_sp_ = kNullAddress;
+  Address js_entry_sp_;
   // The external callback we're currently in.
-  ExternalCallbackScope* external_callback_scope_ = nullptr;
-  StateTag current_vm_state_ = EXTERNAL;
+  ExternalCallbackScope* external_callback_scope_;
+  StateTag current_vm_state_;
 
   // Call back function to report unsafe JS accesses.
-  v8::FailedAccessCheckCallback failed_access_check_callback_ = nullptr;
+  v8::FailedAccessCheckCallback failed_access_check_callback_;
 
   // Address of the thread-local "thread in wasm" flag.
-  Address thread_in_wasm_flag_address_ = kNullAddress;
+  Address thread_in_wasm_flag_address_;
 
 #ifdef V8_ENABLE_CONSERVATIVE_STACK_SCANNING
-  ::heap::base::Stack stack_ = ::heap::base::Stack(nullptr);
+  ::heap::base::Stack stack_;
 #endif
 };
 
diff --git a/deps/v8/src/execution/v8threads.cc b/deps/v8/src/execution/v8threads.cc
index a320f427453bd6..06575e9c646699 100644
--- a/deps/v8/src/execution/v8threads.cc
+++ b/deps/v8/src/execution/v8threads.cc
@@ -8,6 +8,7 @@
 #include "src/debug/debug.h"
 #include "src/execution/execution.h"
 #include "src/execution/isolate-inl.h"
+#include "src/execution/stack-guard.h"
 #include "src/init/bootstrapper.h"
 #include "src/objects/visitors.h"
 #include "src/regexp/regexp-stack.h"
@@ -298,6 +299,8 @@ void ThreadManager::Iterate(RootVisitor* v) {
     data = HandleScopeImplementer::Iterate(v, data);
     data = isolate_->Iterate(v, data);
     data = Relocatable::Iterate(v, data);
+    data = StackGuard::Iterate(v, data);
+    data = Debug::Iterate(v, data);
   }
 }
 
diff --git a/deps/v8/src/execution/vm-state.h b/deps/v8/src/execution/vm-state.h
index 2ccde290d59225..f342c0b0d08f92 100644
--- a/deps/v8/src/execution/vm-state.h
+++ b/deps/v8/src/execution/vm-state.h
@@ -26,7 +26,7 @@ class VMState {
   StateTag previous_tag_;
 };
 
-class ExternalCallbackScope {
+class V8_NODISCARD ExternalCallbackScope {
  public:
   inline ExternalCallbackScope(Isolate* isolate, Address callback);
   inline ~ExternalCallbackScope();
diff --git a/deps/v8/src/extensions/gc-extension.cc b/deps/v8/src/extensions/gc-extension.cc
index de288fe2f5f3b5..6f1c601d8dad3c 100644
--- a/deps/v8/src/extensions/gc-extension.cc
+++ b/deps/v8/src/extensions/gc-extension.cc
@@ -101,6 +101,8 @@ class AsyncGC final : public CancelableTask {
         ctx_(isolate, isolate->GetCurrentContext()),
         resolver_(isolate, resolver),
         type_(type) {}
+  AsyncGC(const AsyncGC&) = delete;
+  AsyncGC& operator=(const AsyncGC&) = delete;
 
   void RunInternal() final {
     v8::HandleScope scope(isolate_);
@@ -116,8 +118,6 @@ class AsyncGC final : public CancelableTask {
   v8::Persistent<v8::Context> ctx_;
   v8::Persistent<v8::Promise::Resolver> resolver_;
   v8::Isolate::GarbageCollectionType type_;
-
-  DISALLOW_COPY_AND_ASSIGN(AsyncGC);
 };
 
 }  // namespace
diff --git a/deps/v8/src/flags/flag-definitions.h b/deps/v8/src/flags/flag-definitions.h
index 00fcf712d6e9b3..b98d6afbb4aa94 100644
--- a/deps/v8/src/flags/flag-definitions.h
+++ b/deps/v8/src/flags/flag-definitions.h
@@ -264,8 +264,9 @@ DEFINE_IMPLICATION(harmony_weak_refs_with_cleanup_some, harmony_weak_refs)
 #endif
 
 // Features that are complete (but still behind --harmony/es-staging flag).
-#define HARMONY_STAGED_BASE(V) \
-  V(harmony_top_level_await, "harmony top level await")
+#define HARMONY_STAGED_BASE(V)                          \
+  V(harmony_top_level_await, "harmony top level await") \
+  V(harmony_relative_indexing_methods, "harmony relative indexing methods")
 
 #ifdef V8_INTL_SUPPORT
 #define HARMONY_STAGED(V)               \
@@ -277,20 +278,16 @@ DEFINE_IMPLICATION(harmony_weak_refs_with_cleanup_some, harmony_weak_refs)
 #endif
 
 // Features that are shipping (turned on by default, but internal flag remains).
-#define HARMONY_SHIPPING_BASE(V)                                          \
-  V(harmony_sharedarraybuffer, "harmony sharedarraybuffer")               \
-  V(harmony_atomics, "harmony atomics")                                   \
-  V(harmony_promise_any, "harmony Promise.any")                           \
-  V(harmony_private_methods, "harmony private methods in class literals") \
-  V(harmony_weak_refs, "harmony weak references")                         \
-  V(harmony_string_replaceall, "harmony String.prototype.replaceAll")     \
-  V(harmony_logical_assignment, "harmony logical assignment")             \
+#define HARMONY_SHIPPING_BASE(V)                                      \
+  V(harmony_sharedarraybuffer, "harmony sharedarraybuffer")           \
+  V(harmony_atomics, "harmony atomics")                               \
+  V(harmony_weak_refs, "harmony weak references")                     \
+  V(harmony_string_replaceall, "harmony String.prototype.replaceAll") \
+  V(harmony_logical_assignment, "harmony logical assignment")         \
   V(harmony_atomics_waitasync, "harmony Atomics.waitAsync")
 
 #ifdef V8_INTL_SUPPORT
-#define HARMONY_SHIPPING(V) \
-  HARMONY_SHIPPING_BASE(V)  \
-  V(harmony_intl_segmenter, "Intl.Segmenter")
+#define HARMONY_SHIPPING(V) HARMONY_SHIPPING_BASE(V)
 #else
 #define HARMONY_SHIPPING(V) HARMONY_SHIPPING_BASE(V)
 #endif
@@ -317,6 +314,9 @@ HARMONY_STAGED(FLAG_STAGED_FEATURES)
 HARMONY_SHIPPING(FLAG_SHIPPING_FEATURES)
 #undef FLAG_SHIPPING_FEATURES
 
+DEFINE_BOOL(builtin_subclassing, true,
+            "subclassing support in built-in methods")
+
 #ifdef V8_INTL_SUPPORT
 DEFINE_BOOL(icu_timezone_data, true, "get information about timezones from ICU")
 #endif
@@ -551,15 +551,12 @@ DEFINE_BOOL(trace_generalization, false, "trace map generalization")
 
 // Flags for TurboProp.
 DEFINE_BOOL(turboprop, false, "enable experimental turboprop mid-tier compiler")
+DEFINE_IMPLICATION(turboprop, turbo_direct_heap_access)
 DEFINE_BOOL(turboprop_mid_tier_reg_alloc, true,
             "enable mid-tier register allocator for turboprop")
-DEFINE_BOOL(turboprop_dynamic_map_checks, false,
-            "use dynamic map checks when generating code for property accesses "
-            "if all handlers in an IC are the same for turboprop")
 DEFINE_BOOL(turboprop_as_midtier, false,
             "enable experimental turboprop mid-tier compiler")
 DEFINE_IMPLICATION(turboprop_as_midtier, turboprop)
-DEFINE_IMPLICATION(turboprop, concurrent_inlining)
 DEFINE_VALUE_IMPLICATION(turboprop, interrupt_budget, 15 * KB)
 DEFINE_VALUE_IMPLICATION(turboprop, reuse_opt_code_count, 2)
 DEFINE_UINT_READONLY(max_minimorphic_map_checks, 4,
@@ -735,6 +732,9 @@ DEFINE_BOOL(
 DEFINE_BOOL(turbo_fast_api_calls, false, "enable fast API calls from TurboFan")
 DEFINE_INT(reuse_opt_code_count, 0,
            "don't discard optimized code for the specified number of deopts.")
+DEFINE_BOOL(turbo_dynamic_map_checks, true,
+            "use dynamic map checks when generating code for property accesses "
+            "if all handlers in an IC are the same for turboprop and NCI")
 
 // Native context independent (NCI) code.
 DEFINE_BOOL(turbo_nci, false,
@@ -777,8 +777,9 @@ DEFINE_BOOL(untrusted_code_mitigations, V8_DEFAULT_UNTRUSTED_CODE_MITIGATIONS,
 #undef V8_DEFAULT_UNTRUSTED_CODE_MITIGATIONS
 
 // Flags for native WebAssembly.
-DEFINE_BOOL(wasm_generic_wrapper, false,
-            "use generic js-to-wasm wrapper instead of per-signature wrappers")
+DEFINE_BOOL(wasm_generic_wrapper, true,
+            "allow use of the generic js-to-wasm wrapper instead of "
+            "per-signature wrappers")
 DEFINE_BOOL(expose_wasm, true, "expose wasm interface to JavaScript")
 DEFINE_INT(wasm_num_compilation_tasks, 128,
            "maximum number of parallel compilation tasks for wasm")
@@ -814,13 +815,16 @@ DEFINE_INT(trace_wasm_ast_start, 0,
 DEFINE_INT(trace_wasm_ast_end, 0, "end function for wasm AST trace (exclusive)")
 DEFINE_BOOL(liftoff, true,
             "enable Liftoff, the baseline compiler for WebAssembly")
+DEFINE_BOOL(liftoff_only, false,
+            "disallow Turbofan compilation for WebAssembly (for testing)")
+DEFINE_IMPLICATION(liftoff_only, liftoff)
+DEFINE_NEG_IMPLICATION(liftoff_only, wasm_tier_up)
+DEFINE_NEG_IMPLICATION(fuzzing, liftoff_only)
 DEFINE_BOOL(experimental_liftoff_extern_ref, false,
             "enable support for externref in Liftoff")
 // We can't tier up (from Liftoff to TurboFan) in single-threaded mode, hence
-// disable Liftoff in that configuration for now. The alternative is disabling
-// TurboFan, which would reduce peak performance considerably.
-// Note that for debugging, Liftoff will still be used.
-DEFINE_NEG_IMPLICATION(single_threaded, liftoff)
+// disable tier up in that configuration for now.
+DEFINE_NEG_IMPLICATION(single_threaded, wasm_tier_up)
 DEFINE_DEBUG_BOOL(trace_liftoff, false,
                   "trace Liftoff, the baseline compiler for WebAssembly")
 DEFINE_BOOL(trace_wasm_memory, false,
@@ -830,9 +834,6 @@ DEFINE_BOOL(trace_wasm_memory, false,
 DEFINE_INT(wasm_tier_mask_for_testing, 0,
            "bitmask of functions to compile with TurboFan instead of Liftoff")
 
-DEFINE_BOOL(wasm_expose_debug_eval, true,
-            "Expose wasm evaluator support on the CDP")
-
 DEFINE_BOOL(validate_asm, true, "validate asm.js modules before compiling")
 DEFINE_BOOL(suppress_asm_messages, false,
             "don't emit asm.js related messages (for golden file testing)")
@@ -901,6 +902,7 @@ DEFINE_BOOL(wasm_grow_shared_memory, true,
 DEFINE_BOOL(wasm_simd_post_mvp, false,
             "allow experimental SIMD operations for prototyping that are not "
             "included in the current proposal")
+DEFINE_BOOL(wasm_simd_ssse3_codegen, false, "allow wasm SIMD SSSE3 codegen")
 DEFINE_IMPLICATION(wasm_simd_post_mvp, experimental_wasm_simd)
 
 DEFINE_BOOL(wasm_code_gc, true, "enable garbage collection of wasm code")
@@ -913,9 +915,6 @@ DEFINE_INT(wasm_max_initial_code_space_reservation, 0,
 DEFINE_BOOL(experimental_wasm_allow_huge_modules, false,
             "allow wasm modules bigger than 1GB, but below ~2GB")
 
-// Profiler flags.
-DEFINE_INT(frame_count, 1, "number of stack frames inspected by the profiler")
-
 DEFINE_INT(stress_sampling_allocation_profiler, 0,
            "Enables sampling allocation profiler with X as a sample interval")
 
@@ -1101,6 +1100,7 @@ DEFINE_BOOL(memory_reducer_for_small_heaps, true,
 DEFINE_INT(heap_growing_percent, 0,
            "specifies heap growing factor as (1 + heap_growing_percent/100)")
 DEFINE_INT(v8_os_page_size, 0, "override OS page size (in KBytes)")
+DEFINE_BOOL(allocation_buffer_parking, true, "allocation buffer parking")
 DEFINE_BOOL(always_compact, false, "Perform compaction on every full GC")
 DEFINE_BOOL(never_compact, false,
             "Never perform compaction on full GC - testing only")
@@ -1184,6 +1184,7 @@ DEFINE_BOOL(enable_sse4_2, true,
 DEFINE_BOOL(enable_sahf, true,
             "enable use of SAHF instruction if available (X64 only)")
 DEFINE_BOOL(enable_avx, true, "enable use of AVX instructions if available")
+DEFINE_BOOL(enable_avx2, true, "enable use of AVX2 instructions if available")
 DEFINE_BOOL(enable_fma3, true, "enable use of FMA3 instructions if available")
 DEFINE_BOOL(enable_bmi1, true, "enable use of BMI1 instructions if available")
 DEFINE_BOOL(enable_bmi2, true, "enable use of BMI2 instructions if available")
@@ -1225,6 +1226,9 @@ DEFINE_BOOL(stress_background_compile, false,
 DEFINE_BOOL(
     finalize_streaming_on_background, false,
     "perform the script streaming finalization on the background thread")
+// TODO(leszeks): Parallel compile tasks currently don't support off-thread
+// finalization.
+DEFINE_NEG_IMPLICATION(finalize_streaming_on_background, parallel_compile_tasks)
 DEFINE_BOOL(disable_old_api_accessors, false,
             "Disable old-style API accessors whose setters trigger through the "
             "prototype chain")
@@ -1281,6 +1285,7 @@ DEFINE_IMPLICATION(trace_deopt_verbose, trace_deopt)
 DEFINE_BOOL(trace_file_names, false,
             "include file names in trace-opt/trace-deopt output")
 DEFINE_BOOL(always_opt, false, "always try to optimize functions")
+DEFINE_IMPLICATION(always_opt, opt)
 DEFINE_BOOL(always_osr, false, "always try to OSR functions")
 DEFINE_BOOL(prepare_always_opt, false, "prepare for turning on always opt")
 
@@ -1356,8 +1361,6 @@ DEFINE_GENERIC_IMPLICATION(
                   v8::tracing::TracingCategoryObserver::ENABLED_BY_NATIVE))
 DEFINE_BOOL_READONLY(fast_map_update, false,
                      "enable fast map update by caching the migration target")
-DEFINE_BOOL(modify_field_representation_inplace, true,
-            "enable in-place field representation updates")
 DEFINE_INT(max_valid_polymorphic_map_count, 4,
            "maximum number of valid maps to track in POLYMORPHIC state")
 
@@ -1710,6 +1713,9 @@ DEFINE_BOOL(log_all, false, "Log all events to the log file.")
 DEFINE_BOOL(log_api, false, "Log API events to the log file.")
 DEFINE_BOOL(log_code, false,
             "Log code events to the log file without profiling.")
+DEFINE_BOOL(log_code_disassemble, false,
+            "Log all disassembled code to the log file.")
+DEFINE_IMPLICATION(log_code_disassemble, log_code)
 DEFINE_BOOL(log_handles, false, "Log global handle events.")
 DEFINE_BOOL(log_suspect, false, "Log suspect operations.")
 DEFINE_BOOL(log_source_code, false, "Log source code.")
@@ -1719,6 +1725,7 @@ DEFINE_BOOL(log_function_events, false,
 
 DEFINE_IMPLICATION(log_all, log_api)
 DEFINE_IMPLICATION(log_all, log_code)
+DEFINE_IMPLICATION(log_all, log_code_disassemble)
 DEFINE_IMPLICATION(log_all, log_suspect)
 DEFINE_IMPLICATION(log_all, log_handles)
 DEFINE_IMPLICATION(log_all, log_internal_timer_events)
@@ -1917,6 +1924,7 @@ DEFINE_NEG_IMPLICATION(single_threaded_gc, concurrent_store_buffer)
 DEFINE_NEG_IMPLICATION(single_threaded_gc, minor_mc_parallel_marking)
 #endif  // ENABLE_MINOR_MC
 DEFINE_NEG_IMPLICATION(single_threaded_gc, concurrent_array_buffer_sweeping)
+DEFINE_NEG_IMPLICATION(single_threaded_gc, stress_concurrent_allocation)
 
 #undef FLAG
 
diff --git a/deps/v8/src/flags/flags.cc b/deps/v8/src/flags/flags.cc
index f9f74b009b8851..900499c19401e7 100644
--- a/deps/v8/src/flags/flags.cc
+++ b/deps/v8/src/flags/flags.cc
@@ -269,10 +269,17 @@ struct Flag {
           break;
         case SetBy::kCommandLine:
           if (new_set_by == SetBy::kImplication && check_command_line_flags) {
-            FATAL(
-                "Flag --%s is implied by --%s but also specified "
-                "explicitly.\n%s",
-                name(), implied_by, hint);
+            if (is_bool_flag) {
+              FATAL(
+                  "Flag --%s: value implied by --%s conflicts with explicit "
+                  "specification\n%s",
+                  name(), implied_by, hint);
+            } else {
+              FATAL(
+                  "Flag --%s is implied by --%s but also specified "
+                  "explicitly.\n%s",
+                  name(), implied_by, hint);
+            }
           } else if (new_set_by == SetBy::kCommandLine &&
                      check_command_line_flags) {
             if (is_bool_flag) {
diff --git a/deps/v8/src/handles/global-handles.cc b/deps/v8/src/handles/global-handles.cc
index 1782514d6ec8ca..8b24de2a05ac6d 100644
--- a/deps/v8/src/handles/global-handles.cc
+++ b/deps/v8/src/handles/global-handles.cc
@@ -51,6 +51,9 @@ class GlobalHandles::NodeBlock final {
                                            global_handles_(global_handles),
                                            space_(space) {}
 
+  NodeBlock(const NodeBlock&) = delete;
+  NodeBlock& operator=(const NodeBlock&) = delete;
+
   NodeType* at(size_t index) { return &nodes_[index]; }
   const NodeType* at(size_t index) const { return &nodes_[index]; }
   GlobalHandles::NodeSpace<NodeType>* space() const { return space_; }
@@ -73,8 +76,6 @@ class GlobalHandles::NodeBlock final {
   NodeBlock* next_used_ = nullptr;
   NodeBlock* prev_used_ = nullptr;
   uint32_t used_nodes_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(NodeBlock);
 };
 
 template <class NodeType>
@@ -143,6 +144,9 @@ class GlobalHandles::NodeIterator final {
   NodeIterator(NodeIterator&& other) V8_NOEXCEPT : block_(other.block_),
                                                    index_(other.index_) {}
 
+  NodeIterator(const NodeIterator&) = delete;
+  NodeIterator& operator=(const NodeIterator&) = delete;
+
   bool operator==(const NodeIterator& other) const {
     return block_ == other.block_;
   }
@@ -163,8 +167,6 @@ class GlobalHandles::NodeIterator final {
  private:
   BlockType* block_ = nullptr;
   size_t index_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(NodeIterator);
 };
 
 template <class NodeType>
@@ -413,6 +415,9 @@ class GlobalHandles::Node final : public NodeBase<GlobalHandles::Node> {
     set_in_young_list(false);
   }
 
+  Node(const Node&) = delete;
+  Node& operator=(const Node&) = delete;
+
   void Zap() {
     DCHECK(IsInUse());
     // Zap the values for eager trapping.
@@ -619,8 +624,6 @@ class GlobalHandles::Node final : public NodeBase<GlobalHandles::Node> {
   WeakCallbackInfo<void>::Callback weak_callback_;
 
   friend class NodeBase<Node>;
-
-  DISALLOW_COPY_AND_ASSIGN(Node);
 };
 
 class GlobalHandles::TracedNode final
@@ -1738,9 +1741,9 @@ void EternalHandles::IterateAllRoots(RootVisitor* visitor) {
   int limit = size_;
   for (Address* block : blocks_) {
     DCHECK_GT(limit, 0);
-    visitor->VisitRootPointers(Root::kEternalHandles, nullptr,
-                               FullObjectSlot(block),
-                               FullObjectSlot(block + Min(limit, kSize)));
+    visitor->VisitRootPointers(
+        Root::kEternalHandles, nullptr, FullObjectSlot(block),
+        FullObjectSlot(block + std::min({limit, kSize})));
     limit -= kSize;
   }
 }
diff --git a/deps/v8/src/handles/global-handles.h b/deps/v8/src/handles/global-handles.h
index bcca8627d1366d..237cedbbb586b6 100644
--- a/deps/v8/src/handles/global-handles.h
+++ b/deps/v8/src/handles/global-handles.h
@@ -42,6 +42,9 @@ enum WeaknessType {
 // callbacks and finalizers attached to them.
 class V8_EXPORT_PRIVATE GlobalHandles final {
  public:
+  GlobalHandles(const GlobalHandles&) = delete;
+  GlobalHandles& operator=(const GlobalHandles&) = delete;
+
   template <class NodeType>
   class NodeBlock;
 
@@ -252,8 +255,6 @@ class V8_EXPORT_PRIVATE GlobalHandles final {
 
   // Counter for recursive garbage collections during callback processing.
   unsigned post_gc_processing_count_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(GlobalHandles);
 };
 
 class GlobalHandles::PendingPhantomCallback final {
@@ -285,6 +286,8 @@ class EternalHandles final {
  public:
   EternalHandles() = default;
   ~EternalHandles();
+  EternalHandles(const EternalHandles&) = delete;
+  EternalHandles& operator=(const EternalHandles&) = delete;
 
   // Create an EternalHandle, overwriting the index.
   V8_EXPORT_PRIVATE void Create(Isolate* isolate, Object object, int* index);
@@ -319,8 +322,6 @@ class EternalHandles final {
   int size_ = 0;
   std::vector<Address*> blocks_;
   std::vector<int> young_node_indices_;
-
-  DISALLOW_COPY_AND_ASSIGN(EternalHandles);
 };
 
 // A vector of global Handles which automatically manages the backing of those
diff --git a/deps/v8/src/handles/handles.cc b/deps/v8/src/handles/handles.cc
index aee0e27f2015a1..9a2b8132631794 100644
--- a/deps/v8/src/handles/handles.cc
+++ b/deps/v8/src/handles/handles.cc
@@ -7,6 +7,8 @@
 #include "src/api/api.h"
 #include "src/base/logging.h"
 #include "src/codegen/optimized-compilation-info.h"
+#include "src/execution/isolate.h"
+#include "src/execution/thread-id.h"
 #include "src/handles/maybe-handles.h"
 #include "src/objects/objects-inl.h"
 #include "src/roots/roots-inl.h"
@@ -42,20 +44,34 @@ bool HandleBase::IsDereferenceAllowed() const {
     return true;
   }
   if (isolate->IsBuiltinsTableHandleLocation(location_)) return true;
+  if (!AllowHandleDereference::IsAllowed()) return false;
+
+  if (FLAG_local_heaps) {
+    LocalHeap* local_heap = isolate->CurrentLocalHeap();
 
-  LocalHeap* local_heap = LocalHeap::Current();
-  if (FLAG_local_heaps && local_heap) {
     // Local heap can't access handles when parked
-    if (!local_heap->IsHandleDereferenceAllowed()) return false;
+    if (!local_heap->IsHandleDereferenceAllowed()) {
+      StdoutStream{} << "Cannot dereference handle owned by "
+                     << "non-running local heap\n";
+      return false;
+    }
 
-    if (local_heap->ContainsPersistentHandle(location_) ||
-        local_heap->ContainsLocalHandle(location_)) {
+    // We are pretty strict with handle dereferences on background threads: A
+    // background local heap is only allowed to dereference its own local or
+    // persistent handles.
+    if (!local_heap->is_main_thread()) {
       // The current thread owns the handle and thus can dereference it.
-      return true;
+      return local_heap->ContainsPersistentHandle(location_) ||
+             local_heap->ContainsLocalHandle(location_);
     }
   }
+  // If LocalHeap::Current() is null, we're on the main thread -- if we were to
+  // check main thread HandleScopes here, we should additionally check the
+  // main-thread LocalHeap.
+  DCHECK_EQ(ThreadId::Current(), isolate->thread_id());
 
-  return AllowHandleDereference::IsAllowed();
+  // TODO(leszeks): Check if the main thread owns this handle.
+  return true;
 }
 #endif
 
diff --git a/deps/v8/src/handles/handles.h b/deps/v8/src/handles/handles.h
index 62f06ce2320d8b..edc88a82eb56a9 100644
--- a/deps/v8/src/handles/handles.h
+++ b/deps/v8/src/handles/handles.h
@@ -195,10 +195,12 @@ inline std::ostream& operator<<(std::ostream& os, Handle<T> handle);
 // garbage collector will no longer track the object stored in the
 // handle and may deallocate it.  The behavior of accessing a handle
 // for which the handle scope has been deleted is undefined.
-class HandleScope {
+class V8_NODISCARD HandleScope {
  public:
   explicit inline HandleScope(Isolate* isolate);
   inline HandleScope(HandleScope&& other) V8_NOEXCEPT;
+  HandleScope(const HandleScope&) = delete;
+  HandleScope& operator=(const HandleScope&) = delete;
 
   // Allow placement new.
   void* operator new(size_t size, void* storage) {
@@ -264,9 +266,8 @@ class HandleScope {
   friend class HandleScopeImplementer;
   friend class Isolate;
   friend class LocalHandles;
+  friend class LocalHandleScope;
   friend class PersistentHandles;
-
-  DISALLOW_COPY_AND_ASSIGN(HandleScope);
 };
 
 // Forward declarations for CanonicalHandleScope.
@@ -282,7 +283,7 @@ using CanonicalHandlesMap = IdentityMap<Address*, ZoneAllocationPolicy>;
 // This does not apply to nested inner HandleScopes unless a nested
 // CanonicalHandleScope is introduced. Handles are only canonicalized within
 // the same CanonicalHandleScope, but not across nested ones.
-class V8_EXPORT_PRIVATE CanonicalHandleScope final {
+class V8_EXPORT_PRIVATE V8_NODISCARD CanonicalHandleScope final {
  public:
   // If we passed a compilation info as parameter, we created the
   // CanonicalHandlesMap on said compilation info's zone(). If so, in the
@@ -315,7 +316,7 @@ class V8_EXPORT_PRIVATE CanonicalHandleScope final {
 
 // Seal off the current HandleScope so that new handles can only be created
 // if a new HandleScope is entered.
-class SealHandleScope final {
+class V8_NODISCARD SealHandleScope final {
  public:
 #ifndef DEBUG
   explicit SealHandleScope(Isolate* isolate) {}
diff --git a/deps/v8/src/handles/local-handles-inl.h b/deps/v8/src/handles/local-handles-inl.h
index 06ba79211a8c14..c9f1588410be95 100644
--- a/deps/v8/src/handles/local-handles-inl.h
+++ b/deps/v8/src/handles/local-handles-inl.h
@@ -5,6 +5,7 @@
 #ifndef V8_HANDLES_LOCAL_HANDLES_INL_H_
 #define V8_HANDLES_LOCAL_HANDLES_INL_H_
 
+#include "src/execution/isolate.h"
 #include "src/execution/local-isolate.h"
 #include "src/handles/local-handles.h"
 #include "src/sanitizer/msan.h"
@@ -15,6 +16,9 @@ namespace internal {
 // static
 V8_INLINE Address* LocalHandleScope::GetHandle(LocalHeap* local_heap,
                                                Address value) {
+  if (local_heap->is_main_thread())
+    return LocalHandleScope::GetMainThreadHandle(local_heap, value);
+
   LocalHandles* handles = local_heap->handles();
   Address* result = handles->scope_.next;
   if (result == handles->scope_.limit) {
@@ -30,16 +34,23 @@ LocalHandleScope::LocalHandleScope(LocalIsolate* local_isolate)
     : LocalHandleScope(local_isolate->heap()) {}
 
 LocalHandleScope::LocalHandleScope(LocalHeap* local_heap) {
-  LocalHandles* handles = local_heap->handles();
-  local_heap_ = local_heap;
-  prev_next_ = handles->scope_.next;
-  prev_limit_ = handles->scope_.limit;
-  handles->scope_.level++;
+  if (local_heap->is_main_thread()) {
+    OpenMainThreadScope(local_heap);
+  } else {
+    LocalHandles* handles = local_heap->handles();
+    local_heap_ = local_heap;
+    prev_next_ = handles->scope_.next;
+    prev_limit_ = handles->scope_.limit;
+    handles->scope_.level++;
+  }
 }
 
 LocalHandleScope::~LocalHandleScope() {
-  if (local_heap_ == nullptr) return;
-  CloseScope(local_heap_, prev_next_, prev_limit_);
+  if (local_heap_->is_main_thread()) {
+    CloseMainThreadScope(local_heap_, prev_next_, prev_limit_);
+  } else {
+    CloseScope(local_heap_, prev_next_, prev_limit_);
+  }
 }
 
 template <typename T>
diff --git a/deps/v8/src/handles/local-handles.cc b/deps/v8/src/handles/local-handles.cc
index fd6cb6346bab98..0676a9b85be2db 100644
--- a/deps/v8/src/handles/local-handles.cc
+++ b/deps/v8/src/handles/local-handles.cc
@@ -5,11 +5,36 @@
 #include "src/handles/local-handles.h"
 
 #include "src/api/api.h"
+#include "src/execution/isolate.h"
+#include "src/handles/handles-inl.h"
 #include "src/handles/handles.h"
+#include "src/heap/heap-inl.h"
 
 namespace v8 {
 namespace internal {
 
+Address* LocalHandleScope::GetMainThreadHandle(LocalHeap* local_heap,
+                                               Address value) {
+  Isolate* isolate = local_heap->heap()->isolate();
+  return HandleScope::GetHandle(isolate, value);
+}
+
+void LocalHandleScope::OpenMainThreadScope(LocalHeap* local_heap) {
+  Isolate* isolate = local_heap->heap()->isolate();
+  HandleScopeData* data = isolate->handle_scope_data();
+  local_heap_ = local_heap;
+  prev_next_ = data->next;
+  prev_limit_ = data->limit;
+  data->level++;
+}
+
+void LocalHandleScope::CloseMainThreadScope(LocalHeap* local_heap,
+                                            Address* prev_next,
+                                            Address* prev_limit) {
+  Isolate* isolate = local_heap->heap()->isolate();
+  HandleScope::CloseScope(isolate, prev_next, prev_limit);
+}
+
 LocalHandles::LocalHandles() { scope_.Initialize(); }
 LocalHandles::~LocalHandles() {
   scope_.limit = nullptr;
diff --git a/deps/v8/src/handles/local-handles.h b/deps/v8/src/handles/local-handles.h
index dd7312c28c3195..06c00418a360df 100644
--- a/deps/v8/src/handles/local-handles.h
+++ b/deps/v8/src/handles/local-handles.h
@@ -41,11 +41,13 @@ class LocalHandles {
   friend class LocalHandleScope;
 };
 
-class LocalHandleScope {
+class V8_NODISCARD LocalHandleScope {
  public:
   explicit inline LocalHandleScope(LocalIsolate* local_isolate);
   explicit inline LocalHandleScope(LocalHeap* local_heap);
   inline ~LocalHandleScope();
+  LocalHandleScope(const LocalHandleScope&) = delete;
+  LocalHandleScope& operator=(const LocalHandleScope&) = delete;
 
   template <typename T>
   Handle<T> CloseAndEscape(Handle<T> handle_value);
@@ -60,12 +62,18 @@ class LocalHandleScope {
   // Close the handle scope resetting limits to a previous state.
   static inline void CloseScope(LocalHeap* local_heap, Address* prev_next,
                                 Address* prev_limit);
+  V8_EXPORT_PRIVATE static void CloseMainThreadScope(LocalHeap* local_heap,
+                                                     Address* prev_next,
+                                                     Address* prev_limit);
+
+  V8_EXPORT_PRIVATE void OpenMainThreadScope(LocalHeap* local_heap);
+
+  V8_EXPORT_PRIVATE static Address* GetMainThreadHandle(LocalHeap* local_heap,
+                                                        Address value);
 
   LocalHeap* local_heap_;
   Address* prev_limit_;
   Address* prev_next_;
-
-  DISALLOW_COPY_AND_ASSIGN(LocalHandleScope);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/handles/persistent-handles.h b/deps/v8/src/handles/persistent-handles.h
index b1c18649d80538..7a70f6a3673177 100644
--- a/deps/v8/src/handles/persistent-handles.h
+++ b/deps/v8/src/handles/persistent-handles.h
@@ -10,6 +10,7 @@
 #include "include/v8-internal.h"
 #include "src/api/api.h"
 #include "src/base/macros.h"
+#include "src/execution/isolate.h"
 #include "src/objects/visitors.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"  // nogncheck
 
@@ -102,7 +103,7 @@ class PersistentHandlesList {
 
 // PersistentHandlesScope sets up a scope in which all created main thread
 // handles become persistent handles that can be sent to another thread.
-class PersistentHandlesScope {
+class V8_NODISCARD PersistentHandlesScope {
  public:
   V8_EXPORT_PRIVATE explicit PersistentHandlesScope(Isolate* isolate);
   V8_EXPORT_PRIVATE ~PersistentHandlesScope();
diff --git a/deps/v8/src/heap/allocation-observer.cc b/deps/v8/src/heap/allocation-observer.cc
index e2b03eb01ed53c..94d5a2f833b7bd 100644
--- a/deps/v8/src/heap/allocation-observer.cc
+++ b/deps/v8/src/heap/allocation-observer.cc
@@ -35,8 +35,8 @@ void AllocationCounter::AddAllocationObserver(AllocationObserver* observer) {
     next_counter_ = observer_next_counter;
   } else {
     size_t missing_bytes = next_counter_ - current_counter_;
-    next_counter_ =
-        current_counter_ + Min(static_cast<intptr_t>(missing_bytes), step_size);
+    next_counter_ = current_counter_ +
+                    std::min(static_cast<intptr_t>(missing_bytes), step_size);
   }
 }
 
@@ -63,7 +63,7 @@ void AllocationCounter::RemoveAllocationObserver(AllocationObserver* observer) {
     for (AllocationObserverCounter& observer : observers_) {
       size_t left_in_step = observer.next_counter_ - current_counter_;
       DCHECK_GT(left_in_step, 0);
-      step_size = step_size ? Min(step_size, left_in_step) : left_in_step;
+      step_size = step_size ? std::min(step_size, left_in_step) : left_in_step;
     }
 
     next_counter_ = current_counter_ + step_size;
@@ -100,7 +100,7 @@ void AllocationCounter::InvokeAllocationObservers(Address soon_object,
   for (AllocationObserverCounter& aoc : observers_) {
     if (aoc.next_counter_ - current_counter_ <= aligned_object_size) {
       {
-        DisallowHeapAllocation disallow_heap_allocation;
+        DisallowGarbageCollection no_gc;
         aoc.observer_->Step(
             static_cast<int>(current_counter_ - aoc.prev_counter_), soon_object,
             object_size);
@@ -114,7 +114,7 @@ void AllocationCounter::InvokeAllocationObservers(Address soon_object,
     }
 
     size_t left_in_step = aoc.next_counter_ - current_counter_;
-    step_size = step_size ? Min(step_size, left_in_step) : left_in_step;
+    step_size = step_size ? std::min(step_size, left_in_step) : left_in_step;
   }
 
   CHECK(step_run);
@@ -127,7 +127,7 @@ void AllocationCounter::InvokeAllocationObservers(Address soon_object,
         current_counter_ + aligned_object_size + observer_step_size;
 
     DCHECK_NE(step_size, 0);
-    step_size = Min(step_size, aligned_object_size + observer_step_size);
+    step_size = std::min(step_size, aligned_object_size + observer_step_size);
 
     observers_.push_back(aoc);
   }
@@ -146,7 +146,7 @@ void AllocationCounter::InvokeAllocationObservers(Address soon_object,
     step_size = 0;
     for (AllocationObserverCounter& aoc : observers_) {
       size_t left_in_step = aoc.next_counter_ - current_counter_;
-      step_size = step_size ? Min(step_size, left_in_step) : left_in_step;
+      step_size = step_size ? std::min(step_size, left_in_step) : left_in_step;
     }
 
     if (observers_.empty()) {
diff --git a/deps/v8/src/heap/allocation-observer.h b/deps/v8/src/heap/allocation-observer.h
index a7d644ea48f380..6a3826bf16bc63 100644
--- a/deps/v8/src/heap/allocation-observer.h
+++ b/deps/v8/src/heap/allocation-observer.h
@@ -87,6 +87,8 @@ class AllocationObserver {
     DCHECK_LE(kTaggedSize, step_size);
   }
   virtual ~AllocationObserver() = default;
+  AllocationObserver(const AllocationObserver&) = delete;
+  AllocationObserver& operator=(const AllocationObserver&) = delete;
 
  protected:
   // Pure virtual method provided by the subclasses that gets called when at
@@ -110,17 +112,18 @@ class AllocationObserver {
   intptr_t step_size_;
 
   friend class AllocationCounter;
-  DISALLOW_COPY_AND_ASSIGN(AllocationObserver);
 };
 
-class V8_EXPORT_PRIVATE PauseAllocationObserversScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD PauseAllocationObserversScope {
  public:
   explicit PauseAllocationObserversScope(Heap* heap);
   ~PauseAllocationObserversScope();
+  PauseAllocationObserversScope(const PauseAllocationObserversScope&) = delete;
+  PauseAllocationObserversScope& operator=(
+      const PauseAllocationObserversScope&) = delete;
 
  private:
   Heap* heap_;
-  DISALLOW_COPY_AND_ASSIGN(PauseAllocationObserversScope);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/array-buffer-sweeper.cc b/deps/v8/src/heap/array-buffer-sweeper.cc
index 5bc8fcb720af3c..8af2a60e9c1b9c 100644
--- a/deps/v8/src/heap/array-buffer-sweeper.cc
+++ b/deps/v8/src/heap/array-buffer-sweeper.cc
@@ -149,10 +149,12 @@ void ArrayBufferSweeper::RequestSweep(SweepingScope scope) {
       FLAG_concurrent_array_buffer_sweeping) {
     Prepare(scope);
 
-    auto task = MakeCancelableTask(heap_->isolate(), [this] {
-      TRACE_BACKGROUND_GC(
-          heap_->tracer(),
-          GCTracer::BackgroundScope::BACKGROUND_ARRAY_BUFFER_SWEEP);
+    auto task = MakeCancelableTask(heap_->isolate(), [this, scope] {
+      GCTracer::Scope::ScopeId scope_id =
+          scope == SweepingScope::kYoung
+              ? GCTracer::Scope::BACKGROUND_YOUNG_ARRAY_BUFFER_SWEEP
+              : GCTracer::Scope::BACKGROUND_FULL_ARRAY_BUFFER_SWEEP;
+      TRACE_GC_EPOCH(heap_->tracer(), scope_id, ThreadKind::kBackground);
       base::MutexGuard guard(&sweeping_mutex_);
       job_->Sweep();
       job_finished_.NotifyAll();
diff --git a/deps/v8/src/heap/array-buffer-sweeper.h b/deps/v8/src/heap/array-buffer-sweeper.h
index 963682d82ff9a1..0c15428b754c1a 100644
--- a/deps/v8/src/heap/array-buffer-sweeper.h
+++ b/deps/v8/src/heap/array-buffer-sweeper.h
@@ -103,7 +103,6 @@ class ArrayBufferSweeper {
   void DecrementExternalMemoryCounters();
   void IncrementExternalMemoryCounters(size_t bytes);
   void IncrementFreedBytes(size_t bytes);
-  void IncrementFreedYoungBytes(size_t bytes);
 
   void RequestSweep(SweepingScope sweeping_task);
   void Prepare(SweepingScope sweeping_task);
diff --git a/deps/v8/src/heap/base-space.h b/deps/v8/src/heap/base-space.h
index 4b121e470cd7ce..f9ce4fe9b74f7a 100644
--- a/deps/v8/src/heap/base-space.h
+++ b/deps/v8/src/heap/base-space.h
@@ -21,6 +21,9 @@ class Heap;
 // BaseSpace is the abstract superclass for all allocation spaces.
 class V8_EXPORT_PRIVATE BaseSpace : public Malloced {
  public:
+  BaseSpace(const BaseSpace&) = delete;
+  BaseSpace& operator=(const BaseSpace&) = delete;
+
   Heap* heap() const {
     DCHECK_NOT_NULL(heap_);
     return heap_;
@@ -71,8 +74,6 @@ class V8_EXPORT_PRIVATE BaseSpace : public Malloced {
   // Keeps track of committed memory in a space.
   std::atomic<size_t> committed_;
   size_t max_committed_;
-
-  DISALLOW_COPY_AND_ASSIGN(BaseSpace);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/collection-barrier.cc b/deps/v8/src/heap/collection-barrier.cc
index 47a9db882b1e7c..51f04bb94d5d5a 100644
--- a/deps/v8/src/heap/collection-barrier.cc
+++ b/deps/v8/src/heap/collection-barrier.cc
@@ -5,6 +5,7 @@
 #include "src/heap/collection-barrier.h"
 
 #include "src/base/platform/time.h"
+#include "src/common/globals.h"
 #include "src/heap/gc-tracer.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap.h"
@@ -31,13 +32,16 @@ class BackgroundCollectionInterruptTask : public CancelableTask {
       : CancelableTask(heap->isolate()), heap_(heap) {}
 
   ~BackgroundCollectionInterruptTask() override = default;
+  BackgroundCollectionInterruptTask(const BackgroundCollectionInterruptTask&) =
+      delete;
+  BackgroundCollectionInterruptTask& operator=(
+      const BackgroundCollectionInterruptTask&) = delete;
 
  private:
   // v8::internal::CancelableTask overrides.
   void RunInternal() override { heap_->CheckCollectionRequested(); }
 
   Heap* heap_;
-  DISALLOW_COPY_AND_ASSIGN(BackgroundCollectionInterruptTask);
 };
 
 void CollectionBarrier::AwaitCollectionBackground() {
@@ -87,8 +91,8 @@ void CollectionBarrier::ActivateStackGuardAndPostTask() {
 }
 
 void CollectionBarrier::BlockUntilCollected() {
-  TRACE_BACKGROUND_GC(heap_->tracer(),
-                      GCTracer::BackgroundScope::BACKGROUND_COLLECTION);
+  TRACE_GC1(heap_->tracer(), GCTracer::Scope::BACKGROUND_COLLECTION,
+            ThreadKind::kBackground);
   base::MutexGuard guard(&mutex_);
 
   while (CollectionRequested()) {
diff --git a/deps/v8/src/heap/concurrent-allocator-inl.h b/deps/v8/src/heap/concurrent-allocator-inl.h
index 6fe1d9cd29e769..116bc55ac1aa35 100644
--- a/deps/v8/src/heap/concurrent-allocator-inl.h
+++ b/deps/v8/src/heap/concurrent-allocator-inl.h
@@ -23,8 +23,9 @@ AllocationResult ConcurrentAllocator::AllocateRaw(int object_size,
   // TODO(dinfuehr): Add support for allocation observers
   CHECK(FLAG_concurrent_allocation);
 
-  // Ensure that we are on the right thread
-  DCHECK_EQ(LocalHeap::Current(), local_heap_);
+#ifdef DEBUG
+  local_heap_->VerifyCurrent();
+#endif
 
   if (object_size > kMaxLabObjectSize) {
     return AllocateOutsideLab(object_size, alignment, origin);
diff --git a/deps/v8/src/heap/concurrent-allocator.cc b/deps/v8/src/heap/concurrent-allocator.cc
index 82975fa339d6b8..f49059d5564ff9 100644
--- a/deps/v8/src/heap/concurrent-allocator.cc
+++ b/deps/v8/src/heap/concurrent-allocator.cc
@@ -12,6 +12,7 @@
 #include "src/heap/local-heap.h"
 #include "src/heap/marking.h"
 #include "src/heap/memory-chunk.h"
+#include "src/heap/parked-scope.h"
 
 namespace v8 {
 namespace internal {
diff --git a/deps/v8/src/heap/concurrent-marking.cc b/deps/v8/src/heap/concurrent-marking.cc
index f2dfad057bfbe9..03aefd67b967a8 100644
--- a/deps/v8/src/heap/concurrent-marking.cc
+++ b/deps/v8/src/heap/concurrent-marking.cc
@@ -60,6 +60,8 @@ class ConcurrentMarkingState final
 class SlotSnapshot {
  public:
   SlotSnapshot() : number_of_slots_(0) {}
+  SlotSnapshot(const SlotSnapshot&) = delete;
+  SlotSnapshot& operator=(const SlotSnapshot&) = delete;
   int number_of_slots() const { return number_of_slots_; }
   ObjectSlot slot(int i) const { return snapshot_[i].first; }
   Object value(int i) const { return snapshot_[i].second; }
@@ -72,7 +74,6 @@ class SlotSnapshot {
   static const int kMaxSnapshotSize = JSObject::kMaxInstanceSize / kTaggedSize;
   int number_of_slots_;
   std::pair<ObjectSlot, Object> snapshot_[kMaxSnapshotSize];
-  DISALLOW_COPY_AND_ASSIGN(SlotSnapshot);
 };
 
 class ConcurrentMarkingVisitor final
@@ -363,6 +364,8 @@ class ConcurrentMarking::JobTask : public v8::JobTask {
         is_forced_gc_(is_forced_gc) {}
 
   ~JobTask() override = default;
+  JobTask(const JobTask&) = delete;
+  JobTask& operator=(const JobTask&) = delete;
 
   // v8::JobTask overrides.
   void Run(JobDelegate* delegate) override {
@@ -377,7 +380,6 @@ class ConcurrentMarking::JobTask : public v8::JobTask {
   ConcurrentMarking* concurrent_marking_;
   const unsigned mark_compact_epoch_;
   const bool is_forced_gc_;
-  DISALLOW_COPY_AND_ASSIGN(JobTask);
 };
 
 ConcurrentMarking::ConcurrentMarking(Heap* heap,
@@ -398,8 +400,8 @@ ConcurrentMarking::ConcurrentMarking(Heap* heap,
 
 void ConcurrentMarking::Run(JobDelegate* delegate, unsigned mark_compact_epoch,
                             bool is_forced_gc) {
-  TRACE_BACKGROUND_GC(heap_->tracer(),
-                      GCTracer::BackgroundScope::MC_BACKGROUND_MARKING);
+  TRACE_GC_EPOCH(heap_->tracer(), GCTracer::Scope::MC_BACKGROUND_MARKING,
+                 ThreadKind::kBackground);
   size_t kBytesUntilInterruptCheck = 64 * KB;
   int kObjectsUntilInterrupCheck = 1000;
   uint8_t task_id = delegate->GetTaskId() + 1;
diff --git a/deps/v8/src/heap/concurrent-marking.h b/deps/v8/src/heap/concurrent-marking.h
index 4d2dda08c194e9..86e161c8ab985a 100644
--- a/deps/v8/src/heap/concurrent-marking.h
+++ b/deps/v8/src/heap/concurrent-marking.h
@@ -44,7 +44,7 @@ class V8_EXPORT_PRIVATE ConcurrentMarking {
   // When the scope is entered, the concurrent marking tasks
   // are preempted and are not looking at the heap objects, concurrent marking
   // is resumed when the scope is exited.
-  class PauseScope {
+  class V8_NODISCARD PauseScope {
    public:
     explicit PauseScope(ConcurrentMarking* concurrent_marking);
     ~PauseScope();
diff --git a/deps/v8/src/heap/cppgc-js/cpp-heap.cc b/deps/v8/src/heap/cppgc-js/cpp-heap.cc
index 8ad35749783bc1..413e3ecdd1337b 100644
--- a/deps/v8/src/heap/cppgc-js/cpp-heap.cc
+++ b/deps/v8/src/heap/cppgc-js/cpp-heap.cc
@@ -33,6 +33,21 @@
 #include "src/profiler/heap-profiler.h"
 
 namespace v8 {
+
+cppgc::AllocationHandle& CppHeap::GetAllocationHandle() {
+  return internal::CppHeap::From(this)->object_allocator();
+}
+
+cppgc::HeapHandle& CppHeap::GetHeapHandle() {
+  return *internal::CppHeap::From(this);
+}
+
+void JSHeapConsistency::DijkstraMarkingBarrierSlow(
+    cppgc::HeapHandle& heap_handle, const TracedReferenceBase& ref) {
+  auto& heap_base = cppgc::internal::HeapBase::From(heap_handle);
+  static_cast<JSVisitor*>(&heap_base.marker()->Visitor())->Trace(ref);
+}
+
 namespace internal {
 
 namespace {
@@ -62,6 +77,10 @@ class CppgcPlatformAdapter final : public cppgc::Platform {
     return platform_->PostJob(priority, std::move(job_task));
   }
 
+  TracingController* GetTracingController() override {
+    return platform_->GetTracingController();
+  }
+
  private:
   v8::Platform* platform_;
   v8::Isolate* isolate_;
@@ -149,13 +168,17 @@ CppHeap::CppHeap(
                                     kSupportsConservativeStackScan),
       isolate_(*reinterpret_cast<Isolate*>(isolate)) {
   CHECK(!FLAG_incremental_marking_wrappers);
-  isolate_.heap_profiler()->AddBuildEmbedderGraphCallback(&CppGraphBuilder::Run,
-                                                          this);
+  if (isolate_.heap_profiler()) {
+    isolate_.heap_profiler()->AddBuildEmbedderGraphCallback(
+        &CppGraphBuilder::Run, this);
+  }
 }
 
 CppHeap::~CppHeap() {
-  isolate_.heap_profiler()->RemoveBuildEmbedderGraphCallback(
-      &CppGraphBuilder::Run, this);
+  if (isolate_.heap_profiler()) {
+    isolate_.heap_profiler()->RemoveBuildEmbedderGraphCallback(
+        &CppGraphBuilder::Run, this);
+  }
 }
 
 void CppHeap::RegisterV8References(
@@ -176,7 +199,10 @@ void CppHeap::TracePrologue(TraceFlags flags) {
   const UnifiedHeapMarker::MarkingConfig marking_config{
       UnifiedHeapMarker::MarkingConfig::CollectionType::kMajor,
       cppgc::Heap::StackState::kNoHeapPointers,
-      UnifiedHeapMarker::MarkingConfig::MarkingType::kIncrementalAndConcurrent};
+      cppgc::Heap::MarkingType::kIncrementalAndConcurrent,
+      flags == TraceFlags::kForced
+          ? UnifiedHeapMarker::MarkingConfig::IsForcedGC::kForced
+          : UnifiedHeapMarker::MarkingConfig::IsForcedGC::kNotForced};
   if ((flags == TraceFlags::kReduceMemory) || (flags == TraceFlags::kForced)) {
     // Only enable compaction when in a memory reduction garbage collection as
     // it may significantly increase the final garbage collection pause.
@@ -190,32 +216,44 @@ void CppHeap::TracePrologue(TraceFlags flags) {
 }
 
 bool CppHeap::AdvanceTracing(double deadline_in_ms) {
-  // TODO(chromium:1056170): Replace std::numeric_limits<size_t>::max() with a
-  // proper deadline when unified heap transitions to bytes-based deadline.
-  marking_done_ = marker_->AdvanceMarkingWithMaxDuration(
-      v8::base::TimeDelta::FromMillisecondsD(deadline_in_ms));
+  v8::base::TimeDelta deadline =
+      is_in_final_pause_
+          ? v8::base::TimeDelta::Max()
+          : v8::base::TimeDelta::FromMillisecondsD(deadline_in_ms);
+  // TODO(chromium:1056170): Replace when unified heap transitions to
+  // bytes-based deadline.
+  marking_done_ = marker_->AdvanceMarkingWithMaxDuration(deadline);
+  DCHECK_IMPLIES(is_in_final_pause_, marking_done_);
   return marking_done_;
 }
 
 bool CppHeap::IsTracingDone() { return marking_done_; }
 
 void CppHeap::EnterFinalPause(EmbedderStackState stack_state) {
+  cppgc::internal::StatsCollector::EnabledScope stats_scope(
+      AsBase(), cppgc::internal::StatsCollector::kAtomicMark);
+  is_in_final_pause_ = true;
   marker_->EnterAtomicPause(stack_state);
-  if (compactor_.CancelIfShouldNotCompact(
-          UnifiedHeapMarker::MarkingConfig::MarkingType::kAtomic,
-          stack_state)) {
+  if (compactor_.CancelIfShouldNotCompact(cppgc::Heap::MarkingType::kAtomic,
+                                          stack_state)) {
     marker_->NotifyCompactionCancelled();
   }
 }
 
 void CppHeap::TraceEpilogue(TraceSummary* trace_summary) {
+  CHECK(is_in_final_pause_);
   CHECK(marking_done_);
   {
-    // Weakness callbacks and pre-finalizers are forbidden from allocating
-    // objects.
+    cppgc::internal::StatsCollector::EnabledScope stats_scope(
+        AsBase(), cppgc::internal::StatsCollector::kAtomicMark);
     cppgc::internal::ObjectAllocator::NoAllocationScope no_allocation_scope_(
         object_allocator_);
     marker_->LeaveAtomicPause();
+    is_in_final_pause_ = false;
+  }
+  {
+    cppgc::internal::ObjectAllocator::NoAllocationScope no_allocation_scope_(
+        object_allocator_);
     prefinalizer_handler()->InvokePreFinalizers();
   }
   marker_.reset();
@@ -224,16 +262,18 @@ void CppHeap::TraceEpilogue(TraceSummary* trace_summary) {
   UnifiedHeapMarkingVerifier verifier(*this);
   verifier.Run(cppgc::Heap::StackState::kNoHeapPointers);
 #endif
-  cppgc::internal::Sweeper::SweepingConfig::CompactableSpaceHandling
-      compactable_space_handling = compactor_.CompactSpacesIfEnabled();
+
   {
     NoGCScope no_gc(*this);
+    cppgc::internal::Sweeper::SweepingConfig::CompactableSpaceHandling
+        compactable_space_handling = compactor_.CompactSpacesIfEnabled();
     const cppgc::internal::Sweeper::SweepingConfig sweeping_config{
         cppgc::internal::Sweeper::SweepingConfig::SweepingType::
             kIncrementalAndConcurrent,
         compactable_space_handling};
     sweeper().Start(sweeping_config);
   }
+  sweeper().NotifyDoneIfNeeded();
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/cppgc-js/cpp-heap.h b/deps/v8/src/heap/cppgc-js/cpp-heap.h
index b2bfc6f8a728db..44607e58979712 100644
--- a/deps/v8/src/heap/cppgc-js/cpp-heap.h
+++ b/deps/v8/src/heap/cppgc-js/cpp-heap.h
@@ -5,6 +5,7 @@
 #ifndef V8_HEAP_CPPGC_JS_CPP_HEAP_H_
 #define V8_HEAP_CPPGC_JS_CPP_HEAP_H_
 
+#include "include/v8-cppgc.h"
 #include "include/v8.h"
 #include "src/base/macros.h"
 #include "src/heap/cppgc/heap-base.h"
@@ -17,8 +18,16 @@ namespace internal {
 
 // A C++ heap implementation used with V8 to implement unified heap.
 class V8_EXPORT_PRIVATE CppHeap final : public cppgc::internal::HeapBase,
+                                        public v8::CppHeap,
                                         public v8::EmbedderHeapTracer {
  public:
+  static CppHeap* From(v8::CppHeap* heap) {
+    return static_cast<CppHeap*>(heap);
+  }
+  static const CppHeap* From(const v8::CppHeap* heap) {
+    return static_cast<const CppHeap*>(heap);
+  }
+
   CppHeap(v8::Isolate* isolate,
           const std::vector<std::unique_ptr<cppgc::CustomSpaceBase>>&
               custom_spaces);
@@ -45,8 +54,11 @@ class V8_EXPORT_PRIVATE CppHeap final : public cppgc::internal::HeapBase,
     // finalization is not needed) thus this method is left empty.
   }
 
+  void PostGarbageCollection() final {}
+
   Isolate& isolate_;
   bool marking_done_ = false;
+  bool is_in_final_pause_ = false;
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/cppgc-js/cpp-snapshot.cc b/deps/v8/src/heap/cppgc-js/cpp-snapshot.cc
index b1784baa9ffc4d..bbf9fff4a36ade 100644
--- a/deps/v8/src/heap/cppgc-js/cpp-snapshot.cc
+++ b/deps/v8/src/heap/cppgc-js/cpp-snapshot.cc
@@ -34,11 +34,12 @@ using cppgc::internal::HeapObjectHeader;
 // Node representing a C++ object on the heap.
 class EmbedderNode : public v8::EmbedderGraph::Node {
  public:
-  explicit EmbedderNode(const char* name) : name_(name) {}
+  explicit EmbedderNode(const char* name, size_t size)
+      : name_(name), size_(size) {}
   ~EmbedderNode() override = default;
 
   const char* Name() final { return name_; }
-  size_t SizeInBytes() override { return 0; }
+  size_t SizeInBytes() final { return size_; }
 
   void SetWrapperNode(v8::EmbedderGraph::Node* wrapper_node) {
     wrapper_node_ = wrapper_node;
@@ -52,6 +53,7 @@ class EmbedderNode : public v8::EmbedderGraph::Node {
 
  private:
   const char* name_;
+  size_t size_;
   Node* wrapper_node_ = nullptr;
   Detachedness detachedness_ = Detachedness::kUnknown;
 };
@@ -59,11 +61,10 @@ class EmbedderNode : public v8::EmbedderGraph::Node {
 // Node representing an artificial root group, e.g., set of Persistent handles.
 class EmbedderRootNode final : public EmbedderNode {
  public:
-  explicit EmbedderRootNode(const char* name) : EmbedderNode(name) {}
+  explicit EmbedderRootNode(const char* name) : EmbedderNode(name, 0) {}
   ~EmbedderRootNode() final = default;
 
   bool IsRootNode() final { return true; }
-  size_t SizeInBytes() final { return 0; }
 };
 
 // Canonical state representing real and artificial (e.g. root) objects.
@@ -373,7 +374,7 @@ class CppGraphBuilderImpl final {
   EmbedderNode* AddNode(const HeapObjectHeader& header) {
     return static_cast<EmbedderNode*>(
         graph_.AddNode(std::unique_ptr<v8::EmbedderGraph::Node>{
-            new EmbedderNode(header.GetName().value)}));
+            new EmbedderNode(header.GetName().value, header.GetSize())}));
   }
 
   void AddEdge(State& parent, const HeapObjectHeader& header) {
diff --git a/deps/v8/src/heap/cppgc/compactor.cc b/deps/v8/src/heap/cppgc/compactor.cc
index 23869d2f14aaa4..8efadc6f127ad6 100644
--- a/deps/v8/src/heap/cppgc/compactor.cc
+++ b/deps/v8/src/heap/cppgc/compactor.cc
@@ -16,6 +16,7 @@
 #include "src/heap/cppgc/heap-page.h"
 #include "src/heap/cppgc/heap-space.h"
 #include "src/heap/cppgc/raw-heap.h"
+#include "src/heap/cppgc/stats-collector.h"
 
 namespace cppgc {
 namespace internal {
@@ -483,6 +484,9 @@ bool Compactor::CancelIfShouldNotCompact(
 Compactor::CompactableSpaceHandling Compactor::CompactSpacesIfEnabled() {
   if (!is_enabled_) return CompactableSpaceHandling::kSweep;
 
+  StatsCollector::DisabledScope stats_scope(*heap_.heap(),
+                                            StatsCollector::kAtomicCompact);
+
   MovableReferences movable_references(*heap_.heap());
 
   CompactionWorklists::MovableReferencesWorklist::Local local(
diff --git a/deps/v8/src/heap/cppgc/concurrent-marker.cc b/deps/v8/src/heap/cppgc/concurrent-marker.cc
index 5df422fa5cdb4a..8627829aad1d77 100644
--- a/deps/v8/src/heap/cppgc/concurrent-marker.cc
+++ b/deps/v8/src/heap/cppgc/concurrent-marker.cc
@@ -10,6 +10,7 @@
 #include "src/heap/cppgc/liveness-broker.h"
 #include "src/heap/cppgc/marking-state.h"
 #include "src/heap/cppgc/marking-visitor.h"
+#include "src/heap/cppgc/stats-collector.h"
 
 namespace cppgc {
 namespace internal {
@@ -71,6 +72,9 @@ ConcurrentMarkingTask::ConcurrentMarkingTask(
     : concurrent_marker_(concurrent_marker) {}
 
 void ConcurrentMarkingTask::Run(JobDelegate* job_delegate) {
+  StatsCollector::EnabledConcurrentScope stats_scope(
+      concurrent_marker_.heap(), StatsCollector::kConcurrentMark);
+
   if (!HasWorkForConcurrentMarking(concurrent_marker_.marking_worklists()))
     return;
   ConcurrentMarkingState concurrent_marking_state(
@@ -144,16 +148,22 @@ void ConcurrentMarkingTask::ProcessWorklists(
       return;
     }
 
-    if (!DrainWorklistWithYielding(
-            job_delegate, concurrent_marking_state,
-            concurrent_marker_.incremental_marking_schedule(),
-            concurrent_marking_state.ephemeron_pairs_for_processing_worklist(),
-            [&concurrent_marking_state](
-                const MarkingWorklists::EphemeronPairItem& item) {
-              concurrent_marking_state.ProcessEphemeron(item.key,
-                                                        item.value_desc);
-            })) {
-      return;
+    {
+      StatsCollector::DisabledConcurrentScope stats_scope(
+          concurrent_marker_.heap(),
+          StatsCollector::kConcurrentMarkProcessEphemerons);
+      if (!DrainWorklistWithYielding(
+              job_delegate, concurrent_marking_state,
+              concurrent_marker_.incremental_marking_schedule(),
+              concurrent_marking_state
+                  .ephemeron_pairs_for_processing_worklist(),
+              [&concurrent_marking_state](
+                  const MarkingWorklists::EphemeronPairItem& item) {
+                concurrent_marking_state.ProcessEphemeron(item.key,
+                                                          item.value_desc);
+              })) {
+        return;
+      }
     }
   } while (
       !concurrent_marking_state.marking_worklist().IsLocalAndGlobalEmpty());
@@ -188,7 +198,7 @@ void ConcurrentMarkerBase::JoinForTesting() {
 }
 
 bool ConcurrentMarkerBase::IsActive() const {
-  return concurrent_marking_handle_ && concurrent_marking_handle_->IsRunning();
+  return concurrent_marking_handle_ && concurrent_marking_handle_->IsValid();
 }
 
 ConcurrentMarkerBase::~ConcurrentMarkerBase() {
@@ -196,16 +206,14 @@ ConcurrentMarkerBase::~ConcurrentMarkerBase() {
                 !concurrent_marking_handle_->IsValid());
 }
 
-bool ConcurrentMarkerBase::NotifyIncrementalMutatorStepCompleted() {
+void ConcurrentMarkerBase::NotifyIncrementalMutatorStepCompleted() {
   DCHECK(concurrent_marking_handle_);
   if (HasWorkForConcurrentMarking(marking_worklists_)) {
     // Notifies the scheduler that max concurrency might have increased.
     // This will adjust the number of markers if necessary.
     IncreaseMarkingPriorityIfNeeded();
     concurrent_marking_handle_->NotifyConcurrencyIncrease();
-    return false;
   }
-  return !concurrent_marking_handle_->IsActive();
 }
 
 void ConcurrentMarkerBase::IncreaseMarkingPriorityIfNeeded() {
diff --git a/deps/v8/src/heap/cppgc/concurrent-marker.h b/deps/v8/src/heap/cppgc/concurrent-marker.h
index 4f0ec849d1b980..830584910af445 100644
--- a/deps/v8/src/heap/cppgc/concurrent-marker.h
+++ b/deps/v8/src/heap/cppgc/concurrent-marker.h
@@ -28,7 +28,7 @@ class V8_EXPORT_PRIVATE ConcurrentMarkerBase {
 
   void JoinForTesting();
 
-  bool NotifyIncrementalMutatorStepCompleted();
+  void NotifyIncrementalMutatorStepCompleted();
 
   bool IsActive() const;
 
diff --git a/deps/v8/src/heap/cppgc/default-platform.cc b/deps/v8/src/heap/cppgc/default-platform.cc
new file mode 100644
index 00000000000000..fd0a55bd8275f6
--- /dev/null
+++ b/deps/v8/src/heap/cppgc/default-platform.cc
@@ -0,0 +1,23 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <include/cppgc/default-platform.h>
+
+#if !CPPGC_IS_STANDALONE
+#include <v8.h>
+#endif  // !CPPGC_IS_STANDALONE
+
+namespace cppgc {
+
+// static
+void DefaultPlatform::InitializeProcess(DefaultPlatform* platform) {
+#if CPPGC_IS_STANDALONE
+  cppgc::InitializeProcess(platform->GetPageAllocator());
+#else
+  // v8::V8::InitializePlatform transitively calls cppgc::InitializeProcess.
+  v8::V8::InitializePlatform(platform->v8_platform_.get());
+#endif  // CPPGC_IS_STANDALONE
+}
+
+}  // namespace cppgc
diff --git a/deps/v8/src/heap/cppgc/garbage-collector.h b/deps/v8/src/heap/cppgc/garbage-collector.h
index e5f6641bdf63f7..3ea88d76fced63 100644
--- a/deps/v8/src/heap/cppgc/garbage-collector.h
+++ b/deps/v8/src/heap/cppgc/garbage-collector.h
@@ -20,6 +20,7 @@ class GarbageCollector {
     using StackState = cppgc::Heap::StackState;
     using MarkingType = Marker::MarkingConfig::MarkingType;
     using SweepingType = Sweeper::SweepingConfig::SweepingType;
+    using IsForcedGC = Marker::MarkingConfig::IsForcedGC;
 
     static constexpr Config ConservativeAtomicConfig() {
       return {CollectionType::kMajor, StackState::kMayContainHeapPointers,
@@ -50,6 +51,7 @@ class GarbageCollector {
     StackState stack_state = StackState::kMayContainHeapPointers;
     MarkingType marking_type = MarkingType::kAtomic;
     SweepingType sweeping_type = SweepingType::kAtomic;
+    IsForcedGC is_forced_gc = IsForcedGC::kNotForced;
   };
 
   // Executes a garbage collection specified in config.
diff --git a/deps/v8/src/heap/cppgc/gc-info-table.cc b/deps/v8/src/heap/cppgc/gc-info-table.cc
index 8f2ee965011523..74ce4af874f780 100644
--- a/deps/v8/src/heap/cppgc/gc-info-table.cc
+++ b/deps/v8/src/heap/cppgc/gc-info-table.cc
@@ -12,6 +12,7 @@
 #include "include/cppgc/platform.h"
 #include "src/base/bits.h"
 #include "src/base/lazy-instance.h"
+#include "src/base/page-allocator.h"
 
 namespace cppgc {
 namespace internal {
@@ -36,6 +37,13 @@ constexpr GCInfoIndex GCInfoTable::kMinIndex;
 constexpr GCInfoIndex GCInfoTable::kInitialWantedLimit;
 
 void GlobalGCInfoTable::Create(PageAllocator* page_allocator) {
+  if (!page_allocator) {
+    static v8::base::LeakyObject<v8::base::PageAllocator>
+        default_page_allocator;
+    page_allocator = default_page_allocator.get();
+  }
+  // TODO(chromium:1056170): Wrap page_allocator into LsanPageAllocator when
+  // running with LEAK_SANITIZER.
   static v8::base::LeakyObject<GCInfoTable> table(page_allocator);
   if (!global_table_) {
     global_table_ = table.get();
diff --git a/deps/v8/src/heap/cppgc/gc-info-table.h b/deps/v8/src/heap/cppgc/gc-info-table.h
index c8ed97ad7de255..addcd0bd38a59f 100644
--- a/deps/v8/src/heap/cppgc/gc-info-table.h
+++ b/deps/v8/src/heap/cppgc/gc-info-table.h
@@ -51,6 +51,8 @@ class V8_EXPORT GCInfoTable final {
   // of testing code.
   explicit GCInfoTable(PageAllocator* page_allocator);
   ~GCInfoTable();
+  GCInfoTable(const GCInfoTable&) = delete;
+  GCInfoTable& operator=(const GCInfoTable&) = delete;
 
   GCInfoIndex RegisterNewGCInfo(const GCInfo& info);
 
@@ -84,12 +86,13 @@ class V8_EXPORT GCInfoTable final {
   GCInfoIndex limit_ = 0;
 
   v8::base::Mutex table_mutex_;
-
-  DISALLOW_COPY_AND_ASSIGN(GCInfoTable);
 };
 
 class V8_EXPORT GlobalGCInfoTable final {
  public:
+  GlobalGCInfoTable(const GlobalGCInfoTable&) = delete;
+  GlobalGCInfoTable& operator=(const GlobalGCInfoTable&) = delete;
+
   // Sets up a singleton table that can be acquired using Get().
   static void Create(PageAllocator* page_allocator);
 
@@ -106,7 +109,6 @@ class V8_EXPORT GlobalGCInfoTable final {
   static GCInfoTable* global_table_;
 
   DISALLOW_NEW_AND_DELETE()
-  DISALLOW_COPY_AND_ASSIGN(GlobalGCInfoTable);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/cppgc/gc-invoker.cc b/deps/v8/src/heap/cppgc/gc-invoker.cc
index 31ca9780bf42ab..9537f0c2a4db76 100644
--- a/deps/v8/src/heap/cppgc/gc-invoker.cc
+++ b/deps/v8/src/heap/cppgc/gc-invoker.cc
@@ -30,15 +30,19 @@ class GCInvoker::GCInvokerImpl final : public GarbageCollector {
    public:
     using Handle = SingleThreadedHandle;
 
-    static Handle Post(GarbageCollector* collector, cppgc::TaskRunner* runner) {
-      auto task = std::make_unique<GCInvoker::GCInvokerImpl::GCTask>(collector);
+    static Handle Post(GarbageCollector* collector, cppgc::TaskRunner* runner,
+                       GarbageCollector::Config config) {
+      auto task =
+          std::make_unique<GCInvoker::GCInvokerImpl::GCTask>(collector, config);
       auto handle = task->GetHandle();
       runner->PostNonNestableTask(std::move(task));
       return handle;
     }
 
-    explicit GCTask(GarbageCollector* collector)
+    explicit GCTask(GarbageCollector* collector,
+                    GarbageCollector::Config config)
         : collector_(collector),
+          config_(config),
           handle_(Handle::NonEmptyTag{}),
           saved_epoch_(collector->epoch()) {}
 
@@ -46,14 +50,14 @@ class GCInvoker::GCInvokerImpl final : public GarbageCollector {
     void Run() final {
       if (handle_.IsCanceled() || (collector_->epoch() != saved_epoch_)) return;
 
-      collector_->CollectGarbage(
-          GarbageCollector::Config::PreciseAtomicConfig());
+      collector_->CollectGarbage(config_);
       handle_.Cancel();
     }
 
     Handle GetHandle() { return handle_; }
 
     GarbageCollector* collector_;
+    GarbageCollector::Config config_;
     Handle handle_;
     size_t saved_epoch_;
   };
@@ -78,21 +82,27 @@ GCInvoker::GCInvokerImpl::~GCInvokerImpl() {
 }
 
 void GCInvoker::GCInvokerImpl::CollectGarbage(GarbageCollector::Config config) {
+  DCHECK_EQ(config.marking_type, cppgc::Heap::MarkingType::kAtomic);
   if ((config.stack_state ==
        GarbageCollector::Config::StackState::kNoHeapPointers) ||
       (stack_support_ ==
        cppgc::Heap::StackSupport::kSupportsConservativeStackScan)) {
     collector_->CollectGarbage(config);
-  } else if (platform_->GetForegroundTaskRunner()->NonNestableTasksEnabled()) {
+  } else if (platform_->GetForegroundTaskRunner() &&
+             platform_->GetForegroundTaskRunner()->NonNestableTasksEnabled()) {
     if (!gc_task_handle_) {
-      gc_task_handle_ =
-          GCTask::Post(collector_, platform_->GetForegroundTaskRunner().get());
+      // Force a precise GC since it will run in a non-nestable task.
+      config.stack_state =
+          GarbageCollector::Config::StackState::kNoHeapPointers;
+      gc_task_handle_ = GCTask::Post(
+          collector_, platform_->GetForegroundTaskRunner().get(), config);
     }
   }
 }
 
 void GCInvoker::GCInvokerImpl::StartIncrementalGarbageCollection(
     GarbageCollector::Config config) {
+  DCHECK_NE(config.marking_type, cppgc::Heap::MarkingType::kAtomic);
   if ((stack_support_ !=
        cppgc::Heap::StackSupport::kSupportsConservativeStackScan) &&
       (!platform_->GetForegroundTaskRunner() ||
diff --git a/deps/v8/src/heap/cppgc/heap-base.cc b/deps/v8/src/heap/cppgc/heap-base.cc
index 50edce4b4e575e..a882c0792adb10 100644
--- a/deps/v8/src/heap/cppgc/heap-base.cc
+++ b/deps/v8/src/heap/cppgc/heap-base.cc
@@ -69,7 +69,7 @@ HeapBase::HeapBase(
       stats_collector_(std::make_unique<StatsCollector>()),
       stack_(std::make_unique<heap::base::Stack>(
           v8::base::Stack::GetStackStart())),
-      prefinalizer_handler_(std::make_unique<PreFinalizerHandler>()),
+      prefinalizer_handler_(std::make_unique<PreFinalizerHandler>(*this)),
       compactor_(raw_heap_),
       object_allocator_(&raw_heap_, page_backend_.get(),
                         stats_collector_.get()),
diff --git a/deps/v8/src/heap/cppgc/heap-base.h b/deps/v8/src/heap/cppgc/heap-base.h
index f685d94ea5c5f9..acff3f69366e3d 100644
--- a/deps/v8/src/heap/cppgc/heap-base.h
+++ b/deps/v8/src/heap/cppgc/heap-base.h
@@ -32,6 +32,12 @@ namespace cppgc {
 
 class Platform;
 
+class V8_EXPORT HeapHandle {
+ private:
+  HeapHandle() = default;
+  friend class internal::HeapBase;
+};
+
 namespace internal {
 
 namespace testing {
@@ -43,13 +49,13 @@ class PreFinalizerHandler;
 class StatsCollector;
 
 // Base class for heap implementations.
-class V8_EXPORT_PRIVATE HeapBase {
+class V8_EXPORT_PRIVATE HeapBase : public cppgc::HeapHandle {
  public:
   using StackSupport = cppgc::Heap::StackSupport;
 
   // NoGCScope allows going over limits and avoids triggering garbage
   // collection triggered through allocations or even explicitly.
-  class V8_EXPORT_PRIVATE NoGCScope final {
+  class V8_EXPORT_PRIVATE V8_NODISCARD NoGCScope final {
     CPPGC_STACK_ALLOCATED();
 
    public:
@@ -63,6 +69,13 @@ class V8_EXPORT_PRIVATE HeapBase {
     HeapBase& heap_;
   };
 
+  static HeapBase& From(cppgc::HeapHandle& heap_handle) {
+    return static_cast<HeapBase&>(heap_handle);
+  }
+  static const HeapBase& From(const cppgc::HeapHandle& heap_handle) {
+    return static_cast<const HeapBase&>(heap_handle);
+  }
+
   HeapBase(std::shared_ptr<cppgc::Platform> platform,
            const std::vector<std::unique_ptr<CustomSpaceBase>>& custom_spaces,
            StackSupport stack_support);
@@ -139,6 +152,9 @@ class V8_EXPORT_PRIVATE HeapBase {
 
   void AdvanceIncrementalGarbageCollectionOnAllocationIfNeeded();
 
+  // Notifies the heap that a GC is done.
+  virtual void PostGarbageCollection() = 0;
+
  protected:
   virtual void FinalizeIncrementalGarbageCollectionIfNeeded(
       cppgc::Heap::StackState) = 0;
diff --git a/deps/v8/src/heap/cppgc/heap-growing.cc b/deps/v8/src/heap/cppgc/heap-growing.cc
index 45c606505fd878..1055626a0a3548 100644
--- a/deps/v8/src/heap/cppgc/heap-growing.cc
+++ b/deps/v8/src/heap/cppgc/heap-growing.cc
@@ -31,7 +31,8 @@ class HeapGrowing::HeapGrowingImpl final
     : public StatsCollector::AllocationObserver {
  public:
   HeapGrowingImpl(GarbageCollector*, StatsCollector*,
-                  cppgc::Heap::ResourceConstraints);
+                  cppgc::Heap::ResourceConstraints, cppgc::Heap::MarkingType,
+                  cppgc::Heap::SweepingType);
   ~HeapGrowingImpl();
 
   HeapGrowingImpl(const HeapGrowingImpl&) = delete;
@@ -60,14 +61,21 @@ class HeapGrowing::HeapGrowingImpl final
   SingleThreadedHandle gc_task_handle_;
 
   bool disabled_for_testing_ = false;
+
+  const cppgc::Heap::MarkingType marking_support_;
+  const cppgc::Heap::SweepingType sweeping_support_;
 };
 
 HeapGrowing::HeapGrowingImpl::HeapGrowingImpl(
     GarbageCollector* collector, StatsCollector* stats_collector,
-    cppgc::Heap::ResourceConstraints constraints)
+    cppgc::Heap::ResourceConstraints constraints,
+    cppgc::Heap::MarkingType marking_support,
+    cppgc::Heap::SweepingType sweeping_support)
     : collector_(collector),
       stats_collector_(stats_collector),
-      gc_task_handle_(SingleThreadedHandle::NonEmptyTag{}) {
+      gc_task_handle_(SingleThreadedHandle::NonEmptyTag{}),
+      marking_support_(marking_support),
+      sweeping_support_(sweeping_support) {
   if (constraints.initial_heap_size_bytes > 0) {
     initial_heap_size_ = constraints.initial_heap_size_bytes;
   }
@@ -85,10 +93,15 @@ void HeapGrowing::HeapGrowingImpl::AllocatedObjectSizeIncreased(size_t) {
   size_t allocated_object_size = stats_collector_->allocated_object_size();
   if (allocated_object_size > limit_for_atomic_gc_) {
     collector_->CollectGarbage(
-        GarbageCollector::Config::ConservativeAtomicConfig());
+        {GarbageCollector::Config::CollectionType::kMajor,
+         GarbageCollector::Config::StackState::kMayContainHeapPointers,
+         GarbageCollector::Config::MarkingType::kAtomic, sweeping_support_});
   } else if (allocated_object_size > limit_for_incremental_gc_) {
+    if (marking_support_ == cppgc::Heap::MarkingType::kAtomic) return;
     collector_->StartIncrementalGarbageCollection(
-        GarbageCollector::Config::ConservativeIncrementalConfig());
+        {GarbageCollector::Config::CollectionType::kMajor,
+         GarbageCollector::Config::StackState::kMayContainHeapPointers,
+         marking_support_, sweeping_support_});
   }
 }
 
@@ -133,9 +146,12 @@ void HeapGrowing::HeapGrowingImpl::DisableForTesting() {
 
 HeapGrowing::HeapGrowing(GarbageCollector* collector,
                          StatsCollector* stats_collector,
-                         cppgc::Heap::ResourceConstraints constraints)
+                         cppgc::Heap::ResourceConstraints constraints,
+                         cppgc::Heap::MarkingType marking_support,
+                         cppgc::Heap::SweepingType sweeping_support)
     : impl_(std::make_unique<HeapGrowing::HeapGrowingImpl>(
-          collector, stats_collector, constraints)) {}
+          collector, stats_collector, constraints, marking_support,
+          sweeping_support)) {}
 
 HeapGrowing::~HeapGrowing() = default;
 
diff --git a/deps/v8/src/heap/cppgc/heap-growing.h b/deps/v8/src/heap/cppgc/heap-growing.h
index 4ecedb3e16ab37..816885dc6b3bd8 100644
--- a/deps/v8/src/heap/cppgc/heap-growing.h
+++ b/deps/v8/src/heap/cppgc/heap-growing.h
@@ -34,7 +34,8 @@ class V8_EXPORT_PRIVATE HeapGrowing final {
       kPageSize * RawHeap::kNumberOfRegularSpaces;
 
   HeapGrowing(GarbageCollector*, StatsCollector*,
-              cppgc::Heap::ResourceConstraints);
+              cppgc::Heap::ResourceConstraints, cppgc::Heap::MarkingType,
+              cppgc::Heap::SweepingType);
   ~HeapGrowing();
 
   HeapGrowing(const HeapGrowing&) = delete;
diff --git a/deps/v8/src/heap/cppgc/heap.cc b/deps/v8/src/heap/cppgc/heap.cc
index 3da59fd1eecb59..0a79e80820025f 100644
--- a/deps/v8/src/heap/cppgc/heap.cc
+++ b/deps/v8/src/heap/cppgc/heap.cc
@@ -12,6 +12,7 @@
 #include "src/heap/cppgc/marker.h"
 #include "src/heap/cppgc/marking-verifier.h"
 #include "src/heap/cppgc/prefinalizer-handler.h"
+#include "src/heap/cppgc/stats-collector.h"
 
 namespace cppgc {
 
@@ -42,14 +43,16 @@ void Heap::ForceGarbageCollectionSlow(const char* source, const char* reason,
                                       Heap::StackState stack_state) {
   internal::Heap::From(this)->CollectGarbage(
       {internal::GarbageCollector::Config::CollectionType::kMajor, stack_state,
-       internal::GarbageCollector::Config::MarkingType::kAtomic,
-       internal::GarbageCollector::Config::SweepingType::kAtomic});
+       MarkingType::kAtomic, SweepingType::kAtomic,
+       internal::GarbageCollector::Config::IsForcedGC::kForced});
 }
 
 AllocationHandle& Heap::GetAllocationHandle() {
   return internal::Heap::From(this)->object_allocator();
 }
 
+HeapHandle& Heap::GetHeapHandle() { return *internal::Heap::From(this); }
+
 namespace internal {
 
 namespace {
@@ -67,11 +70,16 @@ class Unmarker final : private HeapVisitor<Unmarker> {
   }
 };
 
-void CheckConfig(Heap::Config config) {
+void CheckConfig(Heap::Config config, Heap::MarkingType marking_support,
+                 Heap::SweepingType sweeping_support) {
   CHECK_WITH_MSG(
       (config.collection_type != Heap::Config::CollectionType::kMinor) ||
           (config.stack_state == Heap::Config::StackState::kNoHeapPointers),
       "Minor GCs with stack is currently not supported");
+  CHECK_LE(static_cast<int>(config.marking_type),
+           static_cast<int>(marking_support));
+  CHECK_LE(static_cast<int>(config.sweeping_type),
+           static_cast<int>(sweeping_support));
 }
 
 }  // namespace
@@ -81,7 +89,15 @@ Heap::Heap(std::shared_ptr<cppgc::Platform> platform,
     : HeapBase(platform, options.custom_spaces, options.stack_support),
       gc_invoker_(this, platform_.get(), options.stack_support),
       growing_(&gc_invoker_, stats_collector_.get(),
-               options.resource_constraints) {}
+               options.resource_constraints, options.marking_support,
+               options.sweeping_support),
+      marking_support_(options.marking_support),
+      sweeping_support_(options.sweeping_support) {
+  CHECK_IMPLIES(options.marking_support != MarkingType::kAtomic,
+                platform_->GetForegroundTaskRunner());
+  CHECK_IMPLIES(options.sweeping_support != SweepingType::kAtomic,
+                platform_->GetForegroundTaskRunner());
+}
 
 Heap::~Heap() {
   NoGCScope no_gc(*this);
@@ -89,26 +105,29 @@ Heap::~Heap() {
   sweeper_.FinishIfRunning();
 }
 
+bool Heap::IsMarking() const { return marker_.get(); }
+
 void Heap::CollectGarbage(Config config) {
   DCHECK_EQ(Config::MarkingType::kAtomic, config.marking_type);
-  CheckConfig(config);
+  CheckConfig(config, marking_support_, sweeping_support_);
 
   if (in_no_gc_scope()) return;
 
   config_ = config;
 
-  if (!gc_in_progress_) StartGarbageCollection(config);
+  if (!IsMarking()) StartGarbageCollection(config);
 
-  DCHECK(marker_);
+  DCHECK(IsMarking());
 
   FinalizeGarbageCollection(config.stack_state);
 }
 
 void Heap::StartIncrementalGarbageCollection(Config config) {
   DCHECK_NE(Config::MarkingType::kAtomic, config.marking_type);
-  CheckConfig(config);
+  DCHECK_NE(marking_support_, MarkingType::kAtomic);
+  CheckConfig(config, marking_support_, sweeping_support_);
 
-  if (gc_in_progress_ || in_no_gc_scope()) return;
+  if (IsMarking() || in_no_gc_scope()) return;
 
   config_ = config;
 
@@ -116,7 +135,10 @@ void Heap::StartIncrementalGarbageCollection(Config config) {
 }
 
 void Heap::FinalizeIncrementalGarbageCollectionIfRunning(Config config) {
-  if (!gc_in_progress_) return;
+  DCHECK_NE(marking_support_, MarkingType::kAtomic);
+  CheckConfig(config, marking_support_, sweeping_support_);
+
+  if (!IsMarking()) return;
 
   DCHECK(!in_no_gc_scope());
 
@@ -126,14 +148,13 @@ void Heap::FinalizeIncrementalGarbageCollectionIfRunning(Config config) {
 }
 
 void Heap::StartGarbageCollection(Config config) {
-  DCHECK(!gc_in_progress_);
+  DCHECK(!IsMarking());
 
   DCHECK(!in_no_gc_scope());
 
   // Finish sweeping in case it is still running.
   sweeper_.FinishIfRunning();
 
-  gc_in_progress_ = true;
   epoch_++;
 
 #if defined(CPPGC_YOUNG_GENERATION)
@@ -142,22 +163,25 @@ void Heap::StartGarbageCollection(Config config) {
 #endif
 
   const Marker::MarkingConfig marking_config{
-      config.collection_type, config.stack_state, config.marking_type};
+      config.collection_type, config.stack_state, config.marking_type,
+      config.is_forced_gc};
   marker_ = MarkerFactory::CreateAndStartMarking<Marker>(
       AsBase(), platform_.get(), marking_config);
 }
 
 void Heap::FinalizeGarbageCollection(Config::StackState stack_state) {
-  DCHECK(gc_in_progress_);
+  DCHECK(IsMarking());
   DCHECK(!in_no_gc_scope());
   config_.stack_state = stack_state;
-  DCHECK(marker_);
   {
-    // Pre finalizers are forbidden from allocating objects. Note that this also
-    // guard atomic pause marking below, meaning that no internal method or
+    // This guards atomic pause marking, meaning that no internal method or
     // external callbacks are allowed to allocate new objects.
     ObjectAllocator::NoAllocationScope no_allocation_scope_(object_allocator_);
     marker_->FinishMarking(stack_state);
+  }
+  {
+    // Pre finalizers are forbidden from allocating objects.
+    ObjectAllocator::NoAllocationScope no_allocation_scope_(object_allocator_);
     prefinalizer_handler_->InvokePreFinalizers();
   }
   marker_.reset();
@@ -166,17 +190,25 @@ void Heap::FinalizeGarbageCollection(Config::StackState stack_state) {
   MarkingVerifier verifier(*this);
   verifier.Run(stack_state);
 #endif
-  {
-    NoGCScope no_gc(*this);
-    const Sweeper::SweepingConfig sweeping_config{
-        config_.sweeping_type,
-        Sweeper::SweepingConfig::CompactableSpaceHandling::kSweep};
-    sweeper_.Start(sweeping_config);
-  }
-  gc_in_progress_ = false;
+
+  NoGCScope no_gc(*this);
+  const Sweeper::SweepingConfig sweeping_config{
+      config_.sweeping_type,
+      Sweeper::SweepingConfig::CompactableSpaceHandling::kSweep};
+  sweeper_.Start(sweeping_config);
+  sweeper_.NotifyDoneIfNeeded();
 }
 
+void Heap::PostGarbageCollection() {}
+
 void Heap::DisableHeapGrowingForTesting() { growing_.DisableForTesting(); }
 
+void Heap::FinalizeIncrementalGarbageCollectionIfNeeded(
+    Config::StackState stack_state) {
+  StatsCollector::EnabledScope stats_scope(
+      *this, StatsCollector::kMarkIncrementalFinalize);
+  FinalizeGarbageCollection(stack_state);
+}
+
 }  // namespace internal
 }  // namespace cppgc
diff --git a/deps/v8/src/heap/cppgc/heap.h b/deps/v8/src/heap/cppgc/heap.h
index cd4d3d2bfeb5e6..b718341af1870a 100644
--- a/deps/v8/src/heap/cppgc/heap.h
+++ b/deps/v8/src/heap/cppgc/heap.h
@@ -44,16 +44,19 @@ class V8_EXPORT_PRIVATE Heap final : public HeapBase,
   void StartGarbageCollection(Config);
   void FinalizeGarbageCollection(Config::StackState);
 
-  void FinalizeIncrementalGarbageCollectionIfNeeded(
-      Config::StackState stack_state) final {
-    FinalizeGarbageCollection(stack_state);
-  }
+  void FinalizeIncrementalGarbageCollectionIfNeeded(Config::StackState) final;
+
+  void PostGarbageCollection() final;
+
+  bool IsMarking() const;
 
   Config config_;
   GCInvoker gc_invoker_;
   HeapGrowing growing_;
 
-  bool gc_in_progress_ = false;
+  const MarkingType marking_support_;
+  const SweepingType sweeping_support_;
+
   size_t epoch_ = 0;
 };
 
diff --git a/deps/v8/src/heap/cppgc/marker.cc b/deps/v8/src/heap/cppgc/marker.cc
index 236bc12af4fbff..f6c0e74f625fde 100644
--- a/deps/v8/src/heap/cppgc/marker.cc
+++ b/deps/v8/src/heap/cppgc/marker.cc
@@ -59,6 +59,8 @@ bool ExitIncrementalMarkingIfNeeded(Marker::MarkingConfig config,
 void VisitRememberedSlots(HeapBase& heap,
                           MutatorMarkingState& mutator_marking_state) {
 #if defined(CPPGC_YOUNG_GENERATION)
+  StatsCollector::EnabledScope stats_scope(
+      heap, StatsCollector::kMarkVisitRememberedSets);
   for (void* slot : heap.remembered_slots()) {
     auto& slot_header = BasePage::FromInnerAddress(&heap, slot)
                             ->ObjectHeaderFromInnerAddress(slot);
@@ -67,7 +69,7 @@ void VisitRememberedSlots(HeapBase& heap,
     // top level (with the guarantee that no objects are currently being in
     // construction). This can be ensured by running young GCs from safe points
     // or by reintroducing nested allocation scopes that avoid finalization.
-    DCHECK(!header.IsInConstruction<AccessMode::kNonAtomic>());
+    DCHECK(!slot_header.template IsInConstruction<AccessMode::kNonAtomic>());
 
     void* value = *reinterpret_cast<void**>(slot);
     mutator_marking_state.DynamicallyMarkAddress(static_cast<Address>(value));
@@ -146,6 +148,9 @@ MarkerBase::IncrementalMarkingTask::Post(cppgc::TaskRunner* runner,
 void MarkerBase::IncrementalMarkingTask::Run() {
   if (handle_.IsCanceled()) return;
 
+  StatsCollector::EnabledScope stats_scope(marker_->heap(),
+                                           StatsCollector::kIncrementalMark);
+
   if (marker_->IncrementalMarkingStep(stack_state_)) {
     // Incremental marking is done so should finalize GC.
     marker_->heap().FinalizeIncrementalGarbageCollectionIfNeeded(stack_state_);
@@ -195,10 +200,19 @@ MarkerBase::~MarkerBase() {
 
 void MarkerBase::StartMarking() {
   DCHECK(!is_marking_started_);
-  heap().stats_collector()->NotifyMarkingStarted();
+  StatsCollector::EnabledScope stats_scope(
+      heap(), config_.marking_type == MarkingConfig::MarkingType::kAtomic
+                  ? StatsCollector::kAtomicMark
+                  : StatsCollector::kIncrementalMark);
+
+  heap().stats_collector()->NotifyMarkingStarted(config_.collection_type,
+                                                 config_.is_forced_gc);
 
   is_marking_started_ = true;
   if (EnterIncrementalMarkingIfNeeded(config_, heap())) {
+    StatsCollector::EnabledScope stats_scope(
+        heap(), StatsCollector::kMarkIncrementalStart);
+
     // Performing incremental or concurrent marking.
     schedule_.NotifyIncrementalMarkingStart();
     // Scanning the stack is expensive so we only do it at the atomic pause.
@@ -213,6 +227,9 @@ void MarkerBase::StartMarking() {
 }
 
 void MarkerBase::EnterAtomicPause(MarkingConfig::StackState stack_state) {
+  StatsCollector::EnabledScope stats_scope(heap(),
+                                           StatsCollector::kMarkAtomicPrologue);
+
   if (ExitIncrementalMarkingIfNeeded(config_, heap())) {
     // Cancel remaining concurrent/incremental tasks.
     concurrent_marker_->Cancel();
@@ -227,29 +244,39 @@ void MarkerBase::EnterAtomicPause(MarkingConfig::StackState stack_state) {
   // is either cleared or the object is retained.
   g_process_mutex.Pointer()->Lock();
 
-  // VisitRoots also resets the LABs.
-  VisitRoots(config_.stack_state);
-  if (config_.stack_state == MarkingConfig::StackState::kNoHeapPointers) {
-    mutator_marking_state_.FlushNotFullyConstructedObjects();
-    DCHECK(marking_worklists_.not_fully_constructed_worklist()->IsEmpty());
-  } else {
-    MarkNotFullyConstructedObjects();
+  {
+    // VisitRoots also resets the LABs.
+    VisitRoots(config_.stack_state);
+    if (config_.stack_state == MarkingConfig::StackState::kNoHeapPointers) {
+      mutator_marking_state_.FlushNotFullyConstructedObjects();
+      DCHECK(marking_worklists_.not_fully_constructed_worklist()->IsEmpty());
+    } else {
+      MarkNotFullyConstructedObjects();
+    }
   }
 }
 
 void MarkerBase::LeaveAtomicPause() {
+  StatsCollector::EnabledScope stats_scope(heap(),
+                                           StatsCollector::kMarkAtomicEpilogue);
   DCHECK(!incremental_marking_handle_);
   ResetRememberedSet(heap());
   heap().stats_collector()->NotifyMarkingCompleted(
       // GetOverallMarkedBytes also includes concurrently marked bytes.
       schedule_.GetOverallMarkedBytes());
   is_marking_started_ = false;
-  ProcessWeakness();
+  {
+    // Weakness callbacks are forbidden from allocating objects.
+    ObjectAllocator::NoAllocationScope no_allocation_scope_(
+        heap_.object_allocator());
+    ProcessWeakness();
+  }
   g_process_mutex.Pointer()->Unlock();
 }
 
 void MarkerBase::FinishMarking(MarkingConfig::StackState stack_state) {
   DCHECK(is_marking_started_);
+  StatsCollector::EnabledScope stats_scope(heap(), StatsCollector::kAtomicMark);
   EnterAtomicPause(stack_state);
   CHECK(ProcessWorklistsWithDeadline(std::numeric_limits<size_t>::max(),
                                      v8::base::TimeTicks::Max()));
@@ -259,6 +286,10 @@ void MarkerBase::FinishMarking(MarkingConfig::StackState stack_state) {
 
 void MarkerBase::ProcessWeakness() {
   DCHECK_EQ(MarkingConfig::MarkingType::kAtomic, config_.marking_type);
+
+  StatsCollector::DisabledScope stats_scope(
+      heap(), StatsCollector::kWeakInvokeCallbacks);
+
   heap().GetWeakPersistentRegion().Trace(&visitor());
   // Processing cross-thread handles requires taking the process lock.
   g_process_mutex.Get().AssertHeld();
@@ -272,21 +303,36 @@ void MarkerBase::ProcessWeakness() {
   while (local.Pop(&item)) {
     item.callback(broker, item.parameter);
   }
+
   // Weak callbacks should not add any new objects for marking.
   DCHECK(marking_worklists_.marking_worklist()->IsEmpty());
 }
 
 void MarkerBase::VisitRoots(MarkingConfig::StackState stack_state) {
+  StatsCollector::EnabledScope stats_scope(heap(),
+                                           StatsCollector::kMarkVisitRoots);
+
   // Reset LABs before scanning roots. LABs are cleared to allow
   // ObjectStartBitmap handling without considering LABs.
   heap().object_allocator().ResetLinearAllocationBuffers();
 
-  heap().GetStrongPersistentRegion().Trace(&visitor());
-  if (config_.marking_type == MarkingConfig::MarkingType::kAtomic) {
-    g_process_mutex.Get().AssertHeld();
-    heap().GetStrongCrossThreadPersistentRegion().Trace(&visitor());
+  {
+    {
+      StatsCollector::DisabledScope inner_stats_scope(
+          heap(), StatsCollector::kMarkVisitPersistents);
+      heap().GetStrongPersistentRegion().Trace(&visitor());
+    }
+    if (config_.marking_type == MarkingConfig::MarkingType::kAtomic) {
+      StatsCollector::DisabledScope inner_stats_scope(
+          heap(), StatsCollector::kMarkVisitCrossThreadPersistents);
+      g_process_mutex.Get().AssertHeld();
+      heap().GetStrongCrossThreadPersistentRegion().Trace(&visitor());
+    }
   }
+
   if (stack_state != MarkingConfig::StackState::kNoHeapPointers) {
+    StatsCollector::DisabledScope stack_stats_scope(
+        heap(), StatsCollector::kMarkVisitStack);
     heap().stack()->IteratePointers(&stack_visitor());
   }
   if (config_.collection_type == MarkingConfig::CollectionType::kMinor) {
@@ -332,6 +378,9 @@ bool MarkerBase::AdvanceMarkingWithDeadline(v8::base::TimeDelta max_duration) {
   if (!incremental_marking_disabled_for_testing_) {
     size_t step_size_in_bytes =
         GetNextIncrementalStepDuration(schedule_, heap_);
+    StatsCollector::EnabledScope deadline_scope(
+        heap(), StatsCollector::kMarkTransitiveClosureWithDeadline,
+        "deadline_ms", max_duration.InMillisecondsF());
     is_done = ProcessWorklistsWithDeadline(
         mutator_marking_state_.marked_bytes() + step_size_in_bytes,
         v8::base::TimeTicks::Now() + max_duration);
@@ -353,6 +402,8 @@ bool MarkerBase::AdvanceMarkingWithDeadline(v8::base::TimeDelta max_duration) {
 
 bool MarkerBase::ProcessWorklistsWithDeadline(
     size_t marked_bytes_deadline, v8::base::TimeTicks time_deadline) {
+  StatsCollector::EnabledScope stats_scope(
+      heap(), StatsCollector::kMarkTransitiveClosure);
   do {
     if ((config_.marking_type == MarkingConfig::MarkingType::kAtomic) ||
         schedule_.ShouldFlushEphemeronPairs()) {
@@ -362,67 +413,91 @@ bool MarkerBase::ProcessWorklistsWithDeadline(
     // Bailout objects may be complicated to trace and thus might take longer
     // than other objects. Therefore we reduce the interval between deadline
     // checks to guarantee the deadline is not exceeded.
-    if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultDeadlineCheckInterval /
-                                               5>(
-            mutator_marking_state_, marked_bytes_deadline, time_deadline,
-            mutator_marking_state_.concurrent_marking_bailout_worklist(),
-            [this](const MarkingWorklists::ConcurrentMarkingBailoutItem& item) {
-              mutator_marking_state_.AccountMarkedBytes(item.bailedout_size);
-              item.callback(&visitor(), item.parameter);
-            })) {
-      return false;
+    {
+      StatsCollector::EnabledScope inner_scope(
+          heap(), StatsCollector::kMarkProcessBailOutObjects);
+      if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultDeadlineCheckInterval /
+                                                 5>(
+              mutator_marking_state_, marked_bytes_deadline, time_deadline,
+              mutator_marking_state_.concurrent_marking_bailout_worklist(),
+              [this](
+                  const MarkingWorklists::ConcurrentMarkingBailoutItem& item) {
+                mutator_marking_state_.AccountMarkedBytes(item.bailedout_size);
+                item.callback(&visitor(), item.parameter);
+              })) {
+        return false;
+      }
     }
 
-    if (!DrainWorklistWithBytesAndTimeDeadline(
-            mutator_marking_state_, marked_bytes_deadline, time_deadline,
-            mutator_marking_state_.previously_not_fully_constructed_worklist(),
-            [this](HeapObjectHeader* header) {
-              mutator_marking_state_.AccountMarkedBytes(*header);
-              DynamicallyTraceMarkedObject<AccessMode::kNonAtomic>(visitor(),
-                                                                   *header);
-            })) {
-      return false;
+    {
+      StatsCollector::EnabledScope inner_scope(
+          heap(), StatsCollector::kMarkProcessNotFullyconstructedWorklist);
+      if (!DrainWorklistWithBytesAndTimeDeadline(
+              mutator_marking_state_, marked_bytes_deadline, time_deadline,
+              mutator_marking_state_
+                  .previously_not_fully_constructed_worklist(),
+              [this](HeapObjectHeader* header) {
+                mutator_marking_state_.AccountMarkedBytes(*header);
+                DynamicallyTraceMarkedObject<AccessMode::kNonAtomic>(visitor(),
+                                                                     *header);
+              })) {
+        return false;
+      }
     }
 
-    if (!DrainWorklistWithBytesAndTimeDeadline(
-            mutator_marking_state_, marked_bytes_deadline, time_deadline,
-            mutator_marking_state_.marking_worklist(),
-            [this](const MarkingWorklists::MarkingItem& item) {
-              const HeapObjectHeader& header =
-                  HeapObjectHeader::FromPayload(item.base_object_payload);
-              DCHECK(!header.IsInConstruction<AccessMode::kNonAtomic>());
-              DCHECK(header.IsMarked<AccessMode::kNonAtomic>());
-              mutator_marking_state_.AccountMarkedBytes(header);
-              item.callback(&visitor(), item.base_object_payload);
-            })) {
-      return false;
+    {
+      StatsCollector::EnabledScope inner_scope(
+          heap(), StatsCollector::kMarkProcessMarkingWorklist);
+      if (!DrainWorklistWithBytesAndTimeDeadline(
+              mutator_marking_state_, marked_bytes_deadline, time_deadline,
+              mutator_marking_state_.marking_worklist(),
+              [this](const MarkingWorklists::MarkingItem& item) {
+                const HeapObjectHeader& header =
+                    HeapObjectHeader::FromPayload(item.base_object_payload);
+                DCHECK(!header.IsInConstruction<AccessMode::kNonAtomic>());
+                DCHECK(header.IsMarked<AccessMode::kNonAtomic>());
+                mutator_marking_state_.AccountMarkedBytes(header);
+                item.callback(&visitor(), item.base_object_payload);
+              })) {
+        return false;
+      }
     }
 
-    if (!DrainWorklistWithBytesAndTimeDeadline(
-            mutator_marking_state_, marked_bytes_deadline, time_deadline,
-            mutator_marking_state_.write_barrier_worklist(),
-            [this](HeapObjectHeader* header) {
-              mutator_marking_state_.AccountMarkedBytes(*header);
-              DynamicallyTraceMarkedObject<AccessMode::kNonAtomic>(visitor(),
-                                                                   *header);
-            })) {
-      return false;
+    {
+      StatsCollector::EnabledScope inner_scope(
+          heap(), StatsCollector::kMarkProcessWriteBarrierWorklist);
+      if (!DrainWorklistWithBytesAndTimeDeadline(
+              mutator_marking_state_, marked_bytes_deadline, time_deadline,
+              mutator_marking_state_.write_barrier_worklist(),
+              [this](HeapObjectHeader* header) {
+                mutator_marking_state_.AccountMarkedBytes(*header);
+                DynamicallyTraceMarkedObject<AccessMode::kNonAtomic>(visitor(),
+                                                                     *header);
+              })) {
+        return false;
+      }
     }
 
-    if (!DrainWorklistWithBytesAndTimeDeadline(
-            mutator_marking_state_, marked_bytes_deadline, time_deadline,
-            mutator_marking_state_.ephemeron_pairs_for_processing_worklist(),
-            [this](const MarkingWorklists::EphemeronPairItem& item) {
-              mutator_marking_state_.ProcessEphemeron(item.key,
-                                                      item.value_desc);
-            })) {
-      return false;
+    {
+      StatsCollector::EnabledScope stats_scope(
+          heap(), StatsCollector::kMarkProcessEphemerons);
+      if (!DrainWorklistWithBytesAndTimeDeadline(
+              mutator_marking_state_, marked_bytes_deadline, time_deadline,
+              mutator_marking_state_.ephemeron_pairs_for_processing_worklist(),
+              [this](const MarkingWorklists::EphemeronPairItem& item) {
+                mutator_marking_state_.ProcessEphemeron(item.key,
+                                                        item.value_desc);
+              })) {
+        return false;
+      }
     }
   } while (!mutator_marking_state_.marking_worklist().IsLocalAndGlobalEmpty());
   return true;
 }
 
 void MarkerBase::MarkNotFullyConstructedObjects() {
+  StatsCollector::DisabledScope stats_scope(
+      heap(), StatsCollector::kMarkVisitNotFullyConstructedObjects);
   std::unordered_set<HeapObjectHeader*> objects =
       mutator_marking_state_.not_fully_constructed_worklist().Extract();
   for (HeapObjectHeader* object : objects) {
diff --git a/deps/v8/src/heap/cppgc/marker.h b/deps/v8/src/heap/cppgc/marker.h
index 85a80272061ac0..97792b7504ef06 100644
--- a/deps/v8/src/heap/cppgc/marker.h
+++ b/deps/v8/src/heap/cppgc/marker.h
@@ -44,10 +44,10 @@ class V8_EXPORT_PRIVATE MarkerBase {
       kMajor,
     };
     using StackState = cppgc::Heap::StackState;
-    enum MarkingType : uint8_t {
-      kAtomic,
-      kIncremental,
-      kIncrementalAndConcurrent
+    using MarkingType = cppgc::Heap::MarkingType;
+    enum class IsForcedGC : uint8_t {
+      kNotForced,
+      kForced,
     };
 
     static constexpr MarkingConfig Default() { return {}; }
@@ -55,6 +55,7 @@ class V8_EXPORT_PRIVATE MarkerBase {
     const CollectionType collection_type = CollectionType::kMajor;
     StackState stack_state = StackState::kMayContainHeapPointers;
     MarkingType marking_type = MarkingType::kIncremental;
+    IsForcedGC is_forced_gc = IsForcedGC::kNotForced;
   };
 
   virtual ~MarkerBase();
@@ -98,7 +99,7 @@ class V8_EXPORT_PRIVATE MarkerBase {
   MutatorMarkingState& MutatorMarkingStateForTesting() {
     return mutator_marking_state_;
   }
-  cppgc::Visitor& VisitorForTesting() { return visitor(); }
+  cppgc::Visitor& Visitor() { return visitor(); }
   void ClearAllWorklistsForTesting();
 
   bool IncrementalMarkingStepForTesting(MarkingConfig::StackState);
diff --git a/deps/v8/src/heap/cppgc/marking-state.cc b/deps/v8/src/heap/cppgc/marking-state.cc
index 1796e67cbedbed..ec2d80b2f2ce56 100644
--- a/deps/v8/src/heap/cppgc/marking-state.cc
+++ b/deps/v8/src/heap/cppgc/marking-state.cc
@@ -6,6 +6,8 @@
 
 #include <unordered_set>
 
+#include "src/heap/cppgc/stats-collector.h"
+
 namespace cppgc {
 namespace internal {
 
@@ -19,6 +21,8 @@ void MutatorMarkingState::FlushNotFullyConstructedObjects() {
 }
 
 void MutatorMarkingState::FlushDiscoveredEphemeronPairs() {
+  StatsCollector::EnabledScope stats_scope(
+      heap_, StatsCollector::kMarkFlushEphemerons);
   discovered_ephemeron_pairs_worklist_.Publish();
   if (!discovered_ephemeron_pairs_worklist_.IsGlobalEmpty()) {
     ephemeron_pairs_for_processing_worklist_.Merge(
diff --git a/deps/v8/src/heap/cppgc/marking-state.h b/deps/v8/src/heap/cppgc/marking-state.h
index 777ee08e35ef3c..65185c36e2babe 100644
--- a/deps/v8/src/heap/cppgc/marking-state.h
+++ b/deps/v8/src/heap/cppgc/marking-state.h
@@ -5,6 +5,8 @@
 #ifndef V8_HEAP_CPPGC_MARKING_STATE_H_
 #define V8_HEAP_CPPGC_MARKING_STATE_H_
 
+#include <algorithm>
+
 #include "include/cppgc/trace-trait.h"
 #include "src/heap/cppgc/compaction-worklists.h"
 #include "src/heap/cppgc/globals.h"
@@ -118,9 +120,7 @@ class MarkingStateBase {
     return movable_slots_worklist_.get();
   }
 
-#ifdef DEBUG
   HeapBase& heap_;
-#endif  // DEBUG
 
   MarkingWorklists::MarkingWorklist::Local marking_worklist_;
   MarkingWorklists::NotFullyConstructedWorklist&
@@ -148,9 +148,7 @@ MarkingStateBase::MarkingStateBase(HeapBase& heap,
                                    MarkingWorklists& marking_worklists,
                                    CompactionWorklists* compaction_worklists)
     :
-#ifdef DEBUG
       heap_(heap),
-#endif  // DEBUG
       marking_worklist_(marking_worklists.marking_worklist()),
       not_fully_constructed_worklist_(
           *marking_worklists.not_fully_constructed_worklist()),
@@ -317,11 +315,28 @@ class MutatorMarkingState : public MarkingStateBase {
                                               WeakCallback, const void*);
 
   inline bool IsMarkedWeakContainer(HeapObjectHeader&);
+
+ private:
+  // Weak containers are strongly retraced during conservative stack scanning.
+  // Stack scanning happens once per GC at the start of the atomic pause.
+  // Because the visitor is not retained between GCs, there is no need to clear
+  // the set at the end of GC.
+  class RecentlyRetracedWeakContainers {
+    static constexpr size_t kMaxCacheSize = 8;
+
+   public:
+    inline bool Contains(const HeapObjectHeader*);
+    inline void Insert(const HeapObjectHeader*);
+
+   private:
+    std::vector<const HeapObjectHeader*> recently_retraced_cache_;
+    size_t last_used_index_ = -1;
+  } recently_retraced_weak_containers_;
 };
 
 void MutatorMarkingState::PushMarkedWeakContainer(HeapObjectHeader& header) {
   DCHECK(weak_containers_worklist_.Contains(&header));
-  weak_containers_worklist_.Erase(&header);
+  recently_retraced_weak_containers_.Insert(&header);
   PushMarked(
       header,
       {header.Payload(),
@@ -354,11 +369,29 @@ void MutatorMarkingState::InvokeWeakRootsCallbackIfNeeded(
 }
 
 bool MutatorMarkingState::IsMarkedWeakContainer(HeapObjectHeader& header) {
-  const bool result = weak_containers_worklist_.Contains(&header);
+  const bool result = weak_containers_worklist_.Contains(&header) &&
+                      !recently_retraced_weak_containers_.Contains(&header);
   DCHECK_IMPLIES(result, header.IsMarked());
+  DCHECK_IMPLIES(result, !header.IsInConstruction());
   return result;
 }
 
+bool MutatorMarkingState::RecentlyRetracedWeakContainers::Contains(
+    const HeapObjectHeader* header) {
+  return std::find(recently_retraced_cache_.begin(),
+                   recently_retraced_cache_.end(),
+                   header) != recently_retraced_cache_.end();
+}
+
+void MutatorMarkingState::RecentlyRetracedWeakContainers::Insert(
+    const HeapObjectHeader* header) {
+  last_used_index_ = (last_used_index_ + 1) % kMaxCacheSize;
+  if (recently_retraced_cache_.size() <= last_used_index_)
+    recently_retraced_cache_.push_back(header);
+  else
+    recently_retraced_cache_[last_used_index_] = header;
+}
+
 class ConcurrentMarkingState : public MarkingStateBase {
  public:
   ConcurrentMarkingState(HeapBase& heap, MarkingWorklists& marking_worklists,
diff --git a/deps/v8/src/heap/cppgc/marking-worklists.h b/deps/v8/src/heap/cppgc/marking-worklists.h
index c769a14fb78499..de7e44e4da88bd 100644
--- a/deps/v8/src/heap/cppgc/marking-worklists.h
+++ b/deps/v8/src/heap/cppgc/marking-worklists.h
@@ -22,8 +22,6 @@ class MarkingWorklists {
     template <AccessMode = AccessMode::kNonAtomic>
     void Push(HeapObjectHeader*);
     template <AccessMode = AccessMode::kNonAtomic>
-    void Erase(HeapObjectHeader*);
-    template <AccessMode = AccessMode::kNonAtomic>
     bool Contains(HeapObjectHeader*);
     template <AccessMode = AccessMode::kNonAtomic>
     std::unordered_set<HeapObjectHeader*> Extract();
@@ -150,14 +148,6 @@ void MarkingWorklists::ExternalMarkingWorklist::Push(HeapObjectHeader* object) {
   objects_.insert(object);
 }
 
-template <AccessMode mode>
-void MarkingWorklists::ExternalMarkingWorklist::Erase(
-    HeapObjectHeader* object) {
-  DCHECK_NOT_NULL(object);
-  ConditionalMutexGuard<mode> guard(&lock_);
-  objects_.erase(object);
-}
-
 template <AccessMode mode>
 bool MarkingWorklists::ExternalMarkingWorklist::Contains(
     HeapObjectHeader* object) {
diff --git a/deps/v8/src/heap/cppgc/object-allocator.cc b/deps/v8/src/heap/cppgc/object-allocator.cc
index fdc50d0caba9fc..1f63c1a104b57a 100644
--- a/deps/v8/src/heap/cppgc/object-allocator.cc
+++ b/deps/v8/src/heap/cppgc/object-allocator.cc
@@ -134,7 +134,11 @@ void* ObjectAllocator::OutOfLineAllocateImpl(NormalPageSpace* space,
 
   // 3. Lazily sweep pages of this heap until we find a freed area for
   // this allocation or we finish sweeping all pages of this heap.
-  // TODO(chromium:1056170): Add lazy sweep.
+  // {
+  //   StatsCollector::EnabledScope stats_scope(
+  //       *space->raw_heap()->heap(), StatsCollector::kSweepOnAllocation);
+  //   // TODO(chromium:1056170): Add lazy sweep.
+  // }
 
   // 4. Complete sweeping.
   raw_heap_->heap()->sweeper().FinishIfRunning();
diff --git a/deps/v8/src/heap/cppgc/object-allocator.h b/deps/v8/src/heap/cppgc/object-allocator.h
index 5c857d2478387f..7516c7576e9ad6 100644
--- a/deps/v8/src/heap/cppgc/object-allocator.h
+++ b/deps/v8/src/heap/cppgc/object-allocator.h
@@ -33,7 +33,7 @@ class V8_EXPORT_PRIVATE ObjectAllocator final : public cppgc::AllocationHandle {
  public:
   // NoAllocationScope is used in debug mode to catch unwanted allocations. E.g.
   // allocations during GC.
-  class V8_EXPORT_PRIVATE NoAllocationScope final {
+  class V8_EXPORT_PRIVATE V8_NODISCARD NoAllocationScope final {
     CPPGC_STACK_ALLOCATED();
 
    public:
diff --git a/deps/v8/src/heap/cppgc/platform.cc b/deps/v8/src/heap/cppgc/platform.cc
index e96d69b22570a2..4d64951588ebae 100644
--- a/deps/v8/src/heap/cppgc/platform.cc
+++ b/deps/v8/src/heap/cppgc/platform.cc
@@ -4,11 +4,17 @@
 
 #include "include/cppgc/platform.h"
 
+#include "src/base/lazy-instance.h"
 #include "src/base/platform/platform.h"
 #include "src/heap/cppgc/gc-info-table.h"
 
 namespace cppgc {
 
+TracingController* Platform::GetTracingController() {
+  static v8::base::LeakyObject<TracingController> tracing_controller;
+  return tracing_controller.get();
+}
+
 void InitializeProcess(PageAllocator* page_allocator) {
   internal::GlobalGCInfoTable::Create(page_allocator);
 }
diff --git a/deps/v8/src/heap/cppgc/prefinalizer-handler.cc b/deps/v8/src/heap/cppgc/prefinalizer-handler.cc
index c20b5ec7213b4a..1cfa5c7163388e 100644
--- a/deps/v8/src/heap/cppgc/prefinalizer-handler.cc
+++ b/deps/v8/src/heap/cppgc/prefinalizer-handler.cc
@@ -11,6 +11,7 @@
 #include "src/heap/cppgc/heap-page.h"
 #include "src/heap/cppgc/heap.h"
 #include "src/heap/cppgc/liveness-broker.h"
+#include "src/heap/cppgc/stats-collector.h"
 
 namespace cppgc {
 namespace internal {
@@ -29,9 +30,11 @@ bool PreFinalizerRegistrationDispatcher::PreFinalizer::operator==(
   return (object == other.object) && (callback == other.callback);
 }
 
-PreFinalizerHandler::PreFinalizerHandler()
+PreFinalizerHandler::PreFinalizerHandler(HeapBase& heap)
+    : heap_(heap)
 #ifdef DEBUG
-    : creation_thread_id_(v8::base::OS::GetCurrentThreadId())
+      ,
+      creation_thread_id_(v8::base::OS::GetCurrentThreadId())
 #endif
 {
 }
@@ -45,6 +48,9 @@ void PreFinalizerHandler::RegisterPrefinalizer(PreFinalizer pre_finalizer) {
 }
 
 void PreFinalizerHandler::InvokePreFinalizers() {
+  StatsCollector::DisabledScope stats_scope(
+      heap_, StatsCollector::kSweepInvokePreFinalizers);
+
   DCHECK(CurrentThreadIsCreationThread());
   LivenessBroker liveness_broker = LivenessBrokerFactory::Create();
   ordered_pre_finalizers_.erase(
diff --git a/deps/v8/src/heap/cppgc/prefinalizer-handler.h b/deps/v8/src/heap/cppgc/prefinalizer-handler.h
index 15d24e862cf17b..c18e487fb4a400 100644
--- a/deps/v8/src/heap/cppgc/prefinalizer-handler.h
+++ b/deps/v8/src/heap/cppgc/prefinalizer-handler.h
@@ -12,12 +12,14 @@
 namespace cppgc {
 namespace internal {
 
+class HeapBase;
+
 class PreFinalizerHandler final {
  public:
   using PreFinalizer =
       cppgc::internal::PreFinalizerRegistrationDispatcher::PreFinalizer;
 
-  PreFinalizerHandler();
+  explicit PreFinalizerHandler(HeapBase& heap);
 
   void RegisterPrefinalizer(PreFinalizer pre_finalizer);
 
@@ -33,6 +35,7 @@ class PreFinalizerHandler final {
   // back-to-front.
   std::vector<PreFinalizer> ordered_pre_finalizers_;
 
+  HeapBase& heap_;
 #ifdef DEBUG
   int creation_thread_id_;
 #endif
diff --git a/deps/v8/src/heap/cppgc/stats-collector.cc b/deps/v8/src/heap/cppgc/stats-collector.cc
index dd6d6788773308..8753d96bdd2173 100644
--- a/deps/v8/src/heap/cppgc/stats-collector.cc
+++ b/deps/v8/src/heap/cppgc/stats-collector.cc
@@ -71,8 +71,16 @@ void StatsCollector::AllocatedObjectSizeSafepointImpl() {
   explicitly_freed_bytes_since_safepoint_ = 0;
 }
 
-void StatsCollector::NotifyMarkingStarted() {
+StatsCollector::Event::Event() {
+  static std::atomic<size_t> epoch_counter{0};
+  epoch = epoch_counter.fetch_add(1);
+}
+
+void StatsCollector::NotifyMarkingStarted(CollectionType collection_type,
+                                          IsForcedGC is_forced_gc) {
   DCHECK_EQ(GarbageCollectionState::kNotRunning, gc_state_);
+  current_.collection_type = collection_type;
+  current_.is_forced_gc = is_forced_gc;
   gc_state_ = GarbageCollectionState::kMarking;
 }
 
@@ -101,12 +109,11 @@ double StatsCollector::GetRecentAllocationSpeedInBytesPerMs() const {
          (current_time - time_of_last_end_of_marking_).InMillisecondsF();
 }
 
-const StatsCollector::Event& StatsCollector::NotifySweepingCompleted() {
+void StatsCollector::NotifySweepingCompleted() {
   DCHECK_EQ(GarbageCollectionState::kSweeping, gc_state_);
   gc_state_ = GarbageCollectionState::kNotRunning;
   previous_ = std::move(current_);
   current_ = Event();
-  return previous_;
 }
 
 size_t StatsCollector::allocated_object_size() const {
diff --git a/deps/v8/src/heap/cppgc/stats-collector.h b/deps/v8/src/heap/cppgc/stats-collector.h
index 795832ba478ab3..29e9c63f880f9b 100644
--- a/deps/v8/src/heap/cppgc/stats-collector.h
+++ b/deps/v8/src/heap/cppgc/stats-collector.h
@@ -12,22 +12,186 @@
 
 #include "src/base/macros.h"
 #include "src/base/platform/time.h"
+#include "src/heap/cppgc/garbage-collector.h"
+#include "src/heap/cppgc/heap-base.h"
+#include "src/heap/cppgc/trace-event.h"
 
 namespace cppgc {
 namespace internal {
 
+#define CPPGC_FOR_ALL_SCOPES(V)             \
+  V(AtomicMark)                             \
+  V(AtomicSweep)                            \
+  V(AtomicCompact)                          \
+  V(IncrementalMark)                        \
+  V(IncrementalSweep)                       \
+  V(MarkIncrementalStart)                   \
+  V(MarkIncrementalFinalize)                \
+  V(MarkAtomicPrologue)                     \
+  V(MarkAtomicEpilogue)                     \
+  V(MarkTransitiveClosure)                  \
+  V(MarkTransitiveClosureWithDeadline)      \
+  V(MarkFlushEphemerons)                    \
+  V(MarkProcessBailOutObjects)              \
+  V(MarkProcessMarkingWorklist)             \
+  V(MarkProcessWriteBarrierWorklist)        \
+  V(MarkProcessNotFullyconstructedWorklist) \
+  V(MarkProcessEphemerons)                  \
+  V(MarkVisitRoots)                         \
+  V(MarkVisitNotFullyConstructedObjects)    \
+  V(MarkVisitPersistents)                   \
+  V(MarkVisitCrossThreadPersistents)        \
+  V(MarkVisitStack)                         \
+  V(MarkVisitRememberedSets)                \
+  V(WeakInvokeCallbacks)                    \
+  V(SweepInvokePreFinalizers)               \
+  V(SweepIdleStep)                          \
+  V(SweepOnAllocation)                      \
+  V(SweepFinalize)
+
+#define CPPGC_FOR_ALL_CONCURRENT_SCOPES(V) \
+  V(ConcurrentMarkProcessEphemerons)       \
+  V(ConcurrentMark)                        \
+  V(ConcurrentSweep)
+
 // Sink for various time and memory statistics.
 class V8_EXPORT_PRIVATE StatsCollector final {
+  using CollectionType = GarbageCollector::Config::CollectionType;
+  using IsForcedGC = GarbageCollector::Config::IsForcedGC;
+
  public:
+#if defined(CPPGC_DECLARE_ENUM)
+  static_assert(false, "CPPGC_DECLARE_ENUM macro is already defined");
+#endif
+
+  enum ScopeId {
+#define CPPGC_DECLARE_ENUM(name) k##name,
+    CPPGC_FOR_ALL_SCOPES(CPPGC_DECLARE_ENUM)
+#undef CPPGC_DECLARE_ENUM
+        kNumScopeIds,
+  };
+
+  enum ConcurrentScopeId {
+#define CPPGC_DECLARE_ENUM(name) k##name,
+    CPPGC_FOR_ALL_CONCURRENT_SCOPES(CPPGC_DECLARE_ENUM)
+#undef CPPGC_DECLARE_ENUM
+        kNumConcurrentScopeIds
+  };
+
   // POD to hold interesting data accumulated during a garbage collection cycle.
   //
   // The event is always fully populated when looking at previous events but
   // may only be partially populated when looking at the current event.
   struct Event final {
+    V8_EXPORT_PRIVATE explicit Event();
+
+    v8::base::TimeDelta scope_data[kNumScopeIds];
+    v8::base::Atomic32 concurrent_scope_data[kNumConcurrentScopeIds]{0};
+
+    size_t epoch = -1;
+    CollectionType collection_type = CollectionType::kMajor;
+    IsForcedGC is_forced_gc = IsForcedGC::kNotForced;
     // Marked bytes collected during marking.
     size_t marked_bytes = 0;
   };
 
+ private:
+#if defined(CPPGC_CASE)
+  static_assert(false, "CPPGC_CASE macro is already defined");
+#endif
+
+  constexpr static const char* GetScopeName(ScopeId id, CollectionType type) {
+    switch (id) {
+#define CPPGC_CASE(name)                                   \
+  case k##name:                                            \
+    return type == CollectionType::kMajor ? "CppGC." #name \
+                                          : "CppGC." #name ".Minor";
+      CPPGC_FOR_ALL_SCOPES(CPPGC_CASE)
+#undef CPPGC_CASE
+      default:
+        return nullptr;
+    }
+  }
+
+  constexpr static const char* GetScopeName(ConcurrentScopeId id,
+                                            CollectionType type) {
+    switch (id) {
+#define CPPGC_CASE(name)                                   \
+  case k##name:                                            \
+    return type == CollectionType::kMajor ? "CppGC." #name \
+                                          : "CppGC." #name ".Minor";
+      CPPGC_FOR_ALL_CONCURRENT_SCOPES(CPPGC_CASE)
+#undef CPPGC_CASE
+      default:
+        return nullptr;
+    }
+  }
+
+  enum TraceCategory { kEnabled, kDisabled };
+  enum ScopeContext { kMutatorThread, kConcurrentThread };
+
+  // Trace a particular scope. Will emit a trace event and record the time in
+  // the corresponding StatsCollector.
+  template <TraceCategory trace_category, ScopeContext scope_category>
+  class V8_NODISCARD InternalScope {
+    using ScopeIdType = std::conditional_t<scope_category == kMutatorThread,
+                                           ScopeId, ConcurrentScopeId>;
+
+   public:
+    template <typename... Args>
+    InternalScope(HeapBase& heap, ScopeIdType scope_id, Args... args)
+        : heap_(heap),
+          stats_collector_(heap_.stats_collector()),
+          start_time_(v8::base::TimeTicks::Now()),
+          scope_id_(scope_id) {
+      DCHECK_LE(0, scope_id_);
+      DCHECK_LT(static_cast<int>(scope_id_),
+                scope_category == kMutatorThread
+                    ? static_cast<int>(kNumScopeIds)
+                    : static_cast<int>(kNumConcurrentScopeIds));
+      StartTrace(args...);
+    }
+
+    ~InternalScope() {
+      StopTrace();
+      IncreaseScopeTime();
+    }
+
+    InternalScope(const InternalScope&) = delete;
+    InternalScope& operator=(const InternalScope&) = delete;
+
+   private:
+    void* operator new(size_t, void*) = delete;
+    void* operator new(size_t) = delete;
+
+    inline constexpr static const char* TraceCategory();
+
+    template <typename... Args>
+    inline void StartTrace(Args... args);
+    inline void StopTrace();
+
+    inline void StartTraceImpl();
+    template <typename Value1>
+    inline void StartTraceImpl(const char* k1, Value1 v1);
+    template <typename Value1, typename Value2>
+    inline void StartTraceImpl(const char* k1, Value1 v1, const char* k2,
+                               Value2 v2);
+    inline void StopTraceImpl();
+
+    inline void IncreaseScopeTime();
+
+    HeapBase& heap_;
+    StatsCollector* const stats_collector_;
+    const v8::base::TimeTicks start_time_;
+    const ScopeIdType scope_id_;
+  };
+
+ public:
+  using DisabledScope = InternalScope<kDisabled, kMutatorThread>;
+  using EnabledScope = InternalScope<kEnabled, kMutatorThread>;
+  using DisabledConcurrentScope = InternalScope<kDisabled, kConcurrentThread>;
+  using EnabledConcurrentScope = InternalScope<kEnabled, kConcurrentThread>;
+
   // Observer for allocated object size. May be used to implement heap growing
   // heuristics.
   class AllocationObserver {
@@ -68,13 +232,13 @@ class V8_EXPORT_PRIVATE StatsCollector final {
   void NotifySafePointForConservativeCollection();
 
   // Indicates a new garbage collection cycle.
-  void NotifyMarkingStarted();
+  void NotifyMarkingStarted(CollectionType, IsForcedGC);
   // Indicates that marking of the current garbage collection cycle is
   // completed.
   void NotifyMarkingCompleted(size_t marked_bytes);
   // Indicates the end of a garbage collection cycle. This means that sweeping
   // is finished at this point.
-  const Event& NotifySweepingCompleted();
+  void NotifySweepingCompleted();
 
   // Size of live objects in bytes  on the heap. Based on the most recent marked
   // bytes and the bytes allocated since last marking.
@@ -82,6 +246,8 @@ class V8_EXPORT_PRIVATE StatsCollector final {
 
   double GetRecentAllocationSpeedInBytesPerMs() const;
 
+  const Event& GetPreviousEventForTesting() const { return previous_; }
+
  private:
   enum class GarbageCollectionState : uint8_t {
     kNotRunning,
@@ -128,6 +294,97 @@ void StatsCollector::ForAllAllocationObservers(Callback callback) {
   }
 }
 
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+constexpr const char*
+StatsCollector::InternalScope<trace_category, scope_category>::TraceCategory() {
+  switch (trace_category) {
+    case kEnabled:
+      return "cppgc";
+    case kDisabled:
+      return TRACE_DISABLED_BY_DEFAULT("cppgc");
+  }
+}
+
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+template <typename... Args>
+void StatsCollector::InternalScope<trace_category, scope_category>::StartTrace(
+    Args... args) {
+  if (trace_category == StatsCollector::TraceCategory::kEnabled)
+    StartTraceImpl(args...);
+}
+
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+void StatsCollector::InternalScope<trace_category,
+                                   scope_category>::StopTrace() {
+  if (trace_category == StatsCollector::TraceCategory::kEnabled)
+    StopTraceImpl();
+}
+
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+void StatsCollector::InternalScope<trace_category,
+                                   scope_category>::StartTraceImpl() {
+  TRACE_EVENT_BEGIN0(
+      TraceCategory(),
+      GetScopeName(scope_id_, stats_collector_->current_.collection_type));
+}
+
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+template <typename Value1>
+void StatsCollector::InternalScope<
+    trace_category, scope_category>::StartTraceImpl(const char* k1, Value1 v1) {
+  TRACE_EVENT_BEGIN1(
+      TraceCategory(),
+      GetScopeName(scope_id_, stats_collector_->current_.collection_type), k1,
+      v1);
+}
+
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+template <typename Value1, typename Value2>
+void StatsCollector::InternalScope<
+    trace_category, scope_category>::StartTraceImpl(const char* k1, Value1 v1,
+                                                    const char* k2, Value2 v2) {
+  TRACE_EVENT_BEGIN2(
+      TraceCategory(),
+      GetScopeName(scope_id_, stats_collector_->current_.collection_type), k1,
+      v1, k2, v2);
+}
+
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+void StatsCollector::InternalScope<trace_category,
+                                   scope_category>::StopTraceImpl() {
+  TRACE_EVENT_END2(
+      TraceCategory(),
+      GetScopeName(scope_id_, stats_collector_->current_.collection_type),
+      "epoch", stats_collector_->current_.epoch, "forced",
+      stats_collector_->current_.is_forced_gc == IsForcedGC::kForced);
+}
+
+template <StatsCollector::TraceCategory trace_category,
+          StatsCollector::ScopeContext scope_category>
+void StatsCollector::InternalScope<trace_category,
+                                   scope_category>::IncreaseScopeTime() {
+  DCHECK_NE(GarbageCollectionState::kNotRunning, stats_collector_->gc_state_);
+  v8::base::TimeDelta time = v8::base::TimeTicks::Now() - start_time_;
+  if (scope_category == StatsCollector::ScopeContext::kMutatorThread) {
+    stats_collector_->current_.scope_data[scope_id_] += time;
+    return;
+  }
+  // scope_category == StatsCollector::ScopeContext::kConcurrentThread
+  using Atomic32 = v8::base::Atomic32;
+  const int64_t ms = time.InMicroseconds();
+  DCHECK(ms <= std::numeric_limits<Atomic32>::max());
+  v8::base::Relaxed_AtomicIncrement(
+      &stats_collector_->current_.concurrent_scope_data[scope_id_],
+      static_cast<Atomic32>(ms));
+}
+
 }  // namespace internal
 }  // namespace cppgc
 
diff --git a/deps/v8/src/heap/cppgc/sweeper.cc b/deps/v8/src/heap/cppgc/sweeper.cc
index 5b28d3659c859f..d4880d72ddc36e 100644
--- a/deps/v8/src/heap/cppgc/sweeper.cc
+++ b/deps/v8/src/heap/cppgc/sweeper.cc
@@ -13,6 +13,7 @@
 #include "src/base/platform/mutex.h"
 #include "src/heap/cppgc/free-list.h"
 #include "src/heap/cppgc/globals.h"
+#include "src/heap/cppgc/heap-base.h"
 #include "src/heap/cppgc/heap-object-header.h"
 #include "src/heap/cppgc/heap-page.h"
 #include "src/heap/cppgc/heap-space.h"
@@ -391,9 +392,13 @@ class ConcurrentSweepTask final : public cppgc::JobTask,
   friend class HeapVisitor<ConcurrentSweepTask>;
 
  public:
-  explicit ConcurrentSweepTask(SpaceStates* states) : states_(states) {}
+  explicit ConcurrentSweepTask(HeapBase& heap, SpaceStates* states)
+      : heap_(heap), states_(states) {}
 
   void Run(cppgc::JobDelegate* delegate) final {
+    StatsCollector::EnabledConcurrentScope stats_scope(
+        heap_, StatsCollector::kConcurrentSweep);
+
     for (SpaceState& state : *states_) {
       while (auto page = state.unswept_pages.Pop()) {
         Traverse(*page);
@@ -437,6 +442,7 @@ class ConcurrentSweepTask final : public cppgc::JobTask,
     return true;
   }
 
+  HeapBase& heap_;
   SpaceStates* states_;
   std::atomic_bool is_completed_{false};
 };
@@ -496,6 +502,8 @@ class Sweeper::SweeperImpl final {
   ~SweeperImpl() { CancelSweepers(); }
 
   void Start(SweepingConfig config) {
+    StatsCollector::EnabledScope stats_scope(*heap_->heap(),
+                                             StatsCollector::kAtomicSweep);
     is_in_progress_ = true;
 #if DEBUG
     // Verify bitmap for all spaces regardless of |compactable_space_handling|.
@@ -517,12 +525,19 @@ class Sweeper::SweeperImpl final {
   void FinishIfRunning() {
     if (!is_in_progress_) return;
 
-    if (concurrent_sweeper_handle_ && concurrent_sweeper_handle_->IsValid() &&
-        concurrent_sweeper_handle_->UpdatePriorityEnabled()) {
-      concurrent_sweeper_handle_->UpdatePriority(
-          cppgc::TaskPriority::kUserBlocking);
+    {
+      StatsCollector::EnabledScope stats_scope(
+          *heap_->heap(), StatsCollector::kIncrementalSweep);
+      StatsCollector::EnabledScope inner_scope(*heap_->heap(),
+                                               StatsCollector::kSweepFinalize);
+      if (concurrent_sweeper_handle_ && concurrent_sweeper_handle_->IsValid() &&
+          concurrent_sweeper_handle_->UpdatePriorityEnabled()) {
+        concurrent_sweeper_handle_->UpdatePriority(
+            cppgc::TaskPriority::kUserBlocking);
+      }
+      Finish();
     }
-    Finish();
+    NotifyDone();
   }
 
   void Finish() {
@@ -536,12 +551,28 @@ class Sweeper::SweeperImpl final {
     MutatorThreadSweeper sweeper(&space_states_, platform_);
     sweeper.Sweep();
 
+    FinalizeSweep();
+  }
+
+  void FinalizeSweep() {
     // Synchronize with the concurrent sweeper and call remaining finalizers.
     SynchronizeAndFinalizeConcurrentSweeping();
-
     is_in_progress_ = false;
+    notify_done_pending_ = true;
+  }
 
+  void NotifyDone() {
+    DCHECK(!is_in_progress_);
+    DCHECK(notify_done_pending_);
+    notify_done_pending_ = false;
     stats_collector_->NotifySweepingCompleted();
+    // Notify the heap that GC is finished.
+    heap_->heap()->PostGarbageCollection();
+  }
+
+  void NotifyDoneIfNeeded() {
+    if (!notify_done_pending_) return;
+    NotifyDone();
   }
 
   void WaitForConcurrentSweepingForTesting() {
@@ -567,16 +598,29 @@ class Sweeper::SweeperImpl final {
     void Run(double deadline_in_seconds) override {
       if (handle_.IsCanceled() || !sweeper_->is_in_progress_) return;
 
-      MutatorThreadSweeper sweeper(&sweeper_->space_states_,
-                                   sweeper_->platform_);
-      const bool sweep_complete =
-          sweeper.SweepWithDeadline(deadline_in_seconds);
-
-      if (sweep_complete) {
-        sweeper_->SynchronizeAndFinalizeConcurrentSweeping();
-      } else {
-        sweeper_->ScheduleIncrementalSweeping();
+      bool sweep_complete;
+      {
+        StatsCollector::EnabledScope stats_scope(
+            *sweeper_->heap_->heap(), StatsCollector::kIncrementalSweep);
+
+        MutatorThreadSweeper sweeper(&sweeper_->space_states_,
+                                     sweeper_->platform_);
+        {
+          StatsCollector::EnabledScope stats_scope(
+              *sweeper_->heap_->heap(), StatsCollector::kSweepIdleStep,
+              "idleDeltaInSeconds",
+              (deadline_in_seconds -
+               sweeper_->platform_->MonotonicallyIncreasingTime()));
+
+          sweep_complete = sweeper.SweepWithDeadline(deadline_in_seconds);
+        }
+        if (sweep_complete) {
+          sweeper_->FinalizeSweep();
+        } else {
+          sweeper_->ScheduleIncrementalSweeping();
+        }
       }
+      if (sweep_complete) sweeper_->NotifyDone();
     }
 
     Handle GetHandle() const { return handle_; }
@@ -601,7 +645,7 @@ class Sweeper::SweeperImpl final {
 
     concurrent_sweeper_handle_ = platform_->PostJob(
         cppgc::TaskPriority::kUserVisible,
-        std::make_unique<ConcurrentSweepTask>(&space_states_));
+        std::make_unique<ConcurrentSweepTask>(*heap_->heap(), &space_states_));
   }
 
   void CancelSweepers() {
@@ -625,6 +669,7 @@ class Sweeper::SweeperImpl final {
   IncrementalSweepTask::Handle incremental_sweeper_handle_;
   std::unique_ptr<cppgc::JobHandle> concurrent_sweeper_handle_;
   bool is_in_progress_ = false;
+  bool notify_done_pending_ = false;
 };
 
 Sweeper::Sweeper(RawHeap* heap, cppgc::Platform* platform,
@@ -638,6 +683,7 @@ void Sweeper::FinishIfRunning() { impl_->FinishIfRunning(); }
 void Sweeper::WaitForConcurrentSweepingForTesting() {
   impl_->WaitForConcurrentSweepingForTesting();
 }
+void Sweeper::NotifyDoneIfNeeded() { impl_->NotifyDoneIfNeeded(); }
 
 }  // namespace internal
 }  // namespace cppgc
diff --git a/deps/v8/src/heap/cppgc/sweeper.h b/deps/v8/src/heap/cppgc/sweeper.h
index cb5824cc8c1b20..053b0035c39051 100644
--- a/deps/v8/src/heap/cppgc/sweeper.h
+++ b/deps/v8/src/heap/cppgc/sweeper.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "include/cppgc/heap.h"
 #include "src/base/macros.h"
 
 namespace cppgc {
@@ -22,7 +23,7 @@ class ConcurrentSweeperTest;
 class V8_EXPORT_PRIVATE Sweeper final {
  public:
   struct SweepingConfig {
-    enum class SweepingType : uint8_t { kAtomic, kIncrementalAndConcurrent };
+    using SweepingType = cppgc::Heap::SweepingType;
     enum class CompactableSpaceHandling { kSweep, kIgnore };
 
     SweepingType sweeping_type = SweepingType::kIncrementalAndConcurrent;
@@ -39,6 +40,7 @@ class V8_EXPORT_PRIVATE Sweeper final {
   // Sweeper::Start assumes the heap holds no linear allocation buffers.
   void Start(SweepingConfig);
   void FinishIfRunning();
+  void NotifyDoneIfNeeded();
 
  private:
   void WaitForConcurrentSweepingForTesting();
diff --git a/deps/v8/src/heap/cppgc/trace-event.h b/deps/v8/src/heap/cppgc/trace-event.h
new file mode 100644
index 00000000000000..69b18888cf50d9
--- /dev/null
+++ b/deps/v8/src/heap/cppgc/trace-event.h
@@ -0,0 +1,242 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_HEAP_CPPGC_TRACE_EVENT_H_
+#define V8_HEAP_CPPGC_TRACE_EVENT_H_
+
+#if !CPPGC_IS_STANDALONE
+#include "src/tracing/trace-event.h"
+using ConvertableToTraceFormat = v8::ConvertableToTraceFormat;
+#else
+// This is a subset of stc/tracing/trace-event.h required to support
+// tracing in the cppgc standalone library using TracingController.
+
+#include "base/trace_event/common/trace_event_common.h"
+#include "include/cppgc/platform.h"
+#include "src/base/atomicops.h"
+#include "src/base/macros.h"
+
+// This header file defines implementation details of how the trace macros in
+// trace_event_common.h collect and store trace events. Anything not
+// implementation-specific should go in trace_macros_common.h instead of here.
+
+// The pointer returned from GetCategoryGroupEnabled() points to a
+// value with zero or more of the following bits. Used in this class only.
+// The TRACE_EVENT macros should only use the value as a bool.
+// These values must be in sync with macro values in trace_log.h in
+// chromium.
+enum CategoryGroupEnabledFlags {
+  // Category group enabled for the recording mode.
+  kEnabledForRecording_CategoryGroupEnabledFlags = 1 << 0,
+  // Category group enabled by SetEventCallbackEnabled().
+  kEnabledForEventCallback_CategoryGroupEnabledFlags = 1 << 2,
+};
+
+#define INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE() \
+  TRACE_EVENT_API_LOAD_CATEGORY_GROUP_ENABLED() &                        \
+      (kEnabledForRecording_CategoryGroupEnabledFlags |                  \
+       kEnabledForEventCallback_CategoryGroupEnabledFlags)
+
+////////////////////////////////////////////////////////////////////////////////
+// Implementation specific tracing API definitions.
+
+// Get a pointer to the enabled state of the given trace category. Only
+// long-lived literal strings should be given as the category group. The
+// returned pointer can be held permanently in a local static for example. If
+// the unsigned char is non-zero, tracing is enabled. If tracing is enabled,
+// TRACE_EVENT_API_ADD_TRACE_EVENT can be called. It's OK if tracing is disabled
+// between the load of the tracing state and the call to
+// TRACE_EVENT_API_ADD_TRACE_EVENT, because this flag only provides an early out
+// for best performance when tracing is disabled.
+// const uint8_t*
+//     TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(const char* category_group)
+#define TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED \
+  platform->GetTracingController()->GetCategoryGroupEnabled
+
+// Add a trace event to the platform tracing system.
+// uint64_t TRACE_EVENT_API_ADD_TRACE_EVENT(
+//                    char phase,
+//                    const uint8_t* category_group_enabled,
+//                    const char* name,
+//                    const char* scope,
+//                    uint64_t id,
+//                    uint64_t bind_id,
+//                    int num_args,
+//                    const char** arg_names,
+//                    const uint8_t* arg_types,
+//                    const uint64_t* arg_values,
+//                    unsigned int flags)
+#define TRACE_EVENT_API_ADD_TRACE_EVENT cppgc::internal::AddTraceEventImpl
+
+// Defines atomic operations used internally by the tracing system.
+#define TRACE_EVENT_API_ATOMIC_WORD v8::base::AtomicWord
+#define TRACE_EVENT_API_ATOMIC_LOAD(var) v8::base::Relaxed_Load(&(var))
+#define TRACE_EVENT_API_ATOMIC_STORE(var, value) \
+  v8::base::Relaxed_Store(&(var), (value))
+#define TRACE_EVENT_API_LOAD_CATEGORY_GROUP_ENABLED()                \
+  v8::base::Relaxed_Load(reinterpret_cast<const v8::base::Atomic8*>( \
+      INTERNAL_TRACE_EVENT_UID(category_group_enabled)))
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Implementation detail: trace event macros create temporary variables
+// to keep instrumentation overhead low. These macros give each temporary
+// variable a unique name based on the line number to prevent name collisions.
+#define INTERNAL_TRACE_EVENT_UID3(a, b) cppgc_trace_event_unique_##a##b
+#define INTERNAL_TRACE_EVENT_UID2(a, b) INTERNAL_TRACE_EVENT_UID3(a, b)
+#define INTERNAL_TRACE_EVENT_UID(name_prefix) \
+  INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__)
+
+// Implementation detail: internal macro to create static category.
+// No barriers are needed, because this code is designed to operate safely
+// even when the unsigned char* points to garbage data (which may be the case
+// on processors without cache coherency).
+#define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO_CUSTOM_VARIABLES(             \
+    category_group, atomic, category_group_enabled)                          \
+  category_group_enabled =                                                   \
+      reinterpret_cast<const uint8_t*>(TRACE_EVENT_API_ATOMIC_LOAD(atomic)); \
+  if (!category_group_enabled) {                                             \
+    category_group_enabled =                                                 \
+        TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group);          \
+    TRACE_EVENT_API_ATOMIC_STORE(                                            \
+        atomic, reinterpret_cast<TRACE_EVENT_API_ATOMIC_WORD>(               \
+                    category_group_enabled));                                \
+  }
+
+#define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group)             \
+  static TRACE_EVENT_API_ATOMIC_WORD INTERNAL_TRACE_EVENT_UID(atomic) = 0; \
+  const uint8_t* INTERNAL_TRACE_EVENT_UID(category_group_enabled);         \
+  INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO_CUSTOM_VARIABLES(                 \
+      category_group, INTERNAL_TRACE_EVENT_UID(atomic),                    \
+      INTERNAL_TRACE_EVENT_UID(category_group_enabled));
+
+// Implementation detail: internal macro to create static category and add
+// event if the category is enabled.
+#define INTERNAL_TRACE_EVENT_ADD(phase, category_group, name, flags, ...)    \
+  DCHECK_NOT_NULL(name);                                                     \
+  do {                                                                       \
+    cppgc::Platform* platform = heap_.platform();                            \
+    INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group);                  \
+    if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) {  \
+      cppgc::internal::AddTraceEvent(                                        \
+          phase, INTERNAL_TRACE_EVENT_UID(category_group_enabled), name,     \
+          nullptr /* scope */, 0 /* id */, 0 /* bind_id */, flags, platform, \
+          ##__VA_ARGS__);                                                    \
+    }                                                                        \
+  } while (false)
+
+namespace cppgc {
+namespace internal {
+
+using ConvertableToTraceFormat = v8::ConvertableToTraceFormat;
+
+class TraceEventHelper {
+ public:
+  V8_EXPORT_PRIVATE static TracingController* GetTracingController();
+};
+
+static V8_INLINE uint64_t AddTraceEventImpl(
+    char phase, const uint8_t* category_group_enabled, const char* name,
+    const char* scope, uint64_t id, uint64_t bind_id, int32_t num_args,
+    const char** arg_names, const uint8_t* arg_types,
+    const uint64_t* arg_values, unsigned int flags, Platform* platform) {
+  std::unique_ptr<ConvertableToTraceFormat> arg_convertables[2];
+  if (num_args > 0 && arg_types[0] == TRACE_VALUE_TYPE_CONVERTABLE) {
+    arg_convertables[0].reset(reinterpret_cast<ConvertableToTraceFormat*>(
+        static_cast<intptr_t>(arg_values[0])));
+  }
+  if (num_args > 1 && arg_types[1] == TRACE_VALUE_TYPE_CONVERTABLE) {
+    arg_convertables[1].reset(reinterpret_cast<ConvertableToTraceFormat*>(
+        static_cast<intptr_t>(arg_values[1])));
+  }
+  DCHECK_LE(num_args, 2);
+  TracingController* controller = platform->GetTracingController();
+  return controller->AddTraceEvent(phase, category_group_enabled, name, scope,
+                                   id, bind_id, num_args, arg_names, arg_types,
+                                   arg_values, arg_convertables, flags);
+}
+
+// Define SetTraceValue for each allowed type. It stores the type and value
+// in the return arguments. This allows this API to avoid declaring any
+// structures so that it is portable to third_party libraries.
+// This is the base implementation for integer types (including bool) and enums.
+template <typename T>
+static V8_INLINE typename std::enable_if<
+    std::is_integral<T>::value || std::is_enum<T>::value, void>::type
+SetTraceValue(T arg, unsigned char* type, uint64_t* value) {
+  *type = std::is_same<T, bool>::value
+              ? TRACE_VALUE_TYPE_BOOL
+              : std::is_signed<T>::value ? TRACE_VALUE_TYPE_INT
+                                         : TRACE_VALUE_TYPE_UINT;
+  *value = static_cast<uint64_t>(arg);
+}
+
+#define INTERNAL_DECLARE_SET_TRACE_VALUE(actual_type, value_type_id)        \
+  static V8_INLINE void SetTraceValue(actual_type arg, unsigned char* type, \
+                                      uint64_t* value) {                    \
+    *type = value_type_id;                                                  \
+    *value = 0;                                                             \
+    STATIC_ASSERT(sizeof(arg) <= sizeof(*value));                           \
+    memcpy(value, &arg, sizeof(arg));                                       \
+  }
+INTERNAL_DECLARE_SET_TRACE_VALUE(double, TRACE_VALUE_TYPE_DOUBLE)
+INTERNAL_DECLARE_SET_TRACE_VALUE(const char*, TRACE_VALUE_TYPE_STRING)
+#undef INTERNAL_DECLARE_SET_TRACE_VALUE
+
+// These AddTraceEvent template functions are defined here instead of in
+// the macro, because the arg_values could be temporary objects, such as
+// std::string. In order to store pointers to the internal c_str and pass
+// through to the tracing API, the arg_values must live throughout these
+// procedures.
+
+static V8_INLINE uint64_t AddTraceEvent(char phase,
+                                        const uint8_t* category_group_enabled,
+                                        const char* name, const char* scope,
+                                        uint64_t id, uint64_t bind_id,
+                                        unsigned int flags,
+                                        Platform* platform) {
+  return TRACE_EVENT_API_ADD_TRACE_EVENT(
+      phase, category_group_enabled, name, scope, id, bind_id, 0 /* num_args */,
+      nullptr, nullptr, nullptr, flags, platform);
+}
+
+template <class ARG1_TYPE>
+static V8_INLINE uint64_t AddTraceEvent(
+    char phase, const uint8_t* category_group_enabled, const char* name,
+    const char* scope, uint64_t id, uint64_t bind_id, unsigned int flags,
+    Platform* platform, const char* arg1_name, ARG1_TYPE&& arg1_val) {
+  const int num_args = 1;
+  uint8_t arg_type;
+  uint64_t arg_value;
+  SetTraceValue(std::forward<ARG1_TYPE>(arg1_val), &arg_type, &arg_value);
+  return TRACE_EVENT_API_ADD_TRACE_EVENT(
+      phase, category_group_enabled, name, scope, id, bind_id, num_args,
+      &arg1_name, &arg_type, &arg_value, flags, platform);
+}
+
+template <class ARG1_TYPE, class ARG2_TYPE>
+static V8_INLINE uint64_t AddTraceEvent(
+    char phase, const uint8_t* category_group_enabled, const char* name,
+    const char* scope, uint64_t id, uint64_t bind_id, unsigned int flags,
+    Platform* platform, const char* arg1_name, ARG1_TYPE&& arg1_val,
+    const char* arg2_name, ARG2_TYPE&& arg2_val) {
+  const int num_args = 2;
+  const char* arg_names[2] = {arg1_name, arg2_name};
+  unsigned char arg_types[2];
+  uint64_t arg_values[2];
+  SetTraceValue(std::forward<ARG1_TYPE>(arg1_val), &arg_types[0],
+                &arg_values[0]);
+  SetTraceValue(std::forward<ARG2_TYPE>(arg2_val), &arg_types[1],
+                &arg_values[1]);
+  return TRACE_EVENT_API_ADD_TRACE_EVENT(
+      phase, category_group_enabled, name, scope, id, bind_id, num_args,
+      arg_names, arg_types, arg_values, flags, platform);
+}
+
+}  // namespace internal
+}  // namespace cppgc
+
+#endif  // !CPPGC_IS_STANDALONE
+
+#endif  // V8_HEAP_CPPGC_TRACE_EVENT_H_
diff --git a/deps/v8/src/heap/cppgc/visitor.h b/deps/v8/src/heap/cppgc/visitor.h
index 3b0f185ccb4d63..b91fe114ab1bd6 100644
--- a/deps/v8/src/heap/cppgc/visitor.h
+++ b/deps/v8/src/heap/cppgc/visitor.h
@@ -5,7 +5,6 @@
 #ifndef V8_HEAP_CPPGC_VISITOR_H_
 #define V8_HEAP_CPPGC_VISITOR_H_
 
-#include "include/cppgc/persistent.h"
 #include "include/cppgc/visitor.h"
 #include "src/heap/cppgc/heap-object-header.h"
 
diff --git a/deps/v8/src/heap/cppgc/write-barrier.cc b/deps/v8/src/heap/cppgc/write-barrier.cc
index 795bed84395b72..336c0ba82c75ff 100644
--- a/deps/v8/src/heap/cppgc/write-barrier.cc
+++ b/deps/v8/src/heap/cppgc/write-barrier.cc
@@ -21,17 +21,15 @@ namespace internal {
 
 namespace {
 
-void MarkValue(const BasePage* page, MarkerBase* marker, const void* value) {
+void ProcessMarkValue(HeapObjectHeader& header, MarkerBase* marker,
+                      const void* value) {
 #if defined(CPPGC_CAGED_HEAP)
   DCHECK(reinterpret_cast<CagedHeapLocalData*>(
              reinterpret_cast<uintptr_t>(value) &
              ~(kCagedHeapReservationAlignment - 1))
              ->is_marking_in_progress);
 #endif
-  auto& header =
-      const_cast<HeapObjectHeader&>(page->ObjectHeaderFromInnerAddress(value));
-  if (!header.TryMarkAtomic()) return;
-
+  DCHECK(header.IsMarked<AccessMode::kAtomic>());
   DCHECK(marker);
 
   if (V8_UNLIKELY(header.IsInConstruction<AccessMode::kNonAtomic>())) {
@@ -49,13 +47,16 @@ void MarkValue(const BasePage* page, MarkerBase* marker, const void* value) {
 
 }  // namespace
 
-void WriteBarrier::MarkingBarrierSlowWithSentinelCheck(const void* value) {
+// static
+void WriteBarrier::DijkstraMarkingBarrierSlowWithSentinelCheck(
+    const void* value) {
   if (!value || value == kSentinelPointer) return;
 
-  MarkingBarrierSlow(value);
+  DijkstraMarkingBarrierSlow(value);
 }
 
-void WriteBarrier::MarkingBarrierSlow(const void* value) {
+// static
+void WriteBarrier::DijkstraMarkingBarrierSlow(const void* value) {
   const BasePage* page = BasePage::FromPayload(value);
   const auto* heap = page->heap();
 
@@ -63,19 +64,75 @@ void WriteBarrier::MarkingBarrierSlow(const void* value) {
   // progress.
   if (!heap->marker()) return;
 
-  MarkValue(page, heap->marker(), value);
+  auto& header =
+      const_cast<HeapObjectHeader&>(page->ObjectHeaderFromInnerAddress(value));
+  if (!header.TryMarkAtomic()) return;
+
+  ProcessMarkValue(header, heap->marker(), value);
+}
+
+// static
+void WriteBarrier::DijkstraMarkingBarrierRangeSlow(
+    HeapHandle& heap_handle, const void* first_element, size_t element_size,
+    size_t number_of_elements, TraceCallback trace_callback) {
+  auto& heap_base = HeapBase::From(heap_handle);
+  MarkerBase* marker = heap_base.marker();
+  if (!marker) {
+    return;
+  }
+
+  ObjectAllocator::NoAllocationScope no_allocation(
+      heap_base.object_allocator());
+  const char* array = static_cast<const char*>(first_element);
+  while (number_of_elements-- > 0) {
+    trace_callback(&heap_base.marker()->Visitor(), array);
+    array += element_size;
+  }
+}
+
+// static
+void WriteBarrier::SteeleMarkingBarrierSlowWithSentinelCheck(
+    const void* value) {
+  if (!value || value == kSentinelPointer) return;
+
+  SteeleMarkingBarrierSlow(value);
+}
+
+// static
+void WriteBarrier::SteeleMarkingBarrierSlow(const void* value) {
+  const BasePage* page = BasePage::FromPayload(value);
+  const auto* heap = page->heap();
+
+  // Marker being not set up means that no incremental/concurrent marking is in
+  // progress.
+  if (!heap->marker()) return;
+
+  auto& header =
+      const_cast<HeapObjectHeader&>(page->ObjectHeaderFromInnerAddress(value));
+  if (!header.IsMarked<AccessMode::kAtomic>()) return;
+
+  ProcessMarkValue(header, heap->marker(), value);
 }
 
 #if defined(CPPGC_YOUNG_GENERATION)
-void WriteBarrier::GenerationalBarrierSlow(CagedHeapLocalData* local_data,
+// static
+void WriteBarrier::GenerationalBarrierSlow(const CagedHeapLocalData& local_data,
                                            const AgeTable& age_table,
                                            const void* slot,
                                            uintptr_t value_offset) {
-  if (age_table[value_offset] == AgeTable::Age::kOld) return;
+  if (value_offset > 0 && age_table[value_offset] == AgeTable::Age::kOld)
+    return;
   // Record slot.
-  local_data->heap_base->remembered_slots().insert(const_cast<void*>(slot));
+  local_data.heap_base->remembered_slots().insert(const_cast<void*>(slot));
 }
 #endif
 
+#if V8_ENABLE_CHECKS
+// static
+void WriteBarrier::CheckParams(Type expected_type, const Params& params) {
+  CHECK_EQ(expected_type, params.type);
+}
+#endif  // V8_ENABLE_CHECKS
+
 }  // namespace internal
 }  // namespace cppgc
diff --git a/deps/v8/src/heap/embedder-tracing.h b/deps/v8/src/heap/embedder-tracing.h
index 5aff187ed3dd47..22377804346ca7 100644
--- a/deps/v8/src/heap/embedder-tracing.h
+++ b/deps/v8/src/heap/embedder-tracing.h
@@ -37,7 +37,7 @@ class V8_EXPORT_PRIVATE LocalEmbedderHeapTracer final {
     const WrapperInfo& raw_info;
   };
 
-  class V8_EXPORT_PRIVATE ProcessingScope {
+  class V8_EXPORT_PRIVATE V8_NODISCARD ProcessingScope {
    public:
     explicit ProcessingScope(LocalEmbedderHeapTracer* tracer);
     ~ProcessingScope();
@@ -150,7 +150,7 @@ class V8_EXPORT_PRIVATE LocalEmbedderHeapTracer final {
   friend class EmbedderStackStateScope;
 };
 
-class V8_EXPORT_PRIVATE EmbedderStackStateScope final {
+class V8_EXPORT_PRIVATE V8_NODISCARD EmbedderStackStateScope final {
  public:
   EmbedderStackStateScope(LocalEmbedderHeapTracer* local_tracer,
                           EmbedderHeapTracer::EmbedderStackState stack_state)
diff --git a/deps/v8/src/heap/factory-base.cc b/deps/v8/src/heap/factory-base.cc
index a87611e068fef2..30b568d8efbd2e 100644
--- a/deps/v8/src/heap/factory-base.cc
+++ b/deps/v8/src/heap/factory-base.cc
@@ -206,13 +206,15 @@ Handle<BytecodeArray> FactoryBase<Impl>::NewBytecodeArray(
 }
 
 template <typename Impl>
-Handle<Script> FactoryBase<Impl>::NewScript(Handle<String> source) {
+Handle<Script> FactoryBase<Impl>::NewScript(
+    Handle<PrimitiveHeapObject> source) {
   return NewScriptWithId(source, isolate()->GetNextScriptId());
 }
 
 template <typename Impl>
-Handle<Script> FactoryBase<Impl>::NewScriptWithId(Handle<String> source,
-                                                  int script_id) {
+Handle<Script> FactoryBase<Impl>::NewScriptWithId(
+    Handle<PrimitiveHeapObject> source, int script_id) {
+  DCHECK(source->IsString() || source->IsUndefined());
   // Create and initialize script object.
   ReadOnlyRoots roots = read_only_roots();
   Handle<Script> script =
@@ -275,14 +277,8 @@ Handle<UncompiledDataWithoutPreparseData>
 FactoryBase<Impl>::NewUncompiledDataWithoutPreparseData(
     Handle<String> inferred_name, int32_t start_position,
     int32_t end_position) {
-  Handle<UncompiledDataWithoutPreparseData> result = handle(
-      UncompiledDataWithoutPreparseData::cast(NewWithImmortalMap(
-          impl()->read_only_roots().uncompiled_data_without_preparse_data_map(),
-          AllocationType::kOld)),
-      isolate());
-
-  result->Init(impl(), *inferred_name, start_position, end_position);
-  return result;
+  return TorqueGeneratedFactory<Impl>::NewUncompiledDataWithoutPreparseData(
+      inferred_name, start_position, end_position, AllocationType::kOld);
 }
 
 template <typename Impl>
@@ -290,16 +286,9 @@ Handle<UncompiledDataWithPreparseData>
 FactoryBase<Impl>::NewUncompiledDataWithPreparseData(
     Handle<String> inferred_name, int32_t start_position, int32_t end_position,
     Handle<PreparseData> preparse_data) {
-  Handle<UncompiledDataWithPreparseData> result = handle(
-      UncompiledDataWithPreparseData::cast(NewWithImmortalMap(
-          impl()->read_only_roots().uncompiled_data_with_preparse_data_map(),
-          AllocationType::kOld)),
-      isolate());
-
-  result->Init(impl(), *inferred_name, start_position, end_position,
-               *preparse_data);
-
-  return result;
+  return TorqueGeneratedFactory<Impl>::NewUncompiledDataWithPreparseData(
+      inferred_name, start_position, end_position, preparse_data,
+      AllocationType::kOld);
 }
 
 template <typename Impl>
@@ -505,10 +494,10 @@ Handle<String> FactoryBase<Impl>::InternalizeString(
 
 template <typename Impl>
 Handle<SeqOneByteString> FactoryBase<Impl>::NewOneByteInternalizedString(
-    const Vector<const uint8_t>& str, uint32_t hash_field) {
+    const Vector<const uint8_t>& str, uint32_t raw_hash_field) {
   Handle<SeqOneByteString> result =
-      AllocateRawOneByteInternalizedString(str.length(), hash_field);
-  DisallowHeapAllocation no_gc;
+      AllocateRawOneByteInternalizedString(str.length(), raw_hash_field);
+  DisallowGarbageCollection no_gc;
   MemCopy(result->GetChars(no_gc, SharedStringAccessGuardIfNeeded::NotNeeded()),
           str.begin(), str.length());
   return result;
@@ -516,10 +505,10 @@ Handle<SeqOneByteString> FactoryBase<Impl>::NewOneByteInternalizedString(
 
 template <typename Impl>
 Handle<SeqTwoByteString> FactoryBase<Impl>::NewTwoByteInternalizedString(
-    const Vector<const uc16>& str, uint32_t hash_field) {
+    const Vector<const uc16>& str, uint32_t raw_hash_field) {
   Handle<SeqTwoByteString> result =
-      AllocateRawTwoByteInternalizedString(str.length(), hash_field);
-  DisallowHeapAllocation no_gc;
+      AllocateRawTwoByteInternalizedString(str.length(), raw_hash_field);
+  DisallowGarbageCollection no_gc;
   MemCopy(result->GetChars(no_gc, SharedStringAccessGuardIfNeeded::NotNeeded()),
           str.begin(), str.length() * kUC16Size);
   return result;
@@ -540,7 +529,7 @@ MaybeHandle<SeqOneByteString> FactoryBase<Impl>::NewRawOneByteString(
   Handle<SeqOneByteString> string =
       handle(SeqOneByteString::cast(result), isolate());
   string->set_length(length);
-  string->set_hash_field(String::kEmptyHashField);
+  string->set_raw_hash_field(String::kEmptyHashField);
   DCHECK_EQ(size, string->Size());
   return string;
 }
@@ -560,7 +549,7 @@ MaybeHandle<SeqTwoByteString> FactoryBase<Impl>::NewRawTwoByteString(
   Handle<SeqTwoByteString> string =
       handle(SeqTwoByteString::cast(result), isolate());
   string->set_length(length);
-  string->set_hash_field(String::kEmptyHashField);
+  string->set_raw_hash_field(String::kEmptyHashField);
   DCHECK_EQ(size, string->Size());
   return string;
 }
@@ -582,8 +571,8 @@ MaybeHandle<String> FactoryBase<Impl>::NewConsString(
   int length = left_length + right_length;
 
   if (length == 2) {
-    uint16_t c1 = left->Get(0);
-    uint16_t c2 = right->Get(0);
+    uint16_t c1 = left->Get(0, isolate());
+    uint16_t c2 = right->Get(0, isolate());
     return MakeOrFindTwoCharacterString(c1, c2);
   }
 
@@ -608,19 +597,17 @@ MaybeHandle<String> FactoryBase<Impl>::NewConsString(
     if (is_one_byte) {
       Handle<SeqOneByteString> result =
           NewRawOneByteString(length, allocation).ToHandleChecked();
-      DisallowHeapAllocation no_gc;
-      uint8_t* dest =
-          result->GetChars(no_gc, SharedStringAccessGuardIfNeeded::NotNeeded());
+      DisallowGarbageCollection no_gc;
+      SharedStringAccessGuardIfNeeded access_guard(isolate());
+      uint8_t* dest = result->GetChars(no_gc, access_guard);
       // Copy left part.
       {
-        SharedStringAccessGuardIfNeeded access_guard(*left);
         const uint8_t* src =
             left->template GetChars<uint8_t>(no_gc, access_guard);
         CopyChars(dest, src, left_length);
       }
       // Copy right part.
       {
-        SharedStringAccessGuardIfNeeded access_guard(*right);
         const uint8_t* src =
             right->template GetChars<uint8_t>(no_gc, access_guard);
         CopyChars(dest + left_length, src, right_length);
@@ -631,11 +618,12 @@ MaybeHandle<String> FactoryBase<Impl>::NewConsString(
     Handle<SeqTwoByteString> result =
         NewRawTwoByteString(length, allocation).ToHandleChecked();
 
-    DisallowHeapAllocation no_gc;
-    uc16* sink =
-        result->GetChars(no_gc, SharedStringAccessGuardIfNeeded::NotNeeded());
-    String::WriteToFlat(*left, sink, 0, left->length());
-    String::WriteToFlat(*right, sink + left->length(), 0, right->length());
+    DisallowGarbageCollection no_gc;
+    SharedStringAccessGuardIfNeeded access_guard(isolate());
+    uc16* sink = result->GetChars(no_gc, access_guard);
+    String::WriteToFlat(*left, sink, 0, left->length(), access_guard);
+    String::WriteToFlat(*right, sink + left->length(), 0, right->length(),
+                        access_guard);
     return result;
   }
 
@@ -661,10 +649,10 @@ Handle<String> FactoryBase<Impl>::NewConsString(Handle<String> left,
                                    allocation)),
       isolate());
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = result->GetWriteBarrierMode(no_gc);
 
-  result->set_hash_field(String::kEmptyHashField);
+  result->set_raw_hash_field(String::kEmptyHashField);
   result->set_length(length);
   result->set_first(*left, mode);
   result->set_second(*right, mode);
@@ -747,8 +735,8 @@ Handle<ClassPositions> FactoryBase<Impl>::NewClassPositions(int start,
 
 template <typename Impl>
 Handle<SeqOneByteString>
-FactoryBase<Impl>::AllocateRawOneByteInternalizedString(int length,
-                                                        uint32_t hash_field) {
+FactoryBase<Impl>::AllocateRawOneByteInternalizedString(
+    int length, uint32_t raw_hash_field) {
   CHECK_GE(String::kMaxLength, length);
   // The canonical empty_string is the only zero-length string we allow.
   DCHECK_IMPLIES(length == 0, !impl()->EmptyStringRootIsInitialized());
@@ -763,15 +751,15 @@ FactoryBase<Impl>::AllocateRawOneByteInternalizedString(int length,
   Handle<SeqOneByteString> answer =
       handle(SeqOneByteString::cast(result), isolate());
   answer->set_length(length);
-  answer->set_hash_field(hash_field);
+  answer->set_raw_hash_field(raw_hash_field);
   DCHECK_EQ(size, answer->Size());
   return answer;
 }
 
 template <typename Impl>
 Handle<SeqTwoByteString>
-FactoryBase<Impl>::AllocateRawTwoByteInternalizedString(int length,
-                                                        uint32_t hash_field) {
+FactoryBase<Impl>::AllocateRawTwoByteInternalizedString(
+    int length, uint32_t raw_hash_field) {
   CHECK_GE(String::kMaxLength, length);
   DCHECK_NE(0, length);  // Use Heap::empty_string() instead.
 
@@ -782,7 +770,7 @@ FactoryBase<Impl>::AllocateRawTwoByteInternalizedString(int length,
   Handle<SeqTwoByteString> answer =
       handle(SeqTwoByteString::cast(result), isolate());
   answer->set_length(length);
-  answer->set_hash_field(hash_field);
+  answer->set_raw_hash_field(raw_hash_field);
   DCHECK_EQ(size, result.Size());
   return answer;
 }
diff --git a/deps/v8/src/heap/factory-base.h b/deps/v8/src/heap/factory-base.h
index 847802629e9a67..39b18b39fc9c48 100644
--- a/deps/v8/src/heap/factory-base.h
+++ b/deps/v8/src/heap/factory-base.h
@@ -10,6 +10,7 @@
 #include "src/objects/function-kind.h"
 #include "src/objects/instance-type.h"
 #include "src/roots/roots.h"
+#include "torque-generated/class-forward-declarations.h"
 
 namespace v8 {
 namespace internal {
@@ -25,6 +26,8 @@ class ArrayBoilerplateDescription;
 class TemplateObjectDescription;
 class SourceTextModuleInfo;
 class PreparseData;
+template <class T>
+class PodArray;
 class UncompiledDataWithoutPreparseData;
 class UncompiledDataWithPreparseData;
 class BytecodeArray;
@@ -34,8 +37,28 @@ struct SourceRange;
 template <typename T>
 class ZoneVector;
 
+namespace wasm {
+class ValueType;
+}  // namespace wasm
+
+template <typename Impl>
+class FactoryBase;
+
+// Putting Torque-generated definitions in a superclass allows to shadow them
+// easily when they shouldn't be used and to reference them when they happen to
+// have the same signature.
+template <typename Impl>
+class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) TorqueGeneratedFactory {
+ private:
+  FactoryBase<Impl>* factory() { return static_cast<FactoryBase<Impl>*>(this); }
+
+ public:
+#include "torque-generated/factory.inc"
+};
+
 template <typename Impl>
-class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) FactoryBase {
+class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) FactoryBase
+    : public TorqueGeneratedFactory<Impl> {
  public:
   // Converts the given boolean condition to JavaScript boolean value.
   inline Handle<Oddball> ToBoolean(bool value);
@@ -118,8 +141,9 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) FactoryBase {
   Handle<TemplateObjectDescription> NewTemplateObjectDescription(
       Handle<FixedArray> raw_strings, Handle<FixedArray> cooked_strings);
 
-  Handle<Script> NewScript(Handle<String> source);
-  Handle<Script> NewScriptWithId(Handle<String> source, int script_id);
+  Handle<Script> NewScript(Handle<PrimitiveHeapObject> source);
+  Handle<Script> NewScriptWithId(Handle<PrimitiveHeapObject> source,
+                                 int script_id);
 
   Handle<SharedFunctionInfo> NewSharedFunctionInfoForLiteral(
       FunctionLiteral* literal, Handle<Script> script, bool is_toplevel);
@@ -151,14 +175,14 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) FactoryBase {
   Handle<String> InternalizeStringWithKey(StringTableKey* key);
 
   Handle<SeqOneByteString> NewOneByteInternalizedString(
-      const Vector<const uint8_t>& str, uint32_t hash_field);
+      const Vector<const uint8_t>& str, uint32_t raw_hash_field);
   Handle<SeqTwoByteString> NewTwoByteInternalizedString(
-      const Vector<const uc16>& str, uint32_t hash_field);
+      const Vector<const uc16>& str, uint32_t raw_hash_field);
 
   Handle<SeqOneByteString> AllocateRawOneByteInternalizedString(
-      int length, uint32_t hash_field);
+      int length, uint32_t raw_hash_field);
   Handle<SeqTwoByteString> AllocateRawTwoByteInternalizedString(
-      int length, uint32_t hash_field);
+      int length, uint32_t raw_hash_field);
 
   // Allocates and partially initializes an one-byte or two-byte String. The
   // characters of the string are uninitialized. Currently used in regexp code
@@ -223,6 +247,8 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) FactoryBase {
 
   HeapObject AllocateRaw(int size, AllocationType allocation,
                          AllocationAlignment alignment = kWordAligned);
+
+  friend TorqueGeneratedFactory<Impl>;
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/factory.cc b/deps/v8/src/heap/factory.cc
index 3c2f2d167e7c04..2fd2aaba4b5b47 100644
--- a/deps/v8/src/heap/factory.cc
+++ b/deps/v8/src/heap/factory.cc
@@ -143,7 +143,7 @@ MaybeHandle<Code> Factory::CodeBuilder::BuildInternal(
 
     // The code object has not been fully initialized yet.  We rely on the
     // fact that no allocation will happen from this point on.
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
 
     result.set_map_after_allocation(*factory->code_map(), SKIP_WRITE_BARRIER);
     code = handle(Code::cast(result), isolate_);
@@ -485,8 +485,9 @@ Handle<T> Factory::AllocateSmallOrderedHashTable(Handle<Map> map, int capacity,
   // to something other than 2, capacity should be stored as another
   // field of this object.
   DCHECK_EQ(T::kLoadFactor, 2);
-  capacity = base::bits::RoundUpToPowerOfTwo32(Max(T::kMinCapacity, capacity));
-  capacity = Min(capacity, T::kMaxCapacity);
+  capacity =
+      base::bits::RoundUpToPowerOfTwo32(std::max({T::kMinCapacity, capacity}));
+  capacity = std::min({capacity, T::kMaxCapacity});
 
   DCHECK_LT(0, capacity);
   DCHECK_EQ(0, capacity % T::kLoadFactor);
@@ -596,7 +597,7 @@ MaybeHandle<String> Factory::NewStringFromOneByte(
                              NewRawOneByteString(string.length(), allocation),
                              String);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Copy the characters into the new object.
   CopyChars(SeqOneByteString::cast(*result).GetChars(no_gc), string.begin(),
             length);
@@ -617,7 +618,7 @@ MaybeHandle<String> Factory::NewStringFromUtf8(const Vector<const char>& string,
         isolate(), result,
         NewRawOneByteString(decoder.utf16_length(), allocation), String);
 
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     decoder.Decode(result->GetChars(no_gc), utf8_data);
     return result;
   }
@@ -628,7 +629,7 @@ MaybeHandle<String> Factory::NewStringFromUtf8(const Vector<const char>& string,
       isolate(), result,
       NewRawTwoByteString(decoder.utf16_length(), allocation), String);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   decoder.Decode(result->GetChars(no_gc), utf8_data);
   return result;
 }
@@ -638,7 +639,7 @@ MaybeHandle<String> Factory::NewStringFromUtf8SubString(
     AllocationType allocation) {
   Vector<const uint8_t> utf8_data;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     utf8_data = Vector<const uint8_t>(str->GetChars(no_gc) + begin, length);
   }
   Utf8Decoder decoder(utf8_data);
@@ -664,7 +665,7 @@ MaybeHandle<String> Factory::NewStringFromUtf8SubString(
     ASSIGN_RETURN_ON_EXCEPTION(
         isolate(), result,
         NewRawOneByteString(decoder.utf16_length(), allocation), String);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     // Update pointer references, since the original string may have moved after
     // allocation.
     utf8_data = Vector<const uint8_t>(str->GetChars(no_gc) + begin, length);
@@ -678,7 +679,7 @@ MaybeHandle<String> Factory::NewStringFromUtf8SubString(
       isolate(), result,
       NewRawTwoByteString(decoder.utf16_length(), allocation), String);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Update pointer references, since the original string may have moved after
   // allocation.
   utf8_data = Vector<const uint8_t>(str->GetChars(no_gc) + begin, length);
@@ -696,14 +697,14 @@ MaybeHandle<String> Factory::NewStringFromTwoByte(const uc16* string,
     Handle<SeqOneByteString> result;
     ASSIGN_RETURN_ON_EXCEPTION(isolate(), result,
                                NewRawOneByteString(length, allocation), String);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     CopyChars(result->GetChars(no_gc), string, length);
     return result;
   } else {
     Handle<SeqTwoByteString> result;
     ASSIGN_RETURN_ON_EXCEPTION(isolate(), result,
                                NewRawTwoByteString(length, allocation), String);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     CopyChars(result->GetChars(no_gc), string, length);
     return result;
   }
@@ -763,9 +764,9 @@ Handle<String> Factory::AllocateInternalizedStringImpl(T t, int chars,
                                  map);
   Handle<String> answer(String::cast(result), isolate());
   answer->set_length(chars);
-  answer->set_hash_field(hash_field);
+  answer->set_raw_hash_field(hash_field);
   DCHECK_EQ(size, answer->Size());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (is_one_byte) {
     WriteOneByteData(t, SeqOneByteString::cast(*answer).GetChars(no_gc), chars);
@@ -796,10 +797,6 @@ MaybeHandle<Map> GetInternalizedStringMap(Factory* f, Handle<String> string) {
       return f->external_internalized_string_map();
     case EXTERNAL_ONE_BYTE_STRING_TYPE:
       return f->external_one_byte_internalized_string_map();
-    case UNCACHED_EXTERNAL_STRING_TYPE:
-      return f->uncached_external_internalized_string_map();
-    case UNCACHED_EXTERNAL_ONE_BYTE_STRING_TYPE:
-      return f->uncached_external_one_byte_internalized_string_map();
     default:
       return MaybeHandle<Map>();  // No match found.
   }
@@ -824,7 +821,7 @@ Handle<StringClass> Factory::InternalizeExternalString(Handle<String> string) {
       StringClass::cast(New(map, AllocationType::kOld)), isolate());
   external_string->AllocateExternalPointerEntries(isolate());
   external_string->set_length(cast_string->length());
-  external_string->set_hash_field(cast_string->hash_field());
+  external_string->set_raw_hash_field(cast_string->raw_hash_field());
   external_string->SetResource(isolate(), nullptr);
   isolate()->heap()->RegisterExternalString(*external_string);
   return external_string;
@@ -838,7 +835,7 @@ template Handle<ExternalTwoByteString>
 Handle<String> Factory::LookupSingleCharacterStringFromCode(uint16_t code) {
   if (code <= unibrow::Latin1::kMaxChar) {
     {
-      DisallowHeapAllocation no_allocation;
+      DisallowGarbageCollection no_gc;
       Object value = single_character_string_cache()->get(code);
       if (value != *undefined_value()) {
         return handle(String::cast(value), isolate());
@@ -861,8 +858,8 @@ Handle<String> Factory::NewSurrogatePairString(uint16_t lead, uint16_t trail) {
 
   Handle<SeqTwoByteString> str =
       isolate()->factory()->NewRawTwoByteString(2).ToHandleChecked();
-  DisallowHeapAllocation no_allocation;
-  uc16* dest = str->GetChars(no_allocation);
+  DisallowGarbageCollection no_gc;
+  uc16* dest = str->GetChars(no_gc);
   dest[0] = lead;
   dest[1] = trail;
   return str;
@@ -895,14 +892,14 @@ Handle<String> Factory::NewProperSubString(Handle<String> str, int begin,
     if (str->IsOneByteRepresentation()) {
       Handle<SeqOneByteString> result =
           NewRawOneByteString(length).ToHandleChecked();
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       uint8_t* dest = result->GetChars(no_gc);
       String::WriteToFlat(*str, dest, begin, end);
       return result;
     } else {
       Handle<SeqTwoByteString> result =
           NewRawTwoByteString(length).ToHandleChecked();
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       uc16* dest = result->GetChars(no_gc);
       String::WriteToFlat(*str, dest, begin, end);
       return result;
@@ -928,7 +925,7 @@ Handle<String> Factory::NewProperSubString(Handle<String> str, int begin,
   Handle<SlicedString> slice(
       SlicedString::cast(New(map, AllocationType::kYoung)), isolate());
 
-  slice->set_hash_field(String::kEmptyHashField);
+  slice->set_raw_hash_field(String::kEmptyHashField);
   slice->set_length(length);
   slice->set_parent(*str);
   slice->set_offset(offset);
@@ -950,7 +947,7 @@ MaybeHandle<String> Factory::NewExternalStringFromOneByte(
       ExternalOneByteString::cast(New(map, AllocationType::kOld)), isolate());
   external_string->AllocateExternalPointerEntries(isolate());
   external_string->set_length(static_cast<int>(length));
-  external_string->set_hash_field(String::kEmptyHashField);
+  external_string->set_raw_hash_field(String::kEmptyHashField);
   external_string->SetResource(isolate(), resource);
   isolate()->heap()->RegisterExternalString(*external_string);
 
@@ -971,7 +968,7 @@ MaybeHandle<String> Factory::NewExternalStringFromTwoByte(
       ExternalTwoByteString::cast(New(map, AllocationType::kOld)), isolate());
   external_string->AllocateExternalPointerEntries(isolate());
   external_string->set_length(static_cast<int>(length));
-  external_string->set_hash_field(String::kEmptyHashField);
+  external_string->set_raw_hash_field(String::kEmptyHashField);
   external_string->SetResource(isolate(), resource);
   isolate()->heap()->RegisterExternalString(*external_string);
 
@@ -1002,8 +999,8 @@ Handle<Symbol> Factory::NewSymbol(AllocationType allocation) {
   int hash = isolate()->GenerateIdentityHash(Name::kHashBitMask);
 
   Handle<Symbol> symbol(Symbol::cast(result), isolate());
-  symbol->set_hash_field(Name::kIsNotIntegerIndexMask |
-                         (hash << Name::kHashShift));
+  symbol->set_raw_hash_field(Name::kIsNotIntegerIndexMask |
+                             (hash << Name::kHashShift));
   symbol->set_description(*undefined_value());
   symbol->set_flags(0);
   DCHECK(!symbol->is_private());
@@ -1216,7 +1213,7 @@ Handle<AliasedArgumentsEntry> Factory::NewAliasedArgumentsEntry(
 Handle<AccessorInfo> Factory::NewAccessorInfo() {
   Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(
       NewStruct(ACCESSOR_INFO_TYPE, AllocationType::kOld));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   info->set_name(*empty_string());
   info->set_flags(0);  // Must clear the flags, it was initialized as undefined.
   info->set_is_sloppy(true);
@@ -1313,6 +1310,15 @@ Handle<Foreign> Factory::NewForeign(Address addr) {
 Handle<WasmTypeInfo> Factory::NewWasmTypeInfo(Address type_address,
                                               Handle<Map> parent) {
   Handle<ArrayList> subtypes = ArrayList::New(isolate(), 0);
+  Handle<FixedArray> supertypes;
+  if (parent->IsWasmStructMap() || parent->IsWasmArrayMap()) {
+    supertypes = CopyFixedArrayAndGrow(
+        handle(parent->wasm_type_info().supertypes(), isolate()), 1);
+    supertypes->set(supertypes->length() - 1, *parent);
+  } else {
+    supertypes = NewUninitializedFixedArray(1);
+    supertypes->set(0, *parent);
+  }
   Map map = *wasm_type_info_map();
   HeapObject result = AllocateRawWithImmortalMap(map.instance_size(),
                                                  AllocationType::kYoung, map);
@@ -1320,6 +1326,7 @@ Handle<WasmTypeInfo> Factory::NewWasmTypeInfo(Address type_address,
   info->AllocateExternalPointerEntries(isolate());
   info->set_foreign_address(isolate(), type_address);
   info->set_parent(*parent);
+  info->set_supertypes(*supertypes);
   info->set_subtypes(*subtypes);
   return info;
 }
@@ -1463,7 +1470,7 @@ Map Factory::InitializeMap(Map map, InstanceType type, int instance_size,
   // Must be called only after |instance_type|, |instance_size| and
   // |layout_descriptor| are set.
   map.set_visitor_id(Map::GetVisitorId(map));
-  map.set_relaxed_bit_field(0);
+  map.set_bit_field(0);
   map.set_bit_field2(Map::Bits2::NewTargetIsBaseBit::encode(true));
   int bit_field3 =
       Map::Bits3::EnumLengthBits::encode(kInvalidEnumCacheSentinel) |
@@ -1552,8 +1559,11 @@ Handle<JSObject> Factory::CopyJSObjectWithAllocationSite(
       clone->set_raw_properties_or_hash(*prop);
     }
   } else {
-    Handle<FixedArray> properties(
-        FixedArray::cast(source->property_dictionary()), isolate());
+    Handle<FixedArray> properties =
+        handle(V8_DICT_MODE_PROTOTYPES_BOOL
+                   ? FixedArray::cast(source->property_dictionary_ordered())
+                   : FixedArray::cast(source->property_dictionary()),
+               isolate());
     Handle<FixedArray> prop = CopyFixedArray(properties);
     clone->set_raw_properties_or_hash(*prop);
   }
@@ -1589,7 +1599,7 @@ Handle<T> Factory::CopyArrayWithMap(Handle<T> src, Handle<Map> map) {
   Handle<T> result(T::cast(obj), isolate());
   initialize_length(result, len);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = result->GetWriteBarrierMode(no_gc);
   result->CopyElements(isolate(), 0, *src, 0, len, mode);
   return result;
@@ -1609,7 +1619,7 @@ Handle<T> Factory::CopyArrayAndGrow(Handle<T> src, int grow_by,
   initialize_length(result, new_len);
 
   // Copy the content.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = obj.GetWriteBarrierMode(no_gc);
   result->CopyElements(isolate(), 0, *src, 0, old_len, mode);
   MemsetTagged(ObjectSlot(result->data_start() + old_len),
@@ -1667,7 +1677,7 @@ Handle<WeakArrayList> Factory::CopyWeakArrayListAndGrow(
   result->set_length(old_len);
 
   // Copy the content.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = result->GetWriteBarrierMode(no_gc);
   result->CopyElements(isolate(), 0, *src, 0, old_len, mode);
   MemsetTagged(ObjectSlot(result->data_start() + old_len),
@@ -1683,7 +1693,7 @@ Handle<WeakArrayList> Factory::CompactWeakArrayList(Handle<WeakArrayList> src,
       NewUninitializedWeakArrayList(new_capacity, allocation);
 
   // Copy the content.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = result->GetWriteBarrierMode(no_gc);
   int copy_to = 0, length = src->length();
   for (int i = 0; i < length; i++) {
@@ -1717,7 +1727,7 @@ Handle<FixedArray> Factory::CopyFixedArrayUpTo(Handle<FixedArray> array,
   result->set_length(new_len);
 
   // Copy the content.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = result->GetWriteBarrierMode(no_gc);
   result->CopyElements(isolate(), 0, *array, 0, new_len, mode);
   return result;
@@ -2060,7 +2070,7 @@ Handle<JSGlobalObject> Factory::NewJSGlobalObject(
   LOG(isolate(), MapDetails(*new_map));
 
   // Set up the global object as a normalized object.
-  global->set_global_dictionary(*dictionary);
+  global->set_global_dictionary(*dictionary, kReleaseStore);
   global->synchronized_set_map(*new_map);
 
   // Make sure result is a global object with properties in dictionary.
@@ -2137,8 +2147,13 @@ Handle<JSObject> Factory::NewSlowJSObjectFromMap(
     Handle<Map> map, int capacity, AllocationType allocation,
     Handle<AllocationSite> allocation_site) {
   DCHECK(map->is_dictionary_map());
-  Handle<NameDictionary> object_properties =
-      NameDictionary::New(isolate(), capacity);
+  Handle<HeapObject> object_properties;
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    object_properties =
+        OrderedNameDictionary::Allocate(isolate(), capacity).ToHandleChecked();
+  } else {
+    object_properties = NameDictionary::New(isolate(), capacity);
+  }
   Handle<JSObject> js_object =
       NewJSObjectFromMap(map, allocation, allocation_site);
   js_object->set_raw_properties_or_hash(*object_properties);
@@ -2146,8 +2161,12 @@ Handle<JSObject> Factory::NewSlowJSObjectFromMap(
 }
 
 Handle<JSObject> Factory::NewSlowJSObjectWithPropertiesAndElements(
-    Handle<HeapObject> prototype, Handle<NameDictionary> properties,
+    Handle<HeapObject> prototype, Handle<HeapObject> properties,
     Handle<FixedArrayBase> elements) {
+  DCHECK_IMPLIES(V8_DICT_MODE_PROTOTYPES_BOOL,
+                 properties->IsOrderedNameDictionary());
+  DCHECK_IMPLIES(!V8_DICT_MODE_PROTOTYPES_BOOL, properties->IsNameDictionary());
+
   Handle<Map> object_map = isolate()->slow_object_with_object_prototype_map();
   if (object_map->prototype() != *prototype) {
     object_map = Map::TransitionToPrototype(isolate(), object_map, prototype);
@@ -2205,7 +2224,7 @@ Handle<JSArray> Factory::NewJSArrayWithUnverifiedElements(
   }
   Handle<JSArray> array = Handle<JSArray>::cast(
       NewJSObjectFromMap(handle(map, isolate()), allocation));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   array->set_elements(*elements);
   array->set_length(Smi::FromInt(length));
   return array;
@@ -2289,9 +2308,9 @@ Handle<JSGeneratorObject> Factory::NewJSGeneratorObject(
 }
 
 Handle<SourceTextModule> Factory::NewSourceTextModule(
-    Handle<SharedFunctionInfo> code) {
+    Handle<SharedFunctionInfo> sfi) {
   Handle<SourceTextModuleInfo> module_info(
-      code->scope_info().ModuleDescriptorInfo(), isolate());
+      sfi->scope_info().ModuleDescriptorInfo(), isolate());
   Handle<ObjectHashTable> exports =
       ObjectHashTable::New(isolate(), module_info->RegularExportCount());
   Handle<FixedArray> regular_exports =
@@ -2309,14 +2328,13 @@ Handle<SourceTextModule> Factory::NewSourceTextModule(
       SourceTextModule::cast(
           New(source_text_module_map(), AllocationType::kOld)),
       isolate());
-  module->set_code(*code);
+  module->set_code(*sfi);
   module->set_exports(*exports);
   module->set_regular_exports(*regular_exports);
   module->set_regular_imports(*regular_imports);
   module->set_hash(isolate()->GenerateIdentityHash(Smi::kMaxValue));
   module->set_module_namespace(roots.undefined_value());
   module->set_requested_modules(*requested_modules);
-  module->set_script(Script::cast(code->script()));
   module->set_status(Module::kUninstantiated);
   module->set_exception(roots.the_hole_value());
   module->set_import_meta(roots.the_hole_value());
@@ -2324,8 +2342,9 @@ Handle<SourceTextModule> Factory::NewSourceTextModule(
   module->set_dfs_ancestor_index(-1);
   module->set_top_level_capability(roots.undefined_value());
   module->set_flags(0);
-  module->set_async(IsAsyncModule(code->kind()));
+  module->set_async(IsAsyncModule(sfi->kind()));
   module->set_async_evaluating(false);
+  module->set_cycle_root(roots.the_hole_value());
   module->set_async_parent_modules(*async_parent_modules);
   module->set_pending_async_dependencies(0);
   return module;
@@ -2647,7 +2666,7 @@ void Factory::ReinitializeJSGlobalProxy(Handle<JSGlobalProxy> object,
 
   // In order to keep heap in consistent state there must be no allocations
   // before object re-initialization is finished.
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   // Reset the map for the object.
   object->synchronized_set_map(*map);
@@ -2702,6 +2721,17 @@ Handle<SharedFunctionInfo> Factory::NewSharedFunctionInfoForApiFunction(
   return shared;
 }
 
+Handle<SharedFunctionInfo>
+Factory::NewSharedFunctionInfoForWasmExportedFunction(
+    Handle<String> name, Handle<WasmExportedFunctionData> data) {
+  return NewSharedFunctionInfo(name, data, Builtins::kNoBuiltinId);
+}
+
+Handle<SharedFunctionInfo> Factory::NewSharedFunctionInfoForWasmJSFunction(
+    Handle<String> name, Handle<WasmJSFunctionData> data) {
+  return NewSharedFunctionInfo(name, data, Builtins::kNoBuiltinId);
+}
+
 Handle<SharedFunctionInfo> Factory::NewSharedFunctionInfoForWasmCapiFunction(
     Handle<WasmCapiFunctionData> data) {
   return NewSharedFunctionInfo(MaybeHandle<String>(), data,
@@ -2756,7 +2786,7 @@ void Factory::NumberToStringCacheSet(Handle<Object> number, int hash,
 }
 
 Handle<Object> Factory::NumberToStringCacheGet(Object number, int hash) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object key = number_string_cache()->get(hash * 2);
   if (key == number || (key.IsHeapNumber() && number.IsHeapNumber() &&
                         key.Number() == number.Number())) {
@@ -2822,10 +2852,11 @@ inline Handle<String> Factory::SmiToString(Smi number, NumberCacheMode mode) {
   // Compute the hash here (rather than letting the caller take care of it) so
   // that the "cache hit" case above doesn't have to bother with it.
   STATIC_ASSERT(Smi::kMaxValue <= std::numeric_limits<uint32_t>::max());
-  if (result->hash_field() == String::kEmptyHashField && number.value() >= 0) {
-    uint32_t field = StringHasher::MakeArrayIndexHash(
+  if (result->raw_hash_field() == String::kEmptyHashField &&
+      number.value() >= 0) {
+    uint32_t raw_hash_field = StringHasher::MakeArrayIndexHash(
         static_cast<uint32_t>(number.value()), result->length());
-    result->set_hash_field(field);
+    result->set_raw_hash_field(raw_hash_field);
   }
   return result;
 }
@@ -2858,10 +2889,10 @@ Handle<String> Factory::SizeToString(size_t value, bool check_cache) {
     result = NewStringFromAsciiChecked(string);
   }
   if (value <= JSArray::kMaxArrayIndex &&
-      result->hash_field() == String::kEmptyHashField) {
-    uint32_t field = StringHasher::MakeArrayIndexHash(
+      result->raw_hash_field() == String::kEmptyHashField) {
+    uint32_t raw_hash_field = StringHasher::MakeArrayIndexHash(
         static_cast<uint32_t>(value), result->length());
-    result->set_hash_field(field);
+    result->set_raw_hash_field(raw_hash_field);
   }
   return result;
 }
@@ -2877,9 +2908,10 @@ Handle<DebugInfo> Factory::NewDebugInfo(Handle<SharedFunctionInfo> shared) {
   debug_info->set_debugger_hints(0);
   DCHECK_EQ(DebugInfo::kNoDebuggingId, debug_info->debugging_id());
   debug_info->set_script(shared->script_or_debug_info(kAcquireLoad));
-  debug_info->set_original_bytecode_array(
-      ReadOnlyRoots(heap).undefined_value());
-  debug_info->set_debug_bytecode_array(ReadOnlyRoots(heap).undefined_value());
+  debug_info->set_original_bytecode_array(ReadOnlyRoots(heap).undefined_value(),
+                                          kReleaseStore);
+  debug_info->set_debug_bytecode_array(ReadOnlyRoots(heap).undefined_value(),
+                                       kReleaseStore);
   debug_info->set_break_points(ReadOnlyRoots(heap).empty_fixed_array());
 
   // Link debug info to function.
@@ -2888,15 +2920,6 @@ Handle<DebugInfo> Factory::NewDebugInfo(Handle<SharedFunctionInfo> shared) {
   return debug_info;
 }
 
-Handle<WasmValue> Factory::NewWasmValue(int value_type, Handle<Object> ref) {
-  DCHECK(value_type == 6 || ref->IsByteArray());
-  Handle<WasmValue> wasm_value =
-      Handle<WasmValue>::cast(NewStruct(WASM_VALUE_TYPE, AllocationType::kOld));
-  wasm_value->set_value_type(value_type);
-  wasm_value->set_bytes_or_ref(*ref);
-  return wasm_value;
-}
-
 Handle<BreakPointInfo> Factory::NewBreakPointInfo(int source_position) {
   Handle<BreakPointInfo> new_break_point_info = Handle<BreakPointInfo>::cast(
       NewStruct(BREAK_POINT_INFO_TYPE, AllocationType::kOld));
@@ -2978,7 +3001,7 @@ Handle<StackFrameInfo> Factory::NewStackFrameInfo(
   Handle<StackFrameInfo> info = Handle<StackFrameInfo>::cast(
       NewStruct(STACK_FRAME_INFO_TYPE, AllocationType::kYoung));
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   info->set_flag(0);
   info->set_is_wasm(is_wasm);
@@ -3446,280 +3469,11 @@ bool Factory::EmptyStringRootIsInitialized() {
   return isolate()->roots_table()[RootIndex::kempty_string] != kNullAddress;
 }
 
-// static
-NewFunctionArgs NewFunctionArgs::ForWasm(
-    Handle<String> name,
-    Handle<WasmExportedFunctionData> exported_function_data, Handle<Map> map) {
-  DCHECK(name->IsFlat());
-
-  NewFunctionArgs args;
-  args.name_ = name;
-  args.maybe_map_ = map;
-  args.maybe_wasm_function_data_ = exported_function_data;
-  args.language_mode_ = LanguageMode::kSloppy;
-  args.prototype_mutability_ = MUTABLE;
-
-  return args;
-}
-
-// static
-NewFunctionArgs NewFunctionArgs::ForWasm(
-    Handle<String> name, Handle<WasmJSFunctionData> js_function_data,
-    Handle<Map> map) {
-  DCHECK(name->IsFlat());
-
-  NewFunctionArgs args;
-  args.name_ = name;
-  args.maybe_map_ = map;
-  args.maybe_wasm_function_data_ = js_function_data;
-  args.language_mode_ = LanguageMode::kSloppy;
-  args.prototype_mutability_ = MUTABLE;
-
-  return args;
-}
-
-// static
-NewFunctionArgs NewFunctionArgs::ForBuiltin(Handle<String> name,
-                                            Handle<Map> map, int builtin_id) {
-  DCHECK(Builtins::IsBuiltinId(builtin_id));
-  DCHECK(name->IsFlat());
-
-  NewFunctionArgs args;
-  args.name_ = name;
-  args.maybe_map_ = map;
-  args.maybe_builtin_id_ = builtin_id;
-  args.language_mode_ = LanguageMode::kStrict;
-  args.prototype_mutability_ = MUTABLE;
-
-  args.SetShouldSetLanguageMode();
-
-  return args;
-}
-
-// static
-NewFunctionArgs NewFunctionArgs::ForFunctionWithoutCode(
-    Handle<String> name, Handle<Map> map, LanguageMode language_mode) {
-  DCHECK(name->IsFlat());
-
-  NewFunctionArgs args;
-  args.name_ = name;
-  args.maybe_map_ = map;
-  args.maybe_builtin_id_ = Builtins::kIllegal;
-  args.language_mode_ = language_mode;
-  args.prototype_mutability_ = MUTABLE;
-
-  args.SetShouldSetLanguageMode();
-
-  return args;
-}
-
-// static
-NewFunctionArgs NewFunctionArgs::ForBuiltinWithPrototype(
-    Handle<String> name, Handle<HeapObject> prototype, InstanceType type,
-    int instance_size, int inobject_properties, int builtin_id,
-    MutableMode prototype_mutability) {
-  DCHECK(Builtins::IsBuiltinId(builtin_id));
-  DCHECK(name->IsFlat());
-
-  NewFunctionArgs args;
-  args.name_ = name;
-  args.type_ = type;
-  args.instance_size_ = instance_size;
-  args.inobject_properties_ = inobject_properties;
-  args.maybe_prototype_ = prototype;
-  args.maybe_builtin_id_ = builtin_id;
-  args.language_mode_ = LanguageMode::kStrict;
-  args.prototype_mutability_ = prototype_mutability;
-
-  args.SetShouldCreateAndSetInitialMap();
-  args.SetShouldSetPrototype();
-  args.SetShouldSetLanguageMode();
-
-  return args;
-}
-
-// static
-NewFunctionArgs NewFunctionArgs::ForBuiltinWithoutPrototype(
-    Handle<String> name, int builtin_id, LanguageMode language_mode) {
-  DCHECK(Builtins::IsBuiltinId(builtin_id));
-  DCHECK(name->IsFlat());
-
-  NewFunctionArgs args;
-  args.name_ = name;
-  args.maybe_builtin_id_ = builtin_id;
-  args.language_mode_ = language_mode;
-  args.prototype_mutability_ = MUTABLE;
-
-  args.SetShouldSetLanguageMode();
-
-  return args;
-}
-
-void NewFunctionArgs::SetShouldCreateAndSetInitialMap() {
-  // Needed to create the initial map.
-  maybe_prototype_.Assert();
-  DCHECK_NE(kUninitialized, instance_size_);
-  DCHECK_NE(kUninitialized, inobject_properties_);
-
-  should_create_and_set_initial_map_ = true;
-}
-
-void NewFunctionArgs::SetShouldSetPrototype() {
-  maybe_prototype_.Assert();
-  should_set_prototype_ = true;
-}
-
-void NewFunctionArgs::SetShouldSetLanguageMode() {
-  DCHECK(language_mode_ == LanguageMode::kStrict ||
-         language_mode_ == LanguageMode::kSloppy);
-  should_set_language_mode_ = true;
-}
-
-Handle<Map> NewFunctionArgs::GetMap(Isolate* isolate) const {
-  if (!maybe_map_.is_null()) {
-    return maybe_map_.ToHandleChecked();
-  } else if (maybe_prototype_.is_null()) {
-    return is_strict(language_mode_)
-               ? isolate->strict_function_without_prototype_map()
-               : isolate->sloppy_function_without_prototype_map();
-  } else {
-    DCHECK(!maybe_prototype_.is_null());
-    switch (prototype_mutability_) {
-      case MUTABLE:
-        return is_strict(language_mode_) ? isolate->strict_function_map()
-                                         : isolate->sloppy_function_map();
-      case IMMUTABLE:
-        return is_strict(language_mode_)
-                   ? isolate->strict_function_with_readonly_prototype_map()
-                   : isolate->sloppy_function_with_readonly_prototype_map();
-    }
-  }
-  UNREACHABLE();
-}
-
-Handle<JSFunction> Factory::NewFunctionForTest(Handle<String> name) {
-  NewFunctionArgs args = NewFunctionArgs::ForFunctionWithoutCode(
-      name, isolate()->sloppy_function_map(), LanguageMode::kSloppy);
-  Handle<JSFunction> result = NewFunction(args);
-  DCHECK(is_sloppy(result->shared().language_mode()));
-  return result;
-}
-
-Handle<JSFunction> Factory::NewFunction(const NewFunctionArgs& args) {
-  DCHECK(!args.name_.is_null());
-
-  // Create the SharedFunctionInfo.
-  Handle<NativeContext> context(isolate()->native_context());
-  Handle<Map> map = args.GetMap(isolate());
+Handle<JSFunction> Factory::NewFunctionForTesting(Handle<String> name) {
   Handle<SharedFunctionInfo> info =
-      NewSharedFunctionInfo(args.name_, args.maybe_wasm_function_data_,
-                            args.maybe_builtin_id_, kNormalFunction);
-
-  // Proper language mode in shared function info will be set later.
-  DCHECK(is_sloppy(info->language_mode()));
-  DCHECK(!map->IsUndefined(isolate()));
-
-  if (args.should_set_language_mode_) {
-    info->set_language_mode(args.language_mode_);
-  }
-
-#ifdef DEBUG
-  if (isolate()->bootstrapper()->IsActive()) {
-    Handle<Code> code;
-    DCHECK(
-        // During bootstrapping some of these maps could be not created yet.
-        (*map == context->get(Context::STRICT_FUNCTION_MAP_INDEX)) ||
-        (*map ==
-         context->get(Context::STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX)) ||
-        (*map ==
-         context->get(
-             Context::STRICT_FUNCTION_WITH_READONLY_PROTOTYPE_MAP_INDEX)) ||
-        // Check if it's a creation of an empty or Proxy function during
-        // bootstrapping.
-        (args.maybe_builtin_id_ == Builtins::kEmptyFunction ||
-         args.maybe_builtin_id_ == Builtins::kProxyConstructor));
-  }
-#endif
-
-  Handle<JSFunction> result =
-      JSFunctionBuilder{isolate(), info, context}.set_map(map).Build();
-
-  // Both of these write to `prototype_or_initial_map`.
-  // TODO(jgruber): Fix callsites and enable the DCHECK.
-  // DCHECK(!args.should_set_prototype_ ||
-  //        !args.should_create_and_set_initial_map_);
-  if (args.should_set_prototype_) {
-    result->set_prototype_or_initial_map(
-        *args.maybe_prototype_.ToHandleChecked());
-  }
-
-  if (args.should_create_and_set_initial_map_) {
-    ElementsKind elements_kind;
-    switch (args.type_) {
-      case JS_ARRAY_TYPE:
-        elements_kind = PACKED_SMI_ELEMENTS;
-        break;
-      case JS_ARGUMENTS_OBJECT_TYPE:
-        elements_kind = PACKED_ELEMENTS;
-        break;
-      default:
-        elements_kind = TERMINAL_FAST_ELEMENTS_KIND;
-        break;
-    }
-    Handle<Map> initial_map = NewMap(args.type_, args.instance_size_,
-                                     elements_kind, args.inobject_properties_);
-    result->shared().set_expected_nof_properties(args.inobject_properties_);
-    // TODO(littledan): Why do we have this is_generator test when
-    // NewFunctionPrototype already handles finding an appropriately
-    // shared prototype?
-    Handle<HeapObject> prototype = args.maybe_prototype_.ToHandleChecked();
-    if (!IsResumableFunction(result->shared().kind())) {
-      if (prototype->IsTheHole(isolate())) {
-        prototype = NewFunctionPrototype(result);
-      }
-    }
-    JSFunction::SetInitialMap(result, initial_map, prototype);
-  }
-
-  return result;
-}
-
-Handle<JSFunction> Factory::NewFunction(Handle<Map> map,
-                                        Handle<SharedFunctionInfo> info,
-                                        Handle<Context> context,
-                                        AllocationType allocation) {
-  // TODO(jgruber): Remove this function.
-  return JSFunctionBuilder{isolate(), info, context}
-      .set_map(map)
-      .set_allocation_type(allocation)
-      .Build();
-}
-
-Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
-    Handle<SharedFunctionInfo> info, Handle<Context> context,
-    AllocationType allocation) {
-  // TODO(jgruber): Remove this function.
-  return JSFunctionBuilder{isolate(), info, context}
-      .set_allocation_type(allocation)
-      .Build();
-}
-
-Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
-    Handle<SharedFunctionInfo> info, Handle<Context> context,
-    Handle<FeedbackCell> feedback_cell, AllocationType allocation) {
-  // TODO(jgruber): Remove this function.
-  return JSFunctionBuilder{isolate(), info, context}
-      .set_feedback_cell(feedback_cell)
-      .Build();
-}
-
-Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
-    Handle<Map> initial_map, Handle<SharedFunctionInfo> info,
-    Handle<Context> context, AllocationType allocation) {
-  // TODO(jgruber): Remove this function.
-  return JSFunctionBuilder{isolate(), info, context}
-      .set_map(initial_map)
-      .set_allocation_type(allocation)
+      NewSharedFunctionInfoForBuiltin(name, Builtins::kIllegal);
+  info->set_language_mode(LanguageMode::kSloppy);
+  return JSFunctionBuilder{isolate(), info, isolate()->native_context()}
       .Build();
 }
 
@@ -3794,15 +3548,8 @@ void Factory::JSFunctionBuilder::PrepareMap() {
 void Factory::JSFunctionBuilder::PrepareFeedbackCell() {
   Handle<FeedbackCell> feedback_cell;
   if (maybe_feedback_cell_.ToHandle(&feedback_cell)) {
-    // Track the newly-created closure, and check that the optimized code in
-    // the feedback cell wasn't marked for deoptimization while not pointed to
-    // by any live JSFunction.
+    // Track the newly-created closure.
     feedback_cell->IncrementClosureCount(isolate_);
-    if (feedback_cell->value().IsFeedbackVector()) {
-      FeedbackVector::cast(feedback_cell->value())
-          .EvictOptimizedCodeMarkedForDeoptimization(
-              *sfi_, "new function from shared function info");
-    }
   } else {
     // Fall back to the many_closures_cell.
     maybe_feedback_cell_ = isolate_->factory()->many_closures_cell();
diff --git a/deps/v8/src/heap/factory.h b/deps/v8/src/heap/factory.h
index 350a400035305d..77cbaf822139a6 100644
--- a/deps/v8/src/heap/factory.h
+++ b/deps/v8/src/heap/factory.h
@@ -20,7 +20,6 @@
 #include "src/objects/js-regexp.h"
 #include "src/objects/shared-function-info.h"
 #include "src/objects/string.h"
-#include "torque-generated/class-forward-declarations.h"
 
 namespace v8 {
 namespace internal {
@@ -56,7 +55,6 @@ class JSTypedArray;
 class JSWeakMap;
 class LoadHandler;
 class NativeContext;
-class NewFunctionArgs;
 class PromiseResolveThenableJobTask;
 class RegExpMatchInfo;
 class ScriptContextTable;
@@ -72,10 +70,6 @@ class WasmExportedFunctionData;
 class WasmJSFunctionData;
 class WeakCell;
 
-namespace wasm {
-class ValueType;
-}  // namespace wasm
-
 enum class SharedFlag : uint8_t;
 enum class InitializedFlag : uint8_t;
 
@@ -119,12 +113,6 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
     return handle(obj, isolate());
   }
 
-#include "torque-generated/factory.inc"
-
-  // Avoid the Torque-generated factory function to shadow the one from
-  // FactoryBase.
-  using FactoryBase::NewDescriptorArray;
-
   Handle<Oddball> NewOddball(Handle<Map> map, const char* to_string,
                              Handle<Object> to_number, const char* type_of,
                              byte kind);
@@ -168,11 +156,11 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
 
   Handle<FrameArray> NewFrameArray(int number_of_frames);
 
-  // Allocates a |NameDictionary| with an internal capacity calculated such that
+  // Allocates a NameDictionary with an internal capacity calculated such that
   // |at_least_space_for| entries can be added without reallocating.
   Handle<NameDictionary> NewNameDictionary(int at_least_space_for);
 
-  // Allocates an |OrderedNameDictionary| of the given capacity. This guarantees
+  // Allocates an OrderedNameDictionary of the given capacity. This guarantees
   // that |capacity| entries can be added without reallocating.
   Handle<OrderedNameDictionary> NewOrderedNameDictionary(
       int capacity = OrderedNameDictionary::kInitialCapacity);
@@ -524,7 +512,7 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
   // fast elements, or a NumberDictionary, in which case the resulting
   // object will have dictionary elements.
   Handle<JSObject> NewSlowJSObjectWithPropertiesAndElements(
-      Handle<HeapObject> prototype, Handle<NameDictionary> properties,
+      Handle<HeapObject> prototype, Handle<HeapObject> properties,
       Handle<FixedArrayBase> elements);
 
   // JS arrays are pretenured when allocated by the parser.
@@ -622,34 +610,8 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
 
   Handle<JSGlobalProxy> NewUninitializedJSGlobalProxy(int size);
 
-  // Creates a new JSFunction according to the given args. This is the function
-  // you'll probably want to use when creating a JSFunction from the runtime.
-  Handle<JSFunction> NewFunction(const NewFunctionArgs& args);
-
   // For testing only. Creates a sloppy function without code.
-  Handle<JSFunction> NewFunctionForTest(Handle<String> name);
-
-  // Function creation from SharedFunctionInfo.
-
-  Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
-      Handle<SharedFunctionInfo> function_info, Handle<Context> context,
-      Handle<FeedbackCell> feedback_cell,
-      AllocationType allocation = AllocationType::kOld);
-
-  Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
-      Handle<Map> initial_map, Handle<SharedFunctionInfo> function_info,
-      Handle<Context> context,
-      AllocationType allocation = AllocationType::kOld);
-
-  Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
-      Handle<SharedFunctionInfo> function_info, Handle<Context> context,
-      AllocationType allocation = AllocationType::kOld);
-
-  // The choke-point for JSFunction creation. Handles allocation and
-  // initialization. All other utility methods call into this.
-  Handle<JSFunction> NewFunction(
-      Handle<Map> map, Handle<SharedFunctionInfo> info, Handle<Context> context,
-      AllocationType allocation = AllocationType::kOld);
+  Handle<JSFunction> NewFunctionForTesting(Handle<String> name);
 
   // Create an External object for V8's external API.
   Handle<JSObject> NewExternal(void* value);
@@ -720,6 +682,10 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
       MaybeHandle<String> maybe_name,
       Handle<FunctionTemplateInfo> function_template_info, FunctionKind kind);
 
+  Handle<SharedFunctionInfo> NewSharedFunctionInfoForWasmExportedFunction(
+      Handle<String> name, Handle<WasmExportedFunctionData> data);
+  Handle<SharedFunctionInfo> NewSharedFunctionInfoForWasmJSFunction(
+      Handle<String> name, Handle<WasmJSFunctionData> data);
   Handle<SharedFunctionInfo> NewSharedFunctionInfoForWasmCapiFunction(
       Handle<WasmCapiFunctionData> data);
 
@@ -759,8 +725,6 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
 
   Handle<DebugInfo> NewDebugInfo(Handle<SharedFunctionInfo> shared);
 
-  Handle<WasmValue> NewWasmValue(int32_t value_type, Handle<Object> ref);
-
   // Return a map for given number of properties using the map cache in the
   // native context.
   Handle<Map> ObjectLiteralMapFromCache(Handle<NativeContext> native_context,
@@ -806,7 +770,7 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
   }
 
   // Helper class for creating JSFunction objects.
-  class JSFunctionBuilder final {
+  class V8_EXPORT_PRIVATE JSFunctionBuilder final {
    public:
     JSFunctionBuilder(Isolate* isolate, Handle<SharedFunctionInfo> sfi,
                       Handle<Context> context);
@@ -1029,68 +993,10 @@ class V8_EXPORT_PRIVATE Factory : public FactoryBase<Factory> {
   void InitializeJSObjectBody(Handle<JSObject> obj, Handle<Map> map,
                               int start_offset);
 
- private:
   Handle<WeakArrayList> NewUninitializedWeakArrayList(
       int capacity, AllocationType allocation = AllocationType::kYoung);
 };
 
-// Utility class to simplify argument handling around JSFunction creation.
-class NewFunctionArgs final {
- public:
-  static NewFunctionArgs ForWasm(
-      Handle<String> name,
-      Handle<WasmExportedFunctionData> exported_function_data, Handle<Map> map);
-  static NewFunctionArgs ForWasm(Handle<String> name,
-                                 Handle<WasmJSFunctionData> js_function_data,
-                                 Handle<Map> map);
-  V8_EXPORT_PRIVATE static NewFunctionArgs ForBuiltin(Handle<String> name,
-                                                      Handle<Map> map,
-                                                      int builtin_id);
-  static NewFunctionArgs ForFunctionWithoutCode(Handle<String> name,
-                                                Handle<Map> map,
-                                                LanguageMode language_mode);
-  static NewFunctionArgs ForBuiltinWithPrototype(
-      Handle<String> name, Handle<HeapObject> prototype, InstanceType type,
-      int instance_size, int inobject_properties, int builtin_id,
-      MutableMode prototype_mutability);
-  static NewFunctionArgs ForBuiltinWithoutPrototype(Handle<String> name,
-                                                    int builtin_id,
-                                                    LanguageMode language_mode);
-
-  Handle<Map> GetMap(Isolate* isolate) const;
-
- private:
-  NewFunctionArgs() = default;  // Use the static factory constructors.
-
-  void SetShouldCreateAndSetInitialMap();
-  void SetShouldSetPrototype();
-  void SetShouldSetLanguageMode();
-
-  // Sentinel value.
-  static const int kUninitialized = -1;
-
-  Handle<String> name_;
-  MaybeHandle<Map> maybe_map_;
-  MaybeHandle<Struct> maybe_wasm_function_data_;
-
-  bool should_create_and_set_initial_map_ = false;
-  InstanceType type_;
-  int instance_size_ = kUninitialized;
-  int inobject_properties_ = kUninitialized;
-
-  bool should_set_prototype_ = false;
-  MaybeHandle<HeapObject> maybe_prototype_;
-
-  bool should_set_language_mode_ = false;
-  LanguageMode language_mode_;
-
-  int maybe_builtin_id_ = kUninitialized;
-
-  MutableMode prototype_mutability_;
-
-  friend class Factory;
-};
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/heap/gc-idle-time-handler.h b/deps/v8/src/heap/gc-idle-time-handler.h
index f14330ea8a679c..b78b386db2ece5 100644
--- a/deps/v8/src/heap/gc-idle-time-handler.h
+++ b/deps/v8/src/heap/gc-idle-time-handler.h
@@ -52,6 +52,8 @@ class V8_EXPORT_PRIVATE GCIdleTimeHandler {
   static const double kHighContextDisposalRate;
 
   GCIdleTimeHandler() = default;
+  GCIdleTimeHandler(const GCIdleTimeHandler&) = delete;
+  GCIdleTimeHandler& operator=(const GCIdleTimeHandler&) = delete;
 
   GCIdleTimeAction Compute(double idle_time_in_ms,
                            GCIdleTimeHeapState heap_state);
@@ -67,9 +69,6 @@ class V8_EXPORT_PRIVATE GCIdleTimeHandler {
   static bool ShouldDoContextDisposalMarkCompact(int context_disposed,
                                                  double contexts_disposal_rate,
                                                  size_t size_of_objects);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(GCIdleTimeHandler);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/gc-tracer.cc b/deps/v8/src/heap/gc-tracer.cc
index 0469748c4e73cb..a14a7b0b389001 100644
--- a/deps/v8/src/heap/gc-tracer.cc
+++ b/deps/v8/src/heap/gc-tracer.cc
@@ -7,7 +7,9 @@
 #include <cstdarg>
 
 #include "src/base/atomic-utils.h"
+#include "src/common/globals.h"
 #include "src/execution/isolate.h"
+#include "src/execution/thread-id.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/incremental-marking.h"
 #include "src/heap/spaces.h"
@@ -37,45 +39,51 @@ RuntimeCallCounterId GCTracer::RCSCounterFromScope(Scope::ScopeId id) {
       static_cast<int>(id));
 }
 
-RuntimeCallCounterId GCTracer::RCSCounterFromBackgroundScope(
-    BackgroundScope::ScopeId id) {
-  STATIC_ASSERT(Scope::FIRST_BACKGROUND_SCOPE ==
-                Scope::BACKGROUND_ARRAY_BUFFER_FREE);
-  STATIC_ASSERT(
-      0 == static_cast<int>(BackgroundScope::BACKGROUND_ARRAY_BUFFER_FREE));
-  return static_cast<RuntimeCallCounterId>(
-      static_cast<int>(RCSCounterFromScope(Scope::FIRST_BACKGROUND_SCOPE)) +
-      static_cast<int>(id));
+double GCTracer::MonotonicallyIncreasingTimeInMs() {
+  if (V8_UNLIKELY(FLAG_predictable)) {
+    return heap_->MonotonicallyIncreasingTimeInMs();
+  } else {
+    return base::TimeTicks::Now().ToInternalValue() /
+           static_cast<double>(base::Time::kMicrosecondsPerMillisecond);
+  }
+}
+
+CollectionEpoch GCTracer::CurrentEpoch(Scope::ScopeId scope_id) {
+  if (Scope::NeedsYoungEpoch(scope_id)) {
+    return heap_->epoch_young();
+  } else {
+    return heap_->epoch_full();
+  }
 }
 
-GCTracer::Scope::Scope(GCTracer* tracer, ScopeId scope)
-    : tracer_(tracer), scope_(scope) {
-  start_time_ = tracer_->heap_->MonotonicallyIncreasingTimeInMs();
+GCTracer::Scope::Scope(GCTracer* tracer, ScopeId scope, ThreadKind thread_kind)
+    : tracer_(tracer), scope_(scope), thread_kind_(thread_kind) {
+  start_time_ = tracer_->MonotonicallyIncreasingTimeInMs();
   if (V8_LIKELY(!TracingFlags::is_runtime_stats_enabled())) return;
-  runtime_stats_ = tracer_->heap_->isolate()->counters()->runtime_call_stats();
-  runtime_stats_->Enter(&timer_, GCTracer::RCSCounterFromScope(scope));
+
+  if (thread_kind_ == ThreadKind::kMain) {
+    DCHECK_EQ(tracer_->heap_->isolate()->thread_id(), ThreadId::Current());
+    runtime_stats_ =
+        tracer_->heap_->isolate()->counters()->runtime_call_stats();
+    runtime_stats_->Enter(&timer_, GCTracer::RCSCounterFromScope(scope));
+  } else {
+    runtime_call_stats_scope_.emplace(
+        tracer->worker_thread_runtime_call_stats());
+    runtime_stats_ = runtime_call_stats_scope_->Get();
+    runtime_stats_->Enter(&timer_, GCTracer::RCSCounterFromScope(scope));
+  }
 }
 
 GCTracer::Scope::~Scope() {
-  tracer_->AddScopeSample(
-      scope_, tracer_->heap_->MonotonicallyIncreasingTimeInMs() - start_time_);
-  if (V8_LIKELY(runtime_stats_ == nullptr)) return;
-  runtime_stats_->Leave(&timer_);
-}
+  double duration_ms = tracer_->MonotonicallyIncreasingTimeInMs() - start_time_;
 
-GCTracer::BackgroundScope::BackgroundScope(GCTracer* tracer, ScopeId scope,
-                                           RuntimeCallStats* runtime_stats)
-    : tracer_(tracer), scope_(scope), runtime_stats_(runtime_stats) {
-  start_time_ = tracer_->heap_->MonotonicallyIncreasingTimeInMs();
-  if (V8_LIKELY(!TracingFlags::is_runtime_stats_enabled())) return;
-  runtime_stats_->Enter(&timer_,
-                        GCTracer::RCSCounterFromBackgroundScope(scope));
-}
+  if (thread_kind_ == ThreadKind::kMain) {
+    DCHECK_EQ(tracer_->heap_->isolate()->thread_id(), ThreadId::Current());
+    tracer_->AddScopeSample(scope_, duration_ms);
+  } else {
+    tracer_->AddScopeSampleBackground(scope_, duration_ms);
+  }
 
-GCTracer::BackgroundScope::~BackgroundScope() {
-  double duration_ms =
-      tracer_->heap_->MonotonicallyIncreasingTimeInMs() - start_time_;
-  tracer_->AddBackgroundScopeSample(scope_, duration_ms);
   if (V8_LIKELY(runtime_stats_ == nullptr)) return;
   runtime_stats_->Leave(&timer_);
 }
@@ -95,18 +103,17 @@ const char* GCTracer::Scope::Name(ScopeId id) {
   return nullptr;
 }
 
-const char* GCTracer::BackgroundScope::Name(ScopeId id) {
-#define CASE(scope)            \
-  case BackgroundScope::scope: \
-    return "V8.GC_" #scope;
+bool GCTracer::Scope::NeedsYoungEpoch(ScopeId id) {
+#define CASE(scope)  \
+  case Scope::scope: \
+    return true;
   switch (id) {
-    TRACER_BACKGROUND_SCOPES(CASE)
-    case BackgroundScope::NUMBER_OF_SCOPES:
-      break;
+    TRACER_YOUNG_EPOCH_SCOPES(CASE)
+    default:
+      return false;
   }
 #undef CASE
   UNREACHABLE();
-  return nullptr;
 }
 
 GCTracer::Event::Event(Type type, GarbageCollectionReason gc_reason,
@@ -175,15 +182,15 @@ GCTracer::GCTracer(Heap* heap)
   // We assume that MC_INCREMENTAL is the first scope so that we can properly
   // map it to RuntimeCallStats.
   STATIC_ASSERT(0 == Scope::MC_INCREMENTAL);
-  current_.end_time = heap_->MonotonicallyIncreasingTimeInMs();
-  for (int i = 0; i < BackgroundScope::NUMBER_OF_SCOPES; i++) {
+  current_.end_time = MonotonicallyIncreasingTimeInMs();
+  for (int i = 0; i < Scope::NUMBER_OF_SCOPES; i++) {
     background_counter_[i].total_duration_ms = 0;
   }
 }
 
 void GCTracer::ResetForTesting() {
   current_ = Event(Event::START, GarbageCollectionReason::kTesting, nullptr);
-  current_.end_time = heap_->MonotonicallyIncreasingTimeInMs();
+  current_.end_time = MonotonicallyIncreasingTimeInMs();
   previous_ = current_;
   ResetIncrementalMarkingCounters();
   allocation_time_ms_ = 0.0;
@@ -209,7 +216,7 @@ void GCTracer::ResetForTesting() {
   current_mark_compact_mutator_utilization_ = 1.0;
   previous_mark_compact_end_time_ = 0;
   base::MutexGuard guard(&background_counter_mutex_);
-  for (int i = 0; i < BackgroundScope::NUMBER_OF_SCOPES; i++) {
+  for (int i = 0; i < Scope::NUMBER_OF_SCOPES; i++) {
     background_counter_[i].total_duration_ms = 0;
   }
 }
@@ -248,7 +255,7 @@ void GCTracer::Start(GarbageCollector collector,
   }
 
   current_.reduce_memory = heap_->ShouldReduceMemory();
-  current_.start_time = heap_->MonotonicallyIncreasingTimeInMs();
+  current_.start_time = MonotonicallyIncreasingTimeInMs();
   current_.start_object_size = 0;
   current_.start_memory_size = 0;
   current_.start_holes_size = 0;
@@ -322,7 +329,7 @@ void GCTracer::Stop(GarbageCollector collector) {
           (current_.type == Event::MARK_COMPACTOR ||
            current_.type == Event::INCREMENTAL_MARK_COMPACTOR)));
 
-  current_.end_time = heap_->MonotonicallyIncreasingTimeInMs();
+  current_.end_time = MonotonicallyIncreasingTimeInMs();
 
   AddAllocation(current_.end_time);
 
@@ -585,8 +592,6 @@ void GCTracer::PrintNVP() const {
           "scavenge.update_refs=%.2f "
           "scavenge.sweep_array_buffers=%.2f "
           "background.scavenge.parallel=%.2f "
-          "background.array_buffer_free=%.2f "
-          "background.store_buffer=%.2f "
           "background.unmapper=%.2f "
           "incremental.steps_count=%d "
           "incremental.steps_took=%.1f "
@@ -630,8 +635,6 @@ void GCTracer::PrintNVP() const {
           current_.scopes[Scope::SCAVENGER_SCAVENGE_UPDATE_REFS],
           current_.scopes[Scope::SCAVENGER_SWEEP_ARRAY_BUFFERS],
           current_.scopes[Scope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL],
-          current_.scopes[Scope::BACKGROUND_ARRAY_BUFFER_FREE],
-          current_.scopes[Scope::BACKGROUND_STORE_BUFFER],
           current_.scopes[Scope::BACKGROUND_UNMAPPER],
           current_.incremental_marking_scopes[GCTracer::Scope::MC_INCREMENTAL]
               .steps,
@@ -674,8 +677,6 @@ void GCTracer::PrintNVP() const {
           "background.mark=%.2f "
           "background.evacuate.copy=%.2f "
           "background.evacuate.update_pointers=%.2f "
-          "background.array_buffer_free=%.2f "
-          "background.store_buffer=%.2f "
           "background.unmapper=%.2f "
           "update_marking_deque=%.2f "
           "reset_liveness=%.2f\n",
@@ -700,8 +701,6 @@ void GCTracer::PrintNVP() const {
           current_.scopes[Scope::MINOR_MC_BACKGROUND_MARKING],
           current_.scopes[Scope::MINOR_MC_BACKGROUND_EVACUATE_COPY],
           current_.scopes[Scope::MINOR_MC_BACKGROUND_EVACUATE_UPDATE_POINTERS],
-          current_.scopes[Scope::BACKGROUND_ARRAY_BUFFER_FREE],
-          current_.scopes[Scope::BACKGROUND_STORE_BUFFER],
           current_.scopes[Scope::BACKGROUND_UNMAPPER],
           current_.scopes[Scope::MINOR_MC_MARKING_DEQUE],
           current_.scopes[Scope::MINOR_MC_RESET_LIVENESS]);
@@ -725,7 +724,6 @@ void GCTracer::PrintNVP() const {
           "clear.dependent_code=%.1f "
           "clear.maps=%.1f "
           "clear.slots_buffer=%.1f "
-          "clear.store_buffer=%.1f "
           "clear.string_table=%.1f "
           "clear.weak_collections=%.1f "
           "clear.weak_lists=%.1f "
@@ -770,7 +768,6 @@ void GCTracer::PrintNVP() const {
           "incremental.finalize.external.prologue=%.1f "
           "incremental.finalize.external.epilogue=%.1f "
           "incremental.layout_change=%.1f "
-          "incremental.start=%.1f "
           "incremental.sweep_array_buffers=%.1f "
           "incremental.sweeping=%.1f "
           "incremental.embedder_prologue=%.1f "
@@ -786,8 +783,6 @@ void GCTracer::PrintNVP() const {
           "background.sweep=%.1f "
           "background.evacuate.copy=%.1f "
           "background.evacuate.update_pointers=%.1f "
-          "background.array_buffer_free=%.2f "
-          "background.store_buffer=%.2f "
           "background.unmapper=%.1f "
           "total_size_before=%zu "
           "total_size_after=%zu "
@@ -820,7 +815,6 @@ void GCTracer::PrintNVP() const {
           current_.scopes[Scope::MC_CLEAR_DEPENDENT_CODE],
           current_.scopes[Scope::MC_CLEAR_MAPS],
           current_.scopes[Scope::MC_CLEAR_SLOTS_BUFFER],
-          current_.scopes[Scope::MC_CLEAR_STORE_BUFFER],
           current_.scopes[Scope::MC_CLEAR_STRING_TABLE],
           current_.scopes[Scope::MC_CLEAR_WEAK_COLLECTIONS],
           current_.scopes[Scope::MC_CLEAR_WEAK_LISTS],
@@ -865,7 +859,6 @@ void GCTracer::PrintNVP() const {
           current_.scopes[Scope::MC_INCREMENTAL_EXTERNAL_EPILOGUE],
           current_.scopes[Scope::MC_INCREMENTAL_LAYOUT_CHANGE],
           current_.scopes[Scope::MC_INCREMENTAL_START],
-          current_.scopes[Scope::MC_INCREMENTAL_SWEEP_ARRAY_BUFFERS],
           current_.scopes[Scope::MC_INCREMENTAL_SWEEPING],
           current_.scopes[Scope::MC_INCREMENTAL_EMBEDDER_PROLOGUE],
           current_.scopes[Scope::MC_INCREMENTAL_EMBEDDER_TRACING],
@@ -888,8 +881,6 @@ void GCTracer::PrintNVP() const {
           current_.scopes[Scope::MC_BACKGROUND_SWEEPING],
           current_.scopes[Scope::MC_BACKGROUND_EVACUATE_COPY],
           current_.scopes[Scope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS],
-          current_.scopes[Scope::BACKGROUND_ARRAY_BUFFER_FREE],
-          current_.scopes[Scope::BACKGROUND_STORE_BUFFER],
           current_.scopes[Scope::BACKGROUND_UNMAPPER],
           current_.start_object_size, current_.end_object_size,
           current_.start_holes_size, current_.end_holes_size,
@@ -1152,9 +1143,7 @@ void GCTracer::NotifyIncrementalMarkingStart() {
 
 void GCTracer::FetchBackgroundMarkCompactCounters() {
   FetchBackgroundCounters(Scope::FIRST_MC_BACKGROUND_SCOPE,
-                          Scope::LAST_MC_BACKGROUND_SCOPE,
-                          BackgroundScope::FIRST_MC_BACKGROUND_SCOPE,
-                          BackgroundScope::LAST_MC_BACKGROUND_SCOPE);
+                          Scope::LAST_MC_BACKGROUND_SCOPE);
   heap_->isolate()->counters()->background_marking()->AddSample(
       static_cast<int>(current_.scopes[Scope::MC_BACKGROUND_MARKING]));
   heap_->isolate()->counters()->background_sweeping()->AddSample(
@@ -1163,9 +1152,7 @@ void GCTracer::FetchBackgroundMarkCompactCounters() {
 
 void GCTracer::FetchBackgroundMinorGCCounters() {
   FetchBackgroundCounters(Scope::FIRST_MINOR_GC_BACKGROUND_SCOPE,
-                          Scope::LAST_MINOR_GC_BACKGROUND_SCOPE,
-                          BackgroundScope::FIRST_MINOR_GC_BACKGROUND_SCOPE,
-                          BackgroundScope::LAST_MINOR_GC_BACKGROUND_SCOPE);
+                          Scope::LAST_MINOR_GC_BACKGROUND_SCOPE);
   heap_->isolate()->counters()->background_scavenger()->AddSample(
       static_cast<int>(
           current_.scopes[Scope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL]));
@@ -1173,28 +1160,18 @@ void GCTracer::FetchBackgroundMinorGCCounters() {
 
 void GCTracer::FetchBackgroundGeneralCounters() {
   FetchBackgroundCounters(Scope::FIRST_GENERAL_BACKGROUND_SCOPE,
-                          Scope::LAST_GENERAL_BACKGROUND_SCOPE,
-                          BackgroundScope::FIRST_GENERAL_BACKGROUND_SCOPE,
-                          BackgroundScope::LAST_GENERAL_BACKGROUND_SCOPE);
+                          Scope::LAST_GENERAL_BACKGROUND_SCOPE);
 }
 
-void GCTracer::FetchBackgroundCounters(int first_global_scope,
-                                       int last_global_scope,
-                                       int first_background_scope,
-                                       int last_background_scope) {
-  DCHECK_EQ(last_global_scope - first_global_scope,
-            last_background_scope - first_background_scope);
+void GCTracer::FetchBackgroundCounters(int first_scope, int last_scope) {
   base::MutexGuard guard(&background_counter_mutex_);
-  int background_mc_scopes = last_background_scope - first_background_scope + 1;
-  for (int i = 0; i < background_mc_scopes; i++) {
-    current_.scopes[first_global_scope + i] +=
-        background_counter_[first_background_scope + i].total_duration_ms;
-    background_counter_[first_background_scope + i].total_duration_ms = 0;
+  for (int i = first_scope; i <= last_scope; i++) {
+    current_.scopes[i] += background_counter_[i].total_duration_ms;
+    background_counter_[i].total_duration_ms = 0;
   }
 }
 
-void GCTracer::AddBackgroundScopeSample(BackgroundScope::ScopeId scope,
-                                        double duration) {
+void GCTracer::AddScopeSampleBackground(Scope::ScopeId scope, double duration) {
   base::MutexGuard guard(&background_counter_mutex_);
   BackgroundCounter& counter = background_counter_[scope];
   counter.total_duration_ms += duration;
@@ -1274,15 +1251,12 @@ void GCTracer::RecordGCSumCounters(double atomic_pause_duration) {
           .duration +
       atomic_pause_duration;
   const double background_duration =
-      background_counter_[BackgroundScope::MC_BACKGROUND_EVACUATE_COPY]
+      background_counter_[Scope::MC_BACKGROUND_EVACUATE_COPY]
           .total_duration_ms +
-      background_counter_
-          [BackgroundScope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS]
-              .total_duration_ms +
-      background_counter_[BackgroundScope::MC_BACKGROUND_MARKING]
+      background_counter_[Scope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS]
           .total_duration_ms +
-      background_counter_[BackgroundScope::MC_BACKGROUND_SWEEPING]
-          .total_duration_ms;
+      background_counter_[Scope::MC_BACKGROUND_MARKING].total_duration_ms +
+      background_counter_[Scope::MC_BACKGROUND_SWEEPING].total_duration_ms;
 
   const double marking_duration =
       current_.incremental_marking_scopes[Scope::MC_INCREMENTAL_LAYOUT_CHANGE]
@@ -1294,8 +1268,7 @@ void GCTracer::RecordGCSumCounters(double atomic_pause_duration) {
           .duration +
       current_.scopes[Scope::MC_MARK];
   const double marking_background_duration =
-      background_counter_[BackgroundScope::MC_BACKGROUND_MARKING]
-          .total_duration_ms;
+      background_counter_[Scope::MC_BACKGROUND_MARKING].total_duration_ms;
 
   // UMA.
   heap_->isolate()->counters()->gc_mark_compactor()->AddSample(
diff --git a/deps/v8/src/heap/gc-tracer.h b/deps/v8/src/heap/gc-tracer.h
index 628e7ca4bb99e9..5cad6ef50f4d48 100644
--- a/deps/v8/src/heap/gc-tracer.h
+++ b/deps/v8/src/heap/gc-tracer.h
@@ -6,7 +6,9 @@
 #define V8_HEAP_GC_TRACER_H_
 
 #include "src/base/compiler-specific.h"
+#include "src/base/optional.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/time.h"
 #include "src/base/ring-buffer.h"
 #include "src/common/globals.h"
 #include "src/heap/heap.h"
@@ -28,22 +30,31 @@ enum ScavengeSpeedMode { kForAllObjects, kForSurvivedObjects };
 #define TRACE_GC_CATEGORIES \
   "devtools.timeline," TRACE_DISABLED_BY_DEFAULT("v8.gc")
 
-#define TRACE_GC(tracer, scope_id)                             \
-  GCTracer::Scope::ScopeId gc_tracer_scope_id(scope_id);       \
-  GCTracer::Scope gc_tracer_scope(tracer, gc_tracer_scope_id); \
+#define TRACE_GC(tracer, scope_id)                            \
+  GCTracer::Scope::ScopeId gc_tracer_scope_id(scope_id);      \
+  GCTracer::Scope gc_tracer_scope(tracer, gc_tracer_scope_id, \
+                                  ThreadKind::kMain);         \
   TRACE_EVENT0(TRACE_GC_CATEGORIES, GCTracer::Scope::Name(gc_tracer_scope_id))
 
-#define TRACE_BACKGROUND_GC(tracer, scope_id)                                 \
-  WorkerThreadRuntimeCallStatsScope runtime_call_stats_scope(                 \
-      tracer->worker_thread_runtime_call_stats());                            \
-  GCTracer::BackgroundScope background_scope(tracer, scope_id,                \
-                                             runtime_call_stats_scope.Get()); \
-  TRACE_EVENT0(TRACE_GC_CATEGORIES, GCTracer::BackgroundScope::Name(scope_id))
+#define TRACE_GC1(tracer, scope_id, thread_kind)                            \
+  GCTracer::Scope::ScopeId gc_tracer_scope_id(scope_id);                    \
+  GCTracer::Scope gc_tracer_scope(tracer, gc_tracer_scope_id, thread_kind); \
+  TRACE_EVENT0(TRACE_GC_CATEGORIES, GCTracer::Scope::Name(gc_tracer_scope_id))
+
+#define TRACE_GC_EPOCH(tracer, scope_id, thread_kind)                          \
+  GCTracer::Scope::ScopeId gc_tracer_scope_id(scope_id);                       \
+  GCTracer::Scope gc_tracer_scope(tracer, gc_tracer_scope_id, thread_kind);    \
+  CollectionEpoch gc_tracer_epoch = tracer->CurrentEpoch(scope_id);            \
+  TRACE_EVENT1(TRACE_GC_CATEGORIES, GCTracer::Scope::Name(gc_tracer_scope_id), \
+               "epoch", gc_tracer_epoch)
 
 // GCTracer collects and prints ONE line after each garbage collector
 // invocation IFF --trace_gc is used.
 class V8_EXPORT_PRIVATE GCTracer {
  public:
+  GCTracer(const GCTracer&) = delete;
+  GCTracer& operator=(const GCTracer&) = delete;
+
   struct IncrementalMarkingInfos {
     IncrementalMarkingInfos() : duration(0), longest_step(0), steps(0) {}
 
@@ -66,7 +77,7 @@ class V8_EXPORT_PRIVATE GCTracer {
     int steps;
   };
 
-  class Scope {
+  class V8_EXPORT_PRIVATE V8_NODISCARD Scope {
    public:
     enum ScopeId {
 #define DEFINE_SCOPE(scope) scope,
@@ -79,7 +90,7 @@ class V8_EXPORT_PRIVATE GCTracer {
       FIRST_SCOPE = MC_INCREMENTAL,
       NUMBER_OF_INCREMENTAL_SCOPES =
           LAST_INCREMENTAL_SCOPE - FIRST_INCREMENTAL_SCOPE + 1,
-      FIRST_GENERAL_BACKGROUND_SCOPE = BACKGROUND_ARRAY_BUFFER_FREE,
+      FIRST_GENERAL_BACKGROUND_SCOPE = BACKGROUND_YOUNG_ARRAY_BUFFER_SWEEP,
       LAST_GENERAL_BACKGROUND_SCOPE = BACKGROUND_UNMAPPER,
       FIRST_MC_BACKGROUND_SCOPE = MC_BACKGROUND_EVACUATE_COPY,
       LAST_MC_BACKGROUND_SCOPE = MC_BACKGROUND_SWEEPING,
@@ -90,47 +101,21 @@ class V8_EXPORT_PRIVATE GCTracer {
       FIRST_BACKGROUND_SCOPE = FIRST_GENERAL_BACKGROUND_SCOPE
     };
 
-    Scope(GCTracer* tracer, ScopeId scope);
+    Scope(GCTracer* tracer, ScopeId scope, ThreadKind thread_kind);
     ~Scope();
+    Scope(const Scope&) = delete;
+    Scope& operator=(const Scope&) = delete;
     static const char* Name(ScopeId id);
+    static bool NeedsYoungEpoch(ScopeId id);
 
    private:
     GCTracer* tracer_;
     ScopeId scope_;
+    ThreadKind thread_kind_;
     double start_time_;
     RuntimeCallTimer timer_;
     RuntimeCallStats* runtime_stats_ = nullptr;
-
-    DISALLOW_COPY_AND_ASSIGN(Scope);
-  };
-
-  class V8_EXPORT_PRIVATE BackgroundScope {
-   public:
-    enum ScopeId {
-#define DEFINE_SCOPE(scope) scope,
-      TRACER_BACKGROUND_SCOPES(DEFINE_SCOPE)
-#undef DEFINE_SCOPE
-          NUMBER_OF_SCOPES,
-      FIRST_GENERAL_BACKGROUND_SCOPE = BACKGROUND_ARRAY_BUFFER_FREE,
-      LAST_GENERAL_BACKGROUND_SCOPE = BACKGROUND_UNMAPPER,
-      FIRST_MC_BACKGROUND_SCOPE = MC_BACKGROUND_EVACUATE_COPY,
-      LAST_MC_BACKGROUND_SCOPE = MC_BACKGROUND_SWEEPING,
-      FIRST_MINOR_GC_BACKGROUND_SCOPE = MINOR_MC_BACKGROUND_EVACUATE_COPY,
-      LAST_MINOR_GC_BACKGROUND_SCOPE = SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL
-    };
-    BackgroundScope(GCTracer* tracer, ScopeId scope,
-                    RuntimeCallStats* runtime_stats);
-    ~BackgroundScope();
-
-    static const char* Name(ScopeId id);
-
-   private:
-    GCTracer* tracer_;
-    ScopeId scope_;
-    double start_time_;
-    RuntimeCallTimer timer_;
-    RuntimeCallStats* runtime_stats_;
-    DISALLOW_COPY_AND_ASSIGN(BackgroundScope);
+    base::Optional<WorkerThreadRuntimeCallStatsScope> runtime_call_stats_scope_;
   };
 
   class Event {
@@ -211,8 +196,6 @@ class V8_EXPORT_PRIVATE GCTracer {
                                                    double optional_speed);
 
   static RuntimeCallCounterId RCSCounterFromScope(Scope::ScopeId id);
-  static RuntimeCallCounterId RCSCounterFromBackgroundScope(
-      BackgroundScope::ScopeId id);
 
   explicit GCTracer(Heap* heap);
 
@@ -349,8 +332,7 @@ class V8_EXPORT_PRIVATE GCTracer {
     }
   }
 
-  void AddBackgroundScopeSample(BackgroundScope::ScopeId scope,
-                                double duration);
+  void AddScopeSampleBackground(Scope::ScopeId scope, double duration);
 
   void RecordGCPhasesHistograms(TimedHistogram* gc_timer);
 
@@ -363,6 +345,8 @@ class V8_EXPORT_PRIVATE GCTracer {
 
   WorkerThreadRuntimeCallStats* worker_thread_runtime_call_stats();
 
+  CollectionEpoch CurrentEpoch(Scope::ScopeId id);
+
  private:
   FRIEND_TEST(GCTracer, AverageSpeed);
   FRIEND_TEST(GCTracerTest, AllocationThroughput);
@@ -405,6 +389,8 @@ class V8_EXPORT_PRIVATE GCTracer {
   // recording takes place at the end of the atomic pause.
   void RecordGCSumCounters(double atomic_pause_duration);
 
+  double MonotonicallyIncreasingTimeInMs();
+
   // Print one detailed trace line in name=value format.
   // TODO(ernstm): Move to Heap.
   void PrintNVP() const;
@@ -425,9 +411,7 @@ class V8_EXPORT_PRIVATE GCTracer {
            current_.scopes[Scope::MC_INCREMENTAL_EXTERNAL_PROLOGUE];
   }
 
-  void FetchBackgroundCounters(int first_global_scope, int last_global_scope,
-                               int first_background_scope,
-                               int last_background_scope);
+  void FetchBackgroundCounters(int first_scope, int last_scope);
   void FetchBackgroundMinorGCCounters();
   void FetchBackgroundMarkCompactCounters();
   void FetchBackgroundGeneralCounters();
@@ -499,9 +483,7 @@ class V8_EXPORT_PRIVATE GCTracer {
   base::RingBuffer<double> recorded_survival_ratios_;
 
   base::Mutex background_counter_mutex_;
-  BackgroundCounter background_counter_[BackgroundScope::NUMBER_OF_SCOPES];
-
-  DISALLOW_COPY_AND_ASSIGN(GCTracer);
+  BackgroundCounter background_counter_[Scope::NUMBER_OF_SCOPES];
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/heap-controller.cc b/deps/v8/src/heap/heap-controller.cc
index d59f8abe9f5ccd..0854ceeb91ec95 100644
--- a/deps/v8/src/heap/heap-controller.cc
+++ b/deps/v8/src/heap/heap-controller.cc
@@ -34,7 +34,7 @@ double MemoryController<Trait>::MaxGrowingFactor(size_t max_heap_size) {
   constexpr double kHighFactor = 4.0;
 
   size_t max_size = max_heap_size;
-  max_size = Max(max_size, Trait::kMinSize);
+  max_size = std::max({max_size, Trait::kMinSize});
 
   // If we are on a device with lots of memory, we allow a high heap
   // growing factor.
@@ -108,8 +108,8 @@ double MemoryController<Trait>::DynamicGrowingFactor(double gc_speed,
 
   // The factor is a / b, but we need to check for small b first.
   double factor = (a < b * max_factor) ? a / b : max_factor;
-  factor = Min(factor, max_factor);
-  factor = Max(factor, Trait::kMinGrowingFactor);
+  factor = std::min(factor, max_factor);
+  factor = std::max({factor, Trait::kMinGrowingFactor});
   return factor;
 }
 
@@ -132,7 +132,7 @@ size_t MemoryController<Trait>::CalculateAllocationLimit(
   switch (growing_mode) {
     case Heap::HeapGrowingMode::kConservative:
     case Heap::HeapGrowingMode::kSlow:
-      factor = Min(factor, Trait::kConservativeGrowingFactor);
+      factor = std::min({factor, Trait::kConservativeGrowingFactor});
       break;
     case Heap::HeapGrowingMode::kMinimal:
       factor = Trait::kMinGrowingFactor;
@@ -152,15 +152,15 @@ size_t MemoryController<Trait>::CalculateAllocationLimit(
   CHECK_LT(1.0, factor);
   CHECK_LT(0, current_size);
   const uint64_t limit =
-      Max(static_cast<uint64_t>(current_size * factor),
-          static_cast<uint64_t>(current_size) +
-              MinimumAllocationLimitGrowingStep(growing_mode)) +
+      std::max(static_cast<uint64_t>(current_size * factor),
+               static_cast<uint64_t>(current_size) +
+                   MinimumAllocationLimitGrowingStep(growing_mode)) +
       new_space_capacity;
-  const uint64_t limit_above_min_size = Max<uint64_t>(limit, min_size);
+  const uint64_t limit_above_min_size = std::max<uint64_t>(limit, min_size);
   const uint64_t halfway_to_the_max =
       (static_cast<uint64_t>(current_size) + max_size) / 2;
   const size_t result =
-      static_cast<size_t>(Min(limit_above_min_size, halfway_to_the_max));
+      static_cast<size_t>(std::min(limit_above_min_size, halfway_to_the_max));
   if (FLAG_trace_gc_verbose) {
     Isolate::FromHeap(heap)->PrintWithTimestamp(
         "[%s] Limit: old size: %zu KB, new limit: %zu KB (%.1f)\n",
diff --git a/deps/v8/src/heap/heap-inl.h b/deps/v8/src/heap/heap-inl.h
index fe4f2b18bcbb76..2e6f0996889f25 100644
--- a/deps/v8/src/heap/heap-inl.h
+++ b/deps/v8/src/heap/heap-inl.h
@@ -170,7 +170,6 @@ AllocationResult Heap::AllocateRaw(int size_in_bytes, AllocationType type,
                                    AllocationAlignment alignment) {
   DCHECK(AllowHandleAllocation::IsAllowed());
   DCHECK(AllowHeapAllocation::IsAllowed());
-  DCHECK(AllowGarbageCollection::IsAllowed());
   DCHECK_IMPLIES(type == AllocationType::kCode || type == AllocationType::kMap,
                  alignment == AllocationAlignment::kWordAligned);
   DCHECK_EQ(gc_state(), NOT_IN_GC);
@@ -271,7 +270,6 @@ HeapObject Heap::AllocateRawWith(int size, AllocationType allocation,
                                  AllocationAlignment alignment) {
   DCHECK(AllowHandleAllocation::IsAllowed());
   DCHECK(AllowHeapAllocation::IsAllowed());
-  DCHECK(AllowGarbageCollection::IsAllowed());
   DCHECK_EQ(gc_state(), NOT_IN_GC);
   Heap* heap = isolate()->heap();
   if (!V8_ENABLE_THIRD_PARTY_HEAP_BOOL &&
@@ -563,6 +561,25 @@ void Heap::UpdateAllocationSite(Map map, HeapObject object,
   (*pretenuring_feedback)[AllocationSite::unchecked_cast(Object(key))]++;
 }
 
+bool Heap::IsPendingAllocation(HeapObject object) {
+  // TODO(ulan): Optimize this function to perform 3 loads at most.
+  Address addr = object.address();
+  Address top = new_space_->original_top_acquire();
+  Address limit = new_space_->original_limit_relaxed();
+  if (top <= addr && addr < limit) return true;
+  PagedSpaceIterator spaces(this);
+  for (PagedSpace* space = spaces.Next(); space != nullptr;
+       space = spaces.Next()) {
+    top = space->original_top_acquire();
+    limit = space->original_limit_relaxed();
+    if (top <= addr && addr < limit) return true;
+  }
+  if (addr == lo_space_->pending_object()) return true;
+  if (addr == new_lo_space_->pending_object()) return true;
+  if (addr == code_lo_space_->pending_object()) return true;
+  return false;
+}
+
 void Heap::ExternalStringTable::AddString(String string) {
   DCHECK(string.IsExternalString());
   DCHECK(!Contains(string));
@@ -625,8 +642,8 @@ int Heap::MaxNumberToStringCacheSize() const {
   // size to ensure that it is bigger after being made 'full size'.
   size_t number_string_cache_size = max_semi_space_size_ / 512;
   number_string_cache_size =
-      Max(static_cast<size_t>(kInitialNumberStringCacheSize * 2),
-          Min<size_t>(0x4000u, number_string_cache_size));
+      std::max(static_cast<size_t>(kInitialNumberStringCacheSize * 2),
+               std::min(static_cast<size_t>(0x4000), number_string_cache_size));
   // There is a string and a number per entry so the length is twice the number
   // of entries.
   return static_cast<int>(number_string_cache_size * 2);
diff --git a/deps/v8/src/heap/heap-write-barrier-inl.h b/deps/v8/src/heap/heap-write-barrier-inl.h
index 6c5fccb551643c..4eaea5b461f127 100644
--- a/deps/v8/src/heap/heap-write-barrier-inl.h
+++ b/deps/v8/src/heap/heap-write-barrier-inl.h
@@ -171,7 +171,7 @@ inline void GenerationalBarrierForCode(Code host, RelocInfo* rinfo,
 }
 
 inline WriteBarrierMode GetWriteBarrierModeForObject(
-    HeapObject object, const DisallowHeapAllocation* promise) {
+    HeapObject object, const DisallowGarbageCollection* promise) {
   if (FLAG_disable_write_barriers) return SKIP_WRITE_BARRIER;
   DCHECK(Heap_PageFlagsAreConsistent(object));
   heap_internals::MemoryChunk* chunk =
diff --git a/deps/v8/src/heap/heap.cc b/deps/v8/src/heap/heap.cc
index e818600d5b3326..235d17615d5388 100644
--- a/deps/v8/src/heap/heap.cc
+++ b/deps/v8/src/heap/heap.cc
@@ -39,6 +39,7 @@
 #include "src/heap/combined-heap.h"
 #include "src/heap/concurrent-allocator.h"
 #include "src/heap/concurrent-marking.h"
+#include "src/heap/cppgc-js/cpp-heap.h"
 #include "src/heap/embedder-tracing.h"
 #include "src/heap/finalization-registry-cleanup-task.h"
 #include "src/heap/gc-idle-time-handler.h"
@@ -96,12 +97,21 @@
 #include "src/heap/conservative-stack-visitor.h"
 #endif
 
+#include "src/base/platform/wrappers.h"
 // Has to be the last include (doesn't have include guards):
 #include "src/objects/object-macros.h"
 
 namespace v8 {
 namespace internal {
 
+namespace {
+std::atomic<CollectionEpoch> global_epoch{0};
+
+CollectionEpoch next_epoch() {
+  return global_epoch.fetch_add(1, std::memory_order_relaxed) + 1;
+}
+}  // namespace
+
 #ifdef V8_ENABLE_THIRD_PARTY_HEAP
 Isolate* Heap::GetIsolateFromWritableObject(HeapObject object) {
   return reinterpret_cast<Isolate*>(
@@ -224,8 +234,8 @@ size_t Heap::YoungGenerationSizeFromOldGenerationSize(size_t old_generation) {
                      ? kOldGenerationToSemiSpaceRatioLowMemory
                      : kOldGenerationToSemiSpaceRatio;
   size_t semi_space = old_generation / ratio;
-  semi_space = Min<size_t>(semi_space, kMaxSemiSpaceSize);
-  semi_space = Max<size_t>(semi_space, kMinSemiSpaceSize);
+  semi_space = std::min({semi_space, kMaxSemiSpaceSize});
+  semi_space = std::max({semi_space, kMinSemiSpaceSize});
   semi_space = RoundUp(semi_space, Page::kPageSize);
   return YoungGenerationSizeFromSemiSpaceSize(semi_space);
 }
@@ -236,8 +246,10 @@ size_t Heap::HeapSizeFromPhysicalMemory(uint64_t physical_memory) {
                             kPhysicalMemoryToOldGenerationRatio *
                             kHeapLimitMultiplier;
   old_generation =
-      Min<uint64_t>(old_generation, MaxOldGenerationSize(physical_memory));
-  old_generation = Max<uint64_t>(old_generation, V8HeapTrait::kMinSize);
+      std::min(old_generation,
+               static_cast<uint64_t>(MaxOldGenerationSize(physical_memory)));
+  old_generation =
+      std::max({old_generation, static_cast<uint64_t>(V8HeapTrait::kMinSize)});
   old_generation = RoundUp(old_generation, Page::kPageSize);
 
   size_t young_generation = YoungGenerationSizeFromOldGenerationSize(
@@ -300,7 +312,7 @@ size_t Heap::MaxOldGenerationSize(uint64_t physical_memory) {
     DCHECK_EQ(max_size / GB, 2);
     max_size *= 2;
   }
-  return Min(max_size, AllocatorLimitOnMaxOldGenerationSize());
+  return std::min(max_size, AllocatorLimitOnMaxOldGenerationSize());
 }
 
 size_t Heap::YoungGenerationSizeFromSemiSpaceSize(size_t semi_space_size) {
@@ -354,7 +366,6 @@ size_t Heap::CommittedMemory() {
          CommittedOldGenerationMemory();
 }
 
-
 size_t Heap::CommittedPhysicalMemory() {
   if (!HasBeenSetUp()) return 0;
 
@@ -372,7 +383,6 @@ size_t Heap::CommittedMemoryExecutable() {
   return static_cast<size_t>(memory_allocator()->SizeExecutable());
 }
 
-
 void Heap::UpdateMaximumCommitted() {
   if (!HasBeenSetUp()) return;
 
@@ -836,7 +846,8 @@ void Heap::GarbageCollectionPrologue() {
   UpdateMaximumCommitted();
 
 #ifdef DEBUG
-  DCHECK(!AllowHeapAllocation::IsAllowed() && gc_state() == NOT_IN_GC);
+  DCHECK(!AllowGarbageCollection::IsAllowed());
+  DCHECK_EQ(gc_state(), NOT_IN_GC);
 
   if (FLAG_gc_verbose) Print();
 #endif  // DEBUG
@@ -860,6 +871,7 @@ void Heap::GarbageCollectionPrologueInSafepoint() {
 
   UpdateNewSpaceAllocationCounter();
   CheckNewSpaceExpansionCriteria();
+  new_space_->ResetParkedAllocationBuffers();
 }
 
 size_t Heap::SizeOfObjects() {
@@ -933,6 +945,18 @@ void Heap::RemoveAllocationObserversFromAllSpaces(
   }
 }
 
+void Heap::PublishPendingAllocations() {
+  new_space_->MarkLabStartInitialized();
+  PagedSpaceIterator spaces(this);
+  for (PagedSpace* space = spaces.Next(); space != nullptr;
+       space = spaces.Next()) {
+    space->MoveOriginalTopForward();
+  }
+  lo_space_->ResetPendingObject();
+  new_lo_space_->ResetPendingObject();
+  code_lo_space_->ResetPendingObject();
+}
+
 namespace {
 inline bool MakePretenureDecision(
     AllocationSite site, AllocationSite::PretenureDecision current_decision,
@@ -1160,7 +1184,7 @@ void Heap::GarbageCollectionEpilogueInSafepoint(GarbageCollector collector) {
 
 void Heap::GarbageCollectionEpilogue() {
   TRACE_GC(tracer(), GCTracer::Scope::HEAP_EPILOGUE);
-  AllowHeapAllocation for_the_rest_of_the_epilogue;
+  AllowGarbageCollection for_the_rest_of_the_epilogue;
 
   UpdateMaximumCommitted();
 
@@ -1196,7 +1220,7 @@ void Heap::GarbageCollectionEpilogue() {
   last_gc_time_ = MonotonicallyIncreasingTimeInMs();
 }
 
-class GCCallbacksScope {
+class V8_NODISCARD GCCallbacksScope {
  public:
   explicit GCCallbacksScope(Heap* heap) : heap_(heap) {
     heap_->gc_callbacks_depth_++;
@@ -1209,7 +1233,6 @@ class GCCallbacksScope {
   Heap* heap_;
 };
 
-
 void Heap::HandleGCRequest() {
   if (FLAG_stress_scavenge > 0 && stress_scavenge_observer_->HasRequestedGC()) {
     CollectAllGarbage(NEW_SPACE, GarbageCollectionReason::kTesting);
@@ -1391,10 +1414,6 @@ void Heap::CollectAllAvailableGarbage(GarbageCollectionReason gc_reason) {
   }
 
   set_current_gc_flags(kNoGCFlags);
-  new_space_->Shrink();
-  new_lo_space_->SetCapacity(new_space_->Capacity() *
-                             kNewLargeObjectSpaceToSemiSpaceRatio);
-  UncommitFromSpace();
   EagerlyFreeExternalMemory();
 
   if (FLAG_trace_duplicate_threshold_kb) {
@@ -1463,9 +1482,9 @@ void Heap::ReportExternalMemoryPressure() {
     // Incremental marking is turned on an has already been started.
     const double kMinStepSize = 5;
     const double kMaxStepSize = 10;
-    const double ms_step = Min(
-        kMaxStepSize,
-        Max(kMinStepSize, static_cast<double>(current) / limit * kMinStepSize));
+    const double ms_step = std::min(
+        kMaxStepSize, std::max(kMinStepSize, static_cast<double>(current) /
+                                                 limit * kMinStepSize));
     const double deadline = MonotonicallyIncreasingTimeInMs() + ms_step;
     // Extend the gc callback flags with external memory flags.
     current_gc_callback_flags_ = static_cast<GCCallbackFlags>(
@@ -1534,7 +1553,8 @@ bool Heap::CollectGarbage(AllocationSpace space,
   // of allocation sequences and we assume that a garbage collection will allow
   // the subsequent allocation attempts to go through.
   if (FLAG_random_gc_interval > 0 || FLAG_gc_interval >= 0) {
-    allocation_timeout_ = Max(6, NextAllocationTimeout(allocation_timeout_));
+    allocation_timeout_ =
+        std::max(6, NextAllocationTimeout(allocation_timeout_));
   }
 #endif
 
@@ -1558,9 +1578,7 @@ bool Heap::CollectGarbage(AllocationSpace space,
 
   {
     tracer()->Start(collector, gc_reason, collector_reason);
-    DCHECK(AllowHeapAllocation::IsAllowed());
     DCHECK(AllowGarbageCollection::IsAllowed());
-    DisallowHeapAllocation no_allocation_during_gc;
     DisallowGarbageCollection no_gc_during_gc;
     GarbageCollectionPrologue();
 
@@ -1591,7 +1609,6 @@ bool Heap::CollectGarbage(AllocationSpace space,
             local_embedder_heap_tracer(),
             EmbedderHeapTracer::EmbedderStackState::kMayContainHeapPointers);
         if (scope.CheckReenter()) {
-          AllowHeapAllocation allow_allocation;
           AllowGarbageCollection allow_gc;
           AllowJavascriptExecution allow_js(isolate());
           TRACE_GC(tracer(), GCTracer::Scope::HEAP_EXTERNAL_PROLOGUE);
@@ -1616,7 +1633,6 @@ bool Heap::CollectGarbage(AllocationSpace space,
         TRACE_GC(tracer(), GCTracer::Scope::HEAP_EXTERNAL_WEAK_GLOBAL_HANDLES);
         gc_post_processing_depth_++;
         {
-          AllowHeapAllocation allow_allocation;
           AllowGarbageCollection allow_gc;
           AllowJavascriptExecution allow_js(isolate());
           freed_global_handles +=
@@ -1629,7 +1645,6 @@ bool Heap::CollectGarbage(AllocationSpace space,
       {
         GCCallbacksScope scope(this);
         if (scope.CheckReenter()) {
-          AllowHeapAllocation allow_allocation;
           AllowGarbageCollection allow_gc;
           AllowJavascriptExecution allow_js(isolate());
           TRACE_GC(tracer(), GCTracer::Scope::HEAP_EXTERNAL_EPILOGUE);
@@ -1701,7 +1716,6 @@ bool Heap::CollectGarbage(AllocationSpace space,
   return freed_global_handles > 0;
 }
 
-
 int Heap::NotifyContextDisposed(bool dependant_context) {
   if (!dependant_context) {
     tracer()->ResetSurvivalEvents();
@@ -1727,12 +1741,39 @@ void Heap::StartIncrementalMarking(int gc_flags,
                                    GarbageCollectionReason gc_reason,
                                    GCCallbackFlags gc_callback_flags) {
   DCHECK(incremental_marking()->IsStopped());
+
+  // Sweeping needs to be completed such that markbits are all cleared before
+  // starting marking again.
+  CompleteSweepingFull();
+
   SafepointScope safepoint(this);
+
+#ifdef DEBUG
+  VerifyCountersAfterSweeping();
+#endif
+
+  // Now that sweeping is completed, we can update the current epoch for the new
+  // full collection.
+  UpdateEpochFull();
+
   set_current_gc_flags(gc_flags);
   current_gc_callback_flags_ = gc_callback_flags;
   incremental_marking()->Start(gc_reason);
 }
 
+void Heap::CompleteSweepingFull() {
+  TRACE_GC_EPOCH(tracer(), GCTracer::Scope::MC_COMPLETE_SWEEPING,
+                 ThreadKind::kMain);
+
+  {
+    TRACE_GC(tracer(), GCTracer::Scope::MC_COMPLETE_SWEEP_ARRAY_BUFFERS);
+    array_buffer_sweeper()->EnsureFinished();
+  }
+
+  mark_compact_collector()->EnsureSweepingCompleted();
+  DCHECK(!mark_compact_collector()->sweeping_in_progress());
+}
+
 void Heap::StartIncrementalMarkingIfAllocationLimitIsReached(
     int gc_flags, const GCCallbackFlags gc_callback_flags) {
   if (incremental_marking()->IsStopped()) {
@@ -1940,23 +1981,52 @@ void Heap::UpdateSurvivalStatistics(int start_new_space_size) {
   tracer()->AddSurvivalRatio(survival_rate);
 }
 
+namespace {
+GCTracer::Scope::ScopeId CollectorScopeId(GarbageCollector collector) {
+  switch (collector) {
+    case MARK_COMPACTOR:
+      return GCTracer::Scope::ScopeId::MARK_COMPACTOR;
+    case MINOR_MARK_COMPACTOR:
+      return GCTracer::Scope::ScopeId::MINOR_MARK_COMPACTOR;
+    case SCAVENGER:
+      return GCTracer::Scope::ScopeId::SCAVENGER;
+  }
+  UNREACHABLE();
+}
+}  // namespace
+
 size_t Heap::PerformGarbageCollection(
     GarbageCollector collector, const v8::GCCallbackFlags gc_callback_flags) {
   DisallowJavascriptExecution no_js(isolate());
   base::Optional<SafepointScope> optional_safepoint_scope;
 
+  if (IsYoungGenerationCollector(collector)) {
+    CompleteSweepingYoung(collector);
+  } else {
+    DCHECK_EQ(GarbageCollector::MARK_COMPACTOR, collector);
+    CompleteSweepingFull();
+  }
+
+  // The last GC cycle is done after completing sweeping. Start the next GC
+  // cycle.
+  UpdateCurrentEpoch(collector);
+
   // Stop time-to-collection timer before safepoint - we do not want to measure
   // time for safepointing.
   collection_barrier_->StopTimeToCollectionTimer();
 
+  TRACE_GC_EPOCH(tracer(), CollectorScopeId(collector), ThreadKind::kMain);
+
   if (FLAG_local_heaps) {
     optional_safepoint_scope.emplace(this);
   }
+
 #ifdef VERIFY_HEAP
   if (FLAG_verify_heap) {
     Verify();
   }
 #endif
+
   tracer()->StartInSafepoint();
 
   GarbageCollectionPrologueInSafepoint();
@@ -2036,6 +2106,34 @@ size_t Heap::PerformGarbageCollection(
   return freed_global_handles;
 }
 
+void Heap::CompleteSweepingYoung(GarbageCollector collector) {
+  GCTracer::Scope::ScopeId scope_id;
+
+  switch (collector) {
+    case GarbageCollector::MINOR_MARK_COMPACTOR:
+      scope_id = GCTracer::Scope::MINOR_MC_COMPLETE_SWEEP_ARRAY_BUFFERS;
+      break;
+    case GarbageCollector::SCAVENGER:
+      scope_id = GCTracer::Scope::SCAVENGER_COMPLETE_SWEEP_ARRAY_BUFFERS;
+      break;
+    default:
+      UNREACHABLE();
+  }
+
+  TRACE_GC_EPOCH(tracer(), scope_id, ThreadKind::kMain);
+  array_buffer_sweeper()->EnsureFinished();
+}
+
+void Heap::UpdateCurrentEpoch(GarbageCollector collector) {
+  if (IsYoungGenerationCollector(collector)) {
+    epoch_young_ = next_epoch();
+  } else if (incremental_marking()->IsStopped()) {
+    epoch_full_ = next_epoch();
+  }
+}
+
+void Heap::UpdateEpochFull() { epoch_full_ = next_epoch(); }
+
 void Heap::RecomputeLimits(GarbageCollector collector) {
   if (!((collector == MARK_COMPACTOR) ||
         (HasLowYoungGenerationAllocationRate() &&
@@ -2061,7 +2159,8 @@ void Heap::RecomputeLimits(GarbageCollector collector) {
                   this, max_global_memory_size_, embedder_gc_speed,
                   embedder_speed)
             : 0;
-    global_growing_factor = Max(v8_growing_factor, embedder_growing_factor);
+    global_growing_factor =
+        std::max(v8_growing_factor, embedder_growing_factor);
   }
 
   size_t old_gen_size = OldGenerationSizeOfObjects();
@@ -2132,7 +2231,6 @@ void Heap::CallGCEpilogueCallbacks(GCType gc_type, GCCallbackFlags flags) {
   }
 }
 
-
 void Heap::MarkCompact() {
   PauseAllocationObserversScope pause_observers(this);
 
@@ -2204,7 +2302,6 @@ void Heap::MarkCompactEpilogue() {
   DCHECK(incremental_marking()->IsStopped());
 }
 
-
 void Heap::MarkCompactPrologue() {
   TRACE_GC(tracer(), GCTracer::Scope::MC_PROLOGUE);
   isolate_->descriptor_lookup_cache()->Clear();
@@ -2216,7 +2313,6 @@ void Heap::MarkCompactPrologue() {
   FlushNumberStringCache();
 }
 
-
 void Heap::CheckNewSpaceExpansionCriteria() {
   if (new_space_->TotalCapacity() < new_space_->MaximumCapacity() &&
       survived_since_last_expansion_ > new_space_->TotalCapacity()) {
@@ -2304,7 +2400,6 @@ void Heap::Scavenge() {
   IncrementalMarking::PauseBlackAllocationScope pause_black_allocation(
       incremental_marking());
 
-
   mark_compact_collector()->sweeper()->EnsureIterabilityCompleted();
 
   SetGCState(SCAVENGE);
@@ -2563,26 +2658,22 @@ void Heap::UpdateReferencesInExternalStringTable(
   external_string_table_.UpdateReferences(updater_func);
 }
 
-
 void Heap::ProcessAllWeakReferences(WeakObjectRetainer* retainer) {
   ProcessNativeContexts(retainer);
   ProcessAllocationSites(retainer);
   ProcessDirtyJSFinalizationRegistries(retainer);
 }
 
-
 void Heap::ProcessYoungWeakReferences(WeakObjectRetainer* retainer) {
   ProcessNativeContexts(retainer);
 }
 
-
 void Heap::ProcessNativeContexts(WeakObjectRetainer* retainer) {
   Object head = VisitWeakList<Context>(this, native_contexts_list(), retainer);
   // Update the head of the list of contexts.
   set_native_contexts_list(head);
 }
 
-
 void Heap::ProcessAllocationSites(WeakObjectRetainer* retainer) {
   Object allocation_site_obj =
       VisitWeakList<AllocationSite>(this, allocation_sites_list(), retainer);
@@ -2611,7 +2702,7 @@ void Heap::ProcessWeakListRoots(WeakObjectRetainer* retainer) {
 
 void Heap::ForeachAllocationSite(
     Object list, const std::function<void(AllocationSite)>& visitor) {
-  DisallowHeapAllocation disallow_heap_allocation;
+  DisallowGarbageCollection no_gc;
   Object current = list;
   while (current.IsAllocationSite()) {
     AllocationSite site = AllocationSite::cast(current);
@@ -2627,7 +2718,7 @@ void Heap::ForeachAllocationSite(
 }
 
 void Heap::ResetAllAllocationSitesDependentCode(AllocationType allocation) {
-  DisallowHeapAllocation no_allocation_scope;
+  DisallowGarbageCollection no_gc_scope;
   bool marked = false;
 
   ForeachAllocationSite(allocation_sites_list(),
@@ -2665,9 +2756,8 @@ void Heap::EvaluateOldSpaceLocalPretenuring(
   }
 }
 
-
 void Heap::VisitExternalResources(v8::ExternalResourceVisitor* visitor) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // All external strings are listed in the external string table.
 
   class ExternalStringTableVisitorAdapter : public RootVisitor {
@@ -2709,7 +2799,6 @@ STATIC_ASSERT(IsAligned(ByteArray::kHeaderSize, kDoubleAlignment));
 STATIC_ASSERT((HeapNumber::kValueOffset & kDoubleAlignmentMask) == kTaggedSize);
 #endif
 
-
 int Heap::GetMaximumFillToAlign(AllocationAlignment alignment) {
   switch (alignment) {
     case kWordAligned:
@@ -2799,10 +2888,10 @@ void Heap::ConfigureInitialOldGenerationSize() {
         MemoryController<V8HeapTrait>::MinimumAllocationLimitGrowingStep(
             CurrentHeapGrowingMode());
     const size_t new_old_generation_allocation_limit =
-        Max(OldGenerationSizeOfObjects() + minimum_growing_step,
-            static_cast<size_t>(
-                static_cast<double>(old_generation_allocation_limit()) *
-                (tracer()->AverageSurvivalRatio() / 100)));
+        std::max(OldGenerationSizeOfObjects() + minimum_growing_step,
+                 static_cast<size_t>(
+                     static_cast<double>(old_generation_allocation_limit()) *
+                     (tracer()->AverageSurvivalRatio() / 100)));
     if (new_old_generation_allocation_limit <
         old_generation_allocation_limit()) {
       set_old_generation_allocation_limit(new_old_generation_allocation_limit);
@@ -2810,7 +2899,7 @@ void Heap::ConfigureInitialOldGenerationSize() {
       old_generation_size_configured_ = true;
     }
     if (UseGlobalMemoryScheduling()) {
-      const size_t new_global_memory_limit = Max(
+      const size_t new_global_memory_limit = std::max(
           GlobalSizeOfObjects() + minimum_growing_step,
           static_cast<size_t>(static_cast<double>(global_allocation_limit_) *
                               (tracer()->AverageSurvivalRatio() / 100)));
@@ -2952,6 +3041,11 @@ class LeftTrimmerVerifierRootVisitor : public RootVisitor {
   explicit LeftTrimmerVerifierRootVisitor(FixedArrayBase to_check)
       : to_check_(to_check) {}
 
+  LeftTrimmerVerifierRootVisitor(const LeftTrimmerVerifierRootVisitor&) =
+      delete;
+  LeftTrimmerVerifierRootVisitor& operator=(
+      const LeftTrimmerVerifierRootVisitor&) = delete;
+
   void VisitRootPointers(Root root, const char* description,
                          FullObjectSlot start, FullObjectSlot end) override {
     for (FullObjectSlot p = start; p < end; ++p) {
@@ -2969,8 +3063,6 @@ class LeftTrimmerVerifierRootVisitor : public RootVisitor {
 
  private:
   FixedArrayBase to_check_;
-
-  DISALLOW_COPY_AND_ASSIGN(LeftTrimmerVerifierRootVisitor);
 };
 }  // namespace
 #endif  // ENABLE_SLOW_DCHECKS
@@ -3387,7 +3479,7 @@ void Heap::FinalizeIncrementalMarkingAtomically(
 void Heap::InvokeIncrementalMarkingPrologueCallbacks() {
   GCCallbacksScope scope(this);
   if (scope.CheckReenter()) {
-    AllowHeapAllocation allow_allocation;
+    AllowGarbageCollection allow_allocation;
     TRACE_GC(tracer(), GCTracer::Scope::MC_INCREMENTAL_EXTERNAL_PROLOGUE);
     VMState<EXTERNAL> state(isolate_);
     HandleScope handle_scope(isolate_);
@@ -3398,7 +3490,7 @@ void Heap::InvokeIncrementalMarkingPrologueCallbacks() {
 void Heap::InvokeIncrementalMarkingEpilogueCallbacks() {
   GCCallbacksScope scope(this);
   if (scope.CheckReenter()) {
-    AllowHeapAllocation allow_allocation;
+    AllowGarbageCollection allow_allocation;
     TRACE_GC(tracer(), GCTracer::Scope::MC_INCREMENTAL_EXTERNAL_EPILOGUE);
     VMState<EXTERNAL> state(isolate_);
     HandleScope handle_scope(isolate_);
@@ -3419,8 +3511,9 @@ void Heap::FinalizeIncrementalMarkingIncrementally(
 
   HistogramTimerScope incremental_marking_scope(
       isolate()->counters()->gc_incremental_marking_finalize());
-  TRACE_EVENT0("v8", "V8.GCIncrementalMarkingFinalize");
-  TRACE_GC(tracer(), GCTracer::Scope::MC_INCREMENTAL_FINALIZE);
+  TRACE_EVENT1("v8", "V8.GCIncrementalMarkingFinalize", "epoch", epoch_full());
+  TRACE_GC_EPOCH(tracer(), GCTracer::Scope::MC_INCREMENTAL_FINALIZE,
+                 ThreadKind::kMain);
 
   SafepointScope safepoint(this);
   InvokeIncrementalMarkingPrologueCallbacks();
@@ -3429,7 +3522,7 @@ void Heap::FinalizeIncrementalMarkingIncrementally(
 }
 
 void Heap::NotifyObjectLayoutChange(
-    HeapObject object, const DisallowHeapAllocation&,
+    HeapObject object, const DisallowGarbageCollection&,
     InvalidateRecordedSlots invalidate_recorded_slots) {
   if (incremental_marking()->IsMarking()) {
     incremental_marking()->MarkBlackAndVisitObjectDueToLayoutChange(object);
@@ -3531,7 +3624,6 @@ GCIdleTimeHeapState Heap::ComputeHeapState() {
   return heap_state;
 }
 
-
 bool Heap::PerformIdleTimeAction(GCIdleTimeAction action,
                                  GCIdleTimeHeapState heap_state,
                                  double deadline_in_ms) {
@@ -3598,7 +3690,6 @@ void Heap::IdleNotificationEpilogue(GCIdleTimeAction action,
   }
 }
 
-
 double Heap::MonotonicallyIncreasingTimeInMs() {
   return V8::GetCurrentPlatform()->MonotonicallyIncreasingTime() *
          static_cast<double>(base::Time::kMillisecondsPerSecond);
@@ -3613,7 +3704,6 @@ bool Heap::IdleNotification(int idle_time_in_ms) {
        static_cast<double>(base::Time::kMillisecondsPerSecond)));
 }
 
-
 bool Heap::IdleNotification(double deadline_in_seconds) {
   CHECK(HasBeenSetUp());
   double deadline_in_ms =
@@ -3640,7 +3730,6 @@ bool Heap::IdleNotification(double deadline_in_seconds) {
   return result;
 }
 
-
 bool Heap::RecentIdleNotificationHappened() {
   return (last_idle_notification_time_ +
           GCIdleTimeHandler::kMaxScheduledIdleTime) >
@@ -3653,13 +3742,15 @@ class MemoryPressureInterruptTask : public CancelableTask {
       : CancelableTask(heap->isolate()), heap_(heap) {}
 
   ~MemoryPressureInterruptTask() override = default;
+  MemoryPressureInterruptTask(const MemoryPressureInterruptTask&) = delete;
+  MemoryPressureInterruptTask& operator=(const MemoryPressureInterruptTask&) =
+      delete;
 
  private:
   // v8::internal::CancelableTask overrides.
   void RunInternal() override { heap_->CheckMemoryPressure(); }
 
   Heap* heap_;
-  DISALLOW_COPY_AND_ASSIGN(MemoryPressureInterruptTask);
 };
 
 void Heap::CheckMemoryPressure() {
@@ -3743,7 +3834,7 @@ void Heap::MemoryPressureNotification(MemoryPressureLevel level,
 }
 
 void Heap::EagerlyFreeExternalMemory() {
-    array_buffer_sweeper()->EnsureFinished();
+  array_buffer_sweeper()->EnsureFinished();
   memory_allocator()->unmapper()->EnsureUnmappingCompleted();
 }
 
@@ -3791,7 +3882,7 @@ bool Heap::InvokeNearHeapLimitCallback() {
                                  initial_max_old_generation_size_);
     if (heap_limit > max_old_generation_size()) {
       set_max_old_generation_size(
-          Min(heap_limit, AllocatorLimitOnMaxOldGenerationSize()));
+          std::min(heap_limit, AllocatorLimitOnMaxOldGenerationSize()));
       return true;
     }
   }
@@ -3841,7 +3932,6 @@ void Heap::Print() {
   }
 }
 
-
 void Heap::ReportCodeStatistics(const char* title) {
   PrintF(">>>>>> Code Stats (%s) >>>>>>\n", title);
   CollectCodeStatistics();
@@ -4049,7 +4139,7 @@ void Heap::VerifyReadOnlyHeap() {
 class SlotVerifyingVisitor : public ObjectVisitor {
  public:
   SlotVerifyingVisitor(std::set<Address>* untyped,
-                       std::set<std::pair<SlotType, Address> >* typed)
+                       std::set<std::pair<SlotType, Address>>* typed)
       : untyped_(untyped), typed_(typed) {}
 
   virtual bool ShouldHaveBeenRecorded(HeapObject host, MaybeObject target) = 0;
@@ -4089,6 +4179,7 @@ class SlotVerifyingVisitor : public ObjectVisitor {
       CHECK(
           InTypedSet(FULL_EMBEDDED_OBJECT_SLOT, rinfo->pc()) ||
           InTypedSet(COMPRESSED_EMBEDDED_OBJECT_SLOT, rinfo->pc()) ||
+          InTypedSet(DATA_EMBEDDED_OBJECT_SLOT, rinfo->pc()) ||
           (rinfo->IsInConstantPool() &&
            InTypedSet(COMPRESSED_OBJECT_SLOT,
                       rinfo->constant_pool_entry_address())) ||
@@ -4107,7 +4198,7 @@ class SlotVerifyingVisitor : public ObjectVisitor {
     return typed_->count(std::make_pair(type, slot)) > 0;
   }
   std::set<Address>* untyped_;
-  std::set<std::pair<SlotType, Address> >* typed_;
+  std::set<std::pair<SlotType, Address>>* typed_;
 };
 
 class OldToNewSlotVerifyingVisitor : public SlotVerifyingVisitor {
@@ -4152,7 +4243,7 @@ class OldToNewSlotVerifyingVisitor : public SlotVerifyingVisitor {
 template <RememberedSetType direction>
 void CollectSlots(MemoryChunk* chunk, Address start, Address end,
                   std::set<Address>* untyped,
-                  std::set<std::pair<SlotType, Address> >* typed) {
+                  std::set<std::pair<SlotType, Address>>* typed) {
   RememberedSet<direction>::Iterate(
       chunk,
       [start, end, untyped](MaybeObjectSlot slot) {
@@ -4192,7 +4283,7 @@ void Heap::VerifyRememberedSetFor(HeapObject object) {
   Address start = object.address();
   Address end = start + object.Size();
   std::set<Address> old_to_new;
-  std::set<std::pair<SlotType, Address> > typed_old_to_new;
+  std::set<std::pair<SlotType, Address>> typed_old_to_new;
   if (!InYoungGeneration(object)) {
     CollectSlots<OLD_TO_NEW>(chunk, start, end, &old_to_new, &typed_old_to_new);
     OldToNewSlotVerifyingVisitor visitor(&old_to_new, &typed_old_to_new,
@@ -4486,8 +4577,8 @@ void Heap::IterateStackRoots(RootVisitor* v) {
 namespace {
 size_t GlobalMemorySizeFromV8Size(size_t v8_size) {
   const size_t kGlobalMemoryToV8Ratio = 2;
-  return Min(static_cast<uint64_t>(std::numeric_limits<size_t>::max()),
-             static_cast<uint64_t>(v8_size) * kGlobalMemoryToV8Ratio);
+  return std::min(static_cast<uint64_t>(std::numeric_limits<size_t>::max()),
+                  static_cast<uint64_t>(v8_size) * kGlobalMemoryToV8Ratio);
 }
 }  // anonymous namespace
 
@@ -4524,7 +4615,7 @@ void Heap::ConfigureHeap(const v8::ResourceConstraints& constraints) {
     max_semi_space_size_ =
         static_cast<size_t>(base::bits::RoundUpToPowerOfTwo64(
             static_cast<uint64_t>(max_semi_space_size_)));
-    max_semi_space_size_ = Max(max_semi_space_size_, kMinSemiSpaceSize);
+    max_semi_space_size_ = std::max({max_semi_space_size_, kMinSemiSpaceSize});
     max_semi_space_size_ = RoundDown<Page::kPageSize>(max_semi_space_size_);
   }
 
@@ -4546,9 +4637,9 @@ void Heap::ConfigureHeap(const v8::ResourceConstraints& constraints) {
                                     : 0;
     }
     max_old_generation_size =
-        Max(max_old_generation_size, MinOldGenerationSize());
-    max_old_generation_size =
-        Min(max_old_generation_size, AllocatorLimitOnMaxOldGenerationSize());
+        std::max(max_old_generation_size, MinOldGenerationSize());
+    max_old_generation_size = std::min(max_old_generation_size,
+                                       AllocatorLimitOnMaxOldGenerationSize());
     max_old_generation_size =
         RoundDown<Page::kPageSize>(max_old_generation_size);
 
@@ -4566,7 +4657,7 @@ void Heap::ConfigureHeap(const v8::ResourceConstraints& constraints) {
     if (max_semi_space_size_ == kMaxSemiSpaceSize) {
       // Start with at least 1*MB semi-space on machines with a lot of memory.
       initial_semispace_size_ =
-          Max(initial_semispace_size_, static_cast<size_t>(1 * MB));
+          std::max(initial_semispace_size_, static_cast<size_t>(1 * MB));
     }
     if (constraints.initial_young_generation_size_in_bytes() > 0) {
       initial_semispace_size_ = SemiSpaceSizeFromYoungGenerationSize(
@@ -4585,7 +4676,7 @@ void Heap::ConfigureHeap(const v8::ResourceConstraints& constraints) {
           static_cast<size_t>(FLAG_min_semi_space_size) * MB;
     }
     initial_semispace_size_ =
-        Min(initial_semispace_size_, max_semi_space_size_);
+        std::min(initial_semispace_size_, max_semi_space_size_);
     initial_semispace_size_ =
         RoundDown<Page::kPageSize>(initial_semispace_size_);
   }
@@ -4619,7 +4710,7 @@ void Heap::ConfigureHeap(const v8::ResourceConstraints& constraints) {
       old_generation_size_configured_ = true;
     }
     initial_old_generation_size_ =
-        Min(initial_old_generation_size_, max_old_generation_size() / 2);
+        std::min(initial_old_generation_size_, max_old_generation_size() / 2);
     initial_old_generation_size_ =
         RoundDown<Page::kPageSize>(initial_old_generation_size_);
   }
@@ -4652,27 +4743,32 @@ void Heap::ConfigureHeap(const v8::ResourceConstraints& constraints) {
   configured_ = true;
 }
 
+void Heap::ConfigureCppHeap(std::shared_ptr<CppHeapCreateParams> params) {
+  cpp_heap_ = std::make_unique<CppHeap>(
+      reinterpret_cast<v8::Isolate*>(isolate()), params->custom_spaces);
+  SetEmbedderHeapTracer(CppHeap::From(cpp_heap_.get()));
+}
+
 void Heap::AddToRingBuffer(const char* string) {
   size_t first_part =
-      Min(strlen(string), kTraceRingBufferSize - ring_buffer_end_);
-  memcpy(trace_ring_buffer_ + ring_buffer_end_, string, first_part);
+      std::min(strlen(string), kTraceRingBufferSize - ring_buffer_end_);
+  base::Memcpy(trace_ring_buffer_ + ring_buffer_end_, string, first_part);
   ring_buffer_end_ += first_part;
   if (first_part < strlen(string)) {
     ring_buffer_full_ = true;
     size_t second_part = strlen(string) - first_part;
-    memcpy(trace_ring_buffer_, string + first_part, second_part);
+    base::Memcpy(trace_ring_buffer_, string + first_part, second_part);
     ring_buffer_end_ = second_part;
   }
 }
 
-
 void Heap::GetFromRingBuffer(char* buffer) {
   size_t copied = 0;
   if (ring_buffer_full_) {
     copied = kTraceRingBufferSize - ring_buffer_end_;
-    memcpy(buffer, trace_ring_buffer_ + ring_buffer_end_, copied);
+    base::Memcpy(buffer, trace_ring_buffer_ + ring_buffer_end_, copied);
   }
-  memcpy(buffer + copied, trace_ring_buffer_, ring_buffer_end_);
+  base::Memcpy(buffer + copied, trace_ring_buffer_, ring_buffer_end_);
 }
 
 void Heap::ConfigureHeapDefault() {
@@ -4763,12 +4859,12 @@ bool Heap::AllocationLimitOvershotByLargeMargin() {
 
   // Overshoot margin is 50% of allocation limit or half-way to the max heap
   // with special handling of small heaps.
-  const size_t v8_margin =
-      Min(Max(old_generation_allocation_limit() / 2, kMarginForSmallHeaps),
-          (max_old_generation_size() - old_generation_allocation_limit()) / 2);
+  const size_t v8_margin = std::min(
+      std::max(old_generation_allocation_limit() / 2, kMarginForSmallHeaps),
+      (max_old_generation_size() - old_generation_allocation_limit()) / 2);
   const size_t global_margin =
-      Min(Max(global_allocation_limit_ / 2, kMarginForSmallHeaps),
-          (max_global_memory_size_ - global_allocation_limit_) / 2);
+      std::min(std::max(global_allocation_limit_ / 2, kMarginForSmallHeaps),
+               (max_global_memory_size_ - global_allocation_limit_) / 2);
 
   return v8_overshoot >= v8_margin || global_overshoot >= global_margin;
 }
@@ -4973,7 +5069,6 @@ void Heap::EnableInlineAllocation() {
   new_space()->UpdateInlineAllocationLimit(0);
 }
 
-
 void Heap::DisableInlineAllocation() {
   if (inline_allocation_disabled_) return;
   inline_allocation_disabled_ = true;
@@ -5428,6 +5523,7 @@ void Heap::TearDown() {
   dead_object_stats_.reset();
 
   local_embedder_heap_tracer_.reset();
+  cpp_heap_.reset();
 
   external_string_table_.TearDown();
 
@@ -5627,7 +5723,6 @@ class PrintHandleVisitor : public RootVisitor {
   }
 };
 
-
 void Heap::PrintHandles() {
   PrintF("Handles:\n");
   PrintHandleVisitor v;
@@ -5651,7 +5746,6 @@ class CheckHandleCountVisitor : public RootVisitor {
   ptrdiff_t handle_count_;
 };
 
-
 void Heap::CheckHandleCount() {
   CheckHandleCountVisitor v;
   isolate_->handle_scope_implementer()->Iterate(&v);
@@ -5755,7 +5849,6 @@ class HeapObjectsFilter {
   virtual bool SkipObject(HeapObject object) = 0;
 };
 
-
 class UnreachableObjectsFilter : public HeapObjectsFilter {
  public:
   explicit UnreachableObjectsFilter(Heap* heap) : heap_(heap) {
@@ -5865,7 +5958,7 @@ class UnreachableObjectsFilter : public HeapObjectsFilter {
   }
 
   Heap* heap_;
-  DisallowHeapAllocation no_allocation_;
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
   std::unordered_map<BasicMemoryChunk*,
                      std::unordered_set<HeapObject, Object::Hasher>*>
       reachable_;
@@ -6003,7 +6096,6 @@ void Heap::ExternalStringTable::TearDown() {
   old_strings_.clear();
 }
 
-
 void Heap::RememberUnmappedPage(Address page, bool compacted) {
   // Tag the page pointer to make it findable in the dump file.
   if (compacted) {
@@ -6140,7 +6232,7 @@ MaybeHandle<JSFinalizationRegistry> Heap::DequeueDirtyJSFinalizationRegistry() {
 void Heap::RemoveDirtyFinalizationRegistriesOnContext(NativeContext context) {
   if (!FLAG_harmony_weak_refs) return;
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   Isolate* isolate = this->isolate();
   Object prev = ReadOnlyRoots(isolate).undefined_value();
@@ -6191,21 +6283,18 @@ size_t Heap::NumberOfTrackedHeapObjectTypes() {
   return ObjectStats::OBJECT_STATS_COUNT;
 }
 
-
 size_t Heap::ObjectCountAtLastGC(size_t index) {
   if (live_object_stats_ == nullptr || index >= ObjectStats::OBJECT_STATS_COUNT)
     return 0;
   return live_object_stats_->object_count_last_gc(index);
 }
 
-
 size_t Heap::ObjectSizeAtLastGC(size_t index) {
   if (live_object_stats_ == nullptr || index >= ObjectStats::OBJECT_STATS_COUNT)
     return 0;
   return live_object_stats_->object_size_last_gc(index);
 }
 
-
 bool Heap::GetObjectTypeName(size_t index, const char** object_type,
                              const char** object_sub_type) {
   if (index >= ObjectStats::OBJECT_STATS_COUNT) return false;
@@ -6678,7 +6767,7 @@ void Heap::IncrementObjectCounters() {
 // heap as a strong root array, saves that entry in StrongRootsEntry*, and
 // returns a pointer to Address 1.
 Address* StrongRootBlockAllocator::allocate(size_t n) {
-  void* block = malloc(sizeof(StrongRootsEntry*) + n * sizeof(Address));
+  void* block = base::Malloc(sizeof(StrongRootsEntry*) + n * sizeof(Address));
 
   StrongRootsEntry** header = reinterpret_cast<StrongRootsEntry**>(block);
   Address* ret = reinterpret_cast<Address*>(reinterpret_cast<char*>(block) +
@@ -6699,7 +6788,7 @@ void StrongRootBlockAllocator::deallocate(Address* p, size_t n) noexcept {
 
   heap_->UnregisterStrongRoots(*header);
 
-  free(block);
+  base::Free(block);
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/heap.h b/deps/v8/src/heap/heap.h
index 70e2e14993c4a7..24b92e8bc8c5ee 100644
--- a/deps/v8/src/heap/heap.h
+++ b/deps/v8/src/heap/heap.h
@@ -68,6 +68,7 @@ class BasicMemoryChunk;
 class CodeLargeObjectSpace;
 class CollectionBarrier;
 class ConcurrentMarking;
+class CppHeap;
 class GCIdleTimeHandler;
 class GCIdleTimeHeapState;
 class GCTracer;
@@ -248,6 +249,8 @@ using EphemeronRememberedSet =
     std::unordered_map<EphemeronHashTable, std::unordered_set<int>,
                        Object::Hasher>;
 
+using CollectionEpoch = uint32_t;
+
 class Heap {
  public:
   // Stores ephemeron entries where the EphemeronHashTable is in old-space,
@@ -267,7 +270,7 @@ class Heap {
   };
 
   // Emits GC events for DevTools timeline.
-  class DevToolsTraceEventScope {
+  class V8_NODISCARD DevToolsTraceEventScope {
    public:
     DevToolsTraceEventScope(Heap* heap, const char* event_name,
                             const char* event_type);
@@ -510,6 +513,8 @@ class Heap {
 
   void NotifyOldGenerationExpansion(AllocationSpace space, MemoryChunk* chunk);
 
+  void UpdateCurrentEpoch(GarbageCollector collector);
+
   inline Address* NewSpaceAllocationTopAddress();
   inline Address* NewSpaceAllocationLimitAddress();
   inline Address* OldSpaceAllocationTopAddress();
@@ -783,7 +788,7 @@ class Heap {
     // Do not set the limit lower than the live size + some slack.
     size_t min_limit = SizeOfObjects() + SizeOfObjects() / 4;
     set_max_old_generation_size(
-        Min(max_old_generation_size(), Max(heap_limit, min_limit)));
+        std::min(max_old_generation_size(), std::max(heap_limit, min_limit)));
   }
 
   // ===========================================================================
@@ -1067,6 +1072,9 @@ class Heap {
   V8_EXPORT_PRIVATE void FinalizeIncrementalMarkingAtomically(
       GarbageCollectionReason gc_reason);
 
+  void CompleteSweepingFull();
+  void CompleteSweepingYoung(GarbageCollector collector);
+
   IncrementalMarking* incremental_marking() {
     return incremental_marking_.get();
   }
@@ -1086,7 +1094,7 @@ class Heap {
   // InvalidateRecordedSlots::kNo if this is not necessary or to perform this
   // manually.
   void NotifyObjectLayoutChange(
-      HeapObject object, const DisallowHeapAllocation&,
+      HeapObject object, const DisallowGarbageCollection&,
       InvalidateRecordedSlots invalidate_recorded_slots =
           InvalidateRecordedSlots::kYes);
 
@@ -1133,6 +1141,15 @@ class Heap {
 
   EmbedderHeapTracer::TraceFlags flags_for_embedder_tracer() const;
 
+  // ===========================================================================
+  // Unified heap (C++) support. ===============================================
+  // ===========================================================================
+
+  V8_EXPORT_PRIVATE void ConfigureCppHeap(
+      std::shared_ptr<CppHeapCreateParams> params);
+
+  v8::CppHeap* cpp_heap() const { return cpp_heap_.get(); }
+
   // ===========================================================================
   // External string table API. ================================================
   // ===========================================================================
@@ -1447,6 +1464,16 @@ class Heap {
   void RemoveAllocationObserversFromAllSpaces(
       AllocationObserver* observer, AllocationObserver* new_space_observer);
 
+  // Check if the given object was recently allocated and its fields may appear
+  // as uninitialized to background threads.
+  // This predicate may be invoked from a background thread.
+  inline bool IsPendingAllocation(HeapObject object);
+
+  // Notifies that all previously allocated objects are properly initialized
+  // and ensures that IsPendingAllocation returns false for them. This function
+  // may be invoked only on the main thread.
+  V8_EXPORT_PRIVATE void PublishPendingAllocations();
+
   // ===========================================================================
   // Heap object allocation tracking. ==========================================
   // ===========================================================================
@@ -1538,6 +1565,11 @@ class Heap {
 
   static Isolate* GetIsolateFromWritableObject(HeapObject object);
 
+  CollectionEpoch epoch_young() { return epoch_young_; }
+  CollectionEpoch epoch_full() { return epoch_full_; }
+
+  void UpdateEpochFull();
+
  private:
   using ExternalStringTableUpdaterCallback = String (*)(Heap* heap,
                                                         FullObjectSlot pointer);
@@ -1548,6 +1580,8 @@ class Heap {
   class ExternalStringTable {
    public:
     explicit ExternalStringTable(Heap* heap) : heap_(heap) {}
+    ExternalStringTable(const ExternalStringTable&) = delete;
+    ExternalStringTable& operator=(const ExternalStringTable&) = delete;
 
     // Registers an external string.
     inline void AddString(String string);
@@ -1580,8 +1614,6 @@ class Heap {
     // strings.
     std::vector<Object> young_strings_;
     std::vector<Object> old_strings_;
-
-    DISALLOW_COPY_AND_ASSIGN(ExternalStringTable);
   };
 
   struct StringTypeTable {
@@ -1634,6 +1666,9 @@ class Heap {
   Heap();
   ~Heap();
 
+  Heap(const Heap&) = delete;
+  Heap& operator=(const Heap&) = delete;
+
   static bool IsRegularObjectAllocation(AllocationType allocation) {
     return AllocationType::kYoung == allocation ||
            AllocationType::kOld == allocation;
@@ -2209,6 +2244,7 @@ class Heap {
   std::unique_ptr<AllocationObserver> stress_concurrent_allocation_observer_;
   std::unique_ptr<LocalEmbedderHeapTracer> local_embedder_heap_tracer_;
   std::unique_ptr<MarkingBarrier> marking_barrier_;
+  std::unique_ptr<v8::CppHeap> cpp_heap_;
 
   StrongRootsEntry* strong_roots_head_ = nullptr;
   base::Mutex strong_roots_mutex_;
@@ -2310,6 +2346,11 @@ class Heap {
 
   std::unique_ptr<third_party_heap::Heap> tp_heap_;
 
+  // We need two epochs, since there can be scavenges during incremental
+  // marking.
+  CollectionEpoch epoch_young_ = 0;
+  CollectionEpoch epoch_full_ = 0;
+
   // Classes in "heap" can be friends.
   friend class AlwaysAllocateScope;
   friend class ArrayBufferCollector;
@@ -2349,8 +2390,6 @@ class Heap {
 
   // Used in cctest.
   friend class heap::HeapTester;
-
-  DISALLOW_COPY_AND_ASSIGN(Heap);
 };
 
 class HeapStats {
@@ -2391,7 +2430,7 @@ class HeapStats {
 // Disables GC for all allocations. It should not be used
 // outside heap, deserializer, and isolate bootstrap.
 // Use AlwaysAllocateScopeForTesting in tests.
-class AlwaysAllocateScope {
+class V8_NODISCARD AlwaysAllocateScope {
  public:
   inline ~AlwaysAllocateScope();
 
@@ -2407,7 +2446,7 @@ class AlwaysAllocateScope {
   Heap* heap_;
 };
 
-class AlwaysAllocateScopeForTesting {
+class V8_NODISCARD AlwaysAllocateScopeForTesting {
  public:
   explicit inline AlwaysAllocateScopeForTesting(Heap* heap);
 
@@ -2416,7 +2455,7 @@ class AlwaysAllocateScopeForTesting {
 };
 
 // The CodeSpaceMemoryModificationScope can only be used by the main thread.
-class CodeSpaceMemoryModificationScope {
+class V8_NODISCARD CodeSpaceMemoryModificationScope {
  public:
   explicit inline CodeSpaceMemoryModificationScope(Heap* heap);
   inline ~CodeSpaceMemoryModificationScope();
@@ -2428,7 +2467,7 @@ class CodeSpaceMemoryModificationScope {
 // The CodePageCollectionMemoryModificationScope can only be used by the main
 // thread. It will not be enabled if a CodeSpaceMemoryModificationScope is
 // already active.
-class CodePageCollectionMemoryModificationScope {
+class V8_NODISCARD CodePageCollectionMemoryModificationScope {
  public:
   explicit inline CodePageCollectionMemoryModificationScope(Heap* heap);
   inline ~CodePageCollectionMemoryModificationScope();
@@ -2440,7 +2479,7 @@ class CodePageCollectionMemoryModificationScope {
 // The CodePageMemoryModificationScope does not check if tansitions to
 // writeable and back to executable are actually allowed, i.e. the MemoryChunk
 // was registered to be executable. It can be used by concurrent threads.
-class CodePageMemoryModificationScope {
+class V8_NODISCARD CodePageMemoryModificationScope {
  public:
   explicit inline CodePageMemoryModificationScope(BasicMemoryChunk* chunk);
   explicit inline CodePageMemoryModificationScope(Code object);
@@ -2452,7 +2491,7 @@ class CodePageMemoryModificationScope {
 
   // Disallow any GCs inside this scope, as a relocation of the underlying
   // object would change the {MemoryChunk} that this scope targets.
-  DISALLOW_HEAP_ALLOCATION(no_heap_allocation_)
+  DISALLOW_GARBAGE_COLLECTION(no_heap_allocation_)
 };
 
 // Visitor class to verify interior pointers in spaces that do not contain
@@ -2527,7 +2566,7 @@ class V8_EXPORT_PRIVATE SpaceIterator : public Malloced {
 // only iterate over one space only.
 //
 // HeapObjectIterator ensures there is no allocation during its lifetime (using
-// an embedded DisallowHeapAllocation instance).
+// an embedded DisallowGarbageCollection instance).
 //
 // HeapObjectIterator can skip free list nodes (that is, de-allocated heap
 // objects that still remain in the heap). As implementation of free nodes
@@ -2551,7 +2590,7 @@ class V8_EXPORT_PRIVATE HeapObjectIterator {
  private:
   HeapObject NextObject();
 
-  DISALLOW_HEAP_ALLOCATION(no_heap_allocation_)
+  DISALLOW_GARBAGE_COLLECTION(no_heap_allocation_)
 
   Heap* heap_;
   std::unique_ptr<SafepointScope> safepoint_scope_;
@@ -2610,7 +2649,10 @@ class StrongRootBlockAllocator {
   using size_type = size_t;
   using difference_type = ptrdiff_t;
   template <class U>
-  struct rebind;
+  struct rebind {
+    STATIC_ASSERT((std::is_same<Address, U>::value));
+    using other = StrongRootBlockAllocator;
+  };
 
   explicit StrongRootBlockAllocator(Heap* heap) : heap_(heap) {}
 
@@ -2621,23 +2663,6 @@ class StrongRootBlockAllocator {
   Heap* heap_;
 };
 
-// Rebinding to Address gives another StrongRootBlockAllocator.
-template <>
-struct StrongRootBlockAllocator::rebind<Address> {
-  using other = StrongRootBlockAllocator;
-};
-
-// Rebinding to something other than Address gives a std::allocator that
-// is copy-constructable from StrongRootBlockAllocator.
-template <class U>
-struct StrongRootBlockAllocator::rebind {
-  class other : public std::allocator<U> {
-   public:
-    // NOLINTNEXTLINE
-    other(const StrongRootBlockAllocator&) {}
-  };
-};
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/heap/incremental-marking.cc b/deps/v8/src/heap/incremental-marking.cc
index fb0ee2ecab98e3..7b6b01855d608f 100644
--- a/deps/v8/src/heap/incremental-marking.cc
+++ b/deps/v8/src/heap/incremental-marking.cc
@@ -6,7 +6,6 @@
 
 #include "src/codegen/compilation-cache.h"
 #include "src/execution/vm-state-inl.h"
-#include "src/heap/array-buffer-sweeper.h"
 #include "src/heap/concurrent-marking.h"
 #include "src/heap/embedder-tracing.h"
 #include "src/heap/gc-idle-time-handler.h"
@@ -22,7 +21,6 @@
 #include "src/heap/objects-visiting-inl.h"
 #include "src/heap/objects-visiting.h"
 #include "src/heap/safepoint.h"
-#include "src/heap/sweeper.h"
 #include "src/init/v8.h"
 #include "src/numbers/conversions.h"
 #include "src/objects/data-handler-inl.h"
@@ -148,6 +146,8 @@ bool IncrementalMarking::IsBelowActivationThresholds() const {
 }
 
 void IncrementalMarking::Start(GarbageCollectionReason gc_reason) {
+  DCHECK(!collector_->sweeping_in_progress());
+
   if (FLAG_trace_incremental_marking) {
     const size_t old_generation_size_mb =
         heap()->OldGenerationSizeOfObjects() / MB;
@@ -178,8 +178,10 @@ void IncrementalMarking::Start(GarbageCollectionReason gc_reason) {
       static_cast<int>(gc_reason));
   HistogramTimerScope incremental_marking_scope(
       counters->gc_incremental_marking_start());
-  TRACE_EVENT0("v8", "V8.GCIncrementalMarkingStart");
-  TRACE_GC(heap()->tracer(), GCTracer::Scope::MC_INCREMENTAL_START);
+  TRACE_EVENT1("v8", "V8.GCIncrementalMarkingStart", "epoch",
+               heap_->epoch_full());
+  TRACE_GC_EPOCH(heap()->tracer(), GCTracer::Scope::MC_INCREMENTAL_START,
+                 ThreadKind::kMain);
   heap_->tracer()->NotifyIncrementalMarkingStart();
 
   start_time_ms_ = heap()->MonotonicallyIncreasingTimeInMs();
@@ -192,21 +194,7 @@ void IncrementalMarking::Start(GarbageCollectionReason gc_reason) {
   bytes_marked_concurrently_ = 0;
   was_activated_ = true;
 
-  {
-    TRACE_GC(heap()->tracer(),
-             GCTracer::Scope::MC_INCREMENTAL_SWEEP_ARRAY_BUFFERS);
-    heap_->array_buffer_sweeper()->EnsureFinished();
-  }
-
-  if (!collector_->sweeping_in_progress()) {
-    StartMarking();
-  } else {
-    if (FLAG_trace_incremental_marking) {
-      heap()->isolate()->PrintWithTimestamp(
-          "[IncrementalMarking] Start sweeping.\n");
-    }
-    SetState(SWEEPING);
-  }
+  StartMarking();
 
   heap_->AddAllocationObserversToAllSpaces(&old_generation_observer_,
                                            &new_generation_observer_);
@@ -507,7 +495,7 @@ void IncrementalMarking::UpdateMarkingWorklistAfterScavenge() {
 void IncrementalMarking::UpdateMarkedBytesAfterScavenge(
     size_t dead_bytes_in_new_space) {
   if (!IsMarking()) return;
-  bytes_marked_ -= Min(bytes_marked_, dead_bytes_in_new_space);
+  bytes_marked_ -= std::min(bytes_marked_, dead_bytes_in_new_space);
 }
 
 void IncrementalMarking::ProcessBlackAllocatedObject(HeapObject obj) {
@@ -594,7 +582,7 @@ void IncrementalMarking::Stop() {
         "[IncrementalMarking] Stopping: old generation %dMB, limit %dMB, "
         "overshoot %dMB\n",
         old_generation_size_mb, old_generation_limit_mb,
-        Max(0, old_generation_size_mb - old_generation_limit_mb));
+        std::max(0, old_generation_size_mb - old_generation_limit_mb));
   }
 
   SpaceIterator it(heap_);
@@ -653,7 +641,7 @@ double IncrementalMarking::CurrentTimeToMarkingTask() const {
   const double current_time_to_marking_task =
       incremental_marking_job_.CurrentTimeToTask(heap_);
   if (recorded_time_to_marking_task == 0.0) return 0.0;
-  return Max(recorded_time_to_marking_task, current_time_to_marking_task);
+  return std::max(recorded_time_to_marking_task, current_time_to_marking_task);
 }
 
 void IncrementalMarking::MarkingComplete(CompletionAction action) {
@@ -667,7 +655,7 @@ void IncrementalMarking::MarkingComplete(CompletionAction action) {
     if (time_to_force_completion_ == 0.0) {
       const double now = heap_->MonotonicallyIncreasingTimeInMs();
       const double overshoot_ms =
-          Max(kMinOvershootMs, (now - start_time_ms_) * kAllowedOvershoot);
+          std::max(kMinOvershootMs, (now - start_time_ms_) * kAllowedOvershoot);
       const double time_to_marking_task = CurrentTimeToMarkingTask();
       if (time_to_marking_task == 0.0 || time_to_marking_task > overshoot_ms) {
         if (FLAG_trace_incremental_marking) {
@@ -751,7 +739,7 @@ void IncrementalMarking::ScheduleBytesToMarkBasedOnTime(double time_ms) {
   constexpr double kMinTimeBetweenScheduleInMs = 10;
   if (schedule_update_time_ms_ + kMinTimeBetweenScheduleInMs > time_ms) return;
   double delta_ms =
-      Min(time_ms - schedule_update_time_ms_, kTargetMarkingWallTimeInMs);
+      std::min(time_ms - schedule_update_time_ms_, kTargetMarkingWallTimeInMs);
   schedule_update_time_ms_ = time_ms;
 
   size_t bytes_to_mark =
@@ -782,8 +770,9 @@ StepResult IncrementalMarking::AdvanceWithDeadline(
     StepOrigin step_origin) {
   HistogramTimerScope incremental_marking_scope(
       heap_->isolate()->counters()->gc_incremental_marking());
-  TRACE_EVENT0("v8", "V8.GCIncrementalMarking");
-  TRACE_GC(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL);
+  TRACE_EVENT1("v8", "V8.GCIncrementalMarking", "epoch", heap_->epoch_full());
+  TRACE_GC_EPOCH(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL,
+                 ThreadKind::kMain);
   DCHECK(!IsStopped());
 
   ScheduleBytesToMarkBasedOnTime(heap()->MonotonicallyIncreasingTimeInMs());
@@ -791,36 +780,6 @@ StepResult IncrementalMarking::AdvanceWithDeadline(
   return Step(kStepSizeInMs, completion_action, step_origin);
 }
 
-void IncrementalMarking::FinalizeSweeping() {
-  DCHECK(state_ == SWEEPING);
-  if (ContinueConcurrentSweeping()) {
-    if (FLAG_stress_incremental_marking) {
-      // To start concurrent marking a bit earlier, support concurrent sweepers
-      // from main thread by sweeping some pages.
-      SupportConcurrentSweeping();
-    }
-    return;
-  }
-
-  SafepointScope scope(heap());
-  collector_->EnsureSweepingCompleted();
-  DCHECK(!collector_->sweeping_in_progress());
-#ifdef DEBUG
-  heap_->VerifyCountersAfterSweeping();
-#endif
-  StartMarking();
-}
-
-bool IncrementalMarking::ContinueConcurrentSweeping() {
-  if (!collector_->sweeping_in_progress()) return false;
-  return FLAG_concurrent_sweeping &&
-         collector_->sweeper()->AreSweeperTasksRunning();
-}
-
-void IncrementalMarking::SupportConcurrentSweeping() {
-  collector_->sweeper()->SupportConcurrentSweeping();
-}
-
 size_t IncrementalMarking::StepSizeToKeepUpWithAllocations() {
   // Update bytes_allocated_ based on the allocation counter.
   size_t current_counter = heap_->OldGenerationAllocationCounter();
@@ -839,9 +798,9 @@ size_t IncrementalMarking::StepSizeToMakeProgress() {
     return heap()->OldGenerationSizeOfObjects() / kTargetStepCountAtOOM;
   }
 
-  return Min(Max(initial_old_generation_size_ / kTargetStepCount,
-                 IncrementalMarking::kMinStepSizeInBytes),
-             kMaxStepSizeInByte);
+  return std::min(std::max({initial_old_generation_size_ / kTargetStepCount,
+                            IncrementalMarking::kMinStepSizeInBytes}),
+                  kMaxStepSizeInByte);
 }
 
 void IncrementalMarking::AddScheduledBytesToMark(size_t bytes_to_mark) {
@@ -911,7 +870,7 @@ void IncrementalMarking::AdvanceOnAllocation() {
   // Code using an AlwaysAllocateScope assumes that the GC state does not
   // change; that implies that no marking steps must be performed.
   if (heap_->gc_state() != Heap::NOT_IN_GC || !FLAG_incremental_marking ||
-      (state_ != SWEEPING && state_ != MARKING) || heap_->always_allocate()) {
+      state_ != MARKING || heap_->always_allocate()) {
     return;
   }
   HistogramTimerScope incremental_marking_scope(
@@ -927,11 +886,6 @@ StepResult IncrementalMarking::Step(double max_step_size_in_ms,
                                     StepOrigin step_origin) {
   double start = heap_->MonotonicallyIncreasingTimeInMs();
 
-  if (state_ == SWEEPING) {
-    TRACE_GC(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL_SWEEPING);
-    FinalizeSweeping();
-  }
-
   StepResult combined_result = StepResult::kMoreWorkRemaining;
   size_t bytes_to_process = 0;
   size_t v8_bytes_processed = 0;
@@ -963,8 +917,9 @@ StepResult IncrementalMarking::Step(double max_step_size_in_ms,
         heap()->tracer()->IncrementalMarkingSpeedInBytesPerMillisecond();
     size_t max_step_size = GCIdleTimeHandler::EstimateMarkingStepSize(
         max_step_size_in_ms, marking_speed);
-    bytes_to_process = Min(ComputeStepSizeInBytes(step_origin), max_step_size);
-    bytes_to_process = Max(bytes_to_process, kMinStepSizeInBytes);
+    bytes_to_process =
+        std::min(ComputeStepSizeInBytes(step_origin), max_step_size);
+    bytes_to_process = std::max({bytes_to_process, kMinStepSizeInBytes});
 
     // Perform a single V8 and a single embedder step. In case both have been
     // observed as empty back to back, we can finalize.
@@ -979,8 +934,8 @@ StepResult IncrementalMarking::Step(double max_step_size_in_ms,
     StepResult embedder_result = StepResult::kNoImmediateWork;
     if (heap_->local_embedder_heap_tracer()->InUse()) {
       embedder_deadline =
-          Min(max_step_size_in_ms,
-              static_cast<double>(bytes_to_process) / marking_speed);
+          std::min(max_step_size_in_ms,
+                   static_cast<double>(bytes_to_process) / marking_speed);
       // TODO(chromium:1056170): Replace embedder_deadline with bytes_to_process
       // after migrating blink to the cppgc library and after v8 can directly
       // push objects to Oilpan.
diff --git a/deps/v8/src/heap/incremental-marking.h b/deps/v8/src/heap/incremental-marking.h
index b259cacb93688a..cd5d3c24ce7163 100644
--- a/deps/v8/src/heap/incremental-marking.h
+++ b/deps/v8/src/heap/incremental-marking.h
@@ -29,7 +29,7 @@ enum class StepResult {
 
 class V8_EXPORT_PRIVATE IncrementalMarking final {
  public:
-  enum State : uint8_t { STOPPED, SWEEPING, MARKING, COMPLETE };
+  enum State : uint8_t { STOPPED, MARKING, COMPLETE };
 
   enum CompletionAction { GC_VIA_STACK_GUARD, NO_GC_VIA_STACK_GUARD };
 
@@ -39,7 +39,7 @@ class V8_EXPORT_PRIVATE IncrementalMarking final {
   using AtomicMarkingState = MarkCompactCollector::AtomicMarkingState;
   using NonAtomicMarkingState = MarkCompactCollector::NonAtomicMarkingState;
 
-  class PauseBlackAllocationScope {
+  class V8_NODISCARD PauseBlackAllocationScope {
    public:
     explicit PauseBlackAllocationScope(IncrementalMarking* marking)
         : marking_(marking), paused_(false) {
@@ -116,8 +116,6 @@ class V8_EXPORT_PRIVATE IncrementalMarking final {
 
   inline bool IsStopped() const { return state() == STOPPED; }
 
-  inline bool IsSweeping() const { return state() == SWEEPING; }
-
   inline bool IsMarking() const { return state() >= MARKING; }
 
   inline bool IsMarkingIncomplete() const { return state() == MARKING; }
diff --git a/deps/v8/src/heap/item-parallel-job.cc b/deps/v8/src/heap/item-parallel-job.cc
index 001f40193acb48..5a63e28d773b96 100644
--- a/deps/v8/src/heap/item-parallel-job.cc
+++ b/deps/v8/src/heap/item-parallel-job.cc
@@ -63,7 +63,7 @@ void ItemParallelJob::Run() {
   // tasks participate in). Some jobs even have 0 items to preprocess but
   // still have multiple tasks.
   // TODO(gab): Figure out a cleaner scheme for this.
-  const size_t num_tasks_processing_items = Min(num_items, tasks_.size());
+  const size_t num_tasks_processing_items = std::min(num_items, tasks_.size());
 
   // In the event of an uneven workload, distribute an extra item to the first
   // |items_remainder| tasks.
diff --git a/deps/v8/src/heap/item-parallel-job.h b/deps/v8/src/heap/item-parallel-job.h
index 27e1f0865f5e71..ba21e2efd929c2 100644
--- a/deps/v8/src/heap/item-parallel-job.h
+++ b/deps/v8/src/heap/item-parallel-job.h
@@ -42,6 +42,8 @@ class V8_EXPORT_PRIVATE ItemParallelJob {
    public:
     Item() = default;
     virtual ~Item() = default;
+    Item(const Item&) = delete;
+    Item& operator=(const Item&) = delete;
 
     // Marks an item as being finished.
     void MarkFinished() { CHECK_EQ(kProcessing, state_.exchange(kFinished)); }
@@ -59,8 +61,6 @@ class V8_EXPORT_PRIVATE ItemParallelJob {
 
     friend class ItemParallelJob;
     friend class ItemParallelJob::Task;
-
-    DISALLOW_COPY_AND_ASSIGN(Item);
   };
 
   class V8_EXPORT_PRIVATE Task : public CancelableTask {
@@ -68,6 +68,8 @@ class V8_EXPORT_PRIVATE ItemParallelJob {
     enum class Runner { kForeground, kBackground };
     explicit Task(Isolate* isolate);
     ~Task() override = default;
+    Task(const Task&) = delete;
+    Task& operator=(const Task&) = delete;
 
     virtual void RunInParallel(Runner runner) = 0;
 
@@ -109,8 +111,6 @@ class V8_EXPORT_PRIVATE ItemParallelJob {
     size_t items_considered_ = 0;
     Runner runner_ = Runner::kBackground;
     base::Semaphore* on_finish_ = nullptr;
-
-    DISALLOW_COPY_AND_ASSIGN(Task);
   };
 
   ItemParallelJob(CancelableTaskManager* cancelable_task_manager,
@@ -118,6 +118,9 @@ class V8_EXPORT_PRIVATE ItemParallelJob {
 
   ~ItemParallelJob();
 
+  ItemParallelJob(const ItemParallelJob&) = delete;
+  ItemParallelJob& operator=(const ItemParallelJob&) = delete;
+
   // Adds a task to the job. Transfers ownership to the job.
   void AddTask(Task* task) { tasks_.push_back(std::unique_ptr<Task>(task)); }
 
@@ -135,8 +138,6 @@ class V8_EXPORT_PRIVATE ItemParallelJob {
   std::vector<std::unique_ptr<Task>> tasks_;
   CancelableTaskManager* cancelable_task_manager_;
   base::Semaphore* pending_tasks_;
-
-  DISALLOW_COPY_AND_ASSIGN(ItemParallelJob);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/large-spaces.cc b/deps/v8/src/heap/large-spaces.cc
index b207e34ae82935..421c734142e492 100644
--- a/deps/v8/src/heap/large-spaces.cc
+++ b/deps/v8/src/heap/large-spaces.cc
@@ -97,7 +97,8 @@ LargeObjectSpace::LargeObjectSpace(Heap* heap, AllocationSpace id)
     : Space(heap, id, new NoFreeList()),
       size_(0),
       page_count_(0),
-      objects_size_(0) {}
+      objects_size_(0),
+      pending_object_(0) {}
 
 void LargeObjectSpace::TearDown() {
   while (!memory_chunk_list_.Empty()) {
@@ -140,6 +141,7 @@ AllocationResult OldLargeObjectSpace::AllocateRaw(int object_size,
   if (page == nullptr) return AllocationResult::Retry(identity());
   page->SetOldGenerationPageFlags(heap()->incremental_marking()->IsMarking());
   HeapObject object = page->GetObject();
+  pending_object_.store(object.address(), std::memory_order_release);
   heap()->StartIncrementalMarkingIfAllocationLimitIsReached(
       heap()->GCFlagsForIncrementalMarking(),
       kGCCallbackScheduleIdleGarbageCollection);
@@ -441,7 +443,6 @@ OldLargeObjectSpace::OldLargeObjectSpace(Heap* heap, AllocationSpace id)
 
 NewLargeObjectSpace::NewLargeObjectSpace(Heap* heap, size_t capacity)
     : LargeObjectSpace(heap, NEW_LO_SPACE),
-      pending_object_(0),
       capacity_(capacity) {}
 
 AllocationResult NewLargeObjectSpace::AllocateRaw(int object_size) {
@@ -460,12 +461,12 @@ AllocationResult NewLargeObjectSpace::AllocateRaw(int object_size) {
   if (page == nullptr) return AllocationResult::Retry(identity());
 
   // The size of the first object may exceed the capacity.
-  capacity_ = Max(capacity_, SizeOfObjects());
+  capacity_ = std::max(capacity_, SizeOfObjects());
 
   HeapObject result = page->GetObject();
   page->SetYoungGenerationPageFlags(heap()->incremental_marking()->IsMarking());
   page->SetFlag(MemoryChunk::TO_PAGE);
-  pending_object_.store(result.address(), std::memory_order_relaxed);
+  pending_object_.store(result.address(), std::memory_order_release);
 #ifdef ENABLE_MINOR_MC
   if (FLAG_minor_mc) {
     page->AllocateYoungGenerationBitmap();
@@ -523,7 +524,7 @@ void NewLargeObjectSpace::FreeDeadObjects(
 }
 
 void NewLargeObjectSpace::SetCapacity(size_t capacity) {
-  capacity_ = Max(capacity, SizeOfObjects());
+  capacity_ = std::max(capacity, SizeOfObjects());
 }
 
 CodeLargeObjectSpace::CodeLargeObjectSpace(Heap* heap)
diff --git a/deps/v8/src/heap/large-spaces.h b/deps/v8/src/heap/large-spaces.h
index 1182b40315bc9d..8761b9949c4f21 100644
--- a/deps/v8/src/heap/large-spaces.h
+++ b/deps/v8/src/heap/large-spaces.h
@@ -112,6 +112,16 @@ class V8_EXPORT_PRIVATE LargeObjectSpace : public Space {
   void Print() override;
 #endif
 
+  // The last allocated object that is not guaranteed to be initialized when the
+  // concurrent marker visits it.
+  Address pending_object() {
+    return pending_object_.load(std::memory_order_acquire);
+  }
+
+  void ResetPendingObject() {
+    pending_object_.store(0, std::memory_order_release);
+  }
+
  protected:
   LargeObjectSpace(Heap* heap, AllocationSpace id);
 
@@ -123,6 +133,7 @@ class V8_EXPORT_PRIVATE LargeObjectSpace : public Space {
   int page_count_;       // number of chunks
   std::atomic<size_t> objects_size_;  // size of objects
   base::Mutex allocation_mutex_;
+  std::atomic<Address> pending_object_;
 
  private:
   friend class LargeObjectSpaceObjectIterator;
@@ -165,16 +176,7 @@ class NewLargeObjectSpace : public LargeObjectSpace {
 
   void SetCapacity(size_t capacity);
 
-  // The last allocated object that is not guaranteed to be initialized when the
-  // concurrent marker visits it.
-  Address pending_object() {
-    return pending_object_.load(std::memory_order_relaxed);
-  }
-
-  void ResetPendingObject() { pending_object_.store(0); }
-
  private:
-  std::atomic<Address> pending_object_;
   size_t capacity_;
 };
 
diff --git a/deps/v8/src/heap/local-heap-inl.h b/deps/v8/src/heap/local-heap-inl.h
index 89f35ec21fe38b..c520e1e5569f7c 100644
--- a/deps/v8/src/heap/local-heap-inl.h
+++ b/deps/v8/src/heap/local-heap-inl.h
@@ -5,6 +5,7 @@
 #ifndef V8_HEAP_LOCAL_HEAP_INL_H_
 #define V8_HEAP_LOCAL_HEAP_INL_H_
 
+#include "src/common/assert-scope.h"
 #include "src/handles/persistent-handles.h"
 #include "src/heap/concurrent-allocator-inl.h"
 #include "src/heap/local-heap.h"
@@ -16,10 +17,9 @@ AllocationResult LocalHeap::AllocateRaw(int size_in_bytes, AllocationType type,
                                         AllocationOrigin origin,
                                         AllocationAlignment alignment) {
 #if DEBUG
-  DCHECK_EQ(LocalHeap::Current(), this);
+  VerifyCurrent();
   DCHECK(AllowHandleAllocation::IsAllowed());
   DCHECK(AllowHeapAllocation::IsAllowed());
-  DCHECK(AllowGarbageCollection::IsAllowed());
   DCHECK_IMPLIES(type == AllocationType::kCode || type == AllocationType::kMap,
                  alignment == AllocationAlignment::kWordAligned);
   Heap::HeapState state = heap()->gc_state();
diff --git a/deps/v8/src/heap/local-heap.cc b/deps/v8/src/heap/local-heap.cc
index b54df4aae13271..38f2cf17a8f4ff 100644
--- a/deps/v8/src/heap/local-heap.cc
+++ b/deps/v8/src/heap/local-heap.cc
@@ -6,13 +6,16 @@
 
 #include <memory>
 
+#include "src/base/logging.h"
 #include "src/base/platform/mutex.h"
 #include "src/common/globals.h"
+#include "src/execution/isolate.h"
 #include "src/handles/local-handles.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap-write-barrier.h"
 #include "src/heap/local-heap-inl.h"
 #include "src/heap/marking-barrier.h"
+#include "src/heap/parked-scope.h"
 #include "src/heap/safepoint.h"
 
 namespace v8 {
@@ -24,6 +27,17 @@ thread_local LocalHeap* current_local_heap = nullptr;
 
 LocalHeap* LocalHeap::Current() { return current_local_heap; }
 
+#ifdef DEBUG
+void LocalHeap::VerifyCurrent() {
+  LocalHeap* current = LocalHeap::Current();
+
+  if (is_main_thread())
+    DCHECK_NULL(current);
+  else
+    DCHECK_EQ(current, this);
+}
+#endif
+
 LocalHeap::LocalHeap(Heap* heap, ThreadKind kind,
                      std::unique_ptr<PersistentHandles> persistent_handles)
     : heap_(heap),
@@ -38,7 +52,7 @@ LocalHeap::LocalHeap(Heap* heap, ThreadKind kind,
       marking_barrier_(new MarkingBarrier(this)),
       old_space_allocator_(this, heap->old_space()) {
   heap_->safepoint()->AddLocalHeap(this, [this] {
-    if (FLAG_local_heaps) {
+    if (FLAG_local_heaps && !is_main_thread()) {
       WriteBarrier::SetForThread(marking_barrier_.get());
       if (heap_->incremental_marking()->IsMarking()) {
         marking_barrier_->Activate(
@@ -51,7 +65,7 @@ LocalHeap::LocalHeap(Heap* heap, ThreadKind kind,
     persistent_handles_->Attach(this);
   }
   DCHECK_NULL(current_local_heap);
-  current_local_heap = this;
+  if (!is_main_thread()) current_local_heap = this;
 }
 
 LocalHeap::~LocalHeap() {
@@ -61,14 +75,16 @@ LocalHeap::~LocalHeap() {
   heap_->safepoint()->RemoveLocalHeap(this, [this] {
     old_space_allocator_.FreeLinearAllocationArea();
 
-    if (FLAG_local_heaps) {
+    if (FLAG_local_heaps && !is_main_thread()) {
       marking_barrier_->Publish();
       WriteBarrier::ClearForThread(marking_barrier_.get());
     }
   });
 
-  DCHECK_EQ(current_local_heap, this);
-  current_local_heap = nullptr;
+  if (!is_main_thread()) {
+    DCHECK_EQ(current_local_heap, this);
+    current_local_heap = nullptr;
+  }
 }
 
 void LocalHeap::EnsurePersistentHandles() {
@@ -101,13 +117,17 @@ bool LocalHeap::ContainsLocalHandle(Address* location) {
 }
 
 bool LocalHeap::IsHandleDereferenceAllowed() {
-  DCHECK_EQ(LocalHeap::Current(), this);
+#ifdef DEBUG
+  VerifyCurrent();
+#endif
   return state_ == ThreadState::Running;
 }
 #endif
 
 bool LocalHeap::IsParked() {
-  DCHECK_EQ(LocalHeap::Current(), this);
+#ifdef DEBUG
+  VerifyCurrent();
+#endif
   return state_ == ThreadState::Parked;
 }
 
diff --git a/deps/v8/src/heap/local-heap.h b/deps/v8/src/heap/local-heap.h
index bd2a14760cac7a..16eb08d84144a3 100644
--- a/deps/v8/src/heap/local-heap.h
+++ b/deps/v8/src/heap/local-heap.h
@@ -45,9 +45,7 @@ class V8_EXPORT_PRIVATE LocalHeap {
   // Frequently invoked by local thread to check whether safepoint was requested
   // from the main thread.
   void Safepoint() {
-    // In case garbage collection is disabled, the thread isn't even allowed to
-    // invoke Safepoint(). Otherwise a GC might happen here.
-    DCHECK(AllowGarbageCollection::IsAllowed());
+    DCHECK(AllowSafepoints::IsAllowed());
 
     if (IsSafepointRequested()) {
       ClearSafepointRequested();
@@ -113,6 +111,10 @@ class V8_EXPORT_PRIVATE LocalHeap {
   // with the current thread.
   static LocalHeap* Current();
 
+#ifdef DEBUG
+  void VerifyCurrent();
+#endif
+
   // Allocate an uninitialized object.
   V8_WARN_UNUSED_RESULT inline AllocationResult AllocateRaw(
       int size_in_bytes, AllocationType allocation,
@@ -187,47 +189,7 @@ class V8_EXPORT_PRIVATE LocalHeap {
   friend class ParkedScope;
   friend class UnparkedScope;
   friend class ConcurrentAllocator;
-};
-
-// Scope that explicitly parks LocalHeap prohibiting access to the heap and the
-// creation of Handles.
-class ParkedScope {
- public:
-  explicit ParkedScope(LocalHeap* local_heap) : local_heap_(local_heap) {
-    local_heap_->Park();
-  }
-
-  ~ParkedScope() { local_heap_->Unpark(); }
-
- private:
-  LocalHeap* const local_heap_;
-};
-
-// Scope that explicitly unparks LocalHeap allowing access to the heap and the
-// creation of Handles.
-class UnparkedScope {
- public:
-  explicit UnparkedScope(LocalHeap* local_heap) : local_heap_(local_heap) {
-    local_heap_->Unpark();
-  }
-
-  ~UnparkedScope() { local_heap_->Park(); }
-
- private:
-  LocalHeap* const local_heap_;
-};
-
-class ParkedMutexGuard {
-  base::Mutex* guard_;
-
- public:
-  explicit ParkedMutexGuard(LocalHeap* local_heap, base::Mutex* guard)
-      : guard_(guard) {
-    ParkedScope scope(local_heap);
-    guard_->Lock();
-  }
-
-  ~ParkedMutexGuard() { guard_->Unlock(); }
+  friend class Isolate;
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/mark-compact.cc b/deps/v8/src/heap/mark-compact.cc
index 8801ef9cf4a466..ccd3116e3988c6 100644
--- a/deps/v8/src/heap/mark-compact.cc
+++ b/deps/v8/src/heap/mark-compact.cc
@@ -9,6 +9,7 @@
 #include "src/base/optional.h"
 #include "src/base/utils/random-number-generator.h"
 #include "src/codegen/compilation-cache.h"
+#include "src/common/globals.h"
 #include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/execution.h"
 #include "src/execution/frames-inl.h"
@@ -413,7 +414,6 @@ MarkCompactCollector::MarkCompactCollector(Heap* heap)
       black_allocation_(false),
       have_code_to_deoptimize_(false),
       sweeper_(new Sweeper(heap, non_atomic_marking_state())) {
-  old_to_new_slots_ = -1;
 }
 
 MarkCompactCollector::~MarkCompactCollector() { delete sweeper_; }
@@ -434,6 +434,7 @@ void MarkCompactCollector::TearDown() {
     // Marking barriers of LocalHeaps will be published in their destructors.
     marking_worklists()->Clear();
   }
+  sweeper()->TearDown();
 }
 
 void MarkCompactCollector::AddEvacuationCandidate(Page* p) {
@@ -836,19 +837,7 @@ void MarkCompactCollector::Prepare() {
 #endif
 
   DCHECK(!FLAG_never_compact || !FLAG_always_compact);
-
-  // Instead of waiting we could also abort the sweeper threads here.
-  EnsureSweepingCompleted();
-
-  {
-    TRACE_GC(heap()->tracer(),
-             GCTracer::Scope::MC_COMPLETE_SWEEP_ARRAY_BUFFERS);
-    heap_->array_buffer_sweeper()->EnsureFinished();
-  }
-
-  if (heap()->incremental_marking()->IsSweeping()) {
-    heap()->incremental_marking()->Stop();
-  }
+  DCHECK(!sweeping_in_progress());
 
   if (!was_marked_incrementally_) {
     {
@@ -2130,7 +2119,7 @@ void MarkCompactCollector::ClearPotentialSimpleMapTransition(Map dead_target) {
   Object potential_parent = dead_target.constructor_or_backpointer();
   if (potential_parent.IsMap()) {
     Map parent = Map::cast(potential_parent);
-    DisallowHeapAllocation no_gc_obviously;
+    DisallowGarbageCollection no_gc_obviously;
     if (non_atomic_marking_state()->IsBlackOrGrey(parent) &&
         TransitionsAccessor(isolate(), parent, &no_gc_obviously)
             .HasSimpleTransitionTo(dead_target)) {
@@ -2174,7 +2163,7 @@ void MarkCompactCollector::FlushBytecodeFromSFI(
                 UncompiledDataWithoutPreparseData::kSize);
 
   // Replace bytecode array with an uncompiled data array.
-  HeapObject compiled_data = shared_info.GetBytecodeArray();
+  HeapObject compiled_data = shared_info.GetBytecodeArray(isolate());
   Address compiled_data_start = compiled_data.address();
   int compiled_data_size = compiled_data.Size();
   MemoryChunk* chunk = MemoryChunk::FromAddress(compiled_data_start);
@@ -2230,7 +2219,7 @@ void MarkCompactCollector::ClearOldBytecodeCandidates() {
     // If the BytecodeArray is dead, flush it, which will replace the field with
     // an uncompiled data object.
     if (!non_atomic_marking_state()->IsBlackOrGrey(
-            flushing_candidate.GetBytecodeArray())) {
+            flushing_candidate.GetBytecodeArray(isolate()))) {
       FlushBytecodeFromSFI(flushing_candidate);
     }
 
@@ -2301,9 +2290,7 @@ bool MarkCompactCollector::TransitionArrayNeedsCompaction(
 #ifdef DEBUG
       // Targets can only be dead iff this array is fully deserialized.
       for (int i = 0; i < num_transitions; ++i) {
-        DCHECK_IMPLIES(
-            !transitions.GetRawTarget(i).IsSmi(),
-            !non_atomic_marking_state()->IsWhite(transitions.GetTarget(i)));
+        DCHECK(!non_atomic_marking_state()->IsWhite(transitions.GetTarget(i)));
       }
 #endif
       return false;
@@ -2970,7 +2957,7 @@ class Evacuator : public Malloced {
   // to be called from the main thread.
   virtual void Finalize();
 
-  virtual GCTracer::BackgroundScope::ScopeId GetBackgroundTracingScope() = 0;
+  virtual GCTracer::Scope::ScopeId GetBackgroundTracingScope() = 0;
   virtual GCTracer::Scope::ScopeId GetTracingScope() = 0;
 
  protected:
@@ -3059,8 +3046,8 @@ class FullEvacuator : public Evacuator {
         local_allocator_(heap_, LocalSpaceKind::kCompactionSpaceForMarkCompact),
         collector_(collector) {}
 
-  GCTracer::BackgroundScope::ScopeId GetBackgroundTracingScope() override {
-    return GCTracer::BackgroundScope::MC_BACKGROUND_EVACUATE_COPY;
+  GCTracer::Scope::ScopeId GetBackgroundTracingScope() override {
+    return GCTracer::Scope::MC_BACKGROUND_EVACUATE_COPY;
   }
 
   GCTracer::Scope::ScopeId GetTracingScope() override {
@@ -3153,7 +3140,8 @@ class PageEvacuationJob : public v8::JobTask {
       TRACE_GC(tracer_, evacuator->GetTracingScope());
       ProcessItems(delegate, evacuator);
     } else {
-      TRACE_BACKGROUND_GC(tracer_, evacuator->GetBackgroundTracingScope());
+      TRACE_GC_EPOCH(tracer_, evacuator->GetBackgroundTracingScope(),
+                     ThreadKind::kBackground);
       ProcessItems(delegate, evacuator);
     }
   }
@@ -3511,9 +3499,9 @@ class PointersUpdatingJob : public v8::JobTask {
  public:
   explicit PointersUpdatingJob(
       Isolate* isolate,
-      std::vector<std::unique_ptr<UpdatingItem>> updating_items, int slots,
-      GCTracer::Scope::ScopeId scope,
-      GCTracer::BackgroundScope::ScopeId background_scope)
+      std::vector<std::unique_ptr<UpdatingItem>> updating_items,
+      base::Optional<size_t> slots, GCTracer::Scope::ScopeId scope,
+      GCTracer::Scope::ScopeId background_scope)
       : updating_items_(std::move(updating_items)),
         remaining_updating_items_(updating_items_.size()),
         generator_(updating_items_.size()),
@@ -3527,7 +3515,7 @@ class PointersUpdatingJob : public v8::JobTask {
       TRACE_GC(tracer_, scope_);
       UpdatePointers(delegate);
     } else {
-      TRACE_BACKGROUND_GC(tracer_, background_scope_);
+      TRACE_GC_EPOCH(tracer_, background_scope_, ThreadKind::kBackground);
       UpdatePointers(delegate);
     }
   }
@@ -3556,23 +3544,26 @@ class PointersUpdatingJob : public v8::JobTask {
     size_t wanted_tasks = items;
     // Limit the number of update tasks as task creation often dominates the
     // actual work that is being done.
-    if (slots_ >= 0) {
+    if (slots_ && *slots_ > 0) {
       // Round up to ensure enough workers for all items.
-      wanted_tasks =
-          std::min<size_t>(items, (slots_ + kSlotsPerTask - 1) / kSlotsPerTask);
+      wanted_tasks = std::min<size_t>(
+          items, (*slots_ + kSlotsPerTask - 1) / kSlotsPerTask);
     }
-    return std::min<size_t>(kMaxPointerUpdateTasks, wanted_tasks);
+    size_t max_concurrency =
+        std::min<size_t>(kMaxPointerUpdateTasks, wanted_tasks);
+    DCHECK_IMPLIES(items > 0, max_concurrency > 0);
+    return max_concurrency;
   }
 
  private:
   std::vector<std::unique_ptr<UpdatingItem>> updating_items_;
   std::atomic<size_t> remaining_updating_items_{0};
   IndexGenerator generator_;
-  const int slots_;
+  const base::Optional<size_t> slots_;
 
   GCTracer* tracer_;
   GCTracer::Scope::ScopeId scope_;
-  GCTracer::BackgroundScope::ScopeId background_scope_;
+  GCTracer::Scope::ScopeId background_scope_;
 };
 
 template <typename MarkingState>
@@ -3968,8 +3959,7 @@ void MarkCompactCollector::UpdatePointersAfterEvacuation() {
                   std::make_unique<PointersUpdatingJob>(
                       isolate(), std::move(updating_items), old_to_new_slots_,
                       GCTracer::Scope::MC_EVACUATE_UPDATE_POINTERS_PARALLEL,
-                      GCTracer::BackgroundScope::
-                          MC_BACKGROUND_EVACUATE_UPDATE_POINTERS))
+                      GCTracer::Scope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS))
         ->Join();
   }
 
@@ -3986,12 +3976,12 @@ void MarkCompactCollector::UpdatePointersAfterEvacuation() {
                                       RememberedSetUpdatingMode::ALL);
     if (!updating_items.empty()) {
       V8::GetCurrentPlatform()
-          ->PostJob(v8::TaskPriority::kUserBlocking,
-                    std::make_unique<PointersUpdatingJob>(
-                        isolate(), std::move(updating_items), old_to_new_slots_,
-                        GCTracer::Scope::MC_EVACUATE_UPDATE_POINTERS_PARALLEL,
-                        GCTracer::BackgroundScope::
-                            MC_BACKGROUND_EVACUATE_UPDATE_POINTERS))
+          ->PostJob(
+              v8::TaskPriority::kUserBlocking,
+              std::make_unique<PointersUpdatingJob>(
+                  isolate(), std::move(updating_items), old_to_new_slots_,
+                  GCTracer::Scope::MC_EVACUATE_UPDATE_POINTERS_PARALLEL,
+                  GCTracer::Scope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS))
           ->Join();
     }
   }
@@ -4133,18 +4123,18 @@ void MarkCompactCollector::StartSweepSpaces() {
 
   {
     {
-      GCTracer::Scope sweep_scope(heap()->tracer(),
-                                  GCTracer::Scope::MC_SWEEP_OLD);
+      GCTracer::Scope sweep_scope(
+          heap()->tracer(), GCTracer::Scope::MC_SWEEP_OLD, ThreadKind::kMain);
       StartSweepSpace(heap()->old_space());
     }
     {
-      GCTracer::Scope sweep_scope(heap()->tracer(),
-                                  GCTracer::Scope::MC_SWEEP_CODE);
+      GCTracer::Scope sweep_scope(
+          heap()->tracer(), GCTracer::Scope::MC_SWEEP_CODE, ThreadKind::kMain);
       StartSweepSpace(heap()->code_space());
     }
     {
-      GCTracer::Scope sweep_scope(heap()->tracer(),
-                                  GCTracer::Scope::MC_SWEEP_MAP);
+      GCTracer::Scope sweep_scope(
+          heap()->tracer(), GCTracer::Scope::MC_SWEEP_MAP, ThreadKind::kMain);
       StartSweepSpace(heap()->map_space());
     }
     sweeper()->StartSweeping();
@@ -4490,8 +4480,7 @@ void MinorMarkCompactCollector::UpdatePointersAfterEvacuation() {
             std::make_unique<PointersUpdatingJob>(
                 isolate(), std::move(updating_items), old_to_new_slots_,
                 GCTracer::Scope::MINOR_MC_EVACUATE_UPDATE_POINTERS_PARALLEL,
-                GCTracer::BackgroundScope::
-                    MINOR_MC_BACKGROUND_EVACUATE_UPDATE_POINTERS))
+                GCTracer::Scope::MINOR_MC_BACKGROUND_EVACUATE_UPDATE_POINTERS))
         ->Join();
   }
 
@@ -4902,9 +4891,9 @@ class YoungGenerationMarkingJob : public v8::JobTask {
                GCTracer::Scope::MINOR_MC_MARK_PARALLEL);
       ProcessItems(delegate);
     } else {
-      TRACE_BACKGROUND_GC(
-          collector_->heap()->tracer(),
-          GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_MARKING);
+      TRACE_GC_EPOCH(collector_->heap()->tracer(),
+                     GCTracer::Scope::MINOR_MC_BACKGROUND_MARKING,
+                     ThreadKind::kBackground);
       ProcessItems(delegate);
     }
   }
@@ -5161,8 +5150,8 @@ class YoungGenerationEvacuator : public Evacuator {
                          LocalSpaceKind::kCompactionSpaceForMinorMarkCompact),
         collector_(collector) {}
 
-  GCTracer::BackgroundScope::ScopeId GetBackgroundTracingScope() override {
-    return GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_EVACUATE_COPY;
+  GCTracer::Scope::ScopeId GetBackgroundTracingScope() override {
+    return GCTracer::Scope::MINOR_MC_BACKGROUND_EVACUATE_COPY;
   }
 
   GCTracer::Scope::ScopeId GetTracingScope() override {
diff --git a/deps/v8/src/heap/mark-compact.h b/deps/v8/src/heap/mark-compact.h
index 34206a825ffe74..2663eb9aec56c4 100644
--- a/deps/v8/src/heap/mark-compact.h
+++ b/deps/v8/src/heap/mark-compact.h
@@ -200,8 +200,7 @@ class MarkCompactCollectorBase {
   inline Isolate* isolate();
 
  protected:
-  explicit MarkCompactCollectorBase(Heap* heap)
-      : heap_(heap), old_to_new_slots_(0) {}
+  explicit MarkCompactCollectorBase(Heap* heap) : heap_(heap) {}
 
   // Marking operations for objects reachable from roots.
   virtual void MarkLiveObjects() = 0;
@@ -240,8 +239,7 @@ class MarkCompactCollectorBase {
 
   Heap* heap_;
   // Number of old to new slots. Should be computed during MarkLiveObjects.
-  // -1 indicates that the value couldn't be computed.
-  int old_to_new_slots_;
+  base::Optional<size_t> old_to_new_slots_;
 };
 
 class MinorMarkingState final
@@ -361,7 +359,7 @@ class MainMarkingVisitor final
                                 MarkingState> {
  public:
   // This is used for revisiting objects that were black allocated.
-  class RevisitScope {
+  class V8_NODISCARD RevisitScope {
    public:
     explicit RevisitScope(MainMarkingVisitor* visitor) : visitor_(visitor) {
       DCHECK(!visitor->revisiting_object_);
@@ -790,7 +788,7 @@ class MarkCompactCollector final : public MarkCompactCollectorBase {
   friend class RecordMigratedSlotVisitor;
 };
 
-class EvacuationScope {
+class V8_NODISCARD EvacuationScope {
  public:
   explicit EvacuationScope(MarkCompactCollector* collector)
       : collector_(collector) {
diff --git a/deps/v8/src/heap/marking-visitor-inl.h b/deps/v8/src/heap/marking-visitor-inl.h
index bdc955b4bb0ccb..55c37e535bde24 100644
--- a/deps/v8/src/heap/marking-visitor-inl.h
+++ b/deps/v8/src/heap/marking-visitor-inl.h
@@ -177,7 +177,7 @@ int MarkingVisitorBase<ConcreteVisitor, MarkingState>::
     this->VisitMapPointer(object);
     start = FixedArray::BodyDescriptor::kStartOffset;
   }
-  int end = Min(size, start + kProgressBarScanningChunk);
+  int end = std::min(size, start + kProgressBarScanningChunk);
   if (start < end) {
     VisitPointers(object, object.RawField(start), object.RawField(end));
     bool success = chunk->TrySetProgressBar(current_progress_bar, end);
@@ -420,7 +420,7 @@ int MarkingVisitorBase<ConcreteVisitor, MarkingState>::VisitDescriptorsForMap(
   if (descriptors.IsStrongDescriptorArray()) {
     return 0;
   }
-
+  concrete_visitor()->SynchronizePageAccess(descriptors);
   int size = MarkDescriptorArrayBlack(descriptors);
   int number_of_own_descriptors = map.NumberOfOwnDescriptors();
   if (number_of_own_descriptors) {
diff --git a/deps/v8/src/heap/memory-allocator.cc b/deps/v8/src/heap/memory-allocator.cc
index a3d4f0029e0854..ce82fb4d1f5505 100644
--- a/deps/v8/src/heap/memory-allocator.cc
+++ b/deps/v8/src/heap/memory-allocator.cc
@@ -89,7 +89,7 @@ void MemoryAllocator::InitializeCodePageAllocator(
                 page_allocator->AllocatePageSize());
   VirtualMemory reservation(
       page_allocator, requested, reinterpret_cast<void*>(hint),
-      Max(kMinExpectedOSPageSize, page_allocator->AllocatePageSize()));
+      std::max(kMinExpectedOSPageSize, page_allocator->AllocatePageSize()));
   if (!reservation.IsReserved()) {
     V8::FatalProcessOutOfMemory(isolate_,
                                 "CodeRange setup: allocate virtual memory");
@@ -159,9 +159,12 @@ class MemoryAllocator::Unmapper::UnmapFreeMemoryJob : public JobTask {
   explicit UnmapFreeMemoryJob(Isolate* isolate, Unmapper* unmapper)
       : unmapper_(unmapper), tracer_(isolate->heap()->tracer()) {}
 
+  UnmapFreeMemoryJob(const UnmapFreeMemoryJob&) = delete;
+  UnmapFreeMemoryJob& operator=(const UnmapFreeMemoryJob&) = delete;
+
   void Run(JobDelegate* delegate) override {
-    TRACE_BACKGROUND_GC(tracer_,
-                        GCTracer::BackgroundScope::BACKGROUND_UNMAPPER);
+    TRACE_GC1(tracer_, GCTracer::Scope::BACKGROUND_UNMAPPER,
+              ThreadKind::kBackground);
     unmapper_->PerformFreeMemoryOnQueuedChunks<FreeMode::kUncommitPooled>(
         delegate);
     if (FLAG_trace_unmapper) {
@@ -181,7 +184,6 @@ class MemoryAllocator::Unmapper::UnmapFreeMemoryJob : public JobTask {
  private:
   Unmapper* const unmapper_;
   GCTracer* const tracer_;
-  DISALLOW_COPY_AND_ASSIGN(UnmapFreeMemoryJob);
 };
 
 void MemoryAllocator::Unmapper::FreeQueuedChunks() {
diff --git a/deps/v8/src/heap/memory-chunk.cc b/deps/v8/src/heap/memory-chunk.cc
index 9ff4d23557ddf6..92f4f71a7010dd 100644
--- a/deps/v8/src/heap/memory-chunk.cc
+++ b/deps/v8/src/heap/memory-chunk.cc
@@ -5,6 +5,7 @@
 #include "src/heap/memory-chunk.h"
 
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/heap/code-object-registry.h"
 #include "src/heap/memory-allocator.h"
 #include "src/heap/memory-chunk-inl.h"
@@ -378,12 +379,13 @@ bool MemoryChunk::RegisteredObjectWithInvalidatedSlots(HeapObject object) {
 
 void MemoryChunk::AllocateYoungGenerationBitmap() {
   DCHECK_NULL(young_generation_bitmap_);
-  young_generation_bitmap_ = static_cast<Bitmap*>(calloc(1, Bitmap::kSize));
+  young_generation_bitmap_ =
+      static_cast<Bitmap*>(base::Calloc(1, Bitmap::kSize));
 }
 
 void MemoryChunk::ReleaseYoungGenerationBitmap() {
   DCHECK_NOT_NULL(young_generation_bitmap_);
-  free(young_generation_bitmap_);
+  base::Free(young_generation_bitmap_);
   young_generation_bitmap_ = nullptr;
 }
 
diff --git a/deps/v8/src/heap/memory-reducer.cc b/deps/v8/src/heap/memory-reducer.cc
index 37dca5b99c45d4..a0f5ec27939da2 100644
--- a/deps/v8/src/heap/memory-reducer.cc
+++ b/deps/v8/src/heap/memory-reducer.cc
@@ -150,7 +150,8 @@ MemoryReducer::State MemoryReducer::Step(const State& state,
         return state;
       } else if (event.type == kMarkCompact) {
         if (event.committed_memory <
-            Max(static_cast<size_t>(state.committed_memory_at_last_run *
+            std::max(
+                static_cast<size_t>(state.committed_memory_at_last_run *
                                     kCommittedMemoryFactor),
                 state.committed_memory_at_last_run + kCommittedMemoryDelta)) {
           return state;
diff --git a/deps/v8/src/heap/memory-reducer.h b/deps/v8/src/heap/memory-reducer.h
index ae5ff321d3162d..4f6c4970fe0889 100644
--- a/deps/v8/src/heap/memory-reducer.h
+++ b/deps/v8/src/heap/memory-reducer.h
@@ -115,6 +115,8 @@ class V8_EXPORT_PRIVATE MemoryReducer {
   };
 
   explicit MemoryReducer(Heap* heap);
+  MemoryReducer(const MemoryReducer&) = delete;
+  MemoryReducer& operator=(const MemoryReducer&) = delete;
   // Callbacks.
   void NotifyMarkCompact(const Event& event);
   void NotifyPossibleGarbage(const Event& event);
@@ -146,12 +148,13 @@ class V8_EXPORT_PRIVATE MemoryReducer {
   class TimerTask : public v8::internal::CancelableTask {
    public:
     explicit TimerTask(MemoryReducer* memory_reducer);
+    TimerTask(const TimerTask&) = delete;
+    TimerTask& operator=(const TimerTask&) = delete;
 
    private:
     // v8::internal::CancelableTask overrides.
     void RunInternal() override;
     MemoryReducer* memory_reducer_;
-    DISALLOW_COPY_AND_ASSIGN(TimerTask);
   };
 
   void NotifyTimer(const Event& event);
@@ -166,7 +169,6 @@ class V8_EXPORT_PRIVATE MemoryReducer {
 
   // Used in cctest.
   friend class heap::HeapTester;
-  DISALLOW_COPY_AND_ASSIGN(MemoryReducer);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/heap/new-spaces.cc b/deps/v8/src/heap/new-spaces.cc
index f1f31d6713d127..d6cfe7249e67f4 100644
--- a/deps/v8/src/heap/new-spaces.cc
+++ b/deps/v8/src/heap/new-spaces.cc
@@ -37,9 +37,9 @@ Page* SemiSpace::InitializePage(MemoryChunk* chunk) {
 }
 
 bool SemiSpace::EnsureCurrentCapacity() {
-  if (is_committed()) {
+  if (IsCommitted()) {
     const int expected_pages =
-        static_cast<int>(current_capacity_ / Page::kPageSize);
+        static_cast<int>(target_capacity_ / Page::kPageSize);
     MemoryChunk* current_page = first_page();
     int actual_pages = 0;
 
@@ -91,22 +91,22 @@ bool SemiSpace::EnsureCurrentCapacity() {
 void SemiSpace::SetUp(size_t initial_capacity, size_t maximum_capacity) {
   DCHECK_GE(maximum_capacity, static_cast<size_t>(Page::kPageSize));
   minimum_capacity_ = RoundDown(initial_capacity, Page::kPageSize);
-  current_capacity_ = minimum_capacity_;
+  target_capacity_ = minimum_capacity_;
   maximum_capacity_ = RoundDown(maximum_capacity, Page::kPageSize);
-  committed_ = false;
 }
 
 void SemiSpace::TearDown() {
   // Properly uncommit memory to keep the allocator counters in sync.
-  if (is_committed()) {
+  if (IsCommitted()) {
     Uncommit();
   }
-  current_capacity_ = maximum_capacity_ = 0;
+  target_capacity_ = maximum_capacity_ = 0;
 }
 
 bool SemiSpace::Commit() {
-  DCHECK(!is_committed());
-  const int num_pages = static_cast<int>(current_capacity_ / Page::kPageSize);
+  DCHECK(!IsCommitted());
+  const int num_pages = static_cast<int>(target_capacity_ / Page::kPageSize);
+  DCHECK(num_pages);
   for (int pages_added = 0; pages_added < num_pages; pages_added++) {
     // Pages in the new spaces can be moved to the old space by the full
     // collector. Therefore, they must be initialized with the same FreeList as
@@ -117,35 +117,37 @@ bool SemiSpace::Commit() {
             NOT_EXECUTABLE);
     if (new_page == nullptr) {
       if (pages_added) RewindPages(pages_added);
+      DCHECK(!IsCommitted());
       return false;
     }
     memory_chunk_list_.PushBack(new_page);
   }
   Reset();
-  AccountCommitted(current_capacity_);
+  AccountCommitted(target_capacity_);
   if (age_mark_ == kNullAddress) {
     age_mark_ = first_page()->area_start();
   }
-  committed_ = true;
+  DCHECK(IsCommitted());
   return true;
 }
 
 bool SemiSpace::Uncommit() {
-  DCHECK(is_committed());
+  DCHECK(IsCommitted());
   while (!memory_chunk_list_.Empty()) {
     MemoryChunk* chunk = memory_chunk_list_.front();
     memory_chunk_list_.Remove(chunk);
     heap()->memory_allocator()->Free<MemoryAllocator::kPooledAndQueue>(chunk);
   }
   current_page_ = nullptr;
-  AccountUncommitted(current_capacity_);
-  committed_ = false;
+  current_capacity_ = 0;
+  AccountUncommitted(target_capacity_);
   heap()->memory_allocator()->unmapper()->FreeQueuedChunks();
+  DCHECK(!IsCommitted());
   return true;
 }
 
 size_t SemiSpace::CommittedPhysicalMemory() {
-  if (!is_committed()) return 0;
+  if (!IsCommitted()) return 0;
   size_t size = 0;
   for (Page* p : *this) {
     size += p->CommittedPhysicalMemory();
@@ -154,13 +156,13 @@ size_t SemiSpace::CommittedPhysicalMemory() {
 }
 
 bool SemiSpace::GrowTo(size_t new_capacity) {
-  if (!is_committed()) {
+  if (!IsCommitted()) {
     if (!Commit()) return false;
   }
   DCHECK_EQ(new_capacity & kPageAlignmentMask, 0u);
   DCHECK_LE(new_capacity, maximum_capacity_);
-  DCHECK_GT(new_capacity, current_capacity_);
-  const size_t delta = new_capacity - current_capacity_;
+  DCHECK_GT(new_capacity, target_capacity_);
+  const size_t delta = new_capacity - target_capacity_;
   DCHECK(IsAligned(delta, AllocatePageSize()));
   const int delta_pages = static_cast<int>(delta / Page::kPageSize);
   DCHECK(last_page());
@@ -181,7 +183,7 @@ bool SemiSpace::GrowTo(size_t new_capacity) {
     new_page->SetFlags(last_page()->GetFlags(), Page::kCopyOnFlipFlagsMask);
   }
   AccountCommitted(delta);
-  current_capacity_ = new_capacity;
+  target_capacity_ = new_capacity;
   return true;
 }
 
@@ -196,20 +198,19 @@ void SemiSpace::RewindPages(int num_pages) {
   }
 }
 
-bool SemiSpace::ShrinkTo(size_t new_capacity) {
+void SemiSpace::ShrinkTo(size_t new_capacity) {
   DCHECK_EQ(new_capacity & kPageAlignmentMask, 0u);
   DCHECK_GE(new_capacity, minimum_capacity_);
-  DCHECK_LT(new_capacity, current_capacity_);
-  if (is_committed()) {
-    const size_t delta = current_capacity_ - new_capacity;
+  DCHECK_LT(new_capacity, target_capacity_);
+  if (IsCommitted()) {
+    const size_t delta = target_capacity_ - new_capacity;
     DCHECK(IsAligned(delta, Page::kPageSize));
     int delta_pages = static_cast<int>(delta / Page::kPageSize);
     RewindPages(delta_pages);
     AccountUncommitted(delta);
     heap()->memory_allocator()->unmapper()->FreeQueuedChunks();
   }
-  current_capacity_ = new_capacity;
-  return true;
+  target_capacity_ = new_capacity;
 }
 
 void SemiSpace::FixPagesFlags(intptr_t flags, intptr_t mask) {
@@ -234,7 +235,7 @@ void SemiSpace::Reset() {
   DCHECK(first_page());
   DCHECK(last_page());
   current_page_ = first_page();
-  pages_used_ = 0;
+  current_capacity_ = Page::kPageSize;
 }
 
 void SemiSpace::RemovePage(Page* page) {
@@ -255,13 +256,20 @@ void SemiSpace::PrependPage(Page* page) {
                  static_cast<uintptr_t>(Page::kCopyAllFlags));
   page->set_owner(this);
   memory_chunk_list_.PushFront(page);
-  pages_used_++;
+  current_capacity_ += Page::kPageSize;
   for (size_t i = 0; i < ExternalBackingStoreType::kNumTypes; i++) {
     ExternalBackingStoreType t = static_cast<ExternalBackingStoreType>(i);
     IncrementExternalBackingStoreBytes(t, page->ExternalBackingStoreBytes(t));
   }
 }
 
+void SemiSpace::MovePageToTheEnd(Page* page) {
+  DCHECK_EQ(page->owner(), this);
+  memory_chunk_list_.Remove(page);
+  memory_chunk_list_.PushBack(page);
+  current_page_ = page;
+}
+
 void SemiSpace::Swap(SemiSpace* from, SemiSpace* to) {
   // We won't be swapping semispaces without data in them.
   DCHECK(from->first_page());
@@ -270,11 +278,10 @@ void SemiSpace::Swap(SemiSpace* from, SemiSpace* to) {
   intptr_t saved_to_space_flags = to->current_page()->GetFlags();
 
   // We swap all properties but id_.
-  std::swap(from->current_capacity_, to->current_capacity_);
+  std::swap(from->target_capacity_, to->target_capacity_);
   std::swap(from->maximum_capacity_, to->maximum_capacity_);
   std::swap(from->minimum_capacity_, to->minimum_capacity_);
   std::swap(from->age_mark_, to->age_mark_);
-  std::swap(from->committed_, to->committed_);
   std::swap(from->memory_chunk_list_, to->memory_chunk_list_);
   std::swap(from->current_page_, to->current_page_);
   std::swap(from->external_backing_store_bytes_,
@@ -382,7 +389,7 @@ size_t NewSpace::CommittedPhysicalMemory() {
   if (!base::OS::HasLazyCommits()) return CommittedMemory();
   BasicMemoryChunk::UpdateHighWaterMark(allocation_info_.top());
   size_t size = to_space_.CommittedPhysicalMemory();
-  if (from_space_.is_committed()) {
+  if (from_space_.IsCommitted()) {
     size += from_space_.CommittedPhysicalMemory();
   }
   return size;
@@ -404,7 +411,7 @@ NewSpace::NewSpace(Heap* heap, v8::PageAllocator* page_allocator,
   if (!to_space_.Commit()) {
     V8::FatalProcessOutOfMemory(heap->isolate(), "New space setup");
   }
-  DCHECK(!from_space_.is_committed());  // No need to use memory yet.
+  DCHECK(!from_space_.IsCommitted());  // No need to use memory yet.
   ResetLinearAllocationArea();
 }
 
@@ -415,46 +422,38 @@ void NewSpace::TearDown() {
   from_space_.TearDown();
 }
 
+void NewSpace::ResetParkedAllocationBuffers() {
+  parked_allocation_buffers_.clear();
+}
+
 void NewSpace::Flip() { SemiSpace::Swap(&from_space_, &to_space_); }
 
 void NewSpace::Grow() {
   DCHECK_IMPLIES(FLAG_local_heaps, heap()->safepoint()->IsActive());
   // Double the semispace size but only up to maximum capacity.
   DCHECK(TotalCapacity() < MaximumCapacity());
-  size_t new_capacity =
-      Min(MaximumCapacity(),
-          static_cast<size_t>(FLAG_semi_space_growth_factor) * TotalCapacity());
+  size_t new_capacity = std::min(
+      MaximumCapacity(),
+      static_cast<size_t>(FLAG_semi_space_growth_factor) * TotalCapacity());
   if (to_space_.GrowTo(new_capacity)) {
     // Only grow from space if we managed to grow to-space.
     if (!from_space_.GrowTo(new_capacity)) {
       // If we managed to grow to-space but couldn't grow from-space,
       // attempt to shrink to-space.
-      if (!to_space_.ShrinkTo(from_space_.current_capacity())) {
-        // We are in an inconsistent state because we could not
-        // commit/uncommit memory from new space.
-        FATAL("inconsistent state");
-      }
+      to_space_.ShrinkTo(from_space_.target_capacity());
     }
   }
   DCHECK_SEMISPACE_ALLOCATION_INFO(allocation_info_, to_space_);
 }
 
 void NewSpace::Shrink() {
-  size_t new_capacity = Max(InitialTotalCapacity(), 2 * Size());
+  size_t new_capacity = std::max(InitialTotalCapacity(), 2 * Size());
   size_t rounded_new_capacity = ::RoundUp(new_capacity, Page::kPageSize);
-  if (rounded_new_capacity < TotalCapacity() &&
-      to_space_.ShrinkTo(rounded_new_capacity)) {
+  if (rounded_new_capacity < TotalCapacity()) {
+    to_space_.ShrinkTo(rounded_new_capacity);
     // Only shrink from-space if we managed to shrink to-space.
-    from_space_.Reset();
-    if (!from_space_.ShrinkTo(rounded_new_capacity)) {
-      // If we managed to shrink to-space but couldn't shrink from
-      // space, attempt to grow to-space again.
-      if (!to_space_.GrowTo(from_space_.current_capacity())) {
-        // We are in an inconsistent state because we could not
-        // commit/uncommit memory from new space.
-        FATAL("inconsistent state");
-      }
-    }
+    if (from_space_.IsCommitted()) from_space_.Reset();
+    from_space_.ShrinkTo(rounded_new_capacity);
   }
   DCHECK_SEMISPACE_ALLOCATION_INFO(allocation_info_, to_space_);
 }
@@ -465,10 +464,10 @@ bool NewSpace::Rebalance() {
          from_space_.EnsureCurrentCapacity();
 }
 
-void NewSpace::UpdateLinearAllocationArea() {
+void NewSpace::UpdateLinearAllocationArea(Address known_top) {
   AdvanceAllocationObservers();
 
-  Address new_top = to_space_.page_low();
+  Address new_top = known_top == 0 ? to_space_.page_low() : known_top;
   BasicMemoryChunk::UpdateHighWaterMark(allocation_info_.top());
   allocation_info_.Reset(new_top, to_space_.page_high());
   // The order of the following two stores is important.
@@ -509,15 +508,23 @@ bool NewSpace::AddFreshPage() {
   Address top = allocation_info_.top();
   DCHECK(!OldSpace::IsAtPageStart(top));
 
+  // Clear remainder of current page.
+  Address limit = Page::FromAllocationAreaAddress(top)->area_end();
+  int remaining_in_page = static_cast<int>(limit - top);
+  heap()->CreateFillerObjectAt(top, remaining_in_page, ClearRecordedSlots::kNo);
+
   if (!to_space_.AdvancePage()) {
     // No more pages left to advance.
     return false;
   }
 
-  // Clear remainder of current page.
-  Address limit = Page::FromAllocationAreaAddress(top)->area_end();
-  int remaining_in_page = static_cast<int>(limit - top);
-  heap()->CreateFillerObjectAt(top, remaining_in_page, ClearRecordedSlots::kNo);
+  // We park unused allocation buffer space of allocations happenting from the
+  // mutator.
+  if (FLAG_allocation_buffer_parking && heap()->gc_state() == Heap::NOT_IN_GC &&
+      remaining_in_page >= kAllocationBufferParkingThreshold) {
+    parked_allocation_buffers_.push_back(
+        ParkedAllocationBuffer(remaining_in_page, top));
+  }
   UpdateLinearAllocationArea();
 
   return true;
@@ -528,6 +535,30 @@ bool NewSpace::AddFreshPageSynchronized() {
   return AddFreshPage();
 }
 
+bool NewSpace::AddParkedAllocationBuffer(int size_in_bytes,
+                                         AllocationAlignment alignment) {
+  int parked_size = 0;
+  Address start = 0;
+  for (auto it = parked_allocation_buffers_.begin();
+       it != parked_allocation_buffers_.end();) {
+    parked_size = it->first;
+    start = it->second;
+    int filler_size = Heap::GetFillToAlign(start, alignment);
+    if (size_in_bytes + filler_size <= parked_size) {
+      parked_allocation_buffers_.erase(it);
+      Page* page = Page::FromAddress(start);
+      // We move a page with a parked allocaiton to the end of the pages list
+      // to maintain the invariant that the last page is the used one.
+      to_space_.MovePageToTheEnd(page);
+      UpdateLinearAllocationArea(start);
+      return true;
+    } else {
+      it++;
+    }
+  }
+  return false;
+}
+
 bool NewSpace::EnsureAllocation(int size_in_bytes,
                                 AllocationAlignment alignment) {
   AdvanceAllocationObservers();
@@ -544,7 +575,10 @@ bool NewSpace::EnsureAllocation(int size_in_bytes,
 
   // Not enough room in the page, try to allocate a new one.
   if (!AddFreshPage()) {
-    return false;
+    // When we cannot grow NewSpace anymore we query for parked allocations.
+    if (!FLAG_allocation_buffer_parking ||
+        !AddParkedAllocationBuffer(size_in_bytes, alignment))
+      return false;
   }
 
   old_top = allocation_info_.top();
diff --git a/deps/v8/src/heap/new-spaces.h b/deps/v8/src/heap/new-spaces.h
index 4cc5110815ddd7..70428ca63b07f1 100644
--- a/deps/v8/src/heap/new-spaces.h
+++ b/deps/v8/src/heap/new-spaces.h
@@ -6,10 +6,12 @@
 #define V8_HEAP_NEW_SPACES_H_
 
 #include <atomic>
+#include <map>
 #include <memory>
 
 #include "src/base/macros.h"
 #include "src/base/platform/mutex.h"
+#include "src/common/globals.h"
 #include "src/heap/heap.h"
 #include "src/heap/spaces.h"
 #include "src/logging/log.h"
@@ -23,6 +25,9 @@ class MemoryChunk;
 
 enum SemiSpaceId { kFromSpace = 0, kToSpace = 1 };
 
+using ParkedAllocationBuffer = std::pair<int, Address>;
+using ParkedAllocationBuffersVector = std::vector<ParkedAllocationBuffer>;
+
 // -----------------------------------------------------------------------------
 // SemiSpace in young generation
 //
@@ -39,13 +44,12 @@ class SemiSpace : public Space {
   SemiSpace(Heap* heap, SemiSpaceId semispace)
       : Space(heap, NEW_SPACE, new NoFreeList()),
         current_capacity_(0),
+        target_capacity_(0),
         maximum_capacity_(0),
         minimum_capacity_(0),
         age_mark_(kNullAddress),
-        committed_(false),
         id_(semispace),
-        current_page_(nullptr),
-        pages_used_(0) {}
+        current_page_(nullptr) {}
 
   inline bool Contains(HeapObject o) const;
   inline bool Contains(Object o) const;
@@ -56,7 +60,7 @@ class SemiSpace : public Space {
 
   bool Commit();
   bool Uncommit();
-  bool is_committed() { return committed_; }
+  bool IsCommitted() { return !memory_chunk_list_.Empty(); }
 
   // Grow the semispace to the new capacity.  The new capacity requested must
   // be larger than the current capacity and less than the maximum capacity.
@@ -65,12 +69,10 @@ class SemiSpace : public Space {
   // Shrinks the semispace to the new capacity.  The new capacity requested
   // must be more than the amount of used memory in the semispace and less
   // than the current capacity.
-  bool ShrinkTo(size_t new_capacity);
+  void ShrinkTo(size_t new_capacity);
 
   bool EnsureCurrentCapacity();
 
-  Address space_end() { return memory_chunk_list_.back()->area_end(); }
-
   // Returns the start address of the first page of the space.
   Address space_start() {
     DCHECK_NE(memory_chunk_list_.front(), nullptr);
@@ -78,7 +80,6 @@ class SemiSpace : public Space {
   }
 
   Page* current_page() { return current_page_; }
-  int pages_used() { return pages_used_; }
 
   // Returns the start address of the current page of the space.
   Address page_low() { return current_page_->area_start(); }
@@ -88,15 +89,14 @@ class SemiSpace : public Space {
 
   bool AdvancePage() {
     Page* next_page = current_page_->next_page();
-    // We cannot expand if we reached the maximum number of pages already. Note
+    // We cannot expand if we reached the target capcity. Note
     // that we need to account for the next page already for this check as we
     // could potentially fill the whole page after advancing.
-    const bool reached_max_pages = (pages_used_ + 1) == max_pages();
-    if (next_page == nullptr || reached_max_pages) {
+    if (next_page == nullptr || (current_capacity_ == target_capacity_)) {
       return false;
     }
     current_page_ = next_page;
-    pages_used_++;
+    current_capacity_ += Page::kPageSize;
     return true;
   }
 
@@ -105,6 +105,7 @@ class SemiSpace : public Space {
 
   void RemovePage(Page* page);
   void PrependPage(Page* page);
+  void MovePageToTheEnd(Page* page);
 
   Page* InitializePage(MemoryChunk* chunk);
 
@@ -115,6 +116,9 @@ class SemiSpace : public Space {
   // Returns the current capacity of the semispace.
   size_t current_capacity() { return current_capacity_; }
 
+  // Returns the target capacity of the semispace.
+  size_t target_capacity() { return target_capacity_; }
+
   // Returns the maximum capacity of the semispace.
   size_t maximum_capacity() { return maximum_capacity_; }
 
@@ -141,9 +145,6 @@ class SemiSpace : public Space {
   const Page* first_page() const {
     return reinterpret_cast<const Page*>(Space::first_page());
   }
-  const Page* last_page() const {
-    return reinterpret_cast<const Page*>(Space::last_page());
-  }
 
   iterator begin() { return iterator(first_page()); }
   iterator end() { return iterator(nullptr); }
@@ -171,16 +172,15 @@ class SemiSpace : public Space {
  private:
   void RewindPages(int num_pages);
 
-  inline int max_pages() {
-    return static_cast<int>(current_capacity_ / Page::kPageSize);
-  }
-
   // Copies the flags into the masked positions on all pages in the space.
   void FixPagesFlags(intptr_t flags, intptr_t flag_mask);
 
   // The currently committed space capacity.
   size_t current_capacity_;
 
+  // The targetted committed space capacity.
+  size_t target_capacity_;
+
   // The maximum capacity that can be used by this space. A space cannot grow
   // beyond that size.
   size_t maximum_capacity_;
@@ -191,13 +191,10 @@ class SemiSpace : public Space {
   // Used to govern object promotion during mark-compact collection.
   Address age_mark_;
 
-  bool committed_;
   SemiSpaceId id_;
 
   Page* current_page_;
 
-  int pages_used_;
-
   friend class NewSpace;
   friend class SemiSpaceObjectIterator;
 };
@@ -248,6 +245,8 @@ class V8_EXPORT_PRIVATE NewSpace
   // is not deallocated here.
   void TearDown();
 
+  void ResetParkedAllocationBuffers();
+
   // Flip the pair of spaces.
   void Flip();
 
@@ -261,7 +260,7 @@ class V8_EXPORT_PRIVATE NewSpace
   // Return the allocated bytes in the active semispace.
   size_t Size() final {
     DCHECK_GE(top(), to_space_.page_low());
-    return to_space_.pages_used() *
+    return (to_space_.current_capacity() - Page::kPageSize) / Page::kPageSize *
                MemoryChunkLayout::AllocatableMemoryInDataPage() +
            static_cast<size_t>(top() - to_space_.page_low());
   }
@@ -270,16 +269,16 @@ class V8_EXPORT_PRIVATE NewSpace
 
   // Return the allocatable capacity of a semispace.
   size_t Capacity() {
-    SLOW_DCHECK(to_space_.current_capacity() == from_space_.current_capacity());
-    return (to_space_.current_capacity() / Page::kPageSize) *
+    SLOW_DCHECK(to_space_.target_capacity() == from_space_.target_capacity());
+    return (to_space_.target_capacity() / Page::kPageSize) *
            MemoryChunkLayout::AllocatableMemoryInDataPage();
   }
 
   // Return the current size of a semispace, allocatable and non-allocatable
   // memory.
   size_t TotalCapacity() {
-    DCHECK(to_space_.current_capacity() == from_space_.current_capacity());
-    return to_space_.current_capacity();
+    DCHECK(to_space_.target_capacity() == from_space_.target_capacity());
+    return to_space_.target_capacity();
   }
 
   // Committed memory for NewSpace is the committed memory of both semi-spaces
@@ -415,6 +414,9 @@ class V8_EXPORT_PRIVATE NewSpace
   bool AddFreshPage();
   bool AddFreshPageSynchronized();
 
+  bool AddParkedAllocationBuffer(int size_in_bytes,
+                                 AllocationAlignment alignment);
+
 #ifdef VERIFY_HEAP
   // Verify the active semispace.
   virtual void Verify(Isolate* isolate);
@@ -427,16 +429,16 @@ class V8_EXPORT_PRIVATE NewSpace
 
   // Return whether the operation succeeded.
   bool CommitFromSpaceIfNeeded() {
-    if (from_space_.is_committed()) return true;
+    if (from_space_.IsCommitted()) return true;
     return from_space_.Commit();
   }
 
   bool UncommitFromSpace() {
-    if (!from_space_.is_committed()) return true;
+    if (!from_space_.IsCommitted()) return true;
     return from_space_.Uncommit();
   }
 
-  bool IsFromSpaceCommitted() { return from_space_.is_committed(); }
+  bool IsFromSpaceCommitted() { return from_space_.IsCommitted(); }
 
   SemiSpace* active_space() { return &to_space_; }
 
@@ -463,8 +465,10 @@ class V8_EXPORT_PRIVATE NewSpace
   void MaybeFreeUnusedLab(LinearAllocationArea info);
 
  private:
+  static const int kAllocationBufferParkingThreshold = 4 * KB;
+
   // Update linear allocation area to match the current to-space page.
-  void UpdateLinearAllocationArea();
+  void UpdateLinearAllocationArea(Address known_top = 0);
 
   base::Mutex mutex_;
 
@@ -478,6 +482,8 @@ class V8_EXPORT_PRIVATE NewSpace
   SemiSpace from_space_;
   VirtualMemory reservation_;
 
+  ParkedAllocationBuffersVector parked_allocation_buffers_;
+
   // Internal allocation methods.
   V8_WARN_UNUSED_RESULT V8_INLINE AllocationResult
   AllocateFastAligned(int size_in_bytes, int* aligned_size_in_bytes,
diff --git a/deps/v8/src/heap/object-stats.cc b/deps/v8/src/heap/object-stats.cc
index 7ce2c0746296c3..c06e589c0721b9 100644
--- a/deps/v8/src/heap/object-stats.cc
+++ b/deps/v8/src/heap/object-stats.cc
@@ -355,8 +355,8 @@ int Log2ForSize(size_t size) {
 
 int ObjectStats::HistogramIndexFromSize(size_t size) {
   if (size == 0) return 0;
-  return Min(Max(Log2ForSize(size) + 1 - kFirstBucketShift, 0),
-             kLastValueBucketIndex);
+  return std::min({std::max(Log2ForSize(size) + 1 - kFirstBucketShift, 0),
+                   kLastValueBucketIndex});
 }
 
 void ObjectStats::RecordObjectStats(InstanceType type, size_t size,
@@ -581,7 +581,7 @@ void ObjectStatsCollectorImpl::RecordVirtualFunctionTemplateInfoDetails(
 void ObjectStatsCollectorImpl::RecordVirtualJSGlobalObjectDetails(
     JSGlobalObject object) {
   // Properties.
-  GlobalDictionary properties = object.global_dictionary();
+  GlobalDictionary properties = object.global_dictionary(kAcquireLoad);
   RecordHashTableVirtualObjectStats(object, properties,
                                     ObjectStats::GLOBAL_PROPERTIES_TYPE);
   // Elements.
@@ -1092,7 +1092,7 @@ class ObjectStatsVisitor {
             heap->mark_compact_collector()->non_atomic_marking_state()),
         phase_(phase) {}
 
-  bool Visit(HeapObject obj, int size) {
+  void Visit(HeapObject obj) {
     if (marking_state_->IsBlack(obj)) {
       live_collector_->CollectStatistics(
           obj, phase_, ObjectStatsCollectorImpl::CollectFieldStats::kYes);
@@ -1101,7 +1101,6 @@ class ObjectStatsVisitor {
       dead_collector_->CollectStatistics(
           obj, phase_, ObjectStatsCollectorImpl::CollectFieldStats::kNo);
     }
-    return true;
   }
 
  private:
@@ -1117,7 +1116,7 @@ void IterateHeap(Heap* heap, ObjectStatsVisitor* visitor) {
   CombinedHeapObjectIterator iterator(heap);
   for (HeapObject obj = iterator.Next(); !obj.is_null();
        obj = iterator.Next()) {
-    visitor->Visit(obj, obj.Size());
+    visitor->Visit(obj);
   }
 }
 
diff --git a/deps/v8/src/heap/objects-visiting.h b/deps/v8/src/heap/objects-visiting.h
index 310ea893cc0e93..7dd7da570e29e8 100644
--- a/deps/v8/src/heap/objects-visiting.h
+++ b/deps/v8/src/heap/objects-visiting.h
@@ -22,7 +22,6 @@ namespace internal {
   V(Cell)                              \
   V(Code)                              \
   V(CodeDataContainer)                 \
-  V(Context)                           \
   V(CoverageInfo)                      \
   V(DataHandler)                       \
   V(EmbedderDataArray)                 \
@@ -44,7 +43,6 @@ namespace internal {
   V(PropertyArray)                     \
   V(PropertyCell)                      \
   V(PrototypeInfo)                     \
-  V(SharedFunctionInfo)                \
   V(SmallOrderedHashMap)               \
   V(SmallOrderedHashSet)               \
   V(SmallOrderedNameDictionary)        \
@@ -52,8 +50,6 @@ namespace internal {
   V(Symbol)                            \
   V(SyntheticModule)                   \
   V(TransitionArray)                   \
-  V(UncompiledDataWithoutPreparseData) \
-  V(UncompiledDataWithPreparseData)    \
   V(WasmArray)                         \
   V(WasmIndirectFunctionTable)         \
   V(WasmInstanceObject)                \
diff --git a/deps/v8/src/heap/paged-spaces.cc b/deps/v8/src/heap/paged-spaces.cc
index ff6b390ccf6b29..1de1af4e2b5b9b 100644
--- a/deps/v8/src/heap/paged-spaces.cc
+++ b/deps/v8/src/heap/paged-spaces.cc
@@ -275,6 +275,9 @@ void PagedSpace::SetTopAndLimit(Address top, Address limit) {
          Page::FromAddress(top) == Page::FromAddress(limit - 1));
   BasicMemoryChunk::UpdateHighWaterMark(allocation_info_.top());
   allocation_info_.Reset(top, limit);
+  // The order of the following two stores is important.
+  original_limit_.store(limit, std::memory_order_relaxed);
+  original_top_.store(top, std::memory_order_release);
 }
 
 size_t PagedSpace::ShrinkPageToHighWaterMark(Page* page) {
@@ -637,7 +640,7 @@ PagedSpace::TryAllocationFromFreeListBackground(LocalHeap* local_heap,
 
   heap()->StartIncrementalMarkingIfAllocationLimitIsReachedBackground();
 
-  size_t used_size_in_bytes = Min(new_node_size, max_size_in_bytes);
+  size_t used_size_in_bytes = std::min(new_node_size, max_size_in_bytes);
 
   Address start = new_node.address();
   Address end = new_node.address() + new_node_size;
diff --git a/deps/v8/src/heap/paged-spaces.h b/deps/v8/src/heap/paged-spaces.h
index 97670517cdccb4..233bd60d35ccb7 100644
--- a/deps/v8/src/heap/paged-spaces.h
+++ b/deps/v8/src/heap/paged-spaces.h
@@ -300,6 +300,20 @@ class V8_EXPORT_PRIVATE PagedSpace
 
   void SetLinearAllocationArea(Address top, Address limit);
 
+  Address original_top_acquire() {
+    return original_top_.load(std::memory_order_acquire);
+  }
+
+  Address original_limit_relaxed() {
+    return original_limit_.load(std::memory_order_relaxed);
+  }
+
+  void MoveOriginalTopForward() {
+    DCHECK_GE(top(), original_top_);
+    DCHECK_LE(top(), original_limit_);
+    original_top_.store(top(), std::memory_order_release);
+  }
+
  private:
   class ConcurrentAllocationMutex {
    public:
@@ -401,6 +415,11 @@ class V8_EXPORT_PRIVATE PagedSpace
   // Mutex guarding any concurrent access to the space.
   base::Mutex space_mutex_;
 
+  // The top and the limit at the time of setting the linear allocation area.
+  // These values can be accessed by background tasks.
+  std::atomic<Address> original_top_;
+  std::atomic<Address> original_limit_;
+
   friend class IncrementalMarking;
   friend class MarkCompactCollector;
 
diff --git a/deps/v8/src/heap/parked-scope.h b/deps/v8/src/heap/parked-scope.h
new file mode 100644
index 00000000000000..1a35fbc400765c
--- /dev/null
+++ b/deps/v8/src/heap/parked-scope.h
@@ -0,0 +1,65 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_HEAP_PARKED_SCOPE_H_
+#define V8_HEAP_PARKED_SCOPE_H_
+
+#include "src/base/platform/mutex.h"
+#include "src/execution/local-isolate.h"
+#include "src/heap/local-heap.h"
+
+namespace v8 {
+namespace internal {
+
+// Scope that explicitly parks a thread, prohibiting access to the heap and the
+// creation of handles.
+class V8_NODISCARD ParkedScope {
+ public:
+  explicit ParkedScope(LocalIsolate* local_isolate)
+      : ParkedScope(local_isolate->heap()) {}
+  explicit ParkedScope(LocalHeap* local_heap) : local_heap_(local_heap) {
+    local_heap_->Park();
+  }
+
+  ~ParkedScope() { local_heap_->Unpark(); }
+
+ private:
+  LocalHeap* const local_heap_;
+};
+
+// Scope that explicitly unparks a thread, allowing access to the heap and the
+// creation of handles.
+class V8_NODISCARD UnparkedScope {
+ public:
+  explicit UnparkedScope(LocalIsolate* local_isolate)
+      : UnparkedScope(local_isolate->heap()) {}
+  explicit UnparkedScope(LocalHeap* local_heap) : local_heap_(local_heap) {
+    local_heap_->Unpark();
+  }
+
+  ~UnparkedScope() { local_heap_->Park(); }
+
+ private:
+  LocalHeap* const local_heap_;
+};
+
+class V8_NODISCARD ParkedMutexGuard {
+  base::Mutex* guard_;
+
+ public:
+  explicit ParkedMutexGuard(LocalIsolate* local_isolate, base::Mutex* guard)
+      : ParkedMutexGuard(local_isolate->heap(), guard) {}
+  explicit ParkedMutexGuard(LocalHeap* local_heap, base::Mutex* guard)
+      : guard_(guard) {
+    ParkedScope scope(local_heap);
+    guard_->Lock();
+  }
+
+  ~ParkedMutexGuard() { guard_->Unlock(); }
+};
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_HEAP_PARKED_SCOPE_H_
diff --git a/deps/v8/src/heap/read-only-heap.h b/deps/v8/src/heap/read-only-heap.h
index aea6c8d0a783c7..c78ea77452db9b 100644
--- a/deps/v8/src/heap/read-only-heap.h
+++ b/deps/v8/src/heap/read-only-heap.h
@@ -39,6 +39,9 @@ class ReadOnlyHeap {
 
   virtual ~ReadOnlyHeap() = default;
 
+  ReadOnlyHeap(const ReadOnlyHeap&) = delete;
+  ReadOnlyHeap& operator=(const ReadOnlyHeap&) = delete;
+
   // If necessary creates read-only heap and initializes its artifacts (if the
   // deserializer is provided). Then attaches the read-only heap to the isolate.
   // If the deserializer is not provided, then the read-only heap will be only
@@ -121,8 +124,6 @@ class ReadOnlyHeap {
 
   explicit ReadOnlyHeap(ReadOnlySpace* ro_space) : read_only_space_(ro_space) {}
   ReadOnlyHeap(ReadOnlyHeap* ro_heap, ReadOnlySpace* ro_space);
-
-  DISALLOW_COPY_AND_ASSIGN(ReadOnlyHeap);
 };
 
 // This is used without pointer compression when there is just a single
diff --git a/deps/v8/src/heap/remembered-set-inl.h b/deps/v8/src/heap/remembered-set-inl.h
index 3790ed9e7123b9..f7358630d06c66 100644
--- a/deps/v8/src/heap/remembered-set-inl.h
+++ b/deps/v8/src/heap/remembered-set-inl.h
@@ -32,6 +32,10 @@ SlotCallbackResult UpdateTypedSlotHelper::UpdateTypedSlot(Heap* heap,
       RelocInfo rinfo(addr, RelocInfo::FULL_EMBEDDED_OBJECT, 0, Code());
       return UpdateEmbeddedPointer(heap, &rinfo, callback);
     }
+    case DATA_EMBEDDED_OBJECT_SLOT: {
+      RelocInfo rinfo(addr, RelocInfo::DATA_EMBEDDED_OBJECT, 0, Code());
+      return UpdateEmbeddedPointer(heap, &rinfo, callback);
+    }
     case COMPRESSED_OBJECT_SLOT: {
       HeapObject old_target = HeapObject::cast(Object(
           DecompressTaggedAny(heap->isolate(), base::Memory<Tagged_t>(addr))));
diff --git a/deps/v8/src/heap/remembered-set.h b/deps/v8/src/heap/remembered-set.h
index 4ded63de03a29a..88fab8eeac25d3 100644
--- a/deps/v8/src/heap/remembered-set.h
+++ b/deps/v8/src/heap/remembered-set.h
@@ -396,6 +396,8 @@ inline SlotType SlotTypeForRelocInfoMode(RelocInfo::Mode rmode) {
     return FULL_EMBEDDED_OBJECT_SLOT;
   } else if (RelocInfo::IsCompressedEmbeddedObject(rmode)) {
     return COMPRESSED_EMBEDDED_OBJECT_SLOT;
+  } else if (RelocInfo::IsDataEmbeddedObject(rmode)) {
+    return DATA_EMBEDDED_OBJECT_SLOT;
   }
   UNREACHABLE();
 }
diff --git a/deps/v8/src/heap/safepoint.cc b/deps/v8/src/heap/safepoint.cc
index 2550851b306993..ad5c4cbe5399b5 100644
--- a/deps/v8/src/heap/safepoint.cc
+++ b/deps/v8/src/heap/safepoint.cc
@@ -4,6 +4,7 @@
 
 #include "src/heap/safepoint.h"
 
+#include "src/base/logging.h"
 #include "src/handles/local-handles.h"
 #include "src/handles/persistent-handles.h"
 #include "src/heap/gc-tracer.h"
@@ -25,13 +26,13 @@ void GlobalSafepoint::EnterSafepointScope() {
   TRACE_GC(heap_->tracer(), GCTracer::Scope::STOP_THE_WORLD);
 
   local_heaps_mutex_.Lock();
-  local_heap_of_this_thread_ = LocalHeap::Current();
 
   barrier_.Arm();
+  DCHECK_NULL(LocalHeap::Current());
 
   for (LocalHeap* current = local_heaps_head_; current;
        current = current->next_) {
-    if (current == local_heap_of_this_thread_) {
+    if (current->is_main_thread()) {
       continue;
     }
     current->RequestSafepoint();
@@ -39,8 +40,7 @@ void GlobalSafepoint::EnterSafepointScope() {
 
   for (LocalHeap* current = local_heaps_head_; current;
        current = current->next_) {
-    if (current == local_heap_of_this_thread_) {
-      DCHECK(current->is_main_thread());
+    if (current->is_main_thread()) {
       continue;
     }
     DCHECK(!current->is_main_thread());
@@ -58,11 +58,11 @@ void GlobalSafepoint::LeaveSafepointScope() {
   DCHECK_GT(active_safepoint_scopes_, 0);
   if (--active_safepoint_scopes_ > 0) return;
 
-  DCHECK_EQ(local_heap_of_this_thread_, LocalHeap::Current());
+  DCHECK_NULL(LocalHeap::Current());
 
   for (LocalHeap* current = local_heaps_head_; current;
        current = current->next_) {
-    if (current == local_heap_of_this_thread_) {
+    if (current->is_main_thread()) {
       continue;
     }
     current->state_mutex_.Unlock();
@@ -70,7 +70,6 @@ void GlobalSafepoint::LeaveSafepointScope() {
 
   barrier_.Disarm();
 
-  local_heap_of_this_thread_ = nullptr;
   local_heaps_mutex_.Unlock();
 }
 
diff --git a/deps/v8/src/heap/safepoint.h b/deps/v8/src/heap/safepoint.h
index dd2bb421be6949..c45b03d249b655 100644
--- a/deps/v8/src/heap/safepoint.h
+++ b/deps/v8/src/heap/safepoint.h
@@ -101,14 +101,12 @@ class GlobalSafepoint {
 
   int active_safepoint_scopes_;
 
-  LocalHeap* local_heap_of_this_thread_;
-
   friend class SafepointScope;
   friend class LocalHeap;
   friend class PersistentHandles;
 };
 
-class SafepointScope {
+class V8_NODISCARD SafepointScope {
  public:
   V8_EXPORT_PRIVATE explicit SafepointScope(Heap* heap);
   V8_EXPORT_PRIVATE ~SafepointScope();
diff --git a/deps/v8/src/heap/scavenger.cc b/deps/v8/src/heap/scavenger.cc
index ea4cb904590be3..9eb16771807765 100644
--- a/deps/v8/src/heap/scavenger.cc
+++ b/deps/v8/src/heap/scavenger.cc
@@ -182,9 +182,9 @@ void ScavengerCollector::JobTask::Run(JobDelegate* delegate) {
              GCTracer::Scope::SCAVENGER_SCAVENGE_PARALLEL);
     ProcessItems(delegate, scavenger);
   } else {
-    TRACE_BACKGROUND_GC(
-        outer_->heap_->tracer(),
-        GCTracer::BackgroundScope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL);
+    TRACE_GC_EPOCH(outer_->heap_->tracer(),
+                   GCTracer::Scope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL,
+                   ThreadKind::kBackground);
     ProcessItems(delegate, scavenger);
   }
 }
@@ -237,7 +237,7 @@ ScavengerCollector::ScavengerCollector(Heap* heap)
     : isolate_(heap->isolate()), heap_(heap) {}
 
 // Remove this crashkey after chromium:1010312 is fixed.
-class ScopedFullHeapCrashKey {
+class V8_NODISCARD ScopedFullHeapCrashKey {
  public:
   explicit ScopedFullHeapCrashKey(Isolate* isolate) : isolate_(isolate) {
     isolate_->AddCrashKey(v8::CrashKeyId::kDumpType, "heap");
@@ -253,12 +253,6 @@ class ScopedFullHeapCrashKey {
 void ScavengerCollector::CollectGarbage() {
   ScopedFullHeapCrashKey collect_full_heap_dump_if_crash(isolate_);
 
-  {
-    TRACE_GC(heap_->tracer(),
-             GCTracer::Scope::SCAVENGER_COMPLETE_SWEEP_ARRAY_BUFFERS);
-    heap_->array_buffer_sweeper()->EnsureFinished();
-  }
-
   DCHECK(surviving_new_large_objects_.empty());
   std::vector<std::unique_ptr<Scavenger>> scavengers;
   Worklist<MemoryChunk*, 64> empty_chunks;
@@ -502,8 +496,8 @@ int ScavengerCollector::NumberOfScavengeTasks() {
   const int num_scavenge_tasks =
       static_cast<int>(heap_->new_space()->TotalCapacity()) / MB + 1;
   static int num_cores = V8::GetCurrentPlatform()->NumberOfWorkerThreads() + 1;
-  int tasks =
-      Max(1, Min(Min(num_scavenge_tasks, kMaxScavengerTasks), num_cores));
+  int tasks = std::max(
+      1, std::min({num_scavenge_tasks, kMaxScavengerTasks, num_cores}));
   if (!heap_->CanPromoteYoungAndExpandOldGeneration(
           static_cast<size_t>(tasks * Page::kPageSize))) {
     // Optimize for memory usage near the heap limit.
@@ -569,7 +563,7 @@ void Scavenger::AddPageToSweeperIfNecessary(MemoryChunk* page) {
 void Scavenger::ScavengePage(MemoryChunk* page) {
   CodePageMemoryModificationScope memory_modification_scope(page);
 
-  if (page->slot_set<OLD_TO_NEW, AccessMode::NON_ATOMIC>() != nullptr) {
+  if (page->slot_set<OLD_TO_NEW, AccessMode::ATOMIC>() != nullptr) {
     InvalidatedSlotsFilter filter = InvalidatedSlotsFilter::OldToNew(page);
     RememberedSet<OLD_TO_NEW>::IterateAndTrackEmptyBuckets(
         page,
diff --git a/deps/v8/src/heap/setup-heap-internal.cc b/deps/v8/src/heap/setup-heap-internal.cc
index 521d1a10c6bd5c..030f38fd2c50f2 100644
--- a/deps/v8/src/heap/setup-heap-internal.cc
+++ b/deps/v8/src/heap/setup-heap-internal.cc
@@ -423,7 +423,7 @@ bool Heap::CreateInitialMaps() {
                          small_ordered_name_dictionary)
 
 #define TORQUE_ALLOCATE_MAP(NAME, Name, name) \
-  ALLOCATE_MAP(NAME, Name::kSize, name)
+  ALLOCATE_MAP(NAME, Name::SizeFor(), name)
     TORQUE_DEFINED_FIXED_INSTANCE_TYPE_LIST(TORQUE_ALLOCATE_MAP);
 #undef TORQUE_ALLOCATE_MAP
 
@@ -495,12 +495,6 @@ bool Heap::CreateInitialMaps() {
                  next_call_side_effect_free_call_handler_info)
 
     ALLOCATE_VARSIZE_MAP(PREPARSE_DATA_TYPE, preparse_data)
-    ALLOCATE_MAP(UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE,
-                 UncompiledDataWithoutPreparseData::kSize,
-                 uncompiled_data_without_preparse_data)
-    ALLOCATE_MAP(UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE,
-                 UncompiledDataWithPreparseData::kSize,
-                 uncompiled_data_with_preparse_data)
     ALLOCATE_MAP(SHARED_FUNCTION_INFO_TYPE, SharedFunctionInfo::kAlignedSize,
                  shared_function_info)
     ALLOCATE_MAP(SOURCE_TEXT_MODULE_TYPE, SourceTextModule::kSize,
@@ -517,6 +511,7 @@ bool Heap::CreateInitialMaps() {
     ALLOCATE_MAP(WASM_STRUCT_TYPE, 0, wasm_rttcanon_externref)
     ALLOCATE_MAP(WASM_STRUCT_TYPE, 0, wasm_rttcanon_funcref)
     ALLOCATE_MAP(WASM_STRUCT_TYPE, 0, wasm_rttcanon_i31ref)
+    ALLOCATE_MAP(WASM_STRUCT_TYPE, 0, wasm_rttcanon_anyref)
     ALLOCATE_MAP(WASM_TYPE_INFO_TYPE, WasmTypeInfo::kSize, wasm_type_info)
 
     ALLOCATE_MAP(WEAK_CELL_TYPE, WeakCell::kSize, weak_cell)
@@ -533,10 +528,20 @@ bool Heap::CreateInitialMaps() {
 
   {
     AllocationResult alloc =
-        AllocateRaw(FixedArray::SizeFor(0), AllocationType::kReadOnly);
+        AllocateRaw(FixedArray::SizeFor(ScopeInfo::kVariablePartIndex),
+                    AllocationType::kReadOnly);
     if (!alloc.To(&obj)) return false;
     obj.set_map_after_allocation(roots.scope_info_map(), SKIP_WRITE_BARRIER);
-    FixedArray::cast(obj).set_length(0);
+    FixedArray::cast(obj).set_length(ScopeInfo::kVariablePartIndex);
+    int flags = ScopeInfo::IsEmptyBit::encode(true);
+    DCHECK_EQ(ScopeInfo::LanguageModeBit::decode(flags), LanguageMode::kSloppy);
+    DCHECK_EQ(ScopeInfo::ReceiverVariableBits::decode(flags),
+              VariableAllocationInfo::NONE);
+    DCHECK_EQ(ScopeInfo::FunctionVariableBits::decode(flags),
+              VariableAllocationInfo::NONE);
+    ScopeInfo::cast(obj).SetFlags(flags);
+    ScopeInfo::cast(obj).SetContextLocalCount(0);
+    ScopeInfo::cast(obj).SetParameterCount(0);
   }
   set_empty_scope_info(ScopeInfo::cast(obj));
 
@@ -617,27 +622,65 @@ bool Heap::CreateInitialMaps() {
   }
 
   // Set up the WasmTypeInfo objects for built-in generic Wasm RTTs.
-#define ALLOCATE_TYPE_INFO(which)                                           \
-  {                                                                         \
-    int slot_count = ArrayList::kHeaderFields;                              \
-    if (!AllocateRaw(ArrayList::SizeFor(slot_count), AllocationType::kOld)  \
-             .To(&obj)) {                                                   \
-      return false;                                                         \
-    }                                                                       \
-    obj.set_map_after_allocation(roots.array_list_map());                   \
-    ArrayList subtypes = ArrayList::cast(obj);                              \
-    subtypes.set_length(slot_count);                                        \
-    subtypes.SetLength(0);                                                  \
-    if (!AllocateRaw(WasmTypeInfo::kSize, AllocationType::kOld).To(&obj)) { \
-      return false;                                                         \
-    }                                                                       \
-    obj.set_map_after_allocation(roots.wasm_type_info_map(),                \
-                                 SKIP_WRITE_BARRIER);                       \
-    WasmTypeInfo type_info = WasmTypeInfo::cast(obj);                       \
-    type_info.set_subtypes(subtypes);                                       \
-    type_info.set_parent(roots.null_map());                                 \
-    type_info.clear_foreign_address(isolate());                             \
-    wasm_rttcanon_##which##_map().set_wasm_type_info(type_info);            \
+  // anyref:
+  {
+    /* Subtypes. We do not cache subtypes for (rtt.canon any). */
+    int slot_count = ArrayList::kHeaderFields;
+    if (!AllocateRaw(ArrayList::SizeFor(slot_count), AllocationType::kOld)
+             .To(&obj)) {
+      return false;
+    }
+    obj.set_map_after_allocation(roots.array_list_map());
+    ArrayList subtypes = ArrayList::cast(obj);
+    subtypes.set_length(slot_count);
+    subtypes.SetLength(0);
+    /* TypeInfo */
+    if (!AllocateRaw(WasmTypeInfo::kSize, AllocationType::kOld).To(&obj)) {
+      return false;
+    }
+    obj.set_map_after_allocation(roots.wasm_type_info_map(),
+                                 SKIP_WRITE_BARRIER);
+    WasmTypeInfo type_info = WasmTypeInfo::cast(obj);
+    type_info.set_subtypes(subtypes);
+    type_info.set_supertypes(roots.empty_fixed_array());
+    type_info.set_parent(roots.null_map());
+    type_info.clear_foreign_address(isolate());
+    wasm_rttcanon_anyref_map().set_wasm_type_info(type_info);
+  }
+
+  // Rest of builtin types:
+#define ALLOCATE_TYPE_INFO(which)                                              \
+  {                                                                            \
+    /* Subtypes */                                                             \
+    int slot_count = ArrayList::kHeaderFields;                                 \
+    if (!AllocateRaw(ArrayList::SizeFor(slot_count), AllocationType::kOld)     \
+             .To(&obj)) {                                                      \
+      return false;                                                            \
+    }                                                                          \
+    obj.set_map_after_allocation(roots.array_list_map());                      \
+    ArrayList subtypes = ArrayList::cast(obj);                                 \
+    subtypes.set_length(slot_count);                                           \
+    subtypes.SetLength(0);                                                     \
+    /* Supertypes */                                                           \
+    if (!AllocateRaw(FixedArray::SizeFor(1), AllocationType::kOld).To(&obj)) { \
+      return false;                                                            \
+    }                                                                          \
+    obj.set_map_after_allocation(roots.fixed_array_map(), SKIP_WRITE_BARRIER); \
+    FixedArray supertypes = FixedArray::cast(obj);                             \
+    supertypes.set_length(1);                                                  \
+    supertypes.set(0, wasm_rttcanon_anyref_map());                             \
+    /* TypeInfo */                                                             \
+    if (!AllocateRaw(WasmTypeInfo::kSize, AllocationType::kOld).To(&obj)) {    \
+      return false;                                                            \
+    }                                                                          \
+    obj.set_map_after_allocation(roots.wasm_type_info_map(),                   \
+                                 SKIP_WRITE_BARRIER);                          \
+    WasmTypeInfo type_info = WasmTypeInfo::cast(obj);                          \
+    type_info.set_subtypes(subtypes);                                          \
+    type_info.set_supertypes(supertypes);                                      \
+    type_info.set_parent(wasm_rttcanon_anyref_map());                          \
+    type_info.clear_foreign_address(isolate());                                \
+    wasm_rttcanon_##which##_map().set_wasm_type_info(type_info);               \
   }
 
   ALLOCATE_TYPE_INFO(eqref)
@@ -1025,8 +1068,8 @@ void Heap::CreateInitialObjects() {
           AllocationType::kReadOnly));
 
   // Evaluate the hash values which will then be cached in the strings.
-  isolate()->factory()->zero_string()->Hash();
-  isolate()->factory()->one_string()->Hash();
+  isolate()->factory()->zero_string()->EnsureHash();
+  isolate()->factory()->one_string()->EnsureHash();
 
   // Initialize builtins constants table.
   set_builtins_constants_table(roots.empty_fixed_array());
diff --git a/deps/v8/src/heap/slot-set.h b/deps/v8/src/heap/slot-set.h
index ca7eef9b7abcaa..c36b02c22d1307 100644
--- a/deps/v8/src/heap/slot-set.h
+++ b/deps/v8/src/heap/slot-set.h
@@ -39,6 +39,9 @@ class PossiblyEmptyBuckets {
 
   ~PossiblyEmptyBuckets() { Release(); }
 
+  PossiblyEmptyBuckets(const PossiblyEmptyBuckets&) = delete;
+  PossiblyEmptyBuckets& operator=(const PossiblyEmptyBuckets&) = delete;
+
   void Initialize() {
     bitmap_ = kNullAddress;
     DCHECK(!IsAllocated());
@@ -117,8 +120,6 @@ class PossiblyEmptyBuckets {
   }
 
   FRIEND_TEST(PossiblyEmptyBucketsTest, WordsForBuckets);
-
-  DISALLOW_COPY_AND_ASSIGN(PossiblyEmptyBuckets);
 };
 
 STATIC_ASSERT(std::is_standard_layout<PossiblyEmptyBuckets>::value);
@@ -604,6 +605,7 @@ STATIC_ASSERT(std::is_standard_layout<SlotSet::Bucket>::value);
 enum SlotType {
   FULL_EMBEDDED_OBJECT_SLOT,
   COMPRESSED_EMBEDDED_OBJECT_SLOT,
+  DATA_EMBEDDED_OBJECT_SLOT,
   FULL_OBJECT_SLOT,
   COMPRESSED_OBJECT_SLOT,
   CODE_TARGET_SLOT,
@@ -639,7 +641,7 @@ class V8_EXPORT_PRIVATE TypedSlots {
   static const size_t kInitialBufferSize = 100;
   static const size_t kMaxBufferSize = 16 * KB;
   static size_t NextCapacity(size_t capacity) {
-    return Min(kMaxBufferSize, capacity * 2);
+    return std::min({kMaxBufferSize, capacity * 2});
   }
   Chunk* EnsureChunk();
   Chunk* NewChunk(Chunk* next, size_t capacity);
diff --git a/deps/v8/src/heap/spaces.cc b/deps/v8/src/heap/spaces.cc
index 7c4ca049308c39..b6c1e0bcc2a0c6 100644
--- a/deps/v8/src/heap/spaces.cc
+++ b/deps/v8/src/heap/spaces.cc
@@ -269,8 +269,8 @@ Address SpaceWithLinearArea::ComputeLimit(Address start, Address end,
         RoundSizeDownToObjectAlignment(static_cast<int>(step - 1));
     // Use uint64_t to avoid overflow on 32-bit
     uint64_t step_end =
-        static_cast<uint64_t>(start) + Max(min_size, rounded_step);
-    uint64_t new_end = Min(step_end, static_cast<uint64_t>(end));
+        static_cast<uint64_t>(start) + std::max(min_size, rounded_step);
+    uint64_t new_end = std::min(step_end, static_cast<uint64_t>(end));
     return static_cast<Address>(new_end);
   } else {
     // The entire node can be used as the linear allocation area.
diff --git a/deps/v8/src/heap/spaces.h b/deps/v8/src/heap/spaces.h
index 7f2d243aec9594..0a0a884dc025f4 100644
--- a/deps/v8/src/heap/spaces.h
+++ b/deps/v8/src/heap/spaces.h
@@ -121,6 +121,9 @@ class V8_EXPORT_PRIVATE Space : public BaseSpace {
         0;
   }
 
+  Space(const Space&) = delete;
+  Space& operator=(const Space&) = delete;
+
   static inline void MoveExternalBackingStoreBytes(
       ExternalBackingStoreType type, Space* from, Space* to, size_t amount);
 
@@ -194,8 +197,6 @@ class V8_EXPORT_PRIVATE Space : public BaseSpace {
   std::atomic<size_t>* external_backing_store_bytes_;
 
   std::unique_ptr<FreeList> free_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(Space);
 };
 
 STATIC_ASSERT(sizeof(std::atomic<intptr_t>) == kSystemPointerSize);
diff --git a/deps/v8/src/heap/sweeper.cc b/deps/v8/src/heap/sweeper.cc
index cdb1058edb0b40..c4e60be7072a67 100644
--- a/deps/v8/src/heap/sweeper.cc
+++ b/deps/v8/src/heap/sweeper.cc
@@ -4,6 +4,7 @@
 
 #include "src/heap/sweeper.h"
 
+#include "src/common/globals.h"
 #include "src/execution/vm-state-inl.h"
 #include "src/heap/code-object-registry.h"
 #include "src/heap/free-list-inl.h"
@@ -19,12 +20,8 @@ namespace internal {
 Sweeper::Sweeper(Heap* heap, MajorNonAtomicMarkingState* marking_state)
     : heap_(heap),
       marking_state_(marking_state),
-      num_tasks_(0),
-      pending_sweeper_tasks_semaphore_(0),
       incremental_sweeper_pending_(false),
       sweeping_in_progress_(false),
-      num_sweeping_tasks_(0),
-      stop_sweeper_tasks_(false),
       iterability_task_semaphore_(0),
       iterability_in_progress_(false),
       iterability_task_started_(false),
@@ -32,10 +29,10 @@ Sweeper::Sweeper(Heap* heap, MajorNonAtomicMarkingState* marking_state)
 
 Sweeper::PauseOrCompleteScope::PauseOrCompleteScope(Sweeper* sweeper)
     : sweeper_(sweeper) {
-  sweeper_->stop_sweeper_tasks_ = true;
   if (!sweeper_->sweeping_in_progress()) return;
 
-  sweeper_->AbortAndWaitForTasks();
+  if (sweeper_->job_handle_ && sweeper_->job_handle_->IsValid())
+    sweeper_->job_handle_->Cancel();
 
   // Complete sweeping if there's nothing more to do.
   if (sweeper_->IsDoneSweeping()) {
@@ -49,7 +46,6 @@ Sweeper::PauseOrCompleteScope::PauseOrCompleteScope(Sweeper* sweeper)
 }
 
 Sweeper::PauseOrCompleteScope::~PauseOrCompleteScope() {
-  sweeper_->stop_sweeper_tasks_ = false;
   if (!sweeper_->sweeping_in_progress()) return;
 
   sweeper_->StartSweeperTasks();
@@ -78,27 +74,39 @@ Sweeper::FilterSweepingPagesScope::~FilterSweepingPagesScope() {
   // old_space_sweeping_list_ does not need to be cleared as we don't use it.
 }
 
-class Sweeper::SweeperTask final : public CancelableTask {
+class Sweeper::SweeperJob final : public JobTask {
  public:
-  SweeperTask(Isolate* isolate, Sweeper* sweeper,
-              base::Semaphore* pending_sweeper_tasks,
-              std::atomic<intptr_t>* num_sweeping_tasks,
-              AllocationSpace space_to_start)
-      : CancelableTask(isolate),
-        sweeper_(sweeper),
-        pending_sweeper_tasks_(pending_sweeper_tasks),
-        num_sweeping_tasks_(num_sweeping_tasks),
-        space_to_start_(space_to_start),
-        tracer_(isolate->heap()->tracer()) {}
+  SweeperJob(Isolate* isolate, Sweeper* sweeper)
+      : sweeper_(sweeper), tracer_(isolate->heap()->tracer()) {}
+
+  ~SweeperJob() override = default;
 
-  ~SweeperTask() override = default;
+  SweeperJob(const SweeperJob&) = delete;
+  SweeperJob& operator=(const SweeperJob&) = delete;
+
+  void Run(JobDelegate* delegate) final {
+    if (delegate->IsJoiningThread()) {
+      TRACE_GC(tracer_, GCTracer::Scope::MC_SWEEP);
+      RunImpl(delegate);
+    } else {
+      TRACE_GC_EPOCH(tracer_, GCTracer::Scope::MC_BACKGROUND_SWEEPING,
+                     ThreadKind::kBackground);
+      RunImpl(delegate);
+    }
+  }
+
+  size_t GetMaxConcurrency(size_t worker_count) const override {
+    const size_t kPagePerTask = 2;
+    return std::min<size_t>(
+        kMaxSweeperTasks,
+        worker_count +
+            (sweeper_->ConcurrentSweepingPageCount() + kPagePerTask - 1) /
+                kPagePerTask);
+  }
 
  private:
-  void RunInternal() final {
-    TRACE_BACKGROUND_GC(tracer_,
-                        GCTracer::BackgroundScope::MC_BACKGROUND_SWEEPING);
-    DCHECK(IsValidSweepingSpace(space_to_start_));
-    const int offset = space_to_start_ - FIRST_GROWABLE_PAGED_SPACE;
+  void RunImpl(JobDelegate* delegate) {
+    const int offset = delegate->GetTaskId();
     for (int i = 0; i < kNumberOfSweepingSpaces; i++) {
       const AllocationSpace space_id = static_cast<AllocationSpace>(
           FIRST_GROWABLE_PAGED_SPACE +
@@ -106,19 +114,11 @@ class Sweeper::SweeperTask final : public CancelableTask {
       // Do not sweep code space concurrently.
       if (space_id == CODE_SPACE) continue;
       DCHECK(IsValidSweepingSpace(space_id));
-      sweeper_->SweepSpaceFromTask(space_id);
+      if (!sweeper_->ConcurrentSweepSpace(space_id, delegate)) return;
     }
-    (*num_sweeping_tasks_)--;
-    pending_sweeper_tasks_->Signal();
   }
-
   Sweeper* const sweeper_;
-  base::Semaphore* const pending_sweeper_tasks_;
-  std::atomic<intptr_t>* const num_sweeping_tasks_;
-  AllocationSpace space_to_start_;
   GCTracer* const tracer_;
-
-  DISALLOW_COPY_AND_ASSIGN(SweeperTask);
 };
 
 class Sweeper::IncrementalSweeperTask final : public CancelableTask {
@@ -128,6 +128,9 @@ class Sweeper::IncrementalSweeperTask final : public CancelableTask {
 
   ~IncrementalSweeperTask() override = default;
 
+  IncrementalSweeperTask(const IncrementalSweeperTask&) = delete;
+  IncrementalSweeperTask& operator=(const IncrementalSweeperTask&) = delete;
+
  private:
   void RunInternal() final {
     VMState<GC> state(isolate_);
@@ -136,7 +139,7 @@ class Sweeper::IncrementalSweeperTask final : public CancelableTask {
     sweeper_->incremental_sweeper_pending_ = false;
 
     if (sweeper_->sweeping_in_progress()) {
-      if (!sweeper_->SweepSpaceIncrementallyFromTask(CODE_SPACE)) {
+      if (!sweeper_->IncrementalSweepSpace(CODE_SPACE)) {
         sweeper_->ScheduleIncrementalSweepingTask();
       }
     }
@@ -144,11 +147,13 @@ class Sweeper::IncrementalSweeperTask final : public CancelableTask {
 
   Isolate* const isolate_;
   Sweeper* const sweeper_;
-  DISALLOW_COPY_AND_ASSIGN(IncrementalSweeperTask);
 };
 
+void Sweeper::TearDown() {
+  if (job_handle_ && job_handle_->IsValid()) job_handle_->Cancel();
+}
+
 void Sweeper::StartSweeping() {
-  CHECK(!stop_sweeper_tasks_);
   sweeping_in_progress_ = true;
   iterability_in_progress_ = true;
   should_reduce_memory_ = heap_->ShouldReduceMemory();
@@ -174,20 +179,12 @@ void Sweeper::StartSweeping() {
 }
 
 void Sweeper::StartSweeperTasks() {
-  DCHECK_EQ(0, num_tasks_);
-  DCHECK_EQ(0, num_sweeping_tasks_);
+  DCHECK(!job_handle_ || !job_handle_->IsValid());
   if (FLAG_concurrent_sweeping && sweeping_in_progress_ &&
       !heap_->delay_sweeper_tasks_for_testing_) {
-    ForAllSweepingSpaces([this](AllocationSpace space) {
-      DCHECK(IsValidSweepingSpace(space));
-      num_sweeping_tasks_++;
-      auto task = std::make_unique<SweeperTask>(
-          heap_->isolate(), this, &pending_sweeper_tasks_semaphore_,
-          &num_sweeping_tasks_, space);
-      DCHECK_LT(num_tasks_, kMaxSweeperTasks);
-      task_ids_[num_tasks_++] = task->id();
-      V8::GetCurrentPlatform()->CallOnWorkerThread(std::move(task));
-    });
+    job_handle_ = V8::GetCurrentPlatform()->PostJob(
+        TaskPriority::kUserVisible,
+        std::make_unique<SweeperJob>(heap_->isolate(), this));
     ScheduleIncrementalSweepingTask();
   }
 }
@@ -212,22 +209,6 @@ void Sweeper::MergeOldToNewRememberedSetsForSweptPages() {
   });
 }
 
-void Sweeper::AbortAndWaitForTasks() {
-  if (!FLAG_concurrent_sweeping) return;
-
-  for (int i = 0; i < num_tasks_; i++) {
-    if (heap_->isolate()->cancelable_task_manager()->TryAbort(task_ids_[i]) !=
-        TryAbortResult::kTaskAborted) {
-      pending_sweeper_tasks_semaphore_.Wait();
-    } else {
-      // Aborted case.
-      num_sweeping_tasks_--;
-    }
-  }
-  num_tasks_ = 0;
-  DCHECK_EQ(0, num_sweeping_tasks_);
-}
-
 void Sweeper::EnsureCompleted() {
   if (!sweeping_in_progress_) return;
 
@@ -238,7 +219,7 @@ void Sweeper::EnsureCompleted() {
   ForAllSweepingSpaces(
       [this](AllocationSpace space) { ParallelSweepSpace(space, 0); });
 
-  AbortAndWaitForTasks();
+  if (job_handle_ && job_handle_->IsValid()) job_handle_->Join();
 
   ForAllSweepingSpaces([this](AllocationSpace space) {
     CHECK(sweeping_list_[GetSweepSpaceIndex(space)].empty());
@@ -265,7 +246,9 @@ void Sweeper::SupportConcurrentSweeping() {
   });
 }
 
-bool Sweeper::AreSweeperTasksRunning() { return num_sweeping_tasks_ != 0; }
+bool Sweeper::AreSweeperTasksRunning() {
+  return job_handle_ && job_handle_->IsValid() && job_handle_->IsActive();
+}
 
 V8_INLINE size_t Sweeper::FreeAndProcessFreedMemory(
     Address free_start, Address free_end, Page* page, Space* space,
@@ -402,10 +385,10 @@ int Sweeper::RawSweep(
     Address free_end = object.address();
     if (free_end != free_start) {
       max_freed_bytes =
-          Max(max_freed_bytes,
-              FreeAndProcessFreedMemory(free_start, free_end, p, space,
-                                        non_empty_typed_slots, free_list_mode,
-                                        free_space_mode));
+          std::max(max_freed_bytes,
+                   FreeAndProcessFreedMemory(free_start, free_end, p, space,
+                                             non_empty_typed_slots,
+                                             free_list_mode, free_space_mode));
       CleanupRememberedSetEntriesForFreedMemory(
           free_start, free_end, p, non_empty_typed_slots, &free_ranges_map,
           &old_to_new_cleanup);
@@ -424,10 +407,10 @@ int Sweeper::RawSweep(
   Address free_end = p->area_end();
   if (free_end != free_start) {
     max_freed_bytes =
-        Max(max_freed_bytes,
-            FreeAndProcessFreedMemory(free_start, free_end, p, space,
-                                      non_empty_typed_slots, free_list_mode,
-                                      free_space_mode));
+        std::max(max_freed_bytes,
+                 FreeAndProcessFreedMemory(free_start, free_end, p, space,
+                                           non_empty_typed_slots,
+                                           free_list_mode, free_space_mode));
     CleanupRememberedSetEntriesForFreedMemory(
         free_start, free_end, p, non_empty_typed_slots, &free_ranges_map,
         &old_to_new_cleanup);
@@ -445,19 +428,27 @@ int Sweeper::RawSweep(
       p->owner()->free_list()->GuaranteedAllocatable(max_freed_bytes));
 }
 
-void Sweeper::SweepSpaceFromTask(AllocationSpace identity) {
-  Page* page = nullptr;
-  while (!stop_sweeper_tasks_ &&
-         ((page = GetSweepingPageSafe(identity)) != nullptr)) {
+size_t Sweeper::ConcurrentSweepingPageCount() {
+  base::MutexGuard guard(&mutex_);
+  return sweeping_list_[GetSweepSpaceIndex(OLD_SPACE)].size() +
+         sweeping_list_[GetSweepSpaceIndex(MAP_SPACE)].size();
+}
+
+bool Sweeper::ConcurrentSweepSpace(AllocationSpace identity,
+                                   JobDelegate* delegate) {
+  while (!delegate->ShouldYield()) {
+    Page* page = GetSweepingPageSafe(identity);
+    if (page == nullptr) return true;
     // Typed slot sets are only recorded on code pages. Code pages
     // are not swept concurrently to the application to ensure W^X.
     DCHECK(!page->typed_slot_set<OLD_TO_NEW>() &&
            !page->typed_slot_set<OLD_TO_OLD>());
     ParallelSweepPage(page, identity);
   }
+  return false;
 }
 
-bool Sweeper::SweepSpaceIncrementallyFromTask(AllocationSpace identity) {
+bool Sweeper::IncrementalSweepSpace(AllocationSpace identity) {
   if (Page* page = GetSweepingPageSafe(identity)) {
     ParallelSweepPage(page, identity);
   }
@@ -479,7 +470,7 @@ int Sweeper::ParallelSweepSpace(
       continue;
     }
     DCHECK_GE(freed, 0);
-    max_freed = Max(max_freed, freed);
+    max_freed = std::max(max_freed, freed);
     if ((required_freed_bytes) > 0 && (max_freed >= required_freed_bytes))
       return max_freed;
     if ((max_pages > 0) && (pages_freed >= max_pages)) return max_freed;
@@ -536,7 +527,7 @@ void Sweeper::AddPage(AllocationSpace space, Page* page,
                       Sweeper::AddPageMode mode) {
   base::MutexGuard guard(&mutex_);
   DCHECK(IsValidSweepingSpace(space));
-  DCHECK(!FLAG_concurrent_sweeping || !AreSweeperTasksRunning());
+  DCHECK(!FLAG_concurrent_sweeping || !job_handle_ || !job_handle_->IsValid());
   if (mode == Sweeper::REGULAR) {
     PrepareToBeSweptPage(space, page);
   } else {
@@ -606,10 +597,13 @@ class Sweeper::IterabilityTask final : public CancelableTask {
 
   ~IterabilityTask() override = default;
 
+  IterabilityTask(const IterabilityTask&) = delete;
+  IterabilityTask& operator=(const IterabilityTask&) = delete;
+
  private:
   void RunInternal() final {
-    TRACE_BACKGROUND_GC(tracer_,
-                        GCTracer::BackgroundScope::MC_BACKGROUND_SWEEPING);
+    TRACE_GC_EPOCH(tracer_, GCTracer::Scope::MC_BACKGROUND_SWEEPING,
+                   ThreadKind::kBackground);
     for (Page* page : sweeper_->iterability_list_) {
       sweeper_->MakeIterable(page);
     }
@@ -620,8 +614,6 @@ class Sweeper::IterabilityTask final : public CancelableTask {
   Sweeper* const sweeper_;
   base::Semaphore* const pending_iterability_task_;
   GCTracer* const tracer_;
-
-  DISALLOW_COPY_AND_ASSIGN(IterabilityTask);
 };
 
 void Sweeper::StartIterabilityTasks() {
diff --git a/deps/v8/src/heap/sweeper.h b/deps/v8/src/heap/sweeper.h
index e1c6c11738a7b4..8f247f4ca9222e 100644
--- a/deps/v8/src/heap/sweeper.h
+++ b/deps/v8/src/heap/sweeper.h
@@ -32,7 +32,7 @@ class Sweeper {
   using FreeRangesMap = std::map<uint32_t, uint32_t>;
 
   // Pauses the sweeper tasks or completes sweeping.
-  class PauseOrCompleteScope final {
+  class V8_NODISCARD PauseOrCompleteScope final {
    public:
     explicit PauseOrCompleteScope(Sweeper* sweeper);
     ~PauseOrCompleteScope();
@@ -45,7 +45,7 @@ class Sweeper {
   // sweeper to be paused. Allows for pages to be added to the sweeper while
   // in this scope. Note that the original list of sweeping pages is restored
   // after exiting this scope.
-  class FilterSweepingPagesScope final {
+  class V8_NODISCARD FilterSweepingPagesScope final {
    public:
     FilterSweepingPagesScope(
         Sweeper* sweeper, const PauseOrCompleteScope& pause_or_complete_scope);
@@ -81,6 +81,8 @@ class Sweeper {
 
   bool sweeping_in_progress() const { return sweeping_in_progress_; }
 
+  void TearDown();
+
   void AddPage(AllocationSpace space, Page* page, AddPageMode mode);
 
   int ParallelSweepSpace(
@@ -123,7 +125,7 @@ class Sweeper {
  private:
   class IncrementalSweeperTask;
   class IterabilityTask;
-  class SweeperTask;
+  class SweeperJob;
 
   static const int kNumberOfSweepingSpaces =
       LAST_GROWABLE_PAGED_SPACE - FIRST_GROWABLE_PAGED_SPACE + 1;
@@ -172,13 +174,15 @@ class Sweeper {
     return is_done;
   }
 
-  void SweepSpaceFromTask(AllocationSpace identity);
+  size_t ConcurrentSweepingPageCount();
+
+  // Concurrently sweeps many page from the given space. Returns true if there
+  // are no more pages to sweep in the given space.
+  bool ConcurrentSweepSpace(AllocationSpace identity, JobDelegate* delegate);
 
   // Sweeps incrementally one page from the given space. Returns true if
   // there are no more pages to sweep in the given space.
-  bool SweepSpaceIncrementallyFromTask(AllocationSpace identity);
-
-  void AbortAndWaitForTasks();
+  bool IncrementalSweepSpace(AllocationSpace identity);
 
   Page* GetSweepingPageSafe(AllocationSpace space);
 
@@ -202,9 +206,7 @@ class Sweeper {
 
   Heap* const heap_;
   MajorNonAtomicMarkingState* marking_state_;
-  int num_tasks_;
-  CancelableTaskManager::Id task_ids_[kNumberOfSweepingSpaces];
-  base::Semaphore pending_sweeper_tasks_semaphore_;
+  std::unique_ptr<JobHandle> job_handle_;
   base::Mutex mutex_;
   SweptList swept_list_[kNumberOfSweepingSpaces];
   SweepingList sweeping_list_[kNumberOfSweepingSpaces];
@@ -212,11 +214,6 @@ class Sweeper {
   // Main thread can finalize sweeping, while background threads allocation slow
   // path checks this flag to see whether it could support concurrent sweeping.
   std::atomic<bool> sweeping_in_progress_;
-  // Counter is actively maintained by the concurrent tasks to avoid querying
-  // the semaphore for maintaining a task counter on the main thread.
-  std::atomic<intptr_t> num_sweeping_tasks_;
-  // Used by PauseOrCompleteScope to signal early bailout to tasks.
-  std::atomic<bool> stop_sweeper_tasks_;
 
   // Pages that are only made iterable but have their free lists ignored.
   IterabilityList iterability_list_;
diff --git a/deps/v8/src/ic/accessor-assembler.cc b/deps/v8/src/ic/accessor-assembler.cc
index c9e517dccbf916..8335bc5e883d31 100644
--- a/deps/v8/src/ic/accessor-assembler.cc
+++ b/deps/v8/src/ic/accessor-assembler.cc
@@ -868,6 +868,11 @@ TNode<Object> AccessorAssembler::HandleProtoHandler(
 
       BIND(&if_lookup_on_lookup_start_object);
       {
+        if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+          // TODO(v8:11167) remove once OrderedNameDictionary supported.
+          GotoIf(Int32TrueConstant(), miss);
+        }
+
         // Dictionary lookup on lookup start object is not necessary for
         // Load/StoreGlobalIC (which is the only case when the
         // lookup_start_object can be a JSGlobalObject) because prototype
@@ -2444,6 +2449,11 @@ void AccessorAssembler::GenericPropertyLoad(
 
   BIND(&if_property_dictionary);
   {
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      // TODO(v8:11167) remove once OrderedNameDictionary supported.
+      GotoIf(Int32TrueConstant(), slow);
+    }
+
     Comment("dictionary property load");
     // We checked for LAST_CUSTOM_ELEMENTS_RECEIVER before, which rules out
     // seeing global objects here (which would need special handling).
@@ -2554,9 +2564,9 @@ enum AccessorAssembler::StubCacheTable : int {
 TNode<IntPtrT> AccessorAssembler::StubCachePrimaryOffset(TNode<Name> name,
                                                          TNode<Map> map) {
   // Compute the hash of the name (use entire hash field).
-  TNode<Uint32T> hash_field = LoadNameHashField(name);
+  TNode<Uint32T> raw_hash_field = LoadNameRawHashField(name);
   CSA_ASSERT(this,
-             Word32Equal(Word32And(hash_field,
+             Word32Equal(Word32And(raw_hash_field,
                                    Int32Constant(Name::kHashNotComputedMask)),
                          Int32Constant(0)));
 
@@ -2568,7 +2578,7 @@ TNode<IntPtrT> AccessorAssembler::StubCachePrimaryOffset(TNode<Name> name,
   TNode<Int32T> map32 = TruncateIntPtrToInt32(UncheckedCast<IntPtrT>(
       WordXor(map_word, WordShr(map_word, StubCache::kMapKeyShift))));
   // Base the offset on a simple combination of name and map.
-  TNode<Word32T> hash = Int32Add(hash_field, map32);
+  TNode<Word32T> hash = Int32Add(raw_hash_field, map32);
   uint32_t mask = (StubCache::kPrimaryTableSize - 1)
                   << StubCache::kCacheIndexShift;
   TNode<UintPtrT> result =
diff --git a/deps/v8/src/ic/handler-configuration-inl.h b/deps/v8/src/ic/handler-configuration-inl.h
index 4bc8ef6134e956..ca267a72a9723b 100644
--- a/deps/v8/src/ic/handler-configuration-inl.h
+++ b/deps/v8/src/ic/handler-configuration-inl.h
@@ -29,6 +29,8 @@ LoadHandler::Kind LoadHandler::GetHandlerKind(Smi smi_handler) {
 }
 
 Handle<Smi> LoadHandler::LoadNormal(Isolate* isolate) {
+  // TODO(v8:11167) remove DCHECK once OrderedNameDictionary supported.
+  DCHECK(!V8_DICT_MODE_PROTOTYPES_BOOL);
   int config = KindBits::encode(kNormal);
   return handle(Smi::FromInt(config), isolate);
 }
@@ -48,20 +50,16 @@ Handle<Smi> LoadHandler::LoadSlow(Isolate* isolate) {
   return handle(Smi::FromInt(config), isolate);
 }
 
-Handle<Smi> LoadHandler::LoadField(Isolate* isolate, FieldIndex field_index,
-                                   ElementsKind kind) {
+Handle<Smi> LoadHandler::LoadField(Isolate* isolate, FieldIndex field_index) {
   int config = KindBits::encode(kField) |
                IsInobjectBits::encode(field_index.is_inobject()) |
                IsDoubleBits::encode(field_index.is_double()) |
-               FieldIndexBits::encode(field_index.index()) |
-               CompactElementsKindBits::encode(ToCompactElementsKind(kind));
+               FieldIndexBits::encode(field_index.index());
   return handle(Smi::FromInt(config), isolate);
 }
 
-Handle<Smi> LoadHandler::LoadConstantFromPrototype(Isolate* isolate,
-                                                   ElementsKind kind) {
-  int config = KindBits::encode(kConstantFromPrototype) |
-               CompactElementsKindBits::encode(ToCompactElementsKind(kind));
+Handle<Smi> LoadHandler::LoadConstantFromPrototype(Isolate* isolate) {
+  int config = KindBits::encode(kConstantFromPrototype);
   return handle(Smi::FromInt(config), isolate);
 }
 
@@ -132,6 +130,8 @@ Handle<Smi> StoreHandler::StoreGlobalProxy(Isolate* isolate) {
 }
 
 Handle<Smi> StoreHandler::StoreNormal(Isolate* isolate) {
+  // TODO(v8:11167) remove DCHECK once OrderedNameDictionary supported.
+  DCHECK(!V8_DICT_MODE_PROTOTYPES_BOOL);
   int config = KindBits::encode(kNormal);
   return handle(Smi::FromInt(config), isolate);
 }
diff --git a/deps/v8/src/ic/handler-configuration.cc b/deps/v8/src/ic/handler-configuration.cc
index 8418962172108d..462f2e1ab0845e 100644
--- a/deps/v8/src/ic/handler-configuration.cc
+++ b/deps/v8/src/ic/handler-configuration.cc
@@ -116,6 +116,9 @@ Handle<Object> LoadHandler::LoadFromPrototype(
     Isolate* isolate, Handle<Map> lookup_start_object_map,
     Handle<JSReceiver> holder, Handle<Smi> smi_handler,
     MaybeObjectHandle maybe_data1, MaybeObjectHandle maybe_data2) {
+  // TODO(v8:11167) remove DCHECK once OrderedNameDictionary supported.
+  DCHECK_IMPLIES(V8_DICT_MODE_PROTOTYPES_BOOL,
+                 GetHandlerKind(*smi_handler) != Kind::kNormal);
   MaybeObjectHandle data1;
   if (maybe_data1.is_null()) {
     data1 = MaybeObjectHandle::Weak(holder);
@@ -168,7 +171,7 @@ Handle<Object> LoadHandler::LoadFullChain(Isolate* isolate,
 
 // static
 KeyedAccessLoadMode LoadHandler::GetKeyedAccessLoadMode(MaybeObject handler) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (handler->IsSmi()) {
     int const raw_handler = handler.ToSmi().value();
     Kind const kind = KindBits::decode(raw_handler);
@@ -183,7 +186,7 @@ KeyedAccessLoadMode LoadHandler::GetKeyedAccessLoadMode(MaybeObject handler) {
 // static
 KeyedAccessStoreMode StoreHandler::GetKeyedAccessStoreMode(
     MaybeObject handler) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (handler->IsSmi()) {
     int const raw_handler = handler.ToSmi().value();
     Kind const kind = KindBits::decode(raw_handler);
@@ -271,6 +274,10 @@ Handle<Object> StoreHandler::StoreThroughPrototype(
     Isolate* isolate, Handle<Map> receiver_map, Handle<JSReceiver> holder,
     Handle<Smi> smi_handler, MaybeObjectHandle maybe_data1,
     MaybeObjectHandle maybe_data2) {
+  // TODO(v8:11167) remove DCHECK once OrderedNameDictionary supported.
+  DCHECK_IMPLIES(V8_DICT_MODE_PROTOTYPES_BOOL,
+                 KindBits::decode(smi_handler->value()) != Kind::kNormal);
+
   MaybeObjectHandle data1;
   if (maybe_data1.is_null()) {
     data1 = MaybeObjectHandle::Weak(holder);
@@ -335,22 +342,15 @@ void PrintSmiLoadHandler(int raw_handler, std::ostream& os) {
       os << "kGlobal";
       break;
     case LoadHandler::Kind::kField: {
-      CompactElementsKind compact_elements_kind =
-          LoadHandler::CompactElementsKindBits::decode(raw_handler);
       os << "kField, is in object = "
          << LoadHandler::IsInobjectBits::decode(raw_handler)
          << ", is double = " << LoadHandler::IsDoubleBits::decode(raw_handler)
          << ", field index = "
-         << LoadHandler::FieldIndexBits::decode(raw_handler)
-         << ", elements kind = "
-         << CompactElementsKindToString(compact_elements_kind);
+         << LoadHandler::FieldIndexBits::decode(raw_handler);
       break;
     }
     case LoadHandler::Kind::kConstantFromPrototype: {
-      CompactElementsKind compact_elements_kind =
-          LoadHandler::CompactElementsKindBits::decode(raw_handler);
-      os << "kConstantFromPrototype, elements kind = "
-         << CompactElementsKindToString(compact_elements_kind);
+      os << "kConstantFromPrototype ";
       break;
     }
     case LoadHandler::Kind::kAccessor:
@@ -465,7 +465,7 @@ void PrintSmiStoreHandler(int raw_handler, std::ostream& os) {
 
 // static
 void LoadHandler::PrintHandler(Object handler, std::ostream& os) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (handler.IsSmi()) {
     int raw_handler = handler.ToSmi().value();
     os << "LoadHandler(Smi)(";
@@ -497,7 +497,7 @@ void LoadHandler::PrintHandler(Object handler, std::ostream& os) {
 }
 
 void StoreHandler::PrintHandler(Object handler, std::ostream& os) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (handler.IsSmi()) {
     int raw_handler = handler.ToSmi().value();
     os << "StoreHandler(Smi)(";
diff --git a/deps/v8/src/ic/handler-configuration.h b/deps/v8/src/ic/handler-configuration.h
index aaa2ac551fbdb4..c6cd29955c854e 100644
--- a/deps/v8/src/ic/handler-configuration.h
+++ b/deps/v8/src/ic/handler-configuration.h
@@ -80,9 +80,8 @@ class LoadHandler final : public DataHandler {
   // +1 here is to cover all possible JSObject header sizes.
   using FieldIndexBits =
       IsDoubleBits::Next<unsigned, kDescriptorIndexBitCount + 1>;
-  using CompactElementsKindBits = FieldIndexBits::Next<CompactElementsKind, 3>;
   // Make sure we don't overflow the smi.
-  STATIC_ASSERT(CompactElementsKindBits::kLastUsedBit < kSmiValueSize);
+  STATIC_ASSERT(FieldIndexBits::kLastUsedBit < kSmiValueSize);
 
   //
   // Encoding when KindBits contains kElement or kIndexedString.
@@ -122,13 +121,11 @@ class LoadHandler final : public DataHandler {
   static inline Handle<Smi> LoadSlow(Isolate* isolate);
 
   // Creates a Smi-handler for loading a field from fast object.
-  static inline Handle<Smi> LoadField(Isolate* isolate, FieldIndex field_index,
-                                      ElementsKind kind);
+  static inline Handle<Smi> LoadField(Isolate* isolate, FieldIndex field_index);
 
   // Creates a Smi-handler for loading a cached constant from fast
   // prototype object.
-  static inline Handle<Smi> LoadConstantFromPrototype(Isolate* isolate,
-                                                      ElementsKind kind);
+  static inline Handle<Smi> LoadConstantFromPrototype(Isolate* isolate);
 
   // Creates a Smi-handler for calling a getter on a fast object.
   static inline Handle<Smi> LoadAccessor(Isolate* isolate, int descriptor);
diff --git a/deps/v8/src/ic/ic-stats.cc b/deps/v8/src/ic/ic-stats.cc
index 8c5b303ef16b39..0250d75651ed74 100644
--- a/deps/v8/src/ic/ic-stats.cc
+++ b/deps/v8/src/ic/ic-stats.cc
@@ -78,15 +78,14 @@ const char* ICStats::GetOrCacheScriptName(Script script) {
 
 const char* ICStats::GetOrCacheFunctionName(JSFunction function) {
   Address function_ptr = function.ptr();
-  if (function_name_map_.find(function_ptr) != function_name_map_.end()) {
-    return function_name_map_[function_ptr].get();
+  // Lookup the function name or add a null unique_ptr if no entry exists.
+  std::unique_ptr<char[]>& function_name = function_name_map_[function_ptr];
+  if (!function_name) {
+    ic_infos_[pos_].is_optimized = function.HasAttachedOptimizedCode();
+    // Update the map entry with the actual debug name.
+    function_name = function.shared().DebugNameCStr();
   }
-  SharedFunctionInfo shared = function.shared();
-  ic_infos_[pos_].is_optimized = function.HasAttachedOptimizedCode();
-  char* function_name = shared.DebugName().ToCString().release();
-  function_name_map_.insert(
-      std::make_pair(function_ptr, std::unique_ptr<char[]>(function_name)));
-  return function_name;
+  return function_name.get();
 }
 
 ICInfo::ICInfo()
diff --git a/deps/v8/src/ic/ic.cc b/deps/v8/src/ic/ic.cc
index b077d4eabff6bf..d13d1bdab5f9ab 100644
--- a/deps/v8/src/ic/ic.cc
+++ b/deps/v8/src/ic/ic.cc
@@ -12,6 +12,7 @@
 #include "src/builtins/accessors.h"
 #include "src/codegen/code-factory.h"
 #include "src/common/assert-scope.h"
+#include "src/common/globals.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/execution.h"
 #include "src/execution/frames-inl.h"
@@ -124,7 +125,7 @@ void IC::TraceIC(const char* type, Handle<Object> name, State old_state,
   JavaScriptFrameIterator it(isolate());
   JavaScriptFrame* frame = it.frame();
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   JSFunction function = frame->function();
 
   ICStats::instance()->Begin();
@@ -140,7 +141,7 @@ void IC::TraceIC(const char* type, Handle<Object> name, State old_state,
         static_cast<int>(frame->pc() - function.code().InstructionStart());
   }
   JavaScriptFrame::CollectFunctionAndOffsetForICStats(
-      function, function.abstract_code(), code_offset);
+      function, function.abstract_code(isolate_), code_offset);
 
   // Reserve enough space for IC transition state, the longest length is 17.
   ic_info.state.reserve(17);
@@ -574,28 +575,24 @@ bool IC::UpdatePolymorphicIC(Handle<Name> name,
 
   std::vector<MapAndHandler> maps_and_handlers;
   maps_and_handlers.reserve(FLAG_max_valid_polymorphic_map_count);
-  std::vector<MapAndHandler> deprecated_maps_and_handlers;
+  int deprecated_maps = 0;
   int handler_to_overwrite = -1;
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     int i = 0;
     for (FeedbackIterator it(nexus()); !it.done(); it.Advance()) {
       if (it.handler()->IsCleared()) continue;
       MaybeObjectHandle existing_handler = handle(it.handler(), isolate());
       Handle<Map> existing_map = handle(it.map(), isolate());
 
-      if (existing_map->is_deprecated()) {
-        // Filter out deprecated maps to ensure their instances get migrated.
-        deprecated_maps_and_handlers.push_back(
-            MapAndHandler(existing_map, existing_handler));
-        continue;
-      }
-
       maps_and_handlers.push_back(
           MapAndHandler(existing_map, existing_handler));
 
-      if (map.is_identical_to(existing_map)) {
+      if (existing_map->is_deprecated()) {
+        // Filter out deprecated maps to ensure their instances get migrated.
+        deprecated_maps++;
+      } else if (map.is_identical_to(existing_map)) {
         // If both map and handler stayed the same (and the name is also the
         // same as checked above, for keyed accesses), we're not progressing
         // in the lattice and need to go MEGAMORPHIC instead. There's one
@@ -620,9 +617,7 @@ bool IC::UpdatePolymorphicIC(Handle<Name> name,
     DCHECK_LE(i, maps_and_handlers.size());
   }
 
-  int deprecated_maps = static_cast<int>(deprecated_maps_and_handlers.size());
-  int number_of_maps =
-      static_cast<int>(maps_and_handlers.size()) + deprecated_maps;
+  int number_of_maps = static_cast<int>(maps_and_handlers.size());
   int number_of_valid_maps =
       number_of_maps - deprecated_maps - (handler_to_overwrite != -1);
 
@@ -647,15 +642,6 @@ bool IC::UpdatePolymorphicIC(Handle<Name> name,
       maps_and_handlers.push_back(MapAndHandler(map, handler));
     }
 
-    // Reorder the deprecated maps to be at the end, so that
-    // minimorphic ICs have the best chance of succeeding as they only
-    // check the first FLAG_max_minimorphic_map_checks maps.
-    if (deprecated_maps_and_handlers.size() > 0) {
-      maps_and_handlers.insert(maps_and_handlers.end(),
-                               deprecated_maps_and_handlers.begin(),
-                               deprecated_maps_and_handlers.end());
-    }
-
     ConfigureVectorState(name, maps_and_handlers);
   }
 
@@ -859,7 +845,7 @@ Handle<Object> LoadIC::ComputeHandler(LookupIterator* lookup) {
       if (Accessors::IsJSObjectFieldAccessor(isolate(), map, lookup->name(),
                                              &index)) {
         TRACE_HANDLER_STATS(isolate(), LoadIC_LoadFieldDH);
-        return LoadHandler::LoadField(isolate(), index, map->elements_kind());
+        return LoadHandler::LoadField(isolate(), index);
       }
       if (holder->IsJSModuleNamespace()) {
         Handle<ObjectHashTable> exports(
@@ -937,8 +923,12 @@ Handle<Object> LoadIC::ComputeHandler(LookupIterator* lookup) {
               isolate(), map, holder, smi_handler,
               MaybeObjectHandle::Weak(lookup->GetPropertyCell()));
         } else {
-          smi_handler = LoadHandler::LoadNormal(isolate());
-
+          if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+            // TODO(v8:11167) remove once OrderedNameDictionary supported.
+            smi_handler = LoadHandler::LoadSlow(isolate());
+          } else {
+            smi_handler = LoadHandler::LoadNormal(isolate());
+          }
           TRACE_HANDLER_STATS(isolate(), LoadIC_LoadNormalDH);
           if (holder_is_lookup_start_object) return smi_handler;
           TRACE_HANDLER_STATS(isolate(), LoadIC_LoadNormalFromPrototypeDH);
@@ -981,8 +971,12 @@ Handle<Object> LoadIC::ComputeHandler(LookupIterator* lookup) {
               isolate(), map, holder, smi_handler,
               MaybeObjectHandle::Weak(lookup->GetPropertyCell()));
         }
-
-        smi_handler = LoadHandler::LoadNormal(isolate());
+        if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+          // TODO(v8:11167) remove once OrderedNameDictionary supported.
+          smi_handler = LoadHandler::LoadSlow(isolate());
+        } else {
+          smi_handler = LoadHandler::LoadNormal(isolate());
+        }
         TRACE_HANDLER_STATS(isolate(), LoadIC_LoadNormalDH);
         if (holder_is_lookup_start_object) return smi_handler;
         TRACE_HANDLER_STATS(isolate(), LoadIC_LoadNormalFromPrototypeDH);
@@ -992,8 +986,7 @@ Handle<Object> LoadIC::ComputeHandler(LookupIterator* lookup) {
       } else {
         DCHECK_EQ(kField, lookup->property_details().location());
         FieldIndex field = lookup->GetFieldIndex();
-        smi_handler =
-            LoadHandler::LoadField(isolate(), field, map->elements_kind());
+        smi_handler = LoadHandler::LoadField(isolate(), field);
         TRACE_HANDLER_STATS(isolate(), LoadIC_LoadFieldDH);
         if (holder_is_lookup_start_object) return smi_handler;
         TRACE_HANDLER_STATS(isolate(), LoadIC_LoadFieldFromPrototypeDH);
@@ -1019,8 +1012,7 @@ Handle<Object> LoadIC::ComputeHandler(LookupIterator* lookup) {
               value->IsSmi() ? MaybeObjectHandle(*value, isolate())
                              : MaybeObjectHandle::Weak(*value, isolate());
 
-          smi_handler = LoadHandler::LoadConstantFromPrototype(
-              isolate(), map->elements_kind());
+          smi_handler = LoadHandler::LoadConstantFromPrototype(isolate());
           TRACE_HANDLER_STATS(isolate(), LoadIC_LoadConstantFromPrototypeDH);
           return LoadHandler::LoadFromPrototype(isolate(), map, holder,
                                                 smi_handler, weak_value);
@@ -1811,7 +1803,12 @@ MaybeObjectHandle StoreIC::ComputeHandler(LookupIterator* lookup) {
         }
         TRACE_HANDLER_STATS(isolate(), StoreIC_StoreNormalDH);
         DCHECK(holder.is_identical_to(receiver));
-        return MaybeObjectHandle(StoreHandler::StoreNormal(isolate()));
+        // TODO(v8:11167) don't create slow hanlder once OrderedNameDictionary
+        // supported.
+        Handle<Smi> handler = V8_DICT_MODE_PROTOTYPES_BOOL
+                                  ? StoreHandler::StoreSlow(isolate())
+                                  : StoreHandler::StoreNormal(isolate());
+        return MaybeObjectHandle(handler);
       }
 
       // -------------- Elements (for TypedArrays) -------------
@@ -2706,7 +2703,7 @@ RUNTIME_FUNCTION(Runtime_ElementsTransitionAndStoreIC_Miss) {
 }
 
 static bool CanFastCloneObject(Handle<Map> map) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (map->IsNullOrUndefinedMap()) return true;
   if (!map->IsJSObjectMap() ||
       !IsSmiOrObjectElementsKind(map->elements_kind()) ||
@@ -2797,9 +2794,11 @@ static MaybeHandle<JSObject> CloneObjectSlowPath(Isolate* isolate,
     return new_object;
   }
 
-  MAYBE_RETURN(JSReceiver::SetOrCopyDataProperties(isolate, new_object, source,
-                                                   nullptr, false),
-               MaybeHandle<JSObject>());
+  MAYBE_RETURN(
+      JSReceiver::SetOrCopyDataProperties(
+          isolate, new_object, source,
+          PropertiesEnumerationMode::kPropertyAdditionOrder, nullptr, false),
+      MaybeHandle<JSObject>());
   return new_object;
 }
 
diff --git a/deps/v8/src/ic/keyed-store-generic.cc b/deps/v8/src/ic/keyed-store-generic.cc
index 3a0c9076cd605c..b2d33938b409c6 100644
--- a/deps/v8/src/ic/keyed-store-generic.cc
+++ b/deps/v8/src/ic/keyed-store-generic.cc
@@ -827,6 +827,10 @@ void KeyedStoreGenericAssembler::EmitGenericPropertyStore(
 
   BIND(&dictionary_properties);
   {
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      // TODO(v8:11167, v8:11177) Only here due to SetDataProperties workaround.
+      GotoIf(Int32TrueConstant(), slow);
+    }
     Comment("dictionary property store");
     // We checked for LAST_CUSTOM_ELEMENTS_RECEIVER before, which rules out
     // seeing global objects here (which would need special handling).
diff --git a/deps/v8/src/ic/stub-cache.cc b/deps/v8/src/ic/stub-cache.cc
index 8b643341430c67..cf276ea040f4bb 100644
--- a/deps/v8/src/ic/stub-cache.cc
+++ b/deps/v8/src/ic/stub-cache.cc
@@ -32,7 +32,7 @@ void StubCache::Initialize() {
 int StubCache::PrimaryOffset(Name name, Map map) {
   // Compute the hash of the name (use entire hash field).
   DCHECK(name.HasHashCode());
-  uint32_t field = name.hash_field();
+  uint32_t field = name.raw_hash_field();
   // Using only the low bits in 64-bit mode is unlikely to increase the
   // risk of collision even if the heap is spread over an area larger than
   // 4Gb (and not at all if it isn't).
@@ -71,7 +71,6 @@ bool CommonStubCacheChecks(StubCache* stub_cache, Name name, Map map,
   DCHECK(!Heap::InYoungGeneration(name));
   DCHECK(!Heap::InYoungGeneration(handler));
   DCHECK(name.IsUniqueName());
-  DCHECK(name.HasHashCode());
   if (handler->ptr() != kNullAddress) DCHECK(IC::IsHandler(handler));
   return true;
 }
diff --git a/deps/v8/src/ic/stub-cache.h b/deps/v8/src/ic/stub-cache.h
index ec026bcfcf073c..f8b3a3cdf26263 100644
--- a/deps/v8/src/ic/stub-cache.h
+++ b/deps/v8/src/ic/stub-cache.h
@@ -102,6 +102,8 @@ class V8_EXPORT_PRIVATE StubCache {
 
   // The constructor is made public only for the purposes of testing.
   explicit StubCache(Isolate* isolate);
+  StubCache(const StubCache&) = delete;
+  StubCache& operator=(const StubCache&) = delete;
 
  private:
   // The stub cache has a primary and secondary level.  The two levels have
@@ -142,8 +144,6 @@ class V8_EXPORT_PRIVATE StubCache {
 
   friend class Isolate;
   friend class SCTableReference;
-
-  DISALLOW_COPY_AND_ASSIGN(StubCache);
 };
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/init/bootstrapper.cc b/deps/v8/src/init/bootstrapper.cc
index e01e64bf41a2c4..ce3886e87e3747 100644
--- a/deps/v8/src/init/bootstrapper.cc
+++ b/deps/v8/src/init/bootstrapper.cc
@@ -21,6 +21,7 @@
 #include "src/extensions/ignition-statistics-extension.h"
 #include "src/extensions/statistics-extension.h"
 #include "src/extensions/trigger-failure-extension.h"
+#include "src/objects/objects.h"
 #ifdef ENABLE_VTUNE_TRACEMARK
 #include "src/extensions/vtunedomain-support-extension.h"
 #endif  // ENABLE_VTUNE_TRACEMARK
@@ -80,7 +81,7 @@ bool SourceCodeCache::Lookup(Isolate* isolate, Vector<const char> name,
                              Handle<SharedFunctionInfo>* handle) {
   for (int i = 0; i < cache_.length(); i += 2) {
     SeqOneByteString str = SeqOneByteString::cast(cache_.get(i));
-    if (str.IsOneByteEqualTo(Vector<const uint8_t>::cast(name))) {
+    if (str.IsOneByteEqualTo(name)) {
       *handle = Handle<SharedFunctionInfo>(
           SharedFunctionInfo::cast(cache_.get(i + 1)), isolate);
       return true;
@@ -246,13 +247,14 @@ class Genesis {
   class ExtensionStates {
    public:
     ExtensionStates();
+    ExtensionStates(const ExtensionStates&) = delete;
+    ExtensionStates& operator=(const ExtensionStates&) = delete;
     ExtensionTraversalState get_state(RegisteredExtension* extension);
     void set_state(RegisteredExtension* extension,
                    ExtensionTraversalState state);
 
    private:
     base::HashMap map_;
-    DISALLOW_COPY_AND_ASSIGN(ExtensionStates);
   };
 
   // Used both for deserialized and from-scratch contexts to add the extensions
@@ -373,19 +375,110 @@ void Bootstrapper::DetachGlobal(Handle<Context> env) {
 
 namespace {
 
+#ifdef DEBUG
+bool IsFunctionMapOrSpecialBuiltin(Handle<Map> map, Builtins::Name builtin_id,
+                                   Handle<Context> context) {
+  // During bootstrapping some of these maps could be not created yet.
+  return ((*map == context->get(Context::STRICT_FUNCTION_MAP_INDEX)) ||
+          (*map == context->get(
+                       Context::STRICT_FUNCTION_WITHOUT_PROTOTYPE_MAP_INDEX)) ||
+          (*map ==
+           context->get(
+               Context::STRICT_FUNCTION_WITH_READONLY_PROTOTYPE_MAP_INDEX)) ||
+          // Check if it's a creation of an empty or Proxy function during
+          // bootstrapping.
+          (builtin_id == Builtins::kEmptyFunction ||
+           builtin_id == Builtins::kProxyConstructor));
+}
+#endif  // DEBUG
+
+V8_NOINLINE Handle<JSFunction> CreateFunctionForBuiltin(
+    Isolate* isolate, Handle<String> name, Handle<Map> map,
+    Builtins::Name builtin_id) {
+  Factory* factory = isolate->factory();
+  Handle<NativeContext> context(isolate->native_context());
+  DCHECK(IsFunctionMapOrSpecialBuiltin(map, builtin_id, context));
+
+  Handle<SharedFunctionInfo> info =
+      factory->NewSharedFunctionInfoForBuiltin(name, builtin_id);
+  info->set_language_mode(LanguageMode::kStrict);
+
+  return Factory::JSFunctionBuilder{isolate, info, context}
+      .set_map(map)
+      .Build();
+}
+
+V8_NOINLINE Handle<JSFunction> CreateFunctionForBuiltinWithPrototype(
+    Isolate* isolate, Handle<String> name, Builtins::Name builtin_id,
+    Handle<HeapObject> prototype, InstanceType type, int instance_size,
+    int inobject_properties, MutableMode prototype_mutability) {
+  Factory* factory = isolate->factory();
+  Handle<NativeContext> context(isolate->native_context());
+  Handle<Map> map =
+      prototype_mutability == MUTABLE
+          ? isolate->strict_function_map()
+          : isolate->strict_function_with_readonly_prototype_map();
+  DCHECK(IsFunctionMapOrSpecialBuiltin(map, builtin_id, context));
+
+  Handle<SharedFunctionInfo> info =
+      factory->NewSharedFunctionInfoForBuiltin(name, builtin_id);
+  info->set_language_mode(LanguageMode::kStrict);
+  info->set_expected_nof_properties(inobject_properties);
+
+  Handle<JSFunction> result =
+      Factory::JSFunctionBuilder{isolate, info, context}.set_map(map).Build();
+
+  ElementsKind elements_kind;
+  switch (type) {
+    case JS_ARRAY_TYPE:
+      elements_kind = PACKED_SMI_ELEMENTS;
+      break;
+    case JS_ARGUMENTS_OBJECT_TYPE:
+      elements_kind = PACKED_ELEMENTS;
+      break;
+    default:
+      elements_kind = TERMINAL_FAST_ELEMENTS_KIND;
+      break;
+  }
+  Handle<Map> initial_map =
+      factory->NewMap(type, instance_size, elements_kind, inobject_properties);
+  // TODO(littledan): Why do we have this is_generator test when
+  // NewFunctionPrototype already handles finding an appropriately
+  // shared prototype?
+  if (!IsResumableFunction(info->kind()) && prototype->IsTheHole(isolate)) {
+    prototype = factory->NewFunctionPrototype(result);
+  }
+  JSFunction::SetInitialMap(result, initial_map, prototype);
+
+  return result;
+}
+
+V8_NOINLINE Handle<JSFunction> CreateFunctionForBuiltinWithoutPrototype(
+    Isolate* isolate, Handle<String> name, Builtins::Name builtin_id) {
+  Factory* factory = isolate->factory();
+  Handle<NativeContext> context(isolate->native_context());
+  Handle<Map> map = isolate->strict_function_without_prototype_map();
+  DCHECK(IsFunctionMapOrSpecialBuiltin(map, builtin_id, context));
+
+  Handle<SharedFunctionInfo> info =
+      factory->NewSharedFunctionInfoForBuiltin(name, builtin_id);
+  info->set_language_mode(LanguageMode::kStrict);
+
+  return Factory::JSFunctionBuilder{isolate, info, context}
+      .set_map(map)
+      .Build();
+}
+
 V8_NOINLINE Handle<JSFunction> CreateFunction(
     Isolate* isolate, Handle<String> name, InstanceType type, int instance_size,
     int inobject_properties, Handle<HeapObject> prototype,
     Builtins::Name builtin_id) {
   DCHECK(Builtins::HasJSLinkage(builtin_id));
 
-  Handle<JSFunction> result;
-
-  NewFunctionArgs args = NewFunctionArgs::ForBuiltinWithPrototype(
-      name, prototype, type, instance_size, inobject_properties, builtin_id,
-      IMMUTABLE);
+  Handle<JSFunction> result = CreateFunctionForBuiltinWithPrototype(
+      isolate, name, builtin_id, prototype, type, instance_size,
+      inobject_properties, IMMUTABLE);
 
-  result = isolate->factory()->NewFunction(args);
   // Make the JSFunction's prototype object fast.
   JSObject::MakePrototypesFast(handle(result->prototype(), isolate),
                                kStartAtReceiver, isolate);
@@ -431,9 +524,8 @@ V8_NOINLINE Handle<JSFunction> SimpleCreateFunction(Isolate* isolate,
                                                     int len, bool adapt) {
   DCHECK(Builtins::HasJSLinkage(call));
   name = String::Flatten(isolate, name, AllocationType::kOld);
-  NewFunctionArgs args = NewFunctionArgs::ForBuiltinWithoutPrototype(
-      name, call, LanguageMode::kStrict);
-  Handle<JSFunction> fun = isolate->factory()->NewFunction(args);
+  Handle<JSFunction> fun =
+      CreateFunctionForBuiltinWithoutPrototype(isolate, name, call);
   // Make the resulting JSFunction object fast.
   JSObject::MakePrototypesFast(fun, kStartAtReceiver, isolate);
   fun->shared().set_native(true);
@@ -586,9 +678,9 @@ Handle<JSFunction> Genesis::CreateEmptyFunction() {
 
   // Allocate the empty function as the prototype for function according to
   // ES#sec-properties-of-the-function-prototype-object
-  NewFunctionArgs args = NewFunctionArgs::ForBuiltin(
-      factory()->empty_string(), empty_function_map, Builtins::kEmptyFunction);
-  Handle<JSFunction> empty_function = factory()->NewFunction(args);
+  Handle<JSFunction> empty_function =
+      CreateFunctionForBuiltin(isolate(), factory()->empty_string(),
+                               empty_function_map, Builtins::kEmptyFunction);
   native_context()->set_empty_function(*empty_function);
 
   // --- E m p t y ---
@@ -639,9 +731,8 @@ Handle<JSFunction> Genesis::GetThrowTypeErrorIntrinsic() {
     return restricted_properties_thrower_;
   }
   Handle<String> name = factory()->empty_string();
-  NewFunctionArgs args = NewFunctionArgs::ForBuiltinWithoutPrototype(
-      name, Builtins::kStrictPoisonPillThrower, i::LanguageMode::kStrict);
-  Handle<JSFunction> function = factory()->NewFunction(args);
+  Handle<JSFunction> function = CreateFunctionForBuiltinWithoutPrototype(
+      isolate(), name, Builtins::kStrictPoisonPillThrower);
   function->shared().DontAdaptArguments();
 
   // %ThrowTypeError% must have a name property with an empty string value. Per
@@ -765,7 +856,7 @@ void Genesis::CreateObjectFunction(Handle<JSFunction> empty_function) {
 
   native_context()->set_initial_object_prototype(*object_function_prototype);
   JSFunction::SetPrototype(object_fun, object_function_prototype);
-
+  object_function_prototype->map().set_instance_type(JS_OBJECT_PROTOTYPE_TYPE);
   {
     // Set up slow map for Object.create(null) instances without in-object
     // properties.
@@ -816,6 +907,9 @@ void Genesis::CreateIteratorMaps(Handle<JSFunction> empty) {
                           factory()->iterator_symbol(), "[Symbol.iterator]",
                           Builtins::kReturnReceiver, 0, true);
   native_context()->set_initial_iterator_prototype(*iterator_prototype);
+  CHECK_NE(iterator_prototype->map().ptr(),
+           isolate_->initial_object_prototype()->map().ptr());
+  iterator_prototype->map().set_instance_type(JS_ITERATOR_PROTOTYPE_TYPE);
 
   Handle<JSObject> generator_object_prototype = factory()->NewJSObject(
       isolate()->object_function(), AllocationType::kOld);
@@ -1222,10 +1316,9 @@ Handle<JSGlobalObject> Genesis::CreateNewGlobals(
     Handle<String> name = factory()->empty_string();
     Handle<JSObject> prototype =
         factory()->NewFunctionPrototype(isolate()->object_function());
-    NewFunctionArgs args = NewFunctionArgs::ForBuiltinWithPrototype(
-        name, prototype, JS_GLOBAL_OBJECT_TYPE, JSGlobalObject::kHeaderSize, 0,
-        Builtins::kIllegal, MUTABLE);
-    js_global_object_function = factory()->NewFunction(args);
+    js_global_object_function = CreateFunctionForBuiltinWithPrototype(
+        isolate(), name, Builtins::kIllegal, prototype, JS_GLOBAL_OBJECT_TYPE,
+        JSGlobalObject::kHeaderSize, 0, MUTABLE);
 #ifdef DEBUG
     LookupIterator it(isolate(), prototype, factory()->constructor_string(),
                       LookupIterator::OWN_SKIP_INTERCEPTOR);
@@ -1253,11 +1346,10 @@ Handle<JSGlobalObject> Genesis::CreateNewGlobals(
   Handle<JSFunction> global_proxy_function;
   if (global_proxy_template.IsEmpty()) {
     Handle<String> name = factory()->empty_string();
-    NewFunctionArgs args = NewFunctionArgs::ForBuiltinWithPrototype(
-        name, factory()->the_hole_value(), JS_GLOBAL_PROXY_TYPE,
-        JSGlobalProxy::SizeWithEmbedderFields(0), 0, Builtins::kIllegal,
+    global_proxy_function = CreateFunctionForBuiltinWithPrototype(
+        isolate(), name, Builtins::kIllegal, factory()->the_hole_value(),
+        JS_GLOBAL_PROXY_TYPE, JSGlobalProxy::SizeWithEmbedderFields(0), 0,
         MUTABLE);
-    global_proxy_function = factory()->NewFunction(args);
   } else {
     Handle<ObjectTemplateInfo> data =
         v8::Utils::OpenHandle(*global_proxy_template);
@@ -1313,6 +1405,11 @@ void Genesis::HookUpGlobalObject(Handle<JSGlobalObject> global_object) {
   native_context()->set_security_token(*global_object);
 
   TransferNamedProperties(global_object_from_snapshot, global_object);
+  if (global_object_from_snapshot->HasDictionaryElements()) {
+    JSObject::NormalizeElements(global_object);
+  }
+  DCHECK_EQ(global_object_from_snapshot->GetElementsKind(),
+            global_object->GetElementsKind());
   TransferIndexedProperties(global_object_from_snapshot, global_object);
 }
 
@@ -1761,6 +1858,10 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
     Handle<JSObject> array_iterator_prototype =
         factory->NewJSObject(isolate_->object_function(), AllocationType::kOld);
     JSObject::ForceSetPrototype(array_iterator_prototype, iterator_prototype);
+    CHECK_NE(array_iterator_prototype->map().ptr(),
+             isolate_->initial_object_prototype()->map().ptr());
+    array_iterator_prototype->map().set_instance_type(
+        JS_ARRAY_ITERATOR_PROTOTYPE_TYPE);
 
     InstallToStringTag(isolate_, array_iterator_prototype,
                        factory->ArrayIterator_string());
@@ -2071,7 +2172,10 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
     Handle<JSObject> string_iterator_prototype =
         factory->NewJSObject(isolate_->object_function(), AllocationType::kOld);
     JSObject::ForceSetPrototype(string_iterator_prototype, iterator_prototype);
-
+    CHECK_NE(string_iterator_prototype->map().ptr(),
+             isolate_->initial_object_prototype()->map().ptr());
+    string_iterator_prototype->map().set_instance_type(
+        JS_STRING_ITERATOR_PROTOTYPE_TYPE);
     InstallToStringTag(isolate_, string_iterator_prototype, "String Iterator");
 
     InstallFunctionWithBuiltinId(isolate_, string_iterator_prototype, "next",
@@ -2306,6 +2410,10 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
     InstallFunctionWithBuiltinId(isolate_, promise_fun, "allSettled",
                                  Builtins::kPromiseAllSettled, 1, true);
 
+    Handle<JSFunction> promise_any = InstallFunctionWithBuiltinId(
+        isolate_, promise_fun, "any", Builtins::kPromiseAny, 1, true);
+    native_context()->set_promise_any(*promise_any);
+
     InstallFunctionWithBuiltinId(isolate_, promise_fun, "race",
                                  Builtins::kPromiseRace, 1, true);
 
@@ -2326,10 +2434,8 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
         isolate_, prototype, "then", Builtins::kPromisePrototypeThen, 2, true);
     native_context()->set_promise_then(*promise_then);
 
-    Handle<JSFunction> promise_catch =
-        InstallFunctionWithBuiltinId(isolate_, prototype, "catch",
-                                     Builtins::kPromisePrototypeCatch, 1, true);
-    native_context()->set_promise_catch(*promise_catch);
+    InstallFunctionWithBuiltinId(isolate_, prototype, "catch",
+                                 Builtins::kPromisePrototypeCatch, 1, true);
 
     InstallFunctionWithBuiltinId(isolate_, prototype, "finally",
                                  Builtins::kPromisePrototypeFinally, 1, true);
@@ -2338,6 +2444,9 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
 
     Handle<Map> prototype_map(prototype->map(), isolate());
     Map::SetShouldBeFastPrototypeMap(prototype_map, true, isolate_);
+    CHECK_NE(prototype->map().ptr(),
+             isolate_->initial_object_prototype()->map().ptr());
+    prototype->map().set_instance_type(JS_PROMISE_PROTOTYPE_TYPE);
 
     DCHECK(promise_fun->HasFastProperties());
   }
@@ -2442,6 +2551,9 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
 
       Handle<Map> prototype_map(prototype->map(), isolate());
       Map::SetShouldBeFastPrototypeMap(prototype_map, true, isolate_);
+      CHECK_NE((*prototype_map).ptr(),
+               isolate_->initial_object_prototype()->map().ptr());
+      prototype_map->set_instance_type(JS_REG_EXP_PROTOTYPE_TYPE);
 
       // Store the initial RegExp.prototype map. This is used in fast-path
       // checks. Do not alter the prototype after this point.
@@ -2565,6 +2677,11 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
   InstallError(isolate_, global, factory->Error_string(),
                Context::ERROR_FUNCTION_INDEX);
 
+  // -- A g g r e g a t e E r r o r
+  InstallError(isolate_, global, factory->AggregateError_string(),
+               Context::AGGREGATE_ERROR_FUNCTION_INDEX,
+               Builtins::kAggregateErrorConstructor, 2, 2);
+
   // -- E v a l E r r o r
   InstallError(isolate_, global, factory->EvalError_string(),
                Context::EVAL_ERROR_FUNCTION_INDEX);
@@ -2706,10 +2823,14 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
 
   {  // -- C o n s o l e
     Handle<String> name = factory->InternalizeUtf8String("console");
-    NewFunctionArgs args = NewFunctionArgs::ForFunctionWithoutCode(
-        name, isolate_->strict_function_map(), LanguageMode::kStrict);
-    Handle<JSFunction> cons = factory->NewFunction(args);
 
+    Handle<NativeContext> context(isolate()->native_context());
+    Handle<SharedFunctionInfo> info =
+        factory->NewSharedFunctionInfoForBuiltin(name, Builtins::kIllegal);
+    info->set_language_mode(LanguageMode::kStrict);
+
+    Handle<JSFunction> cons =
+        Factory::JSFunctionBuilder{isolate(), info, context}.Build();
     Handle<JSObject> empty = factory->NewJSObject(isolate_->object_function());
     JSFunction::SetPrototype(cons, empty);
 
@@ -3075,6 +3196,87 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
                               Builtins::kDisplayNamesPrototypeOf, 1, false);
       }
     }
+
+    {  // -- S e g m e n t e r
+      Handle<JSFunction> segmenter_fun = InstallFunction(
+          isolate(), intl, "Segmenter", JS_SEGMENTER_TYPE,
+          JSSegmenter::kHeaderSize, 0, factory->the_hole_value(),
+          Builtins::kSegmenterConstructor);
+      segmenter_fun->shared().set_length(0);
+      segmenter_fun->shared().DontAdaptArguments();
+      InstallWithIntrinsicDefaultProto(isolate_, segmenter_fun,
+                                       Context::INTL_SEGMENTER_FUNCTION_INDEX);
+      SimpleInstallFunction(isolate(), segmenter_fun, "supportedLocalesOf",
+                            Builtins::kSegmenterSupportedLocalesOf, 1, false);
+      {
+        // Setup %SegmenterPrototype%.
+        Handle<JSObject> prototype(
+            JSObject::cast(segmenter_fun->instance_prototype()), isolate());
+        // #sec-intl.segmenter.prototype-@@tostringtag
+        //
+        // Intl.Segmenter.prototype [ @@toStringTag ]
+        //
+        // The initial value of the @@toStringTag property is the String value
+        // "Intl.Segmenter".
+        InstallToStringTag(isolate(), prototype, "Intl.Segmenter");
+        SimpleInstallFunction(isolate(), prototype, "resolvedOptions",
+                              Builtins::kSegmenterPrototypeResolvedOptions, 0,
+                              false);
+        SimpleInstallFunction(isolate(), prototype, "segment",
+                              Builtins::kSegmenterPrototypeSegment, 1, false);
+      }
+      {
+        // Setup %SegmentsPrototype%.
+        Handle<JSObject> prototype = factory->NewJSObject(
+            isolate()->object_function(), AllocationType::kOld);
+        Handle<String> name_string =
+            Name::ToFunctionName(isolate(), factory->Segments_string())
+                .ToHandleChecked();
+        Handle<JSFunction> segments_fun = CreateFunction(
+            isolate(), name_string, JS_SEGMENTS_TYPE, JSSegments::kHeaderSize,
+            0, prototype, Builtins::kIllegal);
+        segments_fun->shared().set_native(false);
+        segments_fun->shared().set_length(0);
+        segments_fun->shared().DontAdaptArguments();
+        SimpleInstallFunction(isolate(), prototype, "containing",
+                              Builtins::kSegmentsPrototypeContaining, 1, false);
+        InstallFunctionAtSymbol(isolate_, prototype, factory->iterator_symbol(),
+                                "[Symbol.iterator]",
+                                Builtins::kSegmentsPrototypeIterator, 0, true,
+                                DONT_ENUM);
+        Handle<Map> segments_map(segments_fun->initial_map(), isolate());
+        native_context()->set_intl_segments_map(*segments_map);
+      }
+      {
+        // Setup %SegmentIteratorPrototype%.
+        Handle<JSObject> iterator_prototype(
+            native_context()->initial_iterator_prototype(), isolate());
+        Handle<JSObject> prototype = factory->NewJSObject(
+            isolate()->object_function(), AllocationType::kOld);
+        JSObject::ForceSetPrototype(prototype, iterator_prototype);
+        // #sec-%segmentiteratorprototype%.@@tostringtag
+        //
+        // %SegmentIteratorPrototype% [ @@toStringTag ]
+        //
+        // The initial value of the @@toStringTag property is the String value
+        // "Segmenter String Iterator".
+        InstallToStringTag(isolate(), prototype, "Segmenter String Iterator");
+        SimpleInstallFunction(isolate(), prototype, "next",
+                              Builtins::kSegmentIteratorPrototypeNext, 0,
+                              false);
+        // Setup SegmentIterator constructor.
+        Handle<String> name_string =
+            Name::ToFunctionName(isolate(), factory->SegmentIterator_string())
+                .ToHandleChecked();
+        Handle<JSFunction> segment_iterator_fun = CreateFunction(
+            isolate(), name_string, JS_SEGMENT_ITERATOR_TYPE,
+            JSSegmentIterator::kHeaderSize, 0, prototype, Builtins::kIllegal);
+        segment_iterator_fun->shared().set_native(false);
+        Handle<Map> segment_iterator_map(segment_iterator_fun->initial_map(),
+                                         isolate());
+        native_context()->set_intl_segment_iterator_map(*segment_iterator_map);
+      }
+    }
   }
 #endif  // V8_INTL_SUPPORT
 
@@ -3464,6 +3666,9 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
     DCHECK(js_set_fun->HasFastProperties());
 
     native_context()->set_js_set_map(js_set_fun->initial_map());
+    CHECK_NE(prototype->map().ptr(),
+             isolate_->initial_object_prototype()->map().ptr());
+    prototype->map().set_instance_type(JS_SET_PROTOTYPE_TYPE);
   }
 
   {  // -- J S M o d u l e N a m e s p a c e
@@ -3503,10 +3708,11 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
               .ToHandleChecked();
 
     // done
-    // TODO(bmeurer): Once FLAG_modify_field_representation_inplace is always
-    // on, we can say Representation::HeapObject() here and have the inplace
-    // update logic take care of the case where someone ever stores a Smi into
-    // the done field.
+    // TODO(ishell): Consider using Representation::HeapObject() here and rely
+    // on the inplace update logic to take care of the case where someone ever
+    // stores a Smi into the done field. The logic works fine but in --jitless
+    // mode FLAG_track_heap_object_fields is off and the logic doesn't handle
+    // generalizations of HeapObject representation properly.
     map = Map::CopyWithField(isolate(), map, factory->done_string(),
                              FieldType::Any(isolate()), NONE,
                              PropertyConstness::kConst,
@@ -3595,10 +3801,8 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
     proxy_function_map->set_is_constructor(true);
 
     Handle<String> name = factory->Proxy_string();
-
-    NewFunctionArgs args = NewFunctionArgs::ForBuiltin(
-        name, proxy_function_map, Builtins::kProxyConstructor);
-    Handle<JSFunction> proxy_function = factory->NewFunction(args);
+    Handle<JSFunction> proxy_function = CreateFunctionForBuiltin(
+        isolate(), name, proxy_function_map, Builtins::kProxyConstructor);
 
     isolate_->proxy_map()->SetConstructor(*proxy_function);
 
@@ -3689,11 +3893,10 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
 
   {  // --- sloppy arguments map
     Handle<String> arguments_string = factory->Arguments_string();
-    NewFunctionArgs args = NewFunctionArgs::ForBuiltinWithPrototype(
-        arguments_string, isolate_->initial_object_prototype(),
-        JS_ARGUMENTS_OBJECT_TYPE, JSSloppyArgumentsObject::kSize, 2,
-        Builtins::kIllegal, MUTABLE);
-    Handle<JSFunction> function = factory->NewFunction(args);
+    Handle<JSFunction> function = CreateFunctionForBuiltinWithPrototype(
+        isolate(), arguments_string, Builtins::kIllegal,
+        isolate()->initial_object_prototype(), JS_ARGUMENTS_OBJECT_TYPE,
+        JSSloppyArgumentsObject::kSize, 2, MUTABLE);
     Handle<Map> map(function->initial_map(), isolate());
 
     // Create the descriptor array for the arguments object.
@@ -3841,6 +4044,10 @@ Handle<JSFunction> Genesis::InstallTypedArray(const char* name,
                                kDontThrow)
             .FromJust());
 
+  CHECK_NE(prototype->map().ptr(),
+           isolate_->initial_object_prototype()->map().ptr());
+  prototype->map().set_instance_type(JS_TYPED_ARRAY_PROTOTYPE_TYPE);
+
   InstallConstant(isolate(), prototype, "BYTES_PER_ELEMENT", bytes_per_element);
   return result;
 }
@@ -3893,7 +4100,7 @@ bool Genesis::CompileExtension(Isolate* isolate, v8::Extension* extension) {
   // function before overwriting the context but since we're in a
   // single-threaded environment it is not strictly necessary.
   Handle<JSFunction> fun =
-      factory->NewFunctionFromSharedFunctionInfo(function_info, context);
+      Factory::JSFunctionBuilder{isolate, function_info, context}.Build();
 
   // Call function using either the runtime object or the global
   // object as the receiver. Provide no parameters.
@@ -3980,6 +4187,9 @@ void Genesis::InitializeIteratorFunctions() {
     InstallFunctionWithBuiltinId(isolate, prototype, "next",
                                  Builtins::kSetIteratorPrototypeNext, 0, true);
     native_context->set_initial_set_iterator_prototype(*prototype);
+    CHECK_NE(prototype->map().ptr(),
+             isolate_->initial_object_prototype()->map().ptr());
+    prototype->map().set_instance_type(JS_SET_ITERATOR_PROTOTYPE_TYPE);
 
     // Setup SetIterator constructor.
     Handle<JSFunction> set_iterator_function = CreateFunction(
@@ -4010,6 +4220,9 @@ void Genesis::InitializeIteratorFunctions() {
     InstallFunctionWithBuiltinId(isolate, prototype, "next",
                                  Builtins::kMapIteratorPrototypeNext, 0, true);
     native_context->set_initial_map_iterator_prototype(*prototype);
+    CHECK_NE(prototype->map().ptr(),
+             isolate_->initial_object_prototype()->map().ptr());
+    prototype->map().set_instance_type(JS_MAP_ITERATOR_PROTOTYPE_TYPE);
 
     // Setup MapIterator constructor.
     Handle<JSFunction> map_iterator_function = CreateFunction(
@@ -4135,7 +4348,6 @@ void Genesis::InitializeCallSiteBuiltins() {
 #define EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(id) \
   void Genesis::InitializeGlobal_##id() {}
 
-EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_private_methods)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_regexp_sequence)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_top_level_await)
 EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE(harmony_logical_assignment)
@@ -4255,34 +4467,6 @@ void Genesis::InitializeGlobal_harmony_weak_refs_with_cleanup_some() {
                         DONT_ENUM);
 }
 
-void Genesis::InitializeGlobal_harmony_promise_any() {
-  if (!FLAG_harmony_promise_any) {
-    return;
-  }
-
-  Factory* factory = isolate()->factory();
-  Handle<JSGlobalObject> global(native_context()->global_object(), isolate());
-
-  InstallError(isolate_, global, factory->AggregateError_string(),
-               Context::AGGREGATE_ERROR_FUNCTION_INDEX,
-               Builtins::kAggregateErrorConstructor, 2, 2);
-
-  // Setup %AggregateErrorPrototype%.
-  Handle<JSFunction> aggregate_error_function(
-      native_context()->aggregate_error_function(), isolate());
-  Handle<JSObject> prototype(
-      JSObject::cast(aggregate_error_function->instance_prototype()),
-      isolate());
-
-  Handle<JSFunction> promise_fun(
-      JSFunction::cast(
-          isolate()->native_context()->get(Context::PROMISE_FUNCTION_INDEX)),
-      isolate());
-  Handle<JSFunction> promise_any = InstallFunctionWithBuiltinId(
-      isolate_, promise_fun, "any", Builtins::kPromiseAny, 1, true);
-  native_context()->set_promise_any(*promise_any);
-}
-
 void Genesis::InitializeGlobal_harmony_regexp_match_indices() {
   if (!FLAG_harmony_regexp_match_indices) return;
 
@@ -4320,113 +4504,46 @@ void Genesis::InitializeGlobal_regexp_linear_flag() {
   native_context()->set_regexp_prototype_map(regexp_prototype->map());
 }
 
-#ifdef V8_INTL_SUPPORT
-
-void Genesis::InitializeGlobal_harmony_intl_segmenter() {
-  if (!FLAG_harmony_intl_segmenter) return;
-  Handle<JSObject> intl = Handle<JSObject>::cast(
-      JSReceiver::GetProperty(
-          isolate(),
-          Handle<JSReceiver>(native_context()->global_object(), isolate()),
-          factory()->InternalizeUtf8String("Intl"))
-          .ToHandleChecked());
-
-  Handle<JSFunction> segmenter_fun = InstallFunction(
-      isolate(), intl, "Segmenter", JS_SEGMENTER_TYPE, JSSegmenter::kHeaderSize,
-      0, factory()->the_hole_value(), Builtins::kSegmenterConstructor);
-  segmenter_fun->shared().set_length(0);
-  segmenter_fun->shared().DontAdaptArguments();
-  InstallWithIntrinsicDefaultProto(isolate_, segmenter_fun,
-                                   Context::INTL_SEGMENTER_FUNCTION_INDEX);
-
-  SimpleInstallFunction(isolate(), segmenter_fun, "supportedLocalesOf",
-                        Builtins::kSegmenterSupportedLocalesOf, 1, false);
+void Genesis::InitializeGlobal_harmony_relative_indexing_methods() {
+  if (!FLAG_harmony_relative_indexing_methods) return;
 
   {
-    // Setup %SegmenterPrototype%.
-    Handle<JSObject> prototype(
-        JSObject::cast(segmenter_fun->instance_prototype()), isolate());
-
-    // #sec-intl.segmenter.prototype-@@tostringtag
-    //
-    // Intl.Segmenter.prototype [ @@toStringTag ]
-    //
-    // The initial value of the @@toStringTag property is the String value
-    // "Intl.Segmenter".
-    InstallToStringTag(isolate(), prototype, "Intl.Segmenter");
-
-    SimpleInstallFunction(isolate(), prototype, "resolvedOptions",
-                          Builtins::kSegmenterPrototypeResolvedOptions, 0,
-                          false);
-
-    SimpleInstallFunction(isolate(), prototype, "segment",
-                          Builtins::kSegmenterPrototypeSegment, 1, false);
+    Handle<JSFunction> array_function(native_context()->array_function(),
+                                      isolate());
+    Handle<JSObject> array_prototype(
+        JSObject::cast(array_function->instance_prototype()), isolate());
+
+    SimpleInstallFunction(isolate(), array_prototype, "at",
+                          Builtins::kArrayPrototypeAt, 1, true);
+
+    Handle<JSObject> unscopables = Handle<JSObject>::cast(
+        JSReceiver::GetProperty(isolate(), array_prototype,
+                                factory()->unscopables_symbol())
+            .ToHandleChecked());
+    InstallTrueValuedProperty(isolate(), unscopables, "at");
   }
 
   {
-    // Setup %SegmentsPrototype%.
-    Handle<JSObject> prototype = factory()->NewJSObject(
-        isolate()->object_function(), AllocationType::kOld);
-
-    Handle<String> name_string =
-        Name::ToFunctionName(isolate(), isolate()->factory()->Segments_string())
-            .ToHandleChecked();
-    Handle<JSFunction> segments_fun = CreateFunction(
-        isolate(), name_string, JS_SEGMENTS_TYPE, JSSegments::kHeaderSize, 0,
-        prototype, Builtins::kIllegal);
-    segments_fun->shared().set_native(false);
-    segments_fun->shared().set_length(0);
-    segments_fun->shared().DontAdaptArguments();
-
-    SimpleInstallFunction(isolate(), prototype, "containing",
-                          Builtins::kSegmentsPrototypeContaining, 1, false);
-
-    InstallFunctionAtSymbol(
-        isolate_, prototype, factory()->iterator_symbol(), "[Symbol.iterator]",
-        Builtins::kSegmentsPrototypeIterator, 0, true, DONT_ENUM);
+    Handle<JSFunction> string_function(native_context()->string_function(),
+                                       isolate());
+    Handle<JSObject> string_prototype(
+        JSObject::cast(string_function->instance_prototype()), isolate());
 
-    Handle<Map> segments_map(segments_fun->initial_map(), isolate());
-    native_context()->set_intl_segments_map(*segments_map);
+    SimpleInstallFunction(isolate(), string_prototype, "at",
+                          Builtins::kStringPrototypeAt, 1, true);
   }
 
   {
-    // Setup %SegmentIteratorPrototype%.
-    Handle<JSObject> iterator_prototype(
-        native_context()->initial_iterator_prototype(), isolate());
+    Handle<JSFunction> typed_array_function(
+        native_context()->typed_array_function(), isolate());
+    Handle<JSObject> typed_array_prototype(
+        JSObject::cast(typed_array_function->instance_prototype()), isolate());
 
-    Handle<JSObject> prototype = factory()->NewJSObject(
-        isolate()->object_function(), AllocationType::kOld);
-    JSObject::ForceSetPrototype(prototype, iterator_prototype);
-
-    // #sec-%segmentiteratorprototype%.@@tostringtag
-    //
-    // %SegmentIteratorPrototype% [ @@toStringTag ]
-    //
-    // The initial value of the @@toStringTag property is the String value
-    // "Segmenter String Iterator".
-    InstallToStringTag(isolate(), prototype, "Segmenter String Iterator");
-
-    SimpleInstallFunction(isolate(), prototype, "next",
-                          Builtins::kSegmentIteratorPrototypeNext, 0, false);
-
-    // Setup SegmentIterator constructor.
-    Handle<String> name_string =
-        Name::ToFunctionName(isolate(),
-                             isolate()->factory()->SegmentIterator_string())
-            .ToHandleChecked();
-    Handle<JSFunction> segment_iterator_fun = CreateFunction(
-        isolate(), name_string, JS_SEGMENT_ITERATOR_TYPE,
-        JSSegmentIterator::kHeaderSize, 0, prototype, Builtins::kIllegal);
-    segment_iterator_fun->shared().set_native(false);
-
-    Handle<Map> segment_iterator_map(segment_iterator_fun->initial_map(),
-                                     isolate());
-    native_context()->set_intl_segment_iterator_map(*segment_iterator_map);
+    SimpleInstallFunction(isolate(), typed_array_prototype, "at",
+                          Builtins::kTypedArrayPrototypeAt, 1, true);
   }
 }
 
-#endif  // V8_INTL_SUPPORT
-
 Handle<JSFunction> Genesis::CreateArrayBuffer(
     Handle<String> name, ArrayBufferKind array_buffer_kind) {
   // Create the %ArrayBufferPrototype%
@@ -4482,8 +4599,9 @@ Handle<JSFunction> Genesis::CreateArrayBuffer(
 bool Genesis::InstallABunchOfRandomThings() {
   HandleScope scope(isolate());
 
-  auto fast_template_instantiations_cache = isolate()->factory()->NewFixedArray(
-      TemplateInfo::kFastTemplateInstantiationsCacheSize);
+  auto fast_template_instantiations_cache =
+      isolate()->factory()->NewFixedArrayWithHoles(
+          TemplateInfo::kFastTemplateInstantiationsCacheSize);
   native_context()->set_fast_template_instantiations_cache(
       *fast_template_instantiations_cache);
 
@@ -5084,7 +5202,7 @@ void Genesis::TransferNamedProperties(Handle<JSObject> from,
   } else if (from->IsJSGlobalObject()) {
     // Copy all keys and values in enumeration order.
     Handle<GlobalDictionary> properties(
-        JSGlobalObject::cast(*from).global_dictionary(), isolate());
+        JSGlobalObject::cast(*from).global_dictionary(kAcquireLoad), isolate());
     Handle<FixedArray> indices =
         GlobalDictionary::IterationIndices(isolate(), properties);
     for (int i = 0; i < indices->length(); i++) {
@@ -5100,6 +5218,29 @@ void Genesis::TransferNamedProperties(Handle<JSObject> from,
       if (details.kind() != kData) continue;
       JSObject::AddProperty(isolate(), to, key, value, details.attributes());
     }
+
+  } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    // Copy all keys and values in enumeration order.
+    Handle<OrderedNameDictionary> properties = Handle<OrderedNameDictionary>(
+        from->property_dictionary_ordered(), isolate());
+    ReadOnlyRoots roots(isolate());
+    for (InternalIndex entry : properties->IterateEntries()) {
+      Object raw_key;
+      if (!properties->ToKey(roots, entry, &raw_key)) continue;
+
+      DCHECK(raw_key.IsName());
+      Handle<Name> key(Name::cast(raw_key), isolate());
+      // If the property is already there we skip it.
+      if (PropertyAlreadyExists(isolate(), to, key)) continue;
+      // Set the property.
+      Handle<Object> value =
+          Handle<Object>(properties->ValueAt(entry), isolate());
+      DCHECK(!value->IsCell());
+      DCHECK(!value->IsTheHole(isolate()));
+      PropertyDetails details = properties->DetailsAt(entry);
+      DCHECK_EQ(kData, details.kind());
+      JSObject::AddProperty(isolate(), to, key, value, details.attributes());
+    }
   } else {
     // Copy all keys and values in enumeration order.
     Handle<NameDictionary> properties =
diff --git a/deps/v8/src/init/bootstrapper.h b/deps/v8/src/init/bootstrapper.h
index e51ef0cd1058ef..7ce83d0ea6d4f8 100644
--- a/deps/v8/src/init/bootstrapper.h
+++ b/deps/v8/src/init/bootstrapper.h
@@ -19,6 +19,8 @@ namespace internal {
 class SourceCodeCache final {
  public:
   explicit SourceCodeCache(Script::Type type) : type_(type) {}
+  SourceCodeCache(const SourceCodeCache&) = delete;
+  SourceCodeCache& operator=(const SourceCodeCache&) = delete;
 
   void Initialize(Isolate* isolate, bool create_heap_objects);
 
@@ -33,13 +35,15 @@ class SourceCodeCache final {
  private:
   Script::Type type_;
   FixedArray cache_;
-  DISALLOW_COPY_AND_ASSIGN(SourceCodeCache);
 };
 
 // The Boostrapper is the public interface for creating a JavaScript global
 // context.
 class Bootstrapper final {
  public:
+  Bootstrapper(const Bootstrapper&) = delete;
+  Bootstrapper& operator=(const Bootstrapper&) = delete;
+
   static void InitializeOncePerProcess();
 
   // Requires: Heap::SetUp has been called.
@@ -108,8 +112,6 @@ class Bootstrapper final {
   friend class NativesExternalStringResource;
 
   explicit Bootstrapper(Isolate* isolate);
-
-  DISALLOW_COPY_AND_ASSIGN(Bootstrapper);
 };
 
 class BootstrapperActive final {
@@ -118,13 +120,13 @@ class BootstrapperActive final {
       : bootstrapper_(bootstrapper) {
     ++bootstrapper_->nesting_;
   }
+  BootstrapperActive(const BootstrapperActive&) = delete;
+  BootstrapperActive& operator=(const BootstrapperActive&) = delete;
 
   ~BootstrapperActive() { --bootstrapper_->nesting_; }
 
  private:
   Bootstrapper* bootstrapper_;
-
-  DISALLOW_COPY_AND_ASSIGN(BootstrapperActive);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/init/heap-symbols.h b/deps/v8/src/init/heap-symbols.h
index eaf441d6e8608c..5a2a3a8ac9f5e5 100644
--- a/deps/v8/src/init/heap-symbols.h
+++ b/deps/v8/src/init/heap-symbols.h
@@ -367,19 +367,20 @@
   V(_, wasm_exception_values_symbol)                  \
   V(_, wasm_uncatchable_symbol)                       \
   V(_, wasm_wrapped_object_symbol)                    \
+  V(_, wasm_debug_proxy_cache_symbol)                 \
   V(_, uninitialized_symbol)
 
-#define PUBLIC_SYMBOL_LIST_GENERATOR(V, _)          \
-  V(_, async_iterator_symbol, Symbol.asyncIterator) \
-  V(_, iterator_symbol, Symbol.iterator)            \
-  V(_, intl_fallback_symbol, IntlFallback)          \
-  V(_, match_all_symbol, Symbol.matchAll)           \
-  V(_, match_symbol, Symbol.match)                  \
-  V(_, replace_symbol, Symbol.replace)              \
-  V(_, search_symbol, Symbol.search)                \
-  V(_, species_symbol, Symbol.species)              \
-  V(_, split_symbol, Symbol.split)                  \
-  V(_, to_primitive_symbol, Symbol.toPrimitive)     \
+#define PUBLIC_SYMBOL_LIST_GENERATOR(V, _)                \
+  V(_, async_iterator_symbol, Symbol.asyncIterator)       \
+  V(_, iterator_symbol, Symbol.iterator)                  \
+  V(_, intl_fallback_symbol, IntlLegacyConstructedSymbol) \
+  V(_, match_all_symbol, Symbol.matchAll)                 \
+  V(_, match_symbol, Symbol.match)                        \
+  V(_, replace_symbol, Symbol.replace)                    \
+  V(_, search_symbol, Symbol.search)                      \
+  V(_, species_symbol, Symbol.species)                    \
+  V(_, split_symbol, Symbol.split)                        \
+  V(_, to_primitive_symbol, Symbol.toPrimitive)           \
   V(_, unscopables_symbol, Symbol.unscopables)
 
 // Well-Known Symbols are "Public" symbols, which have a bit set which causes
@@ -402,7 +403,6 @@
   F(MC_INCREMENTAL_FINALIZE_BODY)                                  \
   F(MC_INCREMENTAL_LAYOUT_CHANGE)                                  \
   F(MC_INCREMENTAL_START)                                          \
-  F(MC_INCREMENTAL_SWEEP_ARRAY_BUFFERS)                            \
   F(MC_INCREMENTAL_SWEEPING)
 
 #define TOP_MC_SCOPES(F) \
@@ -425,18 +425,19 @@
   F(HEAP_EXTERNAL_WEAK_GLOBAL_HANDLES)               \
   F(HEAP_PROLOGUE)                                   \
   F(HEAP_PROLOGUE_SAFEPOINT)                         \
+  F(MARK_COMPACTOR)                                  \
   TOP_MC_SCOPES(F)                                   \
   F(MC_CLEAR_DEPENDENT_CODE)                         \
   F(MC_CLEAR_FLUSHABLE_BYTECODE)                     \
   F(MC_CLEAR_FLUSHED_JS_FUNCTIONS)                   \
   F(MC_CLEAR_MAPS)                                   \
   F(MC_CLEAR_SLOTS_BUFFER)                           \
-  F(MC_CLEAR_STORE_BUFFER)                           \
   F(MC_CLEAR_STRING_TABLE)                           \
   F(MC_CLEAR_WEAK_COLLECTIONS)                       \
   F(MC_CLEAR_WEAK_LISTS)                             \
   F(MC_CLEAR_WEAK_REFERENCES)                        \
   F(MC_COMPLETE_SWEEP_ARRAY_BUFFERS)                 \
+  F(MC_COMPLETE_SWEEPING)                            \
   F(MC_EVACUATE_CANDIDATES)                          \
   F(MC_EVACUATE_CLEAN_UP)                            \
   F(MC_EVACUATE_COPY)                                \
@@ -467,10 +468,12 @@
   F(MC_SWEEP_CODE)                                   \
   F(MC_SWEEP_MAP)                                    \
   F(MC_SWEEP_OLD)                                    \
+  F(MINOR_MARK_COMPACTOR)                            \
   F(MINOR_MC)                                        \
   F(MINOR_MC_CLEAR)                                  \
   F(MINOR_MC_CLEAR_STRING_TABLE)                     \
   F(MINOR_MC_CLEAR_WEAK_LISTS)                       \
+  F(MINOR_MC_COMPLETE_SWEEP_ARRAY_BUFFERS)           \
   F(MINOR_MC_EVACUATE)                               \
   F(MINOR_MC_EVACUATE_CLEAN_UP)                      \
   F(MINOR_MC_EVACUATE_COPY)                          \
@@ -492,6 +495,7 @@
   F(MINOR_MC_MARKING_DEQUE)                          \
   F(MINOR_MC_RESET_LIVENESS)                         \
   F(MINOR_MC_SWEEPING)                               \
+  F(SCAVENGER)                                       \
   F(SCAVENGER_COMPLETE_SWEEP_ARRAY_BUFFERS)          \
   F(SCAVENGER_FAST_PROMOTE)                          \
   F(SCAVENGER_FREE_REMEMBERED_SET)                   \
@@ -508,10 +512,9 @@
   F(STOP_THE_WORLD)
 
 #define TRACER_BACKGROUND_SCOPES(F)               \
-  F(BACKGROUND_ARRAY_BUFFER_FREE)                 \
-  F(BACKGROUND_ARRAY_BUFFER_SWEEP)                \
+  F(BACKGROUND_YOUNG_ARRAY_BUFFER_SWEEP)          \
+  F(BACKGROUND_FULL_ARRAY_BUFFER_SWEEP)           \
   F(BACKGROUND_COLLECTION)                        \
-  F(BACKGROUND_STORE_BUFFER)                      \
   F(BACKGROUND_UNMAPPER)                          \
   F(MC_BACKGROUND_EVACUATE_COPY)                  \
   F(MC_BACKGROUND_EVACUATE_UPDATE_POINTERS)       \
@@ -522,4 +525,12 @@
   F(MINOR_MC_BACKGROUND_MARKING)                  \
   F(SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL)
 
+#define TRACER_YOUNG_EPOCH_SCOPES(F)        \
+  F(BACKGROUND_YOUNG_ARRAY_BUFFER_SWEEP)    \
+  F(MINOR_MARK_COMPACTOR)                   \
+  F(MINOR_MC_COMPLETE_SWEEP_ARRAY_BUFFERS)  \
+  F(SCAVENGER)                              \
+  F(SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL) \
+  F(SCAVENGER_COMPLETE_SWEEP_ARRAY_BUFFERS)
+
 #endif  // V8_INIT_HEAP_SYMBOLS_H_
diff --git a/deps/v8/src/init/icu_util.cc b/deps/v8/src/init/icu_util.cc
index 22ea3837cdee7f..67d349557c6c92 100644
--- a/deps/v8/src/init/icu_util.cc
+++ b/deps/v8/src/init/icu_util.cc
@@ -12,11 +12,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "unicode/putil.h"
-#include "unicode/udata.h"
-
 #include "src/base/build_config.h"
 #include "src/base/file-utils.h"
+#include "src/base/platform/wrappers.h"
+#include "unicode/putil.h"
+#include "unicode/udata.h"
 
 #define ICU_UTIL_DATA_FILE 0
 #define ICU_UTIL_DATA_STATIC 1
@@ -71,7 +71,7 @@ bool InitializeICU(const char* icu_data_file) {
 
   if (g_icu_data_ptr) return true;
 
-  FILE* inf = fopen(icu_data_file, "rb");
+  FILE* inf = base::Fopen(icu_data_file, "rb");
   if (!inf) return false;
 
   fseek(inf, 0, SEEK_END);
@@ -82,10 +82,10 @@ bool InitializeICU(const char* icu_data_file) {
   if (fread(g_icu_data_ptr, 1, size, inf) != size) {
     delete[] g_icu_data_ptr;
     g_icu_data_ptr = nullptr;
-    fclose(inf);
+    base::Fclose(inf);
     return false;
   }
-  fclose(inf);
+  base::Fclose(inf);
 
   atexit(free_icu_data_ptr);
 
diff --git a/deps/v8/src/init/isolate-allocator.h b/deps/v8/src/init/isolate-allocator.h
index 8d843702ccc69e..9f894da1595506 100644
--- a/deps/v8/src/init/isolate-allocator.h
+++ b/deps/v8/src/init/isolate-allocator.h
@@ -37,6 +37,8 @@ class V8_EXPORT_PRIVATE IsolateAllocator final {
  public:
   IsolateAllocator();
   ~IsolateAllocator();
+  IsolateAllocator(const IsolateAllocator&) = delete;
+  IsolateAllocator& operator=(const IsolateAllocator&) = delete;
 
   void* isolate_memory() const { return isolate_memory_; }
 
@@ -51,8 +53,6 @@ class V8_EXPORT_PRIVATE IsolateAllocator final {
   v8::PageAllocator* page_allocator_ = nullptr;
   std::unique_ptr<base::BoundedPageAllocator> page_allocator_instance_;
   VirtualMemory reservation_;
-
-  DISALLOW_COPY_AND_ASSIGN(IsolateAllocator);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/init/startup-data-util.cc b/deps/v8/src/init/startup-data-util.cc
index a0f1c7bc9a363e..d480e3dcc2b0d5 100644
--- a/deps/v8/src/init/startup-data-util.cc
+++ b/deps/v8/src/init/startup-data-util.cc
@@ -10,6 +10,7 @@
 #include "src/base/file-utils.h"
 #include "src/base/logging.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/flags/flags.h"
 #include "src/utils/utils.h"
 
@@ -42,7 +43,7 @@ void Load(const char* blob_file, v8::StartupData* startup_data,
 
   CHECK(blob_file);
 
-  FILE* file = fopen(blob_file, "rb");
+  FILE* file = base::Fopen(blob_file, "rb");
   if (!file) {
     PrintF(stderr, "Failed to open startup resource '%s'.\n", blob_file);
     return;
@@ -55,7 +56,7 @@ void Load(const char* blob_file, v8::StartupData* startup_data,
   startup_data->data = new char[startup_data->raw_size];
   int read_size = static_cast<int>(fread(const_cast<char*>(startup_data->data),
                                          1, startup_data->raw_size, file));
-  fclose(file);
+  base::Fclose(file);
 
   if (startup_data->raw_size == read_size) {
     (*setter_fn)(startup_data);
diff --git a/deps/v8/src/init/v8.cc b/deps/v8/src/init/v8.cc
index 2b2194ca7354dc..2ca20ca2627220 100644
--- a/deps/v8/src/init/v8.cc
+++ b/deps/v8/src/init/v8.cc
@@ -6,6 +6,7 @@
 
 #include <fstream>
 
+#include "include/cppgc/platform.h"
 #include "src/api/api.h"
 #include "src/base/atomicops.h"
 #include "src/base/once.h"
@@ -129,6 +130,7 @@ void V8::InitializePlatform(v8::Platform* platform) {
   platform_ = platform;
   v8::base::SetPrintStackTrace(platform_->GetStackTracePrinter());
   v8::tracing::TracingCategoryObserver::SetUp();
+  cppgc::InitializeProcess(platform->GetPageAllocator());
 }
 
 void V8::ShutdownPlatform() {
@@ -136,6 +138,7 @@ void V8::ShutdownPlatform() {
   v8::tracing::TracingCategoryObserver::TearDown();
   v8::base::SetPrintStackTrace(nullptr);
   platform_ = nullptr;
+  cppgc::ShutdownProcess();
 }
 
 v8::Platform* V8::GetCurrentPlatform() {
diff --git a/deps/v8/src/inspector/BUILD.gn b/deps/v8/src/inspector/BUILD.gn
index acb1e961a860ee..495354da456f14 100644
--- a/deps/v8/src/inspector/BUILD.gn
+++ b/deps/v8/src/inspector/BUILD.gn
@@ -124,6 +124,8 @@ v8_source_set("inspector") {
     "v8-console.h",
     "v8-debugger-agent-impl.cc",
     "v8-debugger-agent-impl.h",
+    "v8-debugger-id.cc",
+    "v8-debugger-id.h",
     "v8-debugger-script.cc",
     "v8-debugger-script.h",
     "v8-debugger.cc",
diff --git a/deps/v8/src/inspector/OWNERS b/deps/v8/src/inspector/OWNERS
index ea8456bbe525a0..1dea2a7f543ec0 100644
--- a/deps/v8/src/inspector/OWNERS
+++ b/deps/v8/src/inspector/OWNERS
@@ -1,4 +1,5 @@
 alph@chromium.org
+bmeurer@chromium.org
 caseq@chromium.org
 dgozman@chromium.org
 kozyatinskiy@chromium.org
diff --git a/deps/v8/src/inspector/injected-script.cc b/deps/v8/src/inspector/injected-script.cc
index c72c5311786c5f..992ff50fe7da6a 100644
--- a/deps/v8/src/inspector/injected-script.cc
+++ b/deps/v8/src/inspector/injected-script.cc
@@ -82,7 +82,7 @@ class InjectedScript::ProtocolPromiseHandler {
     }
 
     v8::MaybeLocal<v8::Promise> originalPromise =
-        value->IsPromise() ? v8::Local<v8::Promise>::Cast(value)
+        value->IsPromise() ? value.As<v8::Promise>()
                            : v8::MaybeLocal<v8::Promise>();
     V8InspectorImpl* inspector = session->inspector();
     ProtocolPromiseHandler* handler = new ProtocolPromiseHandler(
@@ -119,9 +119,8 @@ class InjectedScript::ProtocolPromiseHandler {
         info.Data().As<v8::External>()->Value());
     DCHECK(handler);
     v8::Local<v8::Value> value =
-        info.Length() > 0
-            ? info[0]
-            : v8::Local<v8::Value>::Cast(v8::Undefined(info.GetIsolate()));
+        info.Length() > 0 ? info[0]
+                          : v8::Undefined(info.GetIsolate()).As<v8::Value>();
     handler->thenCallback(value);
     delete handler;
   }
@@ -131,9 +130,8 @@ class InjectedScript::ProtocolPromiseHandler {
         info.Data().As<v8::External>()->Value());
     DCHECK(handler);
     v8::Local<v8::Value> value =
-        info.Length() > 0
-            ? info[0]
-            : v8::Local<v8::Value>::Cast(v8::Undefined(info.GetIsolate()));
+        info.Length() > 0 ? info[0]
+                          : v8::Undefined(info.GetIsolate()).As<v8::Value>();
     handler->catchCallback(value);
     delete handler;
   }
@@ -268,8 +266,8 @@ class InjectedScript::ProtocolPromiseHandler {
           toProtocolString(isolate,
                            result->ToDetailString(isolate->GetCurrentContext())
                                .ToLocalChecked());
-      v8::Local<v8::StackTrace> stackTrace = v8::debug::GetDetailedStackTrace(
-          isolate, v8::Local<v8::Object>::Cast(result));
+      v8::Local<v8::StackTrace> stackTrace =
+          v8::debug::GetDetailedStackTrace(isolate, result.As<v8::Object>());
       if (!stackTrace.IsEmpty()) {
         stack = m_inspector->debugger()->createStackTrace(stackTrace);
       }
@@ -800,15 +798,17 @@ Response InjectedScript::createExceptionDetails(
                   : message->GetStartColumn(m_context->context()).FromMaybe(0))
           .build();
   if (!message.IsEmpty()) {
-    exceptionDetails->setScriptId(String16::fromInteger(
-        static_cast<int>(message->GetScriptOrigin().ScriptID()->Value())));
+    exceptionDetails->setScriptId(
+        String16::fromInteger(message->GetScriptOrigin().ScriptId()));
     v8::Local<v8::StackTrace> stackTrace = message->GetStackTrace();
-    if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
-      exceptionDetails->setStackTrace(
-          m_context->inspector()
-              ->debugger()
-              ->createStackTrace(stackTrace)
-              ->buildInspectorObjectImpl(m_context->inspector()->debugger()));
+    if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) {
+      std::unique_ptr<V8StackTraceImpl> v8StackTrace =
+          m_context->inspector()->debugger()->createStackTrace(stackTrace);
+      if (v8StackTrace) {
+        exceptionDetails->setStackTrace(v8StackTrace->buildInspectorObjectImpl(
+            m_context->inspector()->debugger()));
+      }
+    }
   }
   Response response =
       addExceptionToDetails(exception, exceptionDetails.get(), objectGroup);
diff --git a/deps/v8/src/inspector/injected-script.h b/deps/v8/src/inspector/injected-script.h
index 1e8381410c21c0..01d0ff06653cfd 100644
--- a/deps/v8/src/inspector/injected-script.h
+++ b/deps/v8/src/inspector/injected-script.h
@@ -69,6 +69,8 @@ class InjectedScript final {
  public:
   InjectedScript(InspectedContext*, int sessionId);
   ~InjectedScript();
+  InjectedScript(const InjectedScript&) = delete;
+  InjectedScript& operator=(const InjectedScript&) = delete;
 
   InspectedContext* context() const { return m_context; }
 
@@ -175,18 +177,20 @@ class InjectedScript final {
    public:
     ContextScope(V8InspectorSessionImpl*, int executionContextId);
     ~ContextScope() override;
+    ContextScope(const ContextScope&) = delete;
+    ContextScope& operator=(const ContextScope&) = delete;
 
    private:
     Response findInjectedScript(V8InspectorSessionImpl*) override;
     int m_executionContextId;
-
-    DISALLOW_COPY_AND_ASSIGN(ContextScope);
   };
 
   class ObjectScope : public Scope {
    public:
     ObjectScope(V8InspectorSessionImpl*, const String16& remoteObjectId);
     ~ObjectScope() override;
+    ObjectScope(const ObjectScope&) = delete;
+    ObjectScope& operator=(const ObjectScope&) = delete;
     const String16& objectGroupName() const { return m_objectGroupName; }
     v8::Local<v8::Value> object() const { return m_object; }
 
@@ -195,22 +199,20 @@ class InjectedScript final {
     String16 m_remoteObjectId;
     String16 m_objectGroupName;
     v8::Local<v8::Value> m_object;
-
-    DISALLOW_COPY_AND_ASSIGN(ObjectScope);
   };
 
   class CallFrameScope : public Scope {
    public:
     CallFrameScope(V8InspectorSessionImpl*, const String16& remoteCallFrameId);
     ~CallFrameScope() override;
+    CallFrameScope(const CallFrameScope&) = delete;
+    CallFrameScope& operator=(const CallFrameScope&) = delete;
     size_t frameOrdinal() const { return m_frameOrdinal; }
 
    private:
     Response findInjectedScript(V8InspectorSessionImpl*) override;
     String16 m_remoteCallFrameId;
     size_t m_frameOrdinal;
-
-    DISALLOW_COPY_AND_ASSIGN(CallFrameScope);
   };
   String16 bindObject(v8::Local<v8::Value>, const String16& groupName);
 
@@ -241,8 +243,6 @@ class InjectedScript final {
   std::unordered_map<String16, std::vector<int>> m_nameToObjectGroup;
   std::unordered_set<EvaluateCallback*> m_evaluateCallbacks;
   bool m_customPreviewEnabled = false;
-
-  DISALLOW_COPY_AND_ASSIGN(InjectedScript);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/inspected-context.cc b/deps/v8/src/inspector/inspected-context.cc
index 03a799cb5b4874..a47df1ef123347 100644
--- a/deps/v8/src/inspector/inspected-context.cc
+++ b/deps/v8/src/inspector/inspected-context.cc
@@ -55,7 +55,8 @@ InspectedContext::InspectedContext(V8InspectorImpl* inspector,
       m_contextGroupId(info.contextGroupId),
       m_origin(toString16(info.origin)),
       m_humanReadableName(toString16(info.humanReadableName)),
-      m_auxData(toString16(info.auxData)) {
+      m_auxData(toString16(info.auxData)),
+      m_uniqueId(V8DebuggerId::generate(inspector)) {
   v8::debug::SetContextId(info.context, contextId);
   m_weakCallbackData =
       new WeakCallbackData(this, m_inspector, m_contextGroupId, m_contextId);
@@ -70,8 +71,8 @@ InspectedContext::InspectedContext(V8InspectorImpl* inspector,
   if (global->Get(info.context, toV8String(m_inspector->isolate(), "console"))
           .ToLocal(&console) &&
       console->IsObject()) {
-    m_inspector->console()->installMemoryGetter(
-        info.context, v8::Local<v8::Object>::Cast(console));
+    m_inspector->console()->installMemoryGetter(info.context,
+                                                console.As<v8::Object>());
   }
 }
 
diff --git a/deps/v8/src/inspector/inspected-context.h b/deps/v8/src/inspector/inspected-context.h
index 68b865de672f8d..d3f0fe012b899c 100644
--- a/deps/v8/src/inspector/inspected-context.h
+++ b/deps/v8/src/inspector/inspected-context.h
@@ -9,11 +9,11 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include "include/v8.h"
 #include "src/base/macros.h"
 #include "src/debug/debug-interface.h"
 #include "src/inspector/string-16.h"
-
-#include "include/v8.h"
+#include "src/inspector/v8-debugger-id.h"
 
 namespace v8_inspector {
 
@@ -27,6 +27,8 @@ enum class V8InternalValueType { kNone, kEntry, kScope, kScopeList };
 class InspectedContext {
  public:
   ~InspectedContext();
+  InspectedContext(const InspectedContext&) = delete;
+  InspectedContext& operator=(const InspectedContext&) = delete;
 
   static int contextId(v8::Local<v8::Context>);
 
@@ -35,6 +37,7 @@ class InspectedContext {
   int contextGroupId() const { return m_contextGroupId; }
   String16 origin() const { return m_origin; }
   String16 humanReadableName() const { return m_humanReadableName; }
+  V8DebuggerId uniqueId() const { return m_uniqueId; }
   String16 auxData() const { return m_auxData; }
 
   bool isReported(int sessionId) const;
@@ -64,12 +67,11 @@ class InspectedContext {
   const String16 m_origin;
   const String16 m_humanReadableName;
   const String16 m_auxData;
+  const V8DebuggerId m_uniqueId;
   std::unordered_set<int> m_reportedSessionIds;
   std::unordered_map<int, std::unique_ptr<InjectedScript>> m_injectedScripts;
   WeakCallbackData* m_weakCallbackData;
   v8::Global<v8::debug::WeakMap> m_internalObjects;
-
-  DISALLOW_COPY_AND_ASSIGN(InspectedContext);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-console-agent-impl.h b/deps/v8/src/inspector/v8-console-agent-impl.h
index f436aa2f5cb463..009375b04a6062 100644
--- a/deps/v8/src/inspector/v8-console-agent-impl.h
+++ b/deps/v8/src/inspector/v8-console-agent-impl.h
@@ -21,6 +21,8 @@ class V8ConsoleAgentImpl : public protocol::Console::Backend {
   V8ConsoleAgentImpl(V8InspectorSessionImpl*, protocol::FrontendChannel*,
                      protocol::DictionaryValue* state);
   ~V8ConsoleAgentImpl() override;
+  V8ConsoleAgentImpl(const V8ConsoleAgentImpl&) = delete;
+  V8ConsoleAgentImpl& operator=(const V8ConsoleAgentImpl&) = delete;
 
   Response enable() override;
   Response disable() override;
@@ -39,8 +41,6 @@ class V8ConsoleAgentImpl : public protocol::Console::Backend {
   protocol::DictionaryValue* m_state;
   protocol::Console::Frontend m_frontend;
   bool m_enabled;
-
-  DISALLOW_COPY_AND_ASSIGN(V8ConsoleAgentImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-console-message.cc b/deps/v8/src/inspector/v8-console-message.cc
index 6add55a76f2914..d878ca94a0237a 100644
--- a/deps/v8/src/inspector/v8-console-message.cc
+++ b/deps/v8/src/inspector/v8-console-message.cc
@@ -90,34 +90,33 @@ class V8ValueStringBuilder {
     if (value.IsEmpty()) return true;
     if ((ignoreOptions & IgnoreNull) && value->IsNull()) return true;
     if ((ignoreOptions & IgnoreUndefined) && value->IsUndefined()) return true;
-    if (value->IsString()) return append(v8::Local<v8::String>::Cast(value));
+    if (value->IsString()) return append(value.As<v8::String>());
     if (value->IsStringObject())
-      return append(v8::Local<v8::StringObject>::Cast(value)->ValueOf());
-    if (value->IsBigInt()) return append(v8::Local<v8::BigInt>::Cast(value));
+      return append(value.As<v8::StringObject>()->ValueOf());
+    if (value->IsBigInt()) return append(value.As<v8::BigInt>());
     if (value->IsBigIntObject())
-      return append(v8::Local<v8::BigIntObject>::Cast(value)->ValueOf());
-    if (value->IsSymbol()) return append(v8::Local<v8::Symbol>::Cast(value));
+      return append(value.As<v8::BigIntObject>()->ValueOf());
+    if (value->IsSymbol()) return append(value.As<v8::Symbol>());
     if (value->IsSymbolObject())
-      return append(v8::Local<v8::SymbolObject>::Cast(value)->ValueOf());
+      return append(value.As<v8::SymbolObject>()->ValueOf());
     if (value->IsNumberObject()) {
-      m_builder.append(String16::fromDouble(
-          v8::Local<v8::NumberObject>::Cast(value)->ValueOf(), 6));
+      m_builder.append(
+          String16::fromDouble(value.As<v8::NumberObject>()->ValueOf(), 6));
       return true;
     }
     if (value->IsBooleanObject()) {
-      m_builder.append(v8::Local<v8::BooleanObject>::Cast(value)->ValueOf()
-                           ? "true"
-                           : "false");
+      m_builder.append(value.As<v8::BooleanObject>()->ValueOf() ? "true"
+                                                                : "false");
       return true;
     }
-    if (value->IsArray()) return append(v8::Local<v8::Array>::Cast(value));
+    if (value->IsArray()) return append(value.As<v8::Array>());
     if (value->IsProxy()) {
       m_builder.append("[object Proxy]");
       return true;
     }
     if (value->IsObject() && !value->IsDate() && !value->IsFunction() &&
         !value->IsNativeError() && !value->IsRegExp()) {
-      v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
+      v8::Local<v8::Object> object = value.As<v8::Object>();
       v8::Local<v8::String> stringValue;
       if (object->ObjectProtoToString(m_context).ToLocal(&stringValue))
         return append(stringValue);
@@ -267,7 +266,7 @@ V8ConsoleMessage::wrapArguments(V8InspectorSessionImpl* session,
     if (m_arguments.size() > 1) {
       v8::Local<v8::Value> secondArgument = m_arguments[1]->Get(isolate);
       if (secondArgument->IsArray()) {
-        columns = v8::Local<v8::Array>::Cast(secondArgument);
+        columns = secondArgument.As<v8::Array>();
       } else if (secondArgument->IsString()) {
         v8::TryCatch tryCatch(isolate);
         v8::Local<v8::Array> array = v8::Array::New(isolate);
@@ -277,8 +276,7 @@ V8ConsoleMessage::wrapArguments(V8InspectorSessionImpl* session,
       }
     }
     std::unique_ptr<protocol::Runtime::RemoteObject> wrapped =
-        session->wrapTable(context, v8::Local<v8::Object>::Cast(value),
-                           columns);
+        session->wrapTable(context, value.As<v8::Object>(), columns);
     inspectedContext = inspector->getContext(contextGroupId, contextId);
     if (!inspectedContext) return nullptr;
     if (wrapped) {
diff --git a/deps/v8/src/inspector/v8-console.cc b/deps/v8/src/inspector/v8-console.cc
index 12645cecbc4c34..ee989e89319c8a 100644
--- a/deps/v8/src/inspector/v8-console.cc
+++ b/deps/v8/src/inspector/v8-console.cc
@@ -43,6 +43,9 @@ class ConsoleHelper {
         m_contextId(InspectedContext::contextId(m_context)),
         m_groupId(m_inspector->contextGroupId(m_contextId)) {}
 
+  ConsoleHelper(const ConsoleHelper&) = delete;
+  ConsoleHelper& operator=(const ConsoleHelper&) = delete;
+
   int contextId() const { return m_contextId; }
   int groupId() const { return m_groupId; }
 
@@ -156,8 +159,6 @@ class ConsoleHelper {
   V8InspectorImpl* m_inspector = nullptr;
   int m_contextId;
   int m_groupId;
-
-  DISALLOW_COPY_AND_ASSIGN(ConsoleHelper);
 };
 
 void returnDataCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
@@ -544,7 +545,7 @@ void V8Console::monitorFunctionCallback(
   v8::Local<v8::Function> function;
   if (!helper.firstArgAsFunction().ToLocal(&function)) return;
   v8::Local<v8::Value> name = function->GetName();
-  if (!name->IsString() || !v8::Local<v8::String>::Cast(name)->Length())
+  if (!name->IsString() || !name.As<v8::String>()->Length())
     name = function->GetInferredName();
   String16 functionName =
       toProtocolStringWithTypeCheck(info.GetIsolate(), name);
@@ -843,7 +844,7 @@ V8Console::CommandLineAPIScope::CommandLineAPIScope(
     if (!m_installedMethods->Add(context, name).ToLocal(&m_installedMethods))
       continue;
     if (!m_global
-             ->SetAccessor(context, v8::Local<v8::Name>::Cast(name),
+             ->SetAccessor(context, name.As<v8::Name>(),
                            CommandLineAPIScope::accessorGetterCallback,
                            CommandLineAPIScope::accessorSetterCallback,
                            m_thisReference, v8::DEFAULT, v8::DontEnum,
@@ -868,10 +869,9 @@ V8Console::CommandLineAPIScope::~CommandLineAPIScope() {
     if (!names->Get(m_context, i).ToLocal(&name) || !name->IsName()) continue;
     if (name->IsString()) {
       v8::Local<v8::Value> descriptor;
-      bool success = m_global
-                         ->GetOwnPropertyDescriptor(
-                             m_context, v8::Local<v8::String>::Cast(name))
-                         .ToLocal(&descriptor);
+      bool success =
+          m_global->GetOwnPropertyDescriptor(m_context, name.As<v8::String>())
+              .ToLocal(&descriptor);
       USE(success);
     }
   }
diff --git a/deps/v8/src/inspector/v8-console.h b/deps/v8/src/inspector/v8-console.h
index 5875164595f789..59d7a8152f615e 100644
--- a/deps/v8/src/inspector/v8-console.h
+++ b/deps/v8/src/inspector/v8-console.h
@@ -24,12 +24,14 @@ class V8Console : public v8::debug::ConsoleDelegate {
   void installMemoryGetter(v8::Local<v8::Context> context,
                            v8::Local<v8::Object> console);
 
-  class CommandLineAPIScope {
+  class V8_NODISCARD CommandLineAPIScope {
    public:
     CommandLineAPIScope(v8::Local<v8::Context>,
                         v8::Local<v8::Object> commandLineAPI,
                         v8::Local<v8::Object> global);
     ~CommandLineAPIScope();
+    CommandLineAPIScope(const CommandLineAPIScope&) = delete;
+    CommandLineAPIScope& operator=(const CommandLineAPIScope&) = delete;
 
    private:
     static void accessorGetterCallback(
@@ -43,8 +45,6 @@ class V8Console : public v8::debug::ConsoleDelegate {
     v8::Local<v8::Object> m_global;
     v8::Local<v8::Set> m_installedMethods;
     v8::Local<v8::ArrayBuffer> m_thisReference;
-
-    DISALLOW_COPY_AND_ASSIGN(CommandLineAPIScope);
   };
 
   explicit V8Console(V8InspectorImpl* inspector);
diff --git a/deps/v8/src/inspector/v8-debugger-agent-impl.cc b/deps/v8/src/inspector/v8-debugger-agent-impl.cc
index f82ce98600e073..4e0b83952e25d0 100644
--- a/deps/v8/src/inspector/v8-debugger-agent-impl.cc
+++ b/deps/v8/src/inspector/v8-debugger-agent-impl.cc
@@ -1241,55 +1241,6 @@ Response V8DebuggerAgentImpl::evaluateOnCallFrame(
       result, exceptionDetails);
 }
 
-Response V8DebuggerAgentImpl::executeWasmEvaluator(
-    const String16& callFrameId, const protocol::Binary& evaluator,
-    Maybe<double> timeout,
-    std::unique_ptr<protocol::Runtime::RemoteObject>* result,
-    Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails) {
-  if (!v8::debug::StackTraceIterator::SupportsWasmDebugEvaluate()) {
-    return Response::ServerError(
-        "--wasm-expose-debug-eval is required to execte evaluator modules");
-  }
-  if (!isPaused()) return Response::ServerError(kDebuggerNotPaused);
-  InjectedScript::CallFrameScope scope(m_session, callFrameId);
-  Response response = scope.initialize();
-  if (!response.IsSuccess()) return response;
-
-  int frameOrdinal = static_cast<int>(scope.frameOrdinal());
-  std::unique_ptr<v8::debug::StackTraceIterator> it =
-      v8::debug::StackTraceIterator::Create(m_isolate, frameOrdinal);
-  if (it->Done()) {
-    return Response::ServerError("Could not find call frame with given id");
-  }
-  if (!it->GetScript()->IsWasm()) {
-    return Response::ServerError(
-        "executeWasmEvaluator can only be called on WebAssembly frames");
-  }
-
-  v8::MaybeLocal<v8::Value> maybeResultValue;
-  {
-    V8InspectorImpl::EvaluateScope evaluateScope(scope);
-    if (timeout.isJust()) {
-      response = evaluateScope.setTimeout(timeout.fromJust() / 1000.0);
-      if (!response.IsSuccess()) return response;
-    }
-    v8::MaybeLocal<v8::String> eval_result =
-        it->EvaluateWasm({evaluator.data(), evaluator.size()}, frameOrdinal);
-    if (!eval_result.IsEmpty()) maybeResultValue = eval_result.ToLocalChecked();
-  }
-
-  // Re-initialize after running client's code, as it could have destroyed
-  // context or session.
-  response = scope.initialize();
-  if (!response.IsSuccess()) return response;
-
-  String16 object_group = "";
-  InjectedScript* injected_script = scope.injectedScript();
-  return injected_script->wrapEvaluateResult(maybeResultValue, scope.tryCatch(),
-                                             object_group, WrapMode::kNoPreview,
-                                             result, exceptionDetails);
-}
-
 Response V8DebuggerAgentImpl::setVariableValue(
     int scopeNumber, const String16& variableName,
     std::unique_ptr<protocol::Runtime::CallArgument> newValueArgument,
diff --git a/deps/v8/src/inspector/v8-debugger-agent-impl.h b/deps/v8/src/inspector/v8-debugger-agent-impl.h
index f6145dae70e844..0cc96166f554f5 100644
--- a/deps/v8/src/inspector/v8-debugger-agent-impl.h
+++ b/deps/v8/src/inspector/v8-debugger-agent-impl.h
@@ -39,6 +39,8 @@ class V8DebuggerAgentImpl : public protocol::Debugger::Backend {
   V8DebuggerAgentImpl(V8InspectorSessionImpl*, protocol::FrontendChannel*,
                       protocol::DictionaryValue* state);
   ~V8DebuggerAgentImpl() override;
+  V8DebuggerAgentImpl(const V8DebuggerAgentImpl&) = delete;
+  V8DebuggerAgentImpl& operator=(const V8DebuggerAgentImpl&) = delete;
   void restore();
 
   // Part of the protocol.
@@ -116,11 +118,6 @@ class V8DebuggerAgentImpl : public protocol::Debugger::Backend {
       Maybe<double> timeout,
       std::unique_ptr<protocol::Runtime::RemoteObject>* result,
       Maybe<protocol::Runtime::ExceptionDetails>*) override;
-  Response executeWasmEvaluator(
-      const String16& callFrameId, const protocol::Binary& evaluator,
-      Maybe<double> timeout,
-      std::unique_ptr<protocol::Runtime::RemoteObject>* result,
-      Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails) override;
   Response setVariableValue(
       int scopeNumber, const String16& variableName,
       std::unique_ptr<protocol::Runtime::CallArgument> newValue,
@@ -244,8 +241,6 @@ class V8DebuggerAgentImpl : public protocol::Debugger::Backend {
   std::unordered_map<String16, std::vector<std::pair<int, int>>>
       m_blackboxedPositions;
   std::unordered_map<String16, std::vector<std::pair<int, int>>> m_skipList;
-
-  DISALLOW_COPY_AND_ASSIGN(V8DebuggerAgentImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-debugger-id.cc b/deps/v8/src/inspector/v8-debugger-id.cc
new file mode 100644
index 00000000000000..995df6689fbea1
--- /dev/null
+++ b/deps/v8/src/inspector/v8-debugger-id.cc
@@ -0,0 +1,45 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "src/inspector/v8-debugger-id.h"
+
+#include "src/debug/debug-interface.h"
+#include "src/inspector/v8-inspector-impl.h"
+
+namespace v8_inspector {
+
+V8DebuggerId::V8DebuggerId(std::pair<int64_t, int64_t> pair)
+    : m_first(pair.first), m_second(pair.second) {}
+
+// static
+V8DebuggerId V8DebuggerId::generate(V8InspectorImpl* inspector) {
+  return V8DebuggerId(std::make_pair(inspector->generateUniqueId(),
+                                     inspector->generateUniqueId()));
+}
+
+V8DebuggerId::V8DebuggerId(const String16& debuggerId) {
+  const UChar dot = '.';
+  size_t pos = debuggerId.find(dot);
+  if (pos == String16::kNotFound) return;
+  bool ok = false;
+  int64_t first = debuggerId.substring(0, pos).toInteger64(&ok);
+  if (!ok) return;
+  int64_t second = debuggerId.substring(pos + 1).toInteger64(&ok);
+  if (!ok) return;
+  m_first = first;
+  m_second = second;
+}
+
+String16 V8DebuggerId::toString() const {
+  return String16::fromInteger64(m_first) + "." +
+         String16::fromInteger64(m_second);
+}
+
+bool V8DebuggerId::isValid() const { return m_first || m_second; }
+
+std::pair<int64_t, int64_t> V8DebuggerId::pair() const {
+  return std::make_pair(m_first, m_second);
+}
+
+}  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-debugger-id.h b/deps/v8/src/inspector/v8-debugger-id.h
new file mode 100644
index 00000000000000..5f53c02189dcd0
--- /dev/null
+++ b/deps/v8/src/inspector/v8-debugger-id.h
@@ -0,0 +1,44 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_INSPECTOR_V8_DEBUGGER_ID_H_
+#define V8_INSPECTOR_V8_DEBUGGER_ID_H_
+
+#include <utility>
+
+#include "src/base/macros.h"
+#include "src/inspector/protocol/Forward.h"
+
+namespace v8_inspector {
+
+class V8InspectorImpl;
+
+// This debugger id tries to be unique by generating two random
+// numbers, which should most likely avoid collisions.
+// Debugger id has a 1:1 mapping to context group. It is used to
+// attribute stack traces to a particular debugging, when doing any
+// cross-debugger operations (e.g. async step in).
+// See also Runtime.UniqueDebuggerId in the protocol.
+class V8DebuggerId {
+ public:
+  V8DebuggerId() = default;
+  explicit V8DebuggerId(std::pair<int64_t, int64_t>);
+  explicit V8DebuggerId(const String16&);
+  V8DebuggerId(const V8DebuggerId&) V8_NOEXCEPT = default;
+  ~V8DebuggerId() = default;
+
+  static V8DebuggerId generate(V8InspectorImpl*);
+
+  String16 toString() const;
+  bool isValid() const;
+  std::pair<int64_t, int64_t> pair() const;
+
+ private:
+  int64_t m_first = 0;
+  int64_t m_second = 0;
+};
+
+}  // namespace v8_inspector
+
+#endif  // V8_INSPECTOR_V8_DEBUGGER_ID_H_
diff --git a/deps/v8/src/inspector/v8-debugger-script.cc b/deps/v8/src/inspector/v8-debugger-script.cc
index f345e5eea46df1..e5089e5a60c0bc 100644
--- a/deps/v8/src/inspector/v8-debugger-script.cc
+++ b/deps/v8/src/inspector/v8-debugger-script.cc
@@ -253,9 +253,10 @@ class ActualScript : public V8DebuggerScript {
     if (!m_hash.isEmpty()) return m_hash;
     v8::HandleScope scope(m_isolate);
     v8::Local<v8::String> v8Source;
-    if (script()->Source().ToLocal(&v8Source)) {
-      m_hash = calculateHash(m_isolate, v8Source);
+    if (!script()->Source().ToLocal(&v8Source)) {
+      v8Source = v8::String::Empty(m_isolate);
     }
+    m_hash = calculateHash(m_isolate, v8Source);
     DCHECK(!m_hash.isEmpty());
     return m_hash;
   }
diff --git a/deps/v8/src/inspector/v8-debugger-script.h b/deps/v8/src/inspector/v8-debugger-script.h
index c17cac1fa46070..e46dda59a930b7 100644
--- a/deps/v8/src/inspector/v8-debugger-script.h
+++ b/deps/v8/src/inspector/v8-debugger-script.h
@@ -52,6 +52,8 @@ class V8DebuggerScript {
       bool isLiveEdit, V8DebuggerAgentImpl* agent, V8InspectorClient* client);
 
   virtual ~V8DebuggerScript();
+  V8DebuggerScript(const V8DebuggerScript&) = delete;
+  V8DebuggerScript& operator=(const V8DebuggerScript&) = delete;
 
   const String16& scriptId() const { return m_id; }
   bool hasSourceURLComment() const { return m_hasSourceURLComment; }
@@ -111,9 +113,6 @@ class V8DebuggerScript {
 
   v8::Isolate* m_isolate;
   String16 m_embedderName;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(V8DebuggerScript);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-debugger.cc b/deps/v8/src/inspector/v8-debugger.cc
index f1330dcf12314a..f986938c2e4ec5 100644
--- a/deps/v8/src/inspector/v8-debugger.cc
+++ b/deps/v8/src/inspector/v8-debugger.cc
@@ -64,42 +64,6 @@ class MatchPrototypePredicate : public v8::debug::QueryObjectPredicate {
 
 }  // namespace
 
-V8DebuggerId::V8DebuggerId(std::pair<int64_t, int64_t> pair)
-    : m_first(pair.first), m_second(pair.second) {}
-
-// static
-V8DebuggerId V8DebuggerId::generate(v8::Isolate* isolate) {
-  V8DebuggerId debuggerId;
-  debuggerId.m_first = v8::debug::GetNextRandomInt64(isolate);
-  debuggerId.m_second = v8::debug::GetNextRandomInt64(isolate);
-  if (!debuggerId.m_first && !debuggerId.m_second) ++debuggerId.m_first;
-  return debuggerId;
-}
-
-V8DebuggerId::V8DebuggerId(const String16& debuggerId) {
-  const UChar dot = '.';
-  size_t pos = debuggerId.find(dot);
-  if (pos == String16::kNotFound) return;
-  bool ok = false;
-  int64_t first = debuggerId.substring(0, pos).toInteger64(&ok);
-  if (!ok) return;
-  int64_t second = debuggerId.substring(pos + 1).toInteger64(&ok);
-  if (!ok) return;
-  m_first = first;
-  m_second = second;
-}
-
-String16 V8DebuggerId::toString() const {
-  return String16::fromInteger64(m_first) + "." +
-         String16::fromInteger64(m_second);
-}
-
-bool V8DebuggerId::isValid() const { return m_first || m_second; }
-
-std::pair<int64_t, int64_t> V8DebuggerId::pair() const {
-  return std::make_pair(m_first, m_second);
-}
-
 V8Debugger::V8Debugger(v8::Isolate* isolate, V8InspectorImpl* inspector)
     : m_isolate(isolate),
       m_inspector(inspector),
@@ -225,7 +189,7 @@ void V8Debugger::setPauseOnNextCall(bool pause, int targetContextGroupId) {
 }
 
 bool V8Debugger::canBreakProgram() {
-  return !v8::debug::AllFramesOnStackAreBlackboxed(m_isolate);
+  return !v8::debug::CanBreakProgram(m_isolate);
 }
 
 void V8Debugger::breakProgram(int targetContextGroupId) {
@@ -657,7 +621,7 @@ v8::MaybeLocal<v8::Value> V8Debugger::getTargetScopes(
   switch (kind) {
     case FUNCTION:
       iterator = v8::debug::ScopeIterator::CreateForFunction(
-          m_isolate, v8::Local<v8::Function>::Cast(value));
+          m_isolate, value.As<v8::Function>());
       break;
     case GENERATOR:
       v8::Local<v8::debug::GeneratorObject> generatorObject =
@@ -665,7 +629,7 @@ v8::MaybeLocal<v8::Value> V8Debugger::getTargetScopes(
       if (!generatorObject->IsSuspended()) return v8::MaybeLocal<v8::Value>();
 
       iterator = v8::debug::ScopeIterator::CreateForGeneratorObject(
-          m_isolate, v8::Local<v8::Object>::Cast(value));
+          m_isolate, value.As<v8::Object>());
       break;
   }
   if (!iterator) return v8::MaybeLocal<v8::Value>();
@@ -1114,7 +1078,7 @@ void V8Debugger::setMaxAsyncTaskStacksForTest(int limit) {
 V8DebuggerId V8Debugger::debuggerIdFor(int contextGroupId) {
   auto it = m_contextGroupIdToDebuggerId.find(contextGroupId);
   if (it != m_contextGroupIdToDebuggerId.end()) return it->second;
-  V8DebuggerId debuggerId = V8DebuggerId::generate(m_isolate);
+  V8DebuggerId debuggerId = V8DebuggerId::generate(m_inspector);
   m_contextGroupIdToDebuggerId.insert(
       it, std::make_pair(contextGroupId, debuggerId));
   return debuggerId;
diff --git a/deps/v8/src/inspector/v8-debugger.h b/deps/v8/src/inspector/v8-debugger.h
index 79c1e037919261..fc790a93279aa2 100644
--- a/deps/v8/src/inspector/v8-debugger.h
+++ b/deps/v8/src/inspector/v8-debugger.h
@@ -11,15 +11,15 @@
 #include <unordered_set>
 #include <vector>
 
+#include "include/v8-inspector.h"
 #include "src/base/macros.h"
 #include "src/inspector/inspected-context.h"
 #include "src/inspector/protocol/Debugger.h"
 #include "src/inspector/protocol/Forward.h"
 #include "src/inspector/protocol/Runtime.h"
+#include "src/inspector/v8-debugger-id.h"
 #include "src/inspector/v8-debugger-script.h"
 
-#include "include/v8-inspector.h"
-
 namespace v8_inspector {
 
 class AsyncStackTrace;
@@ -36,36 +36,13 @@ using protocol::Response;
 using TerminateExecutionCallback =
     protocol::Runtime::Backend::TerminateExecutionCallback;
 
-// This debugger id tries to be unique by generating two random
-// numbers, which should most likely avoid collisions.
-// Debugger id has a 1:1 mapping to context group. It is used to
-// attribute stack traces to a particular debugging, when doing any
-// cross-debugger operations (e.g. async step in).
-// See also Runtime.UniqueDebuggerId in the protocol.
-class V8DebuggerId {
- public:
-  V8DebuggerId() = default;
-  explicit V8DebuggerId(std::pair<int64_t, int64_t>);
-  explicit V8DebuggerId(const String16&);
-  V8DebuggerId(const V8DebuggerId&) V8_NOEXCEPT = default;
-  ~V8DebuggerId() = default;
-
-  static V8DebuggerId generate(v8::Isolate*);
-
-  String16 toString() const;
-  bool isValid() const;
-  std::pair<int64_t, int64_t> pair() const;
-
- private:
-  int64_t m_first = 0;
-  int64_t m_second = 0;
-};
-
 class V8Debugger : public v8::debug::DebugDelegate,
                    public v8::debug::AsyncEventDelegate {
  public:
   V8Debugger(v8::Isolate*, V8InspectorImpl*);
   ~V8Debugger() override;
+  V8Debugger(const V8Debugger&) = delete;
+  V8Debugger& operator=(const V8Debugger&) = delete;
 
   bool enabled() const;
   v8::Isolate* isolate() const { return m_isolate; }
@@ -273,8 +250,6 @@ class V8Debugger : public v8::debug::DebugDelegate,
   std::unordered_map<int, V8DebuggerId> m_contextGroupIdToDebuggerId;
 
   std::unique_ptr<TerminateExecutionCallback> m_terminateExecutionCallback;
-
-  DISALLOW_COPY_AND_ASSIGN(V8Debugger);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h b/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h
index 8b4e66cb8de706..b9babdb9898f1c 100644
--- a/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h
+++ b/deps/v8/src/inspector/v8-heap-profiler-agent-impl.h
@@ -25,6 +25,8 @@ class V8HeapProfilerAgentImpl : public protocol::HeapProfiler::Backend {
   V8HeapProfilerAgentImpl(V8InspectorSessionImpl*, protocol::FrontendChannel*,
                           protocol::DictionaryValue* state);
   ~V8HeapProfilerAgentImpl() override;
+  V8HeapProfilerAgentImpl(const V8HeapProfilerAgentImpl&) = delete;
+  V8HeapProfilerAgentImpl& operator=(const V8HeapProfilerAgentImpl&) = delete;
   void restore();
 
   void collectGarbage(
@@ -70,8 +72,6 @@ class V8HeapProfilerAgentImpl : public protocol::HeapProfiler::Backend {
   protocol::DictionaryValue* m_state;
   bool m_hasTimer;
   std::shared_ptr<AsyncGC> m_async_gc;
-
-  DISALLOW_COPY_AND_ASSIGN(V8HeapProfilerAgentImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-inspector-impl.cc b/deps/v8/src/inspector/v8-inspector-impl.cc
index 7bb8029a3d368c..3d51aa7f6a499a 100644
--- a/deps/v8/src/inspector/v8-inspector-impl.cc
+++ b/deps/v8/src/inspector/v8-inspector-impl.cc
@@ -62,7 +62,7 @@ V8InspectorImpl::V8InspectorImpl(v8::Isolate* isolate,
       m_capturingStackTracesCount(0),
       m_lastExceptionId(0),
       m_lastContextId(0),
-      m_isolateId(v8::debug::GetNextRandomInt64(m_isolate)) {
+      m_isolateId(generateUniqueId()) {
   v8::debug::SetInspector(m_isolate, this);
   v8::debug::SetConsoleDelegate(m_isolate, console());
 }
@@ -81,6 +81,11 @@ int V8InspectorImpl::contextGroupId(int contextId) const {
   return it != m_contextIdToGroupIdMap.end() ? it->second : 0;
 }
 
+int V8InspectorImpl::resolveUniqueContextId(V8DebuggerId uniqueId) const {
+  auto it = m_uniqueIdToContextId.find(uniqueId.pair());
+  return it == m_uniqueIdToContextId.end() ? 0 : it->second;
+}
+
 v8::MaybeLocal<v8::Value> V8InspectorImpl::compileAndRunInternalScript(
     v8::Local<v8::Context> context, v8::Local<v8::String> source) {
   v8::Local<v8::UnboundScript> unboundScript;
@@ -97,12 +102,7 @@ v8::MaybeLocal<v8::Value> V8InspectorImpl::compileAndRunInternalScript(
 v8::MaybeLocal<v8::Script> V8InspectorImpl::compileScript(
     v8::Local<v8::Context> context, const String16& code,
     const String16& fileName) {
-  v8::ScriptOrigin origin(
-      toV8String(m_isolate, fileName), v8::Integer::New(m_isolate, 0),
-      v8::Integer::New(m_isolate, 0),
-      v8::False(m_isolate),                                         // sharable
-      v8::Local<v8::Integer>(), toV8String(m_isolate, String16()),  // sourceMap
-      v8::True(m_isolate));  // opaqueresource
+  v8::ScriptOrigin origin(toV8String(m_isolate, fileName), 0, 0, false);
   v8::ScriptCompiler::Source source(toV8String(m_isolate, code), origin);
   return v8::ScriptCompiler::Compile(context, &source,
                                      v8::ScriptCompiler::kNoCompileOptions);
@@ -195,6 +195,11 @@ void V8InspectorImpl::contextCreated(const V8ContextInfo& info) {
   auto* context = new InspectedContext(this, info, contextId);
   m_contextIdToGroupIdMap[contextId] = info.contextGroupId;
 
+  DCHECK(m_uniqueIdToContextId.find(context->uniqueId().pair()) ==
+         m_uniqueIdToContextId.end());
+  m_uniqueIdToContextId.insert(
+      std::make_pair(context->uniqueId().pair(), contextId));
+
   auto contextIt = m_contexts.find(info.contextGroupId);
   if (contextIt == m_contexts.end())
     contextIt = m_contexts
@@ -238,14 +243,15 @@ void V8InspectorImpl::contextCollected(int groupId, int contextId) {
 void V8InspectorImpl::resetContextGroup(int contextGroupId) {
   m_consoleStorageMap.erase(contextGroupId);
   m_muteExceptionsMap.erase(contextGroupId);
-  std::vector<int> contextIdsToClear;
-  forEachContext(contextGroupId,
-                 [&contextIdsToClear](InspectedContext* context) {
-                   contextIdsToClear.push_back(context->contextId());
-                 });
+  auto contextsIt = m_contexts.find(contextGroupId);
+  // Context might have been removed already by discardContextScript()
+  if (contextsIt != m_contexts.end()) {
+    for (const auto& map_entry : *contextsIt->second)
+      m_uniqueIdToContextId.erase(map_entry.second->uniqueId().pair());
+    m_contexts.erase(contextsIt);
+  }
   forEachSession(contextGroupId,
                  [](V8InspectorSessionImpl* session) { session->reset(); });
-  m_contexts.erase(contextGroupId);
 }
 
 void V8InspectorImpl::idleStarted() { m_isolate->SetIdle(true); }
@@ -367,7 +373,9 @@ v8::Local<v8::Context> V8InspectorImpl::regexContext() {
 
 void V8InspectorImpl::discardInspectedContext(int contextGroupId,
                                               int contextId) {
-  if (!getContext(contextGroupId, contextId)) return;
+  auto* context = getContext(contextGroupId, contextId);
+  if (!context) return;
+  m_uniqueIdToContextId.erase(context->uniqueId().pair());
   m_contexts[contextGroupId]->erase(contextId);
   if (m_contexts[contextGroupId]->empty()) m_contexts.erase(contextGroupId);
 }
@@ -421,6 +429,13 @@ void V8InspectorImpl::forEachSession(
   }
 }
 
+int64_t V8InspectorImpl::generateUniqueId() {
+  int64_t id = m_client->generateUniqueId();
+  if (!id) id = v8::debug::GetNextRandomInt64(m_isolate);
+  if (!id) id = 1;
+  return id;
+}
+
 V8InspectorImpl::EvaluateScope::EvaluateScope(
     const InjectedScript::Scope& scope)
     : m_scope(scope),
diff --git a/deps/v8/src/inspector/v8-inspector-impl.h b/deps/v8/src/inspector/v8-inspector-impl.h
index 43e33699535419..c5259b0c607811 100644
--- a/deps/v8/src/inspector/v8-inspector-impl.h
+++ b/deps/v8/src/inspector/v8-inspector-impl.h
@@ -59,6 +59,8 @@ class V8InspectorImpl : public V8Inspector {
  public:
   V8InspectorImpl(v8::Isolate*, V8InspectorClient*);
   ~V8InspectorImpl() override;
+  V8InspectorImpl(const V8InspectorImpl&) = delete;
+  V8InspectorImpl& operator=(const V8InspectorImpl&) = delete;
 
   v8::Isolate* isolate() const { return m_isolate; }
   V8InspectorClient* client() { return m_client; }
@@ -66,6 +68,7 @@ class V8InspectorImpl : public V8Inspector {
   int contextGroupId(v8::Local<v8::Context>) const;
   int contextGroupId(int contextId) const;
   uint64_t isolateId() const { return m_isolateId; }
+  int resolveUniqueContextId(V8DebuggerId uniqueId) const;
 
   v8::MaybeLocal<v8::Value> compileAndRunInternalScript(v8::Local<v8::Context>,
                                                         v8::Local<v8::String>);
@@ -127,6 +130,7 @@ class V8InspectorImpl : public V8Inspector {
   void forEachSession(
       int contextGroupId,
       const std::function<void(V8InspectorSessionImpl*)>& callback);
+  int64_t generateUniqueId();
 
   class EvaluateScope {
    public:
@@ -175,12 +179,11 @@ class V8InspectorImpl : public V8Inspector {
   ConsoleStorageMap m_consoleStorageMap;
 
   std::unordered_map<int, int> m_contextIdToGroupIdMap;
+  std::map<std::pair<int64_t, int64_t>, int> m_uniqueIdToContextId;
 
   std::unique_ptr<V8Console> m_console;
 
   Counters* m_counters = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(V8InspectorImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-inspector-session-impl.cc b/deps/v8/src/inspector/v8-inspector-session-impl.cc
index 4303b35c628985..02b694a1a982cd 100644
--- a/deps/v8/src/inspector/v8-inspector-session-impl.cc
+++ b/deps/v8/src/inspector/v8-inspector-session-impl.cc
@@ -145,6 +145,7 @@ V8InspectorSessionImpl::V8InspectorSessionImpl(V8InspectorImpl* inspector,
 }
 
 V8InspectorSessionImpl::~V8InspectorSessionImpl() {
+  v8::Isolate::Scope scope(m_inspector->isolate());
   discardInjectedScripts();
   m_consoleAgent->disable();
   m_profilerAgent->disable();
diff --git a/deps/v8/src/inspector/v8-inspector-session-impl.h b/deps/v8/src/inspector/v8-inspector-session-impl.h
index b3fce48df71f89..db530385aab0a5 100644
--- a/deps/v8/src/inspector/v8-inspector-session-impl.h
+++ b/deps/v8/src/inspector/v8-inspector-session-impl.h
@@ -38,6 +38,8 @@ class V8InspectorSessionImpl : public V8InspectorSession,
                                                         V8Inspector::Channel*,
                                                         StringView state);
   ~V8InspectorSessionImpl() override;
+  V8InspectorSessionImpl(const V8InspectorSessionImpl&) = delete;
+  V8InspectorSessionImpl& operator=(const V8InspectorSessionImpl&) = delete;
 
   V8InspectorImpl* inspector() const { return m_inspector; }
   V8ConsoleAgentImpl* consoleAgent() { return m_consoleAgent.get(); }
@@ -129,8 +131,6 @@ class V8InspectorSessionImpl : public V8InspectorSession,
   std::vector<std::unique_ptr<V8InspectorSession::Inspectable>>
       m_inspectedObjects;
   bool use_binary_protocol_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(V8InspectorSessionImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-profiler-agent-impl.h b/deps/v8/src/inspector/v8-profiler-agent-impl.h
index 79016727b6ddf1..eb643ab4202788 100644
--- a/deps/v8/src/inspector/v8-profiler-agent-impl.h
+++ b/deps/v8/src/inspector/v8-profiler-agent-impl.h
@@ -29,6 +29,8 @@ class V8ProfilerAgentImpl : public protocol::Profiler::Backend {
   V8ProfilerAgentImpl(V8InspectorSessionImpl*, protocol::FrontendChannel*,
                       protocol::DictionaryValue* state);
   ~V8ProfilerAgentImpl() override;
+  V8ProfilerAgentImpl(const V8ProfilerAgentImpl&) = delete;
+  V8ProfilerAgentImpl& operator=(const V8ProfilerAgentImpl&) = delete;
 
   bool enabled() const { return m_enabled; }
   void restore();
@@ -95,8 +97,6 @@ class V8ProfilerAgentImpl : public protocol::Profiler::Backend {
   int m_startedProfilesCount = 0;
   std::shared_ptr<V8Inspector::Counters> m_counters;
   bool m_runtime_call_stats_enabled = false;
-
-  DISALLOW_COPY_AND_ASSIGN(V8ProfilerAgentImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-regex.h b/deps/v8/src/inspector/v8-regex.h
index 0ce779542d5fb1..9ce31cf4cece38 100644
--- a/deps/v8/src/inspector/v8-regex.h
+++ b/deps/v8/src/inspector/v8-regex.h
@@ -20,6 +20,8 @@ class V8Regex {
  public:
   V8Regex(V8InspectorImpl*, const String16&, bool caseSensitive,
           bool multiline = false);
+  V8Regex(const V8Regex&) = delete;
+  V8Regex& operator=(const V8Regex&) = delete;
   int match(const String16&, int startFrom = 0,
             int* matchLength = nullptr) const;
   bool isValid() const { return !m_regex.IsEmpty(); }
@@ -29,8 +31,6 @@ class V8Regex {
   V8InspectorImpl* m_inspector;
   v8::Global<v8::RegExp> m_regex;
   String16 m_errorMessage;
-
-  DISALLOW_COPY_AND_ASSIGN(V8Regex);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-runtime-agent-impl.cc b/deps/v8/src/inspector/v8-runtime-agent-impl.cc
index 2109348d0718f7..6fee3b3b05fff5 100644
--- a/deps/v8/src/inspector/v8-runtime-agent-impl.cc
+++ b/deps/v8/src/inspector/v8-runtime-agent-impl.cc
@@ -204,9 +204,21 @@ void innerCallFunctionOn(
 }
 
 Response ensureContext(V8InspectorImpl* inspector, int contextGroupId,
-                       Maybe<int> executionContextId, int* contextId) {
+                       Maybe<int> executionContextId,
+                       Maybe<String16> uniqueContextId, int* contextId) {
   if (executionContextId.isJust()) {
+    if (uniqueContextId.isJust()) {
+      return Response::InvalidParams(
+          "contextId and uniqueContextId are mutually exclusive");
+    }
     *contextId = executionContextId.fromJust();
+  } else if (uniqueContextId.isJust()) {
+    V8DebuggerId uniqueId(uniqueContextId.fromJust());
+    if (!uniqueId.isValid())
+      return Response::InvalidParams("invalid uniqueContextId");
+    int id = inspector->resolveUniqueContextId(uniqueId);
+    if (!id) return Response::InvalidParams("uniqueContextId not found");
+    *contextId = id;
   } else {
     v8::HandleScope handles(inspector->isolate());
     v8::Local<v8::Context> defaultContext =
@@ -215,6 +227,7 @@ Response ensureContext(V8InspectorImpl* inspector, int contextGroupId,
       return Response::ServerError("Cannot find default execution context");
     *contextId = InspectedContext::contextId(defaultContext);
   }
+
   return Response::Success();
 }
 
@@ -238,13 +251,14 @@ void V8RuntimeAgentImpl::evaluate(
     Maybe<bool> generatePreview, Maybe<bool> userGesture,
     Maybe<bool> maybeAwaitPromise, Maybe<bool> throwOnSideEffect,
     Maybe<double> timeout, Maybe<bool> disableBreaks, Maybe<bool> maybeReplMode,
-    Maybe<bool> allowUnsafeEvalBlockedByCSP,
+    Maybe<bool> allowUnsafeEvalBlockedByCSP, Maybe<String16> uniqueContextId,
     std::unique_ptr<EvaluateCallback> callback) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"),
                "EvaluateScript");
   int contextId = 0;
   Response response = ensureContext(m_inspector, m_session->contextGroupId(),
-                                    std::move(executionContextId), &contextId);
+                                    std::move(executionContextId),
+                                    std::move(uniqueContextId), &contextId);
   if (!response.IsSuccess()) {
     callback->sendFailure(response);
     return;
@@ -378,9 +392,9 @@ void V8RuntimeAgentImpl::callFunctionOn(
                         std::move(callback));
   } else {
     int contextId = 0;
-    Response response =
-        ensureContext(m_inspector, m_session->contextGroupId(),
-                      std::move(executionContextId.fromJust()), &contextId);
+    Response response = ensureContext(m_inspector, m_session->contextGroupId(),
+                                      std::move(executionContextId.fromJust()),
+                                      /* uniqueContextId */ {}, &contextId);
     if (!response.IsSuccess()) {
       callback->sendFailure(response);
       return;
@@ -497,7 +511,8 @@ Response V8RuntimeAgentImpl::compileScript(
 
   int contextId = 0;
   Response response = ensureContext(m_inspector, m_session->contextGroupId(),
-                                    std::move(executionContextId), &contextId);
+                                    std::move(executionContextId),
+                                    /*uniqueContextId*/ {}, &contextId);
   if (!response.IsSuccess()) return response;
   InjectedScript::ContextScope scope(m_session, contextId);
   response = scope.initialize();
@@ -550,7 +565,8 @@ void V8RuntimeAgentImpl::runScript(
 
   int contextId = 0;
   Response response = ensureContext(m_inspector, m_session->contextGroupId(),
-                                    std::move(executionContextId), &contextId);
+                                    std::move(executionContextId),
+                                    /*uniqueContextId*/ {}, &contextId);
   if (!response.IsSuccess()) {
     callback->sendFailure(response);
     return;
@@ -615,7 +631,7 @@ Response V8RuntimeAgentImpl::queryObjects(
     return Response::ServerError("Prototype should be instance of Object");
   }
   v8::Local<v8::Array> resultArray = m_inspector->debugger()->queryObjects(
-      scope.context(), v8::Local<v8::Object>::Cast(scope.object()));
+      scope.context(), scope.object().As<v8::Object>());
   return scope.injectedScript()->wrapObject(
       resultArray, objectGroup.fromMaybe(scope.objectGroupName()),
       WrapMode::kNoPreview, objects);
@@ -626,7 +642,8 @@ Response V8RuntimeAgentImpl::globalLexicalScopeNames(
     std::unique_ptr<protocol::Array<String16>>* outNames) {
   int contextId = 0;
   Response response = ensureContext(m_inspector, m_session->contextGroupId(),
-                                    std::move(executionContextId), &contextId);
+                                    std::move(executionContextId),
+                                    /*uniqueContextId*/ {}, &contextId);
   if (!response.IsSuccess()) return response;
 
   InjectedScript::ContextScope scope(m_session, contextId);
@@ -735,10 +752,8 @@ void V8RuntimeAgentImpl::bindingCallback(
   int contextId = InspectedContext::contextId(isolate->GetCurrentContext());
   int contextGroupId = inspector->contextGroupId(contextId);
 
-  String16 name =
-      toProtocolString(isolate, v8::Local<v8::String>::Cast(info.Data()));
-  String16 payload =
-      toProtocolString(isolate, v8::Local<v8::String>::Cast(info[0]));
+  String16 name = toProtocolString(isolate, info.Data().As<v8::String>());
+  String16 payload = toProtocolString(isolate, info[0].As<v8::String>());
 
   inspector->forEachSession(
       contextGroupId,
@@ -866,6 +881,7 @@ void V8RuntimeAgentImpl::reportExecutionContextCreated(
           .setId(context->contextId())
           .setName(context->humanReadableName())
           .setOrigin(context->origin())
+          .setUniqueId(context->uniqueId().toString())
           .build();
   const String16& aux = context->auxData();
   if (!aux.isEmpty()) {
diff --git a/deps/v8/src/inspector/v8-runtime-agent-impl.h b/deps/v8/src/inspector/v8-runtime-agent-impl.h
index 80c2096fedeb27..5ac1e462f89d43 100644
--- a/deps/v8/src/inspector/v8-runtime-agent-impl.h
+++ b/deps/v8/src/inspector/v8-runtime-agent-impl.h
@@ -57,6 +57,8 @@ class V8RuntimeAgentImpl : public protocol::Runtime::Backend {
   V8RuntimeAgentImpl(V8InspectorSessionImpl*, protocol::FrontendChannel*,
                      protocol::DictionaryValue* state);
   ~V8RuntimeAgentImpl() override;
+  V8RuntimeAgentImpl(const V8RuntimeAgentImpl&) = delete;
+  V8RuntimeAgentImpl& operator=(const V8RuntimeAgentImpl&) = delete;
   void restore();
 
   // Part of the protocol.
@@ -69,6 +71,7 @@ class V8RuntimeAgentImpl : public protocol::Runtime::Backend {
                 Maybe<bool> awaitPromise, Maybe<bool> throwOnSideEffect,
                 Maybe<double> timeout, Maybe<bool> disableBreaks,
                 Maybe<bool> replMode, Maybe<bool> allowUnsafeEvalBlockedByCSP,
+                Maybe<String16> uniqueContextId,
                 std::unique_ptr<EvaluateCallback>) override;
   void awaitPromise(const String16& promiseObjectId, Maybe<bool> returnByValue,
                     Maybe<bool> generatePreview,
@@ -146,8 +149,6 @@ class V8RuntimeAgentImpl : public protocol::Runtime::Backend {
   std::unordered_map<String16, std::unique_ptr<v8::Global<v8::Script>>>
       m_compiledScripts;
   std::set<String16> m_activeBindings;
-
-  DISALLOW_COPY_AND_ASSIGN(V8RuntimeAgentImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-schema-agent-impl.h b/deps/v8/src/inspector/v8-schema-agent-impl.h
index 1251e98bc52814..448529514f1a03 100644
--- a/deps/v8/src/inspector/v8-schema-agent-impl.h
+++ b/deps/v8/src/inspector/v8-schema-agent-impl.h
@@ -22,6 +22,8 @@ class V8SchemaAgentImpl : public protocol::Schema::Backend {
   V8SchemaAgentImpl(V8InspectorSessionImpl*, protocol::FrontendChannel*,
                     protocol::DictionaryValue* state);
   ~V8SchemaAgentImpl() override;
+  V8SchemaAgentImpl(const V8SchemaAgentImpl&) = delete;
+  V8SchemaAgentImpl& operator=(const V8SchemaAgentImpl&) = delete;
 
   Response getDomains(
       std::unique_ptr<protocol::Array<protocol::Schema::Domain>>*) override;
@@ -29,8 +31,6 @@ class V8SchemaAgentImpl : public protocol::Schema::Backend {
  private:
   V8InspectorSessionImpl* m_session;
   protocol::Schema::Frontend m_frontend;
-
-  DISALLOW_COPY_AND_ASSIGN(V8SchemaAgentImpl);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/v8-stack-trace-impl.cc b/deps/v8/src/inspector/v8-stack-trace-impl.cc
index f2fc99e3891af1..db1d98a173fc3c 100644
--- a/deps/v8/src/inspector/v8-stack-trace-impl.cc
+++ b/deps/v8/src/inspector/v8-stack-trace-impl.cc
@@ -176,7 +176,8 @@ std::unique_ptr<StringBuffer> V8StackTraceId::ToString() {
 
 StackFrame::StackFrame(v8::Isolate* isolate, v8::Local<v8::StackFrame> v8Frame)
     : m_functionName(toProtocolString(isolate, v8Frame->GetFunctionName())),
-      m_scriptId(String16::fromInteger(v8Frame->GetScriptId())),
+      m_scriptId(v8Frame->GetScriptId()),
+      m_scriptIdAsString(String16::fromInteger(v8Frame->GetScriptId())),
       m_sourceURL(
           toProtocolString(isolate, v8Frame->GetScriptNameOrSourceURL())),
       m_lineNumber(v8Frame->GetLineNumber() - 1),
@@ -189,7 +190,11 @@ StackFrame::StackFrame(v8::Isolate* isolate, v8::Local<v8::StackFrame> v8Frame)
 
 const String16& StackFrame::functionName() const { return m_functionName; }
 
-const String16& StackFrame::scriptId() const { return m_scriptId; }
+int StackFrame::scriptId() const { return m_scriptId; }
+
+const String16& StackFrame::scriptIdAsString() const {
+  return m_scriptIdAsString;
+}
 
 const String16& StackFrame::sourceURL() const { return m_sourceURL; }
 
@@ -209,7 +214,7 @@ std::unique_ptr<protocol::Runtime::CallFrame> StackFrame::buildInspectorObject(
   }
   return protocol::Runtime::CallFrame::create()
       .setFunctionName(m_functionName)
-      .setScriptId(m_scriptId)
+      .setScriptId(String16::fromInteger(m_scriptId))
       .setUrl(frameUrl)
       .setLineNumber(m_lineNumber)
       .setColumnNumber(m_columnNumber)
@@ -315,7 +320,11 @@ int V8StackTraceImpl::topColumnNumber() const {
 }
 
 StringView V8StackTraceImpl::topScriptId() const {
-  return toStringView(m_frames[0]->scriptId());
+  return toStringView(m_frames[0]->scriptIdAsString());
+}
+
+int V8StackTraceImpl::topScriptIdAsInteger() const {
+  return m_frames[0]->scriptId();
 }
 
 StringView V8StackTraceImpl::topFunctionName() const {
diff --git a/deps/v8/src/inspector/v8-stack-trace-impl.h b/deps/v8/src/inspector/v8-stack-trace-impl.h
index 8e3a35c9b1e908..3896c7371c393e 100644
--- a/deps/v8/src/inspector/v8-stack-trace-impl.h
+++ b/deps/v8/src/inspector/v8-stack-trace-impl.h
@@ -26,7 +26,8 @@ class StackFrame {
   ~StackFrame() = default;
 
   const String16& functionName() const;
-  const String16& scriptId() const;
+  int scriptId() const;
+  const String16& scriptIdAsString() const;
   const String16& sourceURL() const;
   int lineNumber() const;    // 0-based.
   int columnNumber() const;  // 0-based.
@@ -36,7 +37,8 @@ class StackFrame {
 
  private:
   String16 m_functionName;
-  String16 m_scriptId;
+  int m_scriptId;
+  String16 m_scriptIdAsString;
   String16 m_sourceURL;
   int m_lineNumber;    // 0-based.
   int m_columnNumber;  // 0-based.
@@ -57,6 +59,8 @@ class V8StackTraceImpl : public V8StackTrace {
                                                    int maxStackSize);
 
   ~V8StackTraceImpl() override;
+  V8StackTraceImpl(const V8StackTraceImpl&) = delete;
+  V8StackTraceImpl& operator=(const V8StackTraceImpl&) = delete;
   std::unique_ptr<protocol::Runtime::StackTrace> buildInspectorObjectImpl(
       V8Debugger* debugger) const;
 
@@ -72,6 +76,7 @@ class V8StackTraceImpl : public V8StackTrace {
   int topLineNumber() const override;    // 1-based.
   int topColumnNumber() const override;  // 1-based.
   StringView topScriptId() const override;
+  int topScriptIdAsInteger() const override;
   StringView topFunctionName() const override;
   std::unique_ptr<protocol::Runtime::API::StackTrace> buildInspectorObject()
       const override;
@@ -105,12 +110,12 @@ class V8StackTraceImpl : public V8StackTrace {
   int m_maxAsyncDepth;
   std::weak_ptr<AsyncStackTrace> m_asyncParent;
   V8StackTraceId m_externalParent;
-
-  DISALLOW_COPY_AND_ASSIGN(V8StackTraceImpl);
 };
 
 class AsyncStackTrace {
  public:
+  AsyncStackTrace(const AsyncStackTrace&) = delete;
+  AsyncStackTrace& operator=(const AsyncStackTrace&) = delete;
   static std::shared_ptr<AsyncStackTrace> capture(V8Debugger*,
                                                   int contextGroupId,
                                                   const String16& description,
@@ -155,8 +160,6 @@ class AsyncStackTrace {
   std::vector<std::shared_ptr<StackFrame>> m_frames;
   std::weak_ptr<AsyncStackTrace> m_asyncParent;
   V8StackTraceId m_externalParent;
-
-  DISALLOW_COPY_AND_ASSIGN(AsyncStackTrace);
 };
 
 }  // namespace v8_inspector
diff --git a/deps/v8/src/inspector/value-mirror.cc b/deps/v8/src/inspector/value-mirror.cc
index e6f66c98212563..0b76d9ee22e1a6 100644
--- a/deps/v8/src/inspector/value-mirror.cc
+++ b/deps/v8/src/inspector/value-mirror.cc
@@ -22,6 +22,10 @@ using protocol::Runtime::PropertyPreview;
 using protocol::Runtime::RemoteObject;
 
 namespace {
+
+// WebAssembly memory is organized in pages of size 64KiB.
+const size_t kWasmPageSize = 64 * 1024;
+
 V8InspectorClient* clientFor(v8::Local<v8::Context> context) {
   return static_cast<V8InspectorImpl*>(
              v8::debug::GetInspector(context->GetIsolate()))
@@ -54,15 +58,6 @@ ResultType unpackWasmValue(v8::Local<v8::Context> context,
   return result;
 }
 
-String16 descriptionForWasmS128(std::array<uint8_t, 16> arr) {
-  String16Builder builder;
-  for (int i = 0; i < 16; i++) {
-    builder.appendUnsignedAsHex(arr.at(i));
-    builder.append(" ");
-  }
-  return builder.toString();
-}
-
 // Partial list of Wasm's ValueType, copied here to avoid including internal
 // header. Using an unscoped enumeration here to allow implicit conversions from
 // int. Keep in sync with ValueType::Kind in wasm/value-type.h.
@@ -123,7 +118,7 @@ Response toProtocolValue(v8::Local<v8::Context> context,
   if (value->IsObject()) {
     std::unique_ptr<protocol::DictionaryValue> jsonObject =
         protocol::DictionaryValue::create();
-    v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
+    v8::Local<v8::Object> object = value.As<v8::Object>();
     v8::Local<v8::Array> propertyNames;
     if (!object->GetPropertyNames(context).ToLocal(&propertyNames))
       return Response::InternalError();
@@ -134,8 +129,8 @@ Response toProtocolValue(v8::Local<v8::Context> context,
         return Response::InternalError();
       // FIXME(yurys): v8::Object should support GetOwnPropertyNames
       if (name->IsString()) {
-        v8::Maybe<bool> hasRealNamedProperty = object->HasRealNamedProperty(
-            context, v8::Local<v8::String>::Cast(name));
+        v8::Maybe<bool> hasRealNamedProperty =
+            object->HasRealNamedProperty(context, name.As<v8::String>());
         if (hasRealNamedProperty.IsNothing() ||
             !hasRealNamedProperty.FromJust())
           continue;
@@ -158,56 +153,6 @@ Response toProtocolValue(v8::Local<v8::Context> context,
     return Response::Success();
   }
 
-  if (v8::debug::WasmValue::IsWasmValue(value)) {
-    auto wasmValue = value.As<v8::debug::WasmValue>();
-
-    // Convert serializable Wasm values (i32, f32, f64) into protocol values.
-    // Not all i64 values are representable by double, so always represent it as
-    // a String here.
-    switch (wasmValue->value_type()) {
-      case kI32: {
-        *result = protocol::FundamentalValue::create(
-            unpackWasmValue<int32_t>(context, wasmValue->bytes()));
-        break;
-      }
-      case kI64: {
-        *result = protocol::StringValue::create(String16::fromInteger64(
-            unpackWasmValue<int64_t>(context, wasmValue->bytes())));
-        break;
-      }
-      case kF32: {
-        *result = protocol::FundamentalValue::create(
-            unpackWasmValue<float>(context, wasmValue->bytes()));
-        break;
-      }
-      case kF64: {
-        *result = protocol::FundamentalValue::create(
-            unpackWasmValue<double>(context, wasmValue->bytes()));
-        break;
-      }
-      case kS128: {
-        auto bytes = wasmValue->bytes();
-        DCHECK_EQ(16, bytes->Length());
-        auto s128 = unpackWasmValue<std::array<uint8_t, 16>>(context, bytes);
-        String16 desc = descriptionForWasmS128(s128);
-        *result = protocol::StringValue::create(desc);
-        break;
-      }
-      case kExternRef: {
-        std::unique_ptr<protocol::Value> externrefValue;
-        Response response = toProtocolValue(context, wasmValue->ref(), maxDepth,
-                                            &externrefValue);
-        if (!response.IsSuccess()) return response;
-        *result = std::move(externrefValue);
-        break;
-      }
-      default: {
-        UNIMPLEMENTED();
-      }
-    }
-    return Response::Success();
-  }
-
   return Response::ServerError("Object couldn't be returned by value");
 }
 
@@ -215,7 +160,13 @@ Response toProtocolValue(v8::Local<v8::Context> context,
                          v8::Local<v8::Value> value,
                          std::unique_ptr<protocol::Value>* result) {
   if (value->IsUndefined()) return Response::Success();
-  return toProtocolValue(context, value, 1000, result);
+#if defined(V8_USE_ADDRESS_SANITIZER) && V8_OS_MACOSX
+  // For whatever reason, ASan on MacOS has bigger stack frames.
+  static const int kMaxDepth = 900;
+#else
+  static const int kMaxDepth = 1000;
+#endif
+  return toProtocolValue(context, value, kMaxDepth, result);
 }
 
 enum AbbreviateMode { kMiddle, kEnd };
@@ -479,121 +430,6 @@ class PrimitiveValueMirror final : public ValueMirror {
   String16 m_subtype;
 };
 
-class WasmValueMirror final : public ValueMirror {
- public:
-  explicit WasmValueMirror(v8::Local<v8::debug::WasmValue> value)
-      : m_value(value) {}
-
-  v8::Local<v8::Value> v8Value() const override { return m_value; }
-
-  Response buildRemoteObject(
-      v8::Local<v8::Context> context, WrapMode mode,
-      std::unique_ptr<RemoteObject>* result) const override {
-    bool serializable;
-    String16 descriptionValue = description(context, &serializable);
-    *result = RemoteObject::create()
-                  .setType(RemoteObject::TypeEnum::Wasm)
-                  .setSubtype(subtype())
-                  .setDescription(descriptionValue)
-                  .build();
-    if (serializable) {
-      std::unique_ptr<protocol::Value> protocolValue;
-      toProtocolValue(context, m_value, &protocolValue);
-      (*result)->setValue(std::move(protocolValue));
-    } else {
-      (*result)->setUnserializableValue(descriptionValue);
-    }
-    return Response::Success();
-  }
-
-  void buildPropertyPreview(
-      v8::Local<v8::Context> context, const String16& name,
-      std::unique_ptr<PropertyPreview>* result) const override {
-    bool serializable;
-    *result = PropertyPreview::create()
-                  .setName(name)
-                  .setType(RemoteObject::TypeEnum::Wasm)
-                  .setSubtype(subtype())
-                  .setValue(description(context, &serializable))
-                  .build();
-  }
-
-  void buildEntryPreview(
-      v8::Local<v8::Context> context, int* nameLimit, int* indexLimit,
-      std::unique_ptr<ObjectPreview>* preview) const override {
-    bool serializable;
-    *preview =
-        ObjectPreview::create()
-            .setType(RemoteObject::TypeEnum::Wasm)
-            .setSubtype(subtype())
-            .setDescription(description(context, &serializable))
-            .setOverflow(false)
-            .setProperties(std::make_unique<protocol::Array<PropertyPreview>>())
-            .build();
-  }
-
- private:
-  String16 subtype() const {
-    switch (m_value->value_type()) {
-      case kI32:
-        return RemoteObject::SubtypeEnum::I32;
-      case kI64:
-        return RemoteObject::SubtypeEnum::I64;
-      case kF32:
-        return RemoteObject::SubtypeEnum::F32;
-      case kF64:
-        return RemoteObject::SubtypeEnum::F64;
-      case kS128:
-        return RemoteObject::SubtypeEnum::V128;
-      case kExternRef:
-        return RemoteObject::SubtypeEnum::Externref;
-      default:
-        UNREACHABLE();
-    }
-  }
-
-  String16 description(v8::Local<v8::Context> context,
-                       bool* serializable) const {
-    *serializable = true;
-    switch (m_value->value_type()) {
-      case kI32: {
-        return String16::fromInteger(
-            unpackWasmValue<int32_t>(context, m_value->bytes()));
-      }
-      case kI64: {
-        *serializable = false;
-        return String16::fromInteger64(
-            unpackWasmValue<int64_t>(context, m_value->bytes()));
-      }
-      case kF32: {
-        return String16::fromDouble(
-            unpackWasmValue<float>(context, m_value->bytes()));
-      }
-      case kF64: {
-        return String16::fromDouble(
-            unpackWasmValue<double>(context, m_value->bytes()));
-      }
-      case kS128: {
-        *serializable = false;
-        auto bytes = m_value->bytes();
-        DCHECK_EQ(16, bytes->Length());
-        auto s128 = unpackWasmValue<std::array<uint8_t, 16>>(context, bytes);
-        return descriptionForWasmS128(s128);
-      }
-      case kExternRef: {
-        return descriptionForObject(context->GetIsolate(),
-                                    m_value->ref().As<v8::Object>());
-      }
-      default: {
-        *serializable = false;
-        return String16("Unknown");
-      }
-    }
-  }
-
-  v8::Local<v8::debug::WasmValue> m_value;
-};
-
 class NumberMirror final : public ValueMirror {
  public:
   explicit NumberMirror(v8::Local<v8::Number> value) : m_value(value) {}
@@ -883,7 +719,7 @@ bool isArrayLike(v8::Local<v8::Context> context, v8::Local<v8::Value> value,
       !lengthValue->IsUint32()) {
     return false;
   }
-  *length = v8::Local<v8::Uint32>::Cast(lengthValue)->Value();
+  *length = lengthValue.As<v8::Uint32>()->Value();
   return true;
 }
 
@@ -1356,45 +1192,7 @@ bool doesAttributeHaveObservableSideEffectOnGet(v8::Local<v8::Context> context,
   }
   return false;
 }
-template <typename ArrayView, typename ArrayBuffer>
-void addTypedArrayView(v8::Local<v8::Context> context,
-                       v8::Local<ArrayBuffer> buffer, size_t length,
-                       const char* name,
-                       ValueMirror::PropertyAccumulator* accumulator) {
-  accumulator->Add(PropertyMirror{
-      String16(name), false, false, false, true, false,
-      ValueMirror::create(context, ArrayView::New(buffer, 0, length)), nullptr,
-      nullptr, nullptr, nullptr});
-}
-
-template <typename ArrayBuffer>
-void addTypedArrayViews(v8::Local<v8::Context> context,
-                        v8::Local<ArrayBuffer> buffer,
-                        ValueMirror::PropertyAccumulator* accumulator) {
-  // TODO(alph): these should be internal properties.
-  // TODO(v8:9308): Reconsider how large arrays are previewed.
-  const size_t byte_length = buffer->ByteLength();
-
-  size_t length = byte_length;
-  if (length > v8::TypedArray::kMaxLength) return;
 
-  addTypedArrayView<v8::Int8Array>(context, buffer, length, "[[Int8Array]]",
-                                   accumulator);
-  addTypedArrayView<v8::Uint8Array>(context, buffer, length, "[[Uint8Array]]",
-                                    accumulator);
-
-  length = byte_length / 2;
-  if (length > v8::TypedArray::kMaxLength || (byte_length % 2) != 0) return;
-
-  addTypedArrayView<v8::Int16Array>(context, buffer, length, "[[Int16Array]]",
-                                    accumulator);
-
-  length = byte_length / 4;
-  if (length > v8::TypedArray::kMaxLength || (byte_length % 4) != 0) return;
-
-  addTypedArrayView<v8::Int32Array>(context, buffer, length, "[[Int32Array]]",
-                                    accumulator);
-}
 }  // anonymous namespace
 
 ValueMirror::~ValueMirror() = default;
@@ -1429,15 +1227,6 @@ bool ValueMirror::getProperties(v8::Local<v8::Context> context,
 
   bool formatAccessorsAsProperties =
       clientFor(context)->formatAccessorsAsProperties(object);
-
-  if (object->IsArrayBuffer()) {
-    addTypedArrayViews(context, object.As<v8::ArrayBuffer>(), accumulator);
-  }
-  if (object->IsSharedArrayBuffer()) {
-    addTypedArrayViews(context, object.As<v8::SharedArrayBuffer>(),
-                       accumulator);
-  }
-
   for (auto iterator = v8::debug::PropertyIterator::Create(object);
        !iterator->Done(); iterator->Advance()) {
     bool isOwn = iterator->is_own();
@@ -1739,18 +1528,6 @@ String16 descriptionForNode(v8::Local<v8::Context> context,
   return description;
 }
 
-String16 descriptionForTrustedType(v8::Local<v8::Context> context,
-                                   v8::Local<v8::Value> value) {
-  if (!value->IsObject()) return String16();
-  v8::Local<v8::Object> object = value.As<v8::Object>();
-  v8::Isolate* isolate = context->GetIsolate();
-  v8::TryCatch tryCatch(isolate);
-
-  v8::Local<v8::String> description;
-  if (!object->ToString(context).ToLocal(&description)) return String16();
-  return toProtocolString(isolate, description);
-}
-
 std::unique_ptr<ValueMirror> clientMirror(v8::Local<v8::Context> context,
                                           v8::Local<v8::Value> value,
                                           const String16& subtype) {
@@ -1765,10 +1542,6 @@ std::unique_ptr<ValueMirror> clientMirror(v8::Local<v8::Context> context,
     return std::make_unique<ObjectMirror>(value, subtype,
                                           descriptionForNode(context, value));
   }
-  if (subtype == "trustedtype") {
-    return std::make_unique<ObjectMirror>(
-        value, subtype, descriptionForTrustedType(context, value));
-  }
   if (subtype == "error") {
     return std::make_unique<ObjectMirror>(
         value, RemoteObject::SubtypeEnum::Error,
@@ -1819,9 +1592,6 @@ std::unique_ptr<ValueMirror> ValueMirror::create(v8::Local<v8::Context> context,
   if (value->IsSymbol()) {
     return std::make_unique<SymbolMirror>(value.As<v8::Symbol>());
   }
-  if (v8::debug::WasmValue::IsWasmValue(value)) {
-    return std::make_unique<WasmValueMirror>(value.As<v8::debug::WasmValue>());
-  }
   auto clientSubtype = (value->IsUndefined() || value->IsObject())
                            ? clientFor(context)->valueSubtype(value)
                            : nullptr;
@@ -1919,8 +1689,15 @@ std::unique_ptr<ValueMirror> ValueMirror::create(v8::Local<v8::Context> context,
         value, RemoteObject::SubtypeEnum::Dataview,
         descriptionForCollection(isolate, view, view->ByteLength()));
   }
+  if (value->IsWasmMemoryObject()) {
+    v8::Local<v8::WasmMemoryObject> memory = value.As<v8::WasmMemoryObject>();
+    return std::make_unique<ObjectMirror>(
+        value, RemoteObject::SubtypeEnum::Webassemblymemory,
+        descriptionForCollection(
+            isolate, memory, memory->Buffer()->ByteLength() / kWasmPageSize));
+  }
   V8InternalValueType internalType =
-      v8InternalValueTypeFrom(context, v8::Local<v8::Object>::Cast(value));
+      v8InternalValueTypeFrom(context, value.As<v8::Object>());
   if (value->IsArray() && internalType == V8InternalValueType::kScopeList) {
     return std::make_unique<ObjectMirror>(
         value, "internal#scopeList",
diff --git a/deps/v8/src/interpreter/bytecode-array-accessor.cc b/deps/v8/src/interpreter/bytecode-array-accessor.cc
index 8110092ca33041..3dacc2607059e8 100644
--- a/deps/v8/src/interpreter/bytecode-array-accessor.cc
+++ b/deps/v8/src/interpreter/bytecode-array-accessor.cc
@@ -57,6 +57,7 @@ class OnHeapBytecodeArray final : public AbstractBytecodeArray {
 BytecodeArrayAccessor::BytecodeArrayAccessor(
     std::unique_ptr<AbstractBytecodeArray> bytecode_array, int initial_offset)
     : bytecode_array_(std::move(bytecode_array)),
+      bytecode_length_(bytecode_array_->length()),
       bytecode_offset_(initial_offset),
       operand_scale_(OperandScale::kSingle),
       prefix_offset_(0) {
@@ -103,7 +104,7 @@ void BytecodeArrayAccessor::UpdateOperandScale() {
 }
 
 bool BytecodeArrayAccessor::OffsetInBounds() const {
-  return bytecode_offset_ >= 0 && bytecode_offset_ < bytecode_array()->length();
+  return bytecode_offset_ >= 0 && bytecode_offset_ < bytecode_length_;
 }
 
 Bytecode BytecodeArrayAccessor::current_bytecode() const {
diff --git a/deps/v8/src/interpreter/bytecode-array-accessor.h b/deps/v8/src/interpreter/bytecode-array-accessor.h
index e536c52228ab83..65bb2cdbd483e2 100644
--- a/deps/v8/src/interpreter/bytecode-array-accessor.h
+++ b/deps/v8/src/interpreter/bytecode-array-accessor.h
@@ -147,6 +147,8 @@ class V8_EXPORT_PRIVATE BytecodeArrayAccessor {
 
   std::ostream& PrintTo(std::ostream& os) const;
 
+  int bytecode_length() const { return bytecode_length_; }
+
  private:
   bool OffsetInBounds() const;
 
@@ -157,6 +159,7 @@ class V8_EXPORT_PRIVATE BytecodeArrayAccessor {
   void UpdateOperandScale();
 
   std::unique_ptr<AbstractBytecodeArray> bytecode_array_;
+  const int bytecode_length_;
   int bytecode_offset_;
   OperandScale operand_scale_;
   int prefix_offset_;
diff --git a/deps/v8/src/interpreter/bytecode-array-builder.cc b/deps/v8/src/interpreter/bytecode-array-builder.cc
index dc41db71c47847..2511c87e3ca25d 100644
--- a/deps/v8/src/interpreter/bytecode-array-builder.cc
+++ b/deps/v8/src/interpreter/bytecode-array-builder.cc
@@ -110,7 +110,7 @@ template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE)
 
 #ifdef DEBUG
 int BytecodeArrayBuilder::CheckBytecodeMatches(BytecodeArray bytecode) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return bytecode_array_writer_.CheckBytecodeMatches(bytecode);
 }
 #endif
@@ -615,8 +615,14 @@ BytecodeArrayBuilder& BytecodeArrayBuilder::LoadLiteral(Smi smi) {
 }
 
 BytecodeArrayBuilder& BytecodeArrayBuilder::LoadLiteral(double value) {
-  size_t entry = GetConstantPoolEntry(value);
-  OutputLdaConstant(entry);
+  // If we can encode the value as a Smi, we should.
+  int smi;
+  if (DoubleToSmiInteger(value, &smi)) {
+    LoadLiteral(Smi::FromInt(smi));
+  } else {
+    size_t entry = GetConstantPoolEntry(value);
+    OutputLdaConstant(entry);
+  }
   return *this;
 }
 
diff --git a/deps/v8/src/interpreter/bytecode-array-iterator.cc b/deps/v8/src/interpreter/bytecode-array-iterator.cc
index 0fc57f85b8f88f..1232777fd11f11 100644
--- a/deps/v8/src/interpreter/bytecode-array-iterator.cc
+++ b/deps/v8/src/interpreter/bytecode-array-iterator.cc
@@ -23,7 +23,7 @@ void BytecodeArrayIterator::Advance() {
 }
 
 bool BytecodeArrayIterator::done() const {
-  return current_offset() >= bytecode_array()->length();
+  return current_offset() >= bytecode_length();
 }
 
 }  // namespace interpreter
diff --git a/deps/v8/src/interpreter/bytecode-array-random-iterator.cc b/deps/v8/src/interpreter/bytecode-array-random-iterator.cc
index 9362232899646a..9c94cc4c84914c 100644
--- a/deps/v8/src/interpreter/bytecode-array-random-iterator.cc
+++ b/deps/v8/src/interpreter/bytecode-array-random-iterator.cc
@@ -10,15 +10,10 @@ namespace v8 {
 namespace internal {
 namespace interpreter {
 
-BytecodeArrayRandomIterator::BytecodeArrayRandomIterator(
-    std::unique_ptr<AbstractBytecodeArray> bytecode_array, Zone* zone)
-    : BytecodeArrayAccessor(std::move(bytecode_array), 0), offsets_(zone) {
-  Initialize();
-}
-
 BytecodeArrayRandomIterator::BytecodeArrayRandomIterator(
     Handle<BytecodeArray> bytecode_array, Zone* zone)
     : BytecodeArrayAccessor(bytecode_array, 0), offsets_(zone) {
+  offsets_.reserve(bytecode_array->length() / 2);
   Initialize();
 }
 
diff --git a/deps/v8/src/interpreter/bytecode-array-random-iterator.h b/deps/v8/src/interpreter/bytecode-array-random-iterator.h
index 99fe758bbb934f..57eb3573ade9ba 100644
--- a/deps/v8/src/interpreter/bytecode-array-random-iterator.h
+++ b/deps/v8/src/interpreter/bytecode-array-random-iterator.h
@@ -18,9 +18,6 @@ namespace interpreter {
 class V8_EXPORT_PRIVATE BytecodeArrayRandomIterator final
     : public BytecodeArrayAccessor {
  public:
-  BytecodeArrayRandomIterator(
-      std::unique_ptr<AbstractBytecodeArray> bytecode_array, Zone* zone);
-
   BytecodeArrayRandomIterator(Handle<BytecodeArray> bytecode_array, Zone* zone);
 
   BytecodeArrayRandomIterator(const BytecodeArrayRandomIterator&) = delete;
diff --git a/deps/v8/src/interpreter/bytecode-generator.cc b/deps/v8/src/interpreter/bytecode-generator.cc
index b6598b7fe09faa..f8d79e7764f11e 100644
--- a/deps/v8/src/interpreter/bytecode-generator.cc
+++ b/deps/v8/src/interpreter/bytecode-generator.cc
@@ -34,7 +34,7 @@ namespace interpreter {
 // Scoped class tracking context objects created by the visitor. Represents
 // mutations of the context chain within the function body, allowing pushing and
 // popping of the current {context_register} during visitation.
-class BytecodeGenerator::ContextScope {
+class V8_NODISCARD BytecodeGenerator::ContextScope {
  public:
   ContextScope(BytecodeGenerator* generator, Scope* scope)
       : generator_(generator),
@@ -98,8 +98,8 @@ class BytecodeGenerator::ContextScope {
 };
 
 // Scoped class for tracking control statements entered by the
-// visitor. The pattern derives AstGraphBuilder::ControlScope.
-class BytecodeGenerator::ControlScope {
+// visitor.
+class V8_NODISCARD BytecodeGenerator::ControlScope {
  public:
   explicit ControlScope(BytecodeGenerator* generator)
       : generator_(generator),
@@ -107,7 +107,7 @@ class BytecodeGenerator::ControlScope {
         context_(generator->execution_context()) {
     generator_->set_execution_control(this);
   }
-  virtual ~ControlScope() { generator_->set_execution_control(outer()); }
+  ~ControlScope() { generator_->set_execution_control(outer()); }
   ControlScope(const ControlScope&) = delete;
   ControlScope& operator=(const ControlScope&) = delete;
 
@@ -162,7 +162,7 @@ class BytecodeGenerator::ControlScope {
 // control-flow commands that cause entry into a finally-block, and re-apply
 // them after again leaving that block. Special tokens are used to identify
 // paths going through the finally-block to dispatch after leaving the block.
-class BytecodeGenerator::ControlScope::DeferredCommands final {
+class V8_NODISCARD BytecodeGenerator::ControlScope::DeferredCommands final {
  public:
   // Fixed value tokens for paths we know we need.
   // Fallthrough is set to -1 to make it the fallthrough case of the jump table,
@@ -550,7 +550,7 @@ void BytecodeGenerator::ControlScope::PopContextToExpectedDepth() {
   }
 }
 
-class BytecodeGenerator::RegisterAllocationScope final {
+class V8_NODISCARD BytecodeGenerator::RegisterAllocationScope final {
  public:
   explicit RegisterAllocationScope(BytecodeGenerator* generator)
       : generator_(generator),
@@ -572,7 +572,7 @@ class BytecodeGenerator::RegisterAllocationScope final {
   int outer_next_register_index_;
 };
 
-class BytecodeGenerator::AccumulatorPreservingScope final {
+class V8_NODISCARD BytecodeGenerator::AccumulatorPreservingScope final {
  public:
   explicit AccumulatorPreservingScope(BytecodeGenerator* generator,
                                       AccumulatorPreservingMode mode)
@@ -603,7 +603,7 @@ class BytecodeGenerator::AccumulatorPreservingScope final {
 
 // Scoped base class for determining how the result of an expression will be
 // used.
-class BytecodeGenerator::ExpressionResultScope {
+class V8_NODISCARD BytecodeGenerator::ExpressionResultScope {
  public:
   ExpressionResultScope(BytecodeGenerator* generator, Expression::Context kind)
       : outer_(generator->execution_result()),
@@ -660,7 +660,8 @@ class BytecodeGenerator::EffectResultScope final
 
 // Scoped class used when the result of the current expression to be
 // evaluated should go into the interpreter's accumulator.
-class BytecodeGenerator::ValueResultScope final : public ExpressionResultScope {
+class V8_NODISCARD BytecodeGenerator::ValueResultScope final
+    : public ExpressionResultScope {
  public:
   explicit ValueResultScope(BytecodeGenerator* generator)
       : ExpressionResultScope(generator, Expression::kValue) {}
@@ -668,7 +669,8 @@ class BytecodeGenerator::ValueResultScope final : public ExpressionResultScope {
 
 // Scoped class used when the result of the current expression to be
 // evaluated is only tested with jumps to two branches.
-class BytecodeGenerator::TestResultScope final : public ExpressionResultScope {
+class V8_NODISCARD BytecodeGenerator::TestResultScope final
+    : public ExpressionResultScope {
  public:
   TestResultScope(BytecodeGenerator* generator, BytecodeLabels* then_labels,
                   BytecodeLabels* else_labels, TestFallthrough fallthrough)
@@ -837,7 +839,7 @@ class BytecodeGenerator::TopLevelDeclarationsBuilder final : public ZoneObject {
   bool processed_ = false;
 };
 
-class BytecodeGenerator::CurrentScope final {
+class V8_NODISCARD BytecodeGenerator::CurrentScope final {
  public:
   CurrentScope(BytecodeGenerator* generator, Scope* scope)
       : generator_(generator), outer_scope_(generator->current_scope()) {
@@ -941,7 +943,7 @@ class BytecodeGenerator::IteratorRecord final {
   Register next_;
 };
 
-class BytecodeGenerator::OptionalChainNullLabelScope final {
+class V8_NODISCARD BytecodeGenerator::OptionalChainNullLabelScope final {
  public:
   explicit OptionalChainNullLabelScope(BytecodeGenerator* bytecode_generator)
       : bytecode_generator_(bytecode_generator),
@@ -966,7 +968,7 @@ class BytecodeGenerator::OptionalChainNullLabelScope final {
 // It should be constructed iff a (conceptual) back edge should be produced. In
 // the case of creating a LoopBuilder but never emitting the loop, it is valid
 // to skip the creation of LoopScope.
-class BytecodeGenerator::LoopScope final {
+class V8_NODISCARD BytecodeGenerator::LoopScope final {
  public:
   explicit LoopScope(BytecodeGenerator* bytecode_generator, LoopBuilder* loop)
       : bytecode_generator_(bytecode_generator),
@@ -1103,7 +1105,7 @@ struct NullContextScopeHelper<Isolate> {
 
 template <>
 struct NullContextScopeHelper<LocalIsolate> {
-  class DummyNullContextScope {
+  class V8_NODISCARD DummyNullContextScope {
    public:
     explicit DummyNullContextScope(LocalIsolate*) {}
   };
@@ -1280,7 +1282,7 @@ bool NeedsContextInitialization(DeclarationScope* scope) {
 }  // namespace
 
 void BytecodeGenerator::GenerateBytecode(uintptr_t stack_limit) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowHandleAllocation no_handles;
   DisallowHandleDereference no_deref;
 
@@ -3010,7 +3012,9 @@ void BytecodeGenerator::BuildCreateArrayLiteral(
     if (current != end) {
       // If there are remaining elements, prepare the index register
       // to store the next element, which comes from the first spread.
-      builder()->LoadLiteral(array_index).StoreAccumulatorInRegister(index);
+      builder()
+          ->LoadLiteral(Smi::FromInt(array_index))
+          .StoreAccumulatorInRegister(index);
     }
   } else {
     // In other cases, we prepare an empty array to be filled in below.
@@ -4595,11 +4599,8 @@ void BytecodeGenerator::VisitThrow(Throw* expr) {
 void BytecodeGenerator::VisitPropertyLoad(Register obj, Property* property) {
   if (property->is_optional_chain_link()) {
     DCHECK_NOT_NULL(optional_chaining_null_labels_);
-    int right_range =
-        AllocateBlockCoverageSlotIfEnabled(property, SourceRangeKind::kRight);
     builder()->LoadAccumulatorWithRegister(obj).JumpIfUndefinedOrNull(
         optional_chaining_null_labels_->New());
-    BuildIncrementBlockCoverageCounterIfEnabled(right_range);
   }
 
   AssignType property_kind = Property::GetAssignType(property);
@@ -4940,11 +4941,8 @@ void BytecodeGenerator::VisitCall(Call* expr) {
 
   if (expr->is_optional_chain_link()) {
     DCHECK_NOT_NULL(optional_chaining_null_labels_);
-    int right_range =
-        AllocateBlockCoverageSlotIfEnabled(expr, SourceRangeKind::kRight);
     builder()->LoadAccumulatorWithRegister(callee).JumpIfUndefinedOrNull(
         optional_chaining_null_labels_->New());
-    BuildIncrementBlockCoverageCounterIfEnabled(right_range);
   }
 
   // Evaluate all arguments to the function call and store in sequential args
@@ -5223,10 +5221,7 @@ void BytecodeGenerator::VisitDelete(UnaryOperation* unary) {
       OptionalChainNullLabelScope label_scope(this);
       VisitForAccumulatorValue(property->obj());
       if (property->is_optional_chain_link()) {
-        int right_range = AllocateBlockCoverageSlotIfEnabled(
-            property, SourceRangeKind::kRight);
         builder()->JumpIfUndefinedOrNull(label_scope.labels()->New());
-        BuildIncrementBlockCoverageCounterIfEnabled(right_range);
       }
       Register object = register_allocator()->NewRegister();
       builder()->StoreAccumulatorInRegister(object);
@@ -5627,7 +5622,7 @@ void BytecodeGenerator::VisitEmptyParentheses(EmptyParentheses* expr) {
 
 void BytecodeGenerator::VisitImportCallExpression(ImportCallExpression* expr) {
   RegisterList args = register_allocator()->NewRegisterList(2);
-  VisitForRegisterValue(expr->argument(), args[1]);
+  VisitForRegisterValue(expr->specifier(), args[1]);
   builder()
       ->MoveRegister(Register::function_closure(), args[0])
       .CallRuntime(Runtime::kDynamicImportCall, args);
diff --git a/deps/v8/src/interpreter/bytecodes.cc b/deps/v8/src/interpreter/bytecodes.cc
index 88e80b961359c0..0eab890d1e46b3 100644
--- a/deps/v8/src/interpreter/bytecodes.cc
+++ b/deps/v8/src/interpreter/bytecodes.cc
@@ -274,7 +274,9 @@ bool Bytecodes::IsStarLookahead(Bytecode bytecode, OperandScale operand_scale) {
       case Bytecode::kLdaNamedProperty:
       case Bytecode::kLdaKeyedProperty:
       case Bytecode::kLdaContextSlot:
+      case Bytecode::kLdaImmutableContextSlot:
       case Bytecode::kLdaCurrentContextSlot:
+      case Bytecode::kLdaImmutableCurrentContextSlot:
       case Bytecode::kAdd:
       case Bytecode::kSub:
       case Bytecode::kMul:
@@ -295,6 +297,10 @@ bool Bytecodes::IsStarLookahead(Bytecode bytecode, OperandScale operand_scale) {
       case Bytecode::kCallUndefinedReceiver2:
       case Bytecode::kConstruct:
       case Bytecode::kConstructWithSpread:
+      case Bytecode::kCreateObjectLiteral:
+      case Bytecode::kCreateArrayLiteral:
+      case Bytecode::kThrowReferenceErrorIfHole:
+      case Bytecode::kGetTemplateObject:
         return true;
       default:
         return false;
diff --git a/deps/v8/src/interpreter/control-flow-builders.cc b/deps/v8/src/interpreter/control-flow-builders.cc
index 7062550d301b99..49548c42a2297d 100644
--- a/deps/v8/src/interpreter/control-flow-builders.cc
+++ b/deps/v8/src/interpreter/control-flow-builders.cc
@@ -79,7 +79,7 @@ void LoopBuilder::JumpToHeader(int loop_depth, LoopBuilder* const parent_loop) {
   } else {
     // Pass the proper loop nesting level to the backwards branch, to trigger
     // on-stack replacement when armed for the given loop nesting depth.
-    int level = Min(loop_depth, AbstractCode::kMaxLoopNestingMarker - 1);
+    int level = std::min(loop_depth, AbstractCode::kMaxLoopNestingMarker - 1);
     // Loop must have closed form, i.e. all loop elements are within the loop,
     // the loop header precedes the body and next elements in the loop.
     builder()->JumpLoop(&loop_header_, level, source_position_);
diff --git a/deps/v8/src/interpreter/control-flow-builders.h b/deps/v8/src/interpreter/control-flow-builders.h
index ac68947e1a1ffa..e9d0c181a12b30 100644
--- a/deps/v8/src/interpreter/control-flow-builders.h
+++ b/deps/v8/src/interpreter/control-flow-builders.h
@@ -21,6 +21,8 @@ class V8_EXPORT_PRIVATE ControlFlowBuilder {
  public:
   explicit ControlFlowBuilder(BytecodeArrayBuilder* builder)
       : builder_(builder) {}
+  ControlFlowBuilder(const ControlFlowBuilder&) = delete;
+  ControlFlowBuilder& operator=(const ControlFlowBuilder&) = delete;
   virtual ~ControlFlowBuilder() = default;
 
  protected:
@@ -28,8 +30,6 @@ class V8_EXPORT_PRIVATE ControlFlowBuilder {
 
  private:
   BytecodeArrayBuilder* builder_;
-
-  DISALLOW_COPY_AND_ASSIGN(ControlFlowBuilder);
 };
 
 class V8_EXPORT_PRIVATE BreakableControlFlowBuilder
diff --git a/deps/v8/src/interpreter/interpreter.cc b/deps/v8/src/interpreter/interpreter.cc
index 3a6cdff8ade67f..40fdc603376555 100644
--- a/deps/v8/src/interpreter/interpreter.cc
+++ b/deps/v8/src/interpreter/interpreter.cc
@@ -296,7 +296,7 @@ Interpreter::NewSourcePositionCollectionJob(
   auto job = std::make_unique<InterpreterCompilationJob>(parse_info, literal,
                                                          allocator, nullptr);
   job->compilation_info()->SetBytecodeArray(existing_bytecode);
-  return std::unique_ptr<UnoptimizedCompilationJob> { static_cast<UnoptimizedCompilationJob*>(job.release()) };
+  return job;
 }
 
 void Interpreter::ForEachBytecode(
diff --git a/deps/v8/src/json/json-parser.cc b/deps/v8/src/json/json-parser.cc
index 13d4d6c91d94c3..c0109bb77a01f7 100644
--- a/deps/v8/src/json/json-parser.cc
+++ b/deps/v8/src/json/json-parser.cc
@@ -223,7 +223,7 @@ JsonParser<Char>::JsonParser(Isolate* isolate, Handle<String> source)
         static_cast<const Char*>(SeqExternalString::cast(*source_).GetChars());
     chars_may_relocate_ = false;
   } else {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     isolate->heap()->AddGCEpilogueCallback(UpdatePointersCallback,
                                            v8::kGCTypeAll, this);
     chars_ = SeqString::cast(*source_).GetChars(no_gc);
@@ -344,7 +344,7 @@ uc32 JsonParser<Char>::ScanUnicodeCharacter() {
 template <typename Char>
 JsonString JsonParser<Char>::ScanJsonPropertyKey(JsonContinuation* cont) {
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     const Char* start = cursor_;
     uc32 first = CurrentCharacter();
     if (first == '\\' && NextCharacter() == 'u') first = ScanUnicodeCharacter();
@@ -368,7 +368,7 @@ JsonString JsonParser<Char>::ScanJsonPropertyKey(JsonContinuation* cont) {
             advance();
             // Record element information.
             cont->elements++;
-            cont->max_index = Max(cont->max_index, index);
+            cont->max_index = std::max(cont->max_index, index);
             return JsonString(index);
           }
 
@@ -431,7 +431,7 @@ Handle<Object> JsonParser<Char>::BuildJsonObject(
     } else {
       Handle<FixedArray> elms =
           factory()->NewFixedArrayWithHoles(cont.max_index + 1);
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       WriteBarrierMode mode = elms->GetWriteBarrierMode(no_gc);
       DCHECK_EQ(HOLEY_ELEMENTS, map->elements_kind());
 
@@ -468,7 +468,7 @@ Handle<Object> JsonParser<Char>::BuildJsonObject(
                                   .GetKey(descriptor_index)),
                  isolate_);
     } else {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       TransitionsAccessor transitions(isolate(), *map, &no_gc);
       expected = transitions.ExpectedTransitionKey();
       if (!expected.is_null()) {
@@ -555,7 +555,7 @@ Handle<Object> JsonParser<Char>::BuildJsonObject(
 
   {
     descriptor = 0;
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     WriteBarrierMode mode = object->GetWriteBarrierMode(no_gc);
     Address mutable_double_address =
         mutable_double_buffer.is_null()
@@ -626,7 +626,7 @@ Handle<Object> JsonParser<Char>::BuildJsonObject(
       Address end =
           reinterpret_cast<Address>(mutable_double_buffer->GetDataEndAddress());
       if (kTaggedSize != kDoubleSize) {
-        DCHECK_EQ(Min(filler_address, mutable_double_address), end);
+        DCHECK_EQ(std::min(filler_address, mutable_double_address), end);
         DCHECK_GE(filler_address, end);
         DCHECK_GE(mutable_double_address, end);
       } else {
@@ -677,13 +677,13 @@ Handle<Object> JsonParser<Char>::BuildJsonArray(
 
   Handle<JSArray> array = factory()->NewJSArray(kind, length, length);
   if (kind == PACKED_DOUBLE_ELEMENTS) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedDoubleArray elements = FixedDoubleArray::cast(array->elements());
     for (int i = 0; i < length; i++) {
       elements.set(i, element_stack[start + i]->Number());
     }
   } else {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArray elements = FixedArray::cast(array->elements());
     WriteBarrierMode mode = kind == PACKED_SMI_ELEMENTS
                                 ? SKIP_WRITE_BARRIER
@@ -897,7 +897,7 @@ Handle<Object> JsonParser<Char>::ParseJsonNumber() {
 
   {
     const Char* start = cursor_;
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
 
     uc32 c = *cursor_;
     if (c == '-') {
@@ -913,7 +913,7 @@ Handle<Object> JsonParser<Char>::ParseJsonNumber() {
                           static_cast<int32_t>(unibrow::Latin1::kMaxChar)) &&
           IsNumberPart(character_json_scan_flags[c])) {
         if (V8_UNLIKELY(IsDecimalDigit(c))) {
-          AllowHeapAllocation allow_before_exception;
+          AllowGarbageCollection allow_before_exception;
           ReportUnexpectedToken(JsonToken::NUMBER);
           return handle(Smi::FromInt(0), isolate_);
         }
@@ -924,7 +924,7 @@ Handle<Object> JsonParser<Char>::ParseJsonNumber() {
       const Char* smi_start = cursor_;
       AdvanceToNonDecimal();
       if (V8_UNLIKELY(smi_start == cursor_)) {
-        AllowHeapAllocation allow_before_exception;
+        AllowGarbageCollection allow_before_exception;
         ReportUnexpectedCharacter(CurrentCharacter());
         return handle(Smi::FromInt(0), isolate_);
       }
@@ -950,7 +950,7 @@ Handle<Object> JsonParser<Char>::ParseJsonNumber() {
     if (CurrentCharacter() == '.') {
       uc32 c = NextCharacter();
       if (!IsDecimalDigit(c)) {
-        AllowHeapAllocation allow_before_exception;
+        AllowGarbageCollection allow_before_exception;
         ReportUnexpectedCharacter(c);
         return handle(Smi::FromInt(0), isolate_);
       }
@@ -961,7 +961,7 @@ Handle<Object> JsonParser<Char>::ParseJsonNumber() {
       uc32 c = NextCharacter();
       if (c == '-' || c == '+') c = NextCharacter();
       if (!IsDecimalDigit(c)) {
-        AllowHeapAllocation allow_before_exception;
+        AllowGarbageCollection allow_before_exception;
         ReportUnexpectedCharacter(c);
         return handle(Smi::FromInt(0), isolate_);
       }
@@ -984,16 +984,7 @@ namespace {
 template <typename Char>
 bool Matches(const Vector<const Char>& chars, Handle<String> string) {
   DCHECK(!string.is_null());
-
-  if (chars.length() != string->length()) return false;
-
-  DisallowHeapAllocation no_gc;
-  if (string->IsOneByteRepresentation()) {
-    const uint8_t* string_data = string->GetChars<uint8_t>(no_gc);
-    return CompareChars(chars.begin(), string_data, chars.length()) == 0;
-  }
-  const uint16_t* string_data = string->GetChars<uint16_t>(no_gc);
-  return CompareChars(chars.begin(), string_data, chars.length()) == 0;
+  return string->IsEqualTo(chars);
 }
 
 }  // namespace
@@ -1005,7 +996,7 @@ Handle<String> JsonParser<Char>::DecodeString(
     Handle<String> hint) {
   using SinkChar = typename SinkSeqString::Char;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     SinkChar* dest = intermediate->GetChars(no_gc);
     if (!string.has_escape()) {
       DCHECK(!string.internalize());
@@ -1120,7 +1111,7 @@ void JsonParser<Char>::DecodeString(SinkChar* sink, int start, int length) {
 
 template <typename Char>
 JsonString JsonParser<Char>::ScanJsonString(bool needs_internalization) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int start = position();
   int offset = start;
   bool has_escape = false;
@@ -1136,7 +1127,7 @@ JsonString JsonParser<Char>::ScanJsonString(bool needs_internalization) {
     });
 
     if (V8_UNLIKELY(is_at_end())) {
-      AllowHeapAllocation allow_before_exception;
+      AllowGarbageCollection allow_before_exception;
       ReportUnexpectedCharacter(kEndOfString);
       break;
     }
@@ -1156,7 +1147,7 @@ JsonString JsonParser<Char>::ScanJsonString(bool needs_internalization) {
       uc32 c = NextCharacter();
       if (V8_UNLIKELY(!base::IsInRange(
               c, 0, static_cast<int32_t>(unibrow::Latin1::kMaxChar)))) {
-        AllowHeapAllocation allow_before_exception;
+        AllowGarbageCollection allow_before_exception;
         ReportUnexpectedCharacter(c);
         break;
       }
@@ -1174,7 +1165,7 @@ JsonString JsonParser<Char>::ScanJsonString(bool needs_internalization) {
         case EscapeKind::kUnicode: {
           uc32 value = ScanUnicodeCharacter();
           if (value == kInvalidUnicodeCharacter) {
-            AllowHeapAllocation allow_before_exception;
+            AllowGarbageCollection allow_before_exception;
             ReportUnexpectedCharacter(CurrentCharacter());
             return JsonString();
           }
@@ -1187,7 +1178,7 @@ JsonString JsonParser<Char>::ScanJsonString(bool needs_internalization) {
         }
 
         case EscapeKind::kIllegal:
-          AllowHeapAllocation allow_before_exception;
+          AllowGarbageCollection allow_before_exception;
           ReportUnexpectedCharacter(c);
           return JsonString();
       }
@@ -1197,7 +1188,7 @@ JsonString JsonParser<Char>::ScanJsonString(bool needs_internalization) {
     }
 
     DCHECK_LT(*cursor_, 0x20);
-    AllowHeapAllocation allow_before_exception;
+    AllowGarbageCollection allow_before_exception;
     ReportUnexpectedCharacter(*cursor_);
     break;
   }
diff --git a/deps/v8/src/json/json-parser.h b/deps/v8/src/json/json-parser.h
index 6219cd3b5d1985..22aa530a95c574 100644
--- a/deps/v8/src/json/json-parser.h
+++ b/deps/v8/src/json/json-parser.h
@@ -231,13 +231,13 @@ class JsonParser final {
     STATIC_ASSERT(N > 2);
     size_t remaining = static_cast<size_t>(end_ - cursor_);
     if (V8_LIKELY(remaining >= N - 1 &&
-                  CompareChars(s + 1, cursor_ + 1, N - 2) == 0)) {
+                  CompareCharsEqual(s + 1, cursor_ + 1, N - 2))) {
       cursor_ += N - 1;
       return;
     }
 
     cursor_++;
-    for (size_t i = 0; i < Min(N - 2, remaining - 1); i++) {
+    for (size_t i = 0; i < std::min(N - 2, remaining - 1); i++) {
       if (*(s + 1 + i) != *cursor_) {
         ReportUnexpectedCharacter(*cursor_);
         return;
@@ -309,7 +309,7 @@ class JsonParser final {
   }
 
   void UpdatePointers() {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     const Char* chars = Handle<SeqString>::cast(source_)->GetChars(no_gc);
     if (chars_ != chars) {
       size_t position = cursor_ - chars_;
@@ -342,7 +342,7 @@ class JsonParser final {
   // Cached pointer to the raw chars in source. In case source is on-heap, we
   // register an UpdatePointers callback. For this reason, chars_, cursor_ and
   // end_ should never be locally cached across a possible allocation. The scope
-  // in which we cache chars has to be guarded by a DisallowHeapAllocation
+  // in which we cache chars has to be guarded by a DisallowGarbageCollection
   // scope.
   const Char* cursor_;
   const Char* end_;
diff --git a/deps/v8/src/json/json-stringifier.cc b/deps/v8/src/json/json-stringifier.cc
index 0dabdd3082e83c..a7ff0809d003f2 100644
--- a/deps/v8/src/json/json-stringifier.cc
+++ b/deps/v8/src/json/json-stringifier.cc
@@ -381,10 +381,10 @@ JsonStringifier::Result JsonStringifier::StackPush(Handle<Object> object,
   }
 
   {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     for (size_t i = 0; i < stack_.size(); ++i) {
       if (*stack_[i].second == *object) {
-        AllowHeapAllocation allow_to_return_error;
+        AllowGarbageCollection allow_to_return_error;
         Handle<String> circle_description =
             ConstructCircularStructureErrorMessage(key, i);
         Handle<Object> error = factory()->NewTypeError(
@@ -936,7 +936,7 @@ void JsonStringifier::SerializeString_(Handle<String> string) {
   // We might be able to fit the whole escaped string in the current string
   // part, or we might need to allocate.
   if (int worst_case_length = builder_.EscapedLengthIfCurrentPartFits(length)) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Vector<const SrcChar> vector = string->GetCharVector<SrcChar>(no_gc);
     IncrementalStringBuilder::NoExtendBuilder<DestChar> no_extend(
         &builder_, worst_case_length, no_gc);
diff --git a/deps/v8/src/libplatform/default-foreground-task-runner.h b/deps/v8/src/libplatform/default-foreground-task-runner.h
index 19f3b9f667a35d..9e6688c8ca07d7 100644
--- a/deps/v8/src/libplatform/default-foreground-task-runner.h
+++ b/deps/v8/src/libplatform/default-foreground-task-runner.h
@@ -20,7 +20,7 @@ class V8_PLATFORM_EXPORT DefaultForegroundTaskRunner
     : public NON_EXPORTED_BASE(TaskRunner) {
  public:
   using TimeFunction = double (*)();
-  class RunTaskScope {
+  class V8_NODISCARD RunTaskScope {
    public:
     explicit RunTaskScope(
         std::shared_ptr<DefaultForegroundTaskRunner> task_runner);
diff --git a/deps/v8/src/libplatform/default-job.cc b/deps/v8/src/libplatform/default-job.cc
index 8a8064c24c9a05..b54764fbdf7716 100644
--- a/deps/v8/src/libplatform/default-job.cc
+++ b/deps/v8/src/libplatform/default-job.cc
@@ -123,7 +123,6 @@ void DefaultJobState::CancelAndWait() {
 }
 
 void DefaultJobState::CancelAndDetach() {
-  base::MutexGuard guard(&mutex_);
   is_canceled_.store(true, std::memory_order_relaxed);
 }
 
diff --git a/deps/v8/src/libplatform/default-job.h b/deps/v8/src/libplatform/default-job.h
index 082fa1ef6fd29a..3ced65d6da7109 100644
--- a/deps/v8/src/libplatform/default-job.h
+++ b/deps/v8/src/libplatform/default-job.h
@@ -106,6 +106,9 @@ class V8_PLATFORM_EXPORT DefaultJobHandle : public JobHandle {
   explicit DefaultJobHandle(std::shared_ptr<DefaultJobState> state);
   ~DefaultJobHandle() override;
 
+  DefaultJobHandle(const DefaultJobHandle&) = delete;
+  DefaultJobHandle& operator=(const DefaultJobHandle&) = delete;
+
   void NotifyConcurrencyIncrease() override {
     state_->NotifyConcurrencyIncrease();
   }
@@ -113,9 +116,7 @@ class V8_PLATFORM_EXPORT DefaultJobHandle : public JobHandle {
   void Join() override;
   void Cancel() override;
   void CancelAndDetach() override;
-  bool IsCompleted() override { return !IsActive(); }
   bool IsActive() override;
-  bool IsRunning() override { return IsValid(); }
   bool IsValid() override { return state_ != nullptr; }
 
   bool UpdatePriorityEnabled() const override { return true; }
@@ -124,8 +125,6 @@ class V8_PLATFORM_EXPORT DefaultJobHandle : public JobHandle {
 
  private:
   std::shared_ptr<DefaultJobState> state_;
-
-  DISALLOW_COPY_AND_ASSIGN(DefaultJobHandle);
 };
 
 class DefaultJobWorker : public Task {
@@ -134,6 +133,9 @@ class DefaultJobWorker : public Task {
       : state_(std::move(state)), job_task_(job_task) {}
   ~DefaultJobWorker() override = default;
 
+  DefaultJobWorker(const DefaultJobWorker&) = delete;
+  DefaultJobWorker& operator=(const DefaultJobWorker&) = delete;
+
   void Run() override {
     auto shared_state = state_.lock();
     if (!shared_state) return;
@@ -151,8 +153,6 @@ class DefaultJobWorker : public Task {
 
   std::weak_ptr<DefaultJobState> state_;
   JobTask* job_task_;
-
-  DISALLOW_COPY_AND_ASSIGN(DefaultJobWorker);
 };
 
 }  // namespace platform
diff --git a/deps/v8/src/libplatform/default-platform.cc b/deps/v8/src/libplatform/default-platform.cc
index 19313e76d21e96..66057e1a398be3 100644
--- a/deps/v8/src/libplatform/default-platform.cc
+++ b/deps/v8/src/libplatform/default-platform.cc
@@ -30,6 +30,16 @@ void PrintStackTrace() {
   v8::base::debug::DisableSignalStackDump();
 }
 
+constexpr int kMaxThreadPoolSize = 16;
+
+int GetActualThreadPoolSize(int thread_pool_size) {
+  DCHECK_GE(thread_pool_size, 0);
+  if (thread_pool_size < 1) {
+    thread_pool_size = base::SysInfo::NumberOfProcessors() - 1;
+  }
+  return std::max(std::min(thread_pool_size, kMaxThreadPoolSize), 1);
+}
+
 }  // namespace
 
 std::unique_ptr<v8::Platform> NewDefaultPlatform(
@@ -39,9 +49,21 @@ std::unique_ptr<v8::Platform> NewDefaultPlatform(
   if (in_process_stack_dumping == InProcessStackDumping::kEnabled) {
     v8::base::debug::EnableInProcessStackDumping();
   }
+  thread_pool_size = GetActualThreadPoolSize(thread_pool_size);
   auto platform = std::make_unique<DefaultPlatform>(
       thread_pool_size, idle_task_support, std::move(tracing_controller));
-  platform->EnsureBackgroundTaskRunnerInitialized();
+  return platform;
+}
+
+std::unique_ptr<v8::Platform> NewSingleThreadedDefaultPlatform(
+    IdleTaskSupport idle_task_support,
+    InProcessStackDumping in_process_stack_dumping,
+    std::unique_ptr<v8::TracingController> tracing_controller) {
+  if (in_process_stack_dumping == InProcessStackDumping::kEnabled) {
+    v8::base::debug::EnableInProcessStackDumping();
+  }
+  auto platform = std::make_unique<DefaultPlatform>(
+      0, idle_task_support, std::move(tracing_controller));
   return platform;
 }
 
@@ -75,22 +97,10 @@ void NotifyIsolateShutdown(v8::Platform* platform, Isolate* isolate) {
   static_cast<DefaultPlatform*>(platform)->NotifyIsolateShutdown(isolate);
 }
 
-namespace {
-constexpr int kMaxThreadPoolSize = 16;
-
-int GetActualThreadPoolSize(int thread_pool_size) {
-  DCHECK_GE(thread_pool_size, 0);
-  if (thread_pool_size < 1) {
-    thread_pool_size = base::SysInfo::NumberOfProcessors() - 1;
-  }
-  return std::max(std::min(thread_pool_size, kMaxThreadPoolSize), 1);
-}
-}  // namespace
-
 DefaultPlatform::DefaultPlatform(
     int thread_pool_size, IdleTaskSupport idle_task_support,
     std::unique_ptr<v8::TracingController> tracing_controller)
-    : thread_pool_size_(GetActualThreadPoolSize(thread_pool_size)),
+    : thread_pool_size_(thread_pool_size),
       idle_task_support_(idle_task_support),
       tracing_controller_(std::move(tracing_controller)),
       page_allocator_(std::make_unique<v8::base::PageAllocator>()) {
@@ -101,6 +111,9 @@ DefaultPlatform::DefaultPlatform(
 #endif
     tracing_controller_.reset(controller);
   }
+  if (thread_pool_size_ > 0) {
+    EnsureBackgroundTaskRunnerInitialized();
+  }
 }
 
 DefaultPlatform::~DefaultPlatform() {
@@ -121,14 +134,13 @@ double DefaultTimeFunction() {
 }  // namespace
 
 void DefaultPlatform::EnsureBackgroundTaskRunnerInitialized() {
-  base::MutexGuard guard(&lock_);
-  if (!worker_threads_task_runner_) {
-    worker_threads_task_runner_ =
-        std::make_shared<DefaultWorkerThreadsTaskRunner>(
-            thread_pool_size_, time_function_for_testing_
-                                   ? time_function_for_testing_
-                                   : DefaultTimeFunction);
-  }
+  DCHECK_NULL(worker_threads_task_runner_);
+  worker_threads_task_runner_ =
+      std::make_shared<DefaultWorkerThreadsTaskRunner>(
+          thread_pool_size_, time_function_for_testing_
+                                 ? time_function_for_testing_
+                                 : DefaultTimeFunction);
+  DCHECK_NOT_NULL(worker_threads_task_runner_);
 }
 
 void DefaultPlatform::SetTimeFunctionForTesting(
@@ -196,13 +208,23 @@ std::shared_ptr<TaskRunner> DefaultPlatform::GetForegroundTaskRunner(
 }
 
 void DefaultPlatform::CallOnWorkerThread(std::unique_ptr<Task> task) {
-  EnsureBackgroundTaskRunnerInitialized();
+  // If this DCHECK fires, then this means that either
+  // - V8 is running without the --single-threaded flag but
+  //   but the platform was created as a single-threaded platform.
+  // - or some component in V8 is ignoring --single-threaded
+  //   and posting a background task.
+  DCHECK_NOT_NULL(worker_threads_task_runner_);
   worker_threads_task_runner_->PostTask(std::move(task));
 }
 
 void DefaultPlatform::CallDelayedOnWorkerThread(std::unique_ptr<Task> task,
                                                 double delay_in_seconds) {
-  EnsureBackgroundTaskRunnerInitialized();
+  // If this DCHECK fires, then this means that either
+  // - V8 is running without the --single-threaded flag but
+  //   but the platform was created as a single-threaded platform.
+  // - or some component in V8 is ignoring --single-threaded
+  //   and posting a background task.
+  DCHECK_NOT_NULL(worker_threads_task_runner_);
   worker_threads_task_runner_->PostDelayedTask(std::move(task),
                                                delay_in_seconds);
 }
diff --git a/deps/v8/src/libplatform/default-platform.h b/deps/v8/src/libplatform/default-platform.h
index b533dc39c1e9ff..98edfed7c9f07e 100644
--- a/deps/v8/src/libplatform/default-platform.h
+++ b/deps/v8/src/libplatform/default-platform.h
@@ -35,6 +35,9 @@ class V8_PLATFORM_EXPORT DefaultPlatform : public NON_EXPORTED_BASE(Platform) {
 
   ~DefaultPlatform() override;
 
+  DefaultPlatform(const DefaultPlatform&) = delete;
+  DefaultPlatform& operator=(const DefaultPlatform&) = delete;
+
   void EnsureBackgroundTaskRunnerInitialized();
 
   bool PumpMessageLoop(
@@ -80,7 +83,6 @@ class V8_PLATFORM_EXPORT DefaultPlatform : public NON_EXPORTED_BASE(Platform) {
   std::unique_ptr<PageAllocator> page_allocator_;
 
   TimeFunction time_function_for_testing_ = nullptr;
-  DISALLOW_COPY_AND_ASSIGN(DefaultPlatform);
 };
 
 }  // namespace platform
diff --git a/deps/v8/src/libplatform/default-worker-threads-task-runner.h b/deps/v8/src/libplatform/default-worker-threads-task-runner.h
index dd3c9e694b14f4..cce1a5cbeb0dd4 100644
--- a/deps/v8/src/libplatform/default-worker-threads-task-runner.h
+++ b/deps/v8/src/libplatform/default-worker-threads-task-runner.h
@@ -47,13 +47,14 @@ class V8_PLATFORM_EXPORT DefaultWorkerThreadsTaskRunner
     explicit WorkerThread(DefaultWorkerThreadsTaskRunner* runner);
     ~WorkerThread() override;
 
+    WorkerThread(const WorkerThread&) = delete;
+    WorkerThread& operator=(const WorkerThread&) = delete;
+
     // This thread attempts to get tasks in a loop from |runner_| and run them.
     void Run() override;
 
    private:
     DefaultWorkerThreadsTaskRunner* runner_;
-
-    DISALLOW_COPY_AND_ASSIGN(WorkerThread);
   };
 
   // Called by the WorkerThread. Gets the next take (delayed or immediate) to be
diff --git a/deps/v8/src/libplatform/delayed-task-queue.h b/deps/v8/src/libplatform/delayed-task-queue.h
index 9fec948b86a56e..135ef53efee687 100644
--- a/deps/v8/src/libplatform/delayed-task-queue.h
+++ b/deps/v8/src/libplatform/delayed-task-queue.h
@@ -30,6 +30,9 @@ class V8_PLATFORM_EXPORT DelayedTaskQueue {
   explicit DelayedTaskQueue(TimeFunction time_function);
   ~DelayedTaskQueue();
 
+  DelayedTaskQueue(const DelayedTaskQueue&) = delete;
+  DelayedTaskQueue& operator=(const DelayedTaskQueue&) = delete;
+
   double MonotonicallyIncreasingTime();
 
   // Appends an immediate task to the queue. The queue takes ownership of
@@ -59,8 +62,6 @@ class V8_PLATFORM_EXPORT DelayedTaskQueue {
   std::multimap<double, std::unique_ptr<Task>> delayed_task_queue_;
   bool terminated_ = false;
   TimeFunction time_function_;
-
-  DISALLOW_COPY_AND_ASSIGN(DelayedTaskQueue);
 };
 
 }  // namespace platform
diff --git a/deps/v8/src/libplatform/task-queue.h b/deps/v8/src/libplatform/task-queue.h
index fbad3a8adf9290..55748a382e78cc 100644
--- a/deps/v8/src/libplatform/task-queue.h
+++ b/deps/v8/src/libplatform/task-queue.h
@@ -25,6 +25,9 @@ class V8_PLATFORM_EXPORT TaskQueue {
   TaskQueue();
   ~TaskQueue();
 
+  TaskQueue(const TaskQueue&) = delete;
+  TaskQueue& operator=(const TaskQueue&) = delete;
+
   // Appends a task to the queue. The queue takes ownership of |task|.
   void Append(std::unique_ptr<Task> task);
 
@@ -44,8 +47,6 @@ class V8_PLATFORM_EXPORT TaskQueue {
   base::Mutex lock_;
   std::queue<std::unique_ptr<Task>> task_queue_;
   bool terminated_;
-
-  DISALLOW_COPY_AND_ASSIGN(TaskQueue);
 };
 
 }  // namespace platform
diff --git a/deps/v8/src/libplatform/tracing/recorder-default.cc b/deps/v8/src/libplatform/tracing/recorder-default.cc
new file mode 100644
index 00000000000000..46e0cbb8e26c79
--- /dev/null
+++ b/deps/v8/src/libplatform/tracing/recorder-default.cc
@@ -0,0 +1,25 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#ifndef V8_LIBPLATFORM_TRACING_RECORDER_DEFAULT_H_
+#define V8_LIBPLATFORM_TRACING_RECORDER_DEFAULT_H_
+
+#include "src/libplatform/tracing/recorder.h"
+
+namespace v8 {
+namespace platform {
+namespace tracing {
+
+Recorder::Recorder() {}
+Recorder::~Recorder() {}
+
+bool Recorder::IsEnabled() { return false; }
+bool Recorder::IsEnabled(const uint8_t level) { return false; }
+
+void Recorder::AddEvent(TraceObject* trace_event) {}
+
+}  // namespace tracing
+}  // namespace platform
+}  // namespace v8
+
+#endif  // V8_LIBPLATFORM_TRACING_RECORDER_DEFAULT_H_
diff --git a/deps/v8/src/libplatform/tracing/recorder-win.cc b/deps/v8/src/libplatform/tracing/recorder-win.cc
new file mode 100644
index 00000000000000..b15704c050521d
--- /dev/null
+++ b/deps/v8/src/libplatform/tracing/recorder-win.cc
@@ -0,0 +1,72 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#ifndef V8_LIBPLATFORM_TRACING_RECORDER_WIN_H_
+#define V8_LIBPLATFORM_TRACING_RECORDER_WIN_H_
+
+#include <windows.h>
+#include <TraceLoggingProvider.h>
+
+#include "src/libplatform/tracing/recorder.h"
+
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wc++98-compat-extra-semi"
+#endif
+
+#ifndef V8_ETW_GUID
+#define V8_ETW_GUID \
+  0x57277741, 0x3638, 0x4A4B, 0xBD, 0xBA, 0x0A, 0xC6, 0xE4, 0x5D, 0xA5, 0x6C
+#endif
+
+namespace v8 {
+namespace platform {
+namespace tracing {
+
+TRACELOGGING_DECLARE_PROVIDER(g_v8Provider);
+
+TRACELOGGING_DEFINE_PROVIDER(g_v8Provider, "V8.js", (V8_ETW_GUID));
+
+Recorder::Recorder() { TraceLoggingRegister(g_v8Provider); }
+
+Recorder::~Recorder() {
+  if (g_v8Provider) {
+    TraceLoggingUnregister(g_v8Provider);
+  }
+}
+
+bool Recorder::IsEnabled() {
+  return TraceLoggingProviderEnabled(g_v8Provider, 0, 0);
+}
+
+bool Recorder::IsEnabled(const uint8_t level) {
+  return TraceLoggingProviderEnabled(g_v8Provider, level, 0);
+}
+
+void Recorder::AddEvent(TraceObject* trace_event) {
+  // TODO(sartang@microsoft.com): Figure out how to write the conditional
+  // arguments
+  wchar_t* wName = new wchar_t[4096];
+  MultiByteToWideChar(CP_ACP, 0, trace_event->name(), -1, wName, 4096);
+
+  wchar_t* wCategoryGroupName = new wchar_t[4096];
+  MultiByteToWideChar(CP_ACP, 0,
+                      TracingController::GetCategoryGroupName(
+                          trace_event->category_enabled_flag()),
+                      -1, wCategoryGroupName, 4096);
+
+  TraceLoggingWrite(g_v8Provider, "", TraceLoggingValue(wName, "Event Name"),
+                    TraceLoggingValue(trace_event->pid(), "pid"),
+                    TraceLoggingValue(trace_event->tid(), "tid"),
+                    TraceLoggingValue(trace_event->ts(), "ts"),
+                    TraceLoggingValue(trace_event->tts(), "tts"),
+                    TraceLoggingValue(trace_event->phase(), "phase"),
+                    TraceLoggingValue(wCategoryGroupName, "category"),
+                    TraceLoggingValue(trace_event->duration(), "dur"),
+                    TraceLoggingValue(trace_event->cpu_duration(), "tdur"));
+}
+
+}  // namespace tracing
+}  // namespace platform
+}  // namespace v8
+
+#endif  // V8_LIBPLATFORM_TRACING_RECORDER_WIN_H_
diff --git a/deps/v8/src/libplatform/tracing/recorder.h b/deps/v8/src/libplatform/tracing/recorder.h
new file mode 100644
index 00000000000000..4e14a038e86c2d
--- /dev/null
+++ b/deps/v8/src/libplatform/tracing/recorder.h
@@ -0,0 +1,37 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_LIBPLATFORM_TRACING_RECORDER_H_
+#define V8_LIBPLATFORM_TRACING_RECORDER_H_
+
+#include <stdint.h>
+
+#include "include/libplatform/v8-tracing.h"
+
+namespace v8 {
+namespace platform {
+namespace tracing {
+
+// This class serves as a base class for emitting events to system event
+// controllers: ETW for Windows, Signposts on Mac (to be implemented). It is
+// enabled by turning on both the ENABLE_SYSTEM_INSTRUMENTATION build flag and
+// the --enable-system-instrumentation command line flag. When enabled, it is
+// called from within SystemInstrumentationTraceWriter and replaces the
+// JSONTraceWriter for event-tracing.
+class Recorder {
+ public:
+  Recorder();
+  ~Recorder();
+
+  bool IsEnabled();
+  bool IsEnabled(const uint8_t level);
+
+  void AddEvent(TraceObject* trace_event);
+};
+
+}  // namespace tracing
+}  // namespace platform
+}  // namespace v8
+
+#endif  // V8_LIBPLATFORM_TRACING_RECORDER_H_
diff --git a/deps/v8/src/libplatform/tracing/trace-object.cc b/deps/v8/src/libplatform/tracing/trace-object.cc
index d16104df68a990..337800363da14f 100644
--- a/deps/v8/src/libplatform/tracing/trace-object.cc
+++ b/deps/v8/src/libplatform/tracing/trace-object.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "include/libplatform/v8-tracing.h"
-
 #include "base/trace_event/common/trace_event_common.h"
+#include "include/libplatform/v8-tracing.h"
 #include "include/v8-platform.h"
 #include "src/base/platform/platform.h"
 #include "src/base/platform/time.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace platform {
@@ -25,7 +25,7 @@ V8_INLINE static void CopyTraceObjectParameter(char** buffer,
                                                const char** member) {
   if (*member == nullptr) return;
   size_t length = strlen(*member) + 1;
-  memcpy(*buffer, *member, length);
+  base::Memcpy(*buffer, *member, length);
   *member = *buffer;
   *buffer += length;
 }
diff --git a/deps/v8/src/libplatform/tracing/trace-writer.cc b/deps/v8/src/libplatform/tracing/trace-writer.cc
index 1d3e53ac3b997f..5740dabd8f2b94 100644
--- a/deps/v8/src/libplatform/tracing/trace-writer.cc
+++ b/deps/v8/src/libplatform/tracing/trace-writer.cc
@@ -9,6 +9,7 @@
 #include "base/trace_event/common/trace_event_common.h"
 #include "include/v8-platform.h"
 #include "src/base/platform/platform.h"
+#include "src/libplatform/tracing/recorder.h"
 
 namespace v8 {
 namespace platform {
@@ -190,6 +191,27 @@ TraceWriter* TraceWriter::CreateJSONTraceWriter(std::ostream& stream,
   return new JSONTraceWriter(stream, tag);
 }
 
+SystemInstrumentationTraceWriter::SystemInstrumentationTraceWriter() {
+  recorder_ = std::make_unique<Recorder>();
+}
+
+SystemInstrumentationTraceWriter::~SystemInstrumentationTraceWriter() {
+  recorder_.reset(nullptr);
+}
+
+void SystemInstrumentationTraceWriter::AppendTraceEvent(
+    TraceObject* trace_event) {
+  if (recorder_->IsEnabled()) {
+    recorder_->AddEvent(trace_event);
+  }
+}
+
+void SystemInstrumentationTraceWriter::Flush() {}
+
+TraceWriter* TraceWriter::CreateSystemInstrumentationTraceWriter() {
+  return new SystemInstrumentationTraceWriter();
+}
+
 }  // namespace tracing
 }  // namespace platform
 }  // namespace v8
diff --git a/deps/v8/src/libplatform/tracing/trace-writer.h b/deps/v8/src/libplatform/tracing/trace-writer.h
index df48c5a3775139..1f727b815a5cc8 100644
--- a/deps/v8/src/libplatform/tracing/trace-writer.h
+++ b/deps/v8/src/libplatform/tracing/trace-writer.h
@@ -11,6 +11,8 @@ namespace v8 {
 namespace platform {
 namespace tracing {
 
+class Recorder;
+
 class JSONTraceWriter : public TraceWriter {
  public:
   explicit JSONTraceWriter(std::ostream& stream);
@@ -27,6 +29,17 @@ class JSONTraceWriter : public TraceWriter {
   bool append_comma_ = false;
 };
 
+class SystemInstrumentationTraceWriter : public TraceWriter {
+ public:
+  SystemInstrumentationTraceWriter();
+  ~SystemInstrumentationTraceWriter() override;
+  void AppendTraceEvent(TraceObject* trace_event) override;
+  void Flush() override;
+
+ private:
+  std::unique_ptr<Recorder> recorder_;
+};
+
 }  // namespace tracing
 }  // namespace platform
 }  // namespace v8
diff --git a/deps/v8/src/libplatform/worker-thread.h b/deps/v8/src/libplatform/worker-thread.h
index 576576f6e12f7f..8dae4777b7cf4c 100644
--- a/deps/v8/src/libplatform/worker-thread.h
+++ b/deps/v8/src/libplatform/worker-thread.h
@@ -23,13 +23,14 @@ class V8_PLATFORM_EXPORT WorkerThread : public NON_EXPORTED_BASE(base::Thread) {
   explicit WorkerThread(TaskQueue* queue);
   ~WorkerThread() override;
 
+  WorkerThread(const WorkerThread&) = delete;
+  WorkerThread& operator=(const WorkerThread&) = delete;
+
   // Thread implementation.
   void Run() override;
 
  private:
   TaskQueue* queue_;
-
-  DISALLOW_COPY_AND_ASSIGN(WorkerThread);
 };
 
 }  // namespace platform
diff --git a/deps/v8/src/libsampler/sampler.h b/deps/v8/src/libsampler/sampler.h
index e81ba9c90e15f7..35bcf23546c784 100644
--- a/deps/v8/src/libsampler/sampler.h
+++ b/deps/v8/src/libsampler/sampler.h
@@ -97,7 +97,7 @@ using AtomicMutex = std::atomic_bool;
 
 // A helper that uses an std::atomic_bool to create a lock that is obtained on
 // construction and released on destruction.
-class V8_EXPORT_PRIVATE AtomicGuard {
+class V8_EXPORT_PRIVATE V8_NODISCARD AtomicGuard {
  public:
   // Attempt to obtain the lock represented by |atomic|. |is_blocking|
   // determines whether we will block to obtain the lock, or only make one
@@ -123,6 +123,9 @@ class V8_EXPORT_PRIVATE SamplerManager {
  public:
   using SamplerList = std::vector<Sampler*>;
 
+  SamplerManager(const SamplerManager&) = delete;
+  SamplerManager& operator=(const SamplerManager&) = delete;
+
   // Add |sampler| to the map if it is not already present.
   void AddSampler(Sampler* sampler);
 
@@ -146,8 +149,6 @@ class V8_EXPORT_PRIVATE SamplerManager {
 
   std::unordered_map<pthread_t, SamplerList> sampler_map_;
   AtomicMutex samplers_access_counter_{false};
-
-  DISALLOW_COPY_AND_ASSIGN(SamplerManager);
 };
 
 #endif  // USE_SIGNALS
diff --git a/deps/v8/src/logging/code-events.h b/deps/v8/src/logging/code-events.h
index b3fb96005277ff..d2974e49644bbb 100644
--- a/deps/v8/src/logging/code-events.h
+++ b/deps/v8/src/logging/code-events.h
@@ -84,7 +84,8 @@ class CodeEventListener {
                                Handle<Name> script_name, int line,
                                int column) = 0;
   virtual void CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                               wasm::WasmName name) = 0;
+                               wasm::WasmName name, const char* source_url,
+                               int code_offset, int script_id) = 0;
 
   virtual void CallbackEvent(Handle<Name> name, Address entry_point) = 0;
   virtual void GetterCallbackEvent(Handle<Name> name, Address entry_point) = 0;
@@ -115,6 +116,8 @@ class CodeEventDispatcher : public CodeEventListener {
   using LogEventsAndTags = CodeEventListener::LogEventsAndTags;
 
   CodeEventDispatcher() = default;
+  CodeEventDispatcher(const CodeEventDispatcher&) = delete;
+  CodeEventDispatcher& operator=(const CodeEventDispatcher&) = delete;
 
   bool AddListener(CodeEventListener* listener) {
     base::MutexGuard guard(&mutex_);
@@ -168,9 +171,11 @@ class CodeEventDispatcher : public CodeEventListener {
     });
   }
   void CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                       wasm::WasmName name) override {
+                       wasm::WasmName name, const char* source_url,
+                       int code_offset, int script_id) override {
     DispatchEventToListeners([=](CodeEventListener* listener) {
-      listener->CodeCreateEvent(tag, code, name);
+      listener->CodeCreateEvent(tag, code, name, source_url, code_offset,
+                                script_id);
     });
   }
   void CallbackEvent(Handle<Name> name, Address entry_point) override {
@@ -231,8 +236,6 @@ class CodeEventDispatcher : public CodeEventListener {
  private:
   std::unordered_set<CodeEventListener*> listeners_;
   base::Mutex mutex_;
-
-  DISALLOW_COPY_AND_ASSIGN(CodeEventDispatcher);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/logging/counters.h b/deps/v8/src/logging/counters.h
index cb879e3c2350f9..f1a7595a3400cc 100644
--- a/deps/v8/src/logging/counters.h
+++ b/deps/v8/src/logging/counters.h
@@ -36,6 +36,9 @@ class Counters;
 
 class StatsTable {
  public:
+  StatsTable(const StatsTable&) = delete;
+  StatsTable& operator=(const StatsTable&) = delete;
+
   // Register an application-defined function for recording
   // subsequent counter statistics.
   void SetCounterFunction(CounterLookupCallback f);
@@ -90,8 +93,6 @@ class StatsTable {
   CounterLookupCallback lookup_function_;
   CreateHistogramCallback create_histogram_function_;
   AddHistogramSampleCallback add_histogram_sample_function_;
-
-  DISALLOW_COPY_AND_ASSIGN(StatsTable);
 };
 
 // Base class for stats counters.
@@ -293,7 +294,7 @@ class TimedHistogram : public Histogram {
 };
 
 // Helper class for scoping a TimedHistogram.
-class TimedHistogramScope {
+class V8_NODISCARD TimedHistogramScope {
  public:
   explicit TimedHistogramScope(TimedHistogram* histogram,
                                Isolate* isolate = nullptr)
@@ -315,7 +316,7 @@ enum class OptionalTimedHistogramScopeMode { TAKE_TIME, DONT_TAKE_TIME };
 
 // Helper class for scoping a TimedHistogram.
 // It will not take time for mode = DONT_TAKE_TIME.
-class OptionalTimedHistogramScope {
+class V8_NODISCARD OptionalTimedHistogramScope {
  public:
   OptionalTimedHistogramScope(TimedHistogram* histogram, Isolate* isolate,
                               OptionalTimedHistogramScopeMode mode)
@@ -375,7 +376,7 @@ class AsyncTimedHistogram {
 // correctly even if Start() was not called. This happens to be true iff Stop()
 // is passed a null isolate, but that's an implementation detail of
 // TimedHistogram, and we shouldn't rely on it.
-class LazyTimedHistogramScope {
+class V8_NODISCARD LazyTimedHistogramScope {
  public:
   LazyTimedHistogramScope() : histogram_(nullptr) { timer_.Start(); }
   ~LazyTimedHistogramScope() {
@@ -426,7 +427,7 @@ class HistogramTimer : public TimedHistogram {
 // Parser is currently reentrant (when it throws an error, we call back
 // into JavaScript and all bets are off), but ElapsedTimer is not
 // reentry-safe. Fix this properly and remove |allow_nesting|.
-class HistogramTimerScope {
+class V8_NODISCARD HistogramTimerScope {
  public:
   explicit HistogramTimerScope(HistogramTimer* timer,
                                bool allow_nesting = false)
@@ -502,7 +503,7 @@ class AggregatableHistogramTimer : public Histogram {
 // A helper class for use with AggregatableHistogramTimer. This is the
 // // outer-most timer scope used with an AggregatableHistogramTimer. It will
 // // aggregate the information from the inner AggregatedHistogramTimerScope.
-class AggregatingHistogramTimerScope {
+class V8_NODISCARD AggregatingHistogramTimerScope {
  public:
   explicit AggregatingHistogramTimerScope(AggregatableHistogramTimer* histogram)
       : histogram_(histogram) {
@@ -516,7 +517,7 @@ class AggregatingHistogramTimerScope {
 
 // A helper class for use with AggregatableHistogramTimer, the "inner" scope
 // // which defines the events to be timed.
-class AggregatedHistogramTimerScope {
+class V8_NODISCARD AggregatedHistogramTimerScope {
  public:
   explicit AggregatedHistogramTimerScope(AggregatableHistogramTimer* histogram)
       : histogram_(histogram) {
@@ -868,6 +869,7 @@ class RuntimeCallTimer final {
   V(ValueDeserializer_ReadHeader)                          \
   V(ValueDeserializer_ReadValue)                           \
   V(ValueSerializer_WriteValue)                            \
+  V(Value_Equals)                                          \
   V(Value_InstanceOf)                                      \
   V(Value_Int32Value)                                      \
   V(Value_IntegerValue)                                    \
@@ -975,6 +977,8 @@ class RuntimeCallTimer final {
   V(CompilePublishBackgroundFinalization)      \
   V(CompileSerialize)                          \
   V(CompileWaitForDispatcher)                  \
+  V(ConfigureInstance)                         \
+  V(CreateApiFunction)                         \
   V(DeoptimizeCode)                            \
   V(DeserializeContext)                        \
   V(DeserializeIsolate)                        \
@@ -989,6 +993,7 @@ class RuntimeCallTimer final {
   V(GCEpilogueCallback)                        \
   V(GCPrologueCallback)                        \
   V(Genesis)                                   \
+  V(GetCompatibleReceiver)                     \
   V(GetMoreDataCallback)                       \
   V(IndexedDefinerCallback)                    \
   V(IndexedDeleterCallback)                    \
@@ -997,9 +1002,14 @@ class RuntimeCallTimer final {
   V(IndexedGetterCallback)                     \
   V(IndexedQueryCallback)                      \
   V(IndexedSetterCallback)                     \
+  V(InstantiateFunction)                       \
+  V(InstantiateObject)                         \
   V(Invoke)                                    \
   V(InvokeApiFunction)                         \
   V(InvokeApiInterruptCallbacks)               \
+  V(IsCompatibleReceiver)                      \
+  V(IsCompatibleReceiverMap)                   \
+  V(IsTemplateFor)                             \
   V(JS_Execution)                              \
   V(Map_SetPrototype)                          \
   V(Map_TransitionToAccessorProperty)          \
@@ -1016,8 +1026,8 @@ class RuntimeCallTimer final {
   V(ObjectVerify)                              \
   V(OptimizeBackgroundDispatcherJob)           \
   V(OptimizeCode)                              \
-  V(OptimizeConcurrentPrepare)                 \
   V(OptimizeConcurrentFinalize)                \
+  V(OptimizeConcurrentPrepare)                 \
   V(OptimizeFinalizePipelineJob)               \
   V(OptimizeHeapBrokerInitialization)          \
   V(OptimizeNonConcurrent)                     \
@@ -1030,6 +1040,7 @@ class RuntimeCallTimer final {
   V(PrototypeMap_TransitionToDataProperty)     \
   V(PrototypeObject_DeleteProperty)            \
   V(ReconfigureToDataProperty)                 \
+  V(UpdateProtector)                           \
   V(StringLengthGetter)                        \
   V(TestCounter1)                              \
   V(TestCounter2)                              \
@@ -1233,7 +1244,7 @@ class WorkerThreadRuntimeCallStats final {
 // Creating a WorkerThreadRuntimeCallStatsScope will provide a thread-local
 // runtime call stats table, and will dump the table to an immediate trace event
 // when it is destroyed.
-class WorkerThreadRuntimeCallStatsScope final {
+class V8_NODISCARD WorkerThreadRuntimeCallStatsScope final {
  public:
   explicit WorkerThreadRuntimeCallStatsScope(
       WorkerThreadRuntimeCallStats* off_thread_stats);
@@ -1260,7 +1271,7 @@ class WorkerThreadRuntimeCallStatsScope final {
 
 // A RuntimeCallTimerScopes wraps around a RuntimeCallTimer to measure the
 // the time of C++ scope.
-class RuntimeCallTimerScope {
+class V8_NODISCARD RuntimeCallTimerScope {
  public:
   inline RuntimeCallTimerScope(Isolate* isolate,
                                RuntimeCallCounterId counter_id);
@@ -1287,11 +1298,12 @@ class RuntimeCallTimerScope {
     }
   }
 
+  RuntimeCallTimerScope(const RuntimeCallTimerScope&) = delete;
+  RuntimeCallTimerScope& operator=(const RuntimeCallTimerScope&) = delete;
+
  private:
   RuntimeCallStats* stats_ = nullptr;
   RuntimeCallTimer timer_;
-
-  DISALLOW_COPY_AND_ASSIGN(RuntimeCallTimerScope);
 };
 
 // This file contains all the v8 counters that are in use.
diff --git a/deps/v8/src/logging/log-utils.cc b/deps/v8/src/logging/log-utils.cc
index aaf7a3761834a4..3b657290692c78 100644
--- a/deps/v8/src/logging/log-utils.cc
+++ b/deps/v8/src/logging/log-utils.cc
@@ -105,7 +105,7 @@ void Log::MessageBuilder::AppendString(String str,
                                        base::Optional<int> length_limit) {
   if (str.is_null()) return;
 
-  DisallowHeapAllocation no_gc;  // Ensure string stays valid.
+  DisallowGarbageCollection no_gc;  // Ensure string stays valid.
   int length = str.length();
   if (length_limit) length = std::min(length, *length_limit);
   for (int i = 0; i < length; i++) {
@@ -192,14 +192,14 @@ void Log::MessageBuilder::AppendSymbolName(Symbol symbol) {
     AppendSymbolNameDetails(String::cast(symbol.description()), false);
     os << "\" ";
   }
-  os << "hash " << std::hex << symbol.Hash() << std::dec << ")";
+  os << "hash " << std::hex << symbol.hash() << std::dec << ")";
 }
 
 void Log::MessageBuilder::AppendSymbolNameDetails(String str,
                                                   bool show_impl_info) {
   if (str.is_null()) return;
 
-  DisallowHeapAllocation no_gc;  // Ensure string stays valid.
+  DisallowGarbageCollection no_gc;  // Ensure string stays valid.
   OFStream& os = log_->os_;
   int limit = str.length();
   if (limit > 0x1000) limit = 0x1000;
diff --git a/deps/v8/src/logging/log.cc b/deps/v8/src/logging/log.cc
index 61909ae967a4e0..e7ffba35a97c30 100644
--- a/deps/v8/src/logging/log.cc
+++ b/deps/v8/src/logging/log.cc
@@ -12,6 +12,7 @@
 #include "src/api/api-inl.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/builtins/profile-data-reader.h"
 #include "src/codegen/bailout-reason.h"
 #include "src/codegen/macro-assembler.h"
@@ -33,6 +34,8 @@
 #include "src/logging/log-inl.h"
 #include "src/logging/log-utils.h"
 #include "src/objects/api-callbacks.h"
+#include "src/objects/code-kind.h"
+#include "src/objects/code.h"
 #include "src/profiler/tick-sample.h"
 #include "src/snapshot/embedded/embedded-data.h"
 #include "src/strings/string-stream.h"
@@ -78,17 +81,11 @@ static v8::CodeEventType GetCodeEventTypeForTag(
   }
 
 static const char* ComputeMarker(SharedFunctionInfo shared, AbstractCode code) {
-  // TODO(mythria,jgruber): Use different markers for Turboprop/NCI.
-  switch (code.kind()) {
-    case CodeKind::INTERPRETED_FUNCTION:
-      return shared.optimization_disabled() ? "" : "~";
-    case CodeKind::TURBOFAN:
-    case CodeKind::NATIVE_CONTEXT_INDEPENDENT:
-    case CodeKind::TURBOPROP:
-      return "*";
-    default:
-      return "";
+  if (shared.optimization_disabled() &&
+      code.kind() == CodeKind::INTERPRETED_FUNCTION) {
+    return "";
   }
+  return CodeKindToMarker(code.kind());
 }
 
 static const char* ComputeMarker(const wasm::WasmCode* code) {
@@ -124,7 +121,7 @@ class CodeEventLogger::NameBuffer {
         AppendBytes("\" ");
       }
       AppendBytes("hash ");
-      AppendHex(symbol.Hash());
+      AppendHex(symbol.hash());
       AppendByte(')');
     }
   }
@@ -138,7 +135,7 @@ class CodeEventLogger::NameBuffer {
   }
 
   void AppendBytes(const char* bytes, int size) {
-    size = Min(size, kUtf8BufferSize - utf8_pos_);
+    size = std::min(size, kUtf8BufferSize - utf8_pos_);
     MemCopy(utf8_buffer_ + utf8_pos_, bytes, size);
     utf8_pos_ += size;
   }
@@ -226,13 +223,13 @@ void CodeEventLogger::CodeCreateEvent(LogEventsAndTags tag,
                                       int column) {
   name_buffer_->Init(tag);
   name_buffer_->AppendBytes(ComputeMarker(*shared, *code));
-  name_buffer_->AppendString(shared->DebugName());
+  name_buffer_->AppendBytes(shared->DebugNameCStr().get());
   name_buffer_->AppendByte(' ');
   if (script_name->IsString()) {
     name_buffer_->AppendString(String::cast(*script_name));
   } else {
     name_buffer_->AppendBytes("symbol(hash ");
-    name_buffer_->AppendHex(Name::cast(*script_name).Hash());
+    name_buffer_->AppendHex(Name::cast(*script_name).hash());
     name_buffer_->AppendByte(')');
   }
   name_buffer_->AppendByte(':');
@@ -242,7 +239,9 @@ void CodeEventLogger::CodeCreateEvent(LogEventsAndTags tag,
 
 void CodeEventLogger::CodeCreateEvent(LogEventsAndTags tag,
                                       const wasm::WasmCode* code,
-                                      wasm::WasmName name) {
+                                      wasm::WasmName name,
+                                      const char* source_url,
+                                      int /*code_offset*/, int /*script_id*/) {
   name_buffer_->Init(tag);
   DCHECK(!name.empty());
   name_buffer_->AppendBytes(name.begin(), name.length());
@@ -311,7 +310,7 @@ PerfBasicLogger::PerfBasicLogger(Isolate* isolate)
 }
 
 PerfBasicLogger::~PerfBasicLogger() {
-  fclose(perf_output_handle_);
+  base::Fclose(perf_output_handle_);
   perf_output_handle_ = nullptr;
 }
 
@@ -466,9 +465,9 @@ void ExternalCodeEventListener::CodeCreateEvent(
   code_event_handler_->Handle(reinterpret_cast<v8::CodeEvent*>(&code_event));
 }
 
-void ExternalCodeEventListener::CodeCreateEvent(LogEventsAndTags tag,
-                                                const wasm::WasmCode* code,
-                                                wasm::WasmName name) {
+void ExternalCodeEventListener::CodeCreateEvent(
+    LogEventsAndTags tag, const wasm::WasmCode* code, wasm::WasmName name,
+    const char* source_url, int code_offset, int script_id) {
   // TODO(mmarchini): handle later
 }
 
@@ -575,7 +574,7 @@ LowLevelLogger::LowLevelLogger(Isolate* isolate, const char* name)
 }
 
 LowLevelLogger::~LowLevelLogger() {
-  fclose(ll_output_handle_);
+  base::Fclose(ll_output_handle_);
   ll_output_handle_ = nullptr;
 }
 
@@ -982,6 +981,10 @@ void Profiler::Run() {
 //
 // Logger class implementation.
 //
+#define MSG_BUILDER()                                                       \
+  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder(); \
+  if (!msg_ptr) return;                                                     \
+  Log::MessageBuilder& msg = *msg_ptr.get();
 
 Logger::Logger(Isolate* isolate)
     : isolate_(isolate),
@@ -1010,9 +1013,7 @@ void Logger::RemoveCodeEventListener(CodeEventListener* listener) {
 }
 
 void Logger::ProfilerBeginEvent() {
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "profiler" << kNext << "begin" << kNext << FLAG_prof_sampling_interval;
   msg.WriteToLogFile();
 }
@@ -1022,9 +1023,7 @@ void Logger::StringEvent(const char* name, const char* value) {
 }
 
 void Logger::UncheckedStringEvent(const char* name, const char* value) {
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << name << kNext << value;
   msg.WriteToLogFile();
 }
@@ -1034,9 +1033,7 @@ void Logger::IntPtrTEvent(const char* name, intptr_t value) {
 }
 
 void Logger::UncheckedIntPtrTEvent(const char* name, intptr_t value) {
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << name << kNext;
   msg.AppendFormatString("%" V8PRIdPTR, value);
   msg.WriteToLogFile();
@@ -1044,18 +1041,14 @@ void Logger::UncheckedIntPtrTEvent(const char* name, intptr_t value) {
 
 void Logger::HandleEvent(const char* name, Address* location) {
   if (!FLAG_log_handles) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << name << kNext << reinterpret_cast<void*>(location);
   msg.WriteToLogFile();
 }
 
 void Logger::ApiSecurityCheck() {
   if (!FLAG_log_api) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "api" << kNext << "check-security";
   msg.WriteToLogFile();
 }
@@ -1064,9 +1057,7 @@ void Logger::SharedLibraryEvent(const std::string& library_path,
                                 uintptr_t start, uintptr_t end,
                                 intptr_t aslr_slide) {
   if (!FLAG_prof_cpp) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "shared-library" << kNext << library_path.c_str() << kNext
       << reinterpret_cast<void*>(start) << kNext << reinterpret_cast<void*>(end)
       << kNext << aslr_slide;
@@ -1075,17 +1066,13 @@ void Logger::SharedLibraryEvent(const std::string& library_path,
 
 void Logger::CurrentTimeEvent() {
   DCHECK(FLAG_log_internal_timer_events);
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "current-time" << kNext << Time();
   msg.WriteToLogFile();
 }
 
 void Logger::TimerEvent(Logger::StartEnd se, const char* name) {
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   switch (se) {
     case START:
       msg << "timer-event-start";
@@ -1101,11 +1088,9 @@ void Logger::TimerEvent(Logger::StartEnd se, const char* name) {
 }
 
 void Logger::BasicBlockCounterEvent(const char* name, int block_id,
-                                    uint32_t count) {
+                                    double count) {
   if (!FLAG_turbo_profiling_log_builtins) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << ProfileDataFromFileConstants::kBlockCounterMarker << kNext << name
       << kNext << block_id << kNext << count;
   msg.WriteToLogFile();
@@ -1113,9 +1098,7 @@ void Logger::BasicBlockCounterEvent(const char* name, int block_id,
 
 void Logger::BuiltinHashEvent(const char* name, int hash) {
   if (!FLAG_turbo_profiling_log_builtins) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << ProfileDataFromFileConstants::kBuiltinHashMarker << kNext << name
       << kNext << hash;
   msg.WriteToLogFile();
@@ -1138,9 +1121,7 @@ void Logger::ApiNamedPropertyAccess(const char* tag, JSObject holder,
                                     Object property_name) {
   DCHECK(property_name.IsName());
   if (!FLAG_log_api) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "api" << kNext << tag << kNext << holder.class_name() << kNext
       << Name::cast(property_name);
   msg.WriteToLogFile();
@@ -1149,37 +1130,29 @@ void Logger::ApiNamedPropertyAccess(const char* tag, JSObject holder,
 void Logger::ApiIndexedPropertyAccess(const char* tag, JSObject holder,
                                       uint32_t index) {
   if (!FLAG_log_api) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "api" << kNext << tag << kNext << holder.class_name() << kNext
       << index;
   msg.WriteToLogFile();
 }
 
-void Logger::ApiObjectAccess(const char* tag, JSObject object) {
+void Logger::ApiObjectAccess(const char* tag, JSReceiver object) {
   if (!FLAG_log_api) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "api" << kNext << tag << kNext << object.class_name();
   msg.WriteToLogFile();
 }
 
 void Logger::ApiEntryCall(const char* name) {
   if (!FLAG_log_api) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "api" << kNext << name;
   msg.WriteToLogFile();
 }
 
 void Logger::NewEvent(const char* name, void* object, size_t size) {
   if (!FLAG_log) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "new" << kNext << name << kNext << object << kNext
       << static_cast<unsigned int>(size);
   msg.WriteToLogFile();
@@ -1187,9 +1160,7 @@ void Logger::NewEvent(const char* name, void* object, size_t size) {
 
 void Logger::DeleteEvent(const char* name, void* object) {
   if (!FLAG_log) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "delete" << kNext << name << kNext << object;
   msg.WriteToLogFile();
 }
@@ -1216,103 +1187,40 @@ void AppendCodeCreateHeader(
 }
 
 }  // namespace
-
-void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
-                             const char* name) {
-  if (!is_listening_to_code_events()) return;
-  if (!FLAG_log_code) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
-  AppendCodeCreateHeader(msg, tag, *code, Time());
-  msg << name;
-  msg.WriteToLogFile();
-}
-
-void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
-                             Handle<Name> name) {
-  if (!is_listening_to_code_events()) return;
-  if (!FLAG_log_code) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
-  AppendCodeCreateHeader(msg, tag, *code, Time());
-  msg << *name;
-  msg.WriteToLogFile();
-}
-
-void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
-                             Handle<SharedFunctionInfo> shared,
-                             Handle<Name> script_name) {
-  if (!is_listening_to_code_events()) return;
-  if (!FLAG_log_code) return;
-  if (*code == AbstractCode::cast(
-                   isolate_->builtins()->builtin(Builtins::kCompileLazy))) {
-    return;
-  }
-
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
-  AppendCodeCreateHeader(msg, tag, *code, Time());
-  msg << *script_name << kNext << reinterpret_cast<void*>(shared->address())
-      << kNext << ComputeMarker(*shared, *code);
-  msg.WriteToLogFile();
-}
-
-// Although, it is possible to extract source and line from
-// the SharedFunctionInfo object, we left it to caller
-// to leave logging functions free from heap allocations.
-void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
-                             Handle<SharedFunctionInfo> shared,
-                             Handle<Name> script_name, int line, int column) {
-  if (!is_listening_to_code_events()) return;
-  if (!FLAG_log_code) return;
-  {
-    std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-    if (!msg_ptr) return;
-    Log::MessageBuilder& msg = *msg_ptr.get();
-    AppendCodeCreateHeader(msg, tag, *code, Time());
-    msg << shared->DebugName() << " " << *script_name << ":" << line << ":"
-        << column << kNext << reinterpret_cast<void*>(shared->address())
-        << kNext << ComputeMarker(*shared, *code);
-    msg.WriteToLogFile();
-  }
-
-  if (!FLAG_log_source_code) return;
+// We log source code information in the form:
+//
+// code-source-info <addr>,<script>,<start>,<end>,<pos>,<inline-pos>,<fns>
+//
+// where
+//   <addr> is code object address
+//   <script> is script id
+//   <start> is the starting position inside the script
+//   <end> is the end position inside the script
+//   <pos> is source position table encoded in the string,
+//      it is a sequence of C<code-offset>O<script-offset>[I<inlining-id>]
+//      where
+//        <code-offset> is the offset within the code object
+//        <script-offset> is the position within the script
+//        <inlining-id> is the offset in the <inlining> table
+//   <inlining> table is a sequence of strings of the form
+//      F<function-id>O<script-offset>[I<inlining-id>]
+//      where
+//         <function-id> is an index into the <fns> function table
+//   <fns> is the function table encoded as a sequence of strings
+//      S<shared-function-info-address>
+
+void Logger::LogSourceCodeInformation(Handle<AbstractCode> code,
+                                      Handle<SharedFunctionInfo> shared) {
   Object script_object = shared->script();
   if (!script_object.IsScript()) return;
   Script script = Script::cast(script_object);
-  if (!EnsureLogScriptSource(script)) return;
+  EnsureLogScriptSource(script);
 
-  // We log source code information in the form:
-  //
-  // code-source-info <addr>,<script>,<start>,<end>,<pos>,<inline-pos>,<fns>
-  //
-  // where
-  //   <addr> is code object address
-  //   <script> is script id
-  //   <start> is the starting position inside the script
-  //   <end> is the end position inside the script
-  //   <pos> is source position table encoded in the string,
-  //      it is a sequence of C<code-offset>O<script-offset>[I<inlining-id>]
-  //      where
-  //        <code-offset> is the offset within the code object
-  //        <script-offset> is the position within the script
-  //        <inlining-id> is the offset in the <inlining> table
-  //   <inlining> table is a sequence of strings of the form
-  //      F<function-id>O<script-offset>[I<inlining-id>]
-  //      where
-  //         <function-id> is an index into the <fns> function table
-  //   <fns> is the function table encoded as a sequence of strings
-  //      S<shared-function-info-address>
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
-  msg << "code-source-info" << kNext
-      << reinterpret_cast<void*>(code->InstructionStart()) << kNext
-      << script.id() << kNext << shared->StartPosition() << kNext
-      << shared->EndPosition() << kNext;
+  MSG_BUILDER();
+  msg << "code-source-info" << Logger::kNext
+      << reinterpret_cast<void*>(code->InstructionStart()) << Logger::kNext
+      << script.id() << Logger::kNext << shared->StartPosition()
+      << Logger::kNext << shared->EndPosition() << Logger::kNext;
 
   SourcePositionTableIterator iterator(code->source_position_table());
   bool hasInlined = false;
@@ -1324,7 +1232,7 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
       hasInlined = true;
     }
   }
-  msg << kNext;
+  msg << Logger::kNext;
   int maxInlinedId = -1;
   if (hasInlined) {
     PodArray<InliningPosition> inlining_positions =
@@ -1347,11 +1255,10 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
       }
     }
   }
-  msg << kNext;
+  msg << Logger::kNext;
   if (hasInlined) {
     DeoptimizationData deopt_data = DeoptimizationData::cast(
         Handle<Code>::cast(code)->deoptimization_data());
-
     msg << std::hex;
     for (int i = 0; i <= maxInlinedId; i++) {
       msg << "S"
@@ -1363,13 +1270,103 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
   msg.WriteToLogFile();
 }
 
+void Logger::LogCodeDisassemble(Handle<AbstractCode> code) {
+  if (!FLAG_log_code_disassemble) return;
+  MSG_BUILDER();
+  msg << "code-disassemble" << Logger::kNext
+      << reinterpret_cast<void*>(code->InstructionStart()) << Logger::kNext
+      << CodeKindToString(code->kind()) << Logger::kNext;
+  {
+    std::ostringstream stream;
+    if (code->IsCode()) {
+#ifdef ENABLE_DISASSEMBLER
+      Code::cast(*code).Disassemble(nullptr, stream, isolate_);
+#endif
+    } else {
+      BytecodeArray::cast(*code).Disassemble(stream);
+    }
+    std::string string = stream.str();
+    msg.AppendString(string.c_str(), string.length());
+  }
+  msg.WriteToLogFile();
+}
+
+// Builtins and Bytecode handlers
+void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
+                             const char* name) {
+  if (!is_listening_to_code_events()) return;
+  if (!FLAG_log_code) return;
+  {
+    MSG_BUILDER();
+    AppendCodeCreateHeader(msg, tag, *code, Time());
+    msg << name;
+    msg.WriteToLogFile();
+  }
+  LogCodeDisassemble(code);
+}
+
+void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
+                             Handle<Name> name) {
+  if (!is_listening_to_code_events()) return;
+  if (!FLAG_log_code) return;
+  {
+    MSG_BUILDER();
+    AppendCodeCreateHeader(msg, tag, *code, Time());
+    msg << *name;
+    msg.WriteToLogFile();
+  }
+  LogCodeDisassemble(code);
+}
+
+// Scripts
+void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
+                             Handle<SharedFunctionInfo> shared,
+                             Handle<Name> script_name) {
+  if (!is_listening_to_code_events()) return;
+  if (!FLAG_log_code) return;
+  if (*code == AbstractCode::cast(
+                   isolate_->builtins()->builtin(Builtins::kCompileLazy))) {
+    return;
+  }
+  {
+    MSG_BUILDER();
+    AppendCodeCreateHeader(msg, tag, *code, Time());
+    msg << *script_name << kNext << reinterpret_cast<void*>(shared->address())
+        << kNext << ComputeMarker(*shared, *code);
+    msg.WriteToLogFile();
+  }
+  LogSourceCodeInformation(code, shared);
+  LogCodeDisassemble(code);
+}
+
+// Functions
+// Although, it is possible to extract source and line from
+// the SharedFunctionInfo object, we left it to caller
+// to leave logging functions free from heap allocations.
+void Logger::CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
+                             Handle<SharedFunctionInfo> shared,
+                             Handle<Name> script_name, int line, int column) {
+  if (!is_listening_to_code_events()) return;
+  if (!FLAG_log_code) return;
+  {
+    MSG_BUILDER();
+    AppendCodeCreateHeader(msg, tag, *code, Time());
+    msg << shared->DebugNameCStr().get() << " " << *script_name << ":" << line
+        << ":" << column << kNext << reinterpret_cast<void*>(shared->address())
+        << kNext << ComputeMarker(*shared, *code);
+
+    msg.WriteToLogFile();
+  }
+  LogSourceCodeInformation(code, shared);
+  LogCodeDisassemble(code);
+}
+
 void Logger::CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                             wasm::WasmName name) {
+                             wasm::WasmName name, const char* /*source_url*/,
+                             int /*code_offset*/, int /*script_id*/) {
   if (!is_listening_to_code_events()) return;
   if (!FLAG_log_code) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   AppendCodeCreateHeader(msg, tag, CodeKind::WASM_FUNCTION,
                          code->instructions().begin(),
                          code->instructions().length(), Time());
@@ -1390,9 +1387,7 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
 void Logger::CallbackEventInternal(const char* prefix, Handle<Name> name,
                                    Address entry_point) {
   if (!FLAG_log_code) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << kLogEventsNames[CodeEventListener::CODE_CREATION_EVENT] << kNext
       << kLogEventsNames[CodeEventListener::CALLBACK_TAG] << kNext << -2
       << kNext << Time() << kNext << reinterpret_cast<void*>(entry_point)
@@ -1416,9 +1411,7 @@ void Logger::RegExpCodeCreateEvent(Handle<AbstractCode> code,
                                    Handle<String> source) {
   if (!is_listening_to_code_events()) return;
   if (!FLAG_log_code) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   AppendCodeCreateHeader(msg, CodeEventListener::REG_EXP_TAG, *code, Time());
   msg << *source;
   msg.WriteToLogFile();
@@ -1445,20 +1438,16 @@ void Logger::CodeDisableOptEvent(Handle<AbstractCode> code,
                                  Handle<SharedFunctionInfo> shared) {
   if (!is_listening_to_code_events()) return;
   if (!FLAG_log_code) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << kLogEventsNames[CodeEventListener::CODE_DISABLE_OPT_EVENT] << kNext
-      << shared->DebugName() << kNext
+      << shared->DebugNameCStr().get() << kNext
       << GetBailoutReason(shared->disable_optimization_reason());
   msg.WriteToLogFile();
 }
 
 void Logger::ProcessDeoptEvent(Handle<Code> code, SourcePosition position,
                                const char* kind, const char* reason) {
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "code-deopt" << kNext << Time() << kNext << code->CodeSize() << kNext
       << reinterpret_cast<void*>(code->InstructionStart());
 
@@ -1533,9 +1522,7 @@ void Logger::CodeLinePosInfoRecordEvent(
 
 void Logger::CodeNameEvent(Address addr, int pos, const char* code_name) {
   if (code_name == nullptr) return;  // Not a code object.
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << kLogEventsNames[CodeEventListener::SNAPSHOT_CODE_NAME_EVENT] << kNext
       << pos << kNext << code_name;
   msg.WriteToLogFile();
@@ -1544,9 +1531,7 @@ void Logger::CodeNameEvent(Address addr, int pos, const char* code_name) {
 void Logger::MoveEventInternal(LogEventsAndTags event, Address from,
                                Address to) {
   if (!FLAG_log_code) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << kLogEventsNames[event] << kNext << reinterpret_cast<void*>(from)
       << kNext << reinterpret_cast<void*>(to);
   msg.WriteToLogFile();
@@ -1554,9 +1539,7 @@ void Logger::MoveEventInternal(LogEventsAndTags event, Address from,
 
 void Logger::ResourceEvent(const char* name, const char* tag) {
   if (!FLAG_log) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << name << kNext << tag << kNext;
 
   uint32_t sec, usec;
@@ -1570,9 +1553,7 @@ void Logger::ResourceEvent(const char* name, const char* tag) {
 
 void Logger::SuspectReadEvent(Name name, Object obj) {
   if (!FLAG_log_suspect) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   String class_name = obj.IsJSObject() ? JSObject::cast(obj).class_name()
                                        : ReadOnlyRoots(isolate_).empty_string();
   msg << "suspect-read" << kNext << class_name << kNext << name;
@@ -1600,9 +1581,7 @@ void Logger::FunctionEvent(const char* reason, int script_id, double time_delta,
                            int start_position, int end_position,
                            String function_name) {
   if (!FLAG_log_function_events) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   AppendFunctionMessage(msg, reason, script_id, time_delta, start_position,
                         end_position, Time());
   if (!function_name.is_null()) msg << function_name;
@@ -1614,9 +1593,7 @@ void Logger::FunctionEvent(const char* reason, int script_id, double time_delta,
                            const char* function_name,
                            size_t function_name_length, bool is_one_byte) {
   if (!FLAG_log_function_events) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   AppendFunctionMessage(msg, reason, script_id, time_delta, start_position,
                         end_position, Time());
   if (function_name_length > 0) {
@@ -1628,9 +1605,7 @@ void Logger::FunctionEvent(const char* reason, int script_id, double time_delta,
 void Logger::CompilationCacheEvent(const char* action, const char* cache_type,
                                    SharedFunctionInfo sfi) {
   if (!FLAG_log_function_events) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   int script_id = -1;
   if (sfi.script().IsScript()) {
     script_id = Script::cast(sfi.script()).id();
@@ -1644,9 +1619,7 @@ void Logger::CompilationCacheEvent(const char* action, const char* cache_type,
 
 void Logger::ScriptEvent(ScriptEventType type, int script_id) {
   if (!FLAG_log_function_events) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "script" << Logger::kNext;
   switch (type) {
     case ScriptEventType::kReserveId:
@@ -1672,9 +1645,7 @@ void Logger::ScriptEvent(ScriptEventType type, int script_id) {
 void Logger::ScriptDetails(Script script) {
   if (!FLAG_log_function_events) return;
   {
-    std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-    if (!msg_ptr) return;
-    Log::MessageBuilder& msg = *msg_ptr.get();
+    MSG_BUILDER();
     msg << "script-details" << Logger::kNext << script.id() << Logger::kNext;
     if (script.name().IsString()) {
       msg << String::cast(script.name());
@@ -1690,9 +1661,6 @@ void Logger::ScriptDetails(Script script) {
 }
 
 bool Logger::EnsureLogScriptSource(Script script) {
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return false;
-  Log::MessageBuilder& msg = *msg_ptr.get();
   // Make sure the script is written to the log file.
   int script_id = script.id();
   if (logged_source_code_.find(script_id) != logged_source_code_.end()) {
@@ -1702,6 +1670,11 @@ bool Logger::EnsureLogScriptSource(Script script) {
   logged_source_code_.insert(script_id);
   Object source_object = script.source();
   if (!source_object.IsString()) return false;
+
+  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
+  if (!msg_ptr) return false;
+  Log::MessageBuilder& msg = *msg_ptr.get();
+
   String source_code = String::cast(source_object);
   msg << "script-source" << kNext << script_id << kNext;
 
@@ -1722,9 +1695,7 @@ void Logger::RuntimeCallTimerEvent() {
   RuntimeCallStats* stats = isolate_->counters()->runtime_call_stats();
   RuntimeCallCounter* counter = stats->current_counter();
   if (counter == nullptr) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "active-runtime-timer" << kNext << counter->name();
   msg.WriteToLogFile();
 }
@@ -1735,9 +1706,7 @@ void Logger::TickEvent(TickSample* sample, bool overflow) {
                   v8::tracing::TracingCategoryObserver::ENABLED_BY_NATIVE)) {
     RuntimeCallTimerEvent();
   }
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << kLogEventsNames[CodeEventListener::TICK_EVENT] << kNext
       << reinterpret_cast<void*>(sample->pc) << kNext << Time();
   if (sample->has_external_callback) {
@@ -1758,9 +1727,7 @@ void Logger::ICEvent(const char* type, bool keyed, Handle<Map> map,
                      Handle<Object> key, char old_state, char new_state,
                      const char* modifier, const char* slow_stub_reason) {
   if (!FLAG_trace_ic) return;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   if (keyed) msg << "Keyed";
   int line;
   int column;
@@ -1794,9 +1761,7 @@ void Logger::MapEvent(const char* type, Handle<Map> from, Handle<Map> to,
   if (!isolate_->bootstrapper()->IsActive()) {
     pc = isolate_->GetAbstractPC(&line, &column);
   }
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  MSG_BUILDER();
   msg << "map" << kNext << type << kNext << Time() << kNext
       << AsHex::Address(from.is_null() ? kNullAddress : from->ptr()) << kNext
       << AsHex::Address(to.is_null() ? kNullAddress : to->ptr()) << kNext
@@ -1808,7 +1773,7 @@ void Logger::MapEvent(const char* type, Handle<Map> from, Handle<Map> to,
       msg << Name::cast(*name_or_sfi);
     } else if (name_or_sfi->IsSharedFunctionInfo()) {
       SharedFunctionInfo sfi = SharedFunctionInfo::cast(*name_or_sfi);
-      msg << sfi.DebugName();
+      msg << sfi.DebugNameCStr().get();
 #if V8_SFI_HAS_UNIQUE_ID
       msg << " " << sfi.unique_id();
 #endif  // V8_SFI_HAS_UNIQUE_ID
@@ -1819,20 +1784,16 @@ void Logger::MapEvent(const char* type, Handle<Map> from, Handle<Map> to,
 
 void Logger::MapCreate(Map map) {
   if (!FLAG_trace_maps) return;
-  DisallowHeapAllocation no_gc;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  DisallowGarbageCollection no_gc;
+  MSG_BUILDER();
   msg << "map-create" << kNext << Time() << kNext << AsHex::Address(map.ptr());
   msg.WriteToLogFile();
 }
 
 void Logger::MapDetails(Map map) {
   if (!FLAG_trace_maps) return;
-  DisallowHeapAllocation no_gc;
-  std::unique_ptr<Log::MessageBuilder> msg_ptr = log_->NewMessageBuilder();
-  if (!msg_ptr) return;
-  Log::MessageBuilder& msg = *msg_ptr.get();
+  DisallowGarbageCollection no_gc;
+  MSG_BUILDER();
   msg << "map-details" << kNext << Time() << kNext << AsHex::Address(map.ptr())
       << kNext;
   if (FLAG_trace_maps_details) {
@@ -1843,23 +1804,13 @@ void Logger::MapDetails(Map map) {
   msg.WriteToLogFile();
 }
 
-static void AddFunctionAndCode(SharedFunctionInfo sfi, AbstractCode code_object,
-                               Handle<SharedFunctionInfo>* sfis,
-                               Handle<AbstractCode>* code_objects, int offset) {
-  if (sfis != nullptr) {
-    sfis[offset] = Handle<SharedFunctionInfo>(sfi, sfi.GetIsolate());
-  }
-  if (code_objects != nullptr) {
-    code_objects[offset] = Handle<AbstractCode>(code_object, sfi.GetIsolate());
-  }
-}
-
-static int EnumerateCompiledFunctions(Heap* heap,
-                                      Handle<SharedFunctionInfo>* sfis,
-                                      Handle<AbstractCode>* code_objects) {
+static std::vector<std::pair<Handle<SharedFunctionInfo>, Handle<AbstractCode>>>
+EnumerateCompiledFunctions(Heap* heap) {
   HeapObjectIterator iterator(heap);
-  DisallowHeapAllocation no_gc;
-  int compiled_funcs_count = 0;
+  DisallowGarbageCollection no_gc;
+  std::vector<std::pair<Handle<SharedFunctionInfo>, Handle<AbstractCode>>>
+      compiled_funcs;
+  Isolate* isolate = heap->isolate();
 
   // Iterate the heap to find JSFunctions and record their optimized code.
   for (HeapObject obj = iterator.Next(); !obj.is_null();
@@ -1867,9 +1818,9 @@ static int EnumerateCompiledFunctions(Heap* heap,
     if (obj.IsSharedFunctionInfo()) {
       SharedFunctionInfo sfi = SharedFunctionInfo::cast(obj);
       if (sfi.is_compiled() && !sfi.IsInterpreted()) {
-        AddFunctionAndCode(sfi, AbstractCode::cast(sfi.abstract_code()), sfis,
-                           code_objects, compiled_funcs_count);
-        ++compiled_funcs_count;
+        compiled_funcs.emplace_back(
+            handle(sfi, isolate),
+            handle(AbstractCode::cast(sfi.abstract_code(isolate)), isolate));
       }
     } else if (obj.IsJSFunction()) {
       // Given that we no longer iterate over all optimized JSFunctions, we need
@@ -1880,10 +1831,9 @@ static int EnumerateCompiledFunctions(Heap* heap,
       // only on a type feedback vector. We should make this mroe precise.
       if (function.HasAttachedOptimizedCode() &&
           Script::cast(function.shared().script()).HasValidSource()) {
-        AddFunctionAndCode(function.shared(),
-                           AbstractCode::cast(function.code()), sfis,
-                           code_objects, compiled_funcs_count);
-        ++compiled_funcs_count;
+        compiled_funcs.emplace_back(
+            handle(function.shared(), isolate),
+            handle(AbstractCode::cast(function.code()), isolate));
       }
     }
   }
@@ -1897,38 +1847,30 @@ static int EnumerateCompiledFunctions(Heap* heap,
     for (SharedFunctionInfo sfi = sfi_iterator.Next(); !sfi.is_null();
          sfi = sfi_iterator.Next()) {
       if (sfi.is_compiled()) {
-        AddFunctionAndCode(sfi, AbstractCode::cast(sfi.abstract_code()), sfis,
-                           code_objects, compiled_funcs_count);
-        ++compiled_funcs_count;
+        compiled_funcs.emplace_back(
+            handle(sfi, isolate),
+            handle(AbstractCode::cast(sfi.abstract_code(isolate)), isolate));
       }
     }
   }
 
-  return compiled_funcs_count;
+  return compiled_funcs;
 }
 
-static int EnumerateWasmModuleObjects(
-    Heap* heap, Handle<WasmModuleObject>* module_objects) {
+static std::vector<Handle<WasmModuleObject>> EnumerateWasmModuleObjects(
+    Heap* heap) {
   HeapObjectIterator iterator(heap);
-  DisallowHeapAllocation no_gc;
-  int module_objects_count = 0;
+  DisallowGarbageCollection no_gc;
+  std::vector<Handle<WasmModuleObject>> module_objects;
 
   for (HeapObject obj = iterator.Next(); !obj.is_null();
        obj = iterator.Next()) {
     if (obj.IsWasmModuleObject()) {
       WasmModuleObject module = WasmModuleObject::cast(obj);
-      if (module_objects != nullptr) {
-        module_objects[module_objects_count] =
-            handle(module, Isolate::FromHeap(heap));
-      }
-      module_objects_count++;
+      module_objects.emplace_back(module, Isolate::FromHeap(heap));
     }
   }
-  return module_objects_count;
-}
-
-void Logger::LogCodeObject(Object object) {
-  existing_code_logger_.LogCodeObject(object);
+  return module_objects;
 }
 
 void Logger::LogCodeObjects() { existing_code_logger_.LogCodeObjects(); }
@@ -1945,7 +1887,7 @@ void Logger::LogCompiledFunctions() {
 void Logger::LogAccessorCallbacks() {
   Heap* heap = isolate_->heap();
   HeapObjectIterator iterator(heap);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   for (HeapObject obj = iterator.Next(); !obj.is_null();
        obj = iterator.Next()) {
     if (!obj.IsAccessorInfo()) continue;
@@ -1971,7 +1913,7 @@ void Logger::LogAccessorCallbacks() {
 }
 
 void Logger::LogAllMaps() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Heap* heap = isolate_->heap();
   CombinedHeapObjectIterator iterator(heap);
   for (HeapObject obj = iterator.Next(); !obj.is_null();
@@ -2219,7 +2161,7 @@ void ExistingCodeLogger::LogCodeObject(Object object) {
 void ExistingCodeLogger::LogCodeObjects() {
   Heap* heap = isolate_->heap();
   HeapObjectIterator iterator(heap);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   for (HeapObject obj = iterator.Next(); !obj.is_null();
        obj = iterator.Next()) {
     if (obj.IsCode()) LogCodeObject(obj);
@@ -2230,35 +2172,31 @@ void ExistingCodeLogger::LogCodeObjects() {
 void ExistingCodeLogger::LogCompiledFunctions() {
   Heap* heap = isolate_->heap();
   HandleScope scope(isolate_);
-  const int compiled_funcs_count =
-      EnumerateCompiledFunctions(heap, nullptr, nullptr);
-  ScopedVector<Handle<SharedFunctionInfo>> sfis(compiled_funcs_count);
-  ScopedVector<Handle<AbstractCode>> code_objects(compiled_funcs_count);
-  EnumerateCompiledFunctions(heap, sfis.begin(), code_objects.begin());
+  std::vector<std::pair<Handle<SharedFunctionInfo>, Handle<AbstractCode>>>
+      compiled_funcs = EnumerateCompiledFunctions(heap);
 
   // During iteration, there can be heap allocation due to
   // GetScriptLineNumber call.
-  for (int i = 0; i < compiled_funcs_count; ++i) {
-    SharedFunctionInfo::EnsureSourcePositionsAvailable(isolate_, sfis[i]);
-    if (sfis[i]->function_data(kAcquireLoad).IsInterpreterData()) {
+  for (auto& pair : compiled_funcs) {
+    SharedFunctionInfo::EnsureSourcePositionsAvailable(isolate_, pair.first);
+    if (pair.first->function_data(kAcquireLoad).IsInterpreterData()) {
       LogExistingFunction(
-          sfis[i],
+          pair.first,
           Handle<AbstractCode>(
-              AbstractCode::cast(sfis[i]->InterpreterTrampoline()), isolate_),
+              AbstractCode::cast(pair.first->InterpreterTrampoline()),
+              isolate_),
           CodeEventListener::INTERPRETED_FUNCTION_TAG);
     }
-    if (code_objects[i].is_identical_to(BUILTIN_CODE(isolate_, CompileLazy)))
+    if (pair.second.is_identical_to(BUILTIN_CODE(isolate_, CompileLazy)))
       continue;
-    LogExistingFunction(sfis[i], code_objects[i]);
+    LogExistingFunction(pair.first, pair.second);
   }
 
-  const int wasm_module_objects_count =
-      EnumerateWasmModuleObjects(heap, nullptr);
-  ScopedVector<Handle<WasmModuleObject>> module_objects(
-      wasm_module_objects_count);
-  EnumerateWasmModuleObjects(heap, module_objects.begin());
-  for (int i = 0; i < wasm_module_objects_count; ++i) {
-    module_objects[i]->native_module()->LogWasmCodes(isolate_);
+  const std::vector<Handle<WasmModuleObject>> wasm_module_objects =
+      EnumerateWasmModuleObjects(heap);
+  for (auto& module_object : wasm_module_objects) {
+    module_object->native_module()->LogWasmCodes(isolate_,
+                                                 module_object->script());
   }
 }
 
@@ -2289,8 +2227,9 @@ void ExistingCodeLogger::LogExistingFunction(
     }
   } else if (shared->IsApiFunction()) {
     // API function.
-    FunctionTemplateInfo fun_data = shared->get_api_func_data();
-    Object raw_call_data = fun_data.call_code(kAcquireLoad);
+    Handle<FunctionTemplateInfo> fun_data =
+        handle(shared->get_api_func_data(), isolate_);
+    Object raw_call_data = fun_data->call_code(kAcquireLoad);
     if (!raw_call_data.IsUndefined(isolate_)) {
       CallHandlerInfo call_data = CallHandlerInfo::cast(raw_call_data);
       Object callback_obj = call_data.callback();
@@ -2298,13 +2237,20 @@ void ExistingCodeLogger::LogExistingFunction(
 #if USES_FUNCTION_DESCRIPTORS
       entry_point = *FUNCTION_ENTRYPOINT_ADDRESS(entry_point);
 #endif
-      CALL_CODE_EVENT_HANDLER(
-          CallbackEvent(handle(shared->DebugName(), isolate_), entry_point))
+      Handle<String> fun_name = SharedFunctionInfo::DebugName(shared);
+      CALL_CODE_EVENT_HANDLER(CallbackEvent(fun_name, entry_point))
+
+      // Fast API function.
+      Address c_function = v8::ToCData<Address>(fun_data->GetCFunction());
+      if (c_function != kNullAddress) {
+        CALL_CODE_EVENT_HANDLER(CallbackEvent(fun_name, c_function))
+      }
     }
   }
 }
 
 #undef CALL_CODE_EVENT_HANDLER
+#undef MSG_BUILDER
 
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/logging/log.h b/deps/v8/src/logging/log.h
index 303fbd236afaa2..74a601ba6d3070 100644
--- a/deps/v8/src/logging/log.h
+++ b/deps/v8/src/logging/log.h
@@ -182,7 +182,7 @@ class Logger : public CodeEventListener {
   void ApiNamedPropertyAccess(const char* tag, JSObject holder, Object name);
   void ApiIndexedPropertyAccess(const char* tag, JSObject holder,
                                 uint32_t index);
-  void ApiObjectAccess(const char* tag, JSObject obj);
+  void ApiObjectAccess(const char* tag, JSReceiver obj);
   void ApiEntryCall(const char* name);
 
   // ==== Events logged by --log-code. ====
@@ -201,7 +201,8 @@ class Logger : public CodeEventListener {
                        Handle<SharedFunctionInfo> shared,
                        Handle<Name> script_name, int line, int column) override;
   void CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                       wasm::WasmName name) override;
+                       wasm::WasmName name, const char* source_url,
+                       int code_offset, int script_id) override;
 
   void CallbackEvent(Handle<Name> name, Address entry_point) override;
   void GetterCallbackEvent(Handle<Name> name, Address entry_point) override;
@@ -247,7 +248,7 @@ class Logger : public CodeEventListener {
 
   V8_EXPORT_PRIVATE void TimerEvent(StartEnd se, const char* name);
 
-  void BasicBlockCounterEvent(const char* name, int block_id, uint32_t count);
+  void BasicBlockCounterEvent(const char* name, int block_id, double count);
 
   void BuiltinHashEvent(const char* name, int hash);
 
@@ -280,9 +281,6 @@ class Logger : public CodeEventListener {
   V8_INLINE static CodeEventListener::LogEventsAndTags ToNativeByScript(
       CodeEventListener::LogEventsAndTags, Script);
 
-  // Used for logging stubs found in the snapshot.
-  void LogCodeObject(Object code_object);
-
  private:
   void UpdateIsLogging(bool value);
 
@@ -314,6 +312,10 @@ class Logger : public CodeEventListener {
   // each script is logged only once.
   bool EnsureLogScriptSource(Script script);
 
+  void LogSourceCodeInformation(Handle<AbstractCode> code,
+                                Handle<SharedFunctionInfo> shared);
+  void LogCodeDisassemble(Handle<AbstractCode> code);
+
   int64_t Time();
 
   Isolate* isolate_;
@@ -372,7 +374,7 @@ TIMER_EVENTS_LIST(V)
 #undef V
 
 template <class TimerEvent>
-class TimerEventScope {
+class V8_NODISCARD TimerEventScope {
  public:
   explicit TimerEventScope(Isolate* isolate) : isolate_(isolate) {
     LogTimerEvent(Logger::START);
@@ -402,7 +404,8 @@ class V8_EXPORT_PRIVATE CodeEventLogger : public CodeEventListener {
                        Handle<SharedFunctionInfo> shared,
                        Handle<Name> script_name, int line, int column) override;
   void CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                       wasm::WasmName name) override;
+                       wasm::WasmName name, const char* source_url,
+                       int code_offset, int script_id) override;
 
   void RegExpCodeCreateEvent(Handle<AbstractCode> code,
                              Handle<String> source) override;
@@ -461,7 +464,8 @@ class ExternalCodeEventListener : public CodeEventListener {
                        Handle<SharedFunctionInfo> shared, Handle<Name> source,
                        int line, int column) override;
   void CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                       wasm::WasmName name) override;
+                       wasm::WasmName name, const char* source_url,
+                       int code_offset, int script_id) override;
 
   void RegExpCodeCreateEvent(Handle<AbstractCode> code,
                              Handle<String> source) override;
diff --git a/deps/v8/src/logging/metrics.h b/deps/v8/src/logging/metrics.h
index 0b59deb1fd3d5e..9f0a2afa6524fd 100644
--- a/deps/v8/src/logging/metrics.h
+++ b/deps/v8/src/logging/metrics.h
@@ -83,7 +83,7 @@ class Recorder : public std::enable_shared_from_this<Recorder> {
 
 template <class T, int64_t (base::TimeDelta::*precision)() const =
                        &base::TimeDelta::InMicroseconds>
-class TimedScope {
+class V8_NODISCARD TimedScope {
  public:
   explicit TimedScope(T* event) : event_(event) { Start(); }
   ~TimedScope() { Stop(); }
diff --git a/deps/v8/src/numbers/bignum.cc b/deps/v8/src/numbers/bignum.cc
index bf443f5a286cde..8698ec537fc7af 100644
--- a/deps/v8/src/numbers/bignum.cc
+++ b/deps/v8/src/numbers/bignum.cc
@@ -155,7 +155,7 @@ void Bignum::AddBignum(const Bignum& other) {
   //  cccccccccccc 0000
   // In both cases we might need a carry bigit.
 
-  EnsureCapacity(1 + Max(BigitLength(), other.BigitLength()) - exponent_);
+  EnsureCapacity(1 + std::max(BigitLength(), other.BigitLength()) - exponent_);
   Chunk carry = 0;
   int bigit_pos = other.exponent_ - exponent_;
   DCHECK_GE(bigit_pos, 0);
@@ -172,7 +172,7 @@ void Bignum::AddBignum(const Bignum& other) {
     carry = sum >> kBigitSize;
     bigit_pos++;
   }
-  used_digits_ = Max(bigit_pos, used_digits_);
+  used_digits_ = std::max(bigit_pos, used_digits_);
   DCHECK(IsClamped());
 }
 
@@ -569,7 +569,8 @@ int Bignum::Compare(const Bignum& a, const Bignum& b) {
   int bigit_length_b = b.BigitLength();
   if (bigit_length_a < bigit_length_b) return -1;
   if (bigit_length_a > bigit_length_b) return +1;
-  for (int i = bigit_length_a - 1; i >= Min(a.exponent_, b.exponent_); --i) {
+  for (int i = bigit_length_a - 1; i >= std::min(a.exponent_, b.exponent_);
+       --i) {
     Chunk bigit_a = a.BigitAt(i);
     Chunk bigit_b = b.BigitAt(i);
     if (bigit_a < bigit_b) return -1;
@@ -597,7 +598,7 @@ int Bignum::PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c) {
 
   Chunk borrow = 0;
   // Starting at min_exponent all digits are == 0. So no need to compare them.
-  int min_exponent = Min(Min(a.exponent_, b.exponent_), c.exponent_);
+  int min_exponent = std::min({a.exponent_, b.exponent_, c.exponent_});
   for (int i = c.BigitLength() - 1; i >= min_exponent; --i) {
     Chunk chunk_a = a.BigitAt(i);
     Chunk chunk_b = b.BigitAt(i);
diff --git a/deps/v8/src/numbers/bignum.h b/deps/v8/src/numbers/bignum.h
index fdcd176c4ef76f..1fdfa4032595d3 100644
--- a/deps/v8/src/numbers/bignum.h
+++ b/deps/v8/src/numbers/bignum.h
@@ -18,6 +18,8 @@ class V8_EXPORT_PRIVATE Bignum {
   static const int kMaxSignificantBits = 3584;
 
   Bignum();
+  Bignum(const Bignum&) = delete;
+  Bignum& operator=(const Bignum&) = delete;
   void AssignUInt16(uint16_t value);
   void AssignUInt64(uint64_t value);
   void AssignBignum(const Bignum& other);
@@ -111,8 +113,6 @@ class V8_EXPORT_PRIVATE Bignum {
   int used_digits_;
   // The Bignum's value equals value(bigits_) * 2^(exponent_ * kBigitSize).
   int exponent_;
-
-  DISALLOW_COPY_AND_ASSIGN(Bignum);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/numbers/conversions-inl.h b/deps/v8/src/numbers/conversions-inl.h
index 08502d4c672551..2e1823e4bcf1f8 100644
--- a/deps/v8/src/numbers/conversions-inl.h
+++ b/deps/v8/src/numbers/conversions-inl.h
@@ -16,6 +16,7 @@
 
 #include "src/base/bits.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/numbers/conversions.h"
 #include "src/numbers/double.h"
 #include "src/objects/heap-number-inl.h"
@@ -50,7 +51,7 @@ inline unsigned int FastD2UI(double x) {
         reinterpret_cast<void*>(reinterpret_cast<Address>(&x) + kInt32Size);
 #endif
     // Copy least significant 32 bits of mantissa.
-    memcpy(&result, mantissa_ptr, sizeof(result));
+    base::Memcpy(&result, mantissa_ptr, sizeof(result));
     return negative ? ~result + 1 : result;
   }
   // Large number (outside uint32 range), Infinity or NaN.
diff --git a/deps/v8/src/numbers/conversions.cc b/deps/v8/src/numbers/conversions.cc
index 1423bd6fcdc250..d7c31c2e71cc58 100644
--- a/deps/v8/src/numbers/conversions.cc
+++ b/deps/v8/src/numbers/conversions.cc
@@ -9,6 +9,7 @@
 
 #include <cmath>
 
+#include "src/base/platform/wrappers.h"
 #include "src/common/assert-scope.h"
 #include "src/handles/handles.h"
 #include "src/heap/factory.h"
@@ -16,6 +17,7 @@
 #include "src/numbers/strtod.h"
 #include "src/objects/bigint.h"
 #include "src/objects/objects-inl.h"
+#include "src/objects/string-inl.h"
 #include "src/strings/char-predicates-inl.h"
 #include "src/utils/allocation.h"
 #include "src/utils/utils.h"
@@ -228,12 +230,12 @@ class StringToIntHelper {
     if (raw_one_byte_subject_ != nullptr) {
       return Vector<const uint8_t>(raw_one_byte_subject_, length_);
     }
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     return subject_->GetFlatContent(no_gc).ToOneByteVector();
   }
 
   Vector<const uc16> GetTwoByteVector() {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     return subject_->GetFlatContent(no_gc).ToUC16Vector();
   }
 
@@ -268,7 +270,7 @@ class StringToIntHelper {
 template <typename LocalIsolate>
 void StringToIntHelper<LocalIsolate>::ParseInt() {
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     if (IsOneByte()) {
       Vector<const uint8_t> vector = GetOneByteVector();
       DetectRadixInternal(vector.begin(), vector.length());
@@ -283,7 +285,7 @@ void StringToIntHelper<LocalIsolate>::ParseInt() {
   if (state_ != State::kRunning) return;
   do {
     {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       if (IsOneByte()) {
         Vector<const uint8_t> vector = GetOneByteVector();
         DCHECK_EQ(length_, vector.length());
@@ -497,7 +499,7 @@ class NumberParseIntHelper : public StringToIntHelper<Isolate> {
   void HandleSpecialCases() override {
     bool is_power_of_two = base::bits::IsPowerOfTwo(radix());
     if (!is_power_of_two && radix() != 10) return;
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     if (IsOneByte()) {
       Vector<const uint8_t> vector = GetOneByteVector();
       DCHECK_EQ(length(), vector.length());
@@ -1242,7 +1244,7 @@ char* DoubleToPrecisionCString(double value, int p) {
       builder.AddString(decimal_rep);
       builder.AddPadding('0', p - decimal_rep_length);
     } else {
-      const int m = Min(decimal_rep_length, decimal_point);
+      const int m = std::min(decimal_rep_length, decimal_point);
       builder.AddSubstring(decimal_rep, m);
       builder.AddPadding('0', decimal_point - decimal_rep_length);
       if (decimal_point < p) {
@@ -1252,7 +1254,7 @@ char* DoubleToPrecisionCString(double value, int p) {
           const size_t len = strlen(decimal_rep + decimal_point);
           DCHECK_GE(kMaxInt, len);
           const int n =
-              Min(static_cast<int>(len), p - (builder.position() - extra));
+              std::min(static_cast<int>(len), p - (builder.position() - extra));
           builder.AddSubstring(decimal_rep + decimal_point, n);
         }
         builder.AddPadding('0', extra + (p - builder.position()));
@@ -1347,7 +1349,8 @@ char* DoubleToRadixCString(double value, int radix) {
   DCHECK_LE(0, integer_cursor);
   // Allocate new string as return value.
   char* result = NewArray<char>(fraction_cursor - integer_cursor);
-  memcpy(result, buffer + integer_cursor, fraction_cursor - integer_cursor);
+  base::Memcpy(result, buffer + integer_cursor,
+               fraction_cursor - integer_cursor);
   return result;
 }
 
@@ -1356,7 +1359,7 @@ double StringToDouble(Isolate* isolate, Handle<String> string, int flags,
                       double empty_string_val) {
   Handle<String> flattened = String::Flatten(isolate, string);
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent flat = flattened->GetFlatContent(no_gc);
     DCHECK(flat.IsFlat());
     if (flat.IsOneByte()) {
@@ -1367,6 +1370,23 @@ double StringToDouble(Isolate* isolate, Handle<String> string, int flags,
   }
 }
 
+base::Optional<double> TryStringToDouble(LocalIsolate* isolate,
+                                         Handle<String> object,
+                                         int max_length_for_conversion) {
+  DisallowGarbageCollection no_gc;
+  int length = object->length();
+  if (length > max_length_for_conversion) {
+    return base::nullopt;
+  }
+
+  const int flags = ALLOW_HEX | ALLOW_OCTAL | ALLOW_BINARY;
+  auto buffer = std::make_unique<uc16[]>(max_length_for_conversion);
+  SharedStringAccessGuardIfNeeded access_guard(isolate);
+  String::WriteToFlat(*object, buffer.get(), 0, length, access_guard);
+  Vector<const uc16> v(buffer.get(), length);
+  return StringToDouble(v, flags);
+}
+
 bool IsSpecialIndex(String string) {
   // Max length of canonical double: -X.XXXXXXXXXXXXXXXXX-eXXX
   const int kBufferSize = 24;
diff --git a/deps/v8/src/numbers/conversions.h b/deps/v8/src/numbers/conversions.h
index fa90ee2a6effb6..d4a09e1b20cf63 100644
--- a/deps/v8/src/numbers/conversions.h
+++ b/deps/v8/src/numbers/conversions.h
@@ -7,6 +7,7 @@
 
 #include "src/base/export-template.h"
 #include "src/base/logging.h"
+#include "src/base/optional.h"
 #include "src/common/globals.h"
 #include "src/utils/vector.h"
 
@@ -160,6 +161,14 @@ inline uint64_t PositiveNumberToUint64(Object number);
 double StringToDouble(Isolate* isolate, Handle<String> string, int flags,
                       double empty_string_val = 0.0);
 
+// String to double helper without heap allocation.
+// Returns base::nullopt if the string is longer than
+// {max_length_for_conversion}. 23 was chosen because any representable double
+// can be represented using a string of length 23.
+V8_EXPORT_PRIVATE base::Optional<double> TryStringToDouble(
+    LocalIsolate* isolate, Handle<String> object,
+    int max_length_for_conversion = 23);
+
 inline bool TryNumberToSize(Object number, size_t* result);
 
 // Converts a number into size_t.
diff --git a/deps/v8/src/numbers/math-random.cc b/deps/v8/src/numbers/math-random.cc
index d45b4d0a5f113f..8afed862d4be15 100644
--- a/deps/v8/src/numbers/math-random.cc
+++ b/deps/v8/src/numbers/math-random.cc
@@ -34,7 +34,7 @@ void MathRandom::ResetContext(Context native_context) {
 
 Address MathRandom::RefillCache(Isolate* isolate, Address raw_native_context) {
   Context native_context = Context::cast(Object(raw_native_context));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   PodArray<State> pod =
       PodArray<State>::cast(native_context.math_random_state());
   State state = pod.get(0);
diff --git a/deps/v8/src/objects/backing-store.cc b/deps/v8/src/objects/backing-store.cc
index 9f755f5d044578..fd044335da7b3e 100644
--- a/deps/v8/src/objects/backing-store.cc
+++ b/deps/v8/src/objects/backing-store.cc
@@ -6,6 +6,7 @@
 
 #include <cstring>
 
+#include "src/base/platform/wrappers.h"
 #include "src/execution/isolate.h"
 #include "src/handles/global-handles.h"
 #include "src/logging/counters.h"
@@ -464,7 +465,8 @@ std::unique_ptr<BackingStore> BackingStore::CopyWasmMemory(Isolate* isolate,
     // If the allocation was successful, then the new buffer must be at least
     // as big as the old one.
     DCHECK_GE(new_pages * wasm::kWasmPageSize, byte_length_);
-    memcpy(new_backing_store->buffer_start(), buffer_start_, byte_length_);
+    base::Memcpy(new_backing_store->buffer_start(), buffer_start_,
+                 byte_length_);
   }
 
   return new_backing_store;
diff --git a/deps/v8/src/objects/bigint.cc b/deps/v8/src/objects/bigint.cc
index 129bb14b2050ec..7c562465cb06ed 100644
--- a/deps/v8/src/objects/bigint.cc
+++ b/deps/v8/src/objects/bigint.cc
@@ -240,6 +240,7 @@ class MutableBigInt : public FreshlyAllocatedBigInt {
 OBJECT_CONSTRUCTORS_IMPL(MutableBigInt, FreshlyAllocatedBigInt)
 NEVER_READ_ONLY_SPACE_IMPL(MutableBigInt)
 
+#include "src/base/platform/wrappers.h"
 #include "src/objects/object-macros-undef.h"
 
 template <typename T, typename Isolate>
@@ -361,9 +362,10 @@ Handle<MutableBigInt> MutableBigInt::Copy(Isolate* isolate,
   int length = source->length();
   // Allocating a BigInt of the same length as an existing BigInt cannot throw.
   Handle<MutableBigInt> result = New(isolate, length).ToHandleChecked();
-  memcpy(reinterpret_cast<void*>(result->address() + BigIntBase::kHeaderSize),
-         reinterpret_cast<void*>(source->address() + BigIntBase::kHeaderSize),
-         BigInt::SizeFor(length) - BigIntBase::kHeaderSize);
+  base::Memcpy(
+      reinterpret_cast<void*>(result->address() + BigIntBase::kHeaderSize),
+      reinterpret_cast<void*>(source->address() + BigIntBase::kHeaderSize),
+      BigInt::SizeFor(length) - BigIntBase::kHeaderSize);
   return result;
 }
 
@@ -1183,7 +1185,7 @@ void BigInt::BigIntShortPrint(std::ostream& os) {
 // Internal helpers.
 
 void MutableBigInt::AbsoluteAdd(MutableBigInt result, BigInt x, BigInt y) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   digit_t carry = 0;
   int i = 0;
   for (; i < y.length(); i++) {
@@ -1245,7 +1247,7 @@ Handle<BigInt> MutableBigInt::AbsoluteSub(Isolate* isolate, Handle<BigInt> x,
 }
 
 void MutableBigInt::AbsoluteSub(MutableBigInt result, BigInt x, BigInt y) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   digit_t borrow = 0;
   int i = 0;
   for (; i < y.length(); i++) {
@@ -1445,7 +1447,7 @@ int MutableBigInt::AbsoluteCompare(Handle<BigIntBase> x, Handle<BigIntBase> y) {
 }
 
 int MutableBigInt::AbsoluteCompare(BigIntBase x, BigIntBase y) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int diff = x.length() - y.length();
   if (diff != 0) return diff;
   int i = x.length() - 1;
@@ -2005,7 +2007,7 @@ void BigInt::SerializeDigits(uint8_t* storage) {
       reinterpret_cast<void*>(ptr() + kDigitsOffset - kHeapObjectTag);
 #if defined(V8_TARGET_LITTLE_ENDIAN)
   int bytelength = length() * kDigitSize;
-  memcpy(storage, digits, bytelength);
+  base::Memcpy(storage, digits, bytelength);
 #elif defined(V8_TARGET_BIG_ENDIAN)
   digit_t* digit_storage = reinterpret_cast<digit_t*>(storage);
   const digit_t* digit = reinterpret_cast<const digit_t*>(digits);
@@ -2031,7 +2033,7 @@ MaybeHandle<BigInt> BigInt::FromSerializedDigits(
   void* digits =
       reinterpret_cast<void*>(result->ptr() + kDigitsOffset - kHeapObjectTag);
 #if defined(V8_TARGET_LITTLE_ENDIAN)
-  memcpy(digits, digits_storage.begin(), bytelength);
+  base::Memcpy(digits, digits_storage.begin(), bytelength);
   void* padding_start =
       reinterpret_cast<void*>(reinterpret_cast<Address>(digits) + bytelength);
   memset(padding_start, 0, length * kDigitSize - bytelength);
@@ -2094,7 +2096,7 @@ MaybeHandle<String> MutableBigInt::ToStringBasePowerOfTwo(
       isolate->factory()
           ->NewRawOneByteString(static_cast<int>(chars_required))
           .ToHandleChecked();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   uint8_t* buffer = result->GetChars(no_gc);
   // Print the number into the string, starting from the last position.
   int pos = static_cast<int>(chars_required - 1);
@@ -2171,7 +2173,7 @@ MaybeHandle<String> MutableBigInt::ToStringGeneric(Isolate* isolate,
 #if DEBUG
   // Zap the string first.
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     uint8_t* chars = result->GetChars(no_gc);
     for (int i = 0; i < static_cast<int>(chars_required); i++) chars[i] = '?';
   }
@@ -2205,7 +2207,7 @@ MaybeHandle<String> MutableBigInt::ToStringGeneric(Isolate* isolate,
       AbsoluteDivSmall(isolate, *dividend, chunk_divisor, &rest, &chunk);
       DCHECK(!rest.is_null());
       dividend = reinterpret_cast<Handle<BigIntBase>*>(&rest);
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       uint8_t* chars = result->GetChars(no_gc);
       for (int i = 0; i < chunk_chars; i++) {
         chars[pos++] = kConversionChars[chunk % radix];
@@ -2227,7 +2229,7 @@ MaybeHandle<String> MutableBigInt::ToStringGeneric(Isolate* isolate,
         StackLimitCheck interrupt_check(isolate);
         if (interrupt_check.InterruptRequested()) {
           {
-            AllowHeapAllocation might_throw;
+            AllowGarbageCollection might_throw;
             if (isolate->stack_guard()->HandleInterrupts().IsException(
                     isolate)) {
               return MaybeHandle<String>();
@@ -2241,7 +2243,7 @@ MaybeHandle<String> MutableBigInt::ToStringGeneric(Isolate* isolate,
     } while (nonzero_digit > 0);
     last_digit = rest->digit(0);
   }
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   uint8_t* chars = result->GetChars(no_gc);
   do {
     chars[pos++] = kConversionChars[last_digit % radix];
@@ -2735,7 +2737,7 @@ void MutableBigInt::set_64_bits(uint64_t bits) {
 
 #ifdef OBJECT_PRINT
 void BigIntBase::BigIntBasePrint(std::ostream& os) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   PrintHeader(os, "BigInt");
   int len = length();
   os << "\n- length: " << len;
diff --git a/deps/v8/src/objects/code-inl.h b/deps/v8/src/objects/code-inl.h
index 1a928b20f1bc1a..26eedcac09fc9c 100644
--- a/deps/v8/src/objects/code-inl.h
+++ b/deps/v8/src/objects/code-inl.h
@@ -770,7 +770,8 @@ DEFINE_DEOPT_ELEMENT_ACCESSORS(OsrPcOffset, Smi)
 DEFINE_DEOPT_ELEMENT_ACCESSORS(OptimizationId, Smi)
 DEFINE_DEOPT_ELEMENT_ACCESSORS(InliningPositions, PodArray<InliningPosition>)
 DEFINE_DEOPT_ELEMENT_ACCESSORS(DeoptExitStart, Smi)
-DEFINE_DEOPT_ELEMENT_ACCESSORS(NonLazyDeoptCount, Smi)
+DEFINE_DEOPT_ELEMENT_ACCESSORS(EagerSoftAndBailoutDeoptCount, Smi)
+DEFINE_DEOPT_ELEMENT_ACCESSORS(LazyDeoptCount, Smi)
 
 DEFINE_DEOPT_ENTRY_ACCESSORS(BytecodeOffsetRaw, Smi)
 DEFINE_DEOPT_ENTRY_ACCESSORS(TranslationIndex, Smi)
diff --git a/deps/v8/src/objects/code-kind.cc b/deps/v8/src/objects/code-kind.cc
index 51f7dd707960a8..48b28ea11d46c7 100644
--- a/deps/v8/src/objects/code-kind.cc
+++ b/deps/v8/src/objects/code-kind.cc
@@ -18,5 +18,20 @@ const char* CodeKindToString(CodeKind kind) {
   UNREACHABLE();
 }
 
+const char* CodeKindToMarker(CodeKind kind) {
+  switch (kind) {
+    case CodeKind::INTERPRETED_FUNCTION:
+      return "~";
+    case CodeKind::NATIVE_CONTEXT_INDEPENDENT:
+      return "-";
+    case CodeKind::TURBOPROP:
+      return "+";
+    case CodeKind::TURBOFAN:
+      return "*";
+    default:
+      return "";
+  }
+}
+
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/objects/code-kind.h b/deps/v8/src/objects/code-kind.h
index 6314005649d86c..c5ac4c49c666bc 100644
--- a/deps/v8/src/objects/code-kind.h
+++ b/deps/v8/src/objects/code-kind.h
@@ -47,6 +47,8 @@ static constexpr int kCodeKindCount = CODE_KIND_LIST(V);
 
 const char* CodeKindToString(CodeKind kind);
 
+const char* CodeKindToMarker(CodeKind kind);
+
 inline constexpr bool CodeKindIsInterpretedJSFunction(CodeKind kind) {
   return kind == CodeKind::INTERPRETED_FUNCTION;
 }
diff --git a/deps/v8/src/objects/code.cc b/deps/v8/src/objects/code.cc
index 1004180669ecd4..c78246f3cb327e 100644
--- a/deps/v8/src/objects/code.cc
+++ b/deps/v8/src/objects/code.cc
@@ -250,6 +250,7 @@ bool Code::IsIsolateIndependent(Isolate* isolate) {
                  RelocInfo::ModeMask(RelocInfo::RELATIVE_CODE_TARGET) |
                  RelocInfo::ModeMask(RelocInfo::COMPRESSED_EMBEDDED_OBJECT) |
                  RelocInfo::ModeMask(RelocInfo::FULL_EMBEDDED_OBJECT) |
+                 RelocInfo::ModeMask(RelocInfo::DATA_EMBEDDED_OBJECT) |
                  RelocInfo::ModeMask(RelocInfo::EXTERNAL_REFERENCE) |
                  RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE) |
                  RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE_ENCODED) |
@@ -305,6 +306,7 @@ bool Code::IsNativeContextIndependent(Isolate* isolate) {
                  RelocInfo::ModeMask(RelocInfo::RELATIVE_CODE_TARGET) |
                  RelocInfo::ModeMask(RelocInfo::COMPRESSED_EMBEDDED_OBJECT) |
                  RelocInfo::ModeMask(RelocInfo::FULL_EMBEDDED_OBJECT) |
+                 RelocInfo::ModeMask(RelocInfo::DATA_EMBEDDED_OBJECT) |
                  RelocInfo::ModeMask(RelocInfo::WASM_CALL) |
                  RelocInfo::ModeMask(RelocInfo::WASM_STUB_CALL)));
 
@@ -347,7 +349,7 @@ bool Code::IsNativeContextIndependent(Isolate* isolate) {
 bool Code::Inlines(SharedFunctionInfo sfi) {
   // We can only check for inlining for optimized code.
   DCHECK(is_optimized_code());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DeoptimizationData const data =
       DeoptimizationData::cast(deoptimization_data());
   if (data.length() == 0) return false;
@@ -496,7 +498,7 @@ void DeoptimizationData::DeoptimizationDataPrint(std::ostream& os) {  // NOLINT
           int return_value_count = iterator.Next();
           Object shared_info = LiteralArray().get(shared_info_id);
           os << "{bytecode_offset=" << bytecode_offset << ", function="
-             << Brief(SharedFunctionInfo::cast(shared_info).DebugName())
+             << SharedFunctionInfo::cast(shared_info).DebugNameCStr().get()
              << ", height=" << height << ", retval=@" << return_value_offset
              << "(#" << return_value_count << ")}";
           break;
@@ -508,7 +510,7 @@ void DeoptimizationData::DeoptimizationDataPrint(std::ostream& os) {  // NOLINT
           Object shared_info = LiteralArray().get(shared_info_id);
           unsigned height = iterator.Next();
           os << "{bailout_id=" << bailout_id << ", function="
-             << Brief(SharedFunctionInfo::cast(shared_info).DebugName())
+             << SharedFunctionInfo::cast(shared_info).DebugNameCStr().get()
              << ", height=" << height << "}";
           break;
         }
@@ -521,7 +523,7 @@ void DeoptimizationData::DeoptimizationDataPrint(std::ostream& os) {  // NOLINT
           Object shared_info = LiteralArray().get(shared_info_id);
           unsigned height = iterator.Next();
           os << "{bailout_id=" << bailout_id << ", function="
-             << Brief(SharedFunctionInfo::cast(shared_info).DebugName())
+             << SharedFunctionInfo::cast(shared_info).DebugNameCStr().get()
              << ", height=" << height << "}";
           break;
         }
@@ -531,7 +533,7 @@ void DeoptimizationData::DeoptimizationDataPrint(std::ostream& os) {  // NOLINT
           Object shared_info = LiteralArray().get(shared_info_id);
           unsigned height = iterator.Next();
           os << "{function="
-             << Brief(SharedFunctionInfo::cast(shared_info).DebugName())
+             << SharedFunctionInfo::cast(shared_info).DebugNameCStr().get()
              << ", height=" << height << "}";
           break;
         }
@@ -670,7 +672,7 @@ inline void DisassembleCodeRange(Isolate* isolate, std::ostream& os, Code code,
                                  Address current_pc) {
   Address end = begin + size;
   AllowHandleAllocation allow_handles;
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   HandleScope handle_scope(isolate);
   Disassembler::Decode(isolate, &os, reinterpret_cast<byte*>(begin),
                        reinterpret_cast<byte*>(end),
@@ -812,7 +814,7 @@ void Code::Disassemble(const char* name, std::ostream& os, Isolate* isolate,
 #endif  // ENABLE_DISASSEMBLER
 
 void BytecodeArray::Disassemble(std::ostream& os) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   os << "Parameter count " << parameter_count() << "\n";
   os << "Register count " << register_count() << "\n";
@@ -1042,7 +1044,7 @@ bool DependentCode::MarkCodeForDeoptimization(
     return next_link().MarkCodeForDeoptimization(group);
   }
   DCHECK_EQ(group, this->group());
-  DisallowHeapAllocation no_allocation_scope;
+  DisallowGarbageCollection no_gc_scope;
   // Mark all the code that needs to be deoptimized.
   bool marked = false;
   int count = this->count();
@@ -1064,7 +1066,7 @@ bool DependentCode::MarkCodeForDeoptimization(
 
 void DependentCode::DeoptimizeDependentCodeGroup(
     DependentCode::DependencyGroup group) {
-  DisallowHeapAllocation no_allocation_scope;
+  DisallowGarbageCollection no_gc_scope;
   bool marked = MarkCodeForDeoptimization(group);
   if (marked) {
     DCHECK(AllowCodeDependencyChange::IsAllowed());
diff --git a/deps/v8/src/objects/code.h b/deps/v8/src/objects/code.h
index 201f17773a6742..f73e63b9e2b02c 100644
--- a/deps/v8/src/objects/code.h
+++ b/deps/v8/src/objects/code.h
@@ -530,7 +530,7 @@ class Code::OptimizedCodeIterator {
   Code current_code_;
   Isolate* isolate_;
 
-  DISALLOW_HEAP_ALLOCATION(no_gc)
+  DISALLOW_GARBAGE_COLLECTION(no_gc)
 };
 
 class AbstractCode : public HeapObject {
@@ -850,8 +850,9 @@ class DeoptimizationData : public FixedArray {
   static const int kSharedFunctionInfoIndex = 6;
   static const int kInliningPositionsIndex = 7;
   static const int kDeoptExitStartIndex = 8;
-  static const int kNonLazyDeoptCountIndex = 9;
-  static const int kFirstDeoptEntryIndex = 10;
+  static const int kEagerSoftAndBailoutDeoptCountIndex = 9;
+  static const int kLazyDeoptCountIndex = 10;
+  static const int kFirstDeoptEntryIndex = 11;
 
   // Offsets of deopt entry elements relative to the start of the entry.
   static const int kBytecodeOffsetRawOffset = 0;
@@ -873,7 +874,8 @@ class DeoptimizationData : public FixedArray {
   DECL_ELEMENT_ACCESSORS(SharedFunctionInfo, Object)
   DECL_ELEMENT_ACCESSORS(InliningPositions, PodArray<InliningPosition>)
   DECL_ELEMENT_ACCESSORS(DeoptExitStart, Smi)
-  DECL_ELEMENT_ACCESSORS(NonLazyDeoptCount, Smi)
+  DECL_ELEMENT_ACCESSORS(EagerSoftAndBailoutDeoptCount, Smi)
+  DECL_ELEMENT_ACCESSORS(LazyDeoptCount, Smi)
 
 #undef DECL_ELEMENT_ACCESSORS
 
diff --git a/deps/v8/src/objects/compilation-cache-table-inl.h b/deps/v8/src/objects/compilation-cache-table-inl.h
index 473eed496cc92c..496332490e10ac 100644
--- a/deps/v8/src/objects/compilation-cache-table-inl.h
+++ b/deps/v8/src/objects/compilation-cache-table-inl.h
@@ -27,14 +27,14 @@ NEVER_READ_ONLY_SPACE_IMPL(CompilationCacheTable)
 CAST_ACCESSOR(CompilationCacheTable)
 
 uint32_t CompilationCacheShape::RegExpHash(String string, Smi flags) {
-  return string.Hash() + flags.value();
+  return string.EnsureHash() + flags.value();
 }
 
 uint32_t CompilationCacheShape::StringSharedHash(String source,
                                                  SharedFunctionInfo shared,
                                                  LanguageMode language_mode,
                                                  int position) {
-  uint32_t hash = source.Hash();
+  uint32_t hash = source.EnsureHash();
   if (shared.HasSourceCode()) {
     // Instead of using the SharedFunctionInfo pointer in the hash
     // code computation, we use a combination of the hash of the
@@ -42,7 +42,7 @@ uint32_t CompilationCacheShape::StringSharedHash(String source,
     // We do this to ensure that the cache entries can survive garbage
     // collection.
     Script script(Script::cast(shared.script()));
-    hash ^= String::cast(script.source()).Hash();
+    hash ^= String::cast(script.source()).EnsureHash();
     STATIC_ASSERT(LanguageModeSize == 2);
     if (is_strict(language_mode)) hash ^= 0x8000;
     hash += position;
diff --git a/deps/v8/src/objects/compilation-cache-table.cc b/deps/v8/src/objects/compilation-cache-table.cc
index 57cbeb040cd513..a995da3883023b 100644
--- a/deps/v8/src/objects/compilation-cache-table.cc
+++ b/deps/v8/src/objects/compilation-cache-table.cc
@@ -4,6 +4,7 @@
 
 #include "src/objects/compilation-cache-table.h"
 
+#include "src/common/assert-scope.h"
 #include "src/objects/compilation-cache-table-inl.h"
 
 namespace v8 {
@@ -21,7 +22,7 @@ const int kHashGenerations = 10;
 
 int SearchLiteralsMapEntry(CompilationCacheTable cache, int cache_entry,
                            Context native_context) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(native_context.IsNativeContext());
   Object obj = cache.get(cache_entry);
 
@@ -151,7 +152,7 @@ class StringSharedKey : public HashTableKey {
         position_(position) {}
 
   bool IsMatch(Object other) override {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     if (!other.IsFixedArray()) {
       DCHECK(other.IsNumber());
       uint32_t other_hash = static_cast<uint32_t>(other.Number());
@@ -275,7 +276,7 @@ InfoCellPair CompilationCacheTable::LookupEval(
 Handle<Object> CompilationCacheTable::LookupRegExp(Handle<String> src,
                                                    JSRegExp::Flags flags) {
   Isolate* isolate = GetIsolate();
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   RegExpKey key(src, flags);
   InternalIndex entry = FindEntry(isolate, &key);
   if (entry.is_not_found()) return isolate->factory()->undefined_value();
@@ -285,7 +286,7 @@ Handle<Object> CompilationCacheTable::LookupRegExp(Handle<String> src,
 MaybeHandle<Code> CompilationCacheTable::LookupCode(
     Handle<SharedFunctionInfo> key) {
   Isolate* isolate = GetIsolate();
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   CodeKey k(key);
   InternalIndex entry = FindEntry(isolate, &k);
   if (entry.is_not_found()) return {};
@@ -391,8 +392,8 @@ Handle<CompilationCacheTable> CompilationCacheTable::PutCode(
   return cache;
 }
 
-void CompilationCacheTable::Age() {
-  DisallowHeapAllocation no_allocation;
+void CompilationCacheTable::Age(Isolate* isolate) {
+  DisallowGarbageCollection no_gc;
   for (InternalIndex entry : IterateEntries()) {
     const int entry_index = EntryToIndex(entry);
     const int value_index = entry_index + 1;
@@ -417,7 +418,7 @@ void CompilationCacheTable::Age() {
     } else if (key.IsFixedArray()) {
       // The ageing mechanism for script and eval caches.
       SharedFunctionInfo info = SharedFunctionInfo::cast(get(value_index));
-      if (info.IsInterpreted() && info.GetBytecodeArray().IsOld()) {
+      if (info.IsInterpreted() && info.GetBytecodeArray(isolate).IsOld()) {
         RemoveEntry(entry_index);
       }
     }
@@ -425,7 +426,7 @@ void CompilationCacheTable::Age() {
 }
 
 void CompilationCacheTable::Remove(Object value) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   for (InternalIndex entry : IterateEntries()) {
     int entry_index = EntryToIndex(entry);
     int value_index = entry_index + 1;
diff --git a/deps/v8/src/objects/compilation-cache-table.h b/deps/v8/src/objects/compilation-cache-table.h
index b624767b8a5ebf..e8101943ad538e 100644
--- a/deps/v8/src/objects/compilation-cache-table.h
+++ b/deps/v8/src/objects/compilation-cache-table.h
@@ -128,7 +128,7 @@ class CompilationCacheTable
       Handle<SharedFunctionInfo> key, Handle<Code> value);
 
   void Remove(Object value);
-  void Age();
+  void Age(Isolate* isolate);
 
   DECL_CAST(CompilationCacheTable)
 
diff --git a/deps/v8/src/objects/contexts-inl.h b/deps/v8/src/objects/contexts-inl.h
index 663ce6a965da64..87f13818e909ab 100644
--- a/deps/v8/src/objects/contexts-inl.h
+++ b/deps/v8/src/objects/contexts-inl.h
@@ -25,6 +25,8 @@
 namespace v8 {
 namespace internal {
 
+#include "torque-generated/src/objects/contexts-tq-inl.inc"
+
 OBJECT_CONSTRUCTORS_IMPL(ScriptContextTable, FixedArray)
 CAST_ACCESSOR(ScriptContextTable)
 
@@ -48,39 +50,20 @@ Context ScriptContextTable::get_context(int i) const {
   return Context::cast(this->get(i + kFirstContextSlotIndex));
 }
 
-OBJECT_CONSTRUCTORS_IMPL(Context, HeapObject)
+TQ_OBJECT_CONSTRUCTORS_IMPL(Context)
 NEVER_READ_ONLY_SPACE_IMPL(Context)
-CAST_ACCESSOR(Context)
 
-SMI_ACCESSORS(Context, length, kLengthOffset)
 CAST_ACCESSOR(NativeContext)
 
-Object Context::get(int index) const {
-  IsolateRoot isolate = GetIsolateForPtrCompr(*this);
-  return get(isolate, index);
+V8_INLINE Object Context::get(int index) const { return elements(index); }
+V8_INLINE Object Context::get(IsolateRoot isolate, int index) const {
+  return elements(isolate, index);
 }
-
-Object Context::get(IsolateRoot isolate, int index) const {
-  DCHECK_LT(static_cast<unsigned>(index),
-            static_cast<unsigned>(this->length()));
-  return TaggedField<Object>::Relaxed_Load(isolate, *this,
-                                           OffsetOfElementAt(index));
+V8_INLINE void Context::set(int index, Object value) {
+  set_elements(index, value);
 }
-
-void Context::set(int index, Object value) {
-  DCHECK_LT(static_cast<unsigned>(index),
-            static_cast<unsigned>(this->length()));
-  int offset = OffsetOfElementAt(index);
-  RELAXED_WRITE_FIELD(*this, offset, value);
-  WRITE_BARRIER(*this, offset, value);
-}
-
-void Context::set(int index, Object value, WriteBarrierMode mode) {
-  DCHECK_LT(static_cast<unsigned>(index),
-            static_cast<unsigned>(this->length()));
-  int offset = OffsetOfElementAt(index);
-  RELAXED_WRITE_FIELD(*this, offset, value);
-  CONDITIONAL_WRITE_BARRIER(*this, offset, value, mode);
+V8_INLINE void Context::set(int index, Object value, WriteBarrierMode mode) {
+  set_elements(index, value, mode);
 }
 
 void Context::set_scope_info(ScopeInfo scope_info) {
@@ -261,7 +244,7 @@ int Context::FunctionMapIndex(LanguageMode language_mode, FunctionKind kind,
 Map Context::GetInitialJSArrayMap(ElementsKind kind) const {
   DCHECK(IsNativeContext());
   if (!IsFastElementsKind(kind)) return Map();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object const initial_js_array_map = get(Context::ArrayMapIndex(kind));
   DCHECK(!initial_js_array_map.IsUndefined());
   return Map::cast(initial_js_array_map);
diff --git a/deps/v8/src/objects/contexts.cc b/deps/v8/src/objects/contexts.cc
index acbee9d5108cd0..af73bf02568721 100644
--- a/deps/v8/src/objects/contexts.cc
+++ b/deps/v8/src/objects/contexts.cc
@@ -49,7 +49,7 @@ void Context::Initialize(Isolate* isolate) {
 
 bool ScriptContextTable::Lookup(Isolate* isolate, ScriptContextTable table,
                                 String name, LookupResult* result) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Static variables cannot be in script contexts.
   IsStaticFlag is_static_flag;
   for (int i = 0; i < table.synchronized_used(); i++) {
@@ -216,7 +216,7 @@ Handle<Object> Context::Lookup(Handle<Context> context, Handle<String> name,
       Handle<JSReceiver> object(context->extension_receiver(), isolate);
 
       if (context->IsNativeContext()) {
-        DisallowHeapAllocation no_gc;
+        DisallowGarbageCollection no_gc;
         if (FLAG_trace_contexts) {
           PrintF(" - trying other script contexts\n");
         }
@@ -287,7 +287,7 @@ Handle<Object> Context::Lookup(Handle<Context> context, Handle<String> name,
     if (context->IsFunctionContext() || context->IsBlockContext() ||
         context->IsScriptContext() || context->IsEvalContext() ||
         context->IsModuleContext() || context->IsCatchContext()) {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       // Use serialized scope information of functions and blocks to search
       // for the context index.
       ScopeInfo scope_info = context->scope_info();
diff --git a/deps/v8/src/objects/contexts.h b/deps/v8/src/objects/contexts.h
index f62e41c9a8424e..4b70e3eded7876 100644
--- a/deps/v8/src/objects/contexts.h
+++ b/deps/v8/src/objects/contexts.h
@@ -316,7 +316,6 @@ enum ContextLookupFlags {
   V(OBJECT_VALUE_OF_FUNCTION_INDEX, JSFunction, object_value_of_function)      \
   V(PROMISE_ALL_INDEX, JSFunction, promise_all)                                \
   V(PROMISE_ANY_INDEX, JSFunction, promise_any)                                \
-  V(PROMISE_CATCH_INDEX, JSFunction, promise_catch)                            \
   V(PROMISE_FUNCTION_INDEX, JSFunction, promise_function)                      \
   V(RANGE_ERROR_FUNCTION_INDEX, JSFunction, range_error_function)              \
   V(REFERENCE_ERROR_FUNCTION_INDEX, JSFunction, reference_error_function)      \
@@ -337,6 +336,8 @@ enum ContextLookupFlags {
   V(RETAINED_MAPS, WeakArrayList, retained_maps)                               \
   V(OSR_CODE_CACHE_INDEX, WeakFixedArray, osr_code_cache)
 
+#include "torque-generated/src/objects/contexts-tq.inc"
+
 // A table of all script contexts. Every loaded top-level script with top-level
 // lexical declarations contributes its ScriptContext into this table.
 //
@@ -428,15 +429,10 @@ class ScriptContextTable : public FixedArray {
 // Script contexts from all top-level scripts are gathered in
 // ScriptContextTable.
 
-class Context : public HeapObject {
+class Context : public TorqueGeneratedContext<Context, HeapObject> {
  public:
   NEVER_READ_ONLY_SPACE
 
-  DECL_CAST(Context)
-  // [length]: length of the context.
-  V8_INLINE int length() const;
-  V8_INLINE void set_length(int value);
-
   // Setter and getter for elements.
   V8_INLINE Object get(int index) const;
   V8_INLINE Object get(IsolateRoot isolate, int index) const;
@@ -448,15 +444,9 @@ class Context : public HeapObject {
   V8_INLINE Object synchronized_get(IsolateRoot isolate, int index) const;
   V8_INLINE void synchronized_set(int index, Object value);
 
-  DEFINE_FIELD_OFFSET_CONSTANTS(HeapObject::kHeaderSize,
-                                TORQUE_GENERATED_CONTEXT_FIELDS)
-  static const int kScopeInfoOffset = kHeaderSize;
+  static const int kScopeInfoOffset = kElementsOffset;
   static const int kPreviousOffset = kScopeInfoOffset + kTaggedSize;
 
-  // TODO(v8:8989): [torque] Support marker constants
-  /* TODO(ishell): remove this fixedArray-like header size. */
-  static const int kFixedArrayLikeHeaderSize = kScopeInfoOffset;
-  static const int kStartOfTaggedFieldsOffset = kScopeInfoOffset;
   /* Header size. */                                                  \
   /* TODO(ishell): use this as header size once MIN_CONTEXT_SLOTS */  \
   /* is removed in favour of offset-based access to common fields. */ \
@@ -467,7 +457,10 @@ class Context : public HeapObject {
 
   // Garbage collection support.
   V8_INLINE static constexpr int SizeFor(int length) {
-    return kFixedArrayLikeHeaderSize + length * kTaggedSize;
+    // TODO(v8:9287): This is a workaround for GCMole build failures.
+    int result = kElementsOffset + length * kTaggedSize;
+    CONSTEXPR_DCHECK(TorqueGeneratedContext::SizeFor(length) == result);
+    return result;
   }
 
   // Code Generation support.
@@ -477,7 +470,7 @@ class Context : public HeapObject {
   }
   // Offset of the element from the heap object pointer.
   V8_INLINE static constexpr int SlotOffset(int index) {
-    return SizeFor(index) - kHeapObjectTag;
+    return OffsetOfElementAt(index) - kHeapObjectTag;
   }
 
   // Initializes the variable slots of the context. Lexical variables that need
@@ -647,7 +640,7 @@ class Context : public HeapObject {
   DECL_PRINTER(Context)
   DECL_VERIFIER(Context)
 
-  using BodyDescriptor = FlexibleBodyDescriptor<kStartOfTaggedFieldsOffset>;
+  class BodyDescriptor;
 
  private:
 #ifdef DEBUG
@@ -655,7 +648,7 @@ class Context : public HeapObject {
   static bool IsBootstrappingOrValidParentContext(Object object, Context kid);
 #endif
 
-  OBJECT_CONSTRUCTORS(Context, HeapObject);
+  TQ_OBJECT_CONSTRUCTORS(Context)
 };
 
 class NativeContext : public Context {
diff --git a/deps/v8/src/objects/contexts.tq b/deps/v8/src/objects/contexts.tq
index a246b2177b8830..157504da5f29a7 100644
--- a/deps/v8/src/objects/contexts.tq
+++ b/deps/v8/src/objects/contexts.tq
@@ -3,12 +3,17 @@
 // found in the LICENSE file.
 
 @abstract
-extern class Context extends HeapObject {
+@export
+@customCppClass
+// We normally don't generate a BodyDescriptor for an abstact class, but here we
+// do since all context classes share the same BodyDescriptor.
+@generateBodyDescriptor
+class Context extends HeapObject {
   macro GetScopeInfo(): ScopeInfo {
     return *ContextSlot(this, ContextSlot::SCOPE_INFO_INDEX);
   }
   const length: Smi;
-  elements[length]: Object;
+  @relaxedWrite elements[length]: Object;
 }
 
 extern class AwaitContext extends Context generates 'TNode<Context>';
diff --git a/deps/v8/src/objects/debug-objects-inl.h b/deps/v8/src/objects/debug-objects-inl.h
index a0815d04dff8cb..8c8b013e232eb9 100644
--- a/deps/v8/src/objects/debug-objects-inl.h
+++ b/deps/v8/src/objects/debug-objects-inl.h
@@ -36,26 +36,28 @@ BIT_FIELD_ACCESSORS(DebugInfo, debugger_hints, computed_debug_is_blackboxed,
 BIT_FIELD_ACCESSORS(DebugInfo, debugger_hints, debugging_id,
                     DebugInfo::DebuggingIdBits)
 
+// TODO(nicohartmann@, v8:11122): Remove once Torque can generate them.
+RELEASE_ACQUIRE_ACCESSORS(DebugInfo, debug_bytecode_array, HeapObject,
+                          kDebugBytecodeArrayOffset)
+RELEASE_ACQUIRE_ACCESSORS(DebugInfo, original_bytecode_array, HeapObject,
+                          kOriginalBytecodeArrayOffset)
+
 bool DebugInfo::HasInstrumentedBytecodeArray() {
-  DCHECK_EQ(debug_bytecode_array().IsBytecodeArray(),
-            original_bytecode_array().IsBytecodeArray());
-  return debug_bytecode_array().IsBytecodeArray();
+  return debug_bytecode_array(kAcquireLoad).IsBytecodeArray();
 }
 
 BytecodeArray DebugInfo::OriginalBytecodeArray() {
   DCHECK(HasInstrumentedBytecodeArray());
-  return BytecodeArray::cast(original_bytecode_array());
+  return BytecodeArray::cast(original_bytecode_array(kAcquireLoad));
 }
 
 BytecodeArray DebugInfo::DebugBytecodeArray() {
   DCHECK(HasInstrumentedBytecodeArray());
-  DCHECK_EQ(shared().GetDebugBytecodeArray(), debug_bytecode_array());
-  return BytecodeArray::cast(debug_bytecode_array());
+  DCHECK_EQ(shared().GetActiveBytecodeArray(),
+            debug_bytecode_array(kAcquireLoad));
+  return BytecodeArray::cast(debug_bytecode_array(kAcquireLoad));
 }
 
-TQ_OBJECT_CONSTRUCTORS_IMPL(WasmValue)
-NEVER_READ_ONLY_SPACE_IMPL(WasmValue)
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/objects/debug-objects.cc b/deps/v8/src/objects/debug-objects.cc
index 839bc097d13dab..1c96fa377a90ec 100644
--- a/deps/v8/src/objects/debug-objects.cc
+++ b/deps/v8/src/objects/debug-objects.cc
@@ -4,6 +4,7 @@
 
 #include "src/objects/debug-objects.h"
 
+#include "src/base/platform/mutex.h"
 #include "src/debug/debug-evaluate.h"
 #include "src/handles/handles-inl.h"
 #include "src/objects/debug-objects-inl.h"
@@ -29,10 +30,6 @@ void DebugInfo::SetDebugExecutionMode(ExecutionMode value) {
 
 void DebugInfo::ClearBreakInfo(Isolate* isolate) {
   if (HasInstrumentedBytecodeArray()) {
-    // Reset function's bytecode array field to point to the original bytecode
-    // array.
-    shared().SetDebugBytecodeArray(OriginalBytecodeArray());
-
     // If the function is currently running on the stack, we need to update the
     // bytecode pointers on the stack so they point to the original
     // BytecodeArray before releasing that BytecodeArray from this DebugInfo.
@@ -44,8 +41,7 @@ void DebugInfo::ClearBreakInfo(Isolate* isolate) {
       isolate->thread_manager()->IterateArchivedThreads(&redirect_visitor);
     }
 
-    set_original_bytecode_array(ReadOnlyRoots(isolate).undefined_value());
-    set_debug_bytecode_array(ReadOnlyRoots(isolate).undefined_value());
+    SharedFunctionInfo::UninstallDebugBytecode(shared(), isolate);
   }
   set_break_points(ReadOnlyRoots(isolate).empty_fixed_array());
 
@@ -397,7 +393,7 @@ void CoverageInfo::ResetBlockCount(int slot_index) {
 void CoverageInfo::CoverageInfoPrint(std::ostream& os,
                                      std::unique_ptr<char[]> function_name) {
   DCHECK(FLAG_trace_block_coverage);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   os << "Coverage info (";
   if (function_name == nullptr) {
diff --git a/deps/v8/src/objects/debug-objects.h b/deps/v8/src/objects/debug-objects.h
index e0ddaddd23af49..4a22094a43d703 100644
--- a/deps/v8/src/objects/debug-objects.h
+++ b/deps/v8/src/objects/debug-objects.h
@@ -45,6 +45,9 @@ class DebugInfo : public TorqueGeneratedDebugInfo<DebugInfo, Struct> {
   ExecutionMode DebugExecutionMode() const;
   void SetDebugExecutionMode(ExecutionMode value);
 
+  DECL_RELEASE_ACQUIRE_ACCESSORS(debug_bytecode_array, HeapObject)
+  DECL_RELEASE_ACQUIRE_ACCESSORS(original_bytecode_array, HeapObject)
+
   // Specifies whether the associated function has an instrumented bytecode
   // array. If so, OriginalBytecodeArray returns the non-instrumented bytecode,
   // and DebugBytecodeArray returns the instrumented bytecode.
@@ -59,7 +62,7 @@ class DebugInfo : public TorqueGeneratedDebugInfo<DebugInfo, Struct> {
   bool HasBreakInfo() const;
 
   // Clears all fields related to break points.
-  void ClearBreakInfo(Isolate* isolate);
+  V8_EXPORT_PRIVATE void ClearBreakInfo(Isolate* isolate);
 
   // Accessors to flag whether to break before entering the function.
   // This is used to break for functions with no source, e.g. builtins.
@@ -200,14 +203,6 @@ class BreakPoint : public TorqueGeneratedBreakPoint<BreakPoint, Struct> {
   TQ_OBJECT_CONSTRUCTORS(BreakPoint)
 };
 
-// Holds Wasm values. This is used by the inspector.
-class WasmValue : public TorqueGeneratedWasmValue<WasmValue, Struct> {
- public:
-  NEVER_READ_ONLY_SPACE
-
-  TQ_OBJECT_CONSTRUCTORS(WasmValue)
-};
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/objects/debug-objects.tq b/deps/v8/src/objects/debug-objects.tq
index ee8201e615cba5..b8ca86781fe795 100644
--- a/deps/v8/src/objects/debug-objects.tq
+++ b/deps/v8/src/objects/debug-objects.tq
@@ -70,17 +70,3 @@ extern class CoverageInfo extends HeapObject {
   const slot_count: int32;
   slots[slot_count]: CoverageInfoSlot;
 }
-
-@generateCppClass
-@generatePrint
-extern class WasmValue extends Struct {
-  // TODO(7748): Name and comment are outdated.
-  // The type, should map to ValueType::Kind values in value-type.h.
-  value_type: SmiTagged<WasmValueType>;
-  // Holds the actual value. For example, if this holds a Wasm i32, this will
-  // be of length 4, for s128, it will have length 16. These values are
-  // represented by the respective C++ types, and memcpy-ed in.
-  // When value_type is a externref, it holds the object that externref points
-  // to.
-  bytes_or_ref: Object|ByteArray;
-}
diff --git a/deps/v8/src/objects/descriptor-array-inl.h b/deps/v8/src/objects/descriptor-array-inl.h
index 21f43d292a22d0..9a402984205e45 100644
--- a/deps/v8/src/objects/descriptor-array-inl.h
+++ b/deps/v8/src/objects/descriptor-array-inl.h
@@ -217,13 +217,13 @@ void DescriptorArray::Set(InternalIndex descriptor_number, Descriptor* desc) {
 }
 
 void DescriptorArray::Append(Descriptor* desc) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int descriptor_number = number_of_descriptors();
   DCHECK_LE(descriptor_number + 1, number_of_all_descriptors());
   set_number_of_descriptors(descriptor_number + 1);
   Set(InternalIndex(descriptor_number), desc);
 
-  uint32_t hash = desc->GetKey()->Hash();
+  uint32_t hash = desc->GetKey()->hash();
 
   int insertion;
 
diff --git a/deps/v8/src/objects/dictionary-inl.h b/deps/v8/src/objects/dictionary-inl.h
index 4df78ac99fc4b1..c7e169abcbe97d 100644
--- a/deps/v8/src/objects/dictionary-inl.h
+++ b/deps/v8/src/objects/dictionary-inl.h
@@ -139,7 +139,7 @@ void Dictionary<Derived, Shape>::SetEntry(InternalIndex entry, Object key,
   DCHECK(Dictionary::kEntrySize == 2 || Dictionary::kEntrySize == 3);
   DCHECK(!key.IsName() || details.dictionary_index() > 0);
   int index = DerivedHashTable::EntryToIndex(entry);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = this->GetWriteBarrierMode(no_gc);
   this->set(index + Derived::kEntryKeyIndex, key, mode);
   this->set(index + Derived::kEntryValueIndex, value, mode);
@@ -279,21 +279,24 @@ bool NameDictionaryShape::IsMatch(Handle<Name> key, Object other) {
 }
 
 uint32_t NameDictionaryShape::Hash(ReadOnlyRoots roots, Handle<Name> key) {
-  return key->Hash();
+  DCHECK(key->IsUniqueName());
+  return key->hash();
 }
 
 uint32_t NameDictionaryShape::HashForObject(ReadOnlyRoots roots, Object other) {
-  return Name::cast(other).Hash();
+  DCHECK(other.IsUniqueName());
+  return Name::cast(other).hash();
 }
 
 bool GlobalDictionaryShape::IsMatch(Handle<Name> key, Object other) {
+  DCHECK(key->IsUniqueName());
   DCHECK(PropertyCell::cast(other).name().IsUniqueName());
   return *key == PropertyCell::cast(other).name();
 }
 
 uint32_t GlobalDictionaryShape::HashForObject(ReadOnlyRoots roots,
                                               Object other) {
-  return PropertyCell::cast(other).name().Hash();
+  return PropertyCell::cast(other).name().hash();
 }
 
 Handle<Object> NameDictionaryShape::AsHandle(Isolate* isolate,
@@ -320,7 +323,11 @@ void GlobalDictionaryShape::DetailsAtPut(Dictionary dict, InternalIndex entry,
                                          PropertyDetails value) {
   DCHECK(entry.is_found());
   PropertyCell cell = dict.CellAt(entry);
-  if (cell.property_details().IsReadOnly() != value.IsReadOnly()) {
+  // Deopt when when making a writable property read-only. The reverse direction
+  // is uninteresting because Turbofan does not currently rely on read-only
+  // unless the property is also configurable, in which case it will stay
+  // read-only forever.
+  if (!cell.property_details().IsReadOnly() && value.IsReadOnly()) {
     cell.dependent_code().DeoptimizeDependentCodeGroup(
         DependentCode::kPropertyCellChangedGroup);
   }
diff --git a/deps/v8/src/objects/dictionary.h b/deps/v8/src/objects/dictionary.h
index d9cc62afc1ec94..4aeeca6fb0a62e 100644
--- a/deps/v8/src/objects/dictionary.h
+++ b/deps/v8/src/objects/dictionary.h
@@ -43,6 +43,8 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) Dictionary
   // Set the details for entry.
   inline void DetailsAtPut(InternalIndex entry, PropertyDetails value);
 
+  static const bool kIsOrderedDictionaryType = false;
+
   // Delete a property from the dictionary.
   V8_WARN_UNUSED_RESULT static Handle<Derived> DeleteEntry(
       Isolate* isolate, Handle<Derived> dictionary, InternalIndex entry);
@@ -55,17 +57,12 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) Dictionary
 
   int NumberOfEnumerableProperties();
 
-#ifdef OBJECT_PRINT
-  // For our gdb macros, we should perhaps change these in the future.
-  void Print();
-
-  void Print(std::ostream& os);  // NOLINT
-#endif
   // Returns the key (slow).
   Object SlowReverseLookup(Object value);
 
-  // Sets the entry to (key, value) pair.
   inline void ClearEntry(InternalIndex entry);
+
+  // Sets the entry to (key, value) pair.
   inline void SetEntry(InternalIndex entry, Object key, Object value,
                        PropertyDetails details);
 
@@ -131,8 +128,6 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) BaseNameDictionary
   static const int kObjectHashIndex = kNextEnumerationIndexIndex + 1;
   static const int kEntryValueIndex = 1;
 
-  static const bool kIsOrderedDictionaryType = false;
-
   inline void SetHash(int hash);
   inline int Hash() const;
 
@@ -181,6 +176,7 @@ class V8_EXPORT_PRIVATE NameDictionary
   static inline Handle<Map> GetMap(ReadOnlyRoots roots);
 
   DECL_CAST(NameDictionary)
+  DECL_PRINTER(NameDictionary)
 
   static const int kEntryValueIndex = 1;
   static const int kEntryDetailsIndex = 2;
@@ -222,6 +218,7 @@ class V8_EXPORT_PRIVATE GlobalDictionary
   static inline Handle<Map> GetMap(ReadOnlyRoots roots);
 
   DECL_CAST(GlobalDictionary)
+  DECL_PRINTER(GlobalDictionary)
 
   inline Object ValueAt(InternalIndex entry);
   inline Object ValueAt(IsolateRoot isolate, InternalIndex entry);
diff --git a/deps/v8/src/objects/elements-kind.cc b/deps/v8/src/objects/elements-kind.cc
index 15528244e6954b..78670f25bd0af2 100644
--- a/deps/v8/src/objects/elements-kind.cc
+++ b/deps/v8/src/objects/elements-kind.cc
@@ -115,13 +115,6 @@ const char* ElementsKindToString(ElementsKind kind) {
   }
 }
 
-const char* CompactElementsKindToString(CompactElementsKind kind) {
-  if (kind == CompactElementsKind::NON_COMPACT_ELEMENTS_KIND) {
-    return "NON_COMPACT_ELEMENTS_KIND";
-  }
-  return ElementsKindToString(static_cast<ElementsKind>(kind));
-}
-
 const ElementsKind kFastElementsKindSequence[kFastElementsKindCount] = {
     PACKED_SMI_ELEMENTS,     // 0
     HOLEY_SMI_ELEMENTS,      // 1
diff --git a/deps/v8/src/objects/elements-kind.h b/deps/v8/src/objects/elements-kind.h
index 4bd5672b444cea..ec3ca3402d16b2 100644
--- a/deps/v8/src/objects/elements-kind.h
+++ b/deps/v8/src/objects/elements-kind.h
@@ -350,29 +350,6 @@ inline bool IsTransitionableFastElementsKind(ElementsKind from_kind) {
 
 inline bool ElementsKindEqual(ElementsKind a, ElementsKind b) { return a == b; }
 
-enum class CompactElementsKind : uint8_t {
-  PACKED_SMI_ELEMENTS = PACKED_SMI_ELEMENTS,
-  HOLEY_SMI_ELEMENTS = HOLEY_SMI_ELEMENTS,
-
-  PACKED_ELEMENTS = PACKED_ELEMENTS,
-  HOLEY_ELEMENTS = HOLEY_ELEMENTS,
-
-  PACKED_DOUBLE_ELEMENTS = PACKED_DOUBLE_ELEMENTS,
-  HOLEY_DOUBLE_ELEMENTS = HOLEY_DOUBLE_ELEMENTS,
-
-  NON_COMPACT_ELEMENTS_KIND
-};
-
-inline CompactElementsKind ToCompactElementsKind(ElementsKind kind) {
-  if (base::IsInRange(kind, PACKED_SMI_ELEMENTS, HOLEY_DOUBLE_ELEMENTS)) {
-    return static_cast<CompactElementsKind>(kind);
-  }
-
-  return CompactElementsKind::NON_COMPACT_ELEMENTS_KIND;
-}
-
-const char* CompactElementsKindToString(CompactElementsKind kind);
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/deps/v8/src/objects/elements.cc b/deps/v8/src/objects/elements.cc
index 4dcbb2befc940f..f9ba145cf40b02 100644
--- a/deps/v8/src/objects/elements.cc
+++ b/deps/v8/src/objects/elements.cc
@@ -172,7 +172,7 @@ void CopyObjectToObjectElements(Isolate* isolate, FixedArrayBase from_base,
                                 uint32_t to_start, int raw_copy_size) {
   ReadOnlyRoots roots(isolate);
   DCHECK(to_base.map() != roots.fixed_cow_array_map());
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int copy_size = raw_copy_size;
   if (raw_copy_size < 0) {
     DCHECK_EQ(kCopyToEndAndInitializeToHole, raw_copy_size);
@@ -205,7 +205,7 @@ void CopyDictionaryToObjectElements(Isolate* isolate, FixedArrayBase from_base,
                                     uint32_t from_start, FixedArrayBase to_base,
                                     ElementsKind to_kind, uint32_t to_start,
                                     int raw_copy_size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   NumberDictionary from = NumberDictionary::cast(from_base);
   int copy_size = raw_copy_size;
   if (raw_copy_size < 0) {
@@ -247,7 +247,7 @@ void CopyDoubleToObjectElements(Isolate* isolate, FixedArrayBase from_base,
                                 uint32_t to_start, int raw_copy_size) {
   int copy_size = raw_copy_size;
   if (raw_copy_size < 0) {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     DCHECK_EQ(kCopyToEndAndInitializeToHole, raw_copy_size);
     copy_size =
         std::min(from_base.length() - from_start, to_base.length() - to_start);
@@ -289,7 +289,7 @@ void CopyDoubleToObjectElements(Isolate* isolate, FixedArrayBase from_base,
 void CopyDoubleToDoubleElements(FixedArrayBase from_base, uint32_t from_start,
                                 FixedArrayBase to_base, uint32_t to_start,
                                 int raw_copy_size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int copy_size = raw_copy_size;
   if (raw_copy_size < 0) {
     DCHECK_EQ(kCopyToEndAndInitializeToHole, raw_copy_size);
@@ -325,7 +325,7 @@ void CopyDoubleToDoubleElements(FixedArrayBase from_base, uint32_t from_start,
 void CopySmiToDoubleElements(FixedArrayBase from_base, uint32_t from_start,
                              FixedArrayBase to_base, uint32_t to_start,
                              int raw_copy_size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int copy_size = raw_copy_size;
   if (raw_copy_size < 0) {
     DCHECK_EQ(kCopyToEndAndInitializeToHole, raw_copy_size);
@@ -355,7 +355,7 @@ void CopyPackedSmiToDoubleElements(FixedArrayBase from_base,
                                    uint32_t from_start, FixedArrayBase to_base,
                                    uint32_t to_start, int packed_size,
                                    int raw_copy_size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int copy_size = raw_copy_size;
   uint32_t to_end;
   if (raw_copy_size < 0) {
@@ -386,7 +386,7 @@ void CopyPackedSmiToDoubleElements(FixedArrayBase from_base,
 void CopyObjectToDoubleElements(FixedArrayBase from_base, uint32_t from_start,
                                 FixedArrayBase to_base, uint32_t to_start,
                                 int raw_copy_size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int copy_size = raw_copy_size;
   if (raw_copy_size < 0) {
     DCHECK_EQ(kCopyToEndAndInitializeToHole, raw_copy_size);
@@ -415,7 +415,7 @@ void CopyObjectToDoubleElements(FixedArrayBase from_base, uint32_t from_start,
 void CopyDictionaryToDoubleElements(Isolate* isolate, FixedArrayBase from_base,
                                     uint32_t from_start, FixedArrayBase to_base,
                                     uint32_t to_start, int raw_copy_size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   NumberDictionary from = NumberDictionary::cast(from_base);
   int copy_size = raw_copy_size;
   if (copy_size < 0) {
@@ -570,7 +570,7 @@ class ElementsAccessorBase : public InternalElementsAccessor {
   }
 
   void Validate(JSObject holder) final {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Subclass::ValidateImpl(holder);
   }
 
@@ -1355,7 +1355,7 @@ class DictionaryElementsAccessor
     uint32_t old_length = 0;
     CHECK(array->length().ToArrayLength(&old_length));
     {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       ReadOnlyRoots roots(isolate);
       if (length < old_length) {
         if (dict->requires_slow_elements()) {
@@ -1417,7 +1417,7 @@ class DictionaryElementsAccessor
   }
 
   static bool HasAccessorsImpl(JSObject holder, FixedArrayBase backing_store) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     NumberDictionary dict = NumberDictionary::cast(backing_store);
     if (!dict.requires_slow_elements()) return false;
     IsolateRoot isolate = GetIsolateForPtrCompr(holder);
@@ -1484,7 +1484,7 @@ class DictionaryElementsAccessor
 
   static bool HasEntryImpl(Isolate* isolate, FixedArrayBase store,
                            InternalIndex entry) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     NumberDictionary dict = NumberDictionary::cast(store);
     Object index = dict.KeyAt(isolate, entry);
     return !index.IsTheHole(isolate);
@@ -1493,7 +1493,7 @@ class DictionaryElementsAccessor
   static InternalIndex GetEntryForIndexImpl(Isolate* isolate, JSObject holder,
                                             FixedArrayBase store, size_t index,
                                             PropertyFilter filter) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     NumberDictionary dictionary = NumberDictionary::cast(store);
     DCHECK_LE(index, std::numeric_limits<uint32_t>::max());
     InternalIndex entry =
@@ -1532,7 +1532,7 @@ class DictionaryElementsAccessor
                                      Handle<NumberDictionary> dictionary,
                                      InternalIndex entry,
                                      PropertyFilter filter) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Object raw_key = dictionary->KeyAt(isolate, entry);
     if (!dictionary->IsKey(ReadOnlyRoots(isolate), raw_key)) return kMaxUInt32;
     return FilterKey(dictionary, entry, raw_key, filter);
@@ -1551,7 +1551,7 @@ class DictionaryElementsAccessor
     PropertyFilter filter = keys->filter();
     ReadOnlyRoots roots(isolate);
     for (InternalIndex i : dictionary->IterateEntries()) {
-      AllowHeapAllocation allow_gc;
+      AllowGarbageCollection allow_gc;
       Object raw_key = dictionary->KeyAt(isolate, i);
       if (!dictionary->IsKey(roots, raw_key)) continue;
       uint32_t key = FilterKey(dictionary, i, raw_key, filter);
@@ -1613,7 +1613,7 @@ class DictionaryElementsAccessor
   static bool IncludesValueFastPath(Isolate* isolate, Handle<JSObject> receiver,
                                     Handle<Object> value, size_t start_from,
                                     size_t length, Maybe<bool>* result) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     NumberDictionary dictionary = NumberDictionary::cast(receiver->elements());
     Object the_hole = ReadOnlyRoots(isolate).the_hole_value();
     Object undefined = ReadOnlyRoots(isolate).undefined_value();
@@ -1793,7 +1793,7 @@ class DictionaryElementsAccessor
   }
 
   static void ValidateContents(JSObject holder, size_t length) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
 #if DEBUG
     DCHECK_EQ(holder.map().elements_kind(), DICTIONARY_ELEMENTS);
     if (!FLAG_enable_slow_asserts) return;
@@ -2062,7 +2062,7 @@ class FastElementsAccessor : public ElementsAccessorBase<Subclass, KindTraits> {
     }
     if (length == 0u) return;  // nothing to do!
 #if ENABLE_SLOW_DCHECKS
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     BackingStore backing_store = BackingStore::cast(elements);
     DCHECK(length <= std::numeric_limits<int>::max());
     int length_int = static_cast<int>(length);
@@ -2166,7 +2166,7 @@ class FastElementsAccessor : public ElementsAccessorBase<Subclass, KindTraits> {
                                        Handle<Object> search_value,
                                        size_t start_from, size_t length) {
     DCHECK(JSObject::PrototypeHasNoElements(isolate, *receiver));
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArrayBase elements_base = receiver->elements();
     Object the_hole = ReadOnlyRoots(isolate).the_hole_value();
     Object undefined = ReadOnlyRoots(isolate).undefined_value();
@@ -2389,7 +2389,7 @@ class FastElementsAccessor : public ElementsAccessorBase<Subclass, KindTraits> {
                             uint32_t copy_size, uint32_t src_index,
                             uint32_t dst_index) {
     // Add the provided values.
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArrayBase raw_backing_store = *dst_store;
     WriteBarrierMode mode = raw_backing_store.GetWriteBarrierMode(no_gc);
     for (uint32_t i = 0; i < copy_size; i++) {
@@ -2433,7 +2433,7 @@ class FastSmiOrObjectElementsAccessor
                                uint32_t from_start, FixedArrayBase to,
                                ElementsKind from_kind, uint32_t to_start,
                                int packed_size, int copy_size) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     ElementsKind to_kind = KindTraits::Kind;
     switch (from_kind) {
       case PACKED_SMI_ELEMENTS:
@@ -2451,7 +2451,7 @@ class FastSmiOrObjectElementsAccessor
         break;
       case PACKED_DOUBLE_ELEMENTS:
       case HOLEY_DOUBLE_ELEMENTS: {
-        AllowHeapAllocation allow_allocation;
+        AllowGarbageCollection allow_allocation;
         DCHECK(IsObjectElementsKind(to_kind));
         CopyDoubleToObjectElements(isolate, from, from_start, to, to_start,
                                    copy_size);
@@ -2495,7 +2495,7 @@ class FastSmiOrObjectElementsAccessor
       }
     } else {
       // No allocations here, so we can avoid handlification overhead.
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       FixedArray elements = FixedArray::cast(object->elements());
       uint32_t length = elements.length();
       for (uint32_t index = 0; index < length; ++index) {
@@ -2514,7 +2514,7 @@ class FastSmiOrObjectElementsAccessor
                                          Handle<Object> search_value,
                                          size_t start_from, size_t length) {
     DCHECK(JSObject::PrototypeHasNoElements(isolate, *receiver));
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArrayBase elements_base = receiver->elements();
     Object value = *search_value;
 
@@ -2841,7 +2841,7 @@ class FastDoubleElementsAccessor
                                uint32_t from_start, FixedArrayBase to,
                                ElementsKind from_kind, uint32_t to_start,
                                int packed_size, int copy_size) {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     switch (from_kind) {
       case PACKED_SMI_ELEMENTS:
         CopyPackedSmiToDoubleElements(from, from_start, to, to_start,
@@ -2908,7 +2908,7 @@ class FastDoubleElementsAccessor
                                          Handle<Object> search_value,
                                          size_t start_from, size_t length) {
     DCHECK(JSObject::PrototypeHasNoElements(isolate, *receiver));
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArrayBase elements_base = receiver->elements();
     Object value = *search_value;
 
@@ -3066,12 +3066,12 @@ class TypedElementsAccessor
   }
 
   static PropertyDetails GetDetailsImpl(JSObject holder, InternalIndex entry) {
-    return PropertyDetails(kData, DONT_DELETE, PropertyCellType::kNoCell);
+    return PropertyDetails(kData, NONE, PropertyCellType::kNoCell);
   }
 
   static PropertyDetails GetDetailsImpl(FixedArrayBase backing_store,
                                         InternalIndex entry) {
-    return PropertyDetails(kData, DONT_DELETE, PropertyCellType::kNoCell);
+    return PropertyDetails(kData, NONE, PropertyCellType::kNoCell);
   }
 
   static bool HasElementImpl(Isolate* isolate, JSObject holder, size_t index,
@@ -3092,7 +3092,10 @@ class TypedElementsAccessor
   }
 
   static void DeleteImpl(Handle<JSObject> obj, InternalIndex entry) {
-    UNREACHABLE();
+    // Do nothing.
+    //
+    // TypedArray elements are configurable to explain detaching, but cannot be
+    // deleted otherwise.
   }
 
   static InternalIndex GetEntryForIndexImpl(Isolate* isolate, JSObject holder,
@@ -3156,7 +3159,7 @@ class TypedElementsAccessor
     DCHECK(!typed_array->WasDetached());
     DCHECK_LE(start, end);
     DCHECK_LE(end, typed_array->length());
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     ElementType scalar = FromHandle(value);
     ElementType* data = static_cast<ElementType*>(typed_array->DataPtr());
     if (COMPRESS_POINTERS_BOOL && alignof(ElementType) > kTaggedSize) {
@@ -3173,7 +3176,7 @@ class TypedElementsAccessor
                                        Handle<JSObject> receiver,
                                        Handle<Object> value, size_t start_from,
                                        size_t length) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     JSTypedArray typed_array = JSTypedArray::cast(*receiver);
 
     // TODO(caitp): return Just(false) here when implementing strict throwing on
@@ -3238,7 +3241,7 @@ class TypedElementsAccessor
                                          Handle<JSObject> receiver,
                                          Handle<Object> value,
                                          size_t start_from, size_t length) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     JSTypedArray typed_array = JSTypedArray::cast(*receiver);
 
     if (typed_array.WasDetached()) return Just<int64_t>(-1);
@@ -3290,7 +3293,7 @@ class TypedElementsAccessor
   static Maybe<int64_t> LastIndexOfValueImpl(Handle<JSObject> receiver,
                                              Handle<Object> value,
                                              size_t start_from) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     JSTypedArray typed_array = JSTypedArray::cast(*receiver);
 
     DCHECK(!typed_array.WasDetached());
@@ -3336,7 +3339,7 @@ class TypedElementsAccessor
   }
 
   static void ReverseImpl(JSObject receiver) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     JSTypedArray typed_array = JSTypedArray::cast(receiver);
 
     DCHECK(!typed_array.WasDetached());
@@ -3370,7 +3373,7 @@ class TypedElementsAccessor
   static void CopyTypedArrayElementsSliceImpl(JSTypedArray source,
                                               JSTypedArray destination,
                                               size_t start, size_t end) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     DCHECK_EQ(destination.GetElementsKind(), AccessorClass::kind());
     CHECK(!source.WasDetached());
     CHECK(!destination.WasDetached());
@@ -3404,7 +3407,7 @@ class TypedElementsAccessor
   static void CopyBetweenBackingStores(SourceElementType* source_data_ptr,
                                        ElementType* dest_data_ptr,
                                        size_t length) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     for (size_t i = 0; i < length; i++) {
       // We use scalar accessors to avoid boxing/unboxing, so there are no
       // allocations.
@@ -3421,7 +3424,7 @@ class TypedElementsAccessor
                                          size_t length, size_t offset) {
     // The source is a typed array, so we know we don't need to do ToNumber
     // side-effects, as the source elements will always be a number.
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
 
     CHECK(!source.WasDetached());
     CHECK(!destination.WasDetached());
@@ -3481,7 +3484,7 @@ class TypedElementsAccessor
 
   static bool HoleyPrototypeLookupRequired(Isolate* isolate, Context context,
                                            JSArray source) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     DisallowJavascriptExecution no_js(isolate);
 
 #ifdef V8_ENABLE_FORCE_SLOW_PATH
@@ -3507,7 +3510,7 @@ class TypedElementsAccessor
                                         size_t offset) {
     if (Kind == BIGINT64_ELEMENTS || Kind == BIGUINT64_ELEMENTS) return false;
     Isolate* isolate = source.GetIsolate();
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     DisallowJavascriptExecution no_js(isolate);
 
     CHECK(!destination.WasDetached());
@@ -3888,7 +3891,7 @@ class SloppyArgumentsElementsAccessor
     uint32_t length = elements->length();
     if (entry.as_uint32() < length) {
       // Read context mapped entry.
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       Object probe = elements->mapped_entries(entry.as_uint32());
       DCHECK(!probe.IsTheHole(isolate));
       Context context = elements->context();
@@ -3924,7 +3927,7 @@ class SloppyArgumentsElementsAccessor
     uint32_t length = elements.length();
     if (entry.as_uint32() < length) {
       // Store context mapped entry.
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       Object probe = elements.mapped_entries(entry.as_uint32());
       DCHECK(!probe.IsTheHole());
       Context context = Context::cast(elements.context());
@@ -4224,7 +4227,7 @@ class SlowSloppyArgumentsElementsAccessor
       Handle<Object> result) {
     // Elements of the arguments object in slow mode might be slow aliases.
     if (result->IsAliasedArgumentsEntry()) {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       AliasedArgumentsEntry alias = AliasedArgumentsEntry::cast(*result);
       Context context = elements->context();
       int context_entry = alias.aliased_context_slot();
@@ -4695,7 +4698,7 @@ MaybeHandle<Object> ArrayConstructInitializeElements(
     }
     case HOLEY_ELEMENTS:
     case PACKED_ELEMENTS: {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       WriteBarrierMode mode = elms->GetWriteBarrierMode(no_gc);
       Handle<FixedArray> object_elms = Handle<FixedArray>::cast(elms);
       for (int entry = 0; entry < number_of_elements; entry++) {
@@ -4799,7 +4802,7 @@ Handle<JSArray> ElementsAccessor::Concat(Isolate* isolate,
   ElementsKind result_elements_kind = GetInitialFastElementsKind();
   bool has_raw_doubles = false;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     bool is_holey = false;
     for (uint32_t i = 0; i < concat_size; i++) {
       Object arg = (*args)[i];
diff --git a/deps/v8/src/objects/embedder-data-array.cc b/deps/v8/src/objects/embedder-data-array.cc
index ba3e92c33c4e5c..5f992442f01dd3 100644
--- a/deps/v8/src/objects/embedder-data-array.cc
+++ b/deps/v8/src/objects/embedder-data-array.cc
@@ -17,7 +17,7 @@ Handle<EmbedderDataArray> EmbedderDataArray::EnsureCapacity(
   DCHECK_LT(index, kMaxLength);
   Handle<EmbedderDataArray> new_array =
       isolate->factory()->NewEmbedderDataArray(index + 1);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Last new space allocation does not require any write barriers.
   size_t size = array->length() * kEmbedderDataSlotSize;
   MemCopy(reinterpret_cast<void*>(new_array->slots_start()),
diff --git a/deps/v8/src/objects/feedback-vector.cc b/deps/v8/src/objects/feedback-vector.cc
index 7c30e1a045a04c..f354c1689bf517 100644
--- a/deps/v8/src/objects/feedback-vector.cc
+++ b/deps/v8/src/objects/feedback-vector.cc
@@ -390,11 +390,10 @@ void FeedbackVector::SetOptimizedCode(Handle<FeedbackVector> vector,
          (vector->optimized_code().kind() == CodeKind::TURBOPROP &&
           code->kind() == CodeKind::TURBOFAN));
   // TODO(mythria): We could see a CompileOptimized marker here either from
-  // tests that use %OptimizeFunctionOnNextCall or because we re-mark the
-  // function for non-concurrent optimization after an OSR. We should avoid
-  // these cases and also check that marker isn't kCompileOptimized.
-  DCHECK(vector->optimization_marker() !=
-         OptimizationMarker::kCompileOptimizedConcurrent);
+  // tests that use %OptimizeFunctionOnNextCall, --always-opt or because we
+  // re-mark the function for non-concurrent optimization after an OSR. We
+  // should avoid these cases and also check that marker isn't
+  // kCompileOptimized or kCompileOptimizedConcurrent.
   vector->set_maybe_optimized_code(HeapObjectReference::Weak(*code));
   int32_t state = vector->flags();
   state = OptimizationTierBits::update(state, GetTierForCodeKind(code->kind()));
@@ -503,16 +502,11 @@ void NexusConfig::SetFeedbackPair(FeedbackVector vector,
 
 std::pair<MaybeObject, MaybeObject> NexusConfig::GetFeedbackPair(
     FeedbackVector vector, FeedbackSlot slot) const {
-  if (mode() == BackgroundThread) {
-    isolate()->feedback_vector_access()->LockShared();
-  }
+  base::SharedMutexGuardIf<base::kShared> scope(
+      isolate()->feedback_vector_access(), mode() == BackgroundThread);
   MaybeObject feedback = vector.Get(slot);
   MaybeObject feedback_extra = vector.Get(slot.WithOffset(1));
-  auto return_value = std::make_pair(feedback, feedback_extra);
-  if (mode() == BackgroundThread) {
-    isolate()->feedback_vector_access()->UnlockShared();
-  }
-  return return_value;
+  return std::make_pair(feedback, feedback_extra);
 }
 
 FeedbackNexus::FeedbackNexus(Handle<FeedbackVector> vector, FeedbackSlot slot)
@@ -636,7 +630,7 @@ bool FeedbackNexus::Clear() {
 }
 
 bool FeedbackNexus::ConfigureMegamorphic() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Isolate* isolate = GetIsolate();
   MaybeObject sentinel = MegamorphicSentinel();
   if (GetFeedback() != sentinel) {
@@ -649,7 +643,7 @@ bool FeedbackNexus::ConfigureMegamorphic() {
 }
 
 bool FeedbackNexus::ConfigureMegamorphic(IcCheckType property_type) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   MaybeObject sentinel = MegamorphicSentinel();
   MaybeObject maybe_extra =
       MaybeObject::FromSmi(Smi::FromInt(static_cast<int>(property_type)));
@@ -1025,7 +1019,7 @@ void FeedbackNexus::ConfigurePolymorphic(
 }
 
 int FeedbackNexus::ExtractMaps(MapHandles* maps) const {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int found = 0;
   for (FeedbackIterator it(this); !it.done(); it.Advance()) {
     maps->push_back(config()->NewHandle(it.map()));
@@ -1037,7 +1031,7 @@ int FeedbackNexus::ExtractMaps(MapHandles* maps) const {
 
 int FeedbackNexus::ExtractMapsAndFeedback(
     std::vector<MapAndFeedback>* maps_and_feedback) const {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int found = 0;
 
   for (FeedbackIterator it(this); !it.done(); it.Advance()) {
@@ -1059,7 +1053,7 @@ int FeedbackNexus::ExtractMapsAndHandlers(
     std::vector<MapAndHandler>* maps_and_handlers,
     TryUpdateHandler map_handler) const {
   DCHECK(!IsStoreDataPropertyInLiteralKind(kind()));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int found = 0;
 
   for (FeedbackIterator it(this); !it.done(); it.Advance()) {
@@ -1439,7 +1433,7 @@ FeedbackIterator::FeedbackIterator(const FeedbackNexus* nexus)
          IsStoreInArrayLiteralICKind(nexus->kind()) ||
          IsKeyedHasICKind(nexus->kind()));
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   auto pair = nexus->GetFeedbackPair();
   MaybeObject feedback = pair.first;
   bool is_named_feedback = IsPropertyNameFeedback(feedback);
diff --git a/deps/v8/src/objects/feedback-vector.h b/deps/v8/src/objects/feedback-vector.h
index 6c5b9b97abcbc1..17c0dc8ae3c82a 100644
--- a/deps/v8/src/objects/feedback-vector.h
+++ b/deps/v8/src/objects/feedback-vector.h
@@ -875,12 +875,13 @@ class V8_EXPORT_PRIVATE FeedbackIterator final {
     return (entry * kEntrySize) + kHandlerOffset;
   }
 
+  static constexpr int kEntrySize = 2;
+  static constexpr int kHandlerOffset = 1;
+
  private:
   void AdvancePolymorphic();
   enum State { kMonomorphic, kPolymorphic, kOther };
 
-  static constexpr int kEntrySize = 2;
-  static constexpr int kHandlerOffset = 1;
   Handle<WeakFixedArray> polymorphic_feedback_;
   Map map_;
   MaybeObject handler_;
diff --git a/deps/v8/src/objects/fixed-array-inl.h b/deps/v8/src/objects/fixed-array-inl.h
index 344f58e2a67881..e4b4609119dffc 100644
--- a/deps/v8/src/objects/fixed-array-inl.h
+++ b/deps/v8/src/objects/fixed-array-inl.h
@@ -88,7 +88,6 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) {
   return get(isolate, index).IsTheHole(isolate);
 }
 
-#if !defined(_WIN32) || defined(_WIN64)
 void FixedArray::set(int index, Smi value) {
   DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map());
   DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));
@@ -96,7 +95,6 @@ void FixedArray::set(int index, Smi value) {
   int offset = OffsetOfElementAt(index);
   RELAXED_WRITE_FIELD(*this, offset, value);
 }
-#endif
 
 void FixedArray::set(int index, Object value) {
   DCHECK_NE(GetReadOnlyRoots().fixed_cow_array_map(), map());
@@ -193,7 +191,7 @@ void FixedArray::MoveElements(Isolate* isolate, int dst_index, int src_index,
   if (len == 0) return;
   DCHECK_LE(dst_index + len, length());
   DCHECK_LE(src_index + len, length());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   ObjectSlot dst_slot(RawFieldOfElementAt(dst_index));
   ObjectSlot src_slot(RawFieldOfElementAt(src_index));
   isolate->heap()->MoveRange(*this, dst_slot, src_slot, len, mode);
@@ -204,7 +202,7 @@ void FixedArray::CopyElements(Isolate* isolate, int dst_index, FixedArray src,
   if (len == 0) return;
   DCHECK_LE(dst_index + len, length());
   DCHECK_LE(src_index + len, src.length());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   ObjectSlot dst_slot(RawFieldOfElementAt(dst_index));
   ObjectSlot src_slot(src.RawFieldOfElementAt(src_index));
@@ -435,7 +433,7 @@ void WeakFixedArray::CopyElements(Isolate* isolate, int dst_index,
   if (len == 0) return;
   DCHECK_LE(dst_index + len, length());
   DCHECK_LE(src_index + len, src.length());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   MaybeObjectSlot dst_slot(data_start() + dst_index);
   MaybeObjectSlot src_slot(src.data_start() + src_index);
@@ -466,7 +464,7 @@ void WeakArrayList::CopyElements(Isolate* isolate, int dst_index,
   if (len == 0) return;
   DCHECK_LE(dst_index + len, capacity());
   DCHECK_LE(src_index + len, src.capacity());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   MaybeObjectSlot dst_slot(data_start() + dst_index);
   MaybeObjectSlot src_slot(src.data_start() + src_index);
@@ -532,14 +530,14 @@ void ByteArray::copy_in(int index, const byte* buffer, int length) {
   DCHECK(index >= 0 && length >= 0 && length <= kMaxInt - index &&
          index + length <= this->length());
   Address dst_addr = field_address(kHeaderSize + index * kCharSize);
-  memcpy(reinterpret_cast<void*>(dst_addr), buffer, length);
+  base::Memcpy(reinterpret_cast<void*>(dst_addr), buffer, length);
 }
 
 void ByteArray::copy_out(int index, byte* buffer, int length) {
   DCHECK(index >= 0 && length >= 0 && length <= kMaxInt - index &&
          index + length <= this->length());
   Address src_addr = field_address(kHeaderSize + index * kCharSize);
-  memcpy(buffer, reinterpret_cast<void*>(src_addr), length);
+  base::Memcpy(buffer, reinterpret_cast<void*>(src_addr), length);
 }
 
 int ByteArray::get_int(int index) const {
@@ -634,6 +632,7 @@ void TemplateList::set(int index, Object value) {
 }  // namespace internal
 }  // namespace v8
 
+#include "src/base/platform/wrappers.h"
 #include "src/objects/object-macros-undef.h"
 
 #endif  // V8_OBJECTS_FIXED_ARRAY_INL_H_
diff --git a/deps/v8/src/objects/fixed-array.h b/deps/v8/src/objects/fixed-array.h
index 4258df7e63e027..564f82b736759c 100644
--- a/deps/v8/src/objects/fixed-array.h
+++ b/deps/v8/src/objects/fixed-array.h
@@ -123,18 +123,7 @@ class FixedArray
   inline bool is_the_hole(Isolate* isolate, int index);
 
   // Setter that doesn't need write barrier.
-#if defined(_WIN32) && !defined(_WIN64)
-  inline void set(int index, Smi value) {
-    DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map());
-    DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));
-    DCHECK(Object(value).IsSmi());
-    int offset = OffsetOfElementAt(index);
-    RELAXED_WRITE_FIELD(*this, offset, value);
-  }
-#else
   inline void set(int index, Smi value);
-#endif
-
   // Setter with explicit barrier mode.
   inline void set(int index, Object value, WriteBarrierMode mode);
 
@@ -425,9 +414,7 @@ class WeakArrayList::Iterator {
  private:
   int index_;
   WeakArrayList array_;
-#ifdef DEBUG
-  DisallowHeapAllocation no_gc_;
-#endif  // DEBUG
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 };
 
 // Generic array grows dynamically with O(1) amortized insertion.
diff --git a/deps/v8/src/objects/hash-table-inl.h b/deps/v8/src/objects/hash-table-inl.h
index 4e4e9b90176031..08f30ad004ebb8 100644
--- a/deps/v8/src/objects/hash-table-inl.h
+++ b/deps/v8/src/objects/hash-table-inl.h
@@ -71,18 +71,15 @@ void EphemeronHashTable::set_key(int index, Object value,
 }
 
 int HashTableBase::NumberOfElements() const {
-  int offset = OffsetOfElementAt(kNumberOfElementsIndex);
-  return TaggedField<Smi>::load(*this, offset).value();
+  return Smi::cast(get(kNumberOfElementsIndex)).value();
 }
 
 int HashTableBase::NumberOfDeletedElements() const {
-  int offset = OffsetOfElementAt(kNumberOfDeletedElementsIndex);
-  return TaggedField<Smi>::load(*this, offset).value();
+  return Smi::cast(get(kNumberOfDeletedElementsIndex)).value();
 }
 
 int HashTableBase::Capacity() const {
-  int offset = OffsetOfElementAt(kCapacityIndex);
-  return TaggedField<Smi>::load(*this, offset).value();
+  return Smi::cast(get(kCapacityIndex)).value();
 }
 
 InternalIndex::Range HashTableBase::IterateEntries() const {
@@ -145,6 +142,7 @@ template <typename Derived, typename Shape>
 InternalIndex HashTable<Derived, Shape>::FindEntry(IsolateRoot isolate,
                                                    ReadOnlyRoots roots, Key key,
                                                    int32_t hash) {
+  DisallowGarbageCollection no_gc;
   uint32_t capacity = Capacity();
   uint32_t count = 1;
   Object undefined = roots.undefined_value();
diff --git a/deps/v8/src/objects/heap-object.h b/deps/v8/src/objects/heap-object.h
index 429379d9d303f2..b412d7c733effa 100644
--- a/deps/v8/src/objects/heap-object.h
+++ b/deps/v8/src/objects/heap-object.h
@@ -10,6 +10,7 @@
 #include "src/objects/objects.h"
 #include "src/objects/tagged-field.h"
 #include "src/roots/roots.h"
+#include "src/torque/runtime-macro-shims.h"
 
 // Has to be the last include (doesn't have include guards):
 #include "src/objects/object-macros.h"
@@ -153,12 +154,12 @@ class HeapObject : public Object {
   DECL_CAST(HeapObject)
 
   // Return the write barrier mode for this. Callers of this function
-  // must be able to present a reference to an DisallowHeapAllocation
+  // must be able to present a reference to an DisallowGarbageCollection
   // object as a sign that they are not going to use this function
   // from code that allocates and thus invalidates the returned write
   // barrier mode.
   inline WriteBarrierMode GetWriteBarrierMode(
-      const DisallowHeapAllocation& promise);
+      const DisallowGarbageCollection& promise);
 
   // Dispatched behavior.
   void HeapObjectShortPrint(std::ostream& os);  // NOLINT
diff --git a/deps/v8/src/objects/instance-type.h b/deps/v8/src/objects/instance-type.h
index 2b230224e36e04..cc65797210a52f 100644
--- a/deps/v8/src/objects/instance-type.h
+++ b/deps/v8/src/objects/instance-type.h
@@ -87,12 +87,6 @@ enum InstanceType : uint16_t {
       kTwoByteStringTag | kExternalStringTag | kInternalizedTag,
   EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE =
       kOneByteStringTag | kExternalStringTag | kInternalizedTag,
-  UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE =
-      EXTERNAL_INTERNALIZED_STRING_TYPE | kUncachedExternalStringTag |
-      kInternalizedTag,
-  UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE =
-      EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE | kUncachedExternalStringTag |
-      kInternalizedTag,
   STRING_TYPE = INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
   ONE_BYTE_STRING_TYPE =
       ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
@@ -107,10 +101,12 @@ enum InstanceType : uint16_t {
       EXTERNAL_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
   EXTERNAL_ONE_BYTE_STRING_TYPE =
       EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
-  UNCACHED_EXTERNAL_STRING_TYPE =
-      UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
+  UNCACHED_EXTERNAL_STRING_TYPE = kTwoByteStringTag | kExternalStringTag |
+                                  kUncachedExternalStringTag |
+                                  kNotInternalizedTag,
   UNCACHED_EXTERNAL_ONE_BYTE_STRING_TYPE =
-      UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
+      kOneByteStringTag | kExternalStringTag | kUncachedExternalStringTag |
+      kNotInternalizedTag,
   THIN_STRING_TYPE = kTwoByteStringTag | kThinStringTag | kNotInternalizedTag,
   THIN_ONE_BYTE_STRING_TYPE =
       kOneByteStringTag | kThinStringTag | kNotInternalizedTag,
@@ -125,10 +121,6 @@ enum InstanceType : uint16_t {
 // - JSSpecialObject and JSCustomElementsObject are aligned with the beginning
 //   of the JSObject range, so that we can use a larger range check from
 //   FIRST_JS_RECEIVER_TYPE to the end of those ranges and include JSProxy too.
-// - JSFunction is last, meaning we can use a single inequality check to
-//   determine whether an instance type is within the range for any class in the
-//   inheritance hierarchy of JSFunction. This includes commonly-checked classes
-//   JSObject and JSReceiver.
 #define MAKE_TORQUE_INSTANCE_TYPE(TYPE, value) TYPE = value,
   TORQUE_ASSIGNED_INSTANCE_TYPES(MAKE_TORQUE_INSTANCE_TYPE)
 #undef MAKE_TORQUE_INSTANCE_TYPE
@@ -147,8 +139,6 @@ enum InstanceType : uint16_t {
   // Convenient names for things where the generated name is awkward:
   FIRST_TYPE = FIRST_HEAP_OBJECT_TYPE,
   LAST_TYPE = LAST_HEAP_OBJECT_TYPE,
-  FIRST_FUNCTION_TYPE = FIRST_JS_FUNCTION_OR_BOUND_FUNCTION_TYPE,
-  LAST_FUNCTION_TYPE = LAST_JS_FUNCTION_OR_BOUND_FUNCTION_TYPE,
   BIGINT_TYPE = BIG_INT_BASE_TYPE,
 };
 
@@ -277,11 +267,6 @@ TYPED_ARRAYS(TYPED_ARRAY_IS_TYPE_FUNCTION_DECL)
   V(_, SymbolMap, symbol_map, Symbol)                                       \
   V(_, TransitionArrayMap, transition_array_map, TransitionArray)           \
   V(_, Tuple2Map, tuple2_map, Tuple2)                                       \
-  V(_, UncompiledDataWithoutPreparseDataMap,                                \
-    uncompiled_data_without_preparse_data_map,                              \
-    UncompiledDataWithoutPreparseData)                                      \
-  V(_, UncompiledDataWithPreparseDataMap,                                   \
-    uncompiled_data_with_preparse_data_map, UncompiledDataWithPreparseData) \
   V(_, WeakFixedArrayMap, weak_fixed_array_map, WeakFixedArray)             \
   TORQUE_DEFINED_MAP_CSA_LIST_GENERATOR(V, _)
 
diff --git a/deps/v8/src/objects/intl-objects.cc b/deps/v8/src/objects/intl-objects.cc
index 4840a8397517c4..e60c2d51fed37c 100644
--- a/deps/v8/src/objects/intl-objects.cc
+++ b/deps/v8/src/objects/intl-objects.cc
@@ -194,7 +194,7 @@ const uint8_t* Intl::ToLatin1LowerTable() { return &kToLower[0]; }
 icu::UnicodeString Intl::ToICUUnicodeString(Isolate* isolate,
                                             Handle<String> string) {
   DCHECK(string->IsFlat());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   std::unique_ptr<uc16[]> sap;
   // Short one-byte strings can be expanded on the stack to avoid allocating a
   // temporary buffer.
@@ -215,7 +215,7 @@ icu::UnicodeString Intl::ToICUUnicodeString(Isolate* isolate,
 namespace {
 icu::StringPiece ToICUStringPiece(Isolate* isolate, Handle<String> string) {
   DCHECK(string->IsFlat());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   const String::FlatContent& flat = string->GetFlatContent(no_gc);
   if (!flat.IsOneByte()) return icu::StringPiece(nullptr, 0);
@@ -249,7 +249,7 @@ MaybeHandle<String> LocaleConvertCase(Isolate* isolate, Handle<String> s,
     ASSIGN_RETURN_ON_EXCEPTION(
         isolate, result, isolate->factory()->NewRawTwoByteString(dest_length),
         String);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     DCHECK(s->IsFlat());
     String::FlatContent flat = s->GetFlatContent(no_gc);
     const UChar* src = GetUCharBufferFromFlat(flat, &sap, src_length);
@@ -285,7 +285,7 @@ String Intl::ConvertOneByteToLower(String src, String dst) {
   DCHECK(src.IsFlat());
   DCHECK(dst.IsSeqOneByteString());
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   const int length = src.length();
   String::FlatContent src_flat = src.GetFlatContent(no_gc);
@@ -365,7 +365,7 @@ MaybeHandle<String> Intl::ConvertToUpper(Isolate* isolate, Handle<String> s) {
     int sharp_s_count;
     bool is_result_single_byte;
     {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       String::FlatContent flat = s->GetFlatContent(no_gc);
       uint8_t* dest = result->GetChars(no_gc);
       if (flat.IsOneByte()) {
@@ -405,7 +405,7 @@ MaybeHandle<String> Intl::ConvertToUpper(Isolate* isolate, Handle<String> s) {
         isolate, result,
         isolate->factory()->NewRawOneByteString(length + sharp_s_count),
         String);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent flat = s->GetFlatContent(no_gc);
     if (flat.IsOneByte()) {
       ToUpperWithSharpS(flat.ToOneByteVector(), result);
@@ -433,7 +433,7 @@ std::string Intl::GetNumberingSystem(const icu::Locale& icu_locale) {
 namespace {
 
 Maybe<icu::Locale> CreateICULocale(const std::string& bcp47_locale) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   // Convert BCP47 into ICU locale format.
   UErrorCode status = U_ZERO_ERROR;
@@ -588,27 +588,6 @@ Maybe<std::string> Intl::ToLanguageTag(const icu::Locale& locale) {
     return Nothing<std::string>();
   }
   DCHECK(U_SUCCESS(status));
-
-  // Hack to remove -true and -yes from unicode extensions
-  // Address https://crbug.com/v8/8565
-  // TODO(ftang): Move the following "remove true" logic into ICU toLanguageTag
-  // by fixing ICU-20310.
-  size_t u_ext_start = res.find("-u-");
-  if (u_ext_start != std::string::npos) {
-    // remove "-true" and "-yes" after -u-
-    const std::vector<std::string> remove_items({"-true", "-yes"});
-    for (auto item = remove_items.begin(); item != remove_items.end(); item++) {
-      for (size_t sep_remove =
-               res.find(*item, u_ext_start + 5 /* strlen("-u-xx") == 5 */);
-           sep_remove != std::string::npos; sep_remove = res.find(*item)) {
-        size_t end_of_sep_remove = sep_remove + item->length();
-        if (res.length() == end_of_sep_remove ||
-            res.at(end_of_sep_remove) == '-') {
-          res.erase(sep_remove, item->length());
-        }
-      }
-    }
-  }
   return Just(res);
 }
 
@@ -744,22 +723,12 @@ bool IsTwoLetterLanguage(const std::string& locale) {
          IsAsciiLower(locale[1]);
 }
 
-bool IsDeprecatedLanguage(const std::string& locale) {
+bool IsDeprecatedOrLegacyLanguage(const std::string& locale) {
   //  Check if locale is one of the deprecated language tags:
   return locale == "in" || locale == "iw" || locale == "ji" || locale == "jw" ||
-         locale == "mo";
-}
-
-// Reference:
-// https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
-bool IsGrandfatheredTagWithoutPreferredVaule(const std::string& locale) {
-  if (V8_UNLIKELY(locale == "zh-min" || locale == "cel-gaulish")) return true;
-  if (locale.length() > 6 /* i-mingo is 7 chars long */ &&
-      V8_UNLIKELY(locale[0] == 'i' && locale[1] == '-')) {
-    return locale.substr(2) == "default" || locale.substr(2) == "enochian" ||
-           locale.substr(2) == "mingo";
-  }
-  return false;
+         locale == "mo" ||
+         //  Check if locale is one of the legacy language tags:
+         locale == "sh" || locale == "tl" || locale == "no";
 }
 
 bool IsStructurallyValidLanguageTag(const std::string& tag) {
@@ -788,7 +757,7 @@ Maybe<std::string> CanonicalizeLanguageTag(Isolate* isolate,
   // (in, iw, ji, jw). Don't check for ~70 of 3-letter deprecated language
   // codes. Instead, let them be handled by ICU in the slow path. However,
   // fast-track 'fil' (3-letter canonical code).
-  if ((IsTwoLetterLanguage(locale) && !IsDeprecatedLanguage(locale)) ||
+  if ((IsTwoLetterLanguage(locale) && !IsDeprecatedOrLegacyLanguage(locale)) ||
       locale == "fil") {
     return Just(locale);
   }
@@ -797,13 +766,6 @@ Maybe<std::string> CanonicalizeLanguageTag(Isolate* isolate,
   // the input before any more check.
   std::transform(locale.begin(), locale.end(), locale.begin(), ToAsciiLower);
 
-  // ICU maps a few grandfathered tags to what looks like a regular language
-  // tag even though IANA language tag registry does not have a preferred
-  // entry map for them. Return them as they're with lowercasing.
-  if (IsGrandfatheredTagWithoutPreferredVaule(locale)) {
-    return Just(locale);
-  }
-
   // // ECMA 402 6.2.3
   // TODO(jshin): uloc_{for,to}TanguageTag can fail even for a structually valid
   // language tag if it's too long (much longer than 100 chars). Even if we
@@ -817,6 +779,19 @@ Maybe<std::string> CanonicalizeLanguageTag(Isolate* isolate,
   // is structurally valid. Due to a couple of bugs, we can't use it
   // without Chromium patches or ICU 62 or earlier.
   icu::Locale icu_locale = icu::Locale::forLanguageTag(locale.c_str(), error);
+
+  if (U_FAILURE(error) || icu_locale.isBogus()) {
+    THROW_NEW_ERROR_RETURN_VALUE(
+        isolate,
+        NewRangeError(
+            MessageTemplate::kInvalidLanguageTag,
+            isolate->factory()->NewStringFromAsciiChecked(locale.c_str())),
+        Nothing<std::string>());
+  }
+
+  // Use LocaleBuilder to validate locale.
+  icu_locale = icu::LocaleBuilder().setLocale(icu_locale).build(error);
+  icu_locale.canonicalize(error);
   if (U_FAILURE(error) || icu_locale.isBogus()) {
     THROW_NEW_ERROR_RETURN_VALUE(
         isolate,
@@ -1014,16 +989,16 @@ MaybeHandle<String> Intl::StringLocaleConvertCase(Isolate* isolate,
 MaybeHandle<Object> Intl::StringLocaleCompare(
     Isolate* isolate, Handle<String> string1, Handle<String> string2,
     Handle<Object> locales, Handle<Object> options, const char* method) {
-  // We only cache the instance when both locales and options are undefined,
-  // as that is the only case when the specified side-effects of examining
-  // those arguments are unobservable.
-  bool can_cache =
-      locales->IsUndefined(isolate) && options->IsUndefined(isolate);
+  // We only cache the instance when locales is a string/undefined and
+  // options is undefined, as that is the only case when the specified
+  // side-effects of examining those arguments are unobservable.
+  bool can_cache = (locales->IsString() || locales->IsUndefined(isolate)) &&
+                   options->IsUndefined(isolate);
   if (can_cache) {
     // Both locales and options are undefined, check the cache.
     icu::Collator* cached_icu_collator =
         static_cast<icu::Collator*>(isolate->get_cached_icu_object(
-            Isolate::ICUObjectCacheType::kDefaultCollator));
+            Isolate::ICUObjectCacheType::kDefaultCollator, locales));
     // We may use the cached icu::Collator for a fast path.
     if (cached_icu_collator != nullptr) {
       return Intl::CompareStrings(isolate, *cached_icu_collator, string1,
@@ -1042,7 +1017,7 @@ MaybeHandle<Object> Intl::StringLocaleCompare(
       New<JSCollator>(isolate, constructor, locales, options, method), Object);
   if (can_cache) {
     isolate->set_icu_object_in_cache(
-        Isolate::ICUObjectCacheType::kDefaultCollator,
+        Isolate::ICUObjectCacheType::kDefaultCollator, locales,
         std::static_pointer_cast<icu::UMemory>(collator->icu_collator().get()));
   }
   icu::Collator* icu_collator = collator->icu_collator().raw();
@@ -1104,16 +1079,16 @@ MaybeHandle<String> Intl::NumberToLocaleString(Isolate* isolate,
   ASSIGN_RETURN_ON_EXCEPTION(isolate, numeric_obj,
                              Object::ToNumeric(isolate, num), String);
 
-  // We only cache the instance when both locales and options are undefined,
-  // as that is the only case when the specified side-effects of examining
-  // those arguments are unobservable.
-  bool can_cache =
-      locales->IsUndefined(isolate) && options->IsUndefined(isolate);
+  // We only cache the instance when locales is a string/undefined and
+  // options is undefined, as that is the only case when the specified
+  // side-effects of examining those arguments are unobservable.
+  bool can_cache = (locales->IsString() || locales->IsUndefined(isolate)) &&
+                   options->IsUndefined(isolate);
   if (can_cache) {
     icu::number::LocalizedNumberFormatter* cached_number_format =
         static_cast<icu::number::LocalizedNumberFormatter*>(
             isolate->get_cached_icu_object(
-                Isolate::ICUObjectCacheType::kDefaultNumberFormat));
+                Isolate::ICUObjectCacheType::kDefaultNumberFormat, locales));
     // We may use the cached icu::NumberFormat for a fast path.
     if (cached_number_format != nullptr) {
       return JSNumberFormat::FormatNumeric(isolate, *cached_number_format,
@@ -1134,7 +1109,7 @@ MaybeHandle<String> Intl::NumberToLocaleString(Isolate* isolate,
 
   if (can_cache) {
     isolate->set_icu_object_in_cache(
-        Isolate::ICUObjectCacheType::kDefaultNumberFormat,
+        Isolate::ICUObjectCacheType::kDefaultNumberFormat, locales,
         std::static_pointer_cast<icu::UMemory>(
             number_format->icu_number_formatter().get()));
   }
diff --git a/deps/v8/src/objects/intl-objects.h b/deps/v8/src/objects/intl-objects.h
index cc507a75ab8d18..8530a278e639d0 100644
--- a/deps/v8/src/objects/intl-objects.h
+++ b/deps/v8/src/objects/intl-objects.h
@@ -21,7 +21,7 @@
 #include "unicode/locid.h"
 #include "unicode/uversion.h"
 
-#define V8_MINIMUM_ICU_VERSION 67
+#define V8_MINIMUM_ICU_VERSION 68
 
 namespace U_ICU_NAMESPACE {
 class BreakIterator;
diff --git a/deps/v8/src/objects/js-array-buffer-inl.h b/deps/v8/src/objects/js-array-buffer-inl.h
index 9f2046382f5496..8a0ef135935326 100644
--- a/deps/v8/src/objects/js-array-buffer-inl.h
+++ b/deps/v8/src/objects/js-array-buffer-inl.h
@@ -274,7 +274,7 @@ void JSTypedArray::SetOnHeapDataPtr(Isolate* isolate, HeapObject base,
 }
 
 bool JSTypedArray::is_on_heap() const {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Checking that buffer()->backing_store() is not nullptr is not sufficient;
   // it will be nullptr when byte_length is 0 as well.
   return base_pointer() == elements();
diff --git a/deps/v8/src/objects/js-array-buffer.cc b/deps/v8/src/objects/js-array-buffer.cc
index 72dfde896e8379..074a8dc1bf28cb 100644
--- a/deps/v8/src/objects/js-array-buffer.cc
+++ b/deps/v8/src/objects/js-array-buffer.cc
@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 #include "src/objects/js-array-buffer.h"
-#include "src/objects/js-array-buffer-inl.h"
 
+#include "src/base/platform/wrappers.h"
 #include "src/execution/protectors-inl.h"
 #include "src/logging/counters.h"
+#include "src/objects/js-array-buffer-inl.h"
 #include "src/objects/property-descriptor.h"
 
 namespace v8 {
@@ -174,7 +175,7 @@ Handle<JSArrayBuffer> JSTypedArray::GetBuffer() {
 
   // Copy the elements into the backing store of the array buffer.
   if (byte_length > 0) {
-    memcpy(backing_store->buffer_start(), self->DataPtr(), byte_length);
+    base::Memcpy(backing_store->buffer_start(), self->DataPtr(), byte_length);
   }
 
   // Attach the backing store to the array buffer.
@@ -226,12 +227,12 @@ Maybe<bool> JSTypedArray::DefineOwnProperty(Isolate* isolate,
                        NewTypeError(MessageTemplate::kRedefineDisallowed, key));
       }
       // 3b vii. If Desc has a [[Configurable]] field and if
-      //         Desc.[[Configurable]] is true, return false.
+      //         Desc.[[Configurable]] is false, return false.
       // 3b viii. If Desc has an [[Enumerable]] field and if Desc.[[Enumerable]]
       //          is false, return false.
       // 3b ix. If Desc has a [[Writable]] field and if Desc.[[Writable]] is
       //        false, return false.
-      if ((desc->has_configurable() && desc->configurable()) ||
+      if ((desc->has_configurable() && !desc->configurable()) ||
           (desc->has_enumerable() && !desc->enumerable()) ||
           (desc->has_writable() && !desc->writable())) {
         RETURN_FAILURE(isolate, GetShouldThrow(isolate, should_throw),
@@ -241,7 +242,7 @@ Maybe<bool> JSTypedArray::DefineOwnProperty(Isolate* isolate,
       //   3b x 1. Let value be Desc.[[Value]].
       //   3b x 2. Return ? IntegerIndexedElementSet(O, numericIndex, value).
       if (desc->has_value()) {
-        if (!desc->has_configurable()) desc->set_configurable(false);
+        if (!desc->has_configurable()) desc->set_configurable(true);
         if (!desc->has_enumerable()) desc->set_enumerable(true);
         if (!desc->has_writable()) desc->set_writable(true);
         Handle<Object> value = desc->value();
diff --git a/deps/v8/src/objects/js-array.tq b/deps/v8/src/objects/js-array.tq
index a4d4b9d356bed8..b18f5bafac6805 100644
--- a/deps/v8/src/objects/js-array.tq
+++ b/deps/v8/src/objects/js-array.tq
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-extern enum IterationKind extends uint31
-constexpr 'IterationKind' { kKeys, kValues, kEntries }
+extern enum IterationKind extends uint31 { kKeys, kValues, kEntries }
 
 extern class JSArrayIterator extends JSObject {
   iterated_object: JSReceiver;
diff --git a/deps/v8/src/objects/js-break-iterator.cc b/deps/v8/src/objects/js-break-iterator.cc
index 32f31ad003f3e4..d8794b02ce4c6c 100644
--- a/deps/v8/src/objects/js-break-iterator.cc
+++ b/deps/v8/src/objects/js-break-iterator.cc
@@ -113,7 +113,7 @@ MaybeHandle<JSV8BreakIterator> JSV8BreakIterator::New(
   Handle<JSV8BreakIterator> break_iterator_holder =
       Handle<JSV8BreakIterator>::cast(
           isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   break_iterator_holder->set_locale(*locale_str);
   break_iterator_holder->set_break_iterator(*managed_break_iterator);
   break_iterator_holder->set_unicode_string(*managed_unicode_string);
diff --git a/deps/v8/src/objects/js-collator.cc b/deps/v8/src/objects/js-collator.cc
index 8d5dd0c56a4f52..e51317cb5a2feb 100644
--- a/deps/v8/src/objects/js-collator.cc
+++ b/deps/v8/src/objects/js-collator.cc
@@ -548,7 +548,7 @@ MaybeHandle<JSCollator> JSCollator::New(Isolate* isolate, Handle<Map> map,
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSCollator> collator = Handle<JSCollator>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   collator->set_icu_collator(*managed_collator);
   collator->set_locale(*locale_str);
 
diff --git a/deps/v8/src/objects/js-date-time-format-inl.h b/deps/v8/src/objects/js-date-time-format-inl.h
index fefe081f8f5498..6e24da0589e8bc 100644
--- a/deps/v8/src/objects/js-date-time-format-inl.h
+++ b/deps/v8/src/objects/js-date-time-format-inl.h
@@ -28,6 +28,8 @@ ACCESSORS(JSDateTimeFormat, icu_simple_date_format,
 ACCESSORS(JSDateTimeFormat, icu_date_interval_format,
           Managed<icu::DateIntervalFormat>, kIcuDateIntervalFormatOffset)
 
+BOOL_ACCESSORS(JSDateTimeFormat, flags, iso8601, Iso8601Bit::kShift)
+
 inline void JSDateTimeFormat::set_hour_cycle(HourCycle hour_cycle) {
   int hints = flags();
   hints = HourCycleBits::update(hints, hour_cycle);
diff --git a/deps/v8/src/objects/js-date-time-format.cc b/deps/v8/src/objects/js-date-time-format.cc
index 3e9cff0df8261c..c26b77e2f54b98 100644
--- a/deps/v8/src/objects/js-date-time-format.cc
+++ b/deps/v8/src/objects/js-date-time-format.cc
@@ -510,7 +510,11 @@ MaybeHandle<JSObject> JSDateTimeFormat::ResolvedOptions(
   // and
   // http://www.unicode.org/repos/cldr/tags/latest/common/bcp47/calendar.xml
   if (calendar_str == "gregorian") {
-    calendar_str = "gregory";
+    if (date_time_format->iso8601()) {
+      calendar_str = "iso8601";
+    } else {
+      calendar_str = "gregory";
+    }
   } else if (calendar_str == "ethiopic-amete-alem") {
     calendar_str = "ethioaa";
   }
@@ -770,16 +774,16 @@ MaybeHandle<String> JSDateTimeFormat::ToLocaleDateTime(
     return factory->Invalid_Date_string();
   }
 
-  // We only cache the instance when both locales and options are undefined,
-  // as that is the only case when the specified side-effects of examining
-  // those arguments are unobservable.
-  bool can_cache =
-      locales->IsUndefined(isolate) && options->IsUndefined(isolate);
+  // We only cache the instance when locales is a string/undefined and
+  // options is undefined, as that is the only case when the specified
+  // side-effects of examining those arguments are unobservable.
+  bool can_cache = (locales->IsString() || locales->IsUndefined(isolate)) &&
+                   options->IsUndefined(isolate);
   if (can_cache) {
     // Both locales and options are undefined, check the cache.
     icu::SimpleDateFormat* cached_icu_simple_date_format =
         static_cast<icu::SimpleDateFormat*>(
-            isolate->get_cached_icu_object(cache_type));
+            isolate->get_cached_icu_object(cache_type, locales));
     if (cached_icu_simple_date_format != nullptr) {
       return FormatDateTime(isolate, *cached_icu_simple_date_format, x);
     }
@@ -807,8 +811,9 @@ MaybeHandle<String> JSDateTimeFormat::ToLocaleDateTime(
 
   if (can_cache) {
     isolate->set_icu_object_in_cache(
-        cache_type, std::static_pointer_cast<icu::UMemory>(
-                        date_time_format->icu_simple_date_format().get()));
+        cache_type, locales,
+        std::static_pointer_cast<icu::UMemory>(
+            date_time_format->icu_simple_date_format().get()));
   }
   // 5. Return FormatDateTime(dateFormat, x).
   icu::SimpleDateFormat* format =
@@ -1562,6 +1567,7 @@ MaybeHandle<JSDateTimeFormat> JSDateTimeFormat::New(
     icu_locale.setUnicodeKeywordValue("ca", calendar_str.get(), status);
     DCHECK(U_SUCCESS(status));
   }
+  bool iso8601 = strstr(icu_locale.getName(), "calendar=iso8601") != nullptr;
 
   if (numbering_system_str != nullptr &&
       Intl::IsValidNumberingSystem(numbering_system_str.get())) {
@@ -1860,7 +1866,7 @@ MaybeHandle<JSDateTimeFormat> JSDateTimeFormat::New(
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSDateTimeFormat> date_time_format = Handle<JSDateTimeFormat>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   date_time_format->set_flags(0);
   if (date_style != DateTimeStyle::kUndefined) {
     date_time_format->set_date_style(date_style);
@@ -1869,6 +1875,7 @@ MaybeHandle<JSDateTimeFormat> JSDateTimeFormat::New(
     date_time_format->set_time_style(time_style);
   }
   date_time_format->set_hour_cycle(dateTimeFormatHourCycle);
+  date_time_format->set_iso8601(iso8601);
   date_time_format->set_locale(*locale_str);
   date_time_format->set_icu_locale(*managed_locale);
   date_time_format->set_icu_simple_date_format(*managed_format);
diff --git a/deps/v8/src/objects/js-date-time-format.h b/deps/v8/src/objects/js-date-time-format.h
index 52815f9e86ab37..de8ccfd069c4f0 100644
--- a/deps/v8/src/objects/js-date-time-format.h
+++ b/deps/v8/src/objects/js-date-time-format.h
@@ -128,6 +128,8 @@ class JSDateTimeFormat
   DECL_ACCESSORS(icu_simple_date_format, Managed<icu::SimpleDateFormat>)
   DECL_ACCESSORS(icu_date_interval_format, Managed<icu::DateIntervalFormat>)
 
+  DECL_BOOLEAN_ACCESSORS(iso8601)
+
   DECL_PRINTER(JSDateTimeFormat)
 
   TQ_OBJECT_CONSTRUCTORS(JSDateTimeFormat)
diff --git a/deps/v8/src/objects/js-date-time-format.tq b/deps/v8/src/objects/js-date-time-format.tq
index f45db187ebce6f..a5d6fc96f584a1 100644
--- a/deps/v8/src/objects/js-date-time-format.tq
+++ b/deps/v8/src/objects/js-date-time-format.tq
@@ -10,6 +10,7 @@ bitfield struct JSDateTimeFormatFlags extends uint31 {
   hour_cycle: HourCycle: 3 bit;
   date_style: DateTimeStyle: 3 bit;
   time_style: DateTimeStyle: 3 bit;
+  iso8601: bool: 1bit;
 }
 
 @generateCppClass
diff --git a/deps/v8/src/objects/js-display-names.cc b/deps/v8/src/objects/js-display-names.cc
index 6532b0c25e1158..5c444b98ba2264 100644
--- a/deps/v8/src/objects/js-display-names.cc
+++ b/deps/v8/src/objects/js-display-names.cc
@@ -672,7 +672,7 @@ MaybeHandle<JSDisplayNames> JSDisplayNames::New(Isolate* isolate,
   display_names->set_style(style_enum);
   display_names->set_fallback(fallback_enum);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   display_names->set_internal(*managed_internal);
 
   // Return displayNames.
diff --git a/deps/v8/src/objects/js-function-inl.h b/deps/v8/src/objects/js-function-inl.h
index c937f0231172c7..8a4980a5f77945 100644
--- a/deps/v8/src/objects/js-function-inl.h
+++ b/deps/v8/src/objects/js-function-inl.h
@@ -111,9 +111,10 @@ void JSFunction::CompleteInobjectSlackTrackingIfActive() {
   }
 }
 
-AbstractCode JSFunction::abstract_code() {
+template <typename LocalIsolate>
+AbstractCode JSFunction::abstract_code(LocalIsolate* isolate) {
   if (ActiveTierIsIgnition()) {
-    return AbstractCode::cast(shared().GetBytecodeArray());
+    return AbstractCode::cast(shared().GetBytecodeArray(isolate));
   } else {
     return AbstractCode::cast(code());
   }
diff --git a/deps/v8/src/objects/js-function.cc b/deps/v8/src/objects/js-function.cc
index 6bb3665963dfb9..2e657d28266e8b 100644
--- a/deps/v8/src/objects/js-function.cc
+++ b/deps/v8/src/objects/js-function.cc
@@ -321,6 +321,12 @@ void JSFunction::InitializeFeedbackCell(Handle<JSFunction> function,
     return;
   }
 
+  if (function->has_closure_feedback_cell_array()) {
+    CHECK_EQ(
+        function->closure_feedback_cell_array().length(),
+        function->shared().feedback_metadata().create_closure_slot_count());
+  }
+
   const bool needs_feedback_vector =
       !FLAG_lazy_feedback_allocation || FLAG_always_opt ||
       function->shared().may_have_cached_code() ||
@@ -434,15 +440,16 @@ void JSFunction::SetPrototype(Handle<JSFunction> function,
 
 void JSFunction::SetInitialMap(Handle<JSFunction> function, Handle<Map> map,
                                Handle<HeapObject> prototype) {
+  Isolate* isolate = function->GetIsolate();
   if (map->prototype() != *prototype) {
-    Map::SetPrototype(function->GetIsolate(), map, prototype);
+    Map::SetPrototype(isolate, map, prototype);
   }
   function->set_prototype_or_initial_map(*map);
   map->SetConstructor(*function);
   if (FLAG_trace_maps) {
-    LOG(function->GetIsolate(), MapEvent("InitialMap", Handle<Map>(), map, "",
-                                         handle(function->shared().DebugName(),
-                                                function->GetIsolate())));
+    LOG(isolate, MapEvent("InitialMap", Handle<Map>(), map, "",
+                          SharedFunctionInfo::DebugName(
+                              handle(function->shared(), isolate))));
   }
 }
 
@@ -503,6 +510,7 @@ bool CanSubclassHaveInobjectProperties(InstanceType instance_type) {
   switch (instance_type) {
     case JS_API_OBJECT_TYPE:
     case JS_ARRAY_BUFFER_TYPE:
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
     case JS_ARRAY_TYPE:
     case JS_ASYNC_FROM_SYNC_ITERATOR_TYPE:
     case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
@@ -510,6 +518,15 @@ bool CanSubclassHaveInobjectProperties(InstanceType instance_type) {
     case JS_DATE_TYPE:
     case JS_FUNCTION_TYPE:
     case JS_GENERATOR_OBJECT_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
 #ifdef V8_INTL_SUPPORT
     case JS_COLLATOR_TYPE:
     case JS_DATE_TIME_FORMAT_TYPE:
@@ -737,8 +754,7 @@ int JSFunction::ComputeInstanceSizeWithMinSlack(Isolate* isolate) {
 }
 
 void JSFunction::PrintName(FILE* out) {
-  std::unique_ptr<char[]> name = shared().DebugName().ToCString();
-  PrintF(out, "%s", name.get());
+  PrintF(out, "%s", shared().DebugNameCStr().get());
 }
 
 Handle<String> JSFunction::GetName(Handle<JSFunction> function) {
@@ -746,7 +762,7 @@ Handle<String> JSFunction::GetName(Handle<JSFunction> function) {
   Handle<Object> name =
       JSReceiver::GetDataProperty(function, isolate->factory()->name_string());
   if (name->IsString()) return Handle<String>::cast(name);
-  return handle(function->shared().DebugName(), isolate);
+  return SharedFunctionInfo::DebugName(handle(function->shared(), isolate));
 }
 
 Handle<String> JSFunction::GetDebugName(Handle<JSFunction> function) {
diff --git a/deps/v8/src/objects/js-function.h b/deps/v8/src/objects/js-function.h
index 9fab6bd6c7ab72..bf4cbc87fba9f3 100644
--- a/deps/v8/src/objects/js-function.h
+++ b/deps/v8/src/objects/js-function.h
@@ -89,7 +89,8 @@ class JSFunction : public JSFunctionOrBoundFunction {
 
   // Get the abstract code associated with the function, which will either be
   // a Code object or a BytecodeArray.
-  inline AbstractCode abstract_code();
+  template <typename LocalIsolate>
+  inline AbstractCode abstract_code(LocalIsolate* isolate);
 
   // The predicates for querying code kinds related to this function have
   // specific terminology:
diff --git a/deps/v8/src/objects/js-function.tq b/deps/v8/src/objects/js-function.tq
index b2e8aa6be2f560..62b175a51f912c 100644
--- a/deps/v8/src/objects/js-function.tq
+++ b/deps/v8/src/objects/js-function.tq
@@ -4,7 +4,6 @@
 
 @abstract
 @generateCppClass
-@highestInstanceTypeWithinParentClassRange
 extern class JSFunctionOrBoundFunction extends JSObject {
 }
 
diff --git a/deps/v8/src/objects/js-list-format.cc b/deps/v8/src/objects/js-list-format.cc
index e48a387be50fc7..54f88221f7b53b 100644
--- a/deps/v8/src/objects/js-list-format.cc
+++ b/deps/v8/src/objects/js-list-format.cc
@@ -137,7 +137,7 @@ MaybeHandle<JSListFormat> JSListFormat::New(Isolate* isolate, Handle<Map> map,
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSListFormat> list_format = Handle<JSListFormat>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   list_format->set_flags(0);
   list_format->set_icu_formatter(*managed_formatter);
 
diff --git a/deps/v8/src/objects/js-locale.cc b/deps/v8/src/objects/js-locale.cc
index c9c4cad262c119..82a62103757f93 100644
--- a/deps/v8/src/objects/js-locale.cc
+++ b/deps/v8/src/objects/js-locale.cc
@@ -104,20 +104,15 @@ Handle<Object> UnicodeKeywordValue(Isolate* isolate, Handle<JSLocale> locale,
   if (value == "yes") {
     value = "true";
   }
+  if (value == "true" && strcmp(key, "kf") == 0) {
+    return isolate->factory()->NewStringFromStaticChars("");
+  }
   return isolate->factory()->NewStringFromAsciiChecked(value.c_str());
 }
 
-bool InRange(size_t value, size_t start, size_t end) {
-  return (start <= value) && (value <= end);
-}
-
-bool InRange(char value, char start, char end) {
-  return (start <= value) && (value <= end);
-}
-
 bool IsCheckRange(const std::string& str, size_t min, size_t max,
                   bool(range_check_func)(char)) {
-  if (!InRange(str.length(), min, max)) return false;
+  if (!base::IsInRange(str.length(), min, max)) return false;
   for (size_t i = 0; i < str.length(); i++) {
     if (!range_check_func(str[i])) return false;
   }
@@ -125,18 +120,20 @@ bool IsCheckRange(const std::string& str, size_t min, size_t max,
 }
 bool IsAlpha(const std::string& str, size_t min, size_t max) {
   return IsCheckRange(str, min, max, [](char c) -> bool {
-    return InRange(c, 'a', 'z') || InRange(c, 'A', 'Z');
+    return base::IsInRange(c, 'a', 'z') || base::IsInRange(c, 'A', 'Z');
   });
 }
 
 bool IsDigit(const std::string& str, size_t min, size_t max) {
-  return IsCheckRange(str, min, max,
-                      [](char c) -> bool { return InRange(c, '0', '9'); });
+  return IsCheckRange(str, min, max, [](char c) -> bool {
+    return base::IsInRange(c, '0', '9');
+  });
 }
 
 bool IsAlphanum(const std::string& str, size_t min, size_t max) {
   return IsCheckRange(str, min, max, [](char c) -> bool {
-    return InRange(c, 'a', 'z') || InRange(c, 'A', 'Z') || InRange(c, '0', '9');
+    return base::IsInRange(c, 'a', 'z') || base::IsInRange(c, 'A', 'Z') ||
+           base::IsInRange(c, '0', '9');
   });
 }
 
@@ -156,7 +153,7 @@ bool IsUnicodeRegionSubtag(const std::string& value) {
 }
 
 bool IsDigitAlphanum3(const std::string& value) {
-  return value.length() == 4 && InRange(value[0], '0', '9') &&
+  return value.length() == 4 && base::IsInRange(value[0], '0', '9') &&
          IsAlphanum(value.substr(1), 3, 3);
 }
 
@@ -242,10 +239,12 @@ Maybe<bool> ApplyOptionsToTag(Isolate* isolate, Handle<String> tag,
     return Just(false);
   }
   UErrorCode status = U_ZERO_ERROR;
-  builder->build(status);
+  icu::Locale canonicalized = builder->build(status);
+  canonicalized.canonicalize(status);
   if (U_FAILURE(status)) {
     return Just(false);
   }
+  builder->setLocale(canonicalized);
 
   // 3. Let language be ? GetOption(options, "language", "string", undefined,
   // undefined).
@@ -346,6 +345,9 @@ MaybeHandle<JSLocale> JSLocale::New(Isolate* isolate, Handle<Map> map,
   MAYBE_RETURN(maybe_insert, MaybeHandle<JSLocale>());
   UErrorCode status = U_ZERO_ERROR;
   icu::Locale icu_locale = builder.build(status);
+
+  icu_locale.canonicalize(status);
+
   if (!maybe_insert.FromJust() || U_FAILURE(status)) {
     THROW_NEW_ERROR(isolate,
                     NewRangeError(MessageTemplate::kLocaleBadParameters),
@@ -359,7 +361,7 @@ MaybeHandle<JSLocale> JSLocale::New(Isolate* isolate, Handle<Map> map,
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSLocale> locale = Handle<JSLocale>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   locale->set_icu_locale(*managed_locale);
   return locale;
 }
@@ -381,7 +383,7 @@ MaybeHandle<JSLocale> Construct(Isolate* isolate,
 
   Handle<JSLocale> locale = Handle<JSLocale>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   locale->set_icu_locale(*managed_locale);
   return locale;
 }
diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc
index daedb2a23a41b9..30eb612da9260b 100644
--- a/deps/v8/src/objects/js-number-format.cc
+++ b/deps/v8/src/objects/js-number-format.cc
@@ -1213,7 +1213,7 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSNumberFormat> number_format = Handle<JSNumberFormat>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   number_format->set_locale(*locale_str);
 
   number_format->set_icu_number_formatter(*managed_number_formatter);
diff --git a/deps/v8/src/objects/js-objects-inl.h b/deps/v8/src/objects/js-objects-inl.h
index 65a50d34171f1d..065c5af0054385 100644
--- a/deps/v8/src/objects/js-objects-inl.h
+++ b/deps/v8/src/objects/js-objects-inl.h
@@ -102,7 +102,7 @@ V8_WARN_UNUSED_RESULT MaybeHandle<FixedArray> JSReceiver::OwnPropertyKeys(
 }
 
 bool JSObject::PrototypeHasNoElements(Isolate* isolate, JSObject object) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   HeapObject prototype = HeapObject::cast(object.map().prototype());
   ReadOnlyRoots roots(isolate);
   HeapObject null = roots.null_value();
@@ -146,7 +146,7 @@ void JSObject::EnsureCanContainElements(Handle<JSObject> object, TSlot objects,
   ElementsKind current_kind = object->GetElementsKind();
   ElementsKind target_kind = current_kind;
   {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     DCHECK(mode != ALLOW_COPIED_DOUBLE_ELEMENTS);
     bool is_holey = IsHoleyElementsKind(current_kind);
     if (current_kind == HOLEY_ELEMENTS) return;
@@ -384,7 +384,7 @@ void JSObject::WriteToField(InternalIndex descriptor, PropertyDetails details,
                             Object value) {
   DCHECK_EQ(kField, details.location());
   DCHECK_EQ(kData, details.kind());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   FieldIndex index = FieldIndex::ForDescriptor(map(), descriptor);
   if (details.representation().IsDouble()) {
     // Manipulating the signaling NaN used for the hole and uninitialized
@@ -619,16 +619,9 @@ DEF_GETTER(JSObject, HasIndexedInterceptor, bool) {
   return map(isolate).has_indexed_interceptor();
 }
 
-DEF_GETTER(JSGlobalObject, global_dictionary, GlobalDictionary) {
-  DCHECK(!HasFastProperties(isolate));
-  DCHECK(IsJSGlobalObject(isolate));
-  return GlobalDictionary::cast(raw_properties_or_hash(isolate));
-}
-
-void JSGlobalObject::set_global_dictionary(GlobalDictionary dictionary) {
-  DCHECK(IsJSGlobalObject());
-  set_raw_properties_or_hash(dictionary);
-}
+RELEASE_ACQUIRE_ACCESSORS_CHECKED2(JSGlobalObject, global_dictionary,
+                                   GlobalDictionary, kPropertiesOrHashOffset,
+                                   !HasFastProperties(isolate), true)
 
 DEF_GETTER(JSObject, element_dictionary, NumberDictionary) {
   DCHECK(HasDictionaryElements(isolate) ||
diff --git a/deps/v8/src/objects/js-objects.cc b/deps/v8/src/objects/js-objects.cc
index f889c43499cf23..e150a1339c6080 100644
--- a/deps/v8/src/objects/js-objects.cc
+++ b/deps/v8/src/objects/js-objects.cc
@@ -193,6 +193,7 @@ bool HasExcludedProperty(
 
 V8_WARN_UNUSED_RESULT Maybe<bool> FastAssign(
     Handle<JSReceiver> target, Handle<Object> source,
+    PropertiesEnumerationMode mode,
     const ScopedVector<Handle<Object>>* excluded_properties, bool use_set) {
   // Non-empty strings are the only non-JSReceivers that need to be handled
   // explicitly by Object.assign.
@@ -225,86 +226,111 @@ V8_WARN_UNUSED_RESULT Maybe<bool> FastAssign(
 
   bool stable = true;
 
-  for (InternalIndex i : map->IterateOwnDescriptors()) {
-    HandleScope inner_scope(isolate);
+  // Process symbols last and only do that if we found symbols.
+  bool has_symbol = false;
+  bool process_symbol_only = false;
+  while (true) {
+    for (InternalIndex i : map->IterateOwnDescriptors()) {
+      HandleScope inner_scope(isolate);
 
-    Handle<Name> next_key(descriptors->GetKey(i), isolate);
-    Handle<Object> prop_value;
-    // Directly decode from the descriptor array if |from| did not change shape.
-    if (stable) {
-      DCHECK_EQ(from->map(), *map);
-      DCHECK_EQ(*descriptors, map->instance_descriptors(kRelaxedLoad));
+      Handle<Name> next_key(descriptors->GetKey(i), isolate);
+      if (mode == PropertiesEnumerationMode::kEnumerationOrder) {
+        if (next_key->IsSymbol()) {
+          has_symbol = true;
+          if (!process_symbol_only) continue;
+        } else {
+          if (process_symbol_only) continue;
+        }
+      }
+      Handle<Object> prop_value;
+      // Directly decode from the descriptor array if |from| did not change
+      // shape.
+      if (stable) {
+        DCHECK_EQ(from->map(), *map);
+        DCHECK_EQ(*descriptors, map->instance_descriptors(kRelaxedLoad));
 
-      PropertyDetails details = descriptors->GetDetails(i);
-      if (!details.IsEnumerable()) continue;
-      if (details.kind() == kData) {
-        if (details.location() == kDescriptor) {
-          prop_value = handle(descriptors->GetStrongValue(i), isolate);
+        PropertyDetails details = descriptors->GetDetails(i);
+        if (!details.IsEnumerable()) continue;
+        if (details.kind() == kData) {
+          if (details.location() == kDescriptor) {
+            prop_value = handle(descriptors->GetStrongValue(i), isolate);
+          } else {
+            Representation representation = details.representation();
+            FieldIndex index = FieldIndex::ForPropertyIndex(
+                *map, details.field_index(), representation);
+            prop_value = JSObject::FastPropertyAt(from, representation, index);
+          }
         } else {
-          Representation representation = details.representation();
-          FieldIndex index = FieldIndex::ForPropertyIndex(
-              *map, details.field_index(), representation);
-          prop_value = JSObject::FastPropertyAt(from, representation, index);
+          LookupIterator it(isolate, from, next_key,
+                            LookupIterator::OWN_SKIP_INTERCEPTOR);
+          ASSIGN_RETURN_ON_EXCEPTION_VALUE(
+              isolate, prop_value, Object::GetProperty(&it), Nothing<bool>());
+          stable = from->map() == *map;
+          descriptors.PatchValue(map->instance_descriptors(kRelaxedLoad));
         }
       } else {
-        LookupIterator it(isolate, from, next_key,
+        // If the map did change, do a slower lookup. We are still guaranteed
+        // that the object has a simple shape, and that the key is a name.
+        LookupIterator it(isolate, from, next_key, from,
                           LookupIterator::OWN_SKIP_INTERCEPTOR);
+        if (!it.IsFound()) continue;
+        DCHECK(it.state() == LookupIterator::DATA ||
+               it.state() == LookupIterator::ACCESSOR);
+        if (!it.IsEnumerable()) continue;
         ASSIGN_RETURN_ON_EXCEPTION_VALUE(
             isolate, prop_value, Object::GetProperty(&it), Nothing<bool>());
-        stable = from->map() == *map;
-        descriptors.PatchValue(map->instance_descriptors(kRelaxedLoad));
       }
-    } else {
-      // If the map did change, do a slower lookup. We are still guaranteed that
-      // the object has a simple shape, and that the key is a name.
-      LookupIterator it(isolate, from, next_key, from,
-                        LookupIterator::OWN_SKIP_INTERCEPTOR);
-      if (!it.IsFound()) continue;
-      DCHECK(it.state() == LookupIterator::DATA ||
-             it.state() == LookupIterator::ACCESSOR);
-      if (!it.IsEnumerable()) continue;
-      ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-          isolate, prop_value, Object::GetProperty(&it), Nothing<bool>());
-    }
 
-    if (use_set) {
-      // The lookup will walk the prototype chain, so we have to be careful
-      // to treat any key correctly for any receiver/holder.
-      LookupIterator::Key key(isolate, next_key);
-      LookupIterator it(isolate, target, key);
-      Maybe<bool> result =
-          Object::SetProperty(&it, prop_value, StoreOrigin::kNamed,
-                              Just(ShouldThrow::kThrowOnError));
-      if (result.IsNothing()) return result;
-      if (stable) {
-        stable = from->map() == *map;
-        descriptors.PatchValue(map->instance_descriptors(kRelaxedLoad));
+      if (use_set) {
+        // The lookup will walk the prototype chain, so we have to be careful
+        // to treat any key correctly for any receiver/holder.
+        LookupIterator::Key key(isolate, next_key);
+        LookupIterator it(isolate, target, key);
+        Maybe<bool> result =
+            Object::SetProperty(&it, prop_value, StoreOrigin::kNamed,
+                                Just(ShouldThrow::kThrowOnError));
+        if (result.IsNothing()) return result;
+        if (stable) {
+          stable = from->map() == *map;
+          descriptors.PatchValue(map->instance_descriptors(kRelaxedLoad));
+        }
+      } else {
+        if (excluded_properties != nullptr &&
+            HasExcludedProperty(excluded_properties, next_key)) {
+          continue;
+        }
+
+        // 4a ii 2. Perform ? CreateDataProperty(target, nextKey, propValue).
+        // This is an OWN lookup, so constructing a named-mode LookupIterator
+        // from {next_key} is safe.
+        LookupIterator it(isolate, target, next_key, LookupIterator::OWN);
+        CHECK(JSObject::CreateDataProperty(&it, prop_value, Just(kThrowOnError))
+                  .FromJust());
       }
-    } else {
-      if (excluded_properties != nullptr &&
-          HasExcludedProperty(excluded_properties, next_key)) {
-        continue;
+    }
+    if (mode == PropertiesEnumerationMode::kEnumerationOrder) {
+      if (process_symbol_only || !has_symbol) {
+        return Just(true);
       }
-
-      // 4a ii 2. Perform ? CreateDataProperty(target, nextKey, propValue).
-      // This is an OWN lookup, so constructing a named-mode LookupIterator
-      // from {next_key} is safe.
-      LookupIterator it(isolate, target, next_key, LookupIterator::OWN);
-      CHECK(JSObject::CreateDataProperty(&it, prop_value, Just(kThrowOnError))
-                .FromJust());
+      if (has_symbol) {
+        process_symbol_only = true;
+      }
+    } else {
+      DCHECK_EQ(mode, PropertiesEnumerationMode::kPropertyAdditionOrder);
+      return Just(true);
     }
   }
-
-  return Just(true);
+  UNREACHABLE();
 }
 }  // namespace
 
 // static
 Maybe<bool> JSReceiver::SetOrCopyDataProperties(
     Isolate* isolate, Handle<JSReceiver> target, Handle<Object> source,
+    PropertiesEnumerationMode mode,
     const ScopedVector<Handle<Object>>* excluded_properties, bool use_set) {
   Maybe<bool> fast_assign =
-      FastAssign(target, source, excluded_properties, use_set);
+      FastAssign(target, source, mode, excluded_properties, use_set);
   if (fast_assign.IsNothing()) return Nothing<bool>();
   if (fast_assign.FromJust()) return Just(true);
 
@@ -327,7 +353,7 @@ Maybe<bool> JSReceiver::SetOrCopyDataProperties(
     int source_length;
     if (from->IsJSGlobalObject()) {
       source_length = JSGlobalObject::cast(*from)
-                          .global_dictionary()
+                          .global_dictionary(kAcquireLoad)
                           .NumberOfEnumerableProperties();
     } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
       source_length =
@@ -446,14 +472,15 @@ std::pair<MaybeHandle<JSFunction>, Handle<String>> GetConstructorHelper(
   // reclaimed and replaced by Object in OptimizeAsPrototype.
   if (!receiver->IsJSProxy() && receiver->map().new_target_is_base() &&
       !receiver->map().is_prototype_map()) {
-    Object maybe_constructor = receiver->map().GetConstructor();
-    if (maybe_constructor.IsJSFunction()) {
-      JSFunction constructor = JSFunction::cast(maybe_constructor);
-      String name = constructor.shared().DebugName();
-      if (name.length() != 0 &&
-          !name.Equals(ReadOnlyRoots(isolate).Object_string())) {
-        return std::make_pair(handle(constructor, isolate),
-                              handle(name, isolate));
+    Handle<Object> maybe_constructor(receiver->map().GetConstructor(), isolate);
+    if (maybe_constructor->IsJSFunction()) {
+      Handle<JSFunction> constructor =
+          Handle<JSFunction>::cast(maybe_constructor);
+      Handle<String> name =
+          SharedFunctionInfo::DebugName(handle(constructor->shared(), isolate));
+      if (name->length() != 0 &&
+          !name->Equals(ReadOnlyRoots(isolate).Object_string())) {
+        return std::make_pair(constructor, name);
       }
     }
   }
@@ -480,13 +507,14 @@ std::pair<MaybeHandle<JSFunction>, Handle<String>> GetConstructorHelper(
   Handle<Object> maybe_constructor =
       JSReceiver::GetDataProperty(&it, AllocationPolicy::kAllocationDisallowed);
   if (maybe_constructor->IsJSFunction()) {
-    JSFunction constructor = JSFunction::cast(*maybe_constructor);
-    String name = constructor.shared().DebugName();
+    Handle<JSFunction> constructor =
+        Handle<JSFunction>::cast(maybe_constructor);
+    Handle<String> name =
+        SharedFunctionInfo::DebugName(handle(constructor->shared(), isolate));
 
-    if (name.length() != 0 &&
-        !name.Equals(ReadOnlyRoots(isolate).Object_string())) {
-      return std::make_pair(handle(constructor, isolate),
-                            handle(name, isolate));
+    if (name->length() != 0 &&
+        !name->Equals(ReadOnlyRoots(isolate).Object_string())) {
+      return std::make_pair(constructor, name);
     }
   }
 
@@ -642,7 +670,7 @@ Object SetHashAndUpdateProperties(HeapObject properties, int hash) {
 }
 
 int GetIdentityHashHelper(JSReceiver object) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object properties = object.raw_properties_or_hash();
   if (properties.IsSmi()) {
     return Smi::ToInt(properties);
@@ -676,7 +704,7 @@ int GetIdentityHashHelper(JSReceiver object) {
 }  // namespace
 
 void JSReceiver::SetIdentityHash(int hash) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_NE(PropertyArray::kNoHashSentinel, hash);
   DCHECK(PropertyArray::HashField::is_valid(hash));
 
@@ -689,7 +717,7 @@ void JSReceiver::SetProperties(HeapObject properties) {
   DCHECK_IMPLIES(properties.IsPropertyArray() &&
                      PropertyArray::cast(properties).length() == 0,
                  properties == GetReadOnlyRoots().empty_property_array());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int hash = GetIdentityHashHelper(*this);
   Object new_properties = properties;
 
@@ -703,7 +731,7 @@ void JSReceiver::SetProperties(HeapObject properties) {
 }
 
 Object JSReceiver::GetIdentityHash() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   int hash = GetIdentityHashHelper(*this);
   if (hash == PropertyArray::kNoHashSentinel) {
@@ -715,7 +743,7 @@ Object JSReceiver::GetIdentityHash() {
 
 // static
 Smi JSReceiver::CreateIdentityHash(Isolate* isolate, JSReceiver key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int hash = isolate->GenerateIdentityHash(PropertyArray::HashField::kMax);
   DCHECK_NE(PropertyArray::kNoHashSentinel, hash);
 
@@ -724,7 +752,7 @@ Smi JSReceiver::CreateIdentityHash(Isolate* isolate, JSReceiver key) {
 }
 
 Smi JSReceiver::GetOrCreateIdentityHash(Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   int hash = GetIdentityHashHelper(*this);
   if (hash != PropertyArray::kNoHashSentinel) {
@@ -744,13 +772,14 @@ void JSReceiver::DeleteNormalizedProperty(Handle<JSReceiver> object,
     // If we have a global object, invalidate the cell and remove it from the
     // global object's dictionary.
     Handle<GlobalDictionary> dictionary(
-        JSGlobalObject::cast(*object).global_dictionary(), isolate);
+        JSGlobalObject::cast(*object).global_dictionary(kAcquireLoad), isolate);
 
     Handle<PropertyCell> cell(dictionary->CellAt(entry), isolate);
 
     Handle<GlobalDictionary> new_dictionary =
         GlobalDictionary::DeleteEntry(isolate, dictionary, entry);
-    JSGlobalObject::cast(*object).set_global_dictionary(*new_dictionary);
+    JSGlobalObject::cast(*object).set_global_dictionary(*new_dictionary,
+                                                        kReleaseStore);
 
     cell->ClearAndInvalidate(ReadOnlyRoots(isolate));
   } else {
@@ -824,8 +853,11 @@ Maybe<bool> JSReceiver::DeleteProperty(LookupIterator* it,
         return Just(true);
       case LookupIterator::DATA:
       case LookupIterator::ACCESSOR: {
-        if (!it->IsConfigurable()) {
-          // Fail if the property is not configurable.
+        Handle<JSObject> holder = it->GetHolder<JSObject>();
+        if (!it->IsConfigurable() ||
+            (holder->IsJSTypedArray() && it->IsElement(*holder))) {
+          // Fail if the property is not configurable if the property is a
+          // TypedArray element.
           if (is_strict(language_mode)) {
             isolate->Throw(*isolate->factory()->NewTypeError(
                 MessageTemplate::kStrictDeleteProperty, it->GetName(),
@@ -2144,9 +2176,19 @@ void JSObject::EnsureWritableFastElements(Handle<JSObject> object) {
 int JSObject::GetHeaderSize(InstanceType type,
                             bool function_has_prototype_slot) {
   switch (type) {
-    case JS_OBJECT_TYPE:
     case JS_API_OBJECT_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
+    case JS_OBJECT_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
     case JS_SPECIAL_API_OBJECT_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
       return JSObject::kHeaderSize;
     case JS_GENERATOR_OBJECT_TYPE:
       return JSGeneratorObject::kHeaderSize;
@@ -2388,12 +2430,12 @@ void JSObject::SetNormalizedProperty(Handle<JSObject> object, Handle<Name> name,
   DCHECK(name->IsUniqueName());
   Isolate* isolate = object->GetIsolate();
 
-  uint32_t hash = name->Hash();
+  uint32_t hash = name->hash();
 
   if (object->IsJSGlobalObject()) {
     Handle<JSGlobalObject> global_obj = Handle<JSGlobalObject>::cast(object);
-    Handle<GlobalDictionary> dictionary(global_obj->global_dictionary(),
-                                        isolate);
+    Handle<GlobalDictionary> dictionary(
+        global_obj->global_dictionary(kAcquireLoad), isolate);
     ReadOnlyRoots roots(isolate);
     InternalIndex entry = dictionary->FindEntry(isolate, roots, name, hash);
 
@@ -2408,7 +2450,7 @@ void JSObject::SetNormalizedProperty(Handle<JSObject> object, Handle<Name> name,
       value = cell;
       dictionary =
           GlobalDictionary::Add(isolate, dictionary, name, value, details);
-      global_obj->set_global_dictionary(*dictionary);
+      global_obj->set_global_dictionary(*dictionary, kReleaseStore);
     } else {
       Handle<PropertyCell> cell = PropertyCell::PrepareForValue(
           isolate, dictionary, entry, value, details);
@@ -2487,17 +2529,11 @@ void JSObject::JSObjectShortPrint(StringStream* accumulator) {
     }
     case JS_FUNCTION_TYPE: {
       JSFunction function = JSFunction::cast(*this);
-      Object fun_name = function.shared().DebugName();
-      bool printed = false;
-      if (fun_name.IsString()) {
-        String str = String::cast(fun_name);
-        if (str.length() > 0) {
-          accumulator->Add("<JSFunction ");
-          accumulator->Put(str);
-          printed = true;
-        }
-      }
-      if (!printed) {
+      std::unique_ptr<char[]> fun_name = function.shared().DebugNameCStr();
+      if (fun_name[0] != '\0') {
+        accumulator->Add("<JSFunction ");
+        accumulator->Add(fun_name.get());
+      } else {
         accumulator->Add("<JSFunction");
       }
       if (FLAG_trace_file_names) {
@@ -2760,7 +2796,7 @@ void MigrateFastToFast(Isolate* isolate, Handle<JSObject> object,
     new_storage->set(index.outobject_array_index(), *value);
 
     // From here on we cannot fail and we shouldn't GC anymore.
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
 
     // Set the new property value and do the map transition.
     object->SetProperties(*new_storage);
@@ -2869,14 +2905,13 @@ void MigrateFastToFast(Isolate* isolate, Handle<JSObject> object,
   }
 
   // From here on we cannot fail and we shouldn't GC anymore.
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   Heap* heap = isolate->heap();
 
   // Invalidate slots manually later in case of tagged to untagged translation.
   // In all other cases the recorded slot remains dereferenceable.
-  heap->NotifyObjectLayoutChange(*object, no_allocation,
-                                 InvalidateRecordedSlots::kNo);
+  heap->NotifyObjectLayoutChange(*object, no_gc, InvalidateRecordedSlots::kNo);
 
   // Copy (real) inobject properties. If necessary, stop at number_of_fields to
   // avoid overwriting |one_pointer_filler_map|.
@@ -3007,15 +3042,14 @@ void MigrateFastToSlow(Isolate* isolate, Handle<JSObject> object,
   }
 
   // From here on we cannot fail and we shouldn't GC anymore.
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   Heap* heap = isolate->heap();
 
   // Invalidate slots manually later in case the new map has in-object
   // properties. If not, it is not possible to store an untagged value
   // in a recorded slot.
-  heap->NotifyObjectLayoutChange(*object, no_allocation,
-                                 InvalidateRecordedSlots::kNo);
+  heap->NotifyObjectLayoutChange(*object, no_gc, InvalidateRecordedSlots::kNo);
 
   // Resize the object in the heap if necessary.
   int old_instance_size = map->instance_size();
@@ -3104,7 +3138,7 @@ void JSObject::MigrateToMap(Isolate* isolate, Handle<JSObject> object,
   // state now: the new map might have a new elements_kind, but the object's
   // elements pointer hasn't been updated yet. Callers will fix this, but in
   // the meantime, (indirectly) calling JSObjectVerify() must be avoided.
-  // When adding code here, add a DisallowHeapAllocation too.
+  // When adding code here, add a DisallowGarbageCollection too.
 }
 
 void JSObject::ForceSetPrototype(Handle<JSObject> object,
@@ -3484,7 +3518,7 @@ void JSObject::MigrateSlowToFast(Handle<JSObject> object,
   NotifyMapChange(old_map, new_map, isolate);
 
   if (number_of_elements == 0) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     DCHECK_LE(unused_property_fields, inobject_props);
     // Transform the object.
     new_map->SetInObjectUnusedPropertyFields(inobject_props);
@@ -3593,7 +3627,7 @@ void JSObject::MigrateSlowToFast(Handle<JSObject> object,
   Handle<LayoutDescriptor> layout_descriptor = LayoutDescriptor::New(
       isolate, new_map, descriptors, descriptors->number_of_descriptors());
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   new_map->InitializeDescriptors(isolate, *descriptors, *layout_descriptor);
   if (number_of_allocated_fields == 0) {
     new_map->SetInObjectUnusedPropertyFields(unused_property_fields);
@@ -3631,7 +3665,7 @@ Handle<NumberDictionary> JSObject::NormalizeElements(Handle<JSObject> object) {
   Isolate* isolate = object->GetIsolate();
   bool is_sloppy_arguments = object->HasSloppyArgumentsElements();
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArrayBase elements = object->elements();
 
     if (is_sloppy_arguments) {
@@ -4097,7 +4131,8 @@ Maybe<bool> JSObject::PreventExtensionsWithTransition(
       ReadOnlyRoots roots(isolate);
       if (object->IsJSGlobalObject()) {
         Handle<GlobalDictionary> dictionary(
-            JSGlobalObject::cast(*object).global_dictionary(), isolate);
+            JSGlobalObject::cast(*object).global_dictionary(kAcquireLoad),
+            isolate);
         JSObject::ApplyAttributesToDictionary(isolate, roots, dictionary,
                                               attrs);
       } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
@@ -4358,8 +4393,9 @@ Object JSObject::SlowReverseLookup(Object value) {
     }
     return GetReadOnlyRoots().undefined_value();
   } else if (IsJSGlobalObject()) {
-    return JSGlobalObject::cast(*this).global_dictionary().SlowReverseLookup(
-        value);
+    return JSGlobalObject::cast(*this)
+        .global_dictionary(kAcquireLoad)
+        .SlowReverseLookup(value);
   } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
     return property_dictionary_ordered().SlowReverseLookup(GetIsolate(), value);
   } else {
@@ -4402,7 +4438,7 @@ void JSObject::MakePrototypesFast(Handle<Object> receiver,
 }
 
 static bool PrototypeBenefitsFromNormalization(Handle<JSObject> object) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (!object->HasFastProperties()) return false;
   if (object->IsJSGlobalProxy()) return false;
   if (object->GetIsolate()->bootstrapper()->IsActive()) return false;
@@ -4599,7 +4635,7 @@ void InvalidatePrototypeChainsInternal(Map map) {
 
 // static
 Map JSObject::InvalidatePrototypeChains(Map map) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   InvalidatePrototypeChainsInternal(map);
   return map;
 }
@@ -4613,7 +4649,7 @@ Map JSObject::InvalidatePrototypeChains(Map map) {
 // variable and therefore we don't propagate invalidation down.
 // static
 void JSObject::InvalidatePrototypeValidityCell(JSGlobalObject global) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   InvalidateOnePrototypeValidityCellInternal(global.map());
 }
 
@@ -4865,7 +4901,7 @@ bool JSObject::UpdateAllocationSite(Handle<JSObject> object,
 
   Handle<AllocationSite> site;
   {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
 
     Heap* heap = object->GetHeap();
     AllocationMemento memento =
@@ -5035,7 +5071,8 @@ void JSGlobalObject::InvalidatePropertyCell(Handle<JSGlobalObject> global,
   JSObject::InvalidatePrototypeValidityCell(*global);
 
   DCHECK(!global->HasFastProperties());
-  auto dictionary = handle(global->global_dictionary(), global->GetIsolate());
+  auto dictionary =
+      handle(global->global_dictionary(kAcquireLoad), global->GetIsolate());
   InternalIndex entry = dictionary->FindEntry(global->GetIsolate(), name);
   if (entry.is_not_found()) return;
   PropertyCell::InvalidateAndReplaceEntry(global->GetIsolate(), dictionary,
@@ -5064,6 +5101,7 @@ MaybeHandle<JSDate> JSDate::New(Handle<JSFunction> constructor,
 // static
 double JSDate::CurrentTimeValue(Isolate* isolate) {
   if (FLAG_log_internal_timer_events) LOG(isolate, CurrentTimeEvent());
+  if (FLAG_correctness_fuzzer_suppressions) return 4.2;
 
   // According to ECMA-262, section 15.9.1, page 117, the precision of
   // the number in a Date object representing a particular instant in
@@ -5076,7 +5114,7 @@ double JSDate::CurrentTimeValue(Isolate* isolate) {
 Address JSDate::GetField(Isolate* isolate, Address raw_object,
                          Address smi_index) {
   // Called through CallCFunction.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DisallowHandleAllocation no_handles;
   DisallowJavascriptExecution no_js(isolate);
 
@@ -5239,7 +5277,7 @@ void JSMessageObject::EnsureSourcePositionsAvailable(
         SharedFunctionInfo::cast(message->shared_info()), isolate);
     SharedFunctionInfo::EnsureSourcePositionsAvailable(isolate, shared_info);
     DCHECK(shared_info->HasBytecodeArray());
-    int position = shared_info->abstract_code().SourcePosition(
+    int position = shared_info->abstract_code(isolate).SourcePosition(
         message->bytecode_offset().value());
     DCHECK_GE(position, 0);
     message->set_start_position(position);
diff --git a/deps/v8/src/objects/js-objects.h b/deps/v8/src/objects/js-objects.h
index cc9cc0f1dc0219..e38cb83ac6ea00 100644
--- a/deps/v8/src/objects/js-objects.h
+++ b/deps/v8/src/objects/js-objects.h
@@ -112,6 +112,7 @@ class JSReceiver : public HeapObject {
   // maybe_excluded_properties list.
   V8_WARN_UNUSED_RESULT static Maybe<bool> SetOrCopyDataProperties(
       Isolate* isolate, Handle<JSReceiver> target, Handle<Object> source,
+      PropertiesEnumerationMode mode,
       const ScopedVector<Handle<Object>>* excluded_properties = nullptr,
       bool use_set = true);
 
@@ -966,9 +967,7 @@ class JSGlobalObject : public JSSpecialObject {
   // [global proxy]: the global proxy object of the context
   DECL_ACCESSORS(global_proxy, JSGlobalProxy)
 
-  // Gets global object properties.
-  DECL_GETTER(global_dictionary, GlobalDictionary)
-  inline void set_global_dictionary(GlobalDictionary dictionary);
+  DECL_RELEASE_ACQUIRE_ACCESSORS(global_dictionary, GlobalDictionary)
 
   static void InvalidatePropertyCell(Handle<JSGlobalObject> object,
                                      Handle<Name> name);
diff --git a/deps/v8/src/objects/js-objects.tq b/deps/v8/src/objects/js-objects.tq
index 8dbe1dce03eec1..d074ab1fb2e7e7 100644
--- a/deps/v8/src/objects/js-objects.tq
+++ b/deps/v8/src/objects/js-objects.tq
@@ -73,9 +73,15 @@ macro GetDerivedMap(implicit context: Context)(
 
 macro AllocateFastOrSlowJSObjectFromMap(implicit context: Context)(map: Map):
     JSObject {
-  let properties: EmptyFixedArray|NameDictionary = kEmptyFixedArray;
+  let properties: EmptyFixedArray|NameDictionary|OrderedNameDictionary =
+      kEmptyFixedArray;
   if (IsDictionaryMap(map)) {
-    properties = AllocateNameDictionary(kNameDictionaryInitialCapacity);
+    if (kDictModePrototypes) {
+      properties =
+          AllocateOrderedNameDictionary(kOrderedNameDictionaryInitialCapacity);
+    } else {
+      properties = AllocateNameDictionary(kNameDictionaryInitialCapacity);
+    }
   }
   return AllocateJSObjectFromMap(
       map, properties, kEmptyFixedArray, AllocationFlag::kNone,
@@ -154,7 +160,11 @@ extern class JSStringIterator extends JSObject {
 
 extern macro AllocateJSObjectFromMap(Map): JSObject;
 extern macro AllocateJSObjectFromMap(
-    Map, NameDictionary | EmptyFixedArray | PropertyArray): JSObject;
+    Map,
+    NameDictionary | OrderedNameDictionary | EmptyFixedArray |
+        PropertyArray): JSObject;
 extern macro AllocateJSObjectFromMap(
-    Map, NameDictionary | EmptyFixedArray | PropertyArray, FixedArray,
-    constexpr AllocationFlag, constexpr SlackTrackingMode): JSObject;
+    Map,
+    NameDictionary | OrderedNameDictionary | EmptyFixedArray | PropertyArray,
+    FixedArray, constexpr AllocationFlag,
+    constexpr SlackTrackingMode): JSObject;
diff --git a/deps/v8/src/objects/js-plural-rules.cc b/deps/v8/src/objects/js-plural-rules.cc
index 783d9c8b75bec3..47600ba333c2ce 100644
--- a/deps/v8/src/objects/js-plural-rules.cc
+++ b/deps/v8/src/objects/js-plural-rules.cc
@@ -165,7 +165,7 @@ MaybeHandle<JSPluralRules> JSPluralRules::New(Isolate* isolate, Handle<Map> map,
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSPluralRules> plural_rules = Handle<JSPluralRules>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   plural_rules->set_flags(0);
 
   // 8. Set pluralRules.[[Type]] to t.
diff --git a/deps/v8/src/objects/js-regexp.cc b/deps/v8/src/objects/js-regexp.cc
index eb2bb1c432a7ea..4149e990242d00 100644
--- a/deps/v8/src/objects/js-regexp.cc
+++ b/deps/v8/src/objects/js-regexp.cc
@@ -4,6 +4,7 @@
 
 #include "src/objects/js-regexp.h"
 
+#include "src/common/globals.h"
 #include "src/objects/js-array-inl.h"
 #include "src/objects/js-regexp-inl.h"
 #include "src/regexp/regexp.h"
@@ -135,7 +136,12 @@ Handle<JSRegExpResultIndices> JSRegExpResultIndices::BuildIndices(
   // their corresponding capture indices.
   Handle<FixedArray> names(Handle<FixedArray>::cast(maybe_names));
   int num_names = names->length() >> 1;
-  Handle<NameDictionary> group_names = NameDictionary::New(isolate, num_names);
+  Handle<HeapObject> group_names;
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    group_names = isolate->factory()->NewOrderedNameDictionary(num_names);
+  } else {
+    group_names = isolate->factory()->NewNameDictionary(num_names);
+  }
   for (int i = 0; i < num_names; i++) {
     int base_offset = i * 2;
     int name_offset = base_offset;
@@ -147,8 +153,17 @@ Handle<JSRegExpResultIndices> JSRegExpResultIndices::BuildIndices(
     if (!capture_indices->IsUndefined(isolate)) {
       capture_indices = Handle<JSArray>::cast(capture_indices);
     }
-    group_names = NameDictionary::Add(
-        isolate, group_names, name, capture_indices, PropertyDetails::Empty());
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      group_names =
+          OrderedNameDictionary::Add(
+              isolate, Handle<OrderedNameDictionary>::cast(group_names), name,
+              capture_indices, PropertyDetails::Empty())
+              .ToHandleChecked();
+    } else {
+      group_names = NameDictionary::Add(
+          isolate, Handle<NameDictionary>::cast(group_names), name,
+          capture_indices, PropertyDetails::Empty());
+    }
   }
 
   // Convert group_names to a JSObject and store at the groups property of the
@@ -180,7 +195,7 @@ JSRegExp::Flags JSRegExp::FlagsFromString(Isolate* isolate,
   if (length > JSRegExp::kFlagCount) return JSRegExp::Flags(0);
   JSRegExp::Flags value(0);
   if (flags->IsSeqOneByteString()) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     SeqOneByteString seq_flags = SeqOneByteString::cast(*flags);
     for (int i = 0; i < length; i++) {
       base::Optional<JSRegExp::Flag> maybe_flag =
@@ -193,7 +208,7 @@ JSRegExp::Flags JSRegExp::FlagsFromString(Isolate* isolate,
     }
   } else {
     flags = String::Flatten(isolate, flags);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent flags_content = flags->GetFlatContent(no_gc);
     for (int i = 0; i < length; i++) {
       base::Optional<JSRegExp::Flag> maybe_flag =
@@ -311,7 +326,7 @@ bool IsLineTerminator(int c) {
 // and move related code closer to each other.
 template <typename Char>
 int CountAdditionalEscapeChars(Handle<String> source, bool* needs_escapes_out) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int escapes = 0;
   bool needs_escapes = false;
   bool in_char_class = false;
@@ -366,7 +381,7 @@ void WriteStringToCharVector(Vector<Char> v, int* d, const char* string) {
 template <typename Char, typename StringType>
 Handle<StringType> WriteEscapedRegExpSource(Handle<String> source,
                                             Handle<StringType> result) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Vector<const Char> src = source->GetCharVector<Char>(no_gc);
   Vector<Char> dst(result->GetChars(no_gc), result->length());
   int s = 0;
diff --git a/deps/v8/src/objects/js-relative-time-format.cc b/deps/v8/src/objects/js-relative-time-format.cc
index a2fab9ddc8e27c..08d7358f181280 100644
--- a/deps/v8/src/objects/js-relative-time-format.cc
+++ b/deps/v8/src/objects/js-relative-time-format.cc
@@ -227,7 +227,7 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New(
       Handle<JSRelativeTimeFormat>::cast(
           isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   relative_time_format_holder->set_flags(0);
   relative_time_format_holder->set_locale(*locale_str);
   relative_time_format_holder->set_numberingSystem(*numbering_system_string);
diff --git a/deps/v8/src/objects/js-segment-iterator.cc b/deps/v8/src/objects/js-segment-iterator.cc
index 23758e34560c5e..ff10303dbb9bca 100644
--- a/deps/v8/src/objects/js-segment-iterator.cc
+++ b/deps/v8/src/objects/js-segment-iterator.cc
@@ -55,7 +55,7 @@ MaybeHandle<JSSegmentIterator> JSSegmentIterator::Create(
 
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSObject> result = isolate->factory()->NewJSObjectFromMap(map);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Handle<JSSegmentIterator> segment_iterator =
       Handle<JSSegmentIterator>::cast(result);
 
diff --git a/deps/v8/src/objects/js-segmenter.cc b/deps/v8/src/objects/js-segmenter.cc
index aec804102f2b83..a799ea56b1b369 100644
--- a/deps/v8/src/objects/js-segmenter.cc
+++ b/deps/v8/src/objects/js-segmenter.cc
@@ -112,7 +112,7 @@ MaybeHandle<JSSegmenter> JSSegmenter::New(Isolate* isolate, Handle<Map> map,
   // Now all properties are ready, so we can allocate the result object.
   Handle<JSSegmenter> segmenter = Handle<JSSegmenter>::cast(
       isolate->factory()->NewFastOrSlowJSObjectFromMap(map));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   segmenter->set_flags(0);
 
   // 12. Set segmenter.[[Locale]] to the value of r.[[Locale]].
diff --git a/deps/v8/src/objects/js-weak-refs-inl.h b/deps/v8/src/objects/js-weak-refs-inl.h
index 193544e1c26364..aa51ee18c83385 100644
--- a/deps/v8/src/objects/js-weak-refs-inl.h
+++ b/deps/v8/src/objects/js-weak-refs-inl.h
@@ -85,7 +85,7 @@ bool JSFinalizationRegistry::RemoveUnregisterToken(
   // This method is called from both FinalizationRegistry#unregister and for
   // removing weakly-held dead unregister tokens. The latter is during GC so
   // this function cannot GC.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (key_map().IsUndefined(isolate)) {
     return false;
   }
diff --git a/deps/v8/src/objects/keys.cc b/deps/v8/src/objects/keys.cc
index ba5fa9c9282a92..6abb9d42aec778 100644
--- a/deps/v8/src/objects/keys.cc
+++ b/deps/v8/src/objects/keys.cc
@@ -287,7 +287,7 @@ bool KeyAccumulator::IsShadowed(Handle<Object> key) {
 }
 
 void KeyAccumulator::AddShadowingKey(Object key,
-                                     AllowHeapAllocation* allow_gc) {
+                                     AllowGarbageCollection* allow_gc) {
   if (mode_ == KeyCollectionMode::kOwnOnly) return;
   AddShadowingKey(handle(key, isolate_));
 }
@@ -322,7 +322,7 @@ bool CheckAndInitalizeEmptyEnumCache(JSReceiver object) {
 }  // namespace
 
 void FastKeyAccumulator::Prepare() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Directly go for the fast path for OWN_ONLY keys.
   if (mode_ == KeyCollectionMode::kOwnOnly) return;
   // Fully walk the prototype chain and find the last prototype with keys.
@@ -406,7 +406,7 @@ Handle<FixedArray> GetFastEnumPropertyKeys(Isolate* isolate,
   bool fields_only = true;
   keys = isolate->factory()->NewFixedArray(enum_length);
   for (InternalIndex i : map->IterateOwnDescriptors()) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     PropertyDetails details = descriptors->GetDetails(i);
     if (details.IsDontEnum()) continue;
     Object key = descriptors->GetKey(i);
@@ -423,7 +423,7 @@ Handle<FixedArray> GetFastEnumPropertyKeys(Isolate* isolate,
     indices = isolate->factory()->NewFixedArray(enum_length);
     index = 0;
     for (InternalIndex i : map->IterateOwnDescriptors()) {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       PropertyDetails details = descriptors->GetDetails(i);
       if (details.IsDontEnum()) continue;
       Object key = descriptors->GetKey(i);
@@ -757,7 +757,7 @@ template <bool skip_symbols>
 base::Optional<int> CollectOwnPropertyNamesInternal(
     Handle<JSObject> object, KeyAccumulator* keys,
     Handle<DescriptorArray> descs, int start_index, int limit) {
-  AllowHeapAllocation allow_gc;
+  AllowGarbageCollection allow_gc;
   int first_skipped = -1;
   PropertyFilter filter = keys->filter();
   KeyCollectionMode mode = keys->mode();
@@ -810,7 +810,7 @@ void CommonCopyEnumKeysTo(Isolate* isolate, Handle<Dictionary> dictionary,
   int properties = 0;
   ReadOnlyRoots roots(isolate);
 
-  AllowHeapAllocation allow_gc;
+  AllowGarbageCollection allow_gc;
   for (InternalIndex i : dictionary->IterateEntries()) {
     Object key;
     if (!dictionary->ToKey(roots, i, &key)) continue;
@@ -830,7 +830,7 @@ void CommonCopyEnumKeysTo(Isolate* isolate, Handle<Dictionary> dictionary,
       continue;
     } else {
       if (Dictionary::kIsOrderedDictionaryType) {
-        storage->set(properties, dictionary->ValueAt(i));
+        storage->set(properties, dictionary->NameAt(i));
       } else {
         // If the dictionary does not store elements in enumeration order,
         // we need to sort it afterwards in CopyEnumKeysTo. To enable this we
@@ -860,7 +860,7 @@ void CopyEnumKeysTo(Isolate* isolate, Handle<Dictionary> dictionary,
 
   int length = storage->length();
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Dictionary raw_dictionary = *dictionary;
   FixedArray raw_storage = *storage;
   EnumIndexComparator<Dictionary> cmp(raw_dictionary);
@@ -918,7 +918,7 @@ ExceptionStatus CollectKeysFromDictionary(Handle<Dictionary> dictionary,
   // Handle enumerable strings in CopyEnumKeysTo.
   DCHECK_NE(keys->filter(), ENUMERABLE_STRINGS);
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     for (InternalIndex i : dictionary->IterateEntries()) {
       Object key;
       Dictionary raw_dictionary = *dictionary;
@@ -926,7 +926,7 @@ ExceptionStatus CollectKeysFromDictionary(Handle<Dictionary> dictionary,
       if (key.FilterKey(filter)) continue;
       PropertyDetails details = raw_dictionary.DetailsAt(i);
       if ((details.attributes() & filter) != 0) {
-        AllowHeapAllocation gc;
+        AllowGarbageCollection gc;
         // This might allocate, but {key} is not used afterwards.
         keys->AddShadowingKey(key, &gc);
         continue;
@@ -990,7 +990,7 @@ Maybe<bool> KeyAccumulator::CollectOwnPropertyNames(Handle<JSReceiver> receiver,
       int nof_descriptors = map.NumberOfOwnDescriptors();
       if (enum_keys->length() != nof_descriptors) {
         if (map.prototype(isolate_) != ReadOnlyRoots(isolate_).null_value()) {
-          AllowHeapAllocation allow_gc;
+          AllowGarbageCollection allow_gc;
           Handle<DescriptorArray> descs = Handle<DescriptorArray>(
               map.instance_descriptors(kRelaxedLoad), isolate_);
           for (InternalIndex i : InternalIndex::Range(nof_descriptors)) {
@@ -1003,7 +1003,7 @@ Maybe<bool> KeyAccumulator::CollectOwnPropertyNames(Handle<JSReceiver> receiver,
     } else if (object->IsJSGlobalObject()) {
       enum_keys = GetOwnEnumPropertyDictionaryKeys(
           isolate_, mode_, this, object,
-          JSGlobalObject::cast(*object).global_dictionary());
+          JSGlobalObject::cast(*object).global_dictionary(kAcquireLoad));
     } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
       enum_keys = GetOwnEnumPropertyDictionaryKeys(
           isolate_, mode_, this, object, object->property_dictionary_ordered());
@@ -1040,7 +1040,8 @@ Maybe<bool> KeyAccumulator::CollectOwnPropertyNames(Handle<JSReceiver> receiver,
       }
     } else if (object->IsJSGlobalObject()) {
       RETURN_NOTHING_IF_NOT_SUCCESSFUL(CollectKeysFromDictionary(
-          handle(JSGlobalObject::cast(*object).global_dictionary(), isolate_),
+          handle(JSGlobalObject::cast(*object).global_dictionary(kAcquireLoad),
+                 isolate_),
           this));
     } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
       RETURN_NOTHING_IF_NOT_SUCCESSFUL(CollectKeysFromDictionary(
@@ -1064,7 +1065,8 @@ ExceptionStatus KeyAccumulator::CollectPrivateNames(Handle<JSReceiver> receiver,
     CollectOwnPropertyNamesInternal<false>(object, this, descs, 0, limit);
   } else if (object->IsJSGlobalObject()) {
     RETURN_FAILURE_IF_NOT_SUCCESSFUL(CollectKeysFromDictionary(
-        handle(JSGlobalObject::cast(*object).global_dictionary(), isolate_),
+        handle(JSGlobalObject::cast(*object).global_dictionary(kAcquireLoad),
+               isolate_),
         this));
   } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
     RETURN_FAILURE_IF_NOT_SUCCESSFUL(CollectKeysFromDictionary(
@@ -1114,7 +1116,7 @@ Maybe<bool> KeyAccumulator::CollectOwnKeys(Handle<JSReceiver> receiver,
     DCHECK_EQ(KeyCollectionMode::kOwnOnly, mode_);
     Handle<AccessCheckInfo> access_check_info;
     {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       AccessCheckInfo maybe_info = AccessCheckInfo::Get(isolate_, object);
       if (!maybe_info.is_null()) {
         access_check_info = handle(maybe_info, isolate_);
@@ -1150,7 +1152,7 @@ Handle<FixedArray> KeyAccumulator::GetOwnEnumPropertyKeys(
   } else if (object->IsJSGlobalObject()) {
     return GetOwnEnumPropertyDictionaryKeys(
         isolate, KeyCollectionMode::kOwnOnly, nullptr, object,
-        JSGlobalObject::cast(*object).global_dictionary());
+        JSGlobalObject::cast(*object).global_dictionary(kAcquireLoad));
   } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
     return GetOwnEnumPropertyDictionaryKeys(
         isolate, KeyCollectionMode::kOwnOnly, nullptr, object,
@@ -1249,7 +1251,7 @@ Maybe<bool> KeyAccumulator::CollectOwnJSProxyKeys(Handle<JSReceiver> receiver,
   int unchecked_result_keys_size = 0;
   for (int i = 0; i < trap_result->length(); ++i) {
     Handle<Name> key(Name::cast(trap_result->get(i)), isolate_);
-    auto entry = unchecked_result_keys.LookupOrInsert(key, key->Hash());
+    auto entry = unchecked_result_keys.LookupOrInsert(key, key->EnsureHash());
     if (entry->value != kPresent) {
       entry->value = kPresent;
       unchecked_result_keys_size++;
@@ -1311,7 +1313,7 @@ Maybe<bool> KeyAccumulator::CollectOwnJSProxyKeys(Handle<JSReceiver> receiver,
     Handle<Name> key(Name::cast(raw_key), isolate_);
     // 19a. If key is not an element of uncheckedResultKeys, throw a
     //      TypeError exception.
-    auto found = unchecked_result_keys.Lookup(key, key->Hash());
+    auto found = unchecked_result_keys.Lookup(key, key->hash());
     if (found == nullptr || found->value == kGone) {
       isolate_->Throw(*isolate_->factory()->NewTypeError(
           MessageTemplate::kProxyOwnKeysMissing, key));
@@ -1332,7 +1334,7 @@ Maybe<bool> KeyAccumulator::CollectOwnJSProxyKeys(Handle<JSReceiver> receiver,
     Handle<Name> key(Name::cast(raw_key), isolate_);
     // 21a. If key is not an element of uncheckedResultKeys, throw a
     //      TypeError exception.
-    auto found = unchecked_result_keys.Lookup(key, key->Hash());
+    auto found = unchecked_result_keys.Lookup(key, key->hash());
     if (found == nullptr || found->value == kGone) {
       isolate_->Throw(*isolate_->factory()->NewTypeError(
           MessageTemplate::kProxyOwnKeysMissing, key));
diff --git a/deps/v8/src/objects/keys.h b/deps/v8/src/objects/keys.h
index 92b1fd783e1414..c5d1bd4b8c85ce 100644
--- a/deps/v8/src/objects/keys.h
+++ b/deps/v8/src/objects/keys.h
@@ -75,7 +75,7 @@ class KeyAccumulator final {
   void set_skip_indices(bool value) { skip_indices_ = value; }
   // Shadowing keys are used to filter keys. This happens when non-enumerable
   // keys appear again on the prototype chain.
-  void AddShadowingKey(Object key, AllowHeapAllocation* allow_gc);
+  void AddShadowingKey(Object key, AllowGarbageCollection* allow_gc);
   void AddShadowingKey(Handle<Object> key);
 
  private:
diff --git a/deps/v8/src/objects/layout-descriptor-inl.h b/deps/v8/src/objects/layout-descriptor-inl.h
index 76dd3f618bb0f5..f87143bade570b 100644
--- a/deps/v8/src/objects/layout-descriptor-inl.h
+++ b/deps/v8/src/objects/layout-descriptor-inl.h
@@ -187,7 +187,7 @@ int LayoutDescriptor::CalculateCapacity(Map map, DescriptorArray descriptors,
 LayoutDescriptor LayoutDescriptor::Initialize(
     LayoutDescriptor layout_descriptor, Map map, DescriptorArray descriptors,
     int num_descriptors) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   int inobject_properties = map.GetInObjectProperties();
 
   for (InternalIndex i : InternalIndex::Range(num_descriptors)) {
diff --git a/deps/v8/src/objects/layout-descriptor.cc b/deps/v8/src/objects/layout-descriptor.cc
index 034680e2972f8b..abc3d5c2f8be92 100644
--- a/deps/v8/src/objects/layout-descriptor.cc
+++ b/deps/v8/src/objects/layout-descriptor.cc
@@ -7,6 +7,7 @@
 #include <sstream>
 
 #include "src/base/bits.h"
+#include "src/base/platform/wrappers.h"
 #include "src/handles/handles-inl.h"
 #include "src/objects/objects-inl.h"
 
@@ -52,7 +53,7 @@ Handle<LayoutDescriptor> LayoutDescriptor::ShareAppend(
   layout_descriptor = LayoutDescriptor::EnsureCapacity(
       isolate, layout_descriptor, field_index + details.field_width_in_words());
 
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   LayoutDescriptor layout_desc = *layout_descriptor;
   layout_desc = layout_desc.SetRawData(field_index);
   if (details.field_width_in_words() > 1) {
@@ -64,7 +65,7 @@ Handle<LayoutDescriptor> LayoutDescriptor::ShareAppend(
 Handle<LayoutDescriptor> LayoutDescriptor::AppendIfFastOrUseFull(
     Isolate* isolate, Handle<Map> map, PropertyDetails details,
     Handle<LayoutDescriptor> full_layout_descriptor) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   LayoutDescriptor layout_descriptor = map->layout_descriptor(kAcquireLoad);
   if (layout_descriptor.IsSlowLayout()) {
     return full_layout_descriptor;
@@ -101,9 +102,9 @@ Handle<LayoutDescriptor> LayoutDescriptor::EnsureCapacity(
   DCHECK(new_layout_descriptor->IsSlowLayout());
 
   if (layout_descriptor->IsSlowLayout()) {
-    memcpy(new_layout_descriptor->GetDataStartAddress(),
-           layout_descriptor->GetDataStartAddress(),
-           layout_descriptor->DataSize());
+    base::Memcpy(new_layout_descriptor->GetDataStartAddress(),
+                 layout_descriptor->GetDataStartAddress(),
+                 layout_descriptor->DataSize());
     return new_layout_descriptor;
   } else {
     // Fast layout.
@@ -228,7 +229,7 @@ bool LayoutDescriptorHelper::IsTagged(
 LayoutDescriptor LayoutDescriptor::Trim(Heap* heap, Map map,
                                         DescriptorArray descriptors,
                                         int num_descriptors) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // Fast mode descriptors are never shared and therefore always fully
   // correspond to their map.
   if (!IsSlowLayout()) return *this;
diff --git a/deps/v8/src/objects/literal-objects.cc b/deps/v8/src/objects/literal-objects.cc
index 365eb6ba9e6674..16a678f7d8e395 100644
--- a/deps/v8/src/objects/literal-objects.cc
+++ b/deps/v8/src/objects/literal-objects.cc
@@ -23,6 +23,11 @@ namespace internal {
 
 namespace {
 
+// The enumeration order index in the property details is unused if they are
+// stored in a OrderedNameDictionary or NumberDictionary (because they handle
+// propery ordering differently). We then use this dummy value instead.
+constexpr int kDummyEnumerationIndex = 0;
+
 inline int EncodeComputedEntry(ClassBoilerplate::ValueKind value_kind,
                                unsigned key_index) {
   using Flags = ClassBoilerplate::ComputedEntryFlags;
@@ -93,6 +98,17 @@ Handle<NameDictionary> DictionaryAddNoUpdateNextEnumerationIndex(
       isolate, dictionary, name, value, details, entry_out);
 }
 
+template <typename LocalIsolate>
+Handle<OrderedNameDictionary> DictionaryAddNoUpdateNextEnumerationIndex(
+    LocalIsolate* isolate, Handle<OrderedNameDictionary> dictionary,
+    Handle<Name> name, Handle<Object> value, PropertyDetails details,
+    InternalIndex* entry_out = nullptr) {
+  // OrderedNameDictionary does not maintain the enumeration order in property
+  // details, so it's a normal Add().
+  return OrderedNameDictionary::Add(isolate, dictionary, name, value, details)
+      .ToHandleChecked();
+}
+
 template <typename LocalIsolate>
 Handle<NumberDictionary> DictionaryAddNoUpdateNextEnumerationIndex(
     LocalIsolate* isolate, Handle<NumberDictionary> dictionary,
@@ -104,9 +120,12 @@ Handle<NumberDictionary> DictionaryAddNoUpdateNextEnumerationIndex(
                                entry_out);
 }
 
-void DictionaryUpdateMaxNumberKey(Handle<NameDictionary> dictionary,
+template <typename Dictionary>
+void DictionaryUpdateMaxNumberKey(Handle<Dictionary> dictionary,
                                   Handle<Name> name) {
-  // No-op for name dictionaries.
+  STATIC_ASSERT((std::is_same<Dictionary, OrderedNameDictionary>::value ||
+                 std::is_same<Dictionary, NameDictionary>::value));
+  // No-op for (ordered) name dictionaries.
 }
 
 void DictionaryUpdateMaxNumberKey(Handle<NumberDictionary> dictionary,
@@ -124,8 +143,10 @@ constexpr int ComputeEnumerationIndex(int value_index) {
                    ClassBoilerplate::kMinimumPrototypePropertiesCount});
 }
 
+constexpr int kAccessorNotDefined = -1;
+
 inline int GetExistingValueIndex(Object value) {
-  return value.IsSmi() ? Smi::ToInt(value) : -1;
+  return value.IsSmi() ? Smi::ToInt(value) : kAccessorNotDefined;
 }
 
 template <typename LocalIsolate, typename Dictionary, typename Key>
@@ -136,19 +157,22 @@ void AddToDictionaryTemplate(LocalIsolate* isolate,
                              Smi value) {
   InternalIndex entry = dictionary->FindEntry(isolate, key);
 
+  const bool is_elements_dictionary =
+      std::is_same<Dictionary, NumberDictionary>::value;
+  STATIC_ASSERT(is_elements_dictionary !=
+                (std::is_same<Dictionary, NameDictionary>::value ||
+                 std::is_same<Dictionary, OrderedNameDictionary>::value));
+
   if (entry.is_not_found()) {
     // Entry not found, add new one.
-    const bool is_elements_dictionary =
-        std::is_same<Dictionary, NumberDictionary>::value;
-    STATIC_ASSERT(is_elements_dictionary !=
-                  (std::is_same<Dictionary, NameDictionary>::value));
     int enum_order =
-        is_elements_dictionary ? 0 : ComputeEnumerationIndex(key_index);
+        Dictionary::kIsOrderedDictionaryType || is_elements_dictionary
+            ? kDummyEnumerationIndex
+            : ComputeEnumerationIndex(key_index);
     Handle<Object> value_handle;
     PropertyDetails details(
         value_kind != ClassBoilerplate::kData ? kAccessor : kData, DONT_ENUM,
         PropertyCellType::kNoCell, enum_order);
-
     if (value_kind == ClassBoilerplate::kData) {
       value_handle = handle(value, isolate);
     } else {
@@ -172,7 +196,15 @@ void AddToDictionaryTemplate(LocalIsolate* isolate,
 
   } else {
     // Entry found, update it.
-    int enum_order = dictionary->DetailsAt(entry).dictionary_index();
+    int enum_order_existing =
+        Dictionary::kIsOrderedDictionaryType
+            ? kDummyEnumerationIndex
+            : dictionary->DetailsAt(entry).dictionary_index();
+    int enum_order_computed =
+        Dictionary::kIsOrderedDictionaryType || is_elements_dictionary
+            ? kDummyEnumerationIndex
+            : ComputeEnumerationIndex(key_index);
+
     Object existing_value = dictionary->ValueAt(entry);
     if (value_kind == ClassBoilerplate::kData) {
       // Computed value is a normal method.
@@ -184,6 +216,7 @@ void AddToDictionaryTemplate(LocalIsolate* isolate,
         int existing_setter_index =
             GetExistingValueIndex(current_pair.setter());
         // At least one of the accessors must already be defined.
+        STATIC_ASSERT(kAccessorNotDefined < 0);
         DCHECK(existing_getter_index >= 0 || existing_setter_index >= 0);
         if (existing_getter_index < key_index &&
             existing_setter_index < key_index) {
@@ -191,46 +224,81 @@ void AddToDictionaryTemplate(LocalIsolate* isolate,
           // method or just one of them was defined before while the other one
           // was not defined yet, so overwrite property to kData.
           PropertyDetails details(kData, DONT_ENUM, PropertyCellType::kNoCell,
-                                  enum_order);
+                                  enum_order_existing);
           dictionary->DetailsAtPut(entry, details);
           dictionary->ValueAtPut(entry, value);
 
+        } else if (existing_getter_index != kAccessorNotDefined &&
+                   existing_getter_index < key_index) {
+          DCHECK_LT(key_index, existing_setter_index);
+          // Getter was defined and it was done before the computed method
+          // and then it was overwritten by the current computed method which
+          // in turn was later overwritten by the setter method. So we clear
+          // the getter.
+          current_pair.set_getter(*isolate->factory()->null_value());
+
+        } else if (existing_setter_index != kAccessorNotDefined &&
+                   existing_setter_index < key_index) {
+          DCHECK_LT(key_index, existing_getter_index);
+          // Setter was defined and it was done before the computed method
+          // and then it was overwritten by the current computed method which
+          // in turn was later overwritten by the getter method. So we clear
+          // the setter.
+          current_pair.set_setter(*isolate->factory()->null_value());
+
         } else {
-          // The data property was defined "between" accessors so the one that
-          // was overwritten has to be cleared.
-          if (existing_getter_index < key_index) {
-            DCHECK_LT(key_index, existing_setter_index);
-            // Getter was defined and it was done before the computed method
-            // and then it was overwritten by the current computed method which
-            // in turn was later overwritten by the setter method. So we clear
-            // the getter.
-            current_pair.set_getter(*isolate->factory()->null_value());
-
-          } else if (existing_setter_index < key_index) {
-            DCHECK_LT(key_index, existing_getter_index);
-            // Setter was defined and it was done before the computed method
-            // and then it was overwritten by the current computed method which
-            // in turn was later overwritten by the getter method. So we clear
-            // the setter.
-            current_pair.set_setter(*isolate->factory()->null_value());
+          // One of the following cases holds:
+          // The computed method was defined before ...
+          // 1.) the getter and setter, both of which are defined,
+          // 2.) the getter, and the setter isn't defined,
+          // 3.) the setter, and the getter isn't defined.
+          // Therefore, the computed value is overwritten, receiving the
+          // computed property's enum index.
+          DCHECK(key_index < existing_getter_index ||
+                 existing_getter_index == kAccessorNotDefined);
+          DCHECK(key_index < existing_setter_index ||
+                 existing_setter_index == kAccessorNotDefined);
+          DCHECK(existing_getter_index != kAccessorNotDefined ||
+                 existing_setter_index != kAccessorNotDefined);
+          if (!is_elements_dictionary) {
+            // The enum index is unused by elements dictionaries,
+            // which is why we don't need to update the property details if
+            // |is_elements_dictionary| holds.
+            PropertyDetails details = dictionary->DetailsAt(entry);
+            details = details.set_index(enum_order_computed);
+            dictionary->DetailsAtPut(entry, details);
           }
         }
-      } else {
-        // Overwrite existing value if it was defined before the computed one
-        // (AccessorInfo "length" property is always defined before).
+      } else {  // if (existing_value.IsAccessorPair()) ends here
+        DCHECK(value_kind == ClassBoilerplate::kData);
+
         DCHECK_IMPLIES(!existing_value.IsSmi(),
                        existing_value.IsAccessorInfo());
         DCHECK_IMPLIES(!existing_value.IsSmi(),
                        AccessorInfo::cast(existing_value).name() ==
                            *isolate->factory()->length_string());
         if (!existing_value.IsSmi() || Smi::ToInt(existing_value) < key_index) {
+          // Overwrite existing value because it was defined before the computed
+          // one (AccessorInfo "length" property is always defined before).
           PropertyDetails details(kData, DONT_ENUM, PropertyCellType::kNoCell,
-                                  enum_order);
+                                  enum_order_existing);
           dictionary->DetailsAtPut(entry, details);
           dictionary->ValueAtPut(entry, value);
+        } else {
+          // The computed value appears before the existing one. Set the
+          // existing entry's enum index to that of the computed one.
+          if (!is_elements_dictionary) {
+            // The enum index is unused by elements dictionaries,
+            // which is why we don't need to update the property details if
+            // |is_elements_dictionary| holds.
+
+            PropertyDetails details(kData, DONT_ENUM, PropertyCellType::kNoCell,
+                                    enum_order_computed);
+            dictionary->DetailsAtPut(entry, details);
+          }
         }
       }
-    } else {
+    } else {  // if (value_kind == ClassBoilerplate::kData) ends here
       AccessorComponent component = value_kind == ClassBoilerplate::kGetter
                                         ? ACCESSOR_GETTER
                                         : ACCESSOR_SETTER;
@@ -242,16 +310,51 @@ void AddToDictionaryTemplate(LocalIsolate* isolate,
             GetExistingValueIndex(current_pair.get(component));
         if (existing_component_index < key_index) {
           current_pair.set(component, value);
+        } else {
+          // The existing accessor property overwrites the computed one, update
+          // its enumeration order accordingly.
+
+          if (!is_elements_dictionary) {
+            // The enum index is unused by elements dictionaries,
+            // which is why we don't need to update the property details if
+            // |is_elements_dictionary| holds.
+
+            PropertyDetails details(kAccessor, DONT_ENUM,
+                                    PropertyCellType::kNoCell,
+                                    enum_order_computed);
+            dictionary->DetailsAtPut(entry, details);
+          }
         }
 
       } else {
-        // Overwrite existing value with new AccessorPair.
-        Handle<AccessorPair> pair(isolate->factory()->NewAccessorPair());
-        pair->set(component, value);
-        PropertyDetails details(kAccessor, DONT_ENUM, PropertyCellType::kNoCell,
-                                enum_order);
-        dictionary->DetailsAtPut(entry, details);
-        dictionary->ValueAtPut(entry, *pair);
+        DCHECK(!existing_value.IsAccessorPair());
+        DCHECK(value_kind != ClassBoilerplate::kData);
+
+        if (!existing_value.IsSmi() || Smi::ToInt(existing_value) < key_index) {
+          // Overwrite the existing data property because it was defined before
+          // the computed accessor property.
+          Handle<AccessorPair> pair(isolate->factory()->NewAccessorPair());
+          pair->set(component, value);
+          PropertyDetails details(kAccessor, DONT_ENUM,
+                                  PropertyCellType::kNoCell,
+                                  enum_order_existing);
+          dictionary->DetailsAtPut(entry, details);
+          dictionary->ValueAtPut(entry, *pair);
+        } else {
+          // The computed accessor property appears before the existing data
+          // property. Set the existing entry's enum index to that of the
+          // computed one.
+
+          if (!is_elements_dictionary) {
+            // The enum index is unused by elements dictionaries,
+            // which is why we don't need to update the property details if
+            // |is_elements_dictionary| holds.
+
+            PropertyDetails details(kData, DONT_ENUM, PropertyCellType::kNoCell,
+                                    enum_order_computed);
+            dictionary->DetailsAtPut(entry, details);
+          }
+        }
       }
     }
   }
@@ -278,7 +381,7 @@ class ObjectDescriptor {
 
   Handle<Object> properties_template() const {
     return HasDictionaryProperties()
-               ? Handle<Object>::cast(properties_dictionary_template_)
+               ? properties_dictionary_template_
                : Handle<Object>::cast(descriptor_array_template_);
   }
 
@@ -293,13 +396,25 @@ class ObjectDescriptor {
   void CreateTemplates(LocalIsolate* isolate) {
     auto* factory = isolate->factory();
     descriptor_array_template_ = factory->empty_descriptor_array();
-    properties_dictionary_template_ =
-        Handle<NameDictionary>::cast(factory->empty_property_dictionary());
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      properties_dictionary_template_ =
+          factory->empty_ordered_property_dictionary();
+    } else {
+      properties_dictionary_template_ = factory->empty_property_dictionary();
+    }
     if (property_count_ || computed_count_ || property_slack_) {
       if (HasDictionaryProperties()) {
-        properties_dictionary_template_ = NameDictionary::New(
-            isolate, property_count_ + computed_count_ + property_slack_,
-            AllocationType::kOld);
+        int need_space_for =
+            property_count_ + computed_count_ + property_slack_;
+        if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+          properties_dictionary_template_ =
+              OrderedNameDictionary::Allocate(isolate, need_space_for,
+                                              AllocationType::kOld)
+                  .ToHandleChecked();
+        } else {
+          properties_dictionary_template_ = NameDictionary::New(
+              isolate, need_space_for, AllocationType::kOld);
+        }
       } else {
         descriptor_array_template_ = DescriptorArray::Allocate(
             isolate, 0, property_count_ + property_slack_,
@@ -326,11 +441,21 @@ class ObjectDescriptor {
     DCHECK(!value->IsAccessorPair());
     if (HasDictionaryProperties()) {
       PropertyKind kind = is_accessor ? i::kAccessor : i::kData;
+      int enum_order = V8_DICT_MODE_PROTOTYPES_BOOL ? kDummyEnumerationIndex
+                                                    : next_enumeration_index_++;
       PropertyDetails details(kind, attribs, PropertyCellType::kNoCell,
-                              next_enumeration_index_++);
-      properties_dictionary_template_ =
-          DictionaryAddNoUpdateNextEnumerationIndex(
-              isolate, properties_dictionary_template_, name, value, details);
+                              enum_order);
+      if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+        properties_dictionary_template_ =
+            DictionaryAddNoUpdateNextEnumerationIndex(
+                isolate, properties_ordered_dictionary_template(), name, value,
+                details);
+      } else {
+        properties_dictionary_template_ =
+            DictionaryAddNoUpdateNextEnumerationIndex(
+                isolate, properties_dictionary_template(), name, value,
+                details);
+      }
     } else {
       Descriptor d = is_accessor
                          ? Descriptor::AccessorConstant(name, value, attribs)
@@ -345,8 +470,14 @@ class ObjectDescriptor {
     Smi value = Smi::FromInt(value_index);
     if (HasDictionaryProperties()) {
       UpdateNextEnumerationIndex(value_index);
-      AddToDictionaryTemplate(isolate, properties_dictionary_template_, name,
-                              value_index, value_kind, value);
+      if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+        AddToDictionaryTemplate(isolate,
+                                properties_ordered_dictionary_template(), name,
+                                value_index, value_kind, value);
+      } else {
+        AddToDictionaryTemplate(isolate, properties_dictionary_template(), name,
+                                value_index, value_kind, value);
+      }
     } else {
       temp_handle_.PatchValue(value);
       AddToDescriptorArrayTemplate(isolate, descriptor_array_template_, name,
@@ -371,22 +502,32 @@ class ObjectDescriptor {
   }
 
   void UpdateNextEnumerationIndex(int value_index) {
-    int next_index = ComputeEnumerationIndex(value_index);
-    DCHECK_LT(next_enumeration_index_, next_index);
-    next_enumeration_index_ = next_index;
+    int current_index = ComputeEnumerationIndex(value_index);
+    DCHECK_LE(next_enumeration_index_, current_index);
+    next_enumeration_index_ = current_index + 1;
   }
 
   void Finalize(LocalIsolate* isolate) {
     if (HasDictionaryProperties()) {
       DCHECK_EQ(current_computed_index_, computed_properties_->length());
-      properties_dictionary_template_->set_next_enumeration_index(
-          next_enumeration_index_);
+      if (!V8_DICT_MODE_PROTOTYPES_BOOL) {
+        properties_dictionary_template()->set_next_enumeration_index(
+            next_enumeration_index_);
+      }
     } else {
       DCHECK(descriptor_array_template_->IsSortedNoDuplicates());
     }
   }
 
  private:
+  Handle<NameDictionary> properties_dictionary_template() const {
+    return Handle<NameDictionary>::cast(properties_dictionary_template_);
+  }
+
+  Handle<OrderedNameDictionary> properties_ordered_dictionary_template() const {
+    return Handle<OrderedNameDictionary>::cast(properties_dictionary_template_);
+  }
+
   const int property_slack_;
   int property_count_ = 0;
   int next_enumeration_index_ = PropertyDetails::kInitialIndex;
@@ -395,16 +536,19 @@ class ObjectDescriptor {
   int current_computed_index_ = 0;
 
   Handle<DescriptorArray> descriptor_array_template_;
-  Handle<NameDictionary> properties_dictionary_template_;
+
+  // Is either a NameDictionary or OrderedNameDictionary.
+  Handle<HeapObject> properties_dictionary_template_;
+
   Handle<NumberDictionary> elements_dictionary_template_;
   Handle<FixedArray> computed_properties_;
   // This temporary handle is used for storing to descriptor array.
   Handle<Object> temp_handle_;
 };
 
-template <typename LocalIsolate>
+template <typename LocalIsolate, typename PropertyDict>
 void ClassBoilerplate::AddToPropertiesTemplate(
-    LocalIsolate* isolate, Handle<NameDictionary> dictionary, Handle<Name> name,
+    LocalIsolate* isolate, Handle<PropertyDict> dictionary, Handle<Name> name,
     int key_index, ClassBoilerplate::ValueKind value_kind, Smi value) {
   AddToDictionaryTemplate(isolate, dictionary, name, key_index, value_kind,
                           value);
@@ -415,6 +559,10 @@ template void ClassBoilerplate::AddToPropertiesTemplate(
 template void ClassBoilerplate::AddToPropertiesTemplate(
     LocalIsolate* isolate, Handle<NameDictionary> dictionary, Handle<Name> name,
     int key_index, ClassBoilerplate::ValueKind value_kind, Smi value);
+template void ClassBoilerplate::AddToPropertiesTemplate(
+    Isolate* isolate, Handle<OrderedNameDictionary> dictionary,
+    Handle<Name> name, int key_index, ClassBoilerplate::ValueKind value_kind,
+    Smi value);
 
 template <typename LocalIsolate>
 void ClassBoilerplate::AddToElementsTemplate(
diff --git a/deps/v8/src/objects/literal-objects.h b/deps/v8/src/objects/literal-objects.h
index 2ea5a521c5b4b9..00a2651a665bf8 100644
--- a/deps/v8/src/objects/literal-objects.h
+++ b/deps/v8/src/objects/literal-objects.h
@@ -110,9 +110,9 @@ class ClassBoilerplate : public FixedArray {
   DECL_ACCESSORS(instance_elements_template, Object)
   DECL_ACCESSORS(instance_computed_properties, FixedArray)
 
-  template <typename LocalIsolate>
+  template <typename LocalIsolate, typename Dictionary>
   static void AddToPropertiesTemplate(LocalIsolate* isolate,
-                                      Handle<NameDictionary> dictionary,
+                                      Handle<Dictionary> dictionary,
                                       Handle<Name> name, int key_index,
                                       ValueKind value_kind, Smi value);
 
diff --git a/deps/v8/src/objects/lookup-cache-inl.h b/deps/v8/src/objects/lookup-cache-inl.h
index 0894d6c4c7ab77..ab6a97f3c0e887 100644
--- a/deps/v8/src/objects/lookup-cache-inl.h
+++ b/deps/v8/src/objects/lookup-cache-inl.h
@@ -17,7 +17,7 @@ int DescriptorLookupCache::Hash(Map source, Name name) {
   DCHECK(name.IsUniqueName());
   // Uses only lower 32 bits if pointers are larger.
   uint32_t source_hash = static_cast<uint32_t>(source.ptr()) >> kTaggedSizeLog2;
-  uint32_t name_hash = name.hash_field();
+  uint32_t name_hash = name.hash();
   return (source_hash ^ name_hash) % kLength;
 }
 
diff --git a/deps/v8/src/objects/lookup-inl.h b/deps/v8/src/objects/lookup-inl.h
index 2339606a45a9e3..d38be27fca95a4 100644
--- a/deps/v8/src/objects/lookup-inl.h
+++ b/deps/v8/src/objects/lookup-inl.h
@@ -9,6 +9,7 @@
 
 #include "src/handles/handles-inl.h"
 #include "src/heap/factory-inl.h"
+#include "src/logging/counters.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/internal-index.h"
 #include "src/objects/map-inl.h"
@@ -205,6 +206,8 @@ bool LookupIterator::IsCacheableTransition() {
 // static
 void LookupIterator::UpdateProtector(Isolate* isolate, Handle<Object> receiver,
                                      Handle<Name> name) {
+  RuntimeCallTimerScope scope(isolate, RuntimeCallCounterId::kUpdateProtector);
+
   // This list must be kept in sync with
   // CodeStubAssembler::CheckForAssociatedProtector!
   ReadOnlyRoots roots(isolate);
diff --git a/deps/v8/src/objects/lookup.cc b/deps/v8/src/objects/lookup.cc
index da7a4740aecbce..75fcb32848595c 100644
--- a/deps/v8/src/objects/lookup.cc
+++ b/deps/v8/src/objects/lookup.cc
@@ -61,7 +61,7 @@ void LookupIterator::Start() {
   holder_ = GetRoot(isolate_, lookup_start_object_, index_);
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
 
     has_property_ = false;
     state_ = NOT_FOUND;
@@ -82,7 +82,7 @@ template void LookupIterator::Start<false>();
 void LookupIterator::Next() {
   DCHECK_NE(JSPROXY, state_);
   DCHECK_NE(TRANSITION, state_);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   has_property_ = false;
 
   JSReceiver holder = *holder_;
@@ -231,55 +231,43 @@ void LookupIterator::InternalUpdateProtector(Isolate* isolate,
       return;
     }
     if (receiver->map(isolate).is_prototype_map()) {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       // Setting the constructor of any prototype with the @@species protector
       // (of any realm) also needs to invalidate the protector.
-      // For typed arrays, we check a prototype of this receiver since
-      // TypedArrays have different prototypes for each type, and their parent
-      // prototype is pointing the same TYPED_ARRAY_PROTOTYPE.
       if (isolate->IsInAnyContext(*receiver,
                                   Context::INITIAL_ARRAY_PROTOTYPE_INDEX)) {
         if (!Protectors::IsArraySpeciesLookupChainIntact(isolate)) return;
         isolate->CountUsage(
             v8::Isolate::UseCounterFeature::kArrayPrototypeConstructorModified);
         Protectors::InvalidateArraySpeciesLookupChain(isolate);
-      } else if (isolate->IsInAnyContext(*receiver,
-                                         Context::PROMISE_PROTOTYPE_INDEX)) {
+      } else if (receiver->IsJSPromisePrototype()) {
         if (!Protectors::IsPromiseSpeciesLookupChainIntact(isolate)) return;
         Protectors::InvalidatePromiseSpeciesLookupChain(isolate);
-      } else if (isolate->IsInAnyContext(*receiver,
-                                         Context::REGEXP_PROTOTYPE_INDEX)) {
+      } else if (receiver->IsJSRegExpPrototype()) {
         if (!Protectors::IsRegExpSpeciesLookupChainIntact(isolate)) return;
         Protectors::InvalidateRegExpSpeciesLookupChain(isolate);
-      } else if (isolate->IsInAnyContext(
-                     receiver->map(isolate).prototype(isolate),
-                     Context::TYPED_ARRAY_PROTOTYPE_INDEX)) {
+      } else if (receiver->IsJSTypedArrayPrototype()) {
         if (!Protectors::IsTypedArraySpeciesLookupChainIntact(isolate)) return;
         Protectors::InvalidateTypedArraySpeciesLookupChain(isolate);
       }
     }
   } else if (*name == roots.next_string()) {
     if (receiver->IsJSArrayIterator() ||
-        isolate->IsInAnyContext(
-            *receiver, Context::INITIAL_ARRAY_ITERATOR_PROTOTYPE_INDEX)) {
+        receiver->IsJSArrayIteratorPrototype()) {
       // Setting the next property of %ArrayIteratorPrototype% also needs to
       // invalidate the array iterator protector.
       if (!Protectors::IsArrayIteratorLookupChainIntact(isolate)) return;
       Protectors::InvalidateArrayIteratorLookupChain(isolate);
     } else if (receiver->IsJSMapIterator() ||
-               isolate->IsInAnyContext(
-                   *receiver, Context::INITIAL_MAP_ITERATOR_PROTOTYPE_INDEX)) {
+               receiver->IsJSMapIteratorPrototype()) {
       if (!Protectors::IsMapIteratorLookupChainIntact(isolate)) return;
       Protectors::InvalidateMapIteratorLookupChain(isolate);
     } else if (receiver->IsJSSetIterator() ||
-               isolate->IsInAnyContext(
-                   *receiver, Context::INITIAL_SET_ITERATOR_PROTOTYPE_INDEX)) {
+               receiver->IsJSSetIteratorPrototype()) {
       if (!Protectors::IsSetIteratorLookupChainIntact(isolate)) return;
       Protectors::InvalidateSetIteratorLookupChain(isolate);
     } else if (receiver->IsJSStringIterator() ||
-               isolate->IsInAnyContext(
-                   *receiver,
-                   Context::INITIAL_STRING_ITERATOR_PROTOTYPE_INDEX)) {
+               receiver->IsJSStringIteratorPrototype()) {
       // Setting the next property of %StringIteratorPrototype% invalidates the
       // string iterator protector.
       if (!Protectors::IsStringIteratorLookupChainIntact(isolate)) return;
@@ -319,21 +307,17 @@ void LookupIterator::InternalUpdateProtector(Isolate* isolate,
       if (!Protectors::IsArrayIteratorLookupChainIntact(isolate)) return;
       Protectors::InvalidateArrayIteratorLookupChain(isolate);
     } else if (receiver->IsJSSet(isolate) || receiver->IsJSSetIterator() ||
-               isolate->IsInAnyContext(
-                   *receiver, Context::INITIAL_SET_ITERATOR_PROTOTYPE_INDEX) ||
-               isolate->IsInAnyContext(*receiver,
-                                       Context::INITIAL_SET_PROTOTYPE_INDEX)) {
+               receiver->IsJSSetIteratorPrototype() ||
+               receiver->IsJSSetPrototype()) {
       if (Protectors::IsSetIteratorLookupChainIntact(isolate)) {
         Protectors::InvalidateSetIteratorLookupChain(isolate);
       }
     } else if (receiver->IsJSMapIterator() ||
-               isolate->IsInAnyContext(
-                   *receiver, Context::INITIAL_MAP_ITERATOR_PROTOTYPE_INDEX)) {
+               receiver->IsJSMapIteratorPrototype()) {
       if (Protectors::IsMapIteratorLookupChainIntact(isolate)) {
         Protectors::InvalidateMapIteratorLookupChain(isolate);
       }
-    } else if (isolate->IsInAnyContext(
-                   *receiver, Context::INITIAL_ITERATOR_PROTOTYPE_INDEX)) {
+    } else if (receiver->IsJSIteratorPrototype()) {
       if (Protectors::IsMapIteratorLookupChainIntact(isolate)) {
         Protectors::InvalidateMapIteratorLookupChain(isolate);
       }
@@ -365,10 +349,8 @@ void LookupIterator::InternalUpdateProtector(Isolate* isolate,
     // to guard the fast-path in AsyncGeneratorResolve, where we can skip
     // the ResolvePromise step and go directly to FulfillPromise if we
     // know that the Object.prototype doesn't contain a "then" method.
-    if (receiver->IsJSPromise(isolate) ||
-        isolate->IsInAnyContext(*receiver,
-                                Context::INITIAL_OBJECT_PROTOTYPE_INDEX) ||
-        isolate->IsInAnyContext(*receiver, Context::PROMISE_PROTOTYPE_INDEX)) {
+    if (receiver->IsJSPromise(isolate) || receiver->IsJSObjectPrototype() ||
+        receiver->IsJSPromisePrototype()) {
       Protectors::InvalidatePromiseThenLookupChain(isolate);
     }
   }
@@ -407,7 +389,8 @@ void LookupIterator::PrepareForDataProperty(Handle<Object> value) {
 
   if (holder_obj->IsJSGlobalObject(isolate_)) {
     Handle<GlobalDictionary> dictionary(
-        JSGlobalObject::cast(*holder_obj).global_dictionary(isolate_),
+        JSGlobalObject::cast(*holder_obj)
+            .global_dictionary(isolate_, kAcquireLoad),
         isolate());
     Handle<PropertyCell> cell(dictionary->CellAt(isolate_, dictionary_entry()),
                               isolate());
@@ -504,7 +487,8 @@ void LookupIterator::ReconfigureDataProperty(Handle<Object> value,
     }
     if (holder_obj->IsJSGlobalObject(isolate_)) {
       Handle<GlobalDictionary> dictionary(
-          JSGlobalObject::cast(*holder_obj).global_dictionary(isolate_),
+          JSGlobalObject::cast(*holder_obj)
+              .global_dictionary(isolate_, kAcquireLoad),
           isolate());
 
       Handle<PropertyCell> cell = PropertyCell::PrepareForValue(
@@ -573,9 +557,7 @@ void LookupIterator::PrepareTransitionToDataProperty(
       DCHECK(!value->IsTheHole(isolate_));
       // Don't set enumeration index (it will be set during value store).
       property_details_ = PropertyDetails(
-          kData, attributes,
-          PropertyCell::TypeForUninitializedCell(isolate_, value));
-
+          kData, attributes, PropertyCell::InitialType(isolate_, value));
       transition_ = cell;
       has_property_ = true;
     } else {
@@ -615,13 +597,13 @@ void LookupIterator::ApplyTransitionToDataProperty(
     // Install a property cell.
     Handle<JSGlobalObject> global = Handle<JSGlobalObject>::cast(receiver);
     DCHECK(!global->HasFastProperties());
-    Handle<GlobalDictionary> dictionary(global->global_dictionary(isolate_),
-                                        isolate_);
+    Handle<GlobalDictionary> dictionary(
+        global->global_dictionary(isolate_, kAcquireLoad), isolate_);
 
     dictionary =
         GlobalDictionary::Add(isolate_, dictionary, name(), transition_cell(),
                               property_details_, &number_);
-    global->set_global_dictionary(*dictionary);
+    global->set_global_dictionary(*dictionary, kReleaseStore);
 
     // Reload details containing proper enumeration index value.
     property_details_ = transition_cell()->property_details();
@@ -862,8 +844,8 @@ Handle<Object> LookupIterator::FetchValue(
     return accessor->Get(holder, number_);
   } else if (holder_->IsJSGlobalObject(isolate_)) {
     Handle<JSGlobalObject> holder = GetHolder<JSGlobalObject>();
-    result = holder->global_dictionary(isolate_).ValueAt(isolate_,
-                                                         dictionary_entry());
+    result = holder->global_dictionary(isolate_, kAcquireLoad)
+                 .ValueAt(isolate_, dictionary_entry());
   } else if (!holder_->HasFastProperties(isolate_)) {
     if (V8_DICT_MODE_PROTOTYPES_BOOL) {
       result = holder_->property_dictionary_ordered(isolate_).ValueAt(
@@ -983,9 +965,9 @@ Handle<FieldType> LookupIterator::GetFieldType() const {
 Handle<PropertyCell> LookupIterator::GetPropertyCell() const {
   DCHECK(!IsElement(*holder_));
   Handle<JSGlobalObject> holder = GetHolder<JSGlobalObject>();
-  return handle(
-      holder->global_dictionary(isolate_).CellAt(isolate_, dictionary_entry()),
-      isolate_);
+  return handle(holder->global_dictionary(isolate_, kAcquireLoad)
+                    .CellAt(isolate_, dictionary_entry()),
+                isolate_);
 }
 
 Handle<Object> LookupIterator::GetAccessors() const {
@@ -1023,7 +1005,7 @@ void LookupIterator::WriteDataValue(Handle<Object> value,
     }
   } else if (holder->IsJSGlobalObject(isolate_)) {
     GlobalDictionary dictionary =
-        JSGlobalObject::cast(*holder).global_dictionary(isolate_);
+        JSGlobalObject::cast(*holder).global_dictionary(isolate_, kAcquireLoad);
     dictionary.CellAt(isolate_, dictionary_entry()).set_value(*value);
   } else {
     DCHECK_IMPLIES(holder->IsJSProxy(isolate_), name()->IsPrivate(isolate_));
@@ -1060,7 +1042,7 @@ bool LookupIterator::SkipInterceptor(JSObject holder) {
 }
 
 JSReceiver LookupIterator::NextHolder(Map map) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (map.prototype(isolate_) == ReadOnlyRoots(isolate_).null_value()) {
     return JSReceiver();
   }
@@ -1118,8 +1100,8 @@ LookupIterator::State LookupIterator::LookupInSpecialHolder(
       V8_FALLTHROUGH;
     case INTERCEPTOR:
       if (map.IsJSGlobalObjectMap() && !is_js_array_element(is_element)) {
-        GlobalDictionary dict =
-            JSGlobalObject::cast(holder).global_dictionary(isolate_);
+        GlobalDictionary dict = JSGlobalObject::cast(holder).global_dictionary(
+            isolate_, kAcquireLoad);
         number_ = dict.FindEntry(isolate(), name_);
         if (number_.is_not_found()) return NOT_FOUND;
         PropertyCell cell = dict.CellAt(isolate_, number_);
@@ -1148,7 +1130,7 @@ LookupIterator::State LookupIterator::LookupInSpecialHolder(
 template <bool is_element>
 LookupIterator::State LookupIterator::LookupInRegularHolder(
     Map const map, JSReceiver const holder) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (interceptor_state_ == InterceptorState::kProcessNonMasking) {
     return NOT_FOUND;
   }
@@ -1203,7 +1185,7 @@ LookupIterator::State LookupIterator::LookupInRegularHolder(
 Handle<InterceptorInfo> LookupIterator::GetInterceptorForFailedAccessCheck()
     const {
   DCHECK_EQ(ACCESS_CHECK, state_);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   AccessCheckInfo access_check_info =
       AccessCheckInfo::Get(isolate_, Handle<JSObject>::cast(holder_));
   if (!access_check_info.is_null()) {
diff --git a/deps/v8/src/objects/map-inl.h b/deps/v8/src/objects/map-inl.h
index 9529ea234cfa94..df9c93a4975370 100644
--- a/deps/v8/src/objects/map-inl.h
+++ b/deps/v8/src/objects/map-inl.h
@@ -60,7 +60,7 @@ ACCESSORS_CHECKED(Map, prototype_info, Object,
 // is explicitly allowlisted here. The former is never modified after the map
 // is setup but it's being read by concurrent marker when pointer compression
 // is enabled. The latter bit can be modified on a live objects.
-BIT_FIELD_ACCESSORS(Map, relaxed_bit_field, has_non_instance_prototype,
+BIT_FIELD_ACCESSORS(Map, bit_field, has_non_instance_prototype,
                     Map::Bits1::HasNonInstancePrototypeBit)
 BIT_FIELD_ACCESSORS(Map, bit_field, is_callable, Map::Bits1::IsCallableBit)
 BIT_FIELD_ACCESSORS(Map, bit_field, has_named_interceptor,
@@ -73,7 +73,7 @@ BIT_FIELD_ACCESSORS(Map, bit_field, is_access_check_needed,
                     Map::Bits1::IsAccessCheckNeededBit)
 BIT_FIELD_ACCESSORS(Map, bit_field, is_constructor,
                     Map::Bits1::IsConstructorBit)
-BIT_FIELD_ACCESSORS(Map, relaxed_bit_field, has_prototype_slot,
+BIT_FIELD_ACCESSORS(Map, bit_field, has_prototype_slot,
                     Map::Bits1::HasPrototypeSlotBit)
 
 // |bit_field2| fields.
@@ -448,24 +448,20 @@ void Map::AccountAddedOutOfObjectPropertyField(int unused_in_property_array) {
   DCHECK_EQ(unused_in_property_array, UnusedPropertyFields());
 }
 
-byte Map::bit_field() const { return ReadField<byte>(kBitFieldOffset); }
-
-void Map::set_bit_field(byte value) {
-  WriteField<byte>(kBitFieldOffset, value);
+byte Map::bit_field() const {
+  return ACQUIRE_READ_BYTE_FIELD(*this, kBitFieldOffset);
 }
 
-byte Map::relaxed_bit_field() const {
-  return RELAXED_READ_BYTE_FIELD(*this, kBitFieldOffset);
+void Map::set_bit_field(byte value) {
+  RELEASE_WRITE_BYTE_FIELD(*this, kBitFieldOffset, value);
 }
 
-void Map::set_relaxed_bit_field(byte value) {
-  RELAXED_WRITE_BYTE_FIELD(*this, kBitFieldOffset, value);
+byte Map::bit_field2() const {
+  return ACQUIRE_READ_BYTE_FIELD(*this, kBitField2Offset);
 }
 
-byte Map::bit_field2() const { return ReadField<byte>(kBitField2Offset); }
-
 void Map::set_bit_field2(byte value) {
-  WriteField<byte>(kBitField2Offset, value);
+  RELEASE_WRITE_BYTE_FIELD(*this, kBitField2Offset, value);
 }
 
 bool Map::is_abandoned_prototype_map() const {
@@ -565,11 +561,7 @@ bool Map::is_stable() const {
 bool Map::CanBeDeprecated() const {
   for (InternalIndex i : IterateOwnDescriptors()) {
     PropertyDetails details = instance_descriptors(kRelaxedLoad).GetDetails(i);
-    if (details.representation().IsNone()) return true;
-    if (details.representation().IsSmi()) return true;
-    if (details.representation().IsDouble() && FLAG_unbox_double_fields)
-      return true;
-    if (details.representation().IsHeapObject()) return true;
+    if (details.representation().MightCauseMapDeprecation()) return true;
     if (details.kind() == kData && details.location() == kDescriptor) {
       return true;
     }
@@ -670,11 +662,11 @@ void Map::InitializeDescriptors(Isolate* isolate, DescriptorArray descriptors,
 }
 
 void Map::set_bit_field3(uint32_t bits) {
-  RELAXED_WRITE_UINT32_FIELD(*this, kBitField3Offset, bits);
+  RELEASE_WRITE_UINT32_FIELD(*this, kBitField3Offset, bits);
 }
 
 uint32_t Map::bit_field3() const {
-  return RELAXED_READ_UINT32_FIELD(*this, kBitField3Offset);
+  return ACQUIRE_READ_UINT32_FIELD(*this, kBitField3Offset);
 }
 
 void Map::clear_padding() {
@@ -743,7 +735,7 @@ void Map::SetBackPointer(HeapObject value, WriteBarrierMode mode) {
 
 // static
 Map Map::ElementsTransitionMap(Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return TransitionsAccessor(isolate, *this, &no_gc)
       .SearchSpecial(ReadOnlyRoots(isolate).elements_transition_symbol());
 }
diff --git a/deps/v8/src/objects/map-updater.cc b/deps/v8/src/objects/map-updater.cc
index 36d5da85e8bd0c..0e0c3372cd8368 100644
--- a/deps/v8/src/objects/map-updater.cc
+++ b/deps/v8/src/objects/map-updater.cc
@@ -217,6 +217,14 @@ MapUpdater::State MapUpdater::TryReconfigureToDataFieldInplace() {
 
   PropertyDetails old_details =
       old_descriptors_->GetDetails(modified_descriptor_);
+
+  if (old_details.attributes() != new_attributes_ ||
+      old_details.kind() != new_kind_ ||
+      old_details.location() != new_location_) {
+    // These changes can't be done in-place.
+    return state_;  // Not done yet.
+  }
+
   Representation old_representation = old_details.representation();
   if (!old_representation.CanBeInPlaceChangedTo(new_representation_)) {
     return state_;  // Not done yet.
@@ -667,7 +675,7 @@ Handle<DescriptorArray> MapUpdater::BuildDescriptorArray() {
 }
 
 Handle<Map> MapUpdater::FindSplitMap(Handle<DescriptorArray> descriptors) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   int root_nof = root_map_->NumberOfOwnDescriptors();
   Map current = *root_map_;
@@ -675,7 +683,7 @@ Handle<Map> MapUpdater::FindSplitMap(Handle<DescriptorArray> descriptors) {
     Name name = descriptors->GetKey(i);
     PropertyDetails details = descriptors->GetDetails(i);
     Map next =
-        TransitionsAccessor(isolate_, current, &no_allocation)
+        TransitionsAccessor(isolate_, current, &no_gc)
             .SearchTransition(name, details.kind(), details.attributes());
     if (next.is_null()) break;
     DescriptorArray next_descriptors = next.instance_descriptors(kRelaxedLoad);
diff --git a/deps/v8/src/objects/map.cc b/deps/v8/src/objects/map.cc
index 535ec82d63e519..93a9a92294ca71 100644
--- a/deps/v8/src/objects/map.cc
+++ b/deps/v8/src/objects/map.cc
@@ -32,7 +32,7 @@ namespace v8 {
 namespace internal {
 
 Map Map::GetPrototypeChainRootMap(Isolate* isolate) const {
-  DisallowHeapAllocation no_alloc;
+  DisallowGarbageCollection no_alloc;
   if (IsJSReceiverMap()) {
     return *this;
   }
@@ -209,9 +209,6 @@ VisitorId Map::GetVisitorId(Map map) {
     case CALL_HANDLER_INFO_TYPE:
       return kVisitStruct;
 
-    case SHARED_FUNCTION_INFO_TYPE:
-      return kVisitSharedFunctionInfo;
-
     case JS_PROXY_TYPE:
       return kVisitStruct;
 
@@ -248,41 +245,45 @@ VisitorId Map::GetVisitorId(Map map) {
     case PREPARSE_DATA_TYPE:
       return kVisitPreparseData;
 
-    case UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE:
-      return kVisitUncompiledDataWithoutPreparseData;
-
-    case UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE:
-      return kVisitUncompiledDataWithPreparseData;
-
     case COVERAGE_INFO_TYPE:
       return kVisitCoverageInfo;
 
-    case JS_OBJECT_TYPE:
-    case JS_ERROR_TYPE:
     case JS_ARGUMENTS_OBJECT_TYPE:
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
+    case JS_ARRAY_ITERATOR_TYPE:
+    case JS_ARRAY_TYPE:
     case JS_ASYNC_FROM_SYNC_ITERATOR_TYPE:
-    case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
-    case JS_GENERATOR_OBJECT_TYPE:
     case JS_ASYNC_FUNCTION_OBJECT_TYPE:
     case JS_ASYNC_GENERATOR_OBJECT_TYPE:
-    case JS_MODULE_NAMESPACE_TYPE:
-    case JS_PRIMITIVE_WRAPPER_TYPE:
+    case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
     case JS_DATE_TYPE:
-    case JS_ARRAY_ITERATOR_TYPE:
-    case JS_ARRAY_TYPE:
-    case JS_MESSAGE_OBJECT_TYPE:
-    case JS_SET_TYPE:
-    case JS_MAP_TYPE:
-    case JS_SET_KEY_VALUE_ITERATOR_TYPE:
-    case JS_SET_VALUE_ITERATOR_TYPE:
+    case JS_ERROR_TYPE:
+    case JS_FINALIZATION_REGISTRY_TYPE:
+    case JS_GENERATOR_OBJECT_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
     case JS_MAP_KEY_ITERATOR_TYPE:
     case JS_MAP_KEY_VALUE_ITERATOR_TYPE:
+    case JS_MAP_TYPE:
     case JS_MAP_VALUE_ITERATOR_TYPE:
-    case JS_STRING_ITERATOR_TYPE:
+    case JS_MESSAGE_OBJECT_TYPE:
+    case JS_MODULE_NAMESPACE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
+    case JS_OBJECT_TYPE:
+    case JS_PRIMITIVE_WRAPPER_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
     case JS_PROMISE_TYPE:
-    case JS_REG_EXP_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
     case JS_REG_EXP_STRING_ITERATOR_TYPE:
-    case JS_FINALIZATION_REGISTRY_TYPE:
+    case JS_REG_EXP_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_KEY_VALUE_ITERATOR_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
+    case JS_SET_TYPE:
+    case JS_SET_VALUE_ITERATOR_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
+    case JS_STRING_ITERATOR_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
 #ifdef V8_INTL_SUPPORT
     case JS_V8_BREAK_ITERATOR_TYPE:
     case JS_COLLATOR_TYPE:
@@ -596,7 +597,7 @@ bool Map::HasOutOfObjectProperties() const {
 
 void Map::DeprecateTransitionTree(Isolate* isolate) {
   if (is_deprecated()) return;
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   TransitionsAccessor transitions(isolate, *this, &no_gc);
   int num_transitions = transitions.NumberOfTransitions();
   for (int i = 0; i < num_transitions; ++i) {
@@ -659,7 +660,7 @@ Map Map::FindRootMap(Isolate* isolate) const {
 }
 
 Map Map::FindFieldOwner(Isolate* isolate, InternalIndex descriptor) const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DCHECK_EQ(kField, instance_descriptors(isolate, kRelaxedLoad)
                         .GetDetails(descriptor)
                         .location());
@@ -680,7 +681,7 @@ void Map::UpdateFieldType(Isolate* isolate, InternalIndex descriptor,
                           const MaybeObjectHandle& new_wrapped_type) {
   DCHECK(new_wrapped_type->IsSmi() || new_wrapped_type->IsWeak());
   // We store raw pointers in the queue, so no allocations are allowed.
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   PropertyDetails details =
       instance_descriptors(kRelaxedLoad).GetDetails(descriptor);
   if (details.location() != kField) return;
@@ -698,7 +699,7 @@ void Map::UpdateFieldType(Isolate* isolate, InternalIndex descriptor,
     Map current = backlog.front();
     backlog.pop();
 
-    TransitionsAccessor transitions(isolate, current, &no_allocation);
+    TransitionsAccessor transitions(isolate, current, &no_gc);
     int num_transitions = transitions.NumberOfTransitions();
     for (int i = 0; i < num_transitions; ++i) {
       Map target = transitions.GetTarget(i);
@@ -845,13 +846,12 @@ Handle<Map> Map::ReconfigureElementsKind(Isolate* isolate, Handle<Map> map,
 namespace {
 
 Map SearchMigrationTarget(Isolate* isolate, Map old_map) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowDeoptimization no_deoptimization(isolate);
 
   Map target = old_map;
   do {
-    target = TransitionsAccessor(isolate, target, &no_allocation)
-                 .GetMigrationTarget();
+    target = TransitionsAccessor(isolate, target, &no_gc).GetMigrationTarget();
   } while (!target.is_null() && target.is_deprecated());
   if (target.is_null()) return Map();
 
@@ -882,7 +882,7 @@ Map SearchMigrationTarget(Isolate* isolate, Map old_map) {
 // TODO(ishell): Move TryUpdate() and friends to MapUpdater
 // static
 MaybeHandle<Map> Map::TryUpdate(Isolate* isolate, Handle<Map> old_map) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowDeoptimization no_deoptimization(isolate);
 
   if (!old_map->is_deprecated()) return old_map;
@@ -897,8 +897,7 @@ MaybeHandle<Map> Map::TryUpdate(Isolate* isolate, Handle<Map> old_map) {
   Map new_map = TryUpdateSlow(isolate, *old_map);
   if (new_map.is_null()) return MaybeHandle<Map>();
   if (FLAG_fast_map_update) {
-    TransitionsAccessor(isolate, *old_map, &no_allocation)
-        .SetMigrationTarget(new_map);
+    TransitionsAccessor(isolate, *old_map, &no_gc).SetMigrationTarget(new_map);
   }
   return handle(new_map, isolate);
 }
@@ -916,14 +915,14 @@ struct IntegrityLevelTransitionInfo {
 };
 
 IntegrityLevelTransitionInfo DetectIntegrityLevelTransitions(
-    Map map, Isolate* isolate, DisallowHeapAllocation* no_allocation) {
+    Map map, Isolate* isolate, DisallowGarbageCollection* no_gc) {
   IntegrityLevelTransitionInfo info(map);
 
   // Figure out the most restrictive integrity level transition (it should
   // be the last one in the transition tree).
   DCHECK(!map.is_extensible());
   Map previous = Map::cast(map.GetBackPointer(isolate));
-  TransitionsAccessor last_transitions(isolate, previous, no_allocation);
+  TransitionsAccessor last_transitions(isolate, previous, no_gc);
   if (!last_transitions.HasIntegrityLevelTransitionTo(
           map, &(info.integrity_level_symbol), &(info.integrity_level))) {
     // The last transition was not integrity level transition - just bail out.
@@ -941,7 +940,7 @@ IntegrityLevelTransitionInfo DetectIntegrityLevelTransitions(
   // with integrity level transitions, just bail out.
   while (!source_map.is_extensible()) {
     previous = Map::cast(source_map.GetBackPointer(isolate));
-    TransitionsAccessor transitions(isolate, previous, no_allocation);
+    TransitionsAccessor transitions(isolate, previous, no_gc);
     if (!transitions.HasIntegrityLevelTransitionTo(source_map)) {
       return info;
     }
@@ -959,7 +958,7 @@ IntegrityLevelTransitionInfo DetectIntegrityLevelTransitions(
 }  // namespace
 
 Map Map::TryUpdateSlow(Isolate* isolate, Map old_map) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowDeoptimization no_deoptimization(isolate);
 
   // Check the state of the root map.
@@ -982,7 +981,7 @@ Map Map::TryUpdateSlow(Isolate* isolate, Map old_map) {
   if (root_map.is_extensible() != old_map.is_extensible()) {
     DCHECK(!old_map.is_extensible());
     DCHECK(root_map.is_extensible());
-    info = DetectIntegrityLevelTransitions(old_map, isolate, &no_allocation);
+    info = DetectIntegrityLevelTransitions(old_map, isolate, &no_gc);
     // Bail out if there were some private symbol transitions mixed up
     // with the integrity level transitions.
     if (!info.has_integrity_level_transition) return Map();
@@ -1008,7 +1007,7 @@ Map Map::TryUpdateSlow(Isolate* isolate, Map old_map) {
 
   if (info.has_integrity_level_transition) {
     // Now replay the integrity level transition.
-    result = TransitionsAccessor(isolate, result, &no_allocation)
+    result = TransitionsAccessor(isolate, result, &no_gc)
                  .SearchSpecial(info.integrity_level_symbol);
   }
 
@@ -1020,7 +1019,7 @@ Map Map::TryUpdateSlow(Isolate* isolate, Map old_map) {
 }
 
 Map Map::TryReplayPropertyTransitions(Isolate* isolate, Map old_map) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowDeoptimization no_deoptimization(isolate);
 
   int root_nof = NumberOfOwnDescriptors();
@@ -1032,7 +1031,7 @@ Map Map::TryReplayPropertyTransitions(Isolate* isolate, Map old_map) {
   for (InternalIndex i : InternalIndex::Range(root_nof, old_nof)) {
     PropertyDetails old_details = old_descriptors.GetDetails(i);
     Map transition =
-        TransitionsAccessor(isolate, new_map, &no_allocation)
+        TransitionsAccessor(isolate, new_map, &no_gc)
             .SearchTransition(old_descriptors.GetKey(i), old_details.kind(),
                               old_details.attributes());
     if (transition.is_null()) return Map();
@@ -1111,7 +1110,7 @@ void Map::EnsureDescriptorSlack(Isolate* isolate, Handle<Map> map, int slack) {
   Handle<DescriptorArray> new_descriptors =
       DescriptorArray::CopyUpTo(isolate, descriptors, old_size, slack);
 
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // The descriptors are still the same, so keep the layout descriptor.
   LayoutDescriptor layout_descriptor = map->GetLayoutDescriptor();
 
@@ -1214,7 +1213,7 @@ static bool HasElementsKind(MapHandles const& maps,
 
 Map Map::FindElementsKindTransitionedMap(Isolate* isolate,
                                          MapHandles const& candidates) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowDeoptimization no_deoptimization(isolate);
 
   if (IsDetached(isolate)) return Map();
@@ -1307,7 +1306,7 @@ Handle<Map> Map::TransitionElementsTo(Isolate* isolate, Handle<Map> map,
     }
   } else if (IsFastElementsKind(from_kind) && IsFastElementsKind(to_kind)) {
     // Reuse map transitions for JSArrays.
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     if (native_context.GetInitialJSArrayMap(from_kind) == *map) {
       Object maybe_transitioned_map =
           native_context.get(Context::ArrayMapIndex(to_kind));
@@ -1455,7 +1454,7 @@ Handle<Map> Map::RawCopy(Isolate* isolate, Handle<Map> map, int instance_size,
   Handle<HeapObject> prototype(map->prototype(), isolate);
   Map::SetPrototype(isolate, result, prototype);
   result->set_constructor_or_backpointer(map->GetConstructor());
-  result->set_relaxed_bit_field(map->bit_field());
+  result->set_bit_field(map->bit_field());
   result->set_bit_field2(map->bit_field2());
   int new_bit_field3 = map->bit_field3();
   new_bit_field3 = Bits3::OwnsDescriptorsBit::update(new_bit_field3, true);
@@ -1531,6 +1530,9 @@ Handle<Map> Map::Normalize(Isolate* isolate, Handle<Map> fast_map,
                           Map::kSize - offset));
     }
 #endif
+    if (FLAG_trace_maps) {
+      LOG(isolate, MapEvent("NormalizeCached", fast_map, new_map, reason));
+    }
   } else {
     new_map = Map::CopyNormalized(isolate, fast_map, mode);
     new_map->set_elements_kind(new_elements_kind);
@@ -1538,9 +1540,9 @@ Handle<Map> Map::Normalize(Isolate* isolate, Handle<Map> fast_map,
       cache->Set(fast_map, new_map);
       isolate->counters()->maps_normalized()->Increment();
     }
-  }
-  if (FLAG_trace_maps) {
-    LOG(isolate, MapEvent("Normalize", fast_map, new_map, reason));
+    if (FLAG_trace_maps) {
+      LOG(isolate, MapEvent("Normalize", fast_map, new_map, reason));
+    }
   }
   fast_map->NotifyLeafMapLayoutChange(isolate);
   return new_map;
@@ -1695,7 +1697,7 @@ Handle<Map> Map::ShareDescriptor(Isolate* isolate, Handle<Map> map,
           : handle(LayoutDescriptor::FastPointerLayout(), isolate);
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     descriptors->Append(descriptor);
     result->InitializeDescriptors(isolate, *descriptors, *layout_descriptor);
   }
@@ -1743,6 +1745,7 @@ Handle<Map> Map::CopyReplaceDescriptors(
   DCHECK(descriptors->IsSortedNoDuplicates());
 
   Handle<Map> result = CopyDropDescriptors(isolate, map);
+  bool is_connected = false;
 
   // Properly mark the {result} if the {name} is an "interesting symbol".
   Handle<Name> name;
@@ -1759,17 +1762,14 @@ Handle<Map> Map::CopyReplaceDescriptors(
 
       DCHECK(!maybe_name.is_null());
       ConnectTransition(isolate, map, result, name, simple_flag);
+      is_connected = true;
     } else {
       descriptors->GeneralizeAllFields();
       result->InitializeDescriptors(isolate, *descriptors,
                                     LayoutDescriptor::FastPointerLayout());
     }
   }
-  if (FLAG_trace_maps &&
-      // Mirror conditions above that did not call ConnectTransition().
-      (map->IsDetached(isolate) ||
-       !(flag == INSERT_TRANSITION &&
-         TransitionsAccessor(isolate, map).CanHaveMoreTransitions()))) {
+  if (FLAG_trace_maps && !is_connected) {
     LOG(isolate, MapEvent("ReplaceDescriptors", map, result, reason,
                           maybe_name.is_null() ? Handle<HeapObject>() : name));
   }
@@ -2536,7 +2536,7 @@ static void GetMinInobjectSlack(Map map, void* data) {
 }
 
 int Map::ComputeMinObjectSlack(Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Has to be an initial map.
   DCHECK(GetBackPointer().IsUndefined(isolate));
 
@@ -2564,7 +2564,7 @@ static void StopSlackTracking(Map map, void* data) {
 }
 
 void Map::CompleteInobjectSlackTracking(Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Has to be an initial map.
   DCHECK(GetBackPointer().IsUndefined(isolate));
 
@@ -2716,7 +2716,7 @@ Handle<NormalizedMapCache> NormalizedMapCache::New(Isolate* isolate) {
 MaybeHandle<Map> NormalizedMapCache::Get(Handle<Map> fast_map,
                                          ElementsKind elements_kind,
                                          PropertyNormalizationMode mode) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   MaybeObject value = WeakFixedArray::Get(GetIndex(fast_map));
   HeapObject heap_object;
   if (!value->GetHeapObjectIfWeak(&heap_object)) {
@@ -2732,7 +2732,7 @@ MaybeHandle<Map> NormalizedMapCache::Get(Handle<Map> fast_map,
 }
 
 void NormalizedMapCache::Set(Handle<Map> fast_map, Handle<Map> normalized_map) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(normalized_map->is_dictionary_map());
   WeakFixedArray::Set(GetIndex(fast_map),
                       HeapObjectReference::Weak(*normalized_map));
diff --git a/deps/v8/src/objects/map.h b/deps/v8/src/objects/map.h
index f55b39acd27c61..561dc8b6bfeccc 100644
--- a/deps/v8/src/objects/map.h
+++ b/deps/v8/src/objects/map.h
@@ -38,7 +38,6 @@ enum InstanceType : uint16_t;
   V(Cell)                              \
   V(Code)                              \
   V(CodeDataContainer)                 \
-  V(Context)                           \
   V(DataHandler)                       \
   V(EmbedderDataArray)                 \
   V(EphemeronHashTable)                \
@@ -59,7 +58,6 @@ enum InstanceType : uint16_t;
   V(PropertyArray)                     \
   V(PropertyCell)                      \
   V(PrototypeInfo)                     \
-  V(SharedFunctionInfo)                \
   V(ShortcutCandidate)                 \
   V(SmallOrderedHashMap)               \
   V(SmallOrderedHashSet)               \
@@ -69,8 +67,6 @@ enum InstanceType : uint16_t;
   V(Symbol)                            \
   V(SyntheticModule)                   \
   V(TransitionArray)                   \
-  V(UncompiledDataWithoutPreparseData) \
-  V(UncompiledDataWithPreparseData)    \
   V(WasmIndirectFunctionTable)         \
   V(WasmInstanceObject)                \
   V(WasmArray)                         \
@@ -178,10 +174,9 @@ using MapHandles = std::vector<Handle<Map>>;
 // +---------------+------------------------------------------------+
 // | TaggedPointer | [instance_descriptors]                         |
 // +****************************************************************+
-// ! TaggedPointer ! [layout_descriptors]                           !
+// ! TaggedPointer ! [layout_descriptor]                            !
 // !               ! Field is only present if compile-time flag     !
 // !               ! FLAG_unbox_double_fields is enabled            !
-// !               ! (basically on 64 bit architectures)            !
 // +****************************************************************+
 // | TaggedPointer | [dependent_code]                               |
 // +---------------+------------------------------------------------+
@@ -253,8 +248,6 @@ class Map : public HeapObject {
   // Bit field.
   //
   DECL_PRIMITIVE_ACCESSORS(bit_field, byte)
-  // Atomic accessors, used for allowlisting legitimate concurrent accesses.
-  DECL_PRIMITIVE_ACCESSORS(relaxed_bit_field, byte)
 
   // Bit positions for |bit_field|.
   struct Bits1 {
diff --git a/deps/v8/src/objects/map.tq b/deps/v8/src/objects/map.tq
index e7333a38634693..e9f82f78cbbbb8 100644
--- a/deps/v8/src/objects/map.tq
+++ b/deps/v8/src/objects/map.tq
@@ -89,6 +89,7 @@ macro IsSimpleObjectMap(map: Map): bool {
     return false;
   }
   const bitField = map.bit_field;
+  // Using & instead of && enables Turbofan to merge the two checks into one.
   return !bitField.has_named_interceptor & !bitField.is_access_check_needed;
 }
 
diff --git a/deps/v8/src/objects/module-inl.h b/deps/v8/src/objects/module-inl.h
index c72cf2ad0c57ad..97e469191263da 100644
--- a/deps/v8/src/objects/module-inl.h
+++ b/deps/v8/src/objects/module-inl.h
@@ -51,9 +51,7 @@ struct Module::Hash {
 };
 
 SourceTextModuleInfo SourceTextModule::info() const {
-  return status() == kErrored
-             ? SourceTextModuleInfo::cast(code())
-             : GetSharedFunctionInfo().scope_info().ModuleDescriptorInfo();
+  return GetSharedFunctionInfo().scope_info().ModuleDescriptorInfo();
 }
 
 OBJECT_CONSTRUCTORS_IMPL(SourceTextModuleInfo, FixedArray)
@@ -79,18 +77,13 @@ FixedArray SourceTextModuleInfo::namespace_imports() const {
   return FixedArray::cast(get(kNamespaceImportsIndex));
 }
 
-FixedArray SourceTextModuleInfo::module_request_positions() const {
-  return FixedArray::cast(get(kModuleRequestPositionsIndex));
-}
-
 #ifdef DEBUG
 bool SourceTextModuleInfo::Equals(SourceTextModuleInfo other) const {
   return regular_exports() == other.regular_exports() &&
          regular_imports() == other.regular_imports() &&
          special_exports() == other.special_exports() &&
          namespace_imports() == other.namespace_imports() &&
-         module_requests() == other.module_requests() &&
-         module_request_positions() == other.module_request_positions();
+         module_requests() == other.module_requests();
 }
 #endif
 
@@ -118,6 +111,14 @@ class UnorderedModuleSet
             ZoneAllocator<Handle<Module>>(zone)) {}
 };
 
+Handle<SourceTextModule> SourceTextModule::GetCycleRoot(
+    Isolate* isolate) const {
+  CHECK_GE(status(), kEvaluated);
+  DCHECK(!cycle_root().IsTheHole(isolate));
+  Handle<SourceTextModule> root(SourceTextModule::cast(cycle_root()), isolate);
+  return root;
+}
+
 void SourceTextModule::AddAsyncParentModule(Isolate* isolate,
                                             Handle<SourceTextModule> module,
                                             Handle<SourceTextModule> parent) {
diff --git a/deps/v8/src/objects/module.cc b/deps/v8/src/objects/module.cc
index f4c23ae5c423ce..1bef1a1d45674e 100644
--- a/deps/v8/src/objects/module.cc
+++ b/deps/v8/src/objects/module.cc
@@ -10,12 +10,14 @@
 #include "src/api/api-inl.h"
 #include "src/ast/modules.h"
 #include "src/builtins/accessors.h"
+#include "src/common/assert-scope.h"
 #include "src/heap/heap-inl.h"
 #include "src/objects/cell-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/module-inl.h"
 #include "src/objects/objects-inl.h"
+#include "src/objects/source-text-module.h"
 #include "src/objects/synthetic-module-inl.h"
 #include "src/utils/ostreams.h"
 
@@ -26,7 +28,7 @@ namespace {
 #ifdef DEBUG
 void PrintModuleName(Module module, std::ostream& os) {
   if (module.IsSourceTextModule()) {
-    SourceTextModule::cast(module).script().GetNameOrSourceURL().Print(os);
+    SourceTextModule::cast(module).GetScript().GetNameOrSourceURL().Print(os);
   } else {
     SyntheticModule::cast(module).name().Print(os);
   }
@@ -52,7 +54,7 @@ void PrintStatusMessage(Module module, const char* message) {
 #endif  // DEBUG
 
 void SetStatusInternal(Module module, Module::Status new_status) {
-  DisallowHeapAllocation no_alloc;
+  DisallowGarbageCollection no_gc;
 #ifdef DEBUG
   PrintStatusTransition(module, new_status);
 #endif  // DEBUG
@@ -62,7 +64,7 @@ void SetStatusInternal(Module module, Module::Status new_status) {
 }  // end namespace
 
 void Module::SetStatus(Status new_status) {
-  DisallowHeapAllocation no_alloc;
+  DisallowGarbageCollection no_gc;
   DCHECK_LE(status(), new_status);
   DCHECK_NE(new_status, Module::kErrored);
   SetStatusInternal(*this, new_status);
@@ -78,11 +80,14 @@ void Module::RecordErrorUsingPendingException(Isolate* isolate,
 // static
 void Module::RecordError(Isolate* isolate, Handle<Module> module,
                          Handle<Object> error) {
+  DisallowGarbageCollection no_gc;
   DCHECK(module->exception().IsTheHole(isolate));
   DCHECK(!error->IsTheHole(isolate));
   if (module->IsSourceTextModule()) {
-    Handle<SourceTextModule> self(SourceTextModule::cast(*module), isolate);
-    self->set_code(self->info());
+    // Revert to minmal SFI in case we have already been instantiating or
+    // evaluating.
+    auto self = SourceTextModule::cast(*module);
+    self.set_code(self.GetSharedFunctionInfo());
   }
   SetStatusInternal(*module, Module::kErrored);
   if (isolate->is_catchable_by_javascript(*error)) {
@@ -144,7 +149,7 @@ void Module::Reset(Isolate* isolate, Handle<Module> module) {
 }
 
 Object Module::GetException() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_EQ(status(), Module::kErrored);
   DCHECK(!exception().IsTheHole());
   return exception();
@@ -169,14 +174,16 @@ MaybeHandle<Cell> Module::ResolveExport(Isolate* isolate, Handle<Module> module,
   }
 }
 
-bool Module::Instantiate(Isolate* isolate, Handle<Module> module,
-                         v8::Local<v8::Context> context,
-                         v8::Module::ResolveCallback callback) {
+bool Module::Instantiate(
+    Isolate* isolate, Handle<Module> module, v8::Local<v8::Context> context,
+    v8::Module::ResolveModuleCallback callback,
+    DeprecatedResolveCallback callback_without_import_assertions) {
 #ifdef DEBUG
   PrintStatusMessage(*module, "Instantiating module ");
 #endif  // DEBUG
 
-  if (!PrepareInstantiate(isolate, module, context, callback)) {
+  if (!PrepareInstantiate(isolate, module, context, callback,
+                          callback_without_import_assertions)) {
     ResetGraph(isolate, module);
     DCHECK_EQ(module->status(), kUninstantiated);
     return false;
@@ -195,9 +202,10 @@ bool Module::Instantiate(Isolate* isolate, Handle<Module> module,
   return true;
 }
 
-bool Module::PrepareInstantiate(Isolate* isolate, Handle<Module> module,
-                                v8::Local<v8::Context> context,
-                                v8::Module::ResolveCallback callback) {
+bool Module::PrepareInstantiate(
+    Isolate* isolate, Handle<Module> module, v8::Local<v8::Context> context,
+    v8::Module::ResolveModuleCallback callback,
+    DeprecatedResolveCallback callback_without_import_assertions) {
   DCHECK_NE(module->status(), kEvaluating);
   DCHECK_NE(module->status(), kInstantiating);
   if (module->status() >= kPreInstantiating) return true;
@@ -206,10 +214,11 @@ bool Module::PrepareInstantiate(Isolate* isolate, Handle<Module> module,
 
   if (module->IsSourceTextModule()) {
     return SourceTextModule::PrepareInstantiate(
-        isolate, Handle<SourceTextModule>::cast(module), context, callback);
+        isolate, Handle<SourceTextModule>::cast(module), context, callback,
+        callback_without_import_assertions);
   } else {
     return SyntheticModule::PrepareInstantiate(
-        isolate, Handle<SyntheticModule>::cast(module), context, callback);
+        isolate, Handle<SyntheticModule>::cast(module), context);
   }
 }
 
diff --git a/deps/v8/src/objects/module.h b/deps/v8/src/objects/module.h
index 20be042f82b912..d254f1842075c0 100644
--- a/deps/v8/src/objects/module.h
+++ b/deps/v8/src/objects/module.h
@@ -69,13 +69,24 @@ class Module : public HeapObject {
   // i.e. has a top-level await.
   V8_WARN_UNUSED_RESULT bool IsGraphAsync(Isolate* isolate) const;
 
+  // While deprecating v8::ResolveCallback in v8.h we still need to support the
+  // version of the API that uses it, but we can't directly reference the
+  // deprecated version because of the enusing build warnings.  So, we declare
+  // this matching typedef for temporary internal use.
+  // TODO(v8:10958) Delete this typedef and all references to it once
+  // v8::ResolveCallback is removed.
+  typedef MaybeLocal<v8::Module> (*DeprecatedResolveCallback)(
+      Local<v8::Context> context, Local<v8::String> specifier,
+      Local<v8::Module> referrer);
+
   // Implementation of spec operation ModuleDeclarationInstantiation.
   // Returns false if an exception occurred during instantiation, true
   // otherwise. (In the case where the callback throws an exception, that
   // exception is propagated.)
   static V8_WARN_UNUSED_RESULT bool Instantiate(
       Isolate* isolate, Handle<Module> module, v8::Local<v8::Context> context,
-      v8::Module::ResolveCallback callback);
+      v8::Module::ResolveModuleCallback callback,
+      DeprecatedResolveCallback callback_without_import_assertions);
 
   // Implementation of spec operation ModuleEvaluation.
   static V8_WARN_UNUSED_RESULT MaybeHandle<Object> Evaluate(
@@ -114,7 +125,8 @@ class Module : public HeapObject {
 
   static V8_WARN_UNUSED_RESULT bool PrepareInstantiate(
       Isolate* isolate, Handle<Module> module, v8::Local<v8::Context> context,
-      v8::Module::ResolveCallback callback);
+      v8::Module::ResolveModuleCallback callback,
+      DeprecatedResolveCallback callback_without_import_assertions);
   static V8_WARN_UNUSED_RESULT bool FinishInstantiate(
       Isolate* isolate, Handle<Module> module,
       ZoneForwardList<Handle<SourceTextModule>>* stack, unsigned* dfs_index,
diff --git a/deps/v8/src/objects/name-inl.h b/deps/v8/src/objects/name-inl.h
index 55f5915319bd96..f07e1bb9ced360 100644
--- a/deps/v8/src/objects/name-inl.h
+++ b/deps/v8/src/objects/name-inl.h
@@ -5,10 +5,10 @@
 #ifndef V8_OBJECTS_NAME_INL_H_
 #define V8_OBJECTS_NAME_INL_H_
 
-#include "src/objects/name.h"
-
+#include "src/base/logging.h"
 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/objects/map-inl.h"
+#include "src/objects/name.h"
 #include "src/objects/primitive-heap-object-inl.h"
 
 // Has to be the last include (doesn't have include guards):
@@ -60,6 +60,7 @@ DEF_GETTER(Name, IsUniqueName, bool) {
   bool result = (type & (kIsNotStringMask | kIsNotInternalizedMask)) !=
                 (kStringTag | kNotInternalizedTag);
   SLOW_DCHECK(result == HeapObject::IsUniqueName());
+  DCHECK_IMPLIES(result, HasHashCode());
   return result;
 }
 
@@ -82,22 +83,22 @@ bool Name::Equals(Isolate* isolate, Handle<Name> one, Handle<Name> two) {
                             Handle<String>::cast(two));
 }
 
-bool Name::IsHashFieldComputed(uint32_t field) {
-  return (field & kHashNotComputedMask) == 0;
+bool Name::IsHashFieldComputed(uint32_t raw_hash_field) {
+  return (raw_hash_field & kHashNotComputedMask) == 0;
 }
 
-bool Name::HasHashCode() { return IsHashFieldComputed(hash_field()); }
+bool Name::HasHashCode() const { return IsHashFieldComputed(raw_hash_field()); }
 
-uint32_t Name::Hash() {
+uint32_t Name::EnsureHash() {
   // Fast case: has hash code already been computed?
-  uint32_t field = hash_field();
+  uint32_t field = raw_hash_field();
   if (IsHashFieldComputed(field)) return field >> kHashShift;
   // Slow case: compute hash code and set it. Has to be a string.
   return String::cast(*this).ComputeAndSetHash();
 }
 
 uint32_t Name::hash() const {
-  uint32_t field = hash_field();
+  uint32_t field = raw_hash_field();
   DCHECK(IsHashFieldComputed(field));
   return field >> kHashShift;
 }
@@ -133,8 +134,8 @@ bool Name::AsIntegerIndex(size_t* index) {
 }
 
 // static
-bool Name::ContainsCachedArrayIndex(uint32_t hash) {
-  return (hash & Name::kDoesNotContainCachedArrayIndexMask) == 0;
+bool Name::ContainsCachedArrayIndex(uint32_t raw_hash_field) {
+  return (raw_hash_field & Name::kDoesNotContainCachedArrayIndexMask) == 0;
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/objects/name.h b/deps/v8/src/objects/name.h
index fc0927083e25e8..49d593372d809b 100644
--- a/deps/v8/src/objects/name.h
+++ b/deps/v8/src/objects/name.h
@@ -23,12 +23,11 @@ namespace internal {
 class Name : public TorqueGeneratedName<Name, PrimitiveHeapObject> {
  public:
   // Tells whether the hash code has been computed.
-  inline bool HasHashCode();
+  inline bool HasHashCode() const;
 
   // Returns a hash value used for the property table. Ensures that the hash
   // value is computed.
-  // TODO(ishell): rename to EnsureHash().
-  inline uint32_t Hash();
+  inline uint32_t EnsureHash();
 
   // Returns a hash value used for the property table (same as Hash()), assumes
   // the hash is already computed.
@@ -139,8 +138,7 @@ class Name : public TorqueGeneratedName<Name, PrimitiveHeapObject> {
   static const int kEmptyHashField =
       kIsNotIntegerIndexMask | kHashNotComputedMask;
 
- protected:
-  static inline bool IsHashFieldComputed(uint32_t field);
+  static inline bool IsHashFieldComputed(uint32_t raw_hash_field);
 
   TQ_OBJECT_CONSTRUCTORS(Name)
 };
diff --git a/deps/v8/src/objects/name.tq b/deps/v8/src/objects/name.tq
index a473afaff0d370..b0d892b0703ca2 100644
--- a/deps/v8/src/objects/name.tq
+++ b/deps/v8/src/objects/name.tq
@@ -5,7 +5,7 @@
 @abstract
 @generateCppClass
 extern class Name extends PrimitiveHeapObject {
-  hash_field: NameHash;
+  raw_hash_field: NameHash;
 }
 
 bitfield struct NameHash extends uint32 {
diff --git a/deps/v8/src/objects/object-list-macros.h b/deps/v8/src/objects/object-list-macros.h
index a189f00d27f314..78f9a7f32e1842 100644
--- a/deps/v8/src/objects/object-list-macros.h
+++ b/deps/v8/src/objects/object-list-macros.h
@@ -98,7 +98,6 @@ class ZoneForwardList;
   V(CompilationCacheTable)                     \
   V(ConsString)                                \
   V(Constructor)                               \
-  V(Context)                                   \
   V(CoverageInfo)                              \
   V(ClosureFeedbackCellArray)                  \
   V(DataHandler)                               \
@@ -196,7 +195,6 @@ class ZoneForwardList;
   V(SeqOneByteString)                          \
   V(SeqString)                                 \
   V(SeqTwoByteString)                          \
-  V(SharedFunctionInfo)                        \
   V(SimpleNumberDictionary)                    \
   V(SlicedString)                              \
   V(SmallOrderedHashMap)                       \
@@ -216,9 +214,6 @@ class ZoneForwardList;
   V(TemplateList)                              \
   V(ThinString)                                \
   V(TransitionArray)                           \
-  V(UncompiledData)                            \
-  V(UncompiledDataWithPreparseData)            \
-  V(UncompiledDataWithoutPreparseData)         \
   V(Undetectable)                              \
   V(UniqueName)                                \
   V(WasmArray)                                 \
@@ -279,7 +274,18 @@ class ZoneForwardList;
   V(ModuleContext)                           \
   V(NonNullForeign)                          \
   V(ScriptContext)                           \
-  V(WithContext)
+  V(WithContext)                             \
+  V(JSPrototype)                             \
+  V(JSObjectPrototype)                       \
+  V(JSRegExpPrototype)                       \
+  V(JSPromisePrototype)                      \
+  V(JSSetPrototype)                          \
+  V(JSIteratorPrototype)                     \
+  V(JSArrayIteratorPrototype)                \
+  V(JSMapIteratorPrototype)                  \
+  V(JSTypedArrayPrototype)                   \
+  V(JSSetIteratorPrototype)                  \
+  V(JSStringIteratorPrototype)
 
 #define HEAP_OBJECT_TYPE_LIST(V)    \
   HEAP_OBJECT_ORDINARY_TYPE_LIST(V) \
diff --git a/deps/v8/src/objects/object-macros-undef.h b/deps/v8/src/objects/object-macros-undef.h
index 82b4f36251fe2b..d919e665a086a6 100644
--- a/deps/v8/src/objects/object-macros-undef.h
+++ b/deps/v8/src/objects/object-macros-undef.h
@@ -8,6 +8,7 @@
 
 #undef OBJECT_CONSTRUCTORS
 #undef OBJECT_CONSTRUCTORS_IMPL
+#undef OBJECT_CONSTRUCTORS_IMPL_CHECK_SUPER
 #undef NEVER_READ_ONLY_SPACE
 #undef NEVER_READ_ONLY_SPACE_IMPL
 #undef DECL_PRIMITIVE_ACCESSORS
@@ -21,7 +22,16 @@
 #undef DECL_UINT8_ACCESSORS
 #undef DECL_GETTER
 #undef DEF_GETTER
+#undef DECL_SETTER
 #undef DECL_ACCESSORS
+#undef DECL_ACCESSORS_LOAD_TAG
+#undef DECL_ACCESSORS_STORE_TAG
+#undef DECL_RELAXED_GETTER
+#undef DECL_RELAXED_SETTER
+#undef DECL_RELAXED_ACCESSORS
+#undef DECL_ACQUIRE_GETTER
+#undef DECL_RELEASE_SETTER
+#undef DECL_RELEASE_ACQUIRE_ACCESSORS
 #undef DECL_CAST
 #undef CAST_ACCESSOR
 #undef INT_ACCESSORS
@@ -32,12 +42,20 @@
 #undef ACCESSORS_CHECKED2
 #undef ACCESSORS_CHECKED
 #undef ACCESSORS
+#undef RENAME_TORQUE_ACCESSORS
+#undef RENAME_UINT16_TORQUE_ACCESSORS
+#undef RELAXED_ACCESSORS_CHECKED2
+#undef RELAXED_ACCESSORS_CHECKED
+#undef RELAXED_ACCESSORS
 #undef RELEASE_ACQUIRE_ACCESSORS_CHECKED2
 #undef RELEASE_ACQUIRE_ACCESSORS_CHECKED
 #undef RELEASE_ACQUIRE_ACCESSORS
 #undef WEAK_ACCESSORS_CHECKED2
 #undef WEAK_ACCESSORS_CHECKED
 #undef WEAK_ACCESSORS
+#undef SYNCHRONIZED_WEAK_ACCESSORS_CHECKED2
+#undef SYNCHRONIZED_WEAK_ACCESSORS_CHECKED
+#undef SYNCHRONIZED_WEAK_ACCESSORS
 #undef SMI_ACCESSORS_CHECKED
 #undef SMI_ACCESSORS
 #undef SYNCHRONIZED_SMI_ACCESSORS
@@ -68,12 +86,16 @@
 #undef RELAXED_READ_INT16_FIELD
 #undef RELAXED_WRITE_INT16_FIELD
 #undef RELAXED_READ_UINT32_FIELD
+#undef ACQUIRE_READ_UINT32_FIELD
 #undef RELAXED_WRITE_UINT32_FIELD
+#undef RELEASE_WRITE_UINT32_FIELD
 #undef RELAXED_READ_INT32_FIELD
 #undef RELEASE_WRITE_INT32_FIELD
 #undef RELAXED_WRITE_INT32_FIELD
 #undef RELAXED_READ_BYTE_FIELD
+#undef ACQUIRE_READ_BYTE_FIELD
 #undef RELAXED_WRITE_BYTE_FIELD
+#undef RELEASE_WRITE_BYTE_FIELD
 #undef DECL_PRINTER
 #undef DECL_VERIFIER
 #undef EXPORT_DECL_VERIFIER
diff --git a/deps/v8/src/objects/object-macros.h b/deps/v8/src/objects/object-macros.h
index 3aa56bfbde3b65..7928eff5fb4d7f 100644
--- a/deps/v8/src/objects/object-macros.h
+++ b/deps/v8/src/objects/object-macros.h
@@ -91,11 +91,14 @@
   }                                                     \
   type holder::name(IsolateRoot isolate) const
 
-#define DECL_ACCESSORS(name, type)   \
-  DECL_GETTER(name, type)            \
+#define DECL_SETTER(name, type)      \
   inline void set_##name(type value, \
                          WriteBarrierMode mode = UPDATE_WRITE_BARRIER);
 
+#define DECL_ACCESSORS(name, type) \
+  DECL_GETTER(name, type)          \
+  DECL_SETTER(name, type)
+
 #define DECL_ACCESSORS_LOAD_TAG(name, type, tag_type) \
   inline type name(tag_type tag) const;               \
   inline type name(IsolateRoot isolate, tag_type) const;
@@ -184,6 +187,23 @@
 #define ACCESSORS(holder, name, type, offset) \
   ACCESSORS_CHECKED(holder, name, type, offset, true)
 
+#define RENAME_TORQUE_ACCESSORS(holder, name, torque_name, type)      \
+  inline type holder::name() const {                                  \
+    return TorqueGeneratedClass::torque_name();                       \
+  }                                                                   \
+  inline void holder::set_##name(type value, WriteBarrierMode mode) { \
+    TorqueGeneratedClass::set_##torque_name(value, mode);             \
+  }
+
+#define RENAME_UINT16_TORQUE_ACCESSORS(holder, name, torque_name) \
+  uint16_t holder::name() const {                                 \
+    return TorqueGeneratedClass::torque_name();                   \
+  }                                                               \
+  void holder::set_##name(int value) {                            \
+    DCHECK_EQ(value, static_cast<uint16_t>(value));               \
+    TorqueGeneratedClass::set_##torque_name(value);               \
+  }
+
 #define RELAXED_ACCESSORS_CHECKED2(holder, name, type, offset, get_condition, \
                                    set_condition)                             \
   type holder::name(RelaxedLoadTag tag) const {                               \
@@ -484,11 +504,20 @@
   static_cast<uint32_t>(base::Relaxed_Load(  \
       reinterpret_cast<const base::Atomic32*>(FIELD_ADDR(p, offset))))
 
+#define ACQUIRE_READ_UINT32_FIELD(p, offset) \
+  static_cast<uint32_t>(base::Acquire_Load(  \
+      reinterpret_cast<const base::Atomic32*>(FIELD_ADDR(p, offset))))
+
 #define RELAXED_WRITE_UINT32_FIELD(p, offset, value)            \
   base::Relaxed_Store(                                          \
       reinterpret_cast<base::Atomic32*>(FIELD_ADDR(p, offset)), \
       static_cast<base::Atomic32>(value));
 
+#define RELEASE_WRITE_UINT32_FIELD(p, offset, value)            \
+  base::Release_Store(                                          \
+      reinterpret_cast<base::Atomic32*>(FIELD_ADDR(p, offset)), \
+      static_cast<base::Atomic32>(value));
+
 #define RELAXED_READ_INT32_FIELD(p, offset) \
   static_cast<int32_t>(base::Relaxed_Load(  \
       reinterpret_cast<const base::Atomic32*>(FIELD_ADDR(p, offset))))
@@ -507,10 +536,18 @@
   static_cast<byte>(base::Relaxed_Load(    \
       reinterpret_cast<const base::Atomic8*>(FIELD_ADDR(p, offset))))
 
+#define ACQUIRE_READ_BYTE_FIELD(p, offset) \
+  static_cast<byte>(base::Acquire_Load(    \
+      reinterpret_cast<const base::Atomic8*>(FIELD_ADDR(p, offset))))
+
 #define RELAXED_WRITE_BYTE_FIELD(p, offset, value)                             \
   base::Relaxed_Store(reinterpret_cast<base::Atomic8*>(FIELD_ADDR(p, offset)), \
                       static_cast<base::Atomic8>(value));
 
+#define RELEASE_WRITE_BYTE_FIELD(p, offset, value)                             \
+  base::Release_Store(reinterpret_cast<base::Atomic8*>(FIELD_ADDR(p, offset)), \
+                      static_cast<base::Atomic8>(value));
+
 #ifdef OBJECT_PRINT
 #define DECL_PRINTER(Name) void Name##Print(std::ostream& os);  // NOLINT
 #else
diff --git a/deps/v8/src/objects/objects-body-descriptors-inl.h b/deps/v8/src/objects/objects-body-descriptors-inl.h
index a7571ae288a237..874330e5ebdfb8 100644
--- a/deps/v8/src/objects/objects-body-descriptors-inl.h
+++ b/deps/v8/src/objects/objects-body-descriptors-inl.h
@@ -269,30 +269,6 @@ class JSFinalizationRegistry::BodyDescriptor final : public BodyDescriptorBase {
   }
 };
 
-class SharedFunctionInfo::BodyDescriptor final : public BodyDescriptorBase {
- public:
-  static bool IsValidSlot(Map map, HeapObject obj, int offset) {
-    static_assert(kEndOfWeakFieldsOffset == kStartOfStrongFieldsOffset,
-                  "Leverage that strong fields directly follow weak fields"
-                  "to call FixedBodyDescriptor<...>::IsValidSlot below");
-    return FixedBodyDescriptor<kStartOfWeakFieldsOffset,
-                               kEndOfStrongFieldsOffset,
-                               kAlignedSize>::IsValidSlot(map, obj, offset);
-  }
-
-  template <typename ObjectVisitor>
-  static inline void IterateBody(Map map, HeapObject obj, int object_size,
-                                 ObjectVisitor* v) {
-    IterateCustomWeakPointer(obj, kFunctionDataOffset, v);
-    IteratePointers(obj, SharedFunctionInfo::kStartOfStrongFieldsOffset,
-                    SharedFunctionInfo::kEndOfStrongFieldsOffset, v);
-  }
-
-  static inline int SizeOf(Map map, HeapObject object) {
-    return map.instance_size();
-  }
-};
-
 class AllocationSite::BodyDescriptor final : public BodyDescriptorBase {
  public:
   STATIC_ASSERT(AllocationSite::kCommonPointerFieldEndOffset ==
@@ -588,6 +564,7 @@ class WasmTypeInfo::BodyDescriptor final : public BodyDescriptorBase {
     Foreign::BodyDescriptor::IterateBody<ObjectVisitor>(map, obj, object_size,
                                                         v);
     IteratePointer(obj, kParentOffset, v);
+    IteratePointer(obj, kSupertypesOffset, v);
     IteratePointer(obj, kSubtypesOffset, v);
   }
 
@@ -650,6 +627,7 @@ class Code::BodyDescriptor final : public BodyDescriptorBase {
       RelocInfo::ModeMask(RelocInfo::RELATIVE_CODE_TARGET) |
       RelocInfo::ModeMask(RelocInfo::FULL_EMBEDDED_OBJECT) |
       RelocInfo::ModeMask(RelocInfo::COMPRESSED_EMBEDDED_OBJECT) |
+      RelocInfo::ModeMask(RelocInfo::DATA_EMBEDDED_OBJECT) |
       RelocInfo::ModeMask(RelocInfo::EXTERNAL_REFERENCE) |
       RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE) |
       RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE_ENCODED) |
@@ -804,12 +782,12 @@ class WasmArray::BodyDescriptor final : public BodyDescriptorBase {
   template <typename ObjectVisitor>
   static inline void IterateBody(Map map, HeapObject obj, int object_size,
                                  ObjectVisitor* v) {
-    if (!WasmArray::type(map)->element_type().is_reference_type()) return;
+    if (!WasmArray::GcSafeType(map)->element_type().is_reference_type()) return;
     IteratePointers(obj, WasmArray::kHeaderSize, object_size, v);
   }
 
   static inline int SizeOf(Map map, HeapObject object) {
-    return WasmArray::SizeFor(map, WasmArray::cast(object).length());
+    return WasmArray::GcSafeSizeFor(map, WasmArray::cast(object).length());
   }
 };
 
@@ -958,37 +936,47 @@ ReturnType BodyDescriptorApply(InstanceType type, T1 p1, T2 p2, T3 p3, T4 p4) {
       return Op::template apply<WasmStruct::BodyDescriptor>(p1, p2, p3, p4);
     case WASM_TYPE_INFO_TYPE:
       return Op::template apply<WasmTypeInfo::BodyDescriptor>(p1, p2, p3, p4);
-    case JS_OBJECT_TYPE:
-    case JS_ERROR_TYPE:
+    case JS_API_OBJECT_TYPE:
     case JS_ARGUMENTS_OBJECT_TYPE:
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
+    case JS_ARRAY_ITERATOR_TYPE:
+    case JS_ARRAY_TYPE:
     case JS_ASYNC_FROM_SYNC_ITERATOR_TYPE:
-    case JS_PROMISE_TYPE:
-    case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
-    case JS_GENERATOR_OBJECT_TYPE:
     case JS_ASYNC_FUNCTION_OBJECT_TYPE:
     case JS_ASYNC_GENERATOR_OBJECT_TYPE:
-    case JS_PRIMITIVE_WRAPPER_TYPE:
+    case JS_BOUND_FUNCTION_TYPE:
+    case JS_CONTEXT_EXTENSION_OBJECT_TYPE:
     case JS_DATE_TYPE:
-    case JS_ARRAY_TYPE:
-    case JS_ARRAY_ITERATOR_TYPE:
-    case JS_MODULE_NAMESPACE_TYPE:
-    case JS_SET_TYPE:
-    case JS_MAP_TYPE:
-    case JS_SET_KEY_VALUE_ITERATOR_TYPE:
-    case JS_SET_VALUE_ITERATOR_TYPE:
+    case JS_ERROR_TYPE:
+    case JS_FINALIZATION_REGISTRY_TYPE:
+    case JS_GENERATOR_OBJECT_TYPE:
+    case JS_GLOBAL_OBJECT_TYPE:
+    case JS_GLOBAL_PROXY_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
     case JS_MAP_KEY_ITERATOR_TYPE:
     case JS_MAP_KEY_VALUE_ITERATOR_TYPE:
+    case JS_MAP_TYPE:
     case JS_MAP_VALUE_ITERATOR_TYPE:
-    case JS_STRING_ITERATOR_TYPE:
+    case JS_MESSAGE_OBJECT_TYPE:
+    case JS_MODULE_NAMESPACE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
+    case JS_OBJECT_TYPE:
+    case JS_PRIMITIVE_WRAPPER_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
+    case JS_PROMISE_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
     case JS_REG_EXP_STRING_ITERATOR_TYPE:
     case JS_REG_EXP_TYPE:
-    case JS_GLOBAL_PROXY_TYPE:
-    case JS_GLOBAL_OBJECT_TYPE:
-    case JS_API_OBJECT_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_KEY_VALUE_ITERATOR_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
+    case JS_SET_TYPE:
+    case JS_SET_VALUE_ITERATOR_TYPE:
     case JS_SPECIAL_API_OBJECT_TYPE:
-    case JS_MESSAGE_OBJECT_TYPE:
-    case JS_BOUND_FUNCTION_TYPE:
-    case JS_FINALIZATION_REGISTRY_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
+    case JS_STRING_ITERATOR_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
 #ifdef V8_INTL_SUPPORT
     case JS_V8_BREAK_ITERATOR_TYPE:
     case JS_COLLATOR_TYPE:
@@ -1061,23 +1049,12 @@ ReturnType BodyDescriptorApply(InstanceType type, T1 p1, T2 p2, T3 p3, T4 p4) {
                                                                    p4);
     case PREPARSE_DATA_TYPE:
       return Op::template apply<PreparseData::BodyDescriptor>(p1, p2, p3, p4);
-    case UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE:
-      return Op::template apply<
-          UncompiledDataWithoutPreparseData::BodyDescriptor>(p1, p2, p3, p4);
-    case UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE:
-      return Op::template apply<UncompiledDataWithPreparseData::BodyDescriptor>(
-          p1, p2, p3, p4);
     case HEAP_NUMBER_TYPE:
     case FILLER_TYPE:
     case BYTE_ARRAY_TYPE:
     case FREE_SPACE_TYPE:
     case BIGINT_TYPE:
       return ReturnType();
-
-    case SHARED_FUNCTION_INFO_TYPE: {
-      return Op::template apply<SharedFunctionInfo::BodyDescriptor>(p1, p2, p3,
-                                                                    p4);
-    }
     case ALLOCATION_SITE_TYPE:
       return Op::template apply<AllocationSite::BodyDescriptor>(p1, p2, p3, p4);
 
diff --git a/deps/v8/src/objects/objects-definitions.h b/deps/v8/src/objects/objects-definitions.h
index 54fab1107a932e..3606f6c6058494 100644
--- a/deps/v8/src/objects/objects-definitions.h
+++ b/deps/v8/src/objects/objects-definitions.h
@@ -36,8 +36,6 @@ namespace internal {
   V(EXTERNAL_INTERNALIZED_STRING_TYPE)                   \
   V(ONE_BYTE_INTERNALIZED_STRING_TYPE)                   \
   V(EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE)          \
-  V(UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE)          \
-  V(UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE) \
   V(STRING_TYPE)                                         \
   V(CONS_STRING_TYPE)                                    \
   V(EXTERNAL_STRING_TYPE)                                \
@@ -85,13 +83,6 @@ namespace internal {
     external_internalized_string, ExternalInternalizedString)                  \
   V(EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE, ExternalOneByteString::kSize,  \
     external_one_byte_internalized_string, ExternalOneByteInternalizedString)  \
-  V(UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE,                                \
-    ExternalTwoByteString::kUncachedSize,                                      \
-    uncached_external_internalized_string, UncachedExternalInternalizedString) \
-  V(UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE,                       \
-    ExternalOneByteString::kUncachedSize,                                      \
-    uncached_external_one_byte_internalized_string,                            \
-    UncachedExternalOneByteInternalizedString)                                 \
   V(THIN_STRING_TYPE, ThinString::kSize, thin_string, ThinString)              \
   V(THIN_ONE_BYTE_STRING_TYPE, ThinString::kSize, thin_one_byte_string,        \
     ThinOneByteString)
@@ -154,8 +145,7 @@ namespace internal {
     wasm_exported_function_data)                                              \
   V(_, WASM_INDIRECT_FUNCTION_TABLE_TYPE, WasmIndirectFunctionTable,          \
     wasm_indirect_function_table)                                             \
-  V(_, WASM_JS_FUNCTION_DATA_TYPE, WasmJSFunctionData, wasm_js_function_data) \
-  V(_, WASM_VALUE_TYPE, WasmValue, wasm_value)
+  V(_, WASM_JS_FUNCTION_DATA_TYPE, WasmJSFunctionData, wasm_js_function_data)
 
 #define STRUCT_LIST_GENERATOR(V, _) STRUCT_LIST_GENERATOR_BASE(V, _)
 
diff --git a/deps/v8/src/objects/objects-inl.h b/deps/v8/src/objects/objects-inl.h
index 65ac811e4413de..e047999c0083a8 100644
--- a/deps/v8/src/objects/objects-inl.h
+++ b/deps/v8/src/objects/objects-inl.h
@@ -154,8 +154,7 @@ DEF_GETTER(HeapObject, IsUniqueName, bool) {
 }
 
 DEF_GETTER(HeapObject, IsFunction, bool) {
-  STATIC_ASSERT(LAST_FUNCTION_TYPE == LAST_TYPE);
-  return map(isolate).instance_type() >= FIRST_FUNCTION_TYPE;
+  return IsJSFunctionOrBoundFunction();
 }
 
 DEF_GETTER(HeapObject, IsCallable, bool) { return map(isolate).is_callable(); }
@@ -900,7 +899,7 @@ void RegExpMatchInfo::SetCapture(int i, int value) {
 }
 
 WriteBarrierMode HeapObject::GetWriteBarrierMode(
-    const DisallowHeapAllocation& promise) {
+    const DisallowGarbageCollection& promise) {
   return GetWriteBarrierModeForObject(*this, &promise);
 }
 
@@ -1024,7 +1023,7 @@ MaybeHandle<Object> Object::GetPropertyOrElement(Handle<Object> receiver,
 
 // static
 Object Object::GetSimpleHash(Object object) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (object.IsSmi()) {
     uint32_t hash = ComputeUnseededHash(Smi::ToInt(object));
     return Smi::FromInt(hash & Smi::kMaxValue);
@@ -1044,11 +1043,11 @@ Object Object::GetSimpleHash(Object object) {
     return Smi::FromInt(hash & Smi::kMaxValue);
   }
   if (object.IsName()) {
-    uint32_t hash = Name::cast(object).Hash();
+    uint32_t hash = Name::cast(object).EnsureHash();
     return Smi::FromInt(hash);
   }
   if (object.IsOddball()) {
-    uint32_t hash = Oddball::cast(object).to_string().Hash();
+    uint32_t hash = Oddball::cast(object).to_string().EnsureHash();
     return Smi::FromInt(hash);
   }
   if (object.IsBigInt()) {
@@ -1064,7 +1063,7 @@ Object Object::GetSimpleHash(Object object) {
 }
 
 Object Object::GetHash() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object hash = GetSimpleHash(*this);
   if (hash.IsSmi()) return hash;
 
@@ -1129,11 +1128,8 @@ bool ScopeInfo::HasSimpleParameters() const {
 #define FIELD_ACCESSORS(name)                                                 \
   void ScopeInfo::Set##name(int value) { set(k##name, Smi::FromInt(value)); } \
   int ScopeInfo::name() const {                                               \
-    if (length() > 0) {                                                       \
-      return Smi::ToInt(get(k##name));                                        \
-    } else {                                                                  \
-      return 0;                                                               \
-    }                                                                         \
+    DCHECK_GE(length(), kVariablePartIndex);                                  \
+    return Smi::ToInt(get(k##name));                                          \
   }
 FOR_EACH_SCOPE_INFO_NUMERIC_FIELD(FIELD_ACCESSORS)
 #undef FIELD_ACCESSORS
diff --git a/deps/v8/src/objects/objects.cc b/deps/v8/src/objects/objects.cc
index 5c67fa388fb93f..5e17fa85fca29e 100644
--- a/deps/v8/src/objects/objects.cc
+++ b/deps/v8/src/objects/objects.cc
@@ -184,6 +184,20 @@ std::ostream& operator<<(std::ostream& os, InstanceType instance_type) {
   UNREACHABLE();
 }
 
+std::ostream& operator<<(std::ostream& os, PropertyCellType type) {
+  switch (type) {
+    case PropertyCellType::kUndefined:
+      return os << "Undefined";
+    case PropertyCellType::kConstant:
+      return os << "Constant";
+    case PropertyCellType::kConstantType:
+      return os << "ConstantType";
+    case PropertyCellType::kMutable:
+      return os << "Mutable";
+  }
+  UNREACHABLE();
+}
+
 Handle<FieldType> Object::OptimalType(Isolate* isolate,
                                       Representation representation) {
   if (representation.IsNone()) return FieldType::None(isolate);
@@ -869,6 +883,9 @@ MaybeHandle<Object> Object::OrdinaryHasInstance(Isolate* isolate,
   // Check if {callable} is a bound function, and if so retrieve its
   // [[BoundTargetFunction]] and use that instead of {callable}.
   if (callable->IsJSBoundFunction()) {
+    // Since there is a mutual recursion here, we might run out of stack
+    // space for long chains of bound functions.
+    STACK_CHECK(isolate, MaybeHandle<Object>());
     Handle<Object> bound_callable(
         Handle<JSBoundFunction>::cast(callable)->bound_target_function(),
         isolate);
@@ -1295,6 +1312,8 @@ Handle<SharedFunctionInfo> FunctionTemplateInfo::GetOrCreateSharedFunctionInfo(
 }
 
 bool FunctionTemplateInfo::IsTemplateFor(Map map) {
+  RuntimeCallTimerScope timer(GetIsolate(),
+                              RuntimeCallCounterId::kIsTemplateFor);
   // There is a constraint on the object; check.
   if (!map.IsJSObjectMap()) return false;
   // Fetch the constructor function of the object.
@@ -1632,7 +1651,7 @@ Maybe<bool> Object::SetPropertyWithDefinedSetter(
 }
 
 Map Object::GetPrototypeChainRootMap(Isolate* isolate) const {
-  DisallowHeapAllocation no_alloc;
+  DisallowGarbageCollection no_alloc;
   if (IsSmi()) {
     Context native_context = isolate->context().native_context();
     return native_context.number_function().initial_map();
@@ -1643,7 +1662,7 @@ Map Object::GetPrototypeChainRootMap(Isolate* isolate) const {
 }
 
 Smi Object::GetOrCreateHash(Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object hash = Object::GetSimpleHash(*this);
   if (hash.IsSmi()) return Smi::cast(hash);
 
@@ -1688,6 +1707,7 @@ bool Object::SameValueZero(Object other) {
 MaybeHandle<Object> Object::ArraySpeciesConstructor(
     Isolate* isolate, Handle<Object> original_array) {
   Handle<Object> default_species = isolate->array_function();
+  if (!FLAG_builtin_subclassing) return default_species;
   if (original_array->IsJSArray() &&
       Handle<JSArray>::cast(original_array)->HasArrayPrototype(isolate) &&
       Protectors::IsArraySpeciesLookupChainIntact(isolate)) {
@@ -2032,8 +2052,8 @@ void HeapObject::HeapObjectShortPrint(std::ostream& os) {  // NOLINT
 
     case SHARED_FUNCTION_INFO_TYPE: {
       SharedFunctionInfo shared = SharedFunctionInfo::cast(*this);
-      std::unique_ptr<char[]> debug_name = shared.DebugName().ToCString();
-      if (debug_name[0] != 0) {
+      std::unique_ptr<char[]> debug_name = shared.DebugNameCStr();
+      if (debug_name[0] != '\0') {
         os << "<SharedFunctionInfo " << debug_name.get() << ">";
       } else {
         os << "<SharedFunctionInfo>";
@@ -2060,8 +2080,8 @@ void HeapObject::HeapObjectShortPrint(std::ostream& os) {  // NOLINT
     case SCOPE_INFO_TYPE: {
       ScopeInfo scope = ScopeInfo::cast(*this);
       os << "<ScopeInfo";
-      if (scope.length()) os << " " << scope.scope_type() << " ";
-      os << "[" << scope.length() << "]>";
+      if (!scope.IsEmpty()) os << " " << scope.scope_type();
+      os << ">";
       break;
     }
     case CODE_TYPE: {
@@ -2300,7 +2320,7 @@ int HeapObject::SizeFromMap(Map map) const {
         CoverageInfo::unchecked_cast(*this).slot_count());
   }
   if (instance_type == WASM_ARRAY_TYPE) {
-    return WasmArray::SizeFor(map, WasmArray::cast(*this).length());
+    return WasmArray::GcSafeSizeFor(map, WasmArray::cast(*this).length());
   }
   DCHECK_EQ(instance_type, EMBEDDER_DATA_ARRAY_TYPE);
   return EmbedderDataArray::SizeFor(
@@ -2418,7 +2438,7 @@ void HeapObject::RehashBasedOnMap(Isolate* isolate) {
     case INTERNALIZED_STRING_TYPE:
       // Rare case, rehash read-only space strings before they are sealed.
       DCHECK(ReadOnlyHeap::Contains(*this));
-      String::cast(*this).Hash();
+      String::cast(*this).EnsureHash();
       break;
     default:
       UNREACHABLE();
@@ -2885,7 +2905,7 @@ struct FixedArrayAppender {
   }
   static void Insert(Handle<Name> key, Handle<AccessorInfo> entry,
                      int valid_descriptors, Handle<FixedArray> array) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     array->set(valid_descriptors, *entry);
   }
 };
@@ -3903,7 +3923,7 @@ void FixedArray::Shrink(Isolate* isolate, int new_length) {
 }
 
 void FixedArray::CopyTo(int pos, FixedArray dest, int dest_pos, int len) const {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Return early if len == 0 so that we don't try to read the write barrier off
   // a canonical read-only empty fixed array.
   if (len == 0) return;
@@ -4560,7 +4580,7 @@ namespace {
 template <typename sinkchar>
 void WriteFixedArrayToFlat(FixedArray fixed_array, int length, String separator,
                            sinkchar* sink, int sink_length) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   CHECK_GT(length, 0);
   CHECK_LE(length, fixed_array.length());
 #ifdef DEBUG
@@ -4575,8 +4595,7 @@ void WriteFixedArrayToFlat(FixedArray fixed_array, int length, String separator,
   if (use_one_byte_separator_fast_path) {
     CHECK(StringShape(separator).IsSequentialOneByte());
     CHECK_EQ(separator.length(), 1);
-    separator_one_char =
-        SeqOneByteString::cast(separator).GetChars(no_allocation)[0];
+    separator_one_char = SeqOneByteString::cast(separator).GetChars(no_gc)[0];
   }
 
   uint32_t num_separators = 0;
@@ -4643,7 +4662,7 @@ Address JSArray::ArrayJoinConcatToSequentialString(Isolate* isolate,
                                                    intptr_t length,
                                                    Address raw_separator,
                                                    Address raw_dest) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowJavascriptExecution no_js(isolate);
   FixedArray fixed_array = FixedArray::cast(Object(raw_fixed_array));
   String separator = String::cast(Object(raw_separator));
@@ -4654,12 +4673,12 @@ Address JSArray::ArrayJoinConcatToSequentialString(Isolate* isolate,
 
   if (StringShape(dest).IsSequentialOneByte()) {
     WriteFixedArrayToFlat(fixed_array, static_cast<int>(length), separator,
-                          SeqOneByteString::cast(dest).GetChars(no_allocation),
+                          SeqOneByteString::cast(dest).GetChars(no_gc),
                           dest.length());
   } else {
     DCHECK(StringShape(dest).IsSequentialTwoByte());
     WriteFixedArrayToFlat(fixed_array, static_cast<int>(length), separator,
-                          SeqTwoByteString::cast(dest).GetChars(no_allocation),
+                          SeqTwoByteString::cast(dest).GetChars(no_gc),
                           dest.length());
   }
   return dest.ptr();
@@ -4745,7 +4764,7 @@ int Script::GetEvalPosition(Isolate* isolate, Handle<Script> script) {
       Handle<SharedFunctionInfo> shared =
           handle(script->eval_from_shared(), isolate);
       SharedFunctionInfo::EnsureSourcePositionsAvailable(isolate, shared);
-      position = shared->abstract_code().SourcePosition(-position);
+      position = shared->abstract_code(isolate).SourcePosition(-position);
     }
     DCHECK_GE(position, 0);
     script->set_eval_from_position(position);
@@ -4791,7 +4810,7 @@ bool Script::GetPositionInfo(Handle<Script> script, int position,
 bool Script::IsUserJavaScript() const { return type() == Script::TYPE_NORMAL; }
 
 bool Script::ContainsAsmModule() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   SharedFunctionInfo::ScriptIterator iter(this->GetIsolate(), *this);
   for (SharedFunctionInfo info = iter.Next(); !info.is_null();
        info = iter.Next()) {
@@ -4826,7 +4845,7 @@ bool GetPositionInfoSlowImpl(const Vector<Char>& source, int position,
   return false;
 }
 bool GetPositionInfoSlow(const Script script, int position,
-                         const DisallowHeapAllocation& no_gc,
+                         const DisallowGarbageCollection& no_gc,
                          Script::PositionInfo* info) {
   if (!script.source().IsString()) {
     return false;
@@ -4842,7 +4861,7 @@ bool GetPositionInfoSlow(const Script script, int position,
 
 bool Script::GetPositionInfo(int position, PositionInfo* info,
                              OffsetFlag offset_flag) const {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   // For wasm, we use the byte offset as the column.
   if (type() == Script::TYPE_WASM) {
@@ -4859,7 +4878,7 @@ bool Script::GetPositionInfo(int position, PositionInfo* info,
 
   if (line_ends().IsUndefined()) {
     // Slow mode: we do not have line_ends. We have to iterate through source.
-    if (!GetPositionInfoSlow(*this, position, no_allocation, info)) {
+    if (!GetPositionInfoSlow(*this, position, no_gc, info)) {
       return false;
     }
   } else {
@@ -5172,39 +5191,6 @@ bool JSArray::WouldChangeReadOnlyLength(Handle<JSArray> array, uint32_t index) {
   return false;
 }
 
-// Certain compilers request function template instantiation when they
-// see the definition of the other template functions in the
-// class. This requires us to have the template functions put
-// together, so even though this function belongs in objects-debug.cc,
-// we keep it here instead to satisfy certain compilers.
-#ifdef OBJECT_PRINT
-template <typename Derived, typename Shape>
-void Dictionary<Derived, Shape>::Print(std::ostream& os) {
-  DisallowHeapAllocation no_gc;
-  IsolateRoot isolate = GetIsolateForPtrCompr(*this);
-  ReadOnlyRoots roots = this->GetReadOnlyRoots(isolate);
-  Derived dictionary = Derived::cast(*this);
-  for (InternalIndex i : dictionary.IterateEntries()) {
-    Object k = dictionary.KeyAt(isolate, i);
-    if (!dictionary.ToKey(roots, i, &k)) continue;
-    os << "\n   ";
-    if (k.IsString()) {
-      String::cast(k).PrintUC16(os);
-    } else {
-      os << Brief(k);
-    }
-    os << ": " << Brief(dictionary.ValueAt(i)) << " ";
-    dictionary.DetailsAt(i).PrintAsSlowTo(os);
-  }
-}
-template <typename Derived, typename Shape>
-void Dictionary<Derived, Shape>::Print() {
-  StdoutStream os;
-  Print(os);
-  os << std::endl;
-}
-#endif
-
 int FixedArrayBase::GetMaxLengthForNewSpaceAllocation(ElementsKind kind) {
   return ((kMaxRegularHeapObjectSize - FixedArrayBase::kHeaderSize) >>
           ElementsKindToShiftSize(kind));
@@ -5452,7 +5438,7 @@ Handle<Object> JSPromise::TriggerPromiseReactions(Isolate* isolate,
   // We need to reverse the {reactions} here, since we record them
   // on the JSPromise in the reverse order.
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Object current = *reactions;
     Object reversed = Smi::zero();
     while (!current.IsSmi()) {
@@ -5523,7 +5509,7 @@ Handle<Object> JSPromise::TriggerPromiseReactions(Isolate* isolate,
           static_cast<int>(PromiseFulfillReactionJobTask::
                                kContinuationPreservedEmbedderDataOffset));
     } else {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       task->synchronized_set_map(
           ReadOnlyRoots(isolate).promise_reject_reaction_job_task_map());
       Handle<PromiseRejectReactionJobTask>::cast(task)->set_argument(*argument);
@@ -5599,7 +5585,7 @@ Handle<Derived> HashTable<Derived, Shape>::NewInternal(
 
 template <typename Derived, typename Shape>
 void HashTable<Derived, Shape>::Rehash(IsolateRoot isolate, Derived new_table) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = new_table.GetWriteBarrierMode(no_gc);
 
   DCHECK_LT(NumberOfElements(), new_table.Capacity());
@@ -5663,7 +5649,7 @@ void HashTable<Derived, Shape>::Swap(InternalIndex entry1, InternalIndex entry2,
 
 template <typename Derived, typename Shape>
 void HashTable<Derived, Shape>::Rehash(IsolateRoot isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = GetWriteBarrierMode(no_gc);
   ReadOnlyRoots roots = GetReadOnlyRoots(isolate);
   uint32_t capacity = Capacity();
@@ -5984,7 +5970,7 @@ Handle<SimpleNumberDictionary> SimpleNumberDictionary::Set(
 
 void NumberDictionary::UpdateMaxNumberKey(uint32_t key,
                                           Handle<JSObject> dictionary_holder) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   // If the dictionary requires slow elements an element has already
   // been added at a high index.
   if (requires_slow_elements()) return;
@@ -6021,7 +6007,7 @@ Handle<NumberDictionary> NumberDictionary::Set(
 void NumberDictionary::CopyValuesTo(FixedArray elements) {
   ReadOnlyRoots roots = GetReadOnlyRoots();
   int pos = 0;
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WriteBarrierMode mode = elements.GetWriteBarrierMode(no_gc);
   for (InternalIndex i : this->IterateEntries()) {
     Object k;
@@ -6055,7 +6041,7 @@ Handle<FixedArray> BaseNameDictionary<Derived, Shape>::IterationIndices(
   ReadOnlyRoots roots(isolate);
   int array_size = 0;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Derived raw_dictionary = *dictionary;
     for (InternalIndex i : dictionary->IterateEntries()) {
       Object k;
@@ -6107,7 +6093,7 @@ template <typename Derived, typename Shape>
 Object ObjectHashTableBase<Derived, Shape>::Lookup(IsolateRoot isolate,
                                                    Handle<Object> key,
                                                    int32_t hash) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   ReadOnlyRoots roots = this->GetReadOnlyRoots(isolate);
   DCHECK(this->IsKey(roots, *key));
 
@@ -6118,7 +6104,7 @@ Object ObjectHashTableBase<Derived, Shape>::Lookup(IsolateRoot isolate,
 
 template <typename Derived, typename Shape>
 Object ObjectHashTableBase<Derived, Shape>::Lookup(Handle<Object> key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   IsolateRoot isolate = GetIsolateForPtrCompr(*this);
   ReadOnlyRoots roots = this->GetReadOnlyRoots(isolate);
@@ -6344,7 +6330,7 @@ Handle<JSArray> JSWeakCollection::GetEntries(Handle<JSWeakCollection> holder,
   }
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     ReadOnlyRoots roots = ReadOnlyRoots(isolate);
     int count = 0;
     for (int i = 0;
@@ -6364,10 +6350,9 @@ Handle<JSArray> JSWeakCollection::GetEntries(Handle<JSWeakCollection> holder,
 }
 
 void PropertyCell::ClearAndInvalidate(ReadOnlyRoots roots) {
-  // Cell is officially mutable henceforth.
   DCHECK(!value().IsTheHole(roots));
   PropertyDetails details = property_details();
-  details = details.set_cell_type(PropertyCellType::kInvalidated);
+  details = details.set_cell_type(PropertyCellType::kConstant);
   set_value(roots.the_hole_value());
   set_property_details(details);
   dependent_code().DeoptimizeDependentCodeGroup(
@@ -6396,11 +6381,6 @@ Handle<PropertyCell> PropertyCell::InvalidateAndReplaceEntry(
   return new_cell;
 }
 
-PropertyCellConstantType PropertyCell::GetConstantType() {
-  if (value().IsSmi()) return PropertyCellConstantType::kSmi;
-  return PropertyCellConstantType::kStableMap;
-}
-
 static bool RemainsConstantType(Handle<PropertyCell> cell,
                                 Handle<Object> value) {
   // TODO(dcarney): double->smi and smi->double transition from kConstant
@@ -6415,10 +6395,10 @@ static bool RemainsConstantType(Handle<PropertyCell> cell,
 }
 
 // static
-PropertyCellType PropertyCell::TypeForUninitializedCell(Isolate* isolate,
-                                                        Handle<Object> value) {
-  if (value->IsUndefined(isolate)) return PropertyCellType::kUndefined;
-  return PropertyCellType::kConstant;
+PropertyCellType PropertyCell::InitialType(Isolate* isolate,
+                                           Handle<Object> value) {
+  return value->IsUndefined(isolate) ? PropertyCellType::kUndefined
+                                     : PropertyCellType::kConstant;
 }
 
 // static
@@ -6426,20 +6406,9 @@ PropertyCellType PropertyCell::UpdatedType(Isolate* isolate,
                                            Handle<PropertyCell> cell,
                                            Handle<Object> value,
                                            PropertyDetails details) {
-  PropertyCellType type = details.cell_type();
   DCHECK(!value->IsTheHole(isolate));
-  if (cell->value().IsTheHole(isolate)) {
-    switch (type) {
-      // Only allow a cell to transition once into constant state.
-      case PropertyCellType::kUninitialized:
-        return TypeForUninitializedCell(isolate, value);
-      case PropertyCellType::kInvalidated:
-        return PropertyCellType::kMutable;
-      default:
-        UNREACHABLE();
-    }
-  }
-  switch (type) {
+  DCHECK(!cell->value().IsTheHole(isolate));
+  switch (details.cell_type()) {
     case PropertyCellType::kUndefined:
       return PropertyCellType::kConstant;
     case PropertyCellType::kConstant:
@@ -6461,20 +6430,12 @@ Handle<PropertyCell> PropertyCell::PrepareForValue(
     Handle<Object> value, PropertyDetails details) {
   DCHECK(!value->IsTheHole(isolate));
   Handle<PropertyCell> cell(dictionary->CellAt(entry), isolate);
+  CHECK(!cell->value().IsTheHole(isolate));
   const PropertyDetails original_details = cell->property_details();
   // Data accesses could be cached in ics or optimized code.
   bool invalidate =
       original_details.kind() == kData && details.kind() == kAccessor;
-  int index;
-  PropertyCellType old_type = original_details.cell_type();
-  // Preserve the enumeration index unless the property was deleted or never
-  // initialized.
-  if (cell->value().IsTheHole(isolate)) {
-    index = GlobalDictionary::NextEnumerationIndex(isolate, dictionary);
-    dictionary->set_next_enumeration_index(index + 1);
-  } else {
-    index = original_details.dictionary_index();
-  }
+  int index = original_details.dictionary_index();
   DCHECK_LT(0, index);
   details = details.set_index(index);
 
@@ -6496,9 +6457,14 @@ Handle<PropertyCell> PropertyCell::PrepareForValue(
     cell->set_value(*value);
   }
 
-  // Deopt when transitioning from a constant type.
-  if (!invalidate && (old_type != new_type ||
-                      original_details.IsReadOnly() != details.IsReadOnly())) {
+  // Deopt when transitioning from a constant type or when making a writable
+  // property read-only. Making a read-only property writable again is not
+  // interesting because Turbofan does not currently rely on read-only unless
+  // the property is also configurable, in which case it will stay read-only
+  // forever.
+  if (!invalidate &&
+      (original_details.cell_type() != new_type ||
+       (!original_details.IsReadOnly() && details.IsReadOnly()))) {
     cell->dependent_code().DeoptimizeDependentCodeGroup(
         DependentCode::kPropertyCellChangedGroup);
   }
@@ -6520,7 +6486,9 @@ void PropertyCell::SetValueWithInvalidation(Isolate* isolate,
 int JSGeneratorObject::source_position() const {
   CHECK(is_suspended());
   DCHECK(function().shared().HasBytecodeArray());
-  DCHECK(function().shared().GetBytecodeArray().HasSourcePositionTable());
+  Isolate* isolate = GetIsolate();
+  DCHECK(
+      function().shared().GetBytecodeArray(isolate).HasSourcePositionTable());
 
   int code_offset = Smi::ToInt(input_or_debug_pos());
 
@@ -6528,14 +6496,14 @@ int JSGeneratorObject::source_position() const {
   // is used in the source position table, hence the subtraction.
   code_offset -= BytecodeArray::kHeaderSize - kHeapObjectTag;
   AbstractCode code =
-      AbstractCode::cast(function().shared().GetBytecodeArray());
+      AbstractCode::cast(function().shared().GetBytecodeArray(isolate));
   return code.SourcePosition(code_offset);
 }
 
 // static
 AccessCheckInfo AccessCheckInfo::Get(Isolate* isolate,
                                      Handle<JSObject> receiver) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(receiver->map().is_access_check_needed());
   Object maybe_constructor = receiver->map().GetConstructor();
   if (maybe_constructor.IsFunctionTemplateInfo()) {
@@ -6571,7 +6539,7 @@ MaybeHandle<Name> FunctionTemplateInfo::TryGetCachedPropertyName(
 }
 
 Address Smi::LexicographicCompare(Isolate* isolate, Smi x, Smi y) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowJavascriptExecution no_js(isolate);
 
   int x_value = Smi::ToInt(x);
@@ -6732,7 +6700,7 @@ EXTERN_DEFINE_BASE_NAME_DICTIONARY(GlobalDictionary, GlobalDictionaryShape)
 void JSFinalizationRegistry::RemoveCellFromUnregisterTokenMap(
     Isolate* isolate, Address raw_finalization_registry,
     Address raw_weak_cell) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   JSFinalizationRegistry finalization_registry =
       JSFinalizationRegistry::cast(Object(raw_finalization_registry));
   WeakCell weak_cell = WeakCell::cast(Object(raw_weak_cell));
diff --git a/deps/v8/src/objects/objects.h b/deps/v8/src/objects/objects.h
index 81117c24db8d88..a6b6cd2d2445f5 100644
--- a/deps/v8/src/objects/objects.h
+++ b/deps/v8/src/objects/objects.h
@@ -182,7 +182,6 @@
 //         - SourceTextModule
 //         - SyntheticModule
 //       - SourceTextModuleInfoEntry
-//       - WasmValue
 //     - FeedbackCell
 //     - FeedbackVector
 //     - PreparseData
diff --git a/deps/v8/src/objects/ordered-hash-table-inl.h b/deps/v8/src/objects/ordered-hash-table-inl.h
index 959d7a78010eeb..3aef224e57ef51 100644
--- a/deps/v8/src/objects/ordered-hash-table-inl.h
+++ b/deps/v8/src/objects/ordered-hash-table-inl.h
@@ -20,6 +20,8 @@
 namespace v8 {
 namespace internal {
 
+#include "torque-generated/src/objects/ordered-hash-table-tq-inl.inc"
+
 CAST_ACCESSOR(OrderedNameDictionary)
 CAST_ACCESSOR(SmallOrderedNameDictionary)
 CAST_ACCESSOR(OrderedHashMap)
@@ -117,6 +119,17 @@ Name OrderedNameDictionary::NameAt(InternalIndex entry) {
   return Name::cast(KeyAt(entry));
 }
 
+// Parameter |roots| only here for compatibility with HashTable<...>::ToKey.
+template <class Derived, int entrysize>
+bool OrderedHashTable<Derived, entrysize>::ToKey(ReadOnlyRoots roots,
+                                                 InternalIndex entry,
+                                                 Object* out_key) {
+  Object k = KeyAt(entry);
+  if (!IsKey(roots, k)) return false;
+  *out_key = k;
+  return true;
+}
+
 // Set the value for entry.
 inline void OrderedNameDictionary::ValueAtPut(InternalIndex entry,
                                               Object value) {
@@ -221,11 +234,11 @@ inline int SmallOrderedNameDictionary::Hash() {
 
 inline void OrderedNameDictionary::SetHash(int hash) {
   DCHECK(PropertyArray::HashField::is_valid(hash));
-  this->set(PrefixIndex(), Smi::FromInt(hash));
+  this->set(HashIndex(), Smi::FromInt(hash));
 }
 
 inline int OrderedNameDictionary::Hash() {
-  Object hash_obj = this->get(PrefixIndex());
+  Object hash_obj = this->get(HashIndex());
   int hash = Smi::ToInt(hash_obj);
   DCHECK(PropertyArray::HashField::is_valid(hash));
   return hash;
diff --git a/deps/v8/src/objects/ordered-hash-table.cc b/deps/v8/src/objects/ordered-hash-table.cc
index 15673daa62f396..d9bc94b9af0756 100644
--- a/deps/v8/src/objects/ordered-hash-table.cc
+++ b/deps/v8/src/objects/ordered-hash-table.cc
@@ -16,8 +16,9 @@ namespace v8 {
 namespace internal {
 
 template <class Derived, int entrysize>
+template <typename LocalIsolate>
 MaybeHandle<Derived> OrderedHashTable<Derived, entrysize>::Allocate(
-    Isolate* isolate, int capacity, AllocationType allocation) {
+    LocalIsolate* isolate, int capacity, AllocationType allocation) {
   // Capacity must be a power of two, since we depend on being able
   // to divide and multiple by 2 (kLoadFactor) to derive capacity
   // from number of buckets. If we decide to change kLoadFactor
@@ -62,8 +63,9 @@ MaybeHandle<Derived> OrderedHashTable<Derived, entrysize>::AllocateEmpty(
 }
 
 template <class Derived, int entrysize>
+template <typename LocalIsolate>
 MaybeHandle<Derived> OrderedHashTable<Derived, entrysize>::EnsureGrowable(
-    Isolate* isolate, Handle<Derived> table) {
+    LocalIsolate* isolate, Handle<Derived> table) {
   DCHECK(!table->IsObsolete());
 
   int nof = table->NumberOfElements();
@@ -124,7 +126,7 @@ bool OrderedHashTable<Derived, entrysize>::HasKey(Isolate* isolate,
                                                   Derived table, Object key) {
   DCHECK_IMPLIES(entrysize == 1, table.IsOrderedHashSet());
   DCHECK_IMPLIES(entrysize == 2, table.IsOrderedHashMap());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   InternalIndex entry = table.FindEntry(isolate, key);
   return entry.is_found();
 }
@@ -236,15 +238,17 @@ HeapObject OrderedHashMap::GetEmpty(ReadOnlyRoots ro_roots) {
 }
 
 template <class Derived, int entrysize>
+template <typename LocalIsolate>
 MaybeHandle<Derived> OrderedHashTable<Derived, entrysize>::Rehash(
-    Isolate* isolate, Handle<Derived> table) {
+    LocalIsolate* isolate, Handle<Derived> table) {
   return OrderedHashTable<Derived, entrysize>::Rehash(isolate, table,
                                                       table->Capacity());
 }
 
 template <class Derived, int entrysize>
+template <typename LocalIsolate>
 MaybeHandle<Derived> OrderedHashTable<Derived, entrysize>::Rehash(
-    Isolate* isolate, Handle<Derived> table, int new_capacity) {
+    LocalIsolate* isolate, Handle<Derived> table, int new_capacity) {
   DCHECK(!table->IsObsolete());
 
   MaybeHandle<Derived> new_table_candidate =
@@ -259,7 +263,7 @@ MaybeHandle<Derived> OrderedHashTable<Derived, entrysize>::Rehash(
   int new_entry = 0;
   int removed_holes_index = 0;
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   for (InternalIndex old_entry : table->IterateEntries()) {
     int old_entry_raw = old_entry.as_int();
@@ -316,8 +320,10 @@ MaybeHandle<OrderedHashMap> OrderedHashMap::Rehash(Isolate* isolate,
   return Base::Rehash(isolate, table, new_capacity);
 }
 
+template <typename LocalIsolate>
 MaybeHandle<OrderedNameDictionary> OrderedNameDictionary::Rehash(
-    Isolate* isolate, Handle<OrderedNameDictionary> table, int new_capacity) {
+    LocalIsolate* isolate, Handle<OrderedNameDictionary> table,
+    int new_capacity) {
   MaybeHandle<OrderedNameDictionary> new_table_candidate =
       Base::Rehash(isolate, table, new_capacity);
   Handle<OrderedNameDictionary> new_table;
@@ -330,7 +336,7 @@ MaybeHandle<OrderedNameDictionary> OrderedNameDictionary::Rehash(
 template <class Derived, int entrysize>
 bool OrderedHashTable<Derived, entrysize>::Delete(Isolate* isolate,
                                                   Derived table, Object key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   InternalIndex entry = table.FindEntry(isolate, key);
   if (entry.is_not_found()) return false;
 
@@ -349,19 +355,8 @@ bool OrderedHashTable<Derived, entrysize>::Delete(Isolate* isolate,
   return true;
 }
 
-// Parameter |roots| only here for compatibility with HashTable<...>::ToKey.
-template <class Derived, int entrysize>
-bool OrderedHashTable<Derived, entrysize>::ToKey(ReadOnlyRoots roots,
-                                                 InternalIndex entry,
-                                                 Object* out_key) {
-  Object k = KeyAt(entry);
-  if (!IsKey(roots, k)) return false;
-  *out_key = k;
-  return true;
-}
-
 Address OrderedHashMap::GetHash(Isolate* isolate, Address raw_key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object key(raw_key);
   Object hash = key.GetHash();
   // If the object does not have an identity hash, it was never used as a key
@@ -380,7 +375,7 @@ MaybeHandle<OrderedHashMap> OrderedHashMap::Add(Isolate* isolate,
     int raw_entry = table->HashToEntryRaw(hash);
     // Walk the chain of the bucket and try finding the key.
     {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       Object raw_key = *key;
       while (raw_entry != kNotFound) {
         Object candidate_key = table->KeyAt(InternalIndex(raw_entry));
@@ -412,8 +407,10 @@ MaybeHandle<OrderedHashMap> OrderedHashMap::Add(Isolate* isolate,
   return table;
 }
 
-InternalIndex OrderedNameDictionary::FindEntry(Isolate* isolate, Object key) {
-  DisallowHeapAllocation no_gc;
+template <typename LocalIsolate>
+InternalIndex OrderedNameDictionary::FindEntry(LocalIsolate* isolate,
+                                               Object key) {
+  DisallowGarbageCollection no_gc;
 
   DCHECK(key.IsUniqueName());
   Name raw_key = Name::cast(key);
@@ -424,7 +421,7 @@ InternalIndex OrderedNameDictionary::FindEntry(Isolate* isolate, Object key) {
     return InternalIndex::NotFound();
   }
 
-  int raw_entry = HashToEntryRaw(raw_key.Hash());
+  int raw_entry = HashToEntryRaw(raw_key.hash());
   while (raw_entry != kNotFound) {
     InternalIndex entry(raw_entry);
     Object candidate_key = KeyAt(entry);
@@ -473,9 +470,11 @@ int OrderedNameDictionary::NumberOfEnumerableProperties() {
   return result;
 }
 
+template <typename LocalIsolate>
 MaybeHandle<OrderedNameDictionary> OrderedNameDictionary::Add(
-    Isolate* isolate, Handle<OrderedNameDictionary> table, Handle<Name> key,
-    Handle<Object> value, PropertyDetails details) {
+    LocalIsolate* isolate, Handle<OrderedNameDictionary> table,
+    Handle<Name> key, Handle<Object> value, PropertyDetails details) {
+  DCHECK(key->IsUniqueName());
   DCHECK(table->FindEntry(isolate, *key).is_not_found());
 
   MaybeHandle<OrderedNameDictionary> table_candidate =
@@ -484,7 +483,7 @@ MaybeHandle<OrderedNameDictionary> OrderedNameDictionary::Add(
     return table_candidate;
   }
   // Read the existing bucket values.
-  int hash = key->Hash();
+  int hash = key->hash();
   int bucket = table->HashToBucket(hash);
   int previous_entry = table->HashToEntryRaw(hash);
   int nof = table->NumberOfElements();
@@ -508,9 +507,9 @@ MaybeHandle<OrderedNameDictionary> OrderedNameDictionary::Add(
 
 void OrderedNameDictionary::SetEntry(InternalIndex entry, Object key,
                                      Object value, PropertyDetails details) {
-  DisallowHeapAllocation gc;
+  DisallowGarbageCollection gc;
   DCHECK_IMPLIES(!key.IsName(), key.IsTheHole());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int index = EntryToIndex(entry);
   this->set(index, key);
   this->set(index + kValueOffset, value);
@@ -538,18 +537,21 @@ Handle<OrderedNameDictionary> OrderedNameDictionary::DeleteEntry(
   return Shrink(isolate, table);
 }
 
+template <typename LocalIsolate>
 MaybeHandle<OrderedHashSet> OrderedHashSet::Allocate(
-    Isolate* isolate, int capacity, AllocationType allocation) {
+    LocalIsolate* isolate, int capacity, AllocationType allocation) {
   return Base::Allocate(isolate, capacity, allocation);
 }
 
+template <typename LocalIsolate>
 MaybeHandle<OrderedHashMap> OrderedHashMap::Allocate(
-    Isolate* isolate, int capacity, AllocationType allocation) {
+    LocalIsolate* isolate, int capacity, AllocationType allocation) {
   return Base::Allocate(isolate, capacity, allocation);
 }
 
+template <typename LocalIsolate>
 MaybeHandle<OrderedNameDictionary> OrderedNameDictionary::Allocate(
-    Isolate* isolate, int capacity, AllocationType allocation) {
+    LocalIsolate* isolate, int capacity, AllocationType allocation) {
   MaybeHandle<OrderedNameDictionary> table_candidate =
       Base::Allocate(isolate, capacity, allocation);
   Handle<OrderedNameDictionary> table;
@@ -596,6 +598,9 @@ template V8_EXPORT_PRIVATE Handle<OrderedHashSet>
 OrderedHashTable<OrderedHashSet, 1>::Clear(Isolate* isolate,
                                            Handle<OrderedHashSet> table);
 
+template V8_EXPORT_PRIVATE MaybeHandle<OrderedHashSet> OrderedHashSet::Allocate(
+    Isolate* isolate, int capacity, AllocationType allocation);
+
 template V8_EXPORT_PRIVATE bool OrderedHashTable<OrderedHashSet, 1>::HasKey(
     Isolate* isolate, OrderedHashSet table, Object key);
 
@@ -617,6 +622,9 @@ template V8_EXPORT_PRIVATE Handle<OrderedHashMap>
 OrderedHashTable<OrderedHashMap, 2>::Clear(Isolate* isolate,
                                            Handle<OrderedHashMap> table);
 
+template V8_EXPORT_PRIVATE MaybeHandle<OrderedHashMap> OrderedHashMap::Allocate(
+    Isolate* isolate, int capacity, AllocationType allocation);
+
 template V8_EXPORT_PRIVATE bool OrderedHashTable<OrderedHashMap, 2>::HasKey(
     Isolate* isolate, OrderedHashMap table, Object key);
 
@@ -634,6 +642,37 @@ template MaybeHandle<OrderedNameDictionary>
 OrderedHashTable<OrderedNameDictionary, 3>::EnsureGrowable(
     Isolate* isolate, Handle<OrderedNameDictionary> table);
 
+template V8_EXPORT_PRIVATE MaybeHandle<OrderedNameDictionary>
+OrderedNameDictionary::Allocate(Isolate* isolate, int capacity,
+                                AllocationType allocation);
+
+template V8_EXPORT_PRIVATE MaybeHandle<OrderedNameDictionary>
+OrderedNameDictionary::Allocate(LocalIsolate* isolate, int capacity,
+                                AllocationType allocation);
+
+template V8_EXPORT_PRIVATE MaybeHandle<OrderedNameDictionary>
+OrderedNameDictionary::Rehash(Isolate* isolate,
+                              Handle<OrderedNameDictionary> table,
+                              int new_capacity);
+
+template V8_EXPORT_PRIVATE InternalIndex
+OrderedNameDictionary::FindEntry(Isolate* isolate, Object key);
+
+template V8_EXPORT_PRIVATE InternalIndex
+OrderedNameDictionary::FindEntry(LocalIsolate* isolate, Object key);
+
+template V8_EXPORT_PRIVATE MaybeHandle<OrderedNameDictionary>
+OrderedNameDictionary::Add(Isolate* isolate,
+                           Handle<OrderedNameDictionary> table,
+                           Handle<Name> key, Handle<Object> value,
+                           PropertyDetails details);
+
+template V8_EXPORT_PRIVATE MaybeHandle<OrderedNameDictionary>
+OrderedNameDictionary::Add(LocalIsolate* isolate,
+                           Handle<OrderedNameDictionary> table,
+                           Handle<Name> key, Handle<Object> value,
+                           PropertyDetails details);
+
 template <>
 Handle<SmallOrderedHashSet>
 SmallOrderedHashTable<SmallOrderedHashSet>::Allocate(
@@ -659,7 +698,7 @@ SmallOrderedHashTable<SmallOrderedNameDictionary>::Allocate(
 template <class Derived>
 void SmallOrderedHashTable<Derived>::Initialize(Isolate* isolate,
                                                 int capacity) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int num_buckets = capacity / kLoadFactor;
   int num_chains = capacity;
 
@@ -792,11 +831,11 @@ template <>
 InternalIndex V8_EXPORT_PRIVATE
 SmallOrderedHashTable<SmallOrderedNameDictionary>::FindEntry(Isolate* isolate,
                                                              Object key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(key.IsUniqueName());
   Name raw_key = Name::cast(key);
 
-  int raw_entry = HashToFirstEntry(raw_key.Hash());
+  int raw_entry = HashToFirstEntry(raw_key.hash());
 
   // Walk the chain in the bucket to find the key.
   while (raw_entry != kNotFound) {
@@ -812,6 +851,7 @@ SmallOrderedHashTable<SmallOrderedNameDictionary>::FindEntry(Isolate* isolate,
 MaybeHandle<SmallOrderedNameDictionary> SmallOrderedNameDictionary::Add(
     Isolate* isolate, Handle<SmallOrderedNameDictionary> table,
     Handle<Name> key, Handle<Object> value, PropertyDetails details) {
+  DCHECK(key->IsUniqueName());
   DCHECK(table->FindEntry(isolate, *key).is_not_found());
 
   if (table->UsedCapacity() >= table->Capacity()) {
@@ -825,7 +865,7 @@ MaybeHandle<SmallOrderedNameDictionary> SmallOrderedNameDictionary::Add(
   int nof = table->NumberOfElements();
 
   // Read the existing bucket values.
-  int hash = key->Hash();
+  int hash = key->hash();
   int bucket = table->HashToBucket(hash);
   int previous_entry = table->HashToFirstEntry(hash);
 
@@ -867,14 +907,14 @@ void SmallOrderedNameDictionary::SetEntry(InternalIndex entry, Object key,
 template <class Derived>
 bool SmallOrderedHashTable<Derived>::HasKey(Isolate* isolate,
                                             Handle<Object> key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return FindEntry(isolate, *key).is_found();
 }
 
 template <class Derived>
 bool SmallOrderedHashTable<Derived>::Delete(Isolate* isolate, Derived table,
                                             Object key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   InternalIndex entry = table.FindEntry(isolate, key);
   if (entry.is_not_found()) return false;
 
@@ -897,7 +937,7 @@ Handle<SmallOrderedNameDictionary> SmallOrderedNameDictionary::DeleteEntry(
     InternalIndex entry) {
   DCHECK(entry.is_found());
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Object hole = ReadOnlyRoots(isolate).the_hole_value();
     PropertyDetails details = PropertyDetails::Empty();
     table->SetEntry(entry, hole, hole, details);
@@ -923,7 +963,7 @@ Handle<Derived> SmallOrderedHashTable<Derived>::Rehash(Isolate* isolate,
   int new_entry = 0;
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     for (InternalIndex old_entry : table->IterateEntries()) {
       Object key = table->KeyAt(old_entry);
       if (key.IsTheHole(isolate)) continue;
@@ -1009,7 +1049,7 @@ MaybeHandle<Derived> SmallOrderedHashTable<Derived>::Grow(
 template <class Derived>
 InternalIndex SmallOrderedHashTable<Derived>::FindEntry(Isolate* isolate,
                                                         Object key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object hash = key.GetHash();
 
   if (hash.IsUndefined(isolate)) return InternalIndex::NotFound();
@@ -1293,7 +1333,7 @@ void OrderedNameDictionaryHandler::SetEntry(HeapObject table,
                                             InternalIndex entry, Object key,
                                             Object value,
                                             PropertyDetails details) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (table.IsSmallOrderedNameDictionary()) {
     return SmallOrderedNameDictionary::cast(table).SetEntry(entry, key, value,
                                                             details);
@@ -1307,7 +1347,7 @@ void OrderedNameDictionaryHandler::SetEntry(HeapObject table,
 InternalIndex OrderedNameDictionaryHandler::FindEntry(Isolate* isolate,
                                                       HeapObject table,
                                                       Name key) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (table.IsSmallOrderedNameDictionary()) {
     return SmallOrderedNameDictionary::cast(table).FindEntry(isolate, key);
   }
@@ -1417,7 +1457,7 @@ Handle<HeapObject> OrderedNameDictionaryHandler::Shrink(
 
 Handle<HeapObject> OrderedNameDictionaryHandler::DeleteEntry(
     Isolate* isolate, Handle<HeapObject> table, InternalIndex entry) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (table->IsSmallOrderedNameDictionary()) {
     Handle<SmallOrderedNameDictionary> small_dict =
         Handle<SmallOrderedNameDictionary>::cast(table);
@@ -1432,7 +1472,7 @@ Handle<HeapObject> OrderedNameDictionaryHandler::DeleteEntry(
 
 template <class Derived, class TableType>
 void OrderedHashTableIterator<Derived, TableType>::Transition() {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   TableType table = TableType::cast(this->table());
   if (!table.IsObsolete()) return;
 
@@ -1465,7 +1505,7 @@ void OrderedHashTableIterator<Derived, TableType>::Transition() {
 
 template <class Derived, class TableType>
 bool OrderedHashTableIterator<Derived, TableType>::HasMore() {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   ReadOnlyRoots ro_roots = GetReadOnlyRoots();
 
   Transition();
diff --git a/deps/v8/src/objects/ordered-hash-table.h b/deps/v8/src/objects/ordered-hash-table.h
index 0172986d1f8638..ca1d29d2fd6864 100644
--- a/deps/v8/src/objects/ordered-hash-table.h
+++ b/deps/v8/src/objects/ordered-hash-table.h
@@ -67,7 +67,8 @@ class OrderedHashTable : public FixedArray {
  public:
   // Returns an OrderedHashTable (possibly |table|) with enough space
   // to add at least one new element.
-  static MaybeHandle<Derived> EnsureGrowable(Isolate* isolate,
+  template <typename LocalIsolate>
+  static MaybeHandle<Derived> EnsureGrowable(LocalIsolate* isolate,
                                              Handle<Derived> table);
 
   // Returns an OrderedHashTable (possibly |table|) that's shrunken
@@ -107,6 +108,8 @@ class OrderedHashTable : public FixedArray {
     return NumberOfElements() + NumberOfDeletedElements();
   }
 
+  int Capacity() { return NumberOfBuckets() * kLoadFactor; }
+
   int NumberOfBuckets() const {
     return Smi::ToInt(get(NumberOfBucketsIndex()));
   }
@@ -123,7 +126,7 @@ class OrderedHashTable : public FixedArray {
 
   // Similar to KeyAt, but indicates whether the given entry is valid
   // (not deleted one)
-  bool ToKey(ReadOnlyRoots roots, InternalIndex entry, Object* out_key);
+  inline bool ToKey(ReadOnlyRoots roots, InternalIndex entry, Object* out_key);
 
   bool IsObsolete() { return !get(NextTableIndex()).IsSmi(); }
 
@@ -199,17 +202,21 @@ class OrderedHashTable : public FixedArray {
 
  protected:
   // Returns an OrderedHashTable with a capacity of at least |capacity|.
+  template <typename LocalIsolate>
   static MaybeHandle<Derived> Allocate(
-      Isolate* isolate, int capacity,
+      LocalIsolate* isolate, int capacity,
       AllocationType allocation = AllocationType::kYoung);
 
   static MaybeHandle<Derived> AllocateEmpty(Isolate* isolate,
                                             AllocationType allocation,
                                             RootIndex root_ndex);
 
-  static MaybeHandle<Derived> Rehash(Isolate* isolate, Handle<Derived> table);
-  static MaybeHandle<Derived> Rehash(Isolate* isolate, Handle<Derived> table,
-                                     int new_capacity);
+  template <typename LocalIsolate>
+  static MaybeHandle<Derived> Rehash(LocalIsolate* isolate,
+                                     Handle<Derived> table);
+  template <typename LocalIsolate>
+  static MaybeHandle<Derived> Rehash(LocalIsolate* isolate,
+                                     Handle<Derived> table, int new_capacity);
 
   int HashToEntryRaw(int hash) {
     int bucket = HashToBucket(hash);
@@ -250,8 +257,6 @@ class OrderedHashTable : public FixedArray {
     set(NumberOfDeletedElementsIndex(), Smi::FromInt(num));
   }
 
-  // Returns the number elements that can fit into the allocated buffer.
-  int Capacity() { return NumberOfBuckets() * kLoadFactor; }
 
   void SetNextTable(Derived next_table) { set(NextTableIndex(), next_table); }
 
@@ -271,6 +276,7 @@ class V8_EXPORT_PRIVATE OrderedHashSet
 
  public:
   DECL_CAST(OrderedHashSet)
+  DECL_PRINTER(OrderedHashSet)
 
   static MaybeHandle<OrderedHashSet> Add(Isolate* isolate,
                                          Handle<OrderedHashSet> table,
@@ -283,8 +289,9 @@ class V8_EXPORT_PRIVATE OrderedHashSet
                                             int new_capacity);
   static MaybeHandle<OrderedHashSet> Rehash(Isolate* isolate,
                                             Handle<OrderedHashSet> table);
+  template <typename LocalIsolate>
   static MaybeHandle<OrderedHashSet> Allocate(
-      Isolate* isolate, int capacity,
+      LocalIsolate* isolate, int capacity,
       AllocationType allocation = AllocationType::kYoung);
 
   static MaybeHandle<OrderedHashSet> AllocateEmpty(
@@ -304,6 +311,7 @@ class V8_EXPORT_PRIVATE OrderedHashMap
 
  public:
   DECL_CAST(OrderedHashMap)
+  DECL_PRINTER(OrderedHashMap)
 
   // Returns a value if the OrderedHashMap contains the key, otherwise
   // returns undefined.
@@ -312,8 +320,9 @@ class V8_EXPORT_PRIVATE OrderedHashMap
                                          Handle<Object> key,
                                          Handle<Object> value);
 
+  template <typename LocalIsolate>
   static MaybeHandle<OrderedHashMap> Allocate(
-      Isolate* isolate, int capacity,
+      LocalIsolate* isolate, int capacity,
       AllocationType allocation = AllocationType::kYoung);
 
   static MaybeHandle<OrderedHashMap> AllocateEmpty(
@@ -752,15 +761,28 @@ class V8_EXPORT_PRIVATE OrderedNameDictionary
 
  public:
   DECL_CAST(OrderedNameDictionary)
+  DECL_PRINTER(OrderedNameDictionary)
 
+  template <typename LocalIsolate>
   static MaybeHandle<OrderedNameDictionary> Add(
-      Isolate* isolate, Handle<OrderedNameDictionary> table, Handle<Name> key,
-      Handle<Object> value, PropertyDetails details);
+      LocalIsolate* isolate, Handle<OrderedNameDictionary> table,
+      Handle<Name> key, Handle<Object> value, PropertyDetails details);
 
   void SetEntry(InternalIndex entry, Object key, Object value,
                 PropertyDetails details);
 
-  InternalIndex FindEntry(Isolate* isolate, Object key);
+  template <typename LocalIsolate>
+  InternalIndex FindEntry(LocalIsolate* isolate, Object key);
+
+  // This is to make the interfaces of NameDictionary::FindEntry and
+  // OrderedNameDictionary::FindEntry compatible.
+  // TODO(emrich) clean this up: NameDictionary uses Handle<Object>
+  // for FindEntry keys due to its Key typedef, but that's also used
+  // for adding, where we do need handles.
+  template <typename LocalIsolate>
+  InternalIndex FindEntry(LocalIsolate* isolate, Handle<Object> key) {
+    return FindEntry(isolate, *key);
+  }
 
   int NumberOfEnumerableProperties();
 
@@ -770,15 +792,18 @@ class V8_EXPORT_PRIVATE OrderedNameDictionary
       Isolate* isolate, Handle<OrderedNameDictionary> table,
       InternalIndex entry);
 
+  template <typename LocalIsolate>
   static MaybeHandle<OrderedNameDictionary> Allocate(
-      Isolate* isolate, int capacity,
+      LocalIsolate* isolate, int capacity,
       AllocationType allocation = AllocationType::kYoung);
 
   static MaybeHandle<OrderedNameDictionary> AllocateEmpty(
       Isolate* isolate, AllocationType allocation = AllocationType::kReadOnly);
 
+  template <typename LocalIsolate>
   static MaybeHandle<OrderedNameDictionary> Rehash(
-      Isolate* isolate, Handle<OrderedNameDictionary> table, int new_capacity);
+      LocalIsolate* isolate, Handle<OrderedNameDictionary> table,
+      int new_capacity);
 
   // Returns the value for entry.
   inline Object ValueAt(InternalIndex entry);
@@ -806,6 +831,8 @@ class V8_EXPORT_PRIVATE OrderedNameDictionary
   static const int kPropertyDetailsOffset = 2;
   static const int kPrefixSize = 1;
 
+  static constexpr int HashIndex() { return PrefixIndex(); }
+
   static const bool kIsOrderedDictionaryType = true;
 
   OBJECT_CONSTRUCTORS(OrderedNameDictionary,
diff --git a/deps/v8/src/objects/ordered-hash-table.tq b/deps/v8/src/objects/ordered-hash-table.tq
index 311f08aee7667b..b7fb6b9bc2ca5d 100644
--- a/deps/v8/src/objects/ordered-hash-table.tq
+++ b/deps/v8/src/objects/ordered-hash-table.tq
@@ -99,10 +99,13 @@ struct NameDictionaryEntry {
 
 extern class SmallOrderedNameDictionary extends SmallOrderedHashTable {
   hash: int32;
+  @if(TAGGED_SIZE_8_BYTES) padding_0: int32;
+  @ifnot(TAGGED_SIZE_8_BYTES) padding_0: void;
   number_of_elements: uint8;
   number_of_deleted_elements: uint8;
   const number_of_buckets: uint8;
-  padding: uint8;
+  @if(TAGGED_SIZE_8_BYTES) padding_1[5]: uint8;
+  @ifnot(TAGGED_SIZE_8_BYTES) padding_1[1]: uint8;
   data_table[Convert<intptr>(number_of_buckets) * kSmallOrderedHashTableLoadFactor]:
       NameDictionaryEntry;
   hash_table[number_of_buckets]: uint8;
diff --git a/deps/v8/src/objects/osr-optimized-code-cache.cc b/deps/v8/src/objects/osr-optimized-code-cache.cc
index 8390ab2d2bc0a7..67d907a85cc347 100644
--- a/deps/v8/src/objects/osr-optimized-code-cache.cc
+++ b/deps/v8/src/objects/osr-optimized-code-cache.cc
@@ -82,7 +82,7 @@ void OSROptimizedCodeCache::Compact(Handle<NativeContext> native_context) {
           CapacityForLength(curr_valid_index), AllocationType::kOld));
   DCHECK_LT(new_osr_cache->length(), osr_cache->length());
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     new_osr_cache->CopyElements(native_context->GetIsolate(), 0, *osr_cache, 0,
                                 new_osr_cache->length(),
                                 new_osr_cache->GetWriteBarrierMode(no_gc));
@@ -93,7 +93,7 @@ void OSROptimizedCodeCache::Compact(Handle<NativeContext> native_context) {
 Code OSROptimizedCodeCache::GetOptimizedCode(Handle<SharedFunctionInfo> shared,
                                              BailoutId osr_offset,
                                              Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int index = FindEntry(shared, osr_offset);
   if (index == -1) return Code();
   Code code = GetCodeFromEntry(index);
@@ -107,8 +107,8 @@ Code OSROptimizedCodeCache::GetOptimizedCode(Handle<SharedFunctionInfo> shared,
 
 void OSROptimizedCodeCache::EvictMarkedCode(Isolate* isolate) {
   // This is called from DeoptimizeMarkedCodeForContext that uses raw pointers
-  // and hence the DisallowHeapAllocation scope here.
-  DisallowHeapAllocation no_gc;
+  // and hence the DisallowGarbageCollection scope here.
+  DisallowGarbageCollection no_gc;
   for (int index = 0; index < length(); index += kEntryLength) {
     MaybeObject code_entry = Get(index + kCachedCodeOffset);
     HeapObject heap_object;
@@ -167,7 +167,7 @@ BailoutId OSROptimizedCodeCache::GetBailoutIdFromEntry(int index) {
 
 int OSROptimizedCodeCache::FindEntry(Handle<SharedFunctionInfo> shared,
                                      BailoutId osr_offset) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(!osr_offset.IsNone());
   for (int index = 0; index < length(); index += kEntryLength) {
     if (GetSFIFromEntry(index) != *shared) continue;
diff --git a/deps/v8/src/objects/property-array-inl.h b/deps/v8/src/objects/property-array-inl.h
index d4a4bc94fa665e..e2e905fbb36355 100644
--- a/deps/v8/src/objects/property-array-inl.h
+++ b/deps/v8/src/objects/property-array-inl.h
@@ -80,7 +80,7 @@ void PropertyArray::CopyElements(Isolate* isolate, int dst_index,
                                  PropertyArray src, int src_index, int len,
                                  WriteBarrierMode mode) {
   if (len == 0) return;
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   ObjectSlot dst_slot(data_start() + dst_index);
   ObjectSlot src_slot(src.data_start() + src_index);
diff --git a/deps/v8/src/objects/property-cell-inl.h b/deps/v8/src/objects/property-cell-inl.h
index 581708951dca73..7f14109cbac1c4 100644
--- a/deps/v8/src/objects/property-cell-inl.h
+++ b/deps/v8/src/objects/property-cell-inl.h
@@ -19,6 +19,7 @@ namespace internal {
 OBJECT_CONSTRUCTORS_IMPL(PropertyCell, HeapObject)
 
 CAST_ACCESSOR(PropertyCell)
+
 ACCESSORS(PropertyCell, dependent_code, DependentCode, kDependentCodeOffset)
 ACCESSORS(PropertyCell, name, Name, kNameOffset)
 ACCESSORS(PropertyCell, value, Object, kValueOffset)
diff --git a/deps/v8/src/objects/property-cell.h b/deps/v8/src/objects/property-cell.h
index 64751558a51970..d86d92ca4d5c49 100644
--- a/deps/v8/src/objects/property-cell.h
+++ b/deps/v8/src/objects/property-cell.h
@@ -17,24 +17,22 @@ namespace internal {
 class PropertyCell : public HeapObject {
  public:
   // [name]: the name of the global property.
-  DECL_ACCESSORS(name, Name)
+  DECL_GETTER(name, Name)
+
   // [property_details]: details of the global property.
   DECL_ACCESSORS(property_details_raw, Smi)
+
   // [value]: value of the global property.
   DECL_ACCESSORS(value, Object)
-  // [dependent_code]: dependent code that depends on the type of the global
-  // property.
+
+  // [dependent_code]: code that depends on the type of the global property.
   DECL_ACCESSORS(dependent_code, DependentCode)
 
   inline PropertyDetails property_details() const;
   inline void set_property_details(PropertyDetails details);
 
-  PropertyCellConstantType GetConstantType();
+  static PropertyCellType InitialType(Isolate* isolate, Handle<Object> value);
 
-  // Computes the new type of a previously uninitialized cell for the given
-  // value.
-  static PropertyCellType TypeForUninitializedCell(Isolate* isolate,
-                                                   Handle<Object> value);
   // Computes the new type of the cell's contents for the given value, but
   // without actually modifying the details.
   static PropertyCellType UpdatedType(Isolate* isolate,
@@ -59,8 +57,6 @@ class PropertyCell : public HeapObject {
                                        Handle<Object> new_value);
 
   DECL_CAST(PropertyCell)
-
-  // Dispatched behavior.
   DECL_PRINTER(PropertyCell)
   DECL_VERIFIER(PropertyCell)
 
@@ -70,6 +66,11 @@ class PropertyCell : public HeapObject {
   using BodyDescriptor = FixedBodyDescriptor<kNameOffset, kSize, kSize>;
 
   OBJECT_CONSTRUCTORS(PropertyCell, HeapObject);
+
+ private:
+  friend class Factory;
+
+  DECL_SETTER(name, Name)
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/objects/property-details.h b/deps/v8/src/objects/property-details.h
index a23a1e3a0ece90..af6f0cdaeb5bd7 100644
--- a/deps/v8/src/objects/property-details.h
+++ b/deps/v8/src/objects/property-details.h
@@ -7,7 +7,6 @@
 
 #include "include/v8.h"
 #include "src/utils/allocation.h"
-// TODO(bmeurer): Remove once FLAG_modify_field_representation_inplace is gone.
 #include "src/base/bit-field.h"
 #include "src/flags/flags.h"
 
@@ -104,24 +103,41 @@ class Representation {
     return Equals(other);
   }
 
+  // Returns true if a change from this representation to a more general one
+  // might cause a map deprecation.
+  bool MightCauseMapDeprecation() const {
+    // HeapObject to tagged representation change can be done in-place.
+    if (IsTagged() || IsHeapObject()) return false;
+    // When double fields unboxing is enabled, there must be a map deprecation.
+    // Boxed double to tagged transition is always done in-place.
+    if (IsDouble()) return FLAG_unbox_double_fields;
+    // None to double and smi to double representation changes require
+    // deprecation, because doubles might require box allocation, see
+    // CanBeInPlaceChangedTo().
+    DCHECK(IsNone() || IsSmi());
+    return true;
+  }
+
   bool CanBeInPlaceChangedTo(const Representation& other) const {
+    if (Equals(other)) return true;
     // If it's just a representation generalization case (i.e. property kind and
     // attributes stays unchanged) it's fine to transition from None to anything
     // but double without any modification to the object, because the default
     // uninitialized value for representation None can be overwritten by both
     // smi and tagged values. Doubles, however, would require a box allocation.
     if (IsNone()) return !other.IsDouble();
-    if (!FLAG_modify_field_representation_inplace) return false;
-    return (IsSmi() || (!FLAG_unbox_double_fields && IsDouble()) ||
-            IsHeapObject()) &&
-           other.IsTagged();
+    if (!other.IsTagged()) return false;
+    // Everything but unboxed doubles can be in-place changed to Tagged.
+    if (FLAG_unbox_double_fields && IsDouble()) return false;
+    DCHECK(IsSmi() || (!FLAG_unbox_double_fields && IsDouble()) ||
+           IsHeapObject());
+    return true;
   }
 
   // Return the most generic representation that this representation can be
-  // changed to in-place. If in-place representation changes are disabled, then
-  // this will return the current representation.
+  // changed to in-place. If an in-place representation change is not allowed,
+  // then this will return the current representation.
   Representation MostGenericInPlaceChange() const {
-    if (!FLAG_modify_field_representation_inplace) return *this;
     // Everything but unboxed doubles can be in-place changed to Tagged.
     if (FLAG_unbox_double_fields && IsDouble()) return Representation::Double();
     return Representation::Tagged();
@@ -191,26 +207,18 @@ static const int kMaxNumberOfDescriptors = (1 << kDescriptorIndexBitCount) - 4;
 static const int kInvalidEnumCacheSentinel =
     (1 << kDescriptorIndexBitCount) - 1;
 
+// A PropertyCell's property details contains a cell type that is meaningful if
+// the cell is still valid (does not hold the hole).
 enum class PropertyCellType {
-  // Meaningful when a property cell does not contain the hole.
   kUndefined,     // The PREMONOMORPHIC of property cells.
   kConstant,      // Cell has been assigned only once.
   kConstantType,  // Cell has been assigned only one type.
   kMutable,       // Cell will no longer be tracked as constant.
-
-  // Meaningful when a property cell contains the hole.
-  kUninitialized = kUndefined,  // Cell has never been initialized.
-  kInvalidated = kConstant,     // Cell has been deleted, invalidated or never
-                                // existed.
-
-  // For dictionaries not holding cells.
+  // Arbitrary choice for dictionaries not holding cells.
   kNoCell = kMutable,
 };
 
-enum class PropertyCellConstantType {
-  kSmi,
-  kStableMap,
-};
+std::ostream& operator<<(std::ostream& os, PropertyCellType type);
 
 // PropertyDetails captures type and attributes for a property.
 // They are used both in property dictionaries and instance descriptors.
@@ -365,7 +373,7 @@ class PropertyDetails {
     kForTransitions = kPrintAttributes,
     kPrintFull = -1,
   };
-  void PrintAsSlowTo(std::ostream& out);
+  void PrintAsSlowTo(std::ostream& out, bool print_dict_index);
   void PrintAsFastTo(std::ostream& out, PrintMode mode = kPrintFull);
 
  private:
diff --git a/deps/v8/src/objects/property.cc b/deps/v8/src/objects/property.cc
index a4336e295bcf58..b0bb79c6016c37 100644
--- a/deps/v8/src/objects/property.cc
+++ b/deps/v8/src/objects/property.cc
@@ -98,11 +98,13 @@ Descriptor Descriptor::AccessorConstant(Handle<Name> key,
 }
 
 // Outputs PropertyDetails as a dictionary details.
-void PropertyDetails::PrintAsSlowTo(std::ostream& os) {
+void PropertyDetails::PrintAsSlowTo(std::ostream& os, bool print_dict_index) {
   os << "(";
   if (constness() == PropertyConstness::kConst) os << "const ";
   os << (kind() == kData ? "data" : "accessor");
-  os << ", dict_index: " << dictionary_index();
+  if (print_dict_index) {
+    os << ", dict_index: " << dictionary_index();
+  }
   os << ", attrs: " << attributes() << ")";
 }
 
@@ -135,7 +137,7 @@ void PropertyDetails::PrintAsFastTo(std::ostream& os, PrintMode mode) {
 void PropertyDetails::Print(bool dictionary_mode) {
   StdoutStream os;
   if (dictionary_mode) {
-    PrintAsSlowTo(os);
+    PrintAsSlowTo(os, true);
   } else {
     PrintAsFastTo(os, PrintMode::kPrintFull);
   }
diff --git a/deps/v8/src/objects/scope-info.cc b/deps/v8/src/objects/scope-info.cc
index 6f9f944b68cea4..bd6fd3cb0be65c 100644
--- a/deps/v8/src/objects/scope-info.cc
+++ b/deps/v8/src/objects/scope-info.cc
@@ -172,7 +172,7 @@ Handle<ScopeInfo> ScopeInfo::Create(LocalIsolate* isolate, Zone* zone,
       isolate->factory()->NewScopeInfo(length);
   int index = kVariablePartIndex;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     ScopeInfo scope_info = *scope_info_handle;
     WriteBarrierMode mode = scope_info.GetWriteBarrierMode(no_gc);
 
@@ -588,26 +588,27 @@ ScopeInfo ScopeInfo::Empty(Isolate* isolate) {
   return ReadOnlyRoots(isolate).empty_scope_info();
 }
 
+bool ScopeInfo::IsEmpty() const { return IsEmptyBit::decode(Flags()); }
+
 ScopeType ScopeInfo::scope_type() const {
-  DCHECK_LT(0, length());
+  DCHECK(!IsEmpty());
   return ScopeTypeBits::decode(Flags());
 }
 
 bool ScopeInfo::is_script_scope() const {
-  return length() > 0 && scope_type() == SCRIPT_SCOPE;
+  return !IsEmpty() && scope_type() == SCRIPT_SCOPE;
 }
 
 bool ScopeInfo::SloppyEvalCanExtendVars() const {
   bool sloppy_eval_can_extend_vars =
-      length() > 0 && SloppyEvalCanExtendVarsBit::decode(Flags());
+      SloppyEvalCanExtendVarsBit::decode(Flags());
   DCHECK_IMPLIES(sloppy_eval_can_extend_vars, is_sloppy(language_mode()));
   DCHECK_IMPLIES(sloppy_eval_can_extend_vars, is_declaration_scope());
   return sloppy_eval_can_extend_vars;
 }
 
 LanguageMode ScopeInfo::language_mode() const {
-  return length() > 0 ? LanguageModeBit::decode(Flags())
-                      : LanguageMode::kSloppy;
+  return LanguageModeBit::decode(Flags());
 }
 
 bool ScopeInfo::is_declaration_scope() const {
@@ -615,7 +616,7 @@ bool ScopeInfo::is_declaration_scope() const {
 }
 
 int ScopeInfo::ContextLength() const {
-  if (length() > 0) {
+  if (!IsEmpty()) {
     int context_locals = ContextLocalCount();
     bool function_name_context_slot = FunctionVariableBits::decode(Flags()) ==
                                       VariableAllocationInfo::CONTEXT;
@@ -647,12 +648,10 @@ int ScopeInfo::ContextHeaderLength() const {
 }
 
 bool ScopeInfo::HasReceiver() const {
-  if (length() == 0) return false;
   return VariableAllocationInfo::NONE != ReceiverVariableBits::decode(Flags());
 }
 
 bool ScopeInfo::HasAllocatedReceiver() const {
-  if (length() == 0) return false;
   VariableAllocationInfo allocation = ReceiverVariableBits::decode(Flags());
   return allocation == VariableAllocationInfo::STACK ||
          allocation == VariableAllocationInfo::CONTEXT;
@@ -671,17 +670,15 @@ bool ScopeInfo::HasNewTarget() const {
 }
 
 bool ScopeInfo::HasFunctionName() const {
-  if (length() == 0) return false;
   return VariableAllocationInfo::NONE != FunctionVariableBits::decode(Flags());
 }
 
 bool ScopeInfo::HasInferredFunctionName() const {
-  if (length() == 0) return false;
   return HasInferredFunctionNameBit::decode(Flags());
 }
 
 bool ScopeInfo::HasPositionInfo() const {
-  if (length() == 0) return false;
+  if (IsEmpty()) return false;
   return NeedsPositionInfo(scope_type());
 }
 
@@ -707,36 +704,28 @@ void ScopeInfo::SetInferredFunctionName(String name) {
 }
 
 bool ScopeInfo::HasOuterScopeInfo() const {
-  if (length() == 0) return false;
   return HasOuterScopeInfoBit::decode(Flags());
 }
 
 bool ScopeInfo::IsDebugEvaluateScope() const {
-  if (length() == 0) return false;
   return IsDebugEvaluateScopeBit::decode(Flags());
 }
 
 void ScopeInfo::SetIsDebugEvaluateScope() {
-  if (length() > 0) {
-    DCHECK_EQ(scope_type(), WITH_SCOPE);
-    SetFlags(Flags() | IsDebugEvaluateScopeBit::encode(true));
-  } else {
-    UNREACHABLE();
-  }
+  CHECK(!IsEmpty());
+  DCHECK_EQ(scope_type(), WITH_SCOPE);
+  SetFlags(Flags() | IsDebugEvaluateScopeBit::encode(true));
 }
 
 bool ScopeInfo::PrivateNameLookupSkipsOuterClass() const {
-  if (length() == 0) return false;
   return PrivateNameLookupSkipsOuterClassBit::decode(Flags());
 }
 
 bool ScopeInfo::IsReplModeScope() const {
-  if (length() == 0) return false;
   return IsReplModeScopeBit::decode(Flags());
 }
 
 bool ScopeInfo::HasLocalsBlockList() const {
-  if (length() == 0) return false;
   return HasLocalsBlockListBit::decode(Flags());
 }
 
@@ -864,7 +853,7 @@ bool ScopeInfo::VariableIsSynthetic(String name) {
 int ScopeInfo::ModuleIndex(String name, VariableMode* mode,
                            InitializationFlag* init_flag,
                            MaybeAssignedFlag* maybe_assigned_flag) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(name.IsInternalizedString());
   DCHECK_EQ(scope_type(), MODULE_SCOPE);
   DCHECK_NOT_NULL(mode);
@@ -892,13 +881,13 @@ int ScopeInfo::ContextSlotIndex(ScopeInfo scope_info, String name,
                                 InitializationFlag* init_flag,
                                 MaybeAssignedFlag* maybe_assigned_flag,
                                 IsStaticFlag* is_static_flag) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK(name.IsInternalizedString());
   DCHECK_NOT_NULL(mode);
   DCHECK_NOT_NULL(init_flag);
   DCHECK_NOT_NULL(maybe_assigned_flag);
 
-  if (scope_info.length() == 0) return -1;
+  if (scope_info.IsEmpty()) return -1;
 
   int start = scope_info.ContextLocalNamesIndex();
   int end = start + scope_info.ContextLocalCount();
@@ -919,7 +908,7 @@ int ScopeInfo::ContextSlotIndex(ScopeInfo scope_info, String name,
 }
 
 int ScopeInfo::SavedClassVariableContextLocalIndex() const {
-  if (length() > 0 && HasSavedClassVariableIndexBit::decode(Flags())) {
+  if (HasSavedClassVariableIndexBit::decode(Flags())) {
     int index = Smi::ToInt(get(SavedClassVariableInfoIndex()));
     return index - Context::MIN_CONTEXT_SLOTS;
   }
@@ -927,8 +916,8 @@ int ScopeInfo::SavedClassVariableContextLocalIndex() const {
 }
 
 int ScopeInfo::ReceiverContextSlotIndex() const {
-  if (length() > 0 && ReceiverVariableBits::decode(Flags()) ==
-                          VariableAllocationInfo::CONTEXT) {
+  if (ReceiverVariableBits::decode(Flags()) ==
+      VariableAllocationInfo::CONTEXT) {
     return Smi::ToInt(get(ReceiverInfoIndex()));
   }
   return -1;
@@ -936,12 +925,10 @@ int ScopeInfo::ReceiverContextSlotIndex() const {
 
 int ScopeInfo::FunctionContextSlotIndex(String name) const {
   DCHECK(name.IsInternalizedString());
-  if (length() > 0) {
-    if (FunctionVariableBits::decode(Flags()) ==
-            VariableAllocationInfo::CONTEXT &&
-        FunctionName() == name) {
-      return Smi::ToInt(get(FunctionNameInfoIndex() + 1));
-    }
+  if (FunctionVariableBits::decode(Flags()) ==
+          VariableAllocationInfo::CONTEXT &&
+      FunctionName() == name) {
+    return Smi::ToInt(get(FunctionNameInfoIndex() + 1));
   }
   return -1;
 }
@@ -951,7 +938,7 @@ FunctionKind ScopeInfo::function_kind() const {
 }
 
 int ScopeInfo::ContextLocalNamesIndex() const {
-  DCHECK_LT(0, length());
+  DCHECK_LE(kVariablePartIndex, length());
   return kVariablePartIndex;
 }
 
@@ -1046,20 +1033,22 @@ std::ostream& operator<<(std::ostream& os, VariableAllocationInfo var_info) {
 template <typename LocalIsolate>
 Handle<ModuleRequest> ModuleRequest::New(LocalIsolate* isolate,
                                          Handle<String> specifier,
-                                         Handle<FixedArray> import_assertions) {
+                                         Handle<FixedArray> import_assertions,
+                                         int position) {
   Handle<ModuleRequest> result = Handle<ModuleRequest>::cast(
       isolate->factory()->NewStruct(MODULE_REQUEST_TYPE, AllocationType::kOld));
   result->set_specifier(*specifier);
   result->set_import_assertions(*import_assertions);
+  result->set_position(position);
   return result;
 }
 
 template Handle<ModuleRequest> ModuleRequest::New(
     Isolate* isolate, Handle<String> specifier,
-    Handle<FixedArray> import_assertions);
+    Handle<FixedArray> import_assertions, int position);
 template Handle<ModuleRequest> ModuleRequest::New(
     LocalIsolate* isolate, Handle<String> specifier,
-    Handle<FixedArray> import_assertions);
+    Handle<FixedArray> import_assertions, int position);
 
 template <typename LocalIsolate>
 Handle<SourceTextModuleInfoEntry> SourceTextModuleInfoEntry::New(
@@ -1097,14 +1086,9 @@ Handle<SourceTextModuleInfo> SourceTextModuleInfo::New(
   // Serialize module requests.
   int size = static_cast<int>(descr->module_requests().size());
   Handle<FixedArray> module_requests = isolate->factory()->NewFixedArray(size);
-  Handle<FixedArray> module_request_positions =
-      isolate->factory()->NewFixedArray(size);
   for (const auto& elem : descr->module_requests()) {
-    Handle<ModuleRequest> serialized_module_request =
-        elem.first->Serialize(isolate);
-    module_requests->set(elem.second.index, *serialized_module_request);
-    module_request_positions->set(elem.second.index,
-                                  Smi::FromInt(elem.second.position));
+    Handle<ModuleRequest> serialized_module_request = elem->Serialize(isolate);
+    module_requests->set(elem->index(), *serialized_module_request);
   }
 
   // Serialize special exports.
@@ -1154,7 +1138,6 @@ Handle<SourceTextModuleInfo> SourceTextModuleInfo::New(
   result->set(kRegularExportsIndex, *regular_exports);
   result->set(kNamespaceImportsIndex, *namespace_imports);
   result->set(kRegularImportsIndex, *regular_imports);
-  result->set(kModuleRequestPositionsIndex, *module_request_positions);
   return result;
 }
 template Handle<SourceTextModuleInfo> SourceTextModuleInfo::New(
diff --git a/deps/v8/src/objects/scope-info.h b/deps/v8/src/objects/scope-info.h
index 23c3949895845a..719f1d9204018a 100644
--- a/deps/v8/src/objects/scope-info.h
+++ b/deps/v8/src/objects/scope-info.h
@@ -270,6 +270,8 @@ class ScopeInfo : public FixedArray {
   STATIC_ASSERT(LanguageModeSize == 1 << LanguageModeBit::kSize);
   STATIC_ASSERT(kLastFunctionKind <= FunctionKindBits::kMax);
 
+  bool IsEmpty() const;
+
  private:
   // The layout of the variable part of a ScopeInfo is as follows:
   // 1. ContextLocalNames:
@@ -343,6 +345,10 @@ class ScopeInfo : public FixedArray {
   static const int kFunctionNameEntries = 2;
   static const int kPositionInfoEntries = 2;
 
+  // Hide an inherited member function to ensure that callers have been updated
+  // to use IsEmpty instead.
+  using FixedArray::length;
+
   // Properties of variables.
   using VariableModeField = base::BitField<VariableMode, 0, 4>;
   using InitFlagField = VariableModeField::Next<InitializationFlag, 1>;
diff --git a/deps/v8/src/objects/scope-info.tq b/deps/v8/src/objects/scope-info.tq
index c791f6df3730a8..3bd717171bd1fb 100644
--- a/deps/v8/src/objects/scope-info.tq
+++ b/deps/v8/src/objects/scope-info.tq
@@ -21,7 +21,7 @@ type VariableAllocationInfo extends uint32
 constexpr 'VariableAllocationInfo';
 
 // Properties of scopes.
-bitfield struct ScopeFlags extends uint32 {
+bitfield struct ScopeFlags extends uint31 {
   scope_type: ScopeType: 4 bit;
   sloppy_eval_can_extend_vars: bool: 1 bit;
   language_mode: LanguageMode: 1 bit;
@@ -44,4 +44,5 @@ bitfield struct ScopeFlags extends uint32 {
   has_context_extension_slot: bool: 1 bit;
   is_repl_mode_scope: bool: 1 bit;
   has_locals_block_list: bool: 1 bit;
+  is_empty: bool: 1 bit;
 }
diff --git a/deps/v8/src/objects/shared-function-info-inl.h b/deps/v8/src/objects/shared-function-info-inl.h
index caf14e8bc32f4b..22b75c724cfc7d 100644
--- a/deps/v8/src/objects/shared-function-info-inl.h
+++ b/deps/v8/src/objects/shared-function-info-inl.h
@@ -6,6 +6,7 @@
 #define V8_OBJECTS_SHARED_FUNCTION_INFO_INL_H_
 
 #include "src/base/macros.h"
+#include "src/base/platform/mutex.h"
 #include "src/handles/handles-inl.h"
 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/heap/local-heap-inl.h"
@@ -60,7 +61,7 @@ void PreparseData::copy_in(int index, const byte* buffer, int length) {
   DCHECK(index >= 0 && length >= 0 && length <= kMaxInt - index &&
          index + length <= this->data_length());
   Address dst_addr = field_address(kDataStartOffset + index * kByteSize);
-  memcpy(reinterpret_cast<void*>(dst_addr), buffer, length);
+  base::Memcpy(reinterpret_cast<void*>(dst_addr), buffer, length);
 }
 
 PreparseData PreparseData::get_child(int index) const {
@@ -94,9 +95,8 @@ ACCESSORS(InterpreterData, bytecode_array, BytecodeArray, kBytecodeArrayOffset)
 ACCESSORS(InterpreterData, interpreter_trampoline, Code,
           kInterpreterTrampolineOffset)
 
-OBJECT_CONSTRUCTORS_IMPL(SharedFunctionInfo, HeapObject)
+TQ_OBJECT_CONSTRUCTORS_IMPL(SharedFunctionInfo)
 NEVER_READ_ONLY_SPACE_IMPL(SharedFunctionInfo)
-CAST_ACCESSOR(SharedFunctionInfo)
 DEFINE_DEOPT_ELEMENT_ACCESSORS(SharedFunctionInfo, Object)
 
 RELEASE_ACQUIRE_ACCESSORS(SharedFunctionInfo, function_data, Object,
@@ -106,19 +106,15 @@ RELEASE_ACQUIRE_ACCESSORS(SharedFunctionInfo, name_or_scope_info, Object,
 RELEASE_ACQUIRE_ACCESSORS(SharedFunctionInfo, script_or_debug_info, HeapObject,
                           kScriptOrDebugInfoOffset)
 
-INT32_ACCESSORS(SharedFunctionInfo, function_literal_id,
-                kFunctionLiteralIdOffset)
-
-#if V8_SFI_HAS_UNIQUE_ID
-INT_ACCESSORS(SharedFunctionInfo, unique_id, kUniqueIdOffset)
-#endif
-UINT16_ACCESSORS(SharedFunctionInfo, length, kLengthOffset)
-UINT16_ACCESSORS(SharedFunctionInfo, internal_formal_parameter_count,
-                 kFormalParameterCountOffset)
-UINT8_ACCESSORS(SharedFunctionInfo, expected_nof_properties,
-                kExpectedNofPropertiesOffset)
-UINT16_ACCESSORS(SharedFunctionInfo, raw_function_token_offset,
-                 kFunctionTokenOffsetOffset)
+RENAME_TORQUE_ACCESSORS(SharedFunctionInfo,
+                        raw_outer_scope_info_or_feedback_metadata,
+                        outer_scope_info_or_feedback_metadata, HeapObject)
+RENAME_UINT16_TORQUE_ACCESSORS(SharedFunctionInfo,
+                               internal_formal_parameter_count,
+                               formal_parameter_count)
+RENAME_UINT16_TORQUE_ACCESSORS(SharedFunctionInfo, raw_function_token_offset,
+                               function_token_offset)
+
 RELAXED_INT32_ACCESSORS(SharedFunctionInfo, flags, kFlagsOffset)
 UINT8_ACCESSORS(SharedFunctionInfo, flags2, kFlags2Offset)
 
@@ -164,9 +160,10 @@ bool SharedFunctionInfo::needs_script_context() const {
   return is_script() && scope_info().ContextLocalCount() > 0;
 }
 
-AbstractCode SharedFunctionInfo::abstract_code() {
+template <typename LocalIsolate>
+AbstractCode SharedFunctionInfo::abstract_code(LocalIsolate* isolate) {
   if (HasBytecodeArray()) {
-    return AbstractCode::cast(GetBytecodeArray());
+    return AbstractCode::cast(GetBytecodeArray(isolate));
   } else {
     return AbstractCode::cast(GetCode());
   }
@@ -181,6 +178,48 @@ int SharedFunctionInfo::function_token_position() const {
   }
 }
 
+template <typename LocalIsolate>
+bool SharedFunctionInfo::AreSourcePositionsAvailable(
+    LocalIsolate* isolate) const {
+  if (FLAG_enable_lazy_source_positions) {
+    return !HasBytecodeArray() ||
+           GetBytecodeArray(isolate).HasSourcePositionTable();
+  }
+  return true;
+}
+
+template <typename LocalIsolate>
+SharedFunctionInfo::Inlineability SharedFunctionInfo::GetInlineability(
+    LocalIsolate* isolate) const {
+  if (!script().IsScript()) return kHasNoScript;
+
+  if (GetIsolate()->is_precise_binary_code_coverage() &&
+      !has_reported_binary_coverage()) {
+    // We may miss invocations if this function is inlined.
+    return kNeedsBinaryCoverage;
+  }
+
+  if (optimization_disabled()) return kHasOptimizationDisabled;
+
+  // Built-in functions are handled by the JSCallReducer.
+  if (HasBuiltinId()) return kIsBuiltin;
+
+  if (!IsUserJavaScript()) return kIsNotUserCode;
+
+  // If there is no bytecode array, it is either not compiled or it is compiled
+  // with WebAssembly for the asm.js pipeline. In either case we don't want to
+  // inline.
+  if (!HasBytecodeArray()) return kHasNoBytecode;
+
+  if (GetBytecodeArray(isolate).length() > FLAG_max_inlined_bytecode_size) {
+    return kExceedsBytecodeLimit;
+  }
+
+  if (HasBreakInfo()) return kMayContainBreakPoints;
+
+  return kIsInlineable;
+}
+
 BIT_FIELD_ACCESSORS(SharedFunctionInfo, flags2, class_scope_has_private_brand,
                     SharedFunctionInfo::ClassScopeHasPrivateBrandBit)
 
@@ -362,9 +401,6 @@ void SharedFunctionInfo::set_raw_scope_info(ScopeInfo scope_info,
   CONDITIONAL_WRITE_BARRIER(*this, kNameOrScopeInfoOffset, scope_info, mode);
 }
 
-ACCESSORS(SharedFunctionInfo, raw_outer_scope_info_or_feedback_metadata,
-          HeapObject, kOuterScopeInfoOrFeedbackMetadataOffset)
-
 HeapObject SharedFunctionInfo::outer_scope_info() const {
   DCHECK(!is_compiled());
   DCHECK(!HasFeedbackMetadata());
@@ -380,7 +416,7 @@ bool SharedFunctionInfo::HasOuterScopeInfo() const {
     if (!scope_info().HasOuterScopeInfo()) return false;
     outer_info = scope_info().OuterScopeInfo();
   }
-  return outer_info.length() > 0;
+  return !outer_info.IsEmpty();
 }
 
 ScopeInfo SharedFunctionInfo::GetOuterScopeInfo() const {
@@ -428,7 +464,7 @@ IsCompiledScope SharedFunctionInfo::is_compiled_scope(
 IsCompiledScope::IsCompiledScope(const SharedFunctionInfo shared,
                                  Isolate* isolate)
     : retain_bytecode_(shared.HasBytecodeArray()
-                           ? handle(shared.GetBytecodeArray(), isolate)
+                           ? handle(shared.GetBytecodeArray(isolate), isolate)
                            : MaybeHandle<BytecodeArray>()),
       is_compiled_(shared.is_compiled()) {
   DCHECK_IMPLIES(!retain_bytecode_.is_null(), is_compiled());
@@ -436,10 +472,10 @@ IsCompiledScope::IsCompiledScope(const SharedFunctionInfo shared,
 
 IsCompiledScope::IsCompiledScope(const SharedFunctionInfo shared,
                                  LocalIsolate* isolate)
-    : retain_bytecode_(
-          shared.HasBytecodeArray()
-              ? isolate->heap()->NewPersistentHandle(shared.GetBytecodeArray())
-              : MaybeHandle<BytecodeArray>()),
+    : retain_bytecode_(shared.HasBytecodeArray()
+                           ? isolate->heap()->NewPersistentHandle(
+                                 shared.GetBytecodeArray(isolate))
+                           : MaybeHandle<BytecodeArray>()),
       is_compiled_(shared.is_compiled()) {
   DCHECK_IMPLIES(!retain_bytecode_.is_null(), is_compiled());
 }
@@ -462,7 +498,12 @@ bool SharedFunctionInfo::HasBytecodeArray() const {
   return data.IsBytecodeArray() || data.IsInterpreterData();
 }
 
-BytecodeArray SharedFunctionInfo::GetBytecodeArray() const {
+template <typename LocalIsolate>
+BytecodeArray SharedFunctionInfo::GetBytecodeArray(
+    LocalIsolate* isolate) const {
+  SharedMutexGuardIfOffThread<LocalIsolate, base::kShared> mutex_guard(
+      GetIsolate()->shared_function_info_access(), isolate);
+
   DCHECK(HasBytecodeArray());
   if (HasDebugInfo() && GetDebugInfo().HasInstrumentedBytecodeArray()) {
     return GetDebugInfo().OriginalBytecodeArray();
@@ -477,9 +518,7 @@ BytecodeArray SharedFunctionInfo::GetBytecodeArray() const {
   }
 }
 
-BytecodeArray SharedFunctionInfo::GetDebugBytecodeArray() const {
-  DCHECK(HasDebugInfo() && GetDebugInfo().HasInstrumentedBytecodeArray());
-
+BytecodeArray SharedFunctionInfo::GetActiveBytecodeArray() const {
   Object data = function_data(kAcquireLoad);
   if (data.IsBytecodeArray()) {
     return BytecodeArray::cast(data);
@@ -489,7 +528,7 @@ BytecodeArray SharedFunctionInfo::GetDebugBytecodeArray() const {
   }
 }
 
-void SharedFunctionInfo::SetDebugBytecodeArray(BytecodeArray bytecode) {
+void SharedFunctionInfo::SetActiveBytecodeArray(BytecodeArray bytecode) {
   Object data = function_data(kAcquireLoad);
   if (data.IsBytecodeArray()) {
     set_function_data(bytecode, kReleaseStore);
@@ -621,7 +660,7 @@ void SharedFunctionInfo::ClearPreparseData() {
 
   // Trim off the pre-parsed scope data from the uncompiled data by swapping the
   // map, leaving only an uncompiled data without pre-parsed scope.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Heap* heap = GetHeapFromWritableObject(data);
 
   // Swap the map.
@@ -644,14 +683,6 @@ void SharedFunctionInfo::ClearPreparseData() {
   DCHECK(HasUncompiledDataWithoutPreparseData());
 }
 
-template <typename LocalIsolate>
-void UncompiledData::Init(LocalIsolate* isolate, String inferred_name,
-                          int start_position, int end_position) {
-  set_inferred_name(inferred_name);
-  set_start_position(start_position);
-  set_end_position(end_position);
-}
-
 void UncompiledData::InitAfterBytecodeFlush(
     String inferred_name, int start_position, int end_position,
     std::function<void(HeapObject object, ObjectSlot slot, HeapObject target)>
@@ -663,16 +694,6 @@ void UncompiledData::InitAfterBytecodeFlush(
   set_end_position(end_position);
 }
 
-template <typename LocalIsolate>
-void UncompiledDataWithPreparseData::Init(LocalIsolate* isolate,
-                                          String inferred_name,
-                                          int start_position, int end_position,
-                                          PreparseData scope_data) {
-  this->UncompiledData::Init(isolate, inferred_name, start_position,
-                             end_position);
-  set_preparse_data(scope_data);
-}
-
 bool SharedFunctionInfo::HasWasmExportedFunctionData() const {
   return function_data(kAcquireLoad).IsWasmExportedFunctionData();
 }
@@ -791,6 +812,7 @@ bool SharedFunctionInfo::are_properties_final() const {
 }  // namespace internal
 }  // namespace v8
 
+#include "src/base/platform/wrappers.h"
 #include "src/objects/object-macros-undef.h"
 
 #endif  // V8_OBJECTS_SHARED_FUNCTION_INFO_INL_H_
diff --git a/deps/v8/src/objects/shared-function-info.cc b/deps/v8/src/objects/shared-function-info.cc
index 885d88e68979ae..503d678925547c 100644
--- a/deps/v8/src/objects/shared-function-info.cc
+++ b/deps/v8/src/objects/shared-function-info.cc
@@ -27,7 +27,7 @@ uint32_t SharedFunctionInfo::Hash() {
 }
 
 void SharedFunctionInfo::Init(ReadOnlyRoots ro_roots, int unique_id) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   // Set the function data to the "illegal" builtin. Ideally we'd use some sort
   // of "uninitialized" marker here, but it's cheaper to use a valid buitin and
@@ -157,7 +157,7 @@ void SharedFunctionInfo::SetScript(ReadOnlyRoots roots,
                                    HeapObject script_object,
                                    int function_literal_id,
                                    bool reset_preparsed_scope_data) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (script() == script_object) return;
 
@@ -233,17 +233,35 @@ CoverageInfo SharedFunctionInfo::GetCoverageInfo() const {
   return CoverageInfo::cast(GetDebugInfo().coverage_info());
 }
 
-String SharedFunctionInfo::DebugName() {
-  DisallowHeapAllocation no_gc;
+std::unique_ptr<char[]> SharedFunctionInfo::DebugNameCStr() {
+  if (HasWasmExportedFunctionData()) {
+    return WasmExportedFunction::GetDebugName(
+        wasm_exported_function_data().sig());
+  }
+  DisallowGarbageCollection no_gc;
   String function_name = Name();
-  if (function_name.length() > 0) return function_name;
-  return inferred_name();
+  if (function_name.length() == 0) function_name = inferred_name();
+  return function_name.ToCString();
+}
+
+// static
+Handle<String> SharedFunctionInfo::DebugName(
+    Handle<SharedFunctionInfo> shared) {
+  if (shared->HasWasmExportedFunctionData()) {
+    return shared->GetIsolate()
+        ->factory()
+        ->NewStringFromUtf8(CStrVector(shared->DebugNameCStr().get()))
+        .ToHandleChecked();
+  }
+  DisallowHeapAllocation no_gc;
+  String function_name = shared->Name();
+  if (function_name.length() == 0) function_name = shared->inferred_name();
+  return handle(function_name, shared->GetIsolate());
 }
 
 bool SharedFunctionInfo::PassesFilter(const char* raw_filter) {
   Vector<const char> filter = CStrVector(raw_filter);
-  std::unique_ptr<char[]> cstrname(DebugName().ToCString());
-  return v8::internal::PassesFilter(CStrVector(cstrname.get()), filter);
+  return v8::internal::PassesFilter(CStrVector(DebugNameCStr().get()), filter);
 }
 
 bool SharedFunctionInfo::HasSourceCode() const {
@@ -257,7 +275,7 @@ void SharedFunctionInfo::DiscardCompiledMetadata(
     Isolate* isolate,
     std::function<void(HeapObject object, ObjectSlot slot, HeapObject target)>
         gc_notify_updated_slot) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   if (is_compiled()) {
     if (FLAG_trace_flush_bytecode) {
       CodeTracer::Scope scope(GetIsolate()->GetCodeTracer());
@@ -357,36 +375,6 @@ Handle<Object> SharedFunctionInfo::GetSourceCodeHarmony(
   return builder.Finish().ToHandleChecked();
 }
 
-SharedFunctionInfo::Inlineability SharedFunctionInfo::GetInlineability() const {
-  if (!script().IsScript()) return kHasNoScript;
-
-  if (GetIsolate()->is_precise_binary_code_coverage() &&
-      !has_reported_binary_coverage()) {
-    // We may miss invocations if this function is inlined.
-    return kNeedsBinaryCoverage;
-  }
-
-  if (optimization_disabled()) return kHasOptimizationDisabled;
-
-  // Built-in functions are handled by the JSCallReducer.
-  if (HasBuiltinId()) return kIsBuiltin;
-
-  if (!IsUserJavaScript()) return kIsNotUserCode;
-
-  // If there is no bytecode array, it is either not compiled or it is compiled
-  // with WebAssembly for the asm.js pipeline. In either case we don't want to
-  // inline.
-  if (!HasBytecodeArray()) return kHasNoBytecode;
-
-  if (GetBytecodeArray().length() > FLAG_max_inlined_bytecode_size) {
-    return kExceedsBytecodeLimit;
-  }
-
-  if (HasBreakInfo()) return kMayContainBreakPoints;
-
-  return kIsInlineable;
-}
-
 int SharedFunctionInfo::SourceSize() { return EndPosition() - StartPosition(); }
 
 // Output the source code without any allocation in the heap.
@@ -433,13 +421,13 @@ void SharedFunctionInfo::DisableOptimization(BailoutReason reason) {
 
   set_flags(DisabledOptimizationReasonBits::update(flags(), reason));
   // Code should be the lazy compilation stub or else interpreted.
-  DCHECK(abstract_code().kind() == CodeKind::INTERPRETED_FUNCTION ||
-         abstract_code().kind() == CodeKind::BUILTIN);
-  PROFILE(GetIsolate(),
-          CodeDisableOptEvent(handle(abstract_code(), GetIsolate()),
-                              handle(*this, GetIsolate())));
+  Isolate* isolate = GetIsolate();
+  DCHECK(abstract_code(isolate).kind() == CodeKind::INTERPRETED_FUNCTION ||
+         abstract_code(isolate).kind() == CodeKind::BUILTIN);
+  PROFILE(isolate, CodeDisableOptEvent(handle(abstract_code(isolate), isolate),
+                                       handle(*this, isolate)));
   if (FLAG_trace_opt) {
-    CodeTracer::Scope scope(GetIsolate()->GetCodeTracer());
+    CodeTracer::Scope scope(isolate->GetCodeTracer());
     PrintF(scope.file(), "[disabled optimization for ");
     ShortPrint(scope.file());
     PrintF(scope.file(), ", reason: %s]\n", GetBailoutReason(reason));
@@ -660,21 +648,50 @@ void SharedFunctionInfo::SetPosition(int start_position, int end_position) {
   }
 }
 
-bool SharedFunctionInfo::AreSourcePositionsAvailable() const {
-  if (FLAG_enable_lazy_source_positions) {
-    return !HasBytecodeArray() || GetBytecodeArray().HasSourcePositionTable();
-  }
-  return true;
-}
-
 // static
 void SharedFunctionInfo::EnsureSourcePositionsAvailable(
     Isolate* isolate, Handle<SharedFunctionInfo> shared_info) {
   if (FLAG_enable_lazy_source_positions && shared_info->HasBytecodeArray() &&
-      !shared_info->GetBytecodeArray().HasSourcePositionTable()) {
+      !shared_info->GetBytecodeArray(isolate).HasSourcePositionTable()) {
     Compiler::CollectSourcePositions(isolate, shared_info);
   }
 }
 
+// static
+void SharedFunctionInfo::InstallDebugBytecode(Handle<SharedFunctionInfo> shared,
+                                              Isolate* isolate) {
+  DCHECK(shared->HasBytecodeArray());
+  Handle<BytecodeArray> original_bytecode_array(
+      shared->GetBytecodeArray(isolate), isolate);
+  Handle<BytecodeArray> debug_bytecode_array =
+      isolate->factory()->CopyBytecodeArray(original_bytecode_array);
+
+  {
+    DisallowGarbageCollection no_gc;
+    base::SharedMutexGuard<base::kExclusive> mutex_guard(
+        isolate->shared_function_info_access());
+    DebugInfo debug_info = shared->GetDebugInfo();
+    debug_info.set_original_bytecode_array(*original_bytecode_array,
+                                           kReleaseStore);
+    debug_info.set_debug_bytecode_array(*debug_bytecode_array, kReleaseStore);
+    shared->SetActiveBytecodeArray(*debug_bytecode_array);
+  }
+}
+
+// static
+void SharedFunctionInfo::UninstallDebugBytecode(SharedFunctionInfo shared,
+                                                Isolate* isolate) {
+  DisallowGarbageCollection no_gc;
+  base::SharedMutexGuard<base::kExclusive> mutex_guard(
+      isolate->shared_function_info_access());
+  DebugInfo debug_info = shared.GetDebugInfo();
+  BytecodeArray original_bytecode_array = debug_info.OriginalBytecodeArray();
+  shared.SetActiveBytecodeArray(original_bytecode_array);
+  debug_info.set_original_bytecode_array(
+      ReadOnlyRoots(isolate).undefined_value(), kReleaseStore);
+  debug_info.set_debug_bytecode_array(ReadOnlyRoots(isolate).undefined_value(),
+                                      kReleaseStore);
+}
+
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/objects/shared-function-info.h b/deps/v8/src/objects/shared-function-info.h
index be6705e327d72d..eb130c23b7f067 100644
--- a/deps/v8/src/objects/shared-function-info.h
+++ b/deps/v8/src/objects/shared-function-info.h
@@ -101,19 +101,11 @@ class PreparseData
 class UncompiledData
     : public TorqueGeneratedUncompiledData<UncompiledData, HeapObject> {
  public:
-  template <typename LocalIsolate>
-  inline void Init(LocalIsolate* isolate, String inferred_name,
-                   int start_position, int end_position);
-
   inline void InitAfterBytecodeFlush(
       String inferred_name, int start_position, int end_position,
       std::function<void(HeapObject object, ObjectSlot slot, HeapObject target)>
           gc_notify_updated_slot);
 
-  using BodyDescriptor =
-      FixedBodyDescriptor<kStartOfStrongFieldsOffset, kEndOfStrongFieldsOffset,
-                          kHeaderSize>;
-
   TQ_OBJECT_CONSTRUCTORS(UncompiledData)
 };
 
@@ -124,10 +116,7 @@ class UncompiledDataWithoutPreparseData
     : public TorqueGeneratedUncompiledDataWithoutPreparseData<
           UncompiledDataWithoutPreparseData, UncompiledData> {
  public:
-  DECL_PRINTER(UncompiledDataWithoutPreparseData)
-
-  // No extra fields compared to UncompiledData.
-  using BodyDescriptor = UncompiledData::BodyDescriptor;
+  class BodyDescriptor;
 
   TQ_OBJECT_CONSTRUCTORS(UncompiledDataWithoutPreparseData)
 };
@@ -138,17 +127,7 @@ class UncompiledDataWithPreparseData
     : public TorqueGeneratedUncompiledDataWithPreparseData<
           UncompiledDataWithPreparseData, UncompiledData> {
  public:
-  DECL_PRINTER(UncompiledDataWithPreparseData)
-
-  template <typename LocalIsolate>
-  inline void Init(LocalIsolate* isolate, String inferred_name,
-                   int start_position, int end_position,
-                   PreparseData scope_data);
-
-  using BodyDescriptor = SubclassBodyDescriptor<
-      UncompiledData::BodyDescriptor,
-      FixedBodyDescriptor<kStartOfStrongFieldsOffset, kEndOfStrongFieldsOffset,
-                          kSize>>;
+  class BodyDescriptor;
 
   TQ_OBJECT_CONSTRUCTORS(UncompiledDataWithPreparseData)
 };
@@ -170,7 +149,8 @@ class InterpreterData : public Struct {
 
 // SharedFunctionInfo describes the JSFunction information that can be
 // shared by multiple instances of the function.
-class SharedFunctionInfo : public HeapObject {
+class SharedFunctionInfo
+    : public TorqueGeneratedSharedFunctionInfo<SharedFunctionInfo, HeapObject> {
  public:
   NEVER_READ_ONLY_SPACE
   DEFINE_TORQUE_GENERATED_SHARED_FUNCTION_INFO_FLAGS()
@@ -195,7 +175,8 @@ class SharedFunctionInfo : public HeapObject {
 
   // Get the abstract code associated with the function, which will either be
   // a Code object or a BytecodeArray.
-  inline AbstractCode abstract_code();
+  template <typename LocalIsolate>
+  inline AbstractCode abstract_code(LocalIsolate* isolate);
 
   // Tells whether or not this shared function info has an attached
   // BytecodeArray.
@@ -242,7 +223,13 @@ class SharedFunctionInfo : public HeapObject {
   // [outer scope info | feedback metadata] Shared storage for outer scope info
   // (on uncompiled functions) and feedback metadata (on compiled functions).
   DECL_ACCESSORS(raw_outer_scope_info_or_feedback_metadata, HeapObject)
+ private:
+  using TorqueGeneratedSharedFunctionInfo::
+      outer_scope_info_or_feedback_metadata;
+  using TorqueGeneratedSharedFunctionInfo::
+      set_outer_scope_info_or_feedback_metadata;
 
+ public:
   // Get the outer scope info whether this function is compiled or not.
   inline bool HasOuterScopeInfo() const;
   inline ScopeInfo GetOuterScopeInfo() const;
@@ -264,37 +251,20 @@ class SharedFunctionInfo : public HeapObject {
   template <typename LocalIsolate>
   inline IsCompiledScope is_compiled_scope(LocalIsolate* isolate) const;
 
-  // [length]: The function length - usually the number of declared parameters.
-  // Use up to 2^16-2 parameters (16 bits of values, where one is reserved for
-  // kDontAdaptArgumentsSentinel). The value is only reliable when the function
-  // has been compiled.
-  inline uint16_t length() const;
-  inline void set_length(int value);
 
   // [internal formal parameter count]: The declared number of parameters.
   // For subclass constructors, also includes new.target.
   // The size of function's frame is internal_formal_parameter_count + 1.
   DECL_UINT16_ACCESSORS(internal_formal_parameter_count)
+ private:
+  using TorqueGeneratedSharedFunctionInfo::formal_parameter_count;
+  using TorqueGeneratedSharedFunctionInfo::set_formal_parameter_count;
 
+ public:
   // Set the formal parameter count so the function code will be
   // called without using argument adaptor frames.
   inline void DontAdaptArguments();
 
-  // [expected_nof_properties]: Expected number of properties for the
-  // function. The value is only reliable when the function has been compiled.
-  DECL_UINT8_ACCESSORS(expected_nof_properties)
-
-  // [function_literal_id] - uniquely identifies the FunctionLiteral this
-  // SharedFunctionInfo represents within its script, or -1 if this
-  // SharedFunctionInfo object doesn't correspond to a parsed FunctionLiteral.
-  DECL_INT32_ACCESSORS(function_literal_id)
-
-#if V8_SFI_HAS_UNIQUE_ID
-  // [unique_id] - For --trace-maps purposes, an identifier that's persistent
-  // even if the GC moves this SharedFunctionInfo.
-  DECL_INT_ACCESSORS(unique_id)
-#endif
-
   // [function data]: This field holds some additional data for function.
   // Currently it has one of:
   //  - a FunctionTemplateInfo to make benefit the API [IsApiFunction()].
@@ -315,14 +285,16 @@ class SharedFunctionInfo : public HeapObject {
   inline FunctionTemplateInfo get_api_func_data() const;
   inline void set_api_func_data(FunctionTemplateInfo data);
   inline bool HasBytecodeArray() const;
-  inline BytecodeArray GetBytecodeArray() const;
+  template <typename LocalIsolate>
+  inline BytecodeArray GetBytecodeArray(LocalIsolate* isolate) const;
+
   inline void set_bytecode_array(BytecodeArray bytecode);
   inline Code InterpreterTrampoline() const;
   inline bool HasInterpreterData() const;
   inline InterpreterData interpreter_data() const;
   inline void set_interpreter_data(InterpreterData interpreter_data);
-  inline BytecodeArray GetDebugBytecodeArray() const;
-  inline void SetDebugBytecodeArray(BytecodeArray bytecode);
+  inline BytecodeArray GetActiveBytecodeArray() const;
+  inline void SetActiveBytecodeArray(BytecodeArray bytecode);
   inline bool HasAsmWasmData() const;
   inline AsmWasmData asm_wasm_data() const;
   inline void set_asm_wasm_data(AsmWasmData data);
@@ -370,7 +342,8 @@ class SharedFunctionInfo : public HeapObject {
   CoverageInfo GetCoverageInfo() const;
 
   // The function's name if it is non-empty, otherwise the inferred name.
-  String DebugName();
+  std::unique_ptr<char[]> DebugNameCStr();
+  static Handle<String> DebugName(Handle<SharedFunctionInfo>);
 
   // Used for flags such as --turbo-filter.
   bool PassesFilter(const char* raw_filter);
@@ -395,7 +368,11 @@ class SharedFunctionInfo : public HeapObject {
   // start position. Can return kFunctionTokenOutOfRange if offset doesn't
   // fit in 16 bits.
   DECL_UINT16_ACCESSORS(raw_function_token_offset)
+ private:
+  using TorqueGeneratedSharedFunctionInfo::function_token_offset;
+  using TorqueGeneratedSharedFunctionInfo::set_function_token_offset;
 
+ public:
   // The position of the 'function' token in the script source. Can return
   // kNoSourcePosition if raw_function_token_offset() returns
   // kFunctionTokenOutOfRange.
@@ -555,7 +532,8 @@ class SharedFunctionInfo : public HeapObject {
     kExceedsBytecodeLimit,
     kMayContainBreakPoints,
   };
-  Inlineability GetInlineability() const;
+  template <typename LocalIsolate>
+  Inlineability GetInlineability(LocalIsolate* isolate) const;
 
   // Source size of this function.
   int SourceSize();
@@ -584,7 +562,8 @@ class SharedFunctionInfo : public HeapObject {
   static void EnsureSourcePositionsAvailable(
       Isolate* isolate, Handle<SharedFunctionInfo> shared_info);
 
-  V8_EXPORT_PRIVATE bool AreSourcePositionsAvailable() const;
+  template <typename LocalIsolate>
+  bool AreSourcePositionsAvailable(LocalIsolate* isolate) const;
 
   // Hash based on function literal id and script id.
   V8_EXPORT_PRIVATE uint32_t Hash();
@@ -626,17 +605,12 @@ class SharedFunctionInfo : public HeapObject {
     int index_;
   };
 
-  DECL_CAST(SharedFunctionInfo)
-
   // Constants.
   static const int kMaximumFunctionTokenOffset = kMaxUInt16 - 1;
   static const uint16_t kFunctionTokenOutOfRange = static_cast<uint16_t>(-1);
   STATIC_ASSERT(kMaximumFunctionTokenOffset + 1 == kFunctionTokenOutOfRange);
 
-  DEFINE_FIELD_OFFSET_CONSTANTS(HeapObject::kHeaderSize,
-                                TORQUE_GENERATED_SHARED_FUNCTION_INFO_FIELDS)
-
-  static const int kAlignedSize = POINTER_SIZE_ALIGN(kSize);
+  static const int kAlignedSize = OBJECT_POINTER_ALIGN(kSize);
 
   class BodyDescriptor;
 
@@ -653,6 +627,16 @@ class SharedFunctionInfo : public HeapObject {
   // This is needed to set up the [[HomeObject]] on the function instance.
   inline bool needs_home_object() const;
 
+  // Sets the bytecode in {shared}'s DebugInfo as the bytecode to
+  // be returned by following calls to GetActiveBytecodeArray. Stores a
+  // reference to the original bytecode in the DebugInfo.
+  static void InstallDebugBytecode(Handle<SharedFunctionInfo> shared,
+                                   Isolate* isolate);
+  // Removes the debug bytecode and restores the original bytecode to be
+  // returned by following calls to GetActiveBytecodeArray.
+  static void UninstallDebugBytecode(SharedFunctionInfo shared,
+                                     Isolate* isolate);
+
  private:
 #ifdef VERIFY_HEAP
   void SharedFunctionInfoVerify(ReadOnlyRoots roots);
@@ -685,7 +669,7 @@ class SharedFunctionInfo : public HeapObject {
   friend class V8HeapExplorer;
   FRIEND_TEST(PreParserTest, LazyFunctionLength);
 
-  OBJECT_CONSTRUCTORS(SharedFunctionInfo, HeapObject);
+  TQ_OBJECT_CONSTRUCTORS(SharedFunctionInfo)
 };
 
 // Printing support.
@@ -699,7 +683,7 @@ struct SourceCodeOf {
 // IsCompiledScope enables a caller to check if a function is compiled, and
 // ensure it remains compiled (i.e., doesn't have it's bytecode flushed) while
 // the scope is retained.
-class IsCompiledScope {
+class V8_NODISCARD IsCompiledScope {
  public:
   inline IsCompiledScope(const SharedFunctionInfo shared, Isolate* isolate);
   inline IsCompiledScope(const SharedFunctionInfo shared,
diff --git a/deps/v8/src/objects/shared-function-info.tq b/deps/v8/src/objects/shared-function-info.tq
index 838703454ce1c0..fab396a2cc0e1c 100644
--- a/deps/v8/src/objects/shared-function-info.tq
+++ b/deps/v8/src/objects/shared-function-info.tq
@@ -47,42 +47,59 @@ bitfield struct SharedFunctionInfoFlags2 extends uint8 {
   may_have_cached_code: bool: 1 bit;
 }
 
-extern class SharedFunctionInfo extends HeapObject {
+@export
+@customCppClass
+@customMap  // Just to place the map at the beginning of the roots array.
+class SharedFunctionInfo extends HeapObject {
   weak function_data: Object;
   name_or_scope_info: String|NoSharedNameSentinel|ScopeInfo;
   outer_scope_info_or_feedback_metadata: HeapObject;
   script_or_debug_info: Script|DebugInfo|Undefined;
+  // [length]: The function length - usually the number of declared parameters.
+  // Use up to 2^16-2 parameters (16 bits of values, where one is reserved for
+  // kDontAdaptArgumentsSentinel). The value is only reliable when the function
+  // has been compiled.
   length: int16;
   formal_parameter_count: uint16;
-  function_token_offset: int16;
+  function_token_offset: uint16;
+  // [expected_nof_properties]: Expected number of properties for the
+  // function. The value is only reliable when the function has been compiled.
   expected_nof_properties: uint8;
   flags2: SharedFunctionInfoFlags2;
   flags: SharedFunctionInfoFlags;
+  // [function_literal_id] - uniquely identifies the FunctionLiteral this
+  // SharedFunctionInfo represents within its script, or -1 if this
+  // SharedFunctionInfo object doesn't correspond to a parsed FunctionLiteral.
   function_literal_id: int32;
+  // [unique_id] - For --trace-maps purposes, an identifier that's persistent
+  // even if the GC moves this SharedFunctionInfo.
   @if(V8_SFI_HAS_UNIQUE_ID) unique_id: int32;
 }
 
 @abstract
-@generateCppClass
-extern class UncompiledData extends HeapObject {
+@export
+@customCppClass
+class UncompiledData extends HeapObject {
   inferred_name: String;
   start_position: int32;
   end_position: int32;
 }
 
-@generateCppClass
-extern class UncompiledDataWithoutPreparseData extends UncompiledData {
+@export
+@customCppClass
+class UncompiledDataWithoutPreparseData extends UncompiledData {
 }
 
-@generateCppClass
-extern class UncompiledDataWithPreparseData extends UncompiledData {
+@export
+@customCppClass
+class UncompiledDataWithPreparseData extends UncompiledData {
   preparse_data: PreparseData;
 }
 
 @export
 class OnHeapBasicBlockProfilerData extends HeapObject {
   block_ids: ByteArray;  // Stored as 4-byte ints
-  counts: ByteArray;     // Stored as 4-byte ints
+  counts: ByteArray;     // Stored as 8-byte floats
   name: String;
   schedule: String;
   code: String;
diff --git a/deps/v8/src/objects/source-text-module.cc b/deps/v8/src/objects/source-text-module.cc
index e3c7a2d6cd5f0c..19808bbb575d65 100644
--- a/deps/v8/src/objects/source-text-module.cc
+++ b/deps/v8/src/objects/source-text-module.cc
@@ -7,6 +7,7 @@
 #include "src/api/api-inl.h"
 #include "src/ast/modules.h"
 #include "src/builtins/accessors.h"
+#include "src/common/assert-scope.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/module-inl.h"
 #include "src/objects/objects-inl.h"
@@ -18,7 +19,7 @@ namespace internal {
 
 struct StringHandleHash {
   V8_INLINE size_t operator()(Handle<String> string) const {
-    return string->Hash();
+    return string->EnsureHash();
   }
 };
 
@@ -77,27 +78,28 @@ class Module::ResolveSet
 };
 
 SharedFunctionInfo SourceTextModule::GetSharedFunctionInfo() const {
-  DisallowHeapAllocation no_alloc;
+  DisallowGarbageCollection no_gc;
   switch (status()) {
     case kUninstantiated:
     case kPreInstantiating:
-      DCHECK(code().IsSharedFunctionInfo());
       return SharedFunctionInfo::cast(code());
     case kInstantiating:
-      DCHECK(code().IsJSFunction());
       return JSFunction::cast(code()).shared();
     case kInstantiated:
     case kEvaluating:
     case kEvaluated:
-      DCHECK(code().IsJSGeneratorObject());
       return JSGeneratorObject::cast(code()).function().shared();
     case kErrored:
-      UNREACHABLE();
+      return SharedFunctionInfo::cast(code());
   }
-
   UNREACHABLE();
 }
 
+Script SourceTextModule::GetScript() const {
+  DisallowGarbageCollection no_gc;
+  return Script::cast(GetSharedFunctionInfo().script());
+}
+
 int SourceTextModule::ExportIndex(int cell_index) {
   DCHECK_EQ(SourceTextModuleDescriptor::GetCellIndexKind(cell_index),
             SourceTextModuleDescriptor::kExport);
@@ -137,7 +139,7 @@ void SourceTextModule::CreateExport(Isolate* isolate,
 }
 
 Cell SourceTextModule::GetCell(int cell_index) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Object cell;
   switch (SourceTextModuleDescriptor::GetCellIndexKind(cell_index)) {
     case SourceTextModuleDescriptor::kImport:
@@ -161,7 +163,7 @@ Handle<Object> SourceTextModule::LoadVariable(Isolate* isolate,
 
 void SourceTextModule::StoreVariable(Handle<SourceTextModule> module,
                                      int cell_index, Handle<Object> value) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_EQ(SourceTextModuleDescriptor::GetCellIndexKind(cell_index),
             SourceTextModuleDescriptor::kExport);
   module->GetCell(cell_index).set_value(*value);
@@ -205,7 +207,7 @@ MaybeHandle<Cell> SourceTextModule::ResolveExport(
     Handle<SourceTextModuleInfoEntry> entry =
         Handle<SourceTextModuleInfoEntry>::cast(object);
     Handle<String> import_name(String::cast(entry->import_name()), isolate);
-    Handle<Script> script(module->script(), isolate);
+    Handle<Script> script(module->GetScript(), isolate);
     MessageLocation new_loc(script, entry->beg_pos(), entry->end_pos());
 
     Handle<Cell> cell;
@@ -269,7 +271,7 @@ MaybeHandle<Cell> SourceTextModule::ResolveExportUsingStarExports(
         continue;  // Indirect export.
       }
 
-      Handle<Script> script(module->script(), isolate);
+      Handle<Script> script(module->GetScript(), isolate);
       MessageLocation new_loc(script, entry->beg_pos(), entry->end_pos());
 
       Handle<Cell> cell;
@@ -310,7 +312,9 @@ MaybeHandle<Cell> SourceTextModule::ResolveExportUsingStarExports(
 
 bool SourceTextModule::PrepareInstantiate(
     Isolate* isolate, Handle<SourceTextModule> module,
-    v8::Local<v8::Context> context, v8::Module::ResolveCallback callback) {
+    v8::Local<v8::Context> context, v8::Module::ResolveModuleCallback callback,
+    Module::DeprecatedResolveCallback callback_without_import_assertions) {
+  DCHECK_EQ(callback != nullptr, callback_without_import_assertions == nullptr);
   // Obtain requested modules.
   Handle<SourceTextModuleInfo> module_info(module->info(), isolate);
   Handle<FixedArray> module_requests(module_info->module_requests(), isolate);
@@ -319,13 +323,25 @@ bool SourceTextModule::PrepareInstantiate(
     Handle<ModuleRequest> module_request(
         ModuleRequest::cast(module_requests->get(i)), isolate);
     Handle<String> specifier(module_request->specifier(), isolate);
-    // TODO(v8:10958) Pass import assertions to the callback
     v8::Local<v8::Module> api_requested_module;
-    if (!callback(context, v8::Utils::ToLocal(specifier),
-                  v8::Utils::ToLocal(Handle<Module>::cast(module)))
-             .ToLocal(&api_requested_module)) {
-      isolate->PromoteScheduledException();
-      return false;
+    if (callback) {
+      Handle<FixedArray> import_assertions(module_request->import_assertions(),
+                                           isolate);
+      if (!callback(context, v8::Utils::ToLocal(specifier),
+                    v8::Utils::FixedArrayToLocal(import_assertions),
+                    v8::Utils::ToLocal(Handle<Module>::cast(module)))
+               .ToLocal(&api_requested_module)) {
+        isolate->PromoteScheduledException();
+        return false;
+      }
+    } else {
+      if (!callback_without_import_assertions(
+               context, v8::Utils::ToLocal(specifier),
+               v8::Utils::ToLocal(Handle<Module>::cast(module)))
+               .ToLocal(&api_requested_module)) {
+        isolate->PromoteScheduledException();
+        return false;
+      }
     }
     Handle<Module> requested_module = Utils::OpenHandle(*api_requested_module);
     requested_modules->set(i, *requested_module);
@@ -336,7 +352,8 @@ bool SourceTextModule::PrepareInstantiate(
     Handle<Module> requested_module(Module::cast(requested_modules->get(i)),
                                     isolate);
     if (!Module::PrepareInstantiate(isolate, requested_module, context,
-                                    callback)) {
+                                    callback,
+                                    callback_without_import_assertions)) {
       return false;
     }
   }
@@ -404,6 +421,7 @@ bool SourceTextModule::MaybeTransitionComponent(
   DCHECK_LE(module->dfs_ancestor_index(), module->dfs_index());
   if (module->dfs_ancestor_index() == module->dfs_index()) {
     // This is the root of its strongly connected component.
+    Handle<SourceTextModule> cycle_root = module;
     Handle<SourceTextModule> ancestor;
     do {
       ancestor = stack->front();
@@ -413,6 +431,9 @@ bool SourceTextModule::MaybeTransitionComponent(
       if (new_status == kInstantiated) {
         if (!SourceTextModule::RunInitializationCode(isolate, ancestor))
           return false;
+      } else if (new_status == kEvaluated) {
+        DCHECK(ancestor->cycle_root().IsTheHole(isolate));
+        ancestor->set_cycle_root(*cycle_root);
       }
       ancestor->SetStatus(new_status);
     } while (*ancestor != *module);
@@ -429,8 +450,8 @@ bool SourceTextModule::FinishInstantiate(
   Handle<SharedFunctionInfo> shared(SharedFunctionInfo::cast(module->code()),
                                     isolate);
   Handle<JSFunction> function =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          shared, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, shared, isolate->native_context()}
+          .Build();
   module->set_code(*function);
   module->SetStatus(kInstantiating);
   module->set_dfs_index(*dfs_index);
@@ -466,7 +487,7 @@ bool SourceTextModule::FinishInstantiate(
     }
   }
 
-  Handle<Script> script(module->script(), isolate);
+  Handle<Script> script(module->GetScript(), isolate);
   Handle<SourceTextModuleInfo> module_info(module->info(), isolate);
 
   // Resolve imports.
@@ -625,9 +646,9 @@ MaybeHandle<Object> SourceTextModule::EvaluateMaybeAsync(
   CHECK(module->status() == kInstantiated || module->status() == kEvaluated);
 
   // 3. If module.[[Status]] is "evaluated", set module to
-  //    GetAsyncCycleRoot(module).
+  //    module.[[CycleRoot]].
   if (module->status() == kEvaluated) {
-    module = GetAsyncCycleRoot(isolate, module);
+    module = module->GetCycleRoot(isolate);
   }
 
   // 4. If module.[[TopLevelCapability]] is not undefined, then
@@ -742,37 +763,27 @@ void SourceTextModule::AsyncModuleExecutionFulfilled(
   for (int i = 0; i < module->AsyncParentModuleCount(); i++) {
     Handle<SourceTextModule> m = module->GetAsyncParentModule(isolate, i);
 
-    //  a. If module.[[DFSIndex]] is not equal to module.[[DFSAncestorIndex]],
-    //     then
-    if (module->dfs_index() != module->dfs_ancestor_index()) {
-      //   i. Assert: m.[[DFSAncestorIndex]] is equal to
-      //      module.[[DFSAncestorIndex]].
-      DCHECK_LE(m->dfs_ancestor_index(), module->dfs_ancestor_index());
-    }
-    //  b. Decrement m.[[PendingAsyncDependencies]] by 1.
+    //  a. Decrement m.[[PendingAsyncDependencies]] by 1.
     m->DecrementPendingAsyncDependencies();
 
-    //  c. If m.[[PendingAsyncDependencies]] is 0 and m.[[EvaluationError]] is
+    //  b. If m.[[PendingAsyncDependencies]] is 0 and m.[[EvaluationError]] is
     //     undefined, then
     if (!m->HasPendingAsyncDependencies() && m->status() == kEvaluated) {
       //   i. Assert: m.[[AsyncEvaluating]] is true.
       DCHECK(m->async_evaluating());
 
-      //  ii. Let cycleRoot be ! GetAsyncCycleRoot(m).
-      auto cycle_root = GetAsyncCycleRoot(isolate, m);
-
-      // iii. If cycleRoot.[[EvaluationError]] is not undefined,
+      // ii. If m.[[CycleRoot]].[[EvaluationError]] is not undefined,
       //      return undefined.
-      if (cycle_root->status() == kErrored) {
+      if (m->GetCycleRoot(isolate)->status() == kErrored) {
         return;
       }
 
-      //  iv. If m.[[Async]] is true, then
+      //  iii. If m.[[Async]] is true, then
       if (m->async()) {
         //    1. Perform ! ExecuteAsyncModule(m).
         ExecuteAsyncModule(isolate, m);
       } else {
-        // v. Otherwise,
+        // iv. Otherwise,
         //    1. Let result be m.ExecuteModule().
         //    2. If result is a normal completion,
         Handle<Object> unused_result;
@@ -1052,8 +1063,8 @@ MaybeHandle<Object> SourceTextModule::InnerModuleEvaluation(
                      required_module->dfs_ancestor_index()));
       } else {
         //   iv. Otherwise,
-        //      1. Set requiredModule to GetAsyncCycleRoot(requiredModule).
-        required_module = GetAsyncCycleRoot(isolate, required_module);
+        //      1. Set requiredModule to requiredModule.[[CycleRoot]].
+        required_module = required_module->GetCycleRoot(isolate);
 
         //      2. Assert: requiredModule.[[Status]] is "evaluated".
         CHECK_GE(required_module->status(), kEvaluated);
@@ -1111,43 +1122,6 @@ MaybeHandle<Object> SourceTextModule::InnerModuleEvaluation(
   return result;
 }
 
-Handle<SourceTextModule> SourceTextModule::GetAsyncCycleRoot(
-    Isolate* isolate, Handle<SourceTextModule> module) {
-  // 1. Assert: module.[[Status]] is "evaluated".
-  CHECK_GE(module->status(), kEvaluated);
-
-  // 2. If module.[[AsyncParentModules]] is an empty List, return module.
-  if (module->AsyncParentModuleCount() == 0) {
-    return module;
-  }
-
-  // 3. Repeat, while module.[[DFSIndex]] is greater than
-  //    module.[[DFSAncestorIndex]],
-  while (module->dfs_index() > module->dfs_ancestor_index()) {
-    //  a. Assert: module.[[AsyncParentModules]] is a non-empty List.
-    DCHECK_GT(module->AsyncParentModuleCount(), 0);
-
-    //  b. Let nextCycleModule be the first element of
-    //     module.[[AsyncParentModules]].
-    Handle<SourceTextModule> next_cycle_module =
-        module->GetAsyncParentModule(isolate, 0);
-
-    //  c. Assert: nextCycleModule.[[DFSAncestorIndex]] is less than or equal
-    //     to module.[[DFSAncestorIndex]].
-    DCHECK_LE(next_cycle_module->dfs_ancestor_index(),
-              module->dfs_ancestor_index());
-
-    //  d. Set module to nextCycleModule
-    module = next_cycle_module;
-  }
-
-  // 4. Assert: module.[[DFSIndex]] is equal to module.[[DFSAncestorIndex]].
-  DCHECK_EQ(module->dfs_index(), module->dfs_ancestor_index());
-
-  // 5. Return module.
-  return module;
-}
-
 void SourceTextModule::Reset(Isolate* isolate,
                              Handle<SourceTextModule> module) {
   Factory* factory = isolate->factory();
diff --git a/deps/v8/src/objects/source-text-module.h b/deps/v8/src/objects/source-text-module.h
index c3ef4e36b33e17..1346f1db204440 100644
--- a/deps/v8/src/objects/source-text-module.h
+++ b/deps/v8/src/objects/source-text-module.h
@@ -32,6 +32,8 @@ class SourceTextModule
   // kErrored.
   SharedFunctionInfo GetSharedFunctionInfo() const;
 
+  Script GetScript() const;
+
   // Whether or not this module is an async module. Set during module creation
   // and does not change afterwards.
   DECL_BOOLEAN_ACCESSORS(async)
@@ -81,6 +83,9 @@ class SourceTextModule
                                           Handle<SourceTextModule> module,
                                           Handle<SourceTextModule> parent);
 
+  // Get the non-hole cycle root. Only valid when status >= kEvaluated.
+  inline Handle<SourceTextModule> GetCycleRoot(Isolate* isolate) const;
+
   // Returns a SourceTextModule, the
   // ith parent in depth first traversal order of a given async child.
   inline Handle<SourceTextModule> GetAsyncParentModule(Isolate* isolate,
@@ -136,7 +141,9 @@ class SourceTextModule
 
   static V8_WARN_UNUSED_RESULT bool PrepareInstantiate(
       Isolate* isolate, Handle<SourceTextModule> module,
-      v8::Local<v8::Context> context, v8::Module::ResolveCallback callback);
+      v8::Local<v8::Context> context,
+      v8::Module::ResolveModuleCallback callback,
+      Module::DeprecatedResolveCallback callback_without_import_assertions);
   static V8_WARN_UNUSED_RESULT bool FinishInstantiate(
       Isolate* isolate, Handle<SourceTextModule> module,
       ZoneForwardList<Handle<SourceTextModule>>* stack, unsigned* dfs_index,
@@ -165,10 +172,6 @@ class SourceTextModule
       Isolate* isolate, Handle<SourceTextModule> module,
       ZoneForwardList<Handle<SourceTextModule>>* stack, Status new_status);
 
-  // Implementation of spec GetAsyncCycleRoot.
-  static V8_WARN_UNUSED_RESULT Handle<SourceTextModule> GetAsyncCycleRoot(
-      Isolate* isolate, Handle<SourceTextModule> module);
-
   // Implementation of spec ExecuteModule is broken up into
   // InnerExecuteAsyncModule for asynchronous modules and ExecuteModule
   // for synchronous modules.
@@ -203,7 +206,6 @@ class SourceTextModuleInfo : public FixedArray {
   inline FixedArray regular_exports() const;
   inline FixedArray regular_imports() const;
   inline FixedArray namespace_imports() const;
-  inline FixedArray module_request_positions() const;
 
   // Accessors for [regular_exports].
   int RegularExportCount() const;
@@ -225,7 +227,6 @@ class SourceTextModuleInfo : public FixedArray {
     kRegularExportsIndex,
     kNamespaceImportsIndex,
     kRegularImportsIndex,
-    kModuleRequestPositionsIndex,
     kLength
   };
   enum {
@@ -247,7 +248,12 @@ class ModuleRequest
   template <typename LocalIsolate>
   static Handle<ModuleRequest> New(LocalIsolate* isolate,
                                    Handle<String> specifier,
-                                   Handle<FixedArray> import_assertions);
+                                   Handle<FixedArray> import_assertions,
+                                   int position);
+
+  // The number of entries in the import_assertions FixedArray that are used for
+  // a single assertion.
+  static const size_t kAssertionEntrySize = 3;
 
   TQ_OBJECT_CONSTRUCTORS(ModuleRequest)
 };
diff --git a/deps/v8/src/objects/source-text-module.tq b/deps/v8/src/objects/source-text-module.tq
index 1fee28a31fe73b..3ecc40e292ddc9 100644
--- a/deps/v8/src/objects/source-text-module.tq
+++ b/deps/v8/src/objects/source-text-module.tq
@@ -12,7 +12,7 @@ bitfield struct SourceTextModuleFlags extends uint31 {
 @generateCppClass
 extern class SourceTextModule extends Module {
   // The code representing this module, or an abstraction thereof.
-  code: SharedFunctionInfo|JSFunction|JSGeneratorObject|SourceTextModuleInfo;
+  code: SharedFunctionInfo|JSFunction|JSGeneratorObject;
 
   // Arrays of cells corresponding to regular exports and regular imports.
   // A cell's position in the array is determined by the cell index of the
@@ -26,14 +26,16 @@ extern class SourceTextModule extends Module {
   // SourceTextModuleInfo::module_requests.
   requested_modules: FixedArray;
 
-  // Script from which the module originates.
-  script: Script;
-
   // The value of import.meta inside of this module.
   // Lazily initialized on first access. It's the hole before first access and
   // a JSObject afterwards.
   import_meta: TheHole|JSObject;
 
+  // The first visited module of a cycle. For modules not in a cycle, this is
+  // the module itself. It's the hole before the module state transitions to
+  // kEvaluated.
+  cycle_root: SourceTextModule|TheHole;
+
   async_parent_modules: ArrayList;
   top_level_capability: JSPromise|Undefined;
 
@@ -55,6 +57,9 @@ extern class ModuleRequest extends Struct {
   // Import assertions are stored in this array in the form:
   // [key1, value1, location1, key2, value2, location2, ...]
   import_assertions: FixedArray;
+
+  // Source text position of the module request
+  position: Smi;
 }
 
 @generateCppClass
diff --git a/deps/v8/src/objects/stack-frame-info.cc b/deps/v8/src/objects/stack-frame-info.cc
index 6fe5316631554e..b03329ea02f34d 100644
--- a/deps/v8/src/objects/stack-frame-info.cc
+++ b/deps/v8/src/objects/stack-frame-info.cc
@@ -78,8 +78,20 @@ int StackTraceFrame::GetWasmFunctionIndex(Handle<StackTraceFrame> frame) {
 
 // static
 Handle<Object> StackTraceFrame::GetFileName(Handle<StackTraceFrame> frame) {
-  auto name = GetFrameInfo(frame)->script_name();
-  return handle(name, frame->GetIsolate());
+  Isolate* isolate = frame->GetIsolate();
+
+  // Use FrameInfo if it's already there, but avoid initializing it for just
+  // the file name, as it is much more expensive than just getting this
+  // directly. See GetScriptNameOrSourceUrl() for more detail.
+  if (!frame->frame_info().IsUndefined()) {
+    auto name = GetFrameInfo(frame)->script_name();
+    return handle(name, isolate);
+  }
+  FrameArrayIterator it(isolate,
+                        handle(FrameArray::cast(frame->frame_array()), isolate),
+                        frame->frame_index());
+  DCHECK(it.HasFrame());
+  return it.Frame()->GetFileName();
 }
 
 // static
diff --git a/deps/v8/src/objects/string-comparator.h b/deps/v8/src/objects/string-comparator.h
index dc58d9aeb2073b..59acd4208790c8 100644
--- a/deps/v8/src/objects/string-comparator.h
+++ b/deps/v8/src/objects/string-comparator.h
@@ -13,44 +13,6 @@
 namespace v8 {
 namespace internal {
 
-// Compares the contents of two strings by reading and comparing
-// int-sized blocks of characters.
-template <typename Char>
-static inline bool CompareRawStringContents(const Char* const a,
-                                            const Char* const b, int length) {
-  return CompareChars(a, b, length) == 0;
-}
-
-template <typename Chars1, typename Chars2>
-class RawStringComparator : public AllStatic {
- public:
-  static inline bool compare(const Chars1* a, const Chars2* b, int len) {
-    DCHECK(sizeof(Chars1) != sizeof(Chars2));
-    for (int i = 0; i < len; i++) {
-      if (a[i] != b[i]) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-template <>
-class RawStringComparator<uint16_t, uint16_t> {
- public:
-  static inline bool compare(const uint16_t* a, const uint16_t* b, int len) {
-    return CompareRawStringContents(a, b, len);
-  }
-};
-
-template <>
-class RawStringComparator<uint8_t, uint8_t> {
- public:
-  static inline bool compare(const uint8_t* a, const uint8_t* b, int len) {
-    return CompareRawStringContents(a, b, len);
-  }
-};
-
 class StringComparator {
   class State {
    public:
@@ -92,7 +54,7 @@ class StringComparator {
   static inline bool Equals(State* state_1, State* state_2, int to_check) {
     const Chars1* a = reinterpret_cast<const Chars1*>(state_1->buffer8_);
     const Chars2* b = reinterpret_cast<const Chars2*>(state_2->buffer8_);
-    return RawStringComparator<Chars1, Chars2>::compare(a, b, to_check);
+    return CompareCharsEqual(a, b, to_check);
   }
 
   bool Equals(String string_1, String string_2);
diff --git a/deps/v8/src/objects/string-inl.h b/deps/v8/src/objects/string-inl.h
index ee1afd23a41b4e..3fb41215880fc1 100644
--- a/deps/v8/src/objects/string-inl.h
+++ b/deps/v8/src/objects/string-inl.h
@@ -5,6 +5,7 @@
 #ifndef V8_OBJECTS_STRING_INL_H_
 #define V8_OBJECTS_STRING_INL_H_
 
+#include "src/common/assert-scope.h"
 #include "src/common/external-pointer-inl.h"
 #include "src/common/external-pointer.h"
 #include "src/common/globals.h"
@@ -17,6 +18,7 @@
 #include "src/objects/string-table-inl.h"
 #include "src/objects/string.h"
 #include "src/strings/string-hasher-inl.h"
+#include "src/utils/utils.h"
 
 // Has to be the last include (doesn't have include guards):
 #include "src/objects/object-macros.h"
@@ -26,29 +28,45 @@ namespace internal {
 
 #include "torque-generated/src/objects/string-tq-inl.inc"
 
-// Creates a SharedMutexGuard<kShared> for the string access if:
-// A) {str} is not a read only string, and
-// B) We are on a background thread.
-class SharedStringAccessGuardIfNeeded {
+class V8_NODISCARD SharedStringAccessGuardIfNeeded {
  public:
-  explicit SharedStringAccessGuardIfNeeded(String str) {
-    Isolate* isolate;
-    if (IsNeeded(str, &isolate)) mutex_guard.emplace(isolate->string_access());
+  // Creates no SharedMutexGuard<kShared> for the string access since it was
+  // called from the main thread.
+  explicit SharedStringAccessGuardIfNeeded(Isolate* isolate) {}
+
+  // Creates a SharedMutexGuard<kShared> for the string access if it was called
+  // from a background thread.
+  explicit SharedStringAccessGuardIfNeeded(LocalIsolate* local_isolate) {
+    if (IsNeeded(local_isolate)) {
+      mutex_guard.emplace(local_isolate->string_access());
+    }
   }
 
   static SharedStringAccessGuardIfNeeded NotNeeded() {
     return SharedStringAccessGuardIfNeeded();
   }
 
-  static bool IsNeeded(String str, Isolate** out_isolate = nullptr) {
+#ifdef DEBUG
+  static bool IsNeeded(String str) {
+    LocalHeap* local_heap = LocalHeap::Current();
+    // Don't acquire the lock for the main thread.
+    if (!local_heap || local_heap->is_main_thread()) return false;
+
     Isolate* isolate;
     if (!GetIsolateFromHeapObject(str, &isolate)) {
       // If we can't get the isolate from the String, it must be read-only.
       DCHECK(ReadOnlyHeap::Contains(str));
       return false;
     }
-    if (out_isolate) *out_isolate = isolate;
-    return ThreadId::Current() != isolate->thread_id();
+    return true;
+  }
+#endif
+
+  static bool IsNeeded(Isolate* isolate) { return false; }
+
+  static bool IsNeeded(LocalIsolate* local_isolate) {
+    // TODO(leszeks): Remove the nullptr check for local_isolate.
+    return local_isolate && !local_isolate->heap()->is_main_thread();
   }
 
  private:
@@ -136,6 +154,10 @@ bool StringShape::IsSequential() {
   return (type_ & kStringRepresentationMask) == kSeqStringTag;
 }
 
+bool StringShape::IsUncachedExternal() {
+  return (type_ & kUncachedExternalStringMask) == kUncachedExternalStringTag;
+}
+
 StringRepresentationTag StringShape::representation_tag() {
   uint32_t tag = (type_ & kStringRepresentationMask);
   return static_cast<StringRepresentationTag>(tag);
@@ -294,39 +316,33 @@ class SequentialStringKey final : public StringTableKey {
                                 chars.begin(), chars.length(), seed),
                             chars, convert) {}
 
-  SequentialStringKey(int hash, const Vector<const Char>& chars,
+  SequentialStringKey(int raw_hash_field, const Vector<const Char>& chars,
                       bool convert = false)
-      : StringTableKey(hash, chars.length()),
+      : StringTableKey(raw_hash_field, chars.length()),
         chars_(chars),
         convert_(convert) {}
 
-  bool IsMatch(String s) override {
-    SharedStringAccessGuardIfNeeded access_guard(s);
-    DisallowHeapAllocation no_gc;
-    if (s.IsOneByteRepresentation()) {
-      const uint8_t* chars = s.GetChars<uint8_t>(no_gc, access_guard);
-      return CompareChars(chars, chars_.begin(), chars_.length()) == 0;
-    }
-    const uint16_t* chars = s.GetChars<uint16_t>(no_gc, access_guard);
-    return CompareChars(chars, chars_.begin(), chars_.length()) == 0;
+  template <typename LocalIsolate>
+  bool IsMatch(LocalIsolate* isolate, String s) {
+    return s.IsEqualTo<String::EqualityType::kNoLengthCheck>(chars_, isolate);
   }
 
   Handle<String> AsHandle(Isolate* isolate) {
     if (sizeof(Char) == 1) {
       return isolate->factory()->NewOneByteInternalizedString(
-          Vector<const uint8_t>::cast(chars_), hash_field());
+          Vector<const uint8_t>::cast(chars_), raw_hash_field());
     }
     return isolate->factory()->NewTwoByteInternalizedString(
-        Vector<const uint16_t>::cast(chars_), hash_field());
+        Vector<const uint16_t>::cast(chars_), raw_hash_field());
   }
 
   Handle<String> AsHandle(LocalIsolate* isolate) {
     if (sizeof(Char) == 1) {
       return isolate->factory()->NewOneByteInternalizedString(
-          Vector<const uint8_t>::cast(chars_), hash_field());
+          Vector<const uint8_t>::cast(chars_), raw_hash_field());
     }
     return isolate->factory()->NewTwoByteInternalizedString(
-        Vector<const uint16_t>::cast(chars_), hash_field());
+        Vector<const uint16_t>::cast(chars_), raw_hash_field());
   }
 
  private:
@@ -356,10 +372,10 @@ class SeqSubStringKey final : public StringTableKey {
         from_(from),
         convert_(convert) {
     // We have to set the hash later.
-    DisallowHeapAllocation no_gc;
-    uint32_t hash = StringHasher::HashSequentialString(
+    DisallowGarbageCollection no_gc;
+    uint32_t raw_hash_field = StringHasher::HashSequentialString(
         string->GetChars(no_gc) + from, len, HashSeed(isolate));
-    set_hash_field(hash);
+    set_raw_hash_field(raw_hash_field);
 
     DCHECK_LE(0, length());
     DCHECK_LE(from_ + length(), string_->length());
@@ -370,32 +386,28 @@ class SeqSubStringKey final : public StringTableKey {
 #pragma warning(pop)
 #endif
 
-  bool IsMatch(String string) override {
-    DisallowHeapAllocation no_gc;
-    if (string.IsOneByteRepresentation()) {
-      const uint8_t* data = string.GetChars<uint8_t>(no_gc);
-      return CompareChars(string_->GetChars(no_gc) + from_, data, length()) ==
-             0;
-    }
-    const uint16_t* data = string.GetChars<uint16_t>(no_gc);
-    return CompareChars(string_->GetChars(no_gc) + from_, data, length()) == 0;
+  bool IsMatch(Isolate* isolate, String string) {
+    DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(string));
+    DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(*string_));
+    DisallowGarbageCollection no_gc;
+    return string.IsEqualTo<String::EqualityType::kNoLengthCheck>(
+        Vector<const Char>(string_->GetChars(no_gc) + from_, length()));
   }
 
-  template <typename LocalIsolate>
-  Handle<String> AsHandle(LocalIsolate* isolate) {
+  Handle<String> AsHandle(Isolate* isolate) {
     if (sizeof(Char) == 1 || (sizeof(Char) == 2 && convert_)) {
       Handle<SeqOneByteString> result =
           isolate->factory()->AllocateRawOneByteInternalizedString(
-              length(), hash_field());
-      DisallowHeapAllocation no_gc;
+              length(), raw_hash_field());
+      DisallowGarbageCollection no_gc;
       CopyChars(result->GetChars(no_gc), string_->GetChars(no_gc) + from_,
                 length());
       return result;
     }
     Handle<SeqTwoByteString> result =
-        isolate->factory()->AllocateRawTwoByteInternalizedString(length(),
-                                                                 hash_field());
-    DisallowHeapAllocation no_gc;
+        isolate->factory()->AllocateRawTwoByteInternalizedString(
+            length(), raw_hash_field());
+    DisallowGarbageCollection no_gc;
     CopyChars(result->GetChars(no_gc), string_->GetChars(no_gc) + from_,
               length());
     return result;
@@ -426,8 +438,99 @@ bool String::Equals(Isolate* isolate, Handle<String> one, Handle<String> two) {
   return SlowEquals(isolate, one, two);
 }
 
+template <String::EqualityType kEqType, typename Char>
+bool String::IsEqualTo(Vector<const Char> str, Isolate* isolate) const {
+  DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(*this));
+  return IsEqualToImpl<kEqType>(str,
+                                SharedStringAccessGuardIfNeeded::NotNeeded());
+}
+
+template <String::EqualityType kEqType, typename Char>
+bool String::IsEqualTo(Vector<const Char> str, LocalIsolate* isolate) const {
+  SharedStringAccessGuardIfNeeded access_guard(isolate);
+  return IsEqualToImpl<kEqType>(str, access_guard);
+}
+
+template <String::EqualityType kEqType, typename Char>
+bool String::IsEqualToImpl(
+    Vector<const Char> str,
+    const SharedStringAccessGuardIfNeeded& access_guard) const {
+  size_t len = str.size();
+  switch (kEqType) {
+    case EqualityType::kWholeString:
+      if (static_cast<size_t>(length()) != len) return false;
+      break;
+    case EqualityType::kPrefix:
+      if (static_cast<size_t>(length()) < len) return false;
+      break;
+    case EqualityType::kNoLengthCheck:
+      DCHECK_EQ(length(), len);
+      break;
+  }
+
+  DisallowGarbageCollection no_gc;
+
+  class IsEqualToDispatcher : public AllStatic {
+   public:
+    static inline bool HandleSeqOneByteString(
+        SeqOneByteString str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      return CompareCharsEqual(str.GetChars(no_gc, access_guard), data, len);
+    }
+    static inline bool HandleSeqTwoByteString(
+        SeqTwoByteString str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      return CompareCharsEqual(str.GetChars(no_gc, access_guard), data, len);
+    }
+    static inline bool HandleExternalOneByteString(
+        ExternalOneByteString str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      return CompareCharsEqual(str.GetChars(), data, len);
+    }
+    static inline bool HandleExternalTwoByteString(
+        ExternalTwoByteString str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      return CompareCharsEqual(str.GetChars(), data, len);
+    }
+    static inline bool HandleConsString(
+        ConsString str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      UNREACHABLE();
+    }
+    static inline bool HandleSlicedString(
+        SlicedString str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      UNREACHABLE();
+    }
+    static inline bool HandleThinString(
+        ThinString str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      UNREACHABLE();
+    }
+    static inline bool HandleInvalidString(
+        String str, const Char* data, size_t len,
+        const DisallowGarbageCollection& no_gc,
+        const SharedStringAccessGuardIfNeeded& access_guard) {
+      UNREACHABLE();
+    }
+  };
+
+  return StringShape(*this).DispatchToSpecificType<IsEqualToDispatcher, bool>(
+      *this, str.data(), len, no_gc, access_guard);
+}
+
+bool String::IsOneByteEqualTo(Vector<const char> str) { return IsEqualTo(str); }
+
 template <typename Char>
-const Char* String::GetChars(const DisallowHeapAllocation& no_gc) {
+const Char* String::GetChars(const DisallowGarbageCollection& no_gc) {
+  DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(*this));
   return StringShape(*this).IsExternal()
              ? CharTraits<Char>::ExternalString::cast(*this).GetChars()
              : CharTraits<Char>::String::cast(*this).GetChars(no_gc);
@@ -435,7 +538,7 @@ const Char* String::GetChars(const DisallowHeapAllocation& no_gc) {
 
 template <typename Char>
 const Char* String::GetChars(
-    const DisallowHeapAllocation& no_gc,
+    const DisallowGarbageCollection& no_gc,
     const SharedStringAccessGuardIfNeeded& access_guard) {
   return StringShape(*this).IsExternal()
              ? CharTraits<Char>::ExternalString::cast(*this).GetChars()
@@ -467,10 +570,18 @@ Handle<String> String::Flatten(LocalIsolate* isolate, Handle<String> string,
   return string;
 }
 
-uint16_t String::Get(int index) {
-  DCHECK(index >= 0 && index < length());
+uint16_t String::Get(int index, Isolate* isolate) {
+  DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(*this));
+  return GetImpl(index);
+}
 
-  SharedStringAccessGuardIfNeeded scope(*this);
+uint16_t String::Get(int index, LocalIsolate* local_isolate) {
+  SharedStringAccessGuardIfNeeded scope(local_isolate);
+  return GetImpl(index);
+}
+
+uint16_t String::GetImpl(int index) {
+  DCHECK(index >= 0 && index < length());
 
   class StringGetDispatcher : public AllStatic {
    public:
@@ -519,7 +630,7 @@ String String::GetUnderlying() {
 template <class Visitor>
 ConsString String::VisitFlat(Visitor* visitor, String string,
                              const int offset) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int slice_offset = offset;
   const int length = string.length();
   DCHECK(offset <= length);
@@ -575,7 +686,7 @@ ConsString String::VisitFlat(Visitor* visitor, String string,
 
 template <>
 inline Vector<const uint8_t> String::GetCharVector(
-    const DisallowHeapAllocation& no_gc) {
+    const DisallowGarbageCollection& no_gc) {
   String::FlatContent flat = GetFlatContent(no_gc);
   DCHECK(flat.IsOneByte());
   return flat.ToOneByteVector();
@@ -583,7 +694,7 @@ inline Vector<const uint8_t> String::GetCharVector(
 
 template <>
 inline Vector<const uc16> String::GetCharVector(
-    const DisallowHeapAllocation& no_gc) {
+    const DisallowGarbageCollection& no_gc) {
   String::FlatContent flat = GetFlatContent(no_gc);
   DCHECK(flat.IsTwoByte());
   return flat.ToUC16Vector();
@@ -610,14 +721,14 @@ Address SeqOneByteString::GetCharsAddress() {
   return field_address(kHeaderSize);
 }
 
-uint8_t* SeqOneByteString::GetChars(const DisallowHeapAllocation& no_gc) {
+uint8_t* SeqOneByteString::GetChars(const DisallowGarbageCollection& no_gc) {
   USE(no_gc);
   DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(*this));
   return reinterpret_cast<uint8_t*>(GetCharsAddress());
 }
 
 uint8_t* SeqOneByteString::GetChars(
-    const DisallowHeapAllocation& no_gc,
+    const DisallowGarbageCollection& no_gc,
     const SharedStringAccessGuardIfNeeded& access_guard) {
   USE(no_gc);
   USE(access_guard);
@@ -628,14 +739,14 @@ Address SeqTwoByteString::GetCharsAddress() {
   return field_address(kHeaderSize);
 }
 
-uc16* SeqTwoByteString::GetChars(const DisallowHeapAllocation& no_gc) {
+uc16* SeqTwoByteString::GetChars(const DisallowGarbageCollection& no_gc) {
   USE(no_gc);
   DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(*this));
   return reinterpret_cast<uc16*>(GetCharsAddress());
 }
 
 uc16* SeqTwoByteString::GetChars(
-    const DisallowHeapAllocation& no_gc,
+    const DisallowGarbageCollection& no_gc,
     const SharedStringAccessGuardIfNeeded& access_guard) {
   USE(no_gc);
   USE(access_guard);
@@ -738,6 +849,7 @@ DEF_GETTER(ExternalOneByteString, resource,
 
 void ExternalOneByteString::update_data_cache(Isolate* isolate) {
   if (is_uncached()) return;
+  DisallowGarbageCollection no_gc;
   WriteExternalPointerField(kResourceDataOffset, isolate,
                             reinterpret_cast<Address>(resource()->data()),
                             kExternalStringResourceDataTag);
@@ -761,6 +873,7 @@ void ExternalOneByteString::set_resource(
 }
 
 const uint8_t* ExternalOneByteString::GetChars() {
+  DisallowGarbageCollection no_gc;
   return reinterpret_cast<const uint8_t*>(resource()->data());
 }
 
@@ -776,6 +889,7 @@ DEF_GETTER(ExternalTwoByteString, resource,
 
 void ExternalTwoByteString::update_data_cache(Isolate* isolate) {
   if (is_uncached()) return;
+  DisallowGarbageCollection no_gc;
   WriteExternalPointerField(kResourceDataOffset, isolate,
                             reinterpret_cast<Address>(resource()->data()),
                             kExternalStringResourceDataTag);
@@ -798,7 +912,10 @@ void ExternalTwoByteString::set_resource(
   if (resource != nullptr) update_data_cache(isolate);
 }
 
-const uint16_t* ExternalTwoByteString::GetChars() { return resource()->data(); }
+const uint16_t* ExternalTwoByteString::GetChars() {
+  DisallowGarbageCollection no_gc;
+  return resource()->data();
+}
 
 uint16_t ExternalTwoByteString::Get(int index) {
   DCHECK(index >= 0 && index < length());
@@ -881,8 +998,8 @@ void StringCharacterStream::VisitTwoByteString(const uint16_t* chars,
 }
 
 bool String::AsArrayIndex(uint32_t* index) {
-  DisallowHeapAllocation no_gc;
-  uint32_t field = hash_field();
+  DisallowGarbageCollection no_gc;
+  uint32_t field = raw_hash_field();
   if (ContainsCachedArrayIndex(field)) {
     *index = ArrayIndexValueBits::decode(field);
     return true;
@@ -894,7 +1011,7 @@ bool String::AsArrayIndex(uint32_t* index) {
 }
 
 bool String::AsIntegerIndex(size_t* index) {
-  uint32_t field = hash_field();
+  uint32_t field = raw_hash_field();
   if (ContainsCachedArrayIndex(field)) {
     *index = ArrayIndexValueBits::decode(field);
     return true;
@@ -906,8 +1023,8 @@ bool String::AsIntegerIndex(size_t* index) {
 }
 
 SubStringRange::SubStringRange(String string,
-                               const DisallowHeapAllocation& no_gc, int first,
-                               int length)
+                               const DisallowGarbageCollection& no_gc,
+                               int first, int length)
     : string_(string),
       first_(first),
       length_(length == -1 ? string.length() : length),
@@ -939,7 +1056,7 @@ class SubStringRange::iterator final {
  private:
   friend class String;
   friend class SubStringRange;
-  iterator(String from, int offset, const DisallowHeapAllocation& no_gc)
+  iterator(String from, int offset, const DisallowGarbageCollection& no_gc)
       : content_(from.GetFlatContent(no_gc)), offset_(offset) {}
   String::FlatContent content_;
   int offset_;
diff --git a/deps/v8/src/objects/string-set-inl.h b/deps/v8/src/objects/string-set-inl.h
index 49e96dd2a660b3..ff35fe085aac61 100644
--- a/deps/v8/src/objects/string-set-inl.h
+++ b/deps/v8/src/objects/string-set-inl.h
@@ -26,11 +26,11 @@ bool StringSetShape::IsMatch(String key, Object value) {
 }
 
 uint32_t StringSetShape::Hash(ReadOnlyRoots roots, String key) {
-  return key.Hash();
+  return key.EnsureHash();
 }
 
 uint32_t StringSetShape::HashForObject(ReadOnlyRoots roots, Object object) {
-  return String::cast(object).Hash();
+  return String::cast(object).EnsureHash();
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/objects/string-table-inl.h b/deps/v8/src/objects/string-table-inl.h
index 4bbaa6c09c6626..4a33dd8c5cd3bf 100644
--- a/deps/v8/src/objects/string-table-inl.h
+++ b/deps/v8/src/objects/string-table-inl.h
@@ -13,15 +13,15 @@
 namespace v8 {
 namespace internal {
 
-StringTableKey::StringTableKey(uint32_t hash_field, int length)
-    : hash_field_(hash_field), length_(length) {}
+StringTableKey::StringTableKey(uint32_t raw_hash_field, int length)
+    : raw_hash_field_(raw_hash_field), length_(length) {}
 
-void StringTableKey::set_hash_field(uint32_t hash_field) {
-  hash_field_ = hash_field;
+void StringTableKey::set_raw_hash_field(uint32_t raw_hash_field) {
+  raw_hash_field_ = raw_hash_field;
 }
 
 uint32_t StringTableKey::hash() const {
-  return hash_field_ >> Name::kHashShift;
+  return raw_hash_field_ >> Name::kHashShift;
 }
 
 }  // namespace internal
diff --git a/deps/v8/src/objects/string-table.cc b/deps/v8/src/objects/string-table.cc
index 85f31a2e563948..1f772f6edf53a6 100644
--- a/deps/v8/src/objects/string-table.cc
+++ b/deps/v8/src/objects/string-table.cc
@@ -69,11 +69,11 @@ int ComputeStringTableCapacityWithShrink(int current_capacity,
   return new_capacity;
 }
 
-template <typename StringTableKey>
-bool KeyIsMatch(StringTableKey* key, String string) {
-  if (string.hash_field() != key->hash_field()) return false;
+template <typename LocalIsolate, typename StringTableKey>
+bool KeyIsMatch(LocalIsolate* isolate, StringTableKey* key, String string) {
+  if (string.hash() != key->hash()) return false;
   if (string.length() != key->length()) return false;
-  return key->IsMatch(string);
+  return key->IsMatch(isolate, string);
 }
 
 }  // namespace
@@ -135,14 +135,14 @@ class StringTable::Data {
   int number_of_elements() const { return number_of_elements_; }
   int number_of_deleted_elements() const { return number_of_deleted_elements_; }
 
-  template <typename StringTableKey>
-  InternalIndex FindEntry(IsolateRoot isolate, StringTableKey* key,
+  template <typename LocalIsolate, typename StringTableKey>
+  InternalIndex FindEntry(LocalIsolate* isolate, StringTableKey* key,
                           uint32_t hash) const;
 
   InternalIndex FindInsertionEntry(IsolateRoot isolate, uint32_t hash) const;
 
-  template <typename StringTableKey>
-  InternalIndex FindEntryOrInsertionEntry(IsolateRoot isolate,
+  template <typename LocalIsolate, typename StringTableKey>
+  InternalIndex FindEntryOrInsertionEntry(LocalIsolate* isolate,
                                           StringTableKey* key,
                                           uint32_t hash) const;
 
@@ -237,7 +237,7 @@ std::unique_ptr<StringTable::Data> StringTable::Data::Resize(
     Object element = data->Get(isolate, i);
     if (element == empty_element() || element == deleted_element()) continue;
     String string = String::cast(element);
-    uint32_t hash = string.Hash();
+    uint32_t hash = string.hash();
     InternalIndex insertion_index = new_data->FindInsertionEntry(isolate, hash);
     new_data->Set(insertion_index, string);
   }
@@ -247,13 +247,12 @@ std::unique_ptr<StringTable::Data> StringTable::Data::Resize(
   return new_data;
 }
 
-template <typename StringTableKey>
-InternalIndex StringTable::Data::FindEntry(IsolateRoot isolate,
+template <typename LocalIsolate, typename StringTableKey>
+InternalIndex StringTable::Data::FindEntry(LocalIsolate* isolate,
                                            StringTableKey* key,
                                            uint32_t hash) const {
   uint32_t count = 1;
   // EnsureCapacity will guarantee the hash table is never full.
-  DCHECK_LT(number_of_elements_, capacity_);
   for (InternalIndex entry = FirstProbe(hash, capacity_);;
        entry = NextProbe(entry, count++, capacity_)) {
     // TODO(leszeks): Consider delaying the decompression until after the
@@ -262,7 +261,7 @@ InternalIndex StringTable::Data::FindEntry(IsolateRoot isolate,
     if (element == empty_element()) return InternalIndex::NotFound();
     if (element == deleted_element()) continue;
     String string = String::cast(element);
-    if (KeyIsMatch(key, string)) return entry;
+    if (KeyIsMatch(isolate, key, string)) return entry;
   }
 }
 
@@ -270,7 +269,6 @@ InternalIndex StringTable::Data::FindInsertionEntry(IsolateRoot isolate,
                                                     uint32_t hash) const {
   uint32_t count = 1;
   // EnsureCapacity will guarantee the hash table is never full.
-  DCHECK_LT(number_of_elements_, capacity_);
   for (InternalIndex entry = FirstProbe(hash, capacity_);;
        entry = NextProbe(entry, count++, capacity_)) {
     // TODO(leszeks): Consider delaying the decompression until after the
@@ -281,13 +279,12 @@ InternalIndex StringTable::Data::FindInsertionEntry(IsolateRoot isolate,
   }
 }
 
-template <typename StringTableKey>
+template <typename LocalIsolate, typename StringTableKey>
 InternalIndex StringTable::Data::FindEntryOrInsertionEntry(
-    IsolateRoot isolate, StringTableKey* key, uint32_t hash) const {
+    LocalIsolate* isolate, StringTableKey* key, uint32_t hash) const {
   InternalIndex insertion_entry = InternalIndex::NotFound();
   uint32_t count = 1;
   // EnsureCapacity will guarantee the hash table is never full.
-  DCHECK_LT(number_of_elements_, capacity_);
   for (InternalIndex entry = FirstProbe(hash, capacity_);;
        entry = NextProbe(entry, count++, capacity_)) {
     // TODO(leszeks): Consider delaying the decompression until after the
@@ -307,7 +304,7 @@ InternalIndex StringTable::Data::FindEntryOrInsertionEntry(
     }
 
     String string = String::cast(element);
-    if (KeyIsMatch(key, string)) return entry;
+    if (KeyIsMatch(isolate, key, string)) return entry;
   }
 }
 
@@ -354,11 +351,11 @@ class InternalizedStringKey final : public StringTableKey {
     DCHECK(!string->IsInternalizedString());
     DCHECK(string->IsFlat());
     // Make sure hash_field is computed.
-    string->Hash();
-    set_hash_field(string->hash_field());
+    string->EnsureHash();
+    set_raw_hash_field(string->raw_hash_field());
   }
 
-  bool IsMatch(String string) override {
+  bool IsMatch(Isolate* isolate, String string) {
     DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(string));
     return string_->SlowEquals(string);
   }
@@ -375,18 +372,19 @@ class InternalizedStringKey final : public StringTableKey {
     }
     if (FLAG_thin_strings) {
       // External strings get special treatment, to avoid copying their
-      // contents.
-      if (string_->IsExternalOneByteString()) {
+      // contents as long as they are not uncached.
+      StringShape shape(*string_);
+      if (shape.IsExternalOneByte() && !shape.IsUncachedExternal()) {
         return isolate->factory()
             ->InternalizeExternalString<ExternalOneByteString>(string_);
-      } else if (string_->IsExternalTwoByteString()) {
+      } else if (shape.IsExternalTwoByte() && !shape.IsUncachedExternal()) {
         return isolate->factory()
             ->InternalizeExternalString<ExternalTwoByteString>(string_);
       }
     }
     // Otherwise allocate a new internalized string.
     return isolate->factory()->NewInternalizedStringImpl(
-        string_, string_->length(), string_->hash_field());
+        string_, string_->length(), string_->raw_hash_field());
   }
 
  private:
@@ -413,7 +411,7 @@ Handle<String> StringTable::LookupString(Isolate* isolate,
     } else if (string->IsSlicedString()) {
       STATIC_ASSERT(static_cast<int>(ConsString::kSize) ==
                     static_cast<int>(SlicedString::kSize));
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       bool one_byte = result->IsOneByteRepresentation();
       Handle<Map> map = one_byte
                             ? isolate->factory()->cons_one_byte_string_map()
@@ -464,57 +462,53 @@ Handle<String> StringTable::LookupKey(LocalIsolate* isolate,
   // allocation if another write also did an allocation. This assumes that
   // writes are rarer than reads.
 
-  Handle<String> new_string;
-  while (true) {
-    // Load the current string table data, in case another thread updates the
-    // data while we're reading.
-    const Data* data = data_.load(std::memory_order_acquire);
-
-    // First try to find the string in the table. This is safe to do even if the
-    // table is now reallocated; we won't find a stale entry in the old table
-    // because the new table won't delete it's corresponding entry until the
-    // string is dead, in which case it will die in this table too and worst
-    // case we'll have a false miss.
-    InternalIndex entry = data->FindEntry(isolate, key, key->hash());
-    if (entry.is_found()) {
-      return handle(String::cast(data->Get(isolate, entry)), isolate);
-    }
+  // Load the current string table data, in case another thread updates the
+  // data while we're reading.
+  const Data* data = data_.load(std::memory_order_acquire);
+
+  // First try to find the string in the table. This is safe to do even if the
+  // table is now reallocated; we won't find a stale entry in the old table
+  // because the new table won't delete it's corresponding entry until the
+  // string is dead, in which case it will die in this table too and worst
+  // case we'll have a false miss.
+  InternalIndex entry = data->FindEntry(isolate, key, key->hash());
+  if (entry.is_found()) {
+    return handle(String::cast(data->Get(isolate, entry)), isolate);
+  }
 
-    // No entry found, so adding new string.
-
-    // Allocate the string before the first insertion attempt, reuse this
-    // allocated value on insertion retries. If another thread concurrently
-    // allocates the same string, the insert will fail, the lookup above will
-    // succeed, and this string will be discarded.
-    if (new_string.is_null()) new_string = key->AsHandle(isolate);
-
-    {
-      base::MutexGuard table_write_guard(&write_mutex_);
-
-      Data* data = EnsureCapacity(isolate, 1);
-
-      // Check one last time if the key is present in the table, in case it was
-      // added after the check.
-      InternalIndex entry =
-          data->FindEntryOrInsertionEntry(isolate, key, key->hash());
-
-      Object element = data->Get(isolate, entry);
-      if (element == empty_element()) {
-        // This entry is empty, so write it and register that we added an
-        // element.
-        data->Set(entry, *new_string);
-        data->ElementAdded();
-        return new_string;
-      } else if (element == deleted_element()) {
-        // This entry was deleted, so overwrite it and register that we
-        // overwrote a deleted element.
-        data->Set(entry, *new_string);
-        data->DeletedElementOverwritten();
-        return new_string;
-      } else {
-        // Return the existing string as a handle.
-        return handle(String::cast(element), isolate);
-      }
+  // No entry found, so adding new string.
+
+  // Allocate the string before the first insertion attempt, reuse this
+  // allocated value on insertion retries. If another thread concurrently
+  // allocates the same string, the insert will fail, the lookup above will
+  // succeed, and this string will be discarded.
+  Handle<String> new_string = key->AsHandle(isolate);
+
+  {
+    base::MutexGuard table_write_guard(&write_mutex_);
+
+    Data* data = EnsureCapacity(isolate, 1);
+
+    // Check one last time if the key is present in the table, in case it was
+    // added after the check.
+    entry = data->FindEntryOrInsertionEntry(isolate, key, key->hash());
+
+    Object element = data->Get(isolate, entry);
+    if (element == empty_element()) {
+      // This entry is empty, so write it and register that we added an
+      // element.
+      data->Set(entry, *new_string);
+      data->ElementAdded();
+      return new_string;
+    } else if (element == deleted_element()) {
+      // This entry was deleted, so overwrite it and register that we
+      // overwrote a deleted element.
+      data->Set(entry, *new_string);
+      data->DeletedElementOverwritten();
+      return new_string;
+    } else {
+      // Return the existing string as a handle.
+      return handle(String::cast(element), isolate);
     }
   }
 }
@@ -532,10 +526,6 @@ template Handle<String> StringTable::LookupKey(LocalIsolate* isolate,
                                                OneByteStringKey* key);
 template Handle<String> StringTable::LookupKey(LocalIsolate* isolate,
                                                TwoByteStringKey* key);
-template Handle<String> StringTable::LookupKey(LocalIsolate* isolate,
-                                               SeqOneByteSubStringKey* key);
-template Handle<String> StringTable::LookupKey(LocalIsolate* isolate,
-                                               SeqTwoByteSubStringKey* key);
 
 template Handle<String> StringTable::LookupKey(Isolate* isolate,
                                                StringTableInsertionKey* key);
@@ -593,7 +583,7 @@ Address StringTable::Data::TryStringToIndexOrLookupExisting(Isolate* isolate,
   // Ideally it would be a free function in an anonymous namespace, but that
   // causes issues around method and class visibility.
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   uint64_t seed = HashSeed(isolate);
 
   int length = string.length();
@@ -613,13 +603,14 @@ Address StringTable::Data::TryStringToIndexOrLookupExisting(Isolate* isolate,
   SequentialStringKey<Char> key(Vector<const Char>(chars, length), seed);
 
   // String could be an array index.
-  uint32_t hash_field = key.hash_field();
+  uint32_t raw_hash_field = key.raw_hash_field();
 
-  if (Name::ContainsCachedArrayIndex(hash_field)) {
-    return Smi::FromInt(String::ArrayIndexValueBits::decode(hash_field)).ptr();
+  if (Name::ContainsCachedArrayIndex(raw_hash_field)) {
+    return Smi::FromInt(String::ArrayIndexValueBits::decode(raw_hash_field))
+        .ptr();
   }
 
-  if ((hash_field & Name::kIsNotIntegerIndexMask) == 0) {
+  if ((raw_hash_field & Name::kIsNotIntegerIndexMask) == 0) {
     // It is an index, but it's not cached.
     return Smi::FromInt(ResultSentinel::kUnsupported).ptr();
   }
diff --git a/deps/v8/src/objects/string-table.h b/deps/v8/src/objects/string-table.h
index cdbb22db803272..baf9518ea3feca 100644
--- a/deps/v8/src/objects/string-table.h
+++ b/deps/v8/src/objects/string-table.h
@@ -20,26 +20,21 @@ namespace internal {
 class StringTableKey {
  public:
   virtual ~StringTableKey() = default;
-  inline StringTableKey(uint32_t hash_field, int length);
+  inline StringTableKey(uint32_t raw_hash_field, int length);
 
-  // The individual keys will have their own AsHandle, we shouldn't call the
-  // base version.
-  Handle<String> AsHandle(Isolate* isolate) = delete;
-
-  uint32_t hash_field() const {
-    DCHECK_NE(0, hash_field_);
-    return hash_field_;
+  uint32_t raw_hash_field() const {
+    DCHECK_NE(0, raw_hash_field_);
+    return raw_hash_field_;
   }
 
-  virtual bool IsMatch(String string) = 0;
   inline uint32_t hash() const;
   int length() const { return length_; }
 
  protected:
-  inline void set_hash_field(uint32_t hash_field);
+  inline void set_raw_hash_field(uint32_t raw_hash_field);
 
  private:
-  uint32_t hash_field_ = 0;
+  uint32_t raw_hash_field_ = 0;
   int length_;
 };
 
diff --git a/deps/v8/src/objects/string.cc b/deps/v8/src/objects/string.cc
index 4c023f98014391..4abf15f3331cc1 100644
--- a/deps/v8/src/objects/string.cc
+++ b/deps/v8/src/objects/string.cc
@@ -43,7 +43,6 @@ Handle<String> String::SlowFlatten(Isolate* isolate, Handle<ConsString> cons,
     }
   }
 
-  DCHECK(AllowHeapAllocation::IsAllowed());
   DCHECK(AllowGarbageCollection::IsAllowed());
   int length = cons->length();
   allocation =
@@ -54,7 +53,7 @@ Handle<String> String::SlowFlatten(Isolate* isolate, Handle<ConsString> cons,
         isolate->factory()
             ->NewRawOneByteString(length, allocation)
             .ToHandleChecked();
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     WriteToFlat(*cons, flat->GetChars(no_gc), 0, length);
     result = flat;
   } else {
@@ -62,7 +61,7 @@ Handle<String> String::SlowFlatten(Isolate* isolate, Handle<ConsString> cons,
         isolate->factory()
             ->NewRawTwoByteString(length, allocation)
             .ToHandleChecked();
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     WriteToFlat(*cons, flat->GetChars(no_gc), 0, length);
     result = flat;
   }
@@ -96,7 +95,7 @@ void MigrateExternalStringResource(Isolate* isolate, ExternalString from,
 }  // namespace
 
 void String::MakeThin(Isolate* isolate, String internalized) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_NE(*this, internalized);
   DCHECK(internalized.IsInternalizedString());
 
@@ -139,7 +138,9 @@ void String::MakeThin(Isolate* isolate, String internalized) {
 }
 
 bool String::MakeExternal(v8::String::ExternalStringResource* resource) {
-  DisallowHeapAllocation no_allocation;
+  // Disallow garbage collection to avoid possible GC vs string access deadlock.
+  DisallowGarbageCollection no_gc;
+
   // Externalizing twice leaks the external resource, so it's
   // prohibited by the API.
   DCHECK(this->SupportsExternalization());
@@ -165,12 +166,10 @@ bool String::MakeExternal(v8::String::ExternalStringResource* resource) {
   bool has_pointers = StringShape(*this).IsIndirect();
 
   if (has_pointers) {
-    isolate->heap()->NotifyObjectLayoutChange(*this, no_allocation,
+    isolate->heap()->NotifyObjectLayoutChange(*this, no_gc,
                                               InvalidateRecordedSlots::kYes);
   }
 
-  // Disallow garbage collection to avoid possible GC vs string access deadlock.
-  DisallowGarbageCollection no_gc;
   base::SharedMutexGuard<base::kExclusive> shared_mutex_guard(
       isolate->string_access());
   // Morph the string to an external string by replacing the map and
@@ -183,7 +182,9 @@ bool String::MakeExternal(v8::String::ExternalStringResource* resource) {
   ReadOnlyRoots roots(isolate);
   if (size < ExternalString::kSizeOfAllExternalStrings) {
     if (is_internalized) {
-      new_map = roots.uncached_external_internalized_string_map();
+      // We do not support this case since accessing internal external
+      // uncached strings is not thread-safe.
+      return false;
     } else {
       new_map = roots.uncached_external_string_map();
     }
@@ -206,12 +207,15 @@ bool String::MakeExternal(v8::String::ExternalStringResource* resource) {
   self.AllocateExternalPointerEntries(isolate);
   self.SetResource(isolate, resource);
   isolate->heap()->RegisterExternalString(*this);
-  if (is_internalized) self.Hash();  // Force regeneration of the hash value.
+  // Force regeneration of the hash value.
+  if (is_internalized) self.EnsureHash();
   return true;
 }
 
 bool String::MakeExternal(v8::String::ExternalOneByteStringResource* resource) {
-  DisallowHeapAllocation no_allocation;
+  // Disallow garbage collection to avoid possible GC vs string access deadlock.
+  DisallowGarbageCollection no_gc;
+
   // Externalizing twice leaks the external resource, so it's
   // prohibited by the API.
   DCHECK(this->SupportsExternalization());
@@ -242,12 +246,10 @@ bool String::MakeExternal(v8::String::ExternalOneByteStringResource* resource) {
   bool has_pointers = StringShape(*this).IsIndirect();
 
   if (has_pointers) {
-    isolate->heap()->NotifyObjectLayoutChange(*this, no_allocation,
+    isolate->heap()->NotifyObjectLayoutChange(*this, no_gc,
                                               InvalidateRecordedSlots::kYes);
   }
 
-  // Disallow garbage collection to avoid possible GC vs string access deadlock.
-  DisallowGarbageCollection no_gc;
   base::SharedMutexGuard<base::kExclusive> shared_mutex_guard(
       isolate->string_access());
   // Morph the string to an external string by replacing the map and
@@ -259,9 +261,13 @@ bool String::MakeExternal(v8::String::ExternalOneByteStringResource* resource) {
   Map new_map;
   ReadOnlyRoots roots(isolate);
   if (size < ExternalString::kSizeOfAllExternalStrings) {
-    new_map = is_internalized
-                  ? roots.uncached_external_one_byte_internalized_string_map()
-                  : roots.uncached_external_one_byte_string_map();
+    if (is_internalized) {
+      // We do not support this case since accessing internal external
+      // uncached strings is not thread-safe.
+      return false;
+    } else {
+      new_map = roots.uncached_external_one_byte_string_map();
+    }
   } else {
     new_map = is_internalized
                   ? roots.external_one_byte_internalized_string_map()
@@ -282,7 +288,8 @@ bool String::MakeExternal(v8::String::ExternalOneByteStringResource* resource) {
   self.AllocateExternalPointerEntries(isolate);
   self.SetResource(isolate, resource);
   isolate->heap()->RegisterExternalString(*this);
-  if (is_internalized) self.Hash();  // Force regeneration of the hash value.
+  // Force regeneration of the hash value.
+  if (is_internalized) self.EnsureHash();
   return true;
 }
 
@@ -308,6 +315,11 @@ bool String::SupportsExternalization() {
   DCHECK_LE(ExternalString::kUncachedSize, this->Size());
 #endif
 
+  if (this->Size() < ExternalString::kSizeOfAllExternalStrings &&
+      this->IsInternalizedString()) {
+    return false;
+  }
+
   Isolate* isolate = GetIsolateFromWritableObject(*this);
   return !isolate->heap()->IsInGCPostProcessing();
 }
@@ -399,34 +411,8 @@ void String::PrintUC16(StringStream* accumulator, int start, int end) {
   }
 }
 
-// static
-Handle<String> String::Trim(Isolate* isolate, Handle<String> string,
-                            TrimMode mode) {
-  string = String::Flatten(isolate, string);
-  int const length = string->length();
-
-  // Perform left trimming if requested.
-  int left = 0;
-  if (mode == kTrim || mode == kTrimStart) {
-    while (left < length && IsWhiteSpaceOrLineTerminator(string->Get(left))) {
-      left++;
-    }
-  }
-
-  // Perform right trimming if requested.
-  int right = length;
-  if (mode == kTrim || mode == kTrimEnd) {
-    while (right > left &&
-           IsWhiteSpaceOrLineTerminator(string->Get(right - 1))) {
-      right--;
-    }
-  }
-
-  return isolate->factory()->NewSubString(string, left, right);
-}
-
 int32_t String::ToArrayIndex(Address addr) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   String key(addr);
 
   uint32_t index;
@@ -439,6 +425,7 @@ bool String::LooksValid() {
   // TODO(leszeks): Maybe remove this check entirely, Heap::Contains uses
   // basically the same logic as the way we access the heap in the first place.
   // RO_SPACE objects should always be valid.
+  if (V8_ENABLE_THIRD_PARTY_HEAP_BOOL) return true;
   if (ReadOnlyHeap::Contains(*this)) return true;
   BasicMemoryChunk* chunk = BasicMemoryChunk::FromHeapObject(*this);
   if (chunk->heap() == nullptr) return false;
@@ -485,7 +472,7 @@ Handle<Object> String::ToNumber(Isolate* isolate, Handle<String> subject) {
     int len = subject->length();
     if (len == 0) return handle(Smi::zero(), isolate);
 
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     uint8_t const* data =
         Handle<SeqOneByteString>::cast(subject)->GetChars(no_gc);
     bool minus = (data[0] == '-');
@@ -512,13 +499,12 @@ Handle<Object> String::ToNumber(Isolate* isolate, Handle<String> subject) {
                  (len == 1 || data[0] != '0')) {
         // String hash is not calculated yet but all the data are present.
         // Update the hash field to speed up sequential convertions.
-        uint32_t hash = StringHasher::MakeArrayIndexHash(d, len);
+        uint32_t raw_hash_field = StringHasher::MakeArrayIndexHash(d, len);
 #ifdef DEBUG
-        subject->Hash();  // Force hash calculation.
-        DCHECK_EQ(static_cast<int>(subject->hash_field()),
-                  static_cast<int>(hash));
+        subject->EnsureHash();  // Force hash calculation.
+        DCHECK_EQ(subject->raw_hash_field(), raw_hash_field);
 #endif
-        subject->set_hash_field(hash);
+        subject->set_raw_hash_field(raw_hash_field);
       }
       return handle(Smi::FromInt(d), isolate);
     }
@@ -530,7 +516,7 @@ Handle<Object> String::ToNumber(Isolate* isolate, Handle<String> subject) {
 }
 
 String::FlatContent String::GetFlatContent(
-    const DisallowHeapAllocation& no_gc) {
+    const DisallowGarbageCollection& no_gc) {
 #if DEBUG
   // Check that this method is called only from the main thread.
   {
@@ -640,8 +626,15 @@ std::unique_ptr<char[]> String::ToCString(AllowNullsFlag allow_nulls,
 
 template <typename sinkchar>
 void String::WriteToFlat(String source, sinkchar* sink, int from, int to) {
-  DisallowHeapAllocation no_gc;
-  SharedStringAccessGuardIfNeeded access_guard(source);
+  DCHECK(!SharedStringAccessGuardIfNeeded::IsNeeded(source));
+  return WriteToFlat(source, sink, from, to,
+                     SharedStringAccessGuardIfNeeded::NotNeeded());
+}
+
+template <typename sinkchar>
+void String::WriteToFlat(String source, sinkchar* sink, int from, int to,
+                         const SharedStringAccessGuardIfNeeded& access_guard) {
+  DisallowGarbageCollection no_gc;
   while (from < to) {
     DCHECK_LE(0, from);
     DCHECK_LE(to, source.length());
@@ -678,7 +671,7 @@ void String::WriteToFlat(String source, sinkchar* sink, int from, int to) {
         if (to - boundary >= boundary - from) {
           // Right hand side is longer.  Recurse over left.
           if (from < boundary) {
-            WriteToFlat(first, sink, from, boundary);
+            WriteToFlat(first, sink, from, boundary, access_guard);
             if (from == 0 && cons_string.second() == first) {
               CopyChars(sink + boundary, sink, boundary);
               return;
@@ -705,7 +698,8 @@ void String::WriteToFlat(String source, sinkchar* sink, int from, int to) {
                   SeqOneByteString::cast(second).GetChars(no_gc, access_guard),
                   to - boundary);
             } else {
-              WriteToFlat(second, sink + boundary - from, 0, to - boundary);
+              WriteToFlat(second, sink + boundary - from, 0, to - boundary,
+                          access_guard);
             }
             to = boundary;
           }
@@ -717,7 +711,8 @@ void String::WriteToFlat(String source, sinkchar* sink, int from, int to) {
       case kTwoByteStringTag | kSlicedStringTag: {
         SlicedString slice = SlicedString::cast(source);
         unsigned offset = slice.offset();
-        WriteToFlat(slice.parent(), sink, from + offset, to + offset);
+        WriteToFlat(slice.parent(), sink, from + offset, to + offset,
+                    access_guard);
         return;
       }
       case kOneByteStringTag | kThinStringTag:
@@ -761,9 +756,9 @@ Handle<FixedArray> String::CalculateLineEnds(LocalIsolate* isolate,
   std::vector<int> line_ends;
   line_ends.reserve(line_count_estimate);
   {
-    DisallowHeapAllocation no_allocation;  // ensure vectors stay valid.
+    DisallowGarbageCollection no_gc;  // ensure vectors stay valid.
     // Dispatch on type of strings.
-    String::FlatContent content = src->GetFlatContent(no_allocation);
+    String::FlatContent content = src->GetFlatContent(no_gc);
     DCHECK(content.IsFlat());
     if (content.IsOneByte()) {
       CalculateLineEndsImpl(&line_ends, content.ToOneByteVector(),
@@ -790,7 +785,7 @@ template Handle<FixedArray> String::CalculateLineEnds(LocalIsolate* isolate,
                                                       bool include_ending_line);
 
 bool String::SlowEquals(String other) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Fast check: negative check with lengths.
   int len = length();
   if (len != other.length()) return false;
@@ -812,7 +807,7 @@ bool String::SlowEquals(String other) {
   if (HasHashCode() && other.HasHashCode()) {
 #ifdef ENABLE_SLOW_DCHECKS
     if (FLAG_enable_slow_asserts) {
-      if (Hash() != other.Hash()) {
+      if (hash() != other.hash()) {
         bool found_difference = false;
         for (int i = 0; i < len; i++) {
           if (Get(i) != other.Get(i)) {
@@ -824,7 +819,7 @@ bool String::SlowEquals(String other) {
       }
     }
 #endif
-    if (Hash() != other.Hash()) return false;
+    if (hash() != other.hash()) return false;
   }
 
   // We know the strings are both non-empty. Compare the first chars
@@ -834,7 +829,7 @@ bool String::SlowEquals(String other) {
   if (IsSeqOneByteString() && other.IsSeqOneByteString()) {
     const uint8_t* str1 = SeqOneByteString::cast(*this).GetChars(no_gc);
     const uint8_t* str2 = SeqOneByteString::cast(other).GetChars(no_gc);
-    return CompareRawStringContents(str1, str2, len);
+    return CompareCharsEqual(str1, str2, len);
   }
 
   StringComparator comparator;
@@ -863,7 +858,7 @@ bool String::SlowEquals(Isolate* isolate, Handle<String> one,
   if (one->HasHashCode() && two->HasHashCode()) {
 #ifdef ENABLE_SLOW_DCHECKS
     if (FLAG_enable_slow_asserts) {
-      if (one->Hash() != two->Hash()) {
+      if (one->hash() != two->hash()) {
         bool found_difference = false;
         for (int i = 0; i < one_length; i++) {
           if (one->Get(i) != two->Get(i)) {
@@ -875,7 +870,7 @@ bool String::SlowEquals(Isolate* isolate, Handle<String> one,
       }
     }
 #endif
-    if (one->Hash() != two->Hash()) return false;
+    if (one->hash() != two->hash()) return false;
   }
 
   // We know the strings are both non-empty. Compare the first chars
@@ -885,14 +880,13 @@ bool String::SlowEquals(Isolate* isolate, Handle<String> one,
   one = String::Flatten(isolate, one);
   two = String::Flatten(isolate, two);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   String::FlatContent flat1 = one->GetFlatContent(no_gc);
   String::FlatContent flat2 = two->GetFlatContent(no_gc);
 
   if (flat1.IsOneByte() && flat2.IsOneByte()) {
-    return CompareRawStringContents(flat1.ToOneByteVector().begin(),
-                                    flat2.ToOneByteVector().begin(),
-                                    one_length);
+    return CompareCharsEqual(flat1.ToOneByteVector().begin(),
+                             flat2.ToOneByteVector().begin(), one_length);
   } else {
     for (int i = 0; i < one_length; i++) {
       if (flat1.Get(i) != flat2.Get(i)) return false;
@@ -925,7 +919,7 @@ ComparisonResult String::Compare(Isolate* isolate, Handle<String> x,
   x = String::Flatten(isolate, x);
   y = String::Flatten(isolate, y);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   ComparisonResult result = ComparisonResult::kEqual;
   int prefix_length = x->length();
   if (y->length() < prefix_length) {
@@ -1017,7 +1011,7 @@ int String::IndexOf(Isolate* isolate, Handle<String> receiver,
   receiver = String::Flatten(isolate, receiver);
   search = String::Flatten(isolate, search);
 
-  DisallowHeapAllocation no_gc;  // ensure vectors stay valid
+  DisallowGarbageCollection no_gc;  // ensure vectors stay valid
   // Extract flattened substrings of cons strings before getting encoding.
   String::FlatContent receiver_content = receiver->GetFlatContent(no_gc);
   String::FlatContent search_content = search->GetFlatContent(no_gc);
@@ -1274,7 +1268,7 @@ Object String::LastIndexOf(Isolate* isolate, Handle<Object> receiver,
   search_string = String::Flatten(isolate, search_string);
 
   int last_index = -1;
-  DisallowHeapAllocation no_gc;  // ensure vectors stay valid
+  DisallowGarbageCollection no_gc;  // ensure vectors stay valid
 
   String::FlatContent receiver_content = receiver_string->GetFlatContent(no_gc);
   String::FlatContent search_content = search_string->GetFlatContent(no_gc);
@@ -1301,57 +1295,15 @@ Object String::LastIndexOf(Isolate* isolate, Handle<Object> receiver,
   return Smi::FromInt(last_index);
 }
 
-template <>
-bool String::IsEqualTo(Vector<const uint8_t> str) {
-  return IsOneByteEqualTo(str);
-}
-
-template <>
-bool String::IsEqualTo(Vector<const uc16> str) {
-  return IsTwoByteEqualTo(str);
-}
-
 bool String::HasOneBytePrefix(Vector<const char> str) {
-  int slen = str.length();
-  if (slen > length()) return false;
-  DisallowHeapAllocation no_gc;
-  FlatContent content = GetFlatContent(no_gc);
-  if (content.IsOneByte()) {
-    return CompareChars(content.ToOneByteVector().begin(), str.begin(), slen) ==
-           0;
-  }
-  return CompareChars(content.ToUC16Vector().begin(), str.begin(), slen) == 0;
-}
-
-bool String::IsOneByteEqualTo(Vector<const uint8_t> str) {
-  int slen = length();
-  if (str.length() != slen) return false;
-  DisallowHeapAllocation no_gc;
-  FlatContent content = GetFlatContent(no_gc);
-  if (content.IsOneByte()) {
-    return CompareChars(content.ToOneByteVector().begin(), str.begin(), slen) ==
-           0;
-  }
-  return CompareChars(content.ToUC16Vector().begin(), str.begin(), slen) == 0;
-}
-
-bool String::IsTwoByteEqualTo(Vector<const uc16> str) {
-  int slen = length();
-  if (str.length() != slen) return false;
-  DisallowHeapAllocation no_gc;
-  FlatContent content = GetFlatContent(no_gc);
-  if (content.IsOneByte()) {
-    return CompareChars(content.ToOneByteVector().begin(), str.begin(), slen) ==
-           0;
-  }
-  return CompareChars(content.ToUC16Vector().begin(), str.begin(), slen) == 0;
+  return IsEqualTo<EqualityType::kPrefix>(str);
 }
 
 namespace {
 
 template <typename Char>
 uint32_t HashString(String string, size_t start, int length, uint64_t seed) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (length > String::kMaxHashCalcLength) {
     return StringHasher::GetTrivialHash(length);
@@ -1376,7 +1328,7 @@ uint32_t HashString(String string, size_t start, int length, uint64_t seed) {
 }  // namespace
 
 uint32_t String::ComputeAndSetHash() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // Should only be called if hash code has not yet been computed.
   DCHECK(!HasHashCode());
 
@@ -1395,28 +1347,29 @@ uint32_t String::ComputeAndSetHash() {
   if (string.IsThinString()) {
     string = ThinString::cast(string).actual();
     if (length() == string.length()) {
-      set_hash_field(string.hash_field());
-      return hash_field() >> kHashShift;
+      set_raw_hash_field(string.raw_hash_field());
+      return hash();
     }
   }
-  uint32_t field = string.IsOneByteRepresentation()
-                       ? HashString<uint8_t>(string, start, length(), seed)
-                       : HashString<uint16_t>(string, start, length(), seed);
-  set_hash_field(field);
+  uint32_t raw_hash_field =
+      string.IsOneByteRepresentation()
+          ? HashString<uint8_t>(string, start, length(), seed)
+          : HashString<uint16_t>(string, start, length(), seed);
+  set_raw_hash_field(raw_hash_field);
 
   // Check the hash code is there.
   DCHECK(HasHashCode());
-  uint32_t result = field >> kHashShift;
+  uint32_t result = raw_hash_field >> kHashShift;
   DCHECK_NE(result, 0);  // Ensure that the hash value of 0 is never computed.
   return result;
 }
 
 bool String::SlowAsArrayIndex(uint32_t* index) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int length = this->length();
   if (length <= kMaxCachedArrayIndexLength) {
-    Hash();  // Force computation of hash code.
-    uint32_t field = hash_field();
+    EnsureHash();  // Force computation of hash code.
+    uint32_t field = raw_hash_field();
     if ((field & kIsNotIntegerIndexMask) != 0) return false;
     *index = ArrayIndexValueBits::decode(field);
     return true;
@@ -1427,11 +1380,11 @@ bool String::SlowAsArrayIndex(uint32_t* index) {
 }
 
 bool String::SlowAsIntegerIndex(size_t* index) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int length = this->length();
   if (length <= kMaxCachedArrayIndexLength) {
-    Hash();  // Force computation of hash code.
-    uint32_t field = hash_field();
+    EnsureHash();  // Force computation of hash code.
+    uint32_t field = raw_hash_field();
     if ((field & kIsNotIntegerIndexMask) != 0) return false;
     *index = ArrayIndexValueBits::decode(field);
     return true;
@@ -1544,7 +1497,7 @@ FlatStringReader::FlatStringReader(Isolate* isolate, Handle<String> str)
 
 void FlatStringReader::PostGarbageCollection() {
   DCHECK(str_->IsFlat());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // This does not actually prevent the vector from being relocated later.
   String::FlatContent content = str_->GetFlatContent(no_gc);
   DCHECK(content.IsFlat());
@@ -1688,8 +1641,8 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) {
   UNREACHABLE();
 }
 
-const byte* String::AddressOfCharacterAt(int start_index,
-                                         const DisallowHeapAllocation& no_gc) {
+const byte* String::AddressOfCharacterAt(
+    int start_index, const DisallowGarbageCollection& no_gc) {
   DCHECK(IsFlat());
   String subject = *this;
   if (subject.IsConsString()) {
@@ -1721,6 +1674,34 @@ const byte* String::AddressOfCharacterAt(int start_index,
 
 template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE) void String::WriteToFlat(
     String source, uint16_t* sink, int from, int to);
+template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE) void String::WriteToFlat(
+    String source, uint8_t* sink, int from, int to);
+template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE) void String::WriteToFlat(
+    String source, uint16_t* sink, int from, int to,
+    const SharedStringAccessGuardIfNeeded&);
+template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE) void String::WriteToFlat(
+    String source, uint8_t* sink, int from, int to,
+    const SharedStringAccessGuardIfNeeded&);
+
+namespace {
+// Check that the constants defined in src/objects/instance-type.h coincides
+// with the Torque-definition of string instance types in src/objects/string.tq.
+
+DEFINE_TORQUE_GENERATED_STRING_INSTANCE_TYPE()
+
+STATIC_ASSERT(kStringRepresentationMask == RepresentationBits::kMask);
+
+STATIC_ASSERT(kStringEncodingMask == IsOneByteBit::kMask);
+STATIC_ASSERT(kTwoByteStringTag == IsOneByteBit::encode(false));
+STATIC_ASSERT(kOneByteStringTag == IsOneByteBit::encode(true));
+
+STATIC_ASSERT(kUncachedExternalStringMask == IsUncachedBit::kMask);
+STATIC_ASSERT(kUncachedExternalStringTag == IsUncachedBit::encode(true));
+
+STATIC_ASSERT(kIsNotInternalizedMask == IsNotInternalizedBit::kMask);
+STATIC_ASSERT(kNotInternalizedTag == IsNotInternalizedBit::encode(true));
+STATIC_ASSERT(kInternalizedTag == IsNotInternalizedBit::encode(false));
+}  // namespace
 
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/objects/string.h b/deps/v8/src/objects/string.h
index dc4381b39d6bff..043beb730ec5d7 100644
--- a/deps/v8/src/objects/string.h
+++ b/deps/v8/src/objects/string.h
@@ -50,6 +50,7 @@ class StringShape {
   inline bool IsSliced();
   inline bool IsThin();
   inline bool IsIndirect();
+  inline bool IsUncachedExternal();
   inline bool IsExternalOneByte();
   inline bool IsExternalTwoByte();
   inline bool IsSequentialOneByte();
@@ -144,18 +145,18 @@ class String : public TorqueGeneratedString<String, Name> {
 
     // Constructors only used by String::GetFlatContent().
     FlatContent(const uint8_t* start, int length,
-                const DisallowHeapAllocation& no_gc)
+                const DisallowGarbageCollection& no_gc)
         : onebyte_start(start),
           length_(length),
           state_(ONE_BYTE),
           no_gc_(no_gc) {}
     FlatContent(const uc16* start, int length,
-                const DisallowHeapAllocation& no_gc)
+                const DisallowGarbageCollection& no_gc)
         : twobyte_start(start),
           length_(length),
           state_(TWO_BYTE),
           no_gc_(no_gc) {}
-    explicit FlatContent(const DisallowHeapAllocation& no_gc)
+    explicit FlatContent(const DisallowGarbageCollection& no_gc)
         : onebyte_start(nullptr), length_(0), state_(NON_FLAT), no_gc_(no_gc) {}
 
     union {
@@ -164,7 +165,7 @@ class String : public TorqueGeneratedString<String, Name> {
     };
     int length_;
     State state_;
-    const DisallowHeapAllocation& no_gc_;
+    const DisallowGarbageCollection& no_gc_;
 
     friend class String;
     friend class IterableSubString;
@@ -174,24 +175,24 @@ class String : public TorqueGeneratedString<String, Name> {
 
   template <typename Char>
   V8_INLINE Vector<const Char> GetCharVector(
-      const DisallowHeapAllocation& no_gc);
+      const DisallowGarbageCollection& no_gc);
 
   // Get chars from sequential or external strings. May only be called when a
   // SharedStringAccessGuard is not needed (i.e. on the main thread or on
   // read-only strings).
   template <typename Char>
-  inline const Char* GetChars(const DisallowHeapAllocation& no_gc);
+  inline const Char* GetChars(const DisallowGarbageCollection& no_gc);
 
   // Get chars from sequential or external strings.
   template <typename Char>
   inline const Char* GetChars(
-      const DisallowHeapAllocation& no_gc,
+      const DisallowGarbageCollection& no_gc,
       const SharedStringAccessGuardIfNeeded& access_guard);
 
   // Returns the address of the character at an offset into this string.
   // Requires: this->IsFlat()
   const byte* AddressOfCharacterAt(int start_index,
-                                   const DisallowHeapAllocation& no_gc);
+                                   const DisallowGarbageCollection& no_gc);
 
   // Get and set the length of the string using acquire loads and release
   // stores.
@@ -214,7 +215,10 @@ class String : public TorqueGeneratedString<String, Name> {
   inline void Set(int index, uint16_t value);
   // Get individual two byte char in the string.  Repeated calls
   // to this method are not efficient unless the string is flat.
-  V8_INLINE uint16_t Get(int index);
+  // If it is called from a background thread, the LocalIsolate version should
+  // be used.
+  V8_INLINE uint16_t Get(int index, Isolate* isolate = nullptr);
+  V8_INLINE uint16_t Get(int index, LocalIsolate* local_isolate);
 
   // ES6 section 7.1.3.1 ToNumber Applied to the String Type
   static Handle<Object> ToNumber(Isolate* isolate, Handle<String> subject);
@@ -245,7 +249,7 @@ class String : public TorqueGeneratedString<String, Name> {
   // returned structure will report so, and can't provide a vector of either
   // kind.
   V8_EXPORT_PRIVATE FlatContent
-  GetFlatContent(const DisallowHeapAllocation& no_gc);
+  GetFlatContent(const DisallowGarbageCollection& no_gc);
 
   // Returns the parent of a sliced string or first part of a flat cons string.
   // Requires: StringShape(this).IsIndirect() && this->IsFlat()
@@ -314,16 +318,27 @@ class String : public TorqueGeneratedString<String, Name> {
   inline static bool Equals(Isolate* isolate, Handle<String> one,
                             Handle<String> two);
 
-  // Dispatches to Is{One,Two}ByteEqualTo.
-  template <typename Char>
-  bool IsEqualTo(Vector<const Char> str);
+  enum class EqualityType { kWholeString, kPrefix, kNoLengthCheck };
+
+  // Check if this string matches the given vector of characters, either as a
+  // whole string or just a prefix.
+  //
+  // The Isolate is passed as "evidence" that this call is on the main thread,
+  // and to distiguish from the LocalIsolate overload.
+  template <EqualityType kEqType = EqualityType::kWholeString, typename Char>
+  inline bool IsEqualTo(Vector<const Char> str,
+                        Isolate* isolate = nullptr) const;
+
+  // Check if this string matches the given vector of characters, either as a
+  // whole string or just a prefix.
+  //
+  // The LocalIsolate is passed to provide access to the string access lock,
+  // which is taken when reading the string's contents on a background thread.
+  template <EqualityType kEqType = EqualityType::kWholeString, typename Char>
+  inline bool IsEqualTo(Vector<const Char> str, LocalIsolate* isolate) const;
 
   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) {
-    return IsOneByteEqualTo(Vector<const uint8_t>::cast(str));
-  }
-  bool IsTwoByteEqualTo(Vector<const uc16> str);
+  V8_EXPORT_PRIVATE inline bool IsOneByteEqualTo(Vector<const char> str);
 
   // Return a UTF8 representation of the string.  The string is null
   // terminated but may optionally contain nulls.  Length is returned
@@ -346,7 +361,7 @@ class String : public TorqueGeneratedString<String, Name> {
       v8::String::ExternalStringResource* resource);
   V8_EXPORT_PRIVATE bool MakeExternal(
       v8::String::ExternalOneByteStringResource* resource);
-  bool SupportsExternalization();
+  V8_EXPORT_PRIVATE bool SupportsExternalization();
 
   // Conversion.
   // "array index": an index allowed by the ES spec for JSArrays.
@@ -371,8 +386,6 @@ class String : public TorqueGeneratedString<String, Name> {
 
   // Trimming.
   enum TrimMode { kTrim, kTrimStart, kTrimEnd };
-  static Handle<String> Trim(Isolate* isolate, Handle<String> string,
-                             TrimMode mode);
 
   V8_EXPORT_PRIVATE void PrintOn(FILE* out);
 
@@ -443,6 +456,9 @@ class String : public TorqueGeneratedString<String, Name> {
   template <typename sinkchar>
   EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
   static void WriteToFlat(String source, sinkchar* sink, int from, int to);
+  template <typename sinkchar>
+  static void WriteToFlat(String source, sinkchar* sink, int from, int to,
+                          const SharedStringAccessGuardIfNeeded&);
 
   static inline bool IsAscii(const char* chars, int length) {
     return IsAscii(reinterpret_cast<const uint8_t*>(chars), length);
@@ -510,6 +526,15 @@ class String : public TorqueGeneratedString<String, Name> {
   friend class StringTableInsertionKey;
   friend class InternalizedStringKey;
 
+  // Implementation of the Get() public methods. Do not use directly.
+  V8_INLINE uint16_t GetImpl(int index);
+
+  // Implementation of the IsEqualTo() public methods. Do not use directly.
+  template <EqualityType kEqType, typename Char>
+  V8_INLINE bool IsEqualToImpl(
+      Vector<const Char> str,
+      const SharedStringAccessGuardIfNeeded& access_guard) const;
+
   V8_EXPORT_PRIVATE static Handle<String> SlowFlatten(
       Isolate* isolate, Handle<ConsString> cons, AllocationType allocation);
 
@@ -532,12 +557,20 @@ class String : public TorqueGeneratedString<String, Name> {
 
 // clang-format off
 extern template EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
+void String::WriteToFlat(String source, uint8_t* sink, int from, int to);
+extern template EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
 void String::WriteToFlat(String source, uint16_t* sink, int from, int to);
+extern template EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
+void String::WriteToFlat(String source, uint8_t* sink, int from, int to ,
+                        const SharedStringAccessGuardIfNeeded&);
+extern template EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
+void String::WriteToFlat(String source, uint16_t* sink, int from, int to,
+                        const SharedStringAccessGuardIfNeeded&);
 // clang-format on
 
 class SubStringRange {
  public:
-  inline SubStringRange(String string, const DisallowHeapAllocation& no_gc,
+  inline SubStringRange(String string, const DisallowGarbageCollection& no_gc,
                         int first = 0, int length = -1);
   class iterator;
   inline iterator begin();
@@ -547,7 +580,7 @@ class SubStringRange {
   String string_;
   int first_;
   int length_;
-  const DisallowHeapAllocation& no_gc_;
+  const DisallowGarbageCollection& no_gc_;
 };
 
 // The SeqString abstract class captures sequential string values.
@@ -588,10 +621,10 @@ class SeqOneByteString
   // Get a pointer to the characters of the string. May only be called when a
   // SharedStringAccessGuard is not needed (i.e. on the main thread or on
   // read-only strings).
-  inline uint8_t* GetChars(const DisallowHeapAllocation& no_gc);
+  inline uint8_t* GetChars(const DisallowGarbageCollection& no_gc);
 
   // Get a pointer to the characters of the string.
-  inline uint8_t* GetChars(const DisallowHeapAllocation& no_gc,
+  inline uint8_t* GetChars(const DisallowGarbageCollection& no_gc,
                            const SharedStringAccessGuardIfNeeded& access_guard);
 
   // Clear uninitialized padding space. This ensures that the snapshot content
@@ -633,10 +666,10 @@ class SeqTwoByteString
   // Get a pointer to the characters of the string. May only be called when a
   // SharedStringAccessGuard is not needed (i.e. on the main thread or on
   // read-only strings).
-  inline uc16* GetChars(const DisallowHeapAllocation& no_gc);
+  inline uc16* GetChars(const DisallowGarbageCollection& no_gc);
 
   // Get a pointer to the characters of the string.
-  inline uc16* GetChars(const DisallowHeapAllocation& no_gc,
+  inline uc16* GetChars(const DisallowGarbageCollection& no_gc,
                         const SharedStringAccessGuardIfNeeded& access_guard);
 
   // Clear uninitialized padding space. This ensures that the snapshot content
diff --git a/deps/v8/src/objects/string.tq b/deps/v8/src/objects/string.tq
index df9b0f4ff07555..542dddc3b92730 100644
--- a/deps/v8/src/objects/string.tq
+++ b/deps/v8/src/objects/string.tq
@@ -6,22 +6,51 @@
 @generateCppClass
 @reserveBitsInInstanceType(6)
 extern class String extends Name {
+  macro StringInstanceType(): StringInstanceType {
+    return %RawDownCast<StringInstanceType>(
+        Convert<uint16>(this.map.instance_type));
+  }
+
   const length: int32;
 }
 
+extern enum StringRepresentationTag extends uint32 {
+  kSeqStringTag,
+  kConsStringTag,
+  kExternalStringTag,
+  kSlicedStringTag,
+  kThinStringTag
+}
+
+bitfield struct StringInstanceType extends uint16 {
+  representation: StringRepresentationTag: 3 bit;
+  is_one_byte: bool: 1 bit;
+  is_uncached: bool: 1 bit;
+  is_not_internalized: bool: 1 bit;
+}
+
 @generateCppClass
 @generateBodyDescriptor
 @doNotGenerateCast
 extern class ConsString extends String {
+  // Corresponds to String::IsFlat() in the C++ runtime.
+  macro IsFlat(): bool {
+    return this.second.length == 0;
+  }
+
+  macro IsOneByteRepresentation(): bool {
+    return this.StringInstanceType().is_one_byte;
+  }
+
   first: String;
   second: String;
 }
 
 @abstract
-@generateBodyDescriptor
 @doNotGenerateCast
 extern class ExternalString extends String {
   resource: ExternalPointer;
+  // WARNING: This field is missing for uncached external strings.
   resource_data: ExternalPointer;
 }
 
@@ -29,13 +58,36 @@ extern operator '.resource_ptr' macro LoadExternalStringResourcePtr(
     ExternalString): RawPtr;
 extern operator '.resource_data_ptr' macro LoadExternalStringResourceDataPtr(
     ExternalString): RawPtr;
+extern operator '.resource_data_ptr' macro LoadExternalStringResourceDataPtr(
+    ExternalOneByteString): RawPtr<char8>;
+extern operator '.resource_data_ptr' macro LoadExternalStringResourceDataPtr(
+    ExternalTwoByteString): RawPtr<char16>;
+
+extern macro ExternalOneByteStringGetChars(ExternalOneByteString):
+    RawPtr<char8>;
+extern macro ExternalTwoByteStringGetChars(ExternalTwoByteString):
+    RawPtr<char16>;
 
 @doNotGenerateCast
 extern class ExternalOneByteString extends ExternalString {
+  macro GetChars(): RawPtr<char8> {
+    if (this.StringInstanceType().is_uncached) {
+      return ExternalOneByteStringGetChars(this);
+    } else {
+      return this.resource_data_ptr;
+    }
+  }
 }
 
 @doNotGenerateCast
 extern class ExternalTwoByteString extends ExternalString {
+  macro GetChars(): RawPtr<char16> {
+    if (this.StringInstanceType().is_uncached) {
+      return ExternalTwoByteStringGetChars(this);
+    } else {
+      return this.resource_data_ptr;
+    }
+  }
 }
 
 @generateCppClass
@@ -52,13 +104,13 @@ extern class SeqString extends String {
 @generateBodyDescriptor
 @doNotGenerateCast
 extern class SeqOneByteString extends SeqString {
-  chars[length]: char8;
+  const chars[length]: char8;
 }
 @generateCppClass
 @generateBodyDescriptor
 @doNotGenerateCast
 extern class SeqTwoByteString extends SeqString {
-  chars[length]: char16;
+  const chars[length]: char16;
 }
 
 @generateCppClass
@@ -80,26 +132,177 @@ extern class ThinString extends String {
 // C++ runtime. See also: ToDirectStringAssembler.
 type DirectString extends String;
 
-@export
-macro AllocateSeqOneByteString(length: uint32): SeqOneByteString {
-  assert(length <= kStringMaxLength);
-  if (length == 0) return UnsafeCast<SeqOneByteString>(kEmptyString);
+macro AllocateNonEmptySeqOneByteString<Iterator: type>(
+    length: uint32, content: Iterator): SeqOneByteString {
+  assert(length != 0 && length <= kStringMaxLength);
   return new SeqOneByteString{
     map: kOneByteStringMap,
-    hash_field: kNameEmptyHashField,
+    raw_hash_field: kNameEmptyHashField,
     length: Signed(length),
-    chars: ...UninitializedIterator {}
+    chars: ...content
   };
 }
 
-@export
-macro AllocateSeqTwoByteString(length: uint32): String {
-  assert(length <= kStringMaxLength);
-  if (length == 0) return kEmptyString;
+macro AllocateNonEmptySeqTwoByteString<Iterator: type>(
+    length: uint32, content: Iterator): SeqTwoByteString {
+  assert(length > 0 && length <= kStringMaxLength);
   return new SeqTwoByteString{
     map: kStringMap,
-    hash_field: kNameEmptyHashField,
+    raw_hash_field: kNameEmptyHashField,
     length: Signed(length),
-    chars: ...UninitializedIterator {}
+    chars: ...content
   };
 }
+
+macro AllocateNonEmptySeqOneByteString(length: uint32): SeqOneByteString {
+  return AllocateNonEmptySeqOneByteString(length, UninitializedIterator{});
+}
+macro AllocateNonEmptySeqTwoByteString(length: uint32): SeqTwoByteString {
+  return AllocateNonEmptySeqTwoByteString(length, UninitializedIterator{});
+}
+
+macro AllocateSeqOneByteString<Iterator: type>(
+    length: uint32, content: Iterator): SeqOneByteString|EmptyString {
+  if (length == 0) return kEmptyString;
+  return AllocateNonEmptySeqOneByteString(length, content);
+}
+
+macro AllocateSeqTwoByteString<Iterator: type>(
+    length: uint32, content: Iterator): SeqTwoByteString|EmptyString {
+  if (length == 0) return kEmptyString;
+  return AllocateNonEmptySeqTwoByteString(length, content);
+}
+
+@export
+macro AllocateSeqOneByteString(length: uint32): SeqOneByteString|EmptyString {
+  return AllocateSeqOneByteString(length, UninitializedIterator{});
+}
+
+@export
+macro AllocateSeqTwoByteString(length: uint32): SeqTwoByteString|EmptyString {
+  return AllocateSeqTwoByteString(length, UninitializedIterator{});
+}
+
+extern macro StringWriteToFlatOneByte(String, RawPtr<char8>, int32, int32);
+extern macro StringWriteToFlatTwoByte(String, RawPtr<char16>, int32, int32);
+
+// Corresponds to String::SlowFlatten in the C++ runtime.
+builtin StringSlowFlatten(cons: ConsString): String {
+  // TurboFan can create cons strings with empty first parts.
+  let cons = cons;
+  while (cons.first.length == 0) {
+    // We do not want to call this function recursively. Therefore we call
+    // String::Flatten only in those cases where String::SlowFlatten is not
+    // called again.
+    try {
+      const second = Cast<ConsString>(cons.second) otherwise FoundFlatString;
+      if (second.IsFlat()) goto FoundFlatString;
+      cons = second;
+    } label FoundFlatString {
+      return Flatten(cons.second);
+    }
+  }
+
+  let flat: String;
+  if (cons.IsOneByteRepresentation()) {
+    const allocated = AllocateNonEmptySeqOneByteString(Unsigned(cons.length));
+    StringWriteToFlatOneByte(
+        cons, (&allocated.chars).GCUnsafeStartPointer(), 0, cons.length);
+    flat = allocated;
+  } else {
+    const allocated = UnsafeCast<SeqTwoByteString>(
+        AllocateNonEmptySeqTwoByteString(Unsigned(cons.length)));
+    StringWriteToFlatTwoByte(
+        cons, (&allocated.chars).GCUnsafeStartPointer(), 0, cons.length);
+    flat = allocated;
+  }
+  cons.first = flat;
+  cons.second = kEmptyString;
+  return flat;
+}
+
+// Corresponds to String::Flatten in the C++ runtime.
+macro Flatten(string: String): String {
+  typeswitch (string) {
+    case (cons: ConsString): {
+      return Flatten(cons);
+    }
+    case (thin: ThinString): {
+      assert(!Is<ConsString>(thin.actual));
+      return thin.actual;
+    }
+    case (other: String): {
+      return other;
+    }
+  }
+}
+macro Flatten(cons: ConsString): String {
+  if (cons.IsFlat()) return cons.first;
+  return StringSlowFlatten(cons);
+}
+
+// Get a slice to the string data, flatten only if unavoidable for this.
+macro StringToSlice(string: String): never labels OneByte(ConstSlice<char8>),
+    TwoByte(ConstSlice<char16>) {
+  let string = string;
+  let offset: intptr = 0;
+  const length = Convert<intptr>(string.length);
+  while (true) {
+    typeswitch (string) {
+      case (s: SeqOneByteString): {
+        goto OneByte(Subslice(&s.chars, offset, length) otherwise unreachable);
+      }
+      case (s: SeqTwoByteString): {
+        goto TwoByte(Subslice(&s.chars, offset, length) otherwise unreachable);
+      }
+      case (s: ThinString): {
+        string = s.actual;
+      }
+      case (s: ConsString): {
+        string = Flatten(s);
+      }
+      case (s: SlicedString): {
+        offset += Convert<intptr>(s.offset);
+        string = s.parent;
+      }
+      case (s: ExternalOneByteString): {
+        const data = torque_internal::unsafe::NewOffHeapConstSlice(
+            s.GetChars(), Convert<intptr>(s.length));
+        goto OneByte(Subslice(data, offset, length) otherwise unreachable);
+      }
+      case (s: ExternalTwoByteString): {
+        const data = torque_internal::unsafe::NewOffHeapConstSlice(
+            s.GetChars(), Convert<intptr>(s.length));
+        goto TwoByte(Subslice(data, offset, length) otherwise unreachable);
+      }
+      case (String): {
+        unreachable;
+      }
+    }
+  }
+  VerifiedUnreachable();
+}
+
+// Dispatch on the slice type of two different strings.
+macro TwoStringsToSlices<Result: type, Functor: type>(
+    s1: String, s2: String, f: Functor): Result {
+  try {
+    StringToSlice(s1) otherwise FirstOneByte, FirstTwoByte;
+  } label FirstOneByte(s1Slice: ConstSlice<char8>) {
+    try {
+      StringToSlice(s2) otherwise SecondOneByte, SecondTwoByte;
+    } label SecondOneByte(s2Slice: ConstSlice<char8>) {
+      return Call(f, s1Slice, s2Slice);
+    } label SecondTwoByte(s2Slice: ConstSlice<char16>) {
+      return Call(f, s1Slice, s2Slice);
+    }
+  } label FirstTwoByte(s1Slice: ConstSlice<char16>) {
+    try {
+      StringToSlice(s2) otherwise SecondOneByte, SecondTwoByte;
+    } label SecondOneByte(s2Slice: ConstSlice<char8>) {
+      return Call(f, s1Slice, s2Slice);
+    } label SecondTwoByte(s2Slice: ConstSlice<char16>) {
+      return Call(f, s1Slice, s2Slice);
+    }
+  }
+}
diff --git a/deps/v8/src/objects/synthetic-module.cc b/deps/v8/src/objects/synthetic-module.cc
index 6c288f97cf3a28..61051eff7d704e 100644
--- a/deps/v8/src/objects/synthetic-module.cc
+++ b/deps/v8/src/objects/synthetic-module.cc
@@ -70,8 +70,7 @@ MaybeHandle<Cell> SyntheticModule::ResolveExport(
 // https://heycam.github.io/webidl/#smr-instantiate
 bool SyntheticModule::PrepareInstantiate(Isolate* isolate,
                                          Handle<SyntheticModule> module,
-                                         v8::Local<v8::Context> context,
-                                         v8::Module::ResolveCallback callback) {
+                                         v8::Local<v8::Context> context) {
   Handle<ObjectHashTable> exports(module->exports(), isolate);
   Handle<FixedArray> export_names(module->export_names(), isolate);
   // Spec step 7: For each export_name in module->export_names...
diff --git a/deps/v8/src/objects/synthetic-module.h b/deps/v8/src/objects/synthetic-module.h
index 7c0060e6f0c0b9..a8b79fb0a00a39 100644
--- a/deps/v8/src/objects/synthetic-module.h
+++ b/deps/v8/src/objects/synthetic-module.h
@@ -56,7 +56,7 @@ class SyntheticModule
 
   static V8_WARN_UNUSED_RESULT bool PrepareInstantiate(
       Isolate* isolate, Handle<SyntheticModule> module,
-      v8::Local<v8::Context> context, v8::Module::ResolveCallback callback);
+      v8::Local<v8::Context> context);
   static V8_WARN_UNUSED_RESULT bool FinishInstantiate(
       Isolate* isolate, Handle<SyntheticModule> module);
 
diff --git a/deps/v8/src/objects/tagged-field.h b/deps/v8/src/objects/tagged-field.h
index 1c96cc9d92b0bf..8560c54cc45b66 100644
--- a/deps/v8/src/objects/tagged-field.h
+++ b/deps/v8/src/objects/tagged-field.h
@@ -48,7 +48,7 @@ class TaggedField : public AllStatic {
                                int offset = 0);
 
   static inline void Relaxed_Store(HeapObject host, T value);
-  static void Relaxed_Store(HeapObject host, int offset, T value);
+  static inline void Relaxed_Store(HeapObject host, int offset, T value);
 
   static inline T Acquire_Load(HeapObject host, int offset = 0);
   static inline T Acquire_Load(IsolateRoot isolate, HeapObject host,
diff --git a/deps/v8/src/objects/transitions-inl.h b/deps/v8/src/objects/transitions-inl.h
index d9d2f83a7fc2fa..f60f9bd55a55ca 100644
--- a/deps/v8/src/objects/transitions-inl.h
+++ b/deps/v8/src/objects/transitions-inl.h
@@ -188,15 +188,12 @@ int TransitionArray::SearchSpecial(Symbol symbol, int* out_insertion_index) {
 
 int TransitionArray::SearchName(Name name, int* out_insertion_index) {
   DCHECK(name.IsUniqueName());
-  // The name is taken from DescriptorArray, so it must already has a computed
-  // hash.
-  DCHECK(name.HasHashCode());
   return internal::Search<ALL_ENTRIES>(this, name, number_of_entries(),
                                        out_insertion_index);
 }
 
 TransitionsAccessor::TransitionsAccessor(Isolate* isolate, Map map,
-                                         DisallowHeapAllocation* no_gc)
+                                         DisallowGarbageCollection* no_gc)
     : isolate_(isolate), map_(map), concurrent_access_(false) {
   Initialize();
   USE(no_gc);
@@ -312,7 +309,7 @@ void TransitionArray::SetNumberOfTransitions(int number_of_transitions) {
 }
 
 Handle<String> TransitionsAccessor::ExpectedTransitionKey() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   switch (encoding()) {
     case kPrototypeInfo:
     case kUninitialized:
diff --git a/deps/v8/src/objects/transitions.cc b/deps/v8/src/objects/transitions.cc
index f6623258d6eb37..0b81ad372608bb 100644
--- a/deps/v8/src/objects/transitions.cc
+++ b/deps/v8/src/objects/transitions.cc
@@ -134,7 +134,7 @@ void TransitionsAccessor::Insert(Handle<Name> name, Handle<Map> target,
                                 : GetTargetDetails(*name, *target);
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     TransitionArray array = transitions();
     number_of_transitions = array.number_of_transitions();
 
@@ -180,7 +180,7 @@ void TransitionsAccessor::Insert(Handle<Name> name, Handle<Map> target,
   // it was weakly traversed, though it is guaranteed not to disappear. Trim the
   // result copy if needed, and recompute variables.
   Reload();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   TransitionArray array = transitions();
   if (array.number_of_transitions() != number_of_transitions) {
     DCHECK_LT(array.number_of_transitions(), number_of_transitions);
@@ -230,11 +230,9 @@ Map TransitionsAccessor::SearchTransition(Name name, PropertyKind kind,
       return map;
     }
     case kFullTransitionArray: {
-      if (concurrent_access_) isolate_->transition_array_access()->LockShared();
-      Map result = transitions().SearchAndGetTarget(kind, name, attributes);
-      if (concurrent_access_)
-        isolate_->transition_array_access()->UnlockShared();
-      return result;
+      base::SharedMutexGuardIf<base::kShared> scope(
+          isolate_->transition_array_access(), concurrent_access_);
+      return transitions().SearchAndGetTarget(kind, name, attributes);
     }
   }
   UNREACHABLE();
@@ -259,7 +257,7 @@ bool TransitionsAccessor::IsSpecialTransition(ReadOnlyRoots roots, Name name) {
 MaybeHandle<Map> TransitionsAccessor::FindTransitionToDataProperty(
     Handle<Name> name, RequestedLocation requested_location) {
   DCHECK(name->IsUniqueName());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   PropertyAttributes attributes = name->IsPrivate() ? DONT_ENUM : NONE;
   Map target = SearchTransition(*name, kData, attributes);
   if (target.is_null()) return MaybeHandle<Map>();
@@ -377,7 +375,7 @@ void TransitionsAccessor::PutPrototypeTransition(Handle<Object> prototype,
 
 Handle<Map> TransitionsAccessor::GetPrototypeTransition(
     Handle<Object> prototype) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   WeakFixedArray cache = GetPrototypeTransitions();
   int length = TransitionArray::NumberOfPrototypeTransitions(cache);
   for (int i = 0; i < length; i++) {
@@ -483,7 +481,7 @@ void TransitionsAccessor::EnsureHasFullTransitionArray() {
 }
 
 void TransitionsAccessor::TraverseTransitionTreeInternal(
-    TraverseCallback callback, void* data, DisallowHeapAllocation* no_gc) {
+    TraverseCallback callback, void* data, DisallowGarbageCollection* no_gc) {
   switch (encoding()) {
     case kPrototypeInfo:
     case kUninitialized:
@@ -615,7 +613,7 @@ Map TransitionArray::SearchAndGetTarget(PropertyKind kind, Name name,
 }
 
 void TransitionArray::Sort() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // In-place insertion sort.
   int length = number_of_transitions();
   ReadOnlyRoots roots = GetReadOnlyRoots();
diff --git a/deps/v8/src/objects/transitions.h b/deps/v8/src/objects/transitions.h
index f0038f735019ed..4f992bc6cfdf0d 100644
--- a/deps/v8/src/objects/transitions.h
+++ b/deps/v8/src/objects/transitions.h
@@ -40,7 +40,7 @@ class V8_EXPORT_PRIVATE TransitionsAccessor {
  public:
   // For concurrent access, use the other constructor.
   inline TransitionsAccessor(Isolate* isolate, Map map,
-                             DisallowHeapAllocation* no_gc);
+                             DisallowGarbageCollection* no_gc);
   // {concurrent_access} signals that the TransitionsAccessor will only be used
   // in background threads. It acquires a reader lock for critical paths, as
   // well as blocking the accessor from modifying the TransitionsArray.
@@ -94,8 +94,8 @@ class V8_EXPORT_PRIVATE TransitionsAccessor {
   // Traverse the transition tree in postorder.
   void TraverseTransitionTree(TraverseCallback callback, void* data) {
     // Make sure that we do not allocate in the callback.
-    DisallowHeapAllocation no_allocation;
-    TraverseTransitionTreeInternal(callback, data, &no_allocation);
+    DisallowGarbageCollection no_gc;
+    TraverseTransitionTreeInternal(callback, data, &no_gc);
   }
 
   // ===== PROTOTYPE TRANSITIONS =====
@@ -122,7 +122,7 @@ class V8_EXPORT_PRIVATE TransitionsAccessor {
   static void PrintOneTransition(std::ostream& os, Name key, Map target);
   void PrintTransitionTree();
   void PrintTransitionTree(std::ostream& os, int level,
-                           DisallowHeapAllocation* no_gc);
+                           DisallowGarbageCollection* no_gc);
 #endif
 #if DEBUG
   void CheckNewTransitionsAreConsistent(TransitionArray old_transitions,
@@ -182,7 +182,7 @@ class V8_EXPORT_PRIVATE TransitionsAccessor {
   WeakFixedArray GetPrototypeTransitions();
 
   void TraverseTransitionTreeInternal(TraverseCallback callback, void* data,
-                                      DisallowHeapAllocation* no_gc);
+                                      DisallowGarbageCollection* no_gc);
 
   Isolate* isolate_;
   Handle<Map> map_handle_;
diff --git a/deps/v8/src/objects/type-hints.cc b/deps/v8/src/objects/type-hints.cc
index da63443b4cab33..93924a1b951ace 100644
--- a/deps/v8/src/objects/type-hints.cc
+++ b/deps/v8/src/objects/type-hints.cc
@@ -15,8 +15,6 @@ std::ostream& operator<<(std::ostream& os, BinaryOperationHint hint) {
       return os << "SignedSmall";
     case BinaryOperationHint::kSignedSmallInputs:
       return os << "SignedSmallInputs";
-    case BinaryOperationHint::kSigned32:
-      return os << "Signed32";
     case BinaryOperationHint::kNumber:
       return os << "Number";
     case BinaryOperationHint::kNumberOrOddball:
diff --git a/deps/v8/src/objects/type-hints.h b/deps/v8/src/objects/type-hints.h
index d61ebef8457366..2638c128bd7aea 100644
--- a/deps/v8/src/objects/type-hints.h
+++ b/deps/v8/src/objects/type-hints.h
@@ -16,7 +16,6 @@ enum class BinaryOperationHint : uint8_t {
   kNone,
   kSignedSmall,
   kSignedSmallInputs,
-  kSigned32,
   kNumber,
   kNumberOrOddball,
   kString,
diff --git a/deps/v8/src/objects/value-serializer.cc b/deps/v8/src/objects/value-serializer.cc
index d5f5f05c29274a..dc356d966a5a94 100644
--- a/deps/v8/src/objects/value-serializer.cc
+++ b/deps/v8/src/objects/value-serializer.cc
@@ -10,6 +10,7 @@
 #include "include/v8.h"
 #include "src/api/api-inl.h"
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 #include "src/execution/isolate.h"
 #include "src/flags/flags.h"
 #include "src/handles/handles-inl.h"
@@ -246,7 +247,7 @@ ValueSerializer::~ValueSerializer() {
     if (delegate_) {
       delegate_->FreeBufferMemory(buffer_);
     } else {
-      free(buffer_);
+      base::Free(buffer_);
     }
   }
 }
@@ -326,7 +327,7 @@ void ValueSerializer::WriteBigIntContents(BigInt bigint) {
 void ValueSerializer::WriteRawBytes(const void* source, size_t length) {
   uint8_t* dest;
   if (ReserveRawBytes(length).To(&dest) && length > 0) {
-    memcpy(dest, source, length);
+    base::Memcpy(dest, source, length);
   }
 }
 
@@ -353,7 +354,7 @@ Maybe<bool> ValueSerializer::ExpandBuffer(size_t required_capacity) {
     new_buffer = delegate_->ReallocateBufferMemory(buffer_, requested_capacity,
                                                    &provided_capacity);
   } else {
-    new_buffer = realloc(buffer_, requested_capacity);
+    new_buffer = base::Realloc(buffer_, requested_capacity);
     provided_capacity = requested_capacity;
   }
   if (new_buffer) {
@@ -481,7 +482,7 @@ void ValueSerializer::WriteBigInt(BigInt bigint) {
 
 void ValueSerializer::WriteString(Handle<String> string) {
   string = String::Flatten(isolate_, string);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   String::FlatContent flat = string->GetFlatContent(no_gc);
   DCHECK(flat.IsFlat());
   if (flat.IsOneByte()) {
@@ -529,7 +530,17 @@ Maybe<bool> ValueSerializer::WriteJSReceiver(Handle<JSReceiver> receiver) {
   switch (instance_type) {
     case JS_ARRAY_TYPE:
       return WriteJSArray(Handle<JSArray>::cast(receiver));
+    case JS_ARRAY_ITERATOR_PROTOTYPE_TYPE:
+    case JS_ITERATOR_PROTOTYPE_TYPE:
+    case JS_MAP_ITERATOR_PROTOTYPE_TYPE:
+    case JS_OBJECT_PROTOTYPE_TYPE:
     case JS_OBJECT_TYPE:
+    case JS_PROMISE_PROTOTYPE_TYPE:
+    case JS_REG_EXP_PROTOTYPE_TYPE:
+    case JS_SET_ITERATOR_PROTOTYPE_TYPE:
+    case JS_SET_PROTOTYPE_TYPE:
+    case JS_STRING_ITERATOR_PROTOTYPE_TYPE:
+    case JS_TYPED_ARRAY_PROTOTYPE_TYPE:
     case JS_API_OBJECT_TYPE: {
       Handle<JSObject> js_object = Handle<JSObject>::cast(receiver);
       if (JSObject::GetEmbedderFieldCount(js_object->map())) {
@@ -794,7 +805,7 @@ Maybe<bool> ValueSerializer::WriteJSMap(Handle<JSMap> map) {
   int length = table->NumberOfElements() * 2;
   Handle<FixedArray> entries = isolate_->factory()->NewFixedArray(length);
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Oddball the_hole = ReadOnlyRoots(isolate_).the_hole_value();
     int result_index = 0;
     for (InternalIndex entry : table->IterateEntries()) {
@@ -824,7 +835,7 @@ Maybe<bool> ValueSerializer::WriteJSSet(Handle<JSSet> set) {
   int length = table->NumberOfElements();
   Handle<FixedArray> entries = isolate_->factory()->NewFixedArray(length);
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Oddball the_hole = ReadOnlyRoots(isolate_).the_hole_value();
     int result_index = 0;
     for (InternalIndex entry : table->IterateEntries()) {
@@ -1181,7 +1192,7 @@ Maybe<double> ValueDeserializer::ReadDouble() {
   // Warning: this uses host endianness.
   if (position_ > end_ - sizeof(double)) return Nothing<double>();
   double value;
-  memcpy(&value, position_, sizeof(double));
+  base::Memcpy(&value, position_, sizeof(double));
   position_ += sizeof(double);
   if (std::isnan(value)) value = std::numeric_limits<double>::quiet_NaN();
   return Just(value);
@@ -1417,13 +1428,13 @@ MaybeHandle<String> ValueDeserializer::ReadTwoByteString() {
 
   // Copy the bytes directly into the new string.
   // Warning: this uses host endianness.
-  DisallowHeapAllocation no_gc;
-  memcpy(string->GetChars(no_gc), bytes.begin(), bytes.length());
+  DisallowGarbageCollection no_gc;
+  base::Memcpy(string->GetChars(no_gc), bytes.begin(), bytes.length());
   return string;
 }
 
 bool ValueDeserializer::ReadExpectedString(Handle<String> expected) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // In the case of failure, the position in the stream is reset.
   const uint8_t* original_position = position_;
 
@@ -1776,7 +1787,7 @@ MaybeHandle<JSArrayBuffer> ValueDeserializer::ReadJSArrayBuffer(
   if (!result.ToHandle(&array_buffer)) return result;
 
   if (byte_length > 0) {
-    memcpy(array_buffer->backing_store(), position_, byte_length);
+    base::Memcpy(array_buffer->backing_store(), position_, byte_length);
   }
   position_ += byte_length;
   AddObjectWithID(id, array_buffer);
@@ -1987,7 +1998,7 @@ static void CommitProperties(Handle<JSObject> object, Handle<Map> map,
   JSObject::AllocateStorageForMap(object, map);
   DCHECK(!object->map().is_dictionary_map());
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DescriptorArray descriptors =
       object->map().instance_descriptors(kRelaxedLoad);
   for (InternalIndex i : InternalIndex::Range(properties.size())) {
diff --git a/deps/v8/src/parsing/expression-scope.h b/deps/v8/src/parsing/expression-scope.h
index 9d8c2a934535e6..d6c117f73bf570 100644
--- a/deps/v8/src/parsing/expression-scope.h
+++ b/deps/v8/src/parsing/expression-scope.h
@@ -43,6 +43,9 @@ class VariableProxy;
 template <typename Types>
 class ExpressionScope {
  public:
+  ExpressionScope(const ExpressionScope&) = delete;
+  ExpressionScope& operator=(const ExpressionScope&) = delete;
+
   using ParserT = typename Types::Impl;
   using ExpressionT = typename Types::Expression;
 
@@ -342,8 +345,6 @@ class ExpressionScope {
   ScopeType type_;
   bool has_possible_parameter_in_scope_chain_;
   bool has_possible_arrow_parameter_in_scope_chain_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExpressionScope);
 };
 
 // Used to unambiguously parse var, let, const declarations.
@@ -362,6 +363,11 @@ class VariableDeclarationParsingScope : public ExpressionScope<Types> {
         mode_(mode),
         names_(names) {}
 
+  VariableDeclarationParsingScope(const VariableDeclarationParsingScope&) =
+      delete;
+  VariableDeclarationParsingScope& operator=(
+      const VariableDeclarationParsingScope&) = delete;
+
   Variable* Declare(const AstRawString* name, int pos) {
     VariableKind kind = NORMAL_VARIABLE;
     bool was_added;
@@ -413,8 +419,6 @@ class VariableDeclarationParsingScope : public ExpressionScope<Types> {
 
   VariableMode mode_;
   ZonePtrList<const AstRawString>* names_;
-
-  DISALLOW_COPY_AND_ASSIGN(VariableDeclarationParsingScope);
 };
 
 template <typename Types>
@@ -427,6 +431,11 @@ class ParameterDeclarationParsingScope : public ExpressionScope<Types> {
   explicit ParameterDeclarationParsingScope(ParserT* parser)
       : ExpressionScopeT(parser, ExpressionScopeT::kParameterDeclaration) {}
 
+  ParameterDeclarationParsingScope(const ParameterDeclarationParsingScope&) =
+      delete;
+  ParameterDeclarationParsingScope& operator=(
+      const ParameterDeclarationParsingScope&) = delete;
+
   Variable* Declare(const AstRawString* name, int pos) {
     VariableKind kind = PARAMETER_VARIABLE;
     VariableMode mode = VariableMode::kVar;
@@ -446,7 +455,6 @@ class ParameterDeclarationParsingScope : public ExpressionScope<Types> {
 
  private:
   Scanner::Location duplicate_loc_ = Scanner::Location::invalid();
-  DISALLOW_COPY_AND_ASSIGN(ParameterDeclarationParsingScope);
 };
 
 // Parsing expressions is always ambiguous between at least left-hand-side and
@@ -480,6 +488,9 @@ class ExpressionParsingScope : public ExpressionScope<Types> {
     clear(kPatternIndex);
   }
 
+  ExpressionParsingScope(const ExpressionParsingScope&) = delete;
+  ExpressionParsingScope& operator=(const ExpressionParsingScope&) = delete;
+
   void RecordAsyncArrowParametersError(const Scanner::Location& loc,
                                        MessageTemplate message) {
     for (ExpressionScopeT* scope = this; scope != nullptr;
@@ -643,8 +654,6 @@ class ExpressionParsingScope : public ExpressionScope<Types> {
   MessageTemplate messages_[kNumberOfErrors];
   Scanner::Location locations_[kNumberOfErrors];
   bool has_async_arrow_in_scope_chain_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExpressionParsingScope);
 };
 
 // This class is used to parse multiple ambiguous expressions and declarations
@@ -672,6 +681,9 @@ class AccumulationScope {
     }
   }
 
+  AccumulationScope(const AccumulationScope&) = delete;
+  AccumulationScope& operator=(const AccumulationScope&) = delete;
+
   // Merge errors from the underlying ExpressionParsingScope into this scope.
   // Only keeps the first error across all accumulate calls, and removes the
   // error from the underlying scope.
@@ -723,8 +735,6 @@ class AccumulationScope {
   ExpressionParsingScope<Types>* scope_;
   MessageTemplate messages_[2];
   Scanner::Location locations_[2];
-
-  DISALLOW_COPY_AND_ASSIGN(AccumulationScope);
 };
 
 // The head of an arrow function is ambiguous between expression, assignment
@@ -750,6 +760,9 @@ class ArrowHeadParsingScope : public ExpressionParsingScope<Types> {
     DCHECK(!this->IsCertainlyDeclaration());
   }
 
+  ArrowHeadParsingScope(const ArrowHeadParsingScope&) = delete;
+  ArrowHeadParsingScope& operator=(const ArrowHeadParsingScope&) = delete;
+
   void ValidateExpression() {
     // Turns out this is not an arrow head. Clear any possible tracked strict
     // parameter errors, and reinterpret tracked variables as unresolved
@@ -822,8 +835,6 @@ class ArrowHeadParsingScope : public ExpressionParsingScope<Types> {
   MessageTemplate declaration_error_message = MessageTemplate::kNone;
   bool has_simple_parameter_list_ = true;
   bool uses_this_ = false;
-
-  DISALLOW_COPY_AND_ASSIGN(ArrowHeadParsingScope);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/parsing/func-name-inferrer.h b/deps/v8/src/parsing/func-name-inferrer.h
index 553e6fa512d89c..a8ebe594743899 100644
--- a/deps/v8/src/parsing/func-name-inferrer.h
+++ b/deps/v8/src/parsing/func-name-inferrer.h
@@ -39,6 +39,9 @@ class FuncNameInferrer {
  public:
   explicit FuncNameInferrer(AstValueFactory* ast_value_factory);
 
+  FuncNameInferrer(const FuncNameInferrer&) = delete;
+  FuncNameInferrer& operator=(const FuncNameInferrer&) = delete;
+
   // To enter function name inference state, put a FuncNameInferrer::State
   // on the stack.
   class State {
@@ -52,12 +55,12 @@ class FuncNameInferrer {
       fni_->names_stack_.resize(top_);
       --fni_->scope_depth_;
     }
+    State(const State&) = delete;
+    State& operator=(const State&) = delete;
 
    private:
     FuncNameInferrer* fni_;
     size_t top_;
-
-    DISALLOW_COPY_AND_ASSIGN(State);
   };
 
   // Returns whether we have entered name collection state.
@@ -119,8 +122,6 @@ class FuncNameInferrer {
   std::vector<Name> names_stack_;
   std::vector<FunctionLiteral*> funcs_to_infer_;
   size_t scope_depth_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(FuncNameInferrer);
 };
 
 
diff --git a/deps/v8/src/parsing/import-assertions.cc b/deps/v8/src/parsing/import-assertions.cc
new file mode 100644
index 00000000000000..f294c60bb00c9a
--- /dev/null
+++ b/deps/v8/src/parsing/import-assertions.cc
@@ -0,0 +1,18 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "src/parsing/import-assertions.h"
+
+#include "src/ast/ast-value-factory.h"
+
+namespace v8 {
+namespace internal {
+
+bool ImportAssertionsKeyComparer::operator()(const AstRawString* lhs,
+                                             const AstRawString* rhs) const {
+  return AstRawString::Compare(lhs, rhs) < 0;
+}
+
+}  // namespace internal
+}  // namespace v8
diff --git a/deps/v8/src/parsing/import-assertions.h b/deps/v8/src/parsing/import-assertions.h
new file mode 100644
index 00000000000000..0d5e3510b419a7
--- /dev/null
+++ b/deps/v8/src/parsing/import-assertions.h
@@ -0,0 +1,32 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_PARSING_IMPORT_ASSERTIONS_H_
+#define V8_PARSING_IMPORT_ASSERTIONS_H_
+
+#include "src/parsing/scanner.h"  // Only for Scanner::Location.
+#include "src/zone/zone-containers.h"
+
+namespace v8 {
+namespace internal {
+
+struct V8_EXPORT_PRIVATE ImportAssertionsKeyComparer {
+  bool operator()(const AstRawString* lhs, const AstRawString* rhs) const;
+};
+
+class ImportAssertions
+    : public ZoneMap<const AstRawString*,
+                     std::pair<const AstRawString*, Scanner::Location>,
+                     ImportAssertionsKeyComparer> {
+ public:
+  explicit ImportAssertions(Zone* zone)
+      : ZoneMap<const AstRawString*,
+                std::pair<const AstRawString*, Scanner::Location>,
+                ImportAssertionsKeyComparer>(zone) {}
+};
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_PARSING_IMPORT_ASSERTIONS_H_
diff --git a/deps/v8/src/parsing/literal-buffer.cc b/deps/v8/src/parsing/literal-buffer.cc
index 7d0188cad95d1a..42a41cb15d6613 100644
--- a/deps/v8/src/parsing/literal-buffer.cc
+++ b/deps/v8/src/parsing/literal-buffer.cc
@@ -30,7 +30,7 @@ int LiteralBuffer::NewCapacity(int min_capacity) {
 }
 
 void LiteralBuffer::ExpandBuffer() {
-  int min_capacity = Max(kInitialCapacity, backing_store_.length());
+  int min_capacity = std::max({kInitialCapacity, backing_store_.length()});
   Vector<byte> new_store = Vector<byte>::New(NewCapacity(min_capacity));
   if (position_ > 0) {
     MemCopy(new_store.begin(), backing_store_.begin(), position_);
diff --git a/deps/v8/src/parsing/literal-buffer.h b/deps/v8/src/parsing/literal-buffer.h
index 56d5010b530b9c..60c70a5b468776 100644
--- a/deps/v8/src/parsing/literal-buffer.h
+++ b/deps/v8/src/parsing/literal-buffer.h
@@ -18,6 +18,9 @@ class LiteralBuffer final {
 
   ~LiteralBuffer() { backing_store_.Dispose(); }
 
+  LiteralBuffer(const LiteralBuffer&) = delete;
+  LiteralBuffer& operator=(const LiteralBuffer&) = delete;
+
   V8_INLINE void AddChar(char code_unit) {
     DCHECK(IsValidAscii(code_unit));
     AddOneByteChar(static_cast<byte>(code_unit));
@@ -95,8 +98,6 @@ class LiteralBuffer final {
   int position_;
 
   bool is_one_byte_;
-
-  DISALLOW_COPY_AND_ASSIGN(LiteralBuffer);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/parsing/parse-info.cc b/deps/v8/src/parsing/parse-info.cc
index 1c2b1b91ed873b..5e8d79028f30fe 100644
--- a/deps/v8/src/parsing/parse-info.cc
+++ b/deps/v8/src/parsing/parse-info.cc
@@ -7,6 +7,7 @@
 #include "src/ast/ast-source-ranges.h"
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/ast.h"
+#include "src/base/logging.h"
 #include "src/common/globals.h"
 #include "src/compiler-dispatcher/compiler-dispatcher.h"
 #include "src/heap/heap-inl.h"
@@ -32,7 +33,6 @@ UnoptimizedCompileFlags::UnoptimizedCompileFlags(Isolate* isolate,
   set_might_always_opt(FLAG_always_opt || FLAG_prepare_always_opt);
   set_allow_natives_syntax(FLAG_allow_natives_syntax);
   set_allow_lazy_compile(FLAG_lazy);
-  set_allow_harmony_private_methods(FLAG_harmony_private_methods);
   set_collect_source_positions(!FLAG_enable_lazy_source_positions ||
                                isolate->NeedsDetailedOptimizedCodeLineInfo());
   set_allow_harmony_top_level_await(FLAG_harmony_top_level_await);
@@ -76,7 +76,9 @@ UnoptimizedCompileFlags UnoptimizedCompileFlags::ForScriptCompile(
   flags.SetFlagsForFunctionFromScript(script);
   flags.SetFlagsForToplevelCompile(
       isolate->is_collecting_type_profile(), script.IsUserJavaScript(),
-      flags.outer_language_mode(), construct_repl_mode(script.is_repl_mode()));
+      flags.outer_language_mode(), construct_repl_mode(script.is_repl_mode()),
+      script.origin_options().IsModule() ? ScriptType::kModule
+                                         : ScriptType::kClassic);
   if (script.is_wrapped()) {
     flags.set_function_syntax_kind(FunctionSyntaxKind::kWrapped);
   }
@@ -87,11 +89,11 @@ UnoptimizedCompileFlags UnoptimizedCompileFlags::ForScriptCompile(
 // static
 UnoptimizedCompileFlags UnoptimizedCompileFlags::ForToplevelCompile(
     Isolate* isolate, bool is_user_javascript, LanguageMode language_mode,
-    REPLMode repl_mode) {
+    REPLMode repl_mode, ScriptType type) {
   UnoptimizedCompileFlags flags(isolate, isolate->GetNextScriptId());
   flags.SetFlagsForToplevelCompile(isolate->is_collecting_type_profile(),
-                                   is_user_javascript, language_mode,
-                                   repl_mode);
+                                   is_user_javascript, language_mode, repl_mode,
+                                   type);
 
   LOG(isolate,
       ScriptEvent(Logger::ScriptEventType::kReserveId, flags.script_id()));
@@ -133,13 +135,15 @@ void UnoptimizedCompileFlags::SetFlagsFromFunction(T function) {
 
 void UnoptimizedCompileFlags::SetFlagsForToplevelCompile(
     bool is_collecting_type_profile, bool is_user_javascript,
-    LanguageMode language_mode, REPLMode repl_mode) {
+    LanguageMode language_mode, REPLMode repl_mode, ScriptType type) {
   set_allow_lazy_parsing(true);
   set_is_toplevel(true);
   set_collect_type_profile(is_user_javascript && is_collecting_type_profile);
   set_outer_language_mode(
       stricter_language_mode(outer_language_mode(), language_mode));
   set_is_repl_mode((repl_mode == REPLMode::kYes));
+  set_is_module(type == ScriptType::kModule);
+  DCHECK_IMPLIES(is_eval(), !is_module());
 
   set_block_coverage_enabled(block_coverage_enabled() && is_user_javascript);
 }
@@ -149,7 +153,7 @@ void UnoptimizedCompileFlags::SetFlagsForFunctionFromScript(Script script) {
 
   set_is_eval(script.compilation_type() == Script::COMPILATION_TYPE_EVAL);
   set_is_module(script.origin_options().IsModule());
-  DCHECK(!(is_eval() && is_module()));
+  DCHECK_IMPLIES(is_eval(), !is_module());
 
   set_block_coverage_enabled(block_coverage_enabled() &&
                              script.IsUserJavaScript());
diff --git a/deps/v8/src/parsing/parse-info.h b/deps/v8/src/parsing/parse-info.h
index d99ddcda89cbb3..6fc5e3163eb980 100644
--- a/deps/v8/src/parsing/parse-info.h
+++ b/deps/v8/src/parsing/parse-info.h
@@ -60,7 +60,6 @@ class Zone;
   V(might_always_opt, bool, 1, _)                        \
   V(allow_natives_syntax, bool, 1, _)                    \
   V(allow_lazy_compile, bool, 1, _)                      \
-  V(allow_harmony_private_methods, bool, 1, _)           \
   V(is_oneshot_iife, bool, 1, _)                         \
   V(collect_source_positions, bool, 1, _)                \
   V(allow_harmony_top_level_await, bool, 1, _)           \
@@ -70,10 +69,9 @@ class Zone;
 class V8_EXPORT_PRIVATE UnoptimizedCompileFlags {
  public:
   // Set-up flags for a toplevel compilation.
-  static UnoptimizedCompileFlags ForToplevelCompile(Isolate* isolate,
-                                                    bool is_user_javascript,
-                                                    LanguageMode language_mode,
-                                                    REPLMode repl_mode);
+  static UnoptimizedCompileFlags ForToplevelCompile(
+      Isolate* isolate, bool is_user_javascript, LanguageMode language_mode,
+      REPLMode repl_mode, ScriptType type = ScriptType::kClassic);
 
   // Set-up flags for a compiling a particular function (either a lazy compile
   // or a recompile).
@@ -136,7 +134,7 @@ class V8_EXPORT_PRIVATE UnoptimizedCompileFlags {
   void SetFlagsForToplevelCompile(bool is_collecting_type_profile,
                                   bool is_user_javascript,
                                   LanguageMode language_mode,
-                                  REPLMode repl_mode);
+                                  REPLMode repl_mode, ScriptType type);
   void SetFlagsForFunctionFromScript(Script script);
 
   uint32_t flags_;
diff --git a/deps/v8/src/parsing/parser-base.h b/deps/v8/src/parsing/parser-base.h
index fb86bb218a1216..ff5f0af39012eb 100644
--- a/deps/v8/src/parsing/parser-base.h
+++ b/deps/v8/src/parsing/parser-base.h
@@ -78,7 +78,7 @@ struct FormalParametersBase {
 };
 
 // Stack-allocated scope to collect source ranges from the parser.
-class SourceRangeScope final {
+class V8_NODISCARD SourceRangeScope final {
  public:
   SourceRangeScope(const Scanner* scanner, SourceRange* range)
       : scanner_(scanner), range_(range) {
@@ -463,7 +463,7 @@ class ParserBase {
       return contains_function_or_eval_;
     }
 
-    class FunctionOrEvalRecordingScope {
+    class V8_NODISCARD FunctionOrEvalRecordingScope {
      public:
       explicit FunctionOrEvalRecordingScope(FunctionState* state)
           : state_and_prev_value_(state, state->contains_function_or_eval_) {
@@ -481,7 +481,7 @@ class ParserBase {
       PointerWithPayload<FunctionState, bool, 1> state_and_prev_value_;
     };
 
-    class LoopScope final {
+    class V8_NODISCARD LoopScope final {
      public:
       explicit LoopScope(FunctionState* function_state)
           : function_state_(function_state) {
@@ -1207,7 +1207,7 @@ class ParserBase {
                                 bool name_is_strict_reserved,
                                 int class_token_pos);
   ExpressionT ParseTemplateLiteral(ExpressionT tag, int start, bool tagged);
-  ExpressionT ParseSuperExpression(bool is_new);
+  ExpressionT ParseSuperExpression();
   ExpressionT ParseImportExpressions();
   ExpressionT ParseNewTargetExpression();
 
@@ -1455,7 +1455,7 @@ class ParserBase {
            expression_scope_->has_possible_arrow_parameter_in_scope_chain();
   }
 
-  class AcceptINScope final {
+  class V8_NODISCARD AcceptINScope final {
    public:
     AcceptINScope(ParserBase* parser, bool accept_IN)
         : parser_(parser), previous_accept_IN_(parser->accept_IN_) {
@@ -1469,7 +1469,7 @@ class ParserBase {
     bool previous_accept_IN_;
   };
 
-  class ParameterParsingScope {
+  class V8_NODISCARD ParameterParsingScope {
    public:
     ParameterParsingScope(Impl* parser, FormalParametersT* parameters)
         : parser_(parser), parent_parameters_(parser_->parameters_) {
@@ -1483,7 +1483,7 @@ class ParserBase {
     FormalParametersT* parent_parameters_;
   };
 
-  class FunctionParsingScope {
+  class V8_NODISCARD FunctionParsingScope {
    public:
     explicit FunctionParsingScope(Impl* parser)
         : parser_(parser), expression_scope_(parser_->expression_scope_) {
@@ -1849,8 +1849,7 @@ ParserBase<Impl>::ParsePrimaryExpression() {
       return ParseFunctionExpression();
 
     case Token::SUPER: {
-      const bool is_new = false;
-      return ParseSuperExpression(is_new);
+      return ParseSuperExpression();
     }
     case Token::IMPORT:
       return ParseImportExpressions();
@@ -2161,13 +2160,6 @@ typename ParserBase<Impl>::ExpressionT ParserBase<Impl>::ParseProperty(
         prop_info->kind = ParsePropertyKind::kNotSet;
         return impl()->FailureExpression();
       }
-      if (V8_UNLIKELY(!flags().allow_harmony_private_methods() &&
-                      (IsAccessor(prop_info->kind) ||
-                       prop_info->kind == ParsePropertyKind::kMethod))) {
-        ReportUnexpectedToken(Next());
-        prop_info->kind = ParsePropertyKind::kNotSet;
-        return impl()->FailureExpression();
-      }
       break;
 
     case Token::STRING:
@@ -3176,6 +3168,15 @@ ParserBase<Impl>::ParseAwaitExpression() {
 
   ExpressionT value = ParseUnaryExpression();
 
+  // 'await' is a unary operator according to the spec, even though it's treated
+  // specially in the parser.
+  if (peek() == Token::EXP) {
+    impl()->ReportMessageAt(
+        Scanner::Location(await_pos, peek_end_position()),
+        MessageTemplate::kUnexpectedTokenUnaryExponentiation);
+    return impl()->FailureExpression();
+  }
+
   ExpressionT expr = factory()->NewAwait(value, await_pos);
   function_state_->AddSuspend();
   impl()->RecordSuspendSourceRange(expr, PositionAfterSemicolon());
@@ -3296,7 +3297,6 @@ ParserBase<Impl>::ParseLeftHandSideContinuation(ExpressionT result) {
 
   bool optional_chaining = false;
   bool is_optional = false;
-  int optional_link_begin;
   do {
     switch (peek()) {
       case Token::QUESTION_PERIOD: {
@@ -3304,16 +3304,10 @@ ParserBase<Impl>::ParseLeftHandSideContinuation(ExpressionT result) {
           ReportUnexpectedToken(peek());
           return impl()->FailureExpression();
         }
-        // Include the ?. in the source range position.
-        optional_link_begin = scanner()->peek_location().beg_pos;
         Consume(Token::QUESTION_PERIOD);
         is_optional = true;
         optional_chaining = true;
-        if (Token::IsPropertyOrCall(peek())) continue;
-        int pos = position();
-        ExpressionT key = ParsePropertyOrPrivatePropertyName();
-        result = factory()->NewProperty(result, key, pos, is_optional);
-        break;
+        continue;
       }
 
       /* Property */
@@ -3393,7 +3387,14 @@ ParserBase<Impl>::ParseLeftHandSideContinuation(ExpressionT result) {
       }
 
       default:
-        // Template literals in/after an Optional Chain not supported:
+        /* Optional Property */
+        if (is_optional) {
+          DCHECK_EQ(scanner()->current_token(), Token::QUESTION_PERIOD);
+          int pos = position();
+          ExpressionT key = ParsePropertyOrPrivatePropertyName();
+          result = factory()->NewProperty(result, key, pos, is_optional);
+          break;
+        }
         if (optional_chaining) {
           impl()->ReportMessageAt(scanner()->peek_location(),
                                   MessageTemplate::kOptionalChainingNoTemplate);
@@ -3404,12 +3405,8 @@ ParserBase<Impl>::ParseLeftHandSideContinuation(ExpressionT result) {
         result = ParseTemplateLiteral(result, position(), true);
         break;
     }
-    if (is_optional) {
-      SourceRange chain_link_range(optional_link_begin, end_position());
-      impl()->RecordExpressionSourceRange(result, chain_link_range);
-      is_optional = false;
-    }
-  } while (Token::IsPropertyOrCall(peek()));
+    is_optional = false;
+  } while (is_optional || Token::IsPropertyOrCall(peek()));
   if (optional_chaining) return factory()->NewOptionalChain(result);
   return result;
 }
@@ -3436,16 +3433,14 @@ ParserBase<Impl>::ParseMemberWithPresentNewPrefixesExpression() {
   // new new foo means new (new foo)
   // new new foo() means new (new foo())
   // new new foo().bar().baz means (new (new foo()).bar()).baz
+  // new super.x means new (super.x)
   Consume(Token::NEW);
   int new_pos = position();
   ExpressionT result;
 
   CheckStackOverflow();
 
-  if (peek() == Token::SUPER) {
-    const bool is_new = true;
-    result = ParseSuperExpression(is_new);
-  } else if (peek() == Token::IMPORT && PeekAhead() == Token::LPAREN) {
+  if (peek() == Token::IMPORT && PeekAhead() == Token::LPAREN) {
     impl()->ReportMessageAt(scanner()->peek_location(),
                             MessageTemplate::kImportCallNotNewExpression);
     return impl()->FailureExpression();
@@ -3454,6 +3449,12 @@ ParserBase<Impl>::ParseMemberWithPresentNewPrefixesExpression() {
     return ParseMemberExpressionContinuation(result);
   } else {
     result = ParseMemberExpression();
+    if (result->IsSuperCallReference()) {
+      // new super() is never allowed
+      impl()->ReportMessageAt(scanner()->location(),
+                              MessageTemplate::kUnexpectedSuper);
+      return impl()->FailureExpression();
+    }
   }
   if (peek() == Token::LPAREN) {
     // NewExpression with arguments.
@@ -3573,16 +3574,31 @@ ParserBase<Impl>::ParseImportExpressions() {
                             MessageTemplate::kImportMissingSpecifier);
     return impl()->FailureExpression();
   }
+
   AcceptINScope scope(this, true);
-  ExpressionT arg = ParseAssignmentExpressionCoverGrammar();
-  Expect(Token::RPAREN);
+  ExpressionT specifier = ParseAssignmentExpressionCoverGrammar();
 
-  return factory()->NewImportCallExpression(arg, pos);
+  if (FLAG_harmony_import_assertions && Check(Token::COMMA)) {
+    if (Check(Token::RPAREN)) {
+      // A trailing comma allowed after the specifier.
+      return factory()->NewImportCallExpression(specifier, pos);
+    } else {
+      ExpressionT import_assertions = ParseAssignmentExpressionCoverGrammar();
+      Check(Token::COMMA);  // A trailing comma is allowed after the import
+                            // assertions.
+      Expect(Token::RPAREN);
+      return factory()->NewImportCallExpression(specifier, import_assertions,
+                                                pos);
+    }
+  }
+
+  Expect(Token::RPAREN);
+  return factory()->NewImportCallExpression(specifier, pos);
 }
 
 template <typename Impl>
-typename ParserBase<Impl>::ExpressionT ParserBase<Impl>::ParseSuperExpression(
-    bool is_new) {
+typename ParserBase<Impl>::ExpressionT
+ParserBase<Impl>::ParseSuperExpression() {
   Consume(Token::SUPER);
   int pos = position();
 
@@ -3607,9 +3623,10 @@ typename ParserBase<Impl>::ExpressionT ParserBase<Impl>::ParseSuperExpression(
       UseThis();
       return impl()->NewSuperPropertyReference(pos);
     }
-    // new super() is never allowed.
-    // super() is only allowed in derived constructor
-    if (!is_new && peek() == Token::LPAREN && IsDerivedConstructor(kind)) {
+    // super() is only allowed in derived constructor. new super() is never
+    // allowed; it's reported as an error by
+    // ParseMemberWithPresentNewPrefixesExpression.
+    if (peek() == Token::LPAREN && IsDerivedConstructor(kind)) {
       // TODO(rossberg): This might not be the correct FunctionState for the
       // method here.
       expression_scope()->RecordThisUse();
diff --git a/deps/v8/src/parsing/parser.cc b/deps/v8/src/parsing/parser.cc
index c65c1dc6b6dfff..e96fe368d1c950 100644
--- a/deps/v8/src/parsing/parser.cc
+++ b/deps/v8/src/parsing/parser.cc
@@ -1210,7 +1210,7 @@ ZonePtrList<const Parser::NamedImport>* Parser::ParseNamedImports(int pos) {
   return result;
 }
 
-Parser::ImportAssertions* Parser::ParseImportAssertClause() {
+ImportAssertions* Parser::ParseImportAssertClause() {
   // AssertClause :
   //    assert '{' '}'
   //    assert '{' AssertEntries '}'
@@ -3047,9 +3047,6 @@ void Parser::DeclarePrivateClassMember(ClassScope* scope,
                                        ClassLiteralProperty* property,
                                        ClassLiteralProperty::Kind kind,
                                        bool is_static, ClassInfo* class_info) {
-  DCHECK_IMPLIES(kind != ClassLiteralProperty::Kind::FIELD,
-                 flags().allow_harmony_private_methods());
-
   if (kind == ClassLiteralProperty::Kind::FIELD) {
     if (is_static) {
       class_info->static_fields->Add(property, zone());
diff --git a/deps/v8/src/parsing/parser.h b/deps/v8/src/parsing/parser.h
index 50be9538610be7..d5521acaa1eb2b 100644
--- a/deps/v8/src/parsing/parser.h
+++ b/deps/v8/src/parsing/parser.h
@@ -14,6 +14,7 @@
 #include "src/base/compiler-specific.h"
 #include "src/base/threaded-list.h"
 #include "src/common/globals.h"
+#include "src/parsing/import-assertions.h"
 #include "src/parsing/parse-info.h"
 #include "src/parsing/parser-base.h"
 #include "src/parsing/parsing.h"
@@ -184,7 +185,7 @@ class V8_EXPORT_PRIVATE Parser : public NON_EXPORTED_BASE(ParserBase<Parser>) {
   bool parse_lazily() const { return mode_ == PARSE_LAZILY; }
   enum Mode { PARSE_LAZILY, PARSE_EAGERLY };
 
-  class ParsingModeScope {
+  class V8_NODISCARD ParsingModeScope {
    public:
     ParsingModeScope(Parser* parser, Mode mode)
         : parser_(parser), old_mode_(parser->mode_) {
@@ -283,9 +284,7 @@ class V8_EXPORT_PRIVATE Parser : public NON_EXPORTED_BASE(ParserBase<Parser>) {
   };
   const AstRawString* ParseExportSpecifierName();
   ZonePtrList<const NamedImport>* ParseNamedImports(int pos);
-  using ImportAssertions =
-      ZoneMap<const AstRawString*,
-              std::pair<const AstRawString*, Scanner::Location>>;
+
   ImportAssertions* ParseImportAssertClause();
   Statement* BuildInitializationBlock(DeclarationParsingResult* parsing_result);
   Expression* RewriteReturn(Expression* return_value, int pos);
@@ -1003,14 +1002,6 @@ class V8_EXPORT_PRIVATE Parser : public NON_EXPORTED_BASE(ParserBase<Parser>) {
         node, zone()->New<IterationStatementSourceRanges>(body_range));
   }
 
-  // Used to record source ranges of expressions associated with optional chain:
-  V8_INLINE void RecordExpressionSourceRange(Expression* node,
-                                             const SourceRange& right_range) {
-    if (source_range_map_ == nullptr) return;
-    source_range_map_->Insert(node,
-                              zone()->New<ExpressionSourceRanges>(right_range));
-  }
-
   V8_INLINE void RecordSuspendSourceRange(Expression* node,
                                           int32_t continuation_position) {
     if (source_range_map_ == nullptr) return;
diff --git a/deps/v8/src/parsing/pending-compilation-error-handler.h b/deps/v8/src/parsing/pending-compilation-error-handler.h
index b71e4fcdc39e70..5efb5a43a4845e 100644
--- a/deps/v8/src/parsing/pending-compilation-error-handler.h
+++ b/deps/v8/src/parsing/pending-compilation-error-handler.h
@@ -28,6 +28,11 @@ class PendingCompilationErrorHandler {
   PendingCompilationErrorHandler()
       : has_pending_error_(false), stack_overflow_(false) {}
 
+  PendingCompilationErrorHandler(const PendingCompilationErrorHandler&) =
+      delete;
+  PendingCompilationErrorHandler& operator=(
+      const PendingCompilationErrorHandler&) = delete;
+
   void ReportMessageAt(int start_position, int end_position,
                        MessageTemplate message, const char* arg = nullptr);
 
@@ -130,8 +135,6 @@ class PendingCompilationErrorHandler {
   MessageDetails error_details_;
 
   std::forward_list<MessageDetails> warning_messages_;
-
-  DISALLOW_COPY_AND_ASSIGN(PendingCompilationErrorHandler);
 };
 
 extern template void PendingCompilationErrorHandler::PrepareErrors(
diff --git a/deps/v8/src/parsing/preparse-data-impl.h b/deps/v8/src/parsing/preparse-data-impl.h
index 4d29c2b7ef651a..937244f30b3f15 100644
--- a/deps/v8/src/parsing/preparse-data-impl.h
+++ b/deps/v8/src/parsing/preparse-data-impl.h
@@ -37,9 +37,9 @@ class BaseConsumedPreparseData : public ConsumedPreparseData {
   class ByteData : public PreparseByteDataConstants {
    public:
     // Reading from the ByteData is only allowed when a ReadingScope is on the
-    // stack. This ensures that we have a DisallowHeapAllocation in place
+    // stack. This ensures that we have a DisallowGarbageCollection in place
     // whenever ByteData holds a raw pointer into the heap.
-    class ReadingScope {
+    class V8_NODISCARD ReadingScope {
      public:
       ReadingScope(ByteData* consumed_data, Data data)
           : consumed_data_(consumed_data) {
@@ -58,7 +58,7 @@ class BaseConsumedPreparseData : public ConsumedPreparseData {
 
      private:
       ByteData* consumed_data_;
-      DISALLOW_HEAP_ALLOCATION(no_gc)
+      DISALLOW_GARBAGE_COLLECTION(no_gc)
     };
 
     void SetPosition(int position) {
@@ -144,6 +144,8 @@ class BaseConsumedPreparseData : public ConsumedPreparseData {
   };
 
   BaseConsumedPreparseData() : scope_data_(new ByteData()), child_index_(0) {}
+  BaseConsumedPreparseData(const BaseConsumedPreparseData&) = delete;
+  BaseConsumedPreparseData& operator=(const BaseConsumedPreparseData&) = delete;
 
   virtual Data GetScopeData() = 0;
 
@@ -174,8 +176,6 @@ class BaseConsumedPreparseData : public ConsumedPreparseData {
   // When consuming the data, these indexes point to the data we're going to
   // consume next.
   int child_index_;
-
-  DISALLOW_COPY_AND_ASSIGN(BaseConsumedPreparseData);
 };
 
 // Implementation of ConsumedPreparseData for on-heap data.
@@ -198,6 +198,9 @@ class ZonePreparseData : public ZoneObject {
   V8_EXPORT_PRIVATE ZonePreparseData(Zone* zone, Vector<uint8_t>* byte_data,
                                      int child_length);
 
+  ZonePreparseData(const ZonePreparseData&) = delete;
+  ZonePreparseData& operator=(const ZonePreparseData&) = delete;
+
   Handle<PreparseData> Serialize(Isolate* isolate);
   Handle<PreparseData> Serialize(LocalIsolate* isolate);
 
@@ -215,8 +218,6 @@ class ZonePreparseData : public ZoneObject {
  private:
   ZoneVector<uint8_t> byte_data_;
   ZoneVector<ZonePreparseData*> children_;
-
-  DISALLOW_COPY_AND_ASSIGN(ZonePreparseData);
 };
 
 ZonePreparseData* PreparseDataBuilder::ByteData::CopyToZone(
diff --git a/deps/v8/src/parsing/preparse-data.cc b/deps/v8/src/parsing/preparse-data.cc
index b18788bfe7d7f1..aa49b55227cdc8 100644
--- a/deps/v8/src/parsing/preparse-data.cc
+++ b/deps/v8/src/parsing/preparse-data.cc
@@ -8,6 +8,7 @@
 
 #include "src/ast/scopes.h"
 #include "src/ast/variables.h"
+#include "src/base/platform/wrappers.h"
 #include "src/handles/handles.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/shared-function-info.h"
@@ -133,7 +134,7 @@ struct RawPreparseData {};
 
 void PreparseDataBuilder::ByteData::Finalize(Zone* zone) {
   uint8_t* raw_zone_data = zone->NewArray<uint8_t, RawPreparseData>(index_);
-  memcpy(raw_zone_data, byte_data_->data(), index_);
+  base::Memcpy(raw_zone_data, byte_data_->data(), index_);
   byte_data_->resize(0);
   zone_byte_data_ = Vector<uint8_t>(raw_zone_data, index_);
 #ifdef DEBUG
@@ -760,7 +761,7 @@ PreparseData OnHeapConsumedPreparseData::GetScopeData() { return *data_; }
 
 ProducedPreparseData* OnHeapConsumedPreparseData::GetChildData(Zone* zone,
                                                                int index) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Handle<PreparseData> child_data_handle(data_->get_child(index), isolate_);
   return ProducedPreparseData::For(child_data_handle, zone);
 }
diff --git a/deps/v8/src/parsing/preparse-data.h b/deps/v8/src/parsing/preparse-data.h
index 622338ac25aad5..1c4695a0ae675c 100644
--- a/deps/v8/src/parsing/preparse-data.h
+++ b/deps/v8/src/parsing/preparse-data.h
@@ -101,16 +101,20 @@ class V8_EXPORT_PRIVATE PreparseDataBuilder : public ZoneObject,
   explicit PreparseDataBuilder(Zone* zone, PreparseDataBuilder* parent_builder,
                                std::vector<void*>* children_buffer);
   ~PreparseDataBuilder() {}
+  PreparseDataBuilder(const PreparseDataBuilder&) = delete;
+  PreparseDataBuilder& operator=(const PreparseDataBuilder&) = delete;
 
   PreparseDataBuilder* parent() const { return parent_; }
 
   // For gathering the inner function data and splitting it up according to the
   // laziness boundaries. Each lazy function gets its own
   // ProducedPreparseData, and so do all lazy functions inside it.
-  class DataGatheringScope {
+  class V8_NODISCARD DataGatheringScope {
    public:
     explicit DataGatheringScope(PreParser* preparser)
         : preparser_(preparser), builder_(nullptr) {}
+    DataGatheringScope(const DataGatheringScope&) = delete;
+    DataGatheringScope& operator=(const DataGatheringScope&) = delete;
 
     void Start(DeclarationScope* function_scope);
     void SetSkippableFunction(DeclarationScope* function_scope,
@@ -125,8 +129,6 @@ class V8_EXPORT_PRIVATE PreparseDataBuilder : public ZoneObject,
 
     PreParser* preparser_;
     PreparseDataBuilder* builder_;
-
-    DISALLOW_COPY_AND_ASSIGN(DataGatheringScope);
   };
 
   class V8_EXPORT_PRIVATE ByteData : public ZoneObject,
@@ -241,8 +243,6 @@ class V8_EXPORT_PRIVATE PreparseDataBuilder : public ZoneObject,
 #ifdef DEBUG
   bool finalized_children_ = false;
 #endif
-
-  DISALLOW_COPY_AND_ASSIGN(PreparseDataBuilder);
 };
 
 class ProducedPreparseData : public ZoneObject {
@@ -289,6 +289,9 @@ class ConsumedPreparseData {
 
   virtual ~ConsumedPreparseData() = default;
 
+  ConsumedPreparseData(const ConsumedPreparseData&) = delete;
+  ConsumedPreparseData& operator=(const ConsumedPreparseData&) = delete;
+
   virtual ProducedPreparseData* GetDataForSkippableFunction(
       Zone* zone, int start_position, int* end_position, int* num_parameters,
       int* function_length, int* num_inner_functions, bool* uses_super_property,
@@ -302,9 +305,6 @@ class ConsumedPreparseData {
 
  protected:
   ConsumedPreparseData() = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ConsumedPreparseData);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/parsing/preparser.h b/deps/v8/src/parsing/preparser.h
index af53b8dc87c8ec..ff2b1ff1570239 100644
--- a/deps/v8/src/parsing/preparser.h
+++ b/deps/v8/src/parsing/preparser.h
@@ -792,6 +792,12 @@ class PreParserFactory {
     return PreParserExpression::Default();
   }
 
+  PreParserExpression NewImportCallExpression(
+      const PreParserExpression& specifier,
+      const PreParserExpression& import_assertions, int pos) {
+    return PreParserExpression::Default();
+  }
+
  private:
   // For creating VariableProxy objects to track unresolved variables.
   AstNodeFactory ast_node_factory_;
@@ -823,6 +829,9 @@ class PreParserFormalParameters : public FormalParametersBase {
 class PreParserFuncNameInferrer {
  public:
   explicit PreParserFuncNameInferrer(AstValueFactory* avf) {}
+  PreParserFuncNameInferrer(const PreParserFuncNameInferrer&) = delete;
+  PreParserFuncNameInferrer& operator=(const PreParserFuncNameInferrer&) =
+      delete;
   void RemoveAsyncKeywordFromEnd() const {}
   void Infer() const {}
   void RemoveLastFunction() const {}
@@ -830,13 +839,9 @@ class PreParserFuncNameInferrer {
   class State {
    public:
     explicit State(PreParserFuncNameInferrer* fni) {}
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(State);
+    State(const State&) = delete;
+    State& operator=(const State&) = delete;
   };
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PreParserFuncNameInferrer);
 };
 
 class PreParserSourceRange {
diff --git a/deps/v8/src/parsing/rewriter.cc b/deps/v8/src/parsing/rewriter.cc
index 36461ee762ebe1..c8394a4281de7a 100644
--- a/deps/v8/src/parsing/rewriter.cc
+++ b/deps/v8/src/parsing/rewriter.cc
@@ -69,7 +69,7 @@ class Processor final : public AstVisitor<Processor> {
   // [replacement_].  In many cases this will just be the original node.
   Statement* replacement_;
 
-  class BreakableScope final {
+  class V8_NODISCARD BreakableScope final {
    public:
     explicit BreakableScope(Processor* processor, bool breakable = true)
         : processor_(processor), previous_(processor->breakable_) {
@@ -400,7 +400,7 @@ bool Rewriter::Rewrite(ParseInfo* info) {
 
 base::Optional<VariableProxy*> Rewriter::RewriteBody(
     ParseInfo* info, Scope* scope, ZonePtrList<Statement>* body) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   DisallowHandleAllocation no_handles;
   DisallowHandleDereference no_deref;
 
diff --git a/deps/v8/src/parsing/scanner-character-streams.cc b/deps/v8/src/parsing/scanner-character-streams.cc
index dde90d910f9900..7eedc0c05c85d4 100644
--- a/deps/v8/src/parsing/scanner-character-streams.cc
+++ b/deps/v8/src/parsing/scanner-character-streams.cc
@@ -18,7 +18,7 @@
 namespace v8 {
 namespace internal {
 
-class ScopedExternalStringLock {
+class V8_NODISCARD ScopedExternalStringLock {
  public:
   explicit ScopedExternalStringLock(ExternalString string) {
     DCHECK(!string.is_null());
@@ -76,8 +76,8 @@ class OnHeapStream {
   // The no_gc argument is only here because of the templated way this class
   // is used along with other implementations that require V8 heap access.
   Range<Char> GetDataAt(size_t pos, RuntimeCallStats* stats,
-                        DisallowHeapAllocation* no_gc) {
-    return {&string_->GetChars(*no_gc)[start_offset_ + Min(length_, pos)],
+                        DisallowGarbageCollection* no_gc) {
+    return {&string_->GetChars(*no_gc)[start_offset_ + std::min(length_, pos)],
             &string_->GetChars(*no_gc)[start_offset_ + length_]};
   }
 
@@ -111,8 +111,8 @@ class ExternalStringStream {
   // The no_gc argument is only here because of the templated way this class
   // is used along with other implementations that require V8 heap access.
   Range<Char> GetDataAt(size_t pos, RuntimeCallStats* stats,
-                        DisallowHeapAllocation* no_gc = nullptr) {
-    return {&data_[Min(length_, pos)], &data_[length_]};
+                        DisallowGarbageCollection* no_gc = nullptr) {
+    return {&data_[std::min(length_, pos)], &data_[length_]};
   }
 
   static const bool kCanBeCloned = true;
@@ -133,8 +133,8 @@ class TestingStream {
   // The no_gc argument is only here because of the templated way this class
   // is used along with other implementations that require V8 heap access.
   Range<Char> GetDataAt(size_t pos, RuntimeCallStats* stats,
-                        DisallowHeapAllocation* no_gc = nullptr) {
-    return {&data_[Min(length_, pos)], &data_[length_]};
+                        DisallowGarbageCollection* no_gc = nullptr) {
+    return {&data_[std::min(length_, pos)], &data_[length_]};
   }
 
   static const bool kCanBeCloned = true;
@@ -160,10 +160,10 @@ class ChunkedStream {
   // The no_gc argument is only here because of the templated way this class
   // is used along with other implementations that require V8 heap access.
   Range<Char> GetDataAt(size_t pos, RuntimeCallStats* stats,
-                        DisallowHeapAllocation* no_gc = nullptr) {
+                        DisallowGarbageCollection* no_gc = nullptr) {
     Chunk chunk = FindChunk(pos, stats);
     size_t buffer_end = chunk.length;
-    size_t buffer_pos = Min(buffer_end, pos - chunk.position);
+    size_t buffer_pos = std::min(buffer_end, pos - chunk.position);
     return {&chunk.data[buffer_pos], &chunk.data[buffer_end]};
   }
 
@@ -256,7 +256,7 @@ class BufferedCharacterStream : public Utf16CharacterStream {
     buffer_start_ = &buffer_[0];
     buffer_cursor_ = buffer_start_;
 
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Range<uint8_t> range =
         byte_stream_.GetDataAt(position, runtime_call_stats(), &no_gc);
     if (range.length() == 0) {
@@ -264,7 +264,7 @@ class BufferedCharacterStream : public Utf16CharacterStream {
       return false;
     }
 
-    size_t length = Min(kBufferSize, range.length());
+    size_t length = std::min({kBufferSize, range.length()});
     i::CopyChars(buffer_, range.start, length);
     buffer_end_ = &buffer_[length];
     return true;
@@ -310,7 +310,7 @@ class UnbufferedCharacterStream : public Utf16CharacterStream {
   bool ReadBlock() final {
     size_t position = pos();
     buffer_pos_ = position;
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Range<uint16_t> range =
         byte_stream_.GetDataAt(position, runtime_call_stats(), &no_gc);
     buffer_start_ = range.start;
@@ -357,7 +357,7 @@ class RelocatingCharacterStream final
   }
 
   void UpdateBufferPointers() {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Range<uint16_t> range =
         byte_stream_.GetDataAt(buffer_pos_, runtime_call_stats(), &no_gc);
     if (range.start != buffer_start_) {
@@ -605,7 +605,7 @@ void Utf8ExternalStreamingStream::FillBufferFromCurrentChunk() {
     // Fast path for ascii sequences.
     size_t remaining = end - cursor;
     size_t max_buffer = max_buffer_end - output_cursor;
-    int max_length = static_cast<int>(Min(remaining, max_buffer));
+    int max_length = static_cast<int>(std::min(remaining, max_buffer));
     DCHECK_EQ(state, unibrow::Utf8::State::kAccept);
     int ascii_length = NonAsciiStart(cursor, max_length);
     CopyChars(output_cursor, cursor, ascii_length);
diff --git a/deps/v8/src/parsing/scanner.cc b/deps/v8/src/parsing/scanner.cc
index 9a04bdc510527a..c596078762941e 100644
--- a/deps/v8/src/parsing/scanner.cc
+++ b/deps/v8/src/parsing/scanner.cc
@@ -11,6 +11,7 @@
 #include <cmath>
 
 #include "src/ast/ast-value-factory.h"
+#include "src/base/platform/wrappers.h"
 #include "src/numbers/conversions-inl.h"
 #include "src/objects/bigint.h"
 #include "src/parsing/parse-info.h"
@@ -253,11 +254,6 @@ void Scanner::TryToParseSourceURLComment() {
     Advance();
   }
   while (c0_ != kEndOfInput && !unibrow::IsLineTerminator(c0_)) {
-    // Disallowed characters.
-    if (c0_ == '"' || c0_ == '\'') {
-      value->Start();
-      return;
-    }
     if (IsWhiteSpace(c0_)) {
       break;
     }
@@ -1050,7 +1046,7 @@ const char* Scanner::CurrentLiteralAsCString(Zone* zone) const {
   Vector<const uint8_t> vector = literal_one_byte_string();
   int length = vector.length();
   char* buffer = zone->NewArray<char>(length + 1);
-  memcpy(buffer, vector.begin(), length);
+  base::Memcpy(buffer, vector.begin(), length);
   buffer[length] = '\0';
   return buffer;
 }
diff --git a/deps/v8/src/parsing/scanner.h b/deps/v8/src/parsing/scanner.h
index 6ac7dde01b63d4..3df234ce54a72c 100644
--- a/deps/v8/src/parsing/scanner.h
+++ b/deps/v8/src/parsing/scanner.h
@@ -210,7 +210,7 @@ class Utf16CharacterStream {
 class V8_EXPORT_PRIVATE Scanner {
  public:
   // Scoped helper for a re-settable bookmark.
-  class V8_EXPORT_PRIVATE BookmarkScope {
+  class V8_EXPORT_PRIVATE V8_NODISCARD BookmarkScope {
    public:
     explicit BookmarkScope(Scanner* scanner)
         : scanner_(scanner),
@@ -219,6 +219,8 @@ class V8_EXPORT_PRIVATE Scanner {
       DCHECK_NOT_NULL(scanner_);
     }
     ~BookmarkScope() = default;
+    BookmarkScope(const BookmarkScope&) = delete;
+    BookmarkScope& operator=(const BookmarkScope&) = delete;
 
     void Set(size_t bookmark);
     void Apply();
@@ -232,8 +234,6 @@ class V8_EXPORT_PRIVATE Scanner {
     Scanner* scanner_;
     size_t bookmark_;
     bool had_parser_error_;
-
-    DISALLOW_COPY_AND_ASSIGN(BookmarkScope);
   };
 
   // Sets the Scanner into an error state to stop further scanning and terminate
diff --git a/deps/v8/src/profiler/allocation-tracker.cc b/deps/v8/src/profiler/allocation-tracker.cc
index 59004380cfcedd..4181fbfae37271 100644
--- a/deps/v8/src/profiler/allocation-tracker.cc
+++ b/deps/v8/src/profiler/allocation-tracker.cc
@@ -200,7 +200,7 @@ void AllocationTracker::PrepareForSerialization() {
 
 
 void AllocationTracker::AllocationEvent(Address addr, int size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   Heap* heap = ids_->heap();
 
   // Mark the new block as FreeSpace to make sure the heap is iterable
@@ -242,7 +242,7 @@ unsigned AllocationTracker::AddFunctionInfo(SharedFunctionInfo shared,
       reinterpret_cast<void*>(id), SnapshotObjectIdHash(id));
   if (entry->value == nullptr) {
     FunctionInfo* info = new FunctionInfo();
-    info->name = names_->GetName(shared.DebugName());
+    info->name = names_->GetCopy(shared.DebugNameCStr().get());
     info->function_id = id;
     if (shared.script().IsScript()) {
       Script script = Script::cast(shared.script());
diff --git a/deps/v8/src/profiler/allocation-tracker.h b/deps/v8/src/profiler/allocation-tracker.h
index e67994ca19efec..2c17ec69800ea0 100644
--- a/deps/v8/src/profiler/allocation-tracker.h
+++ b/deps/v8/src/profiler/allocation-tracker.h
@@ -28,6 +28,8 @@ class AllocationTraceNode {
   AllocationTraceNode(AllocationTraceTree* tree,
                       unsigned function_info_index);
   ~AllocationTraceNode();
+  AllocationTraceNode(const AllocationTraceNode&) = delete;
+  AllocationTraceNode& operator=(const AllocationTraceNode&) = delete;
   AllocationTraceNode* FindChild(unsigned function_info_index);
   AllocationTraceNode* FindOrAddChild(unsigned function_info_index);
   void AddAllocation(unsigned size);
@@ -49,8 +51,6 @@ class AllocationTraceNode {
   unsigned allocation_count_;
   unsigned id_;
   std::vector<AllocationTraceNode*> children_;
-
-  DISALLOW_COPY_AND_ASSIGN(AllocationTraceNode);
 };
 
 
@@ -58,6 +58,8 @@ class AllocationTraceTree {
  public:
   AllocationTraceTree();
   ~AllocationTraceTree() = default;
+  AllocationTraceTree(const AllocationTraceTree&) = delete;
+  AllocationTraceTree& operator=(const AllocationTraceTree&) = delete;
   AllocationTraceNode* AddPathFromEnd(const Vector<unsigned>& path);
   AllocationTraceNode* root() { return &root_; }
   unsigned next_node_id() { return next_node_id_++; }
@@ -66,8 +68,6 @@ class AllocationTraceTree {
  private:
   unsigned next_node_id_;
   AllocationTraceNode root_;
-
-  DISALLOW_COPY_AND_ASSIGN(AllocationTraceTree);
 };
 
 class V8_EXPORT_PRIVATE AddressToTraceMap {
@@ -108,6 +108,8 @@ class AllocationTracker {
 
   AllocationTracker(HeapObjectsMap* ids, StringsStorage* names);
   ~AllocationTracker();
+  AllocationTracker(const AllocationTracker&) = delete;
+  AllocationTracker& operator=(const AllocationTracker&) = delete;
 
   V8_EXPORT_PRIVATE void PrepareForSerialization();
   void AllocationEvent(Address addr, int size);
@@ -146,8 +148,6 @@ class AllocationTracker {
   std::vector<UnresolvedLocation*> unresolved_locations_;
   unsigned info_index_for_other_state_;
   AddressToTraceMap address_to_trace_;
-
-  DISALLOW_COPY_AND_ASSIGN(AllocationTracker);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/circular-queue.h b/deps/v8/src/profiler/circular-queue.h
index e9278fbccc5789..ee3e30b268257b 100644
--- a/deps/v8/src/profiler/circular-queue.h
+++ b/deps/v8/src/profiler/circular-queue.h
@@ -23,6 +23,8 @@ class SamplingCircularQueue {
   // Executed on the application thread.
   SamplingCircularQueue();
   ~SamplingCircularQueue();
+  SamplingCircularQueue(const SamplingCircularQueue&) = delete;
+  SamplingCircularQueue& operator=(const SamplingCircularQueue&) = delete;
 
   // StartEnqueue returns a pointer to a memory location for storing the next
   // record or nullptr if all entries are full at the moment.
@@ -57,8 +59,6 @@ class SamplingCircularQueue {
   Entry buffer_[Length];
   alignas(PROCESSOR_CACHE_LINE_SIZE) Entry* enqueue_pos_;
   alignas(PROCESSOR_CACHE_LINE_SIZE) Entry* dequeue_pos_;
-
-  DISALLOW_COPY_AND_ASSIGN(SamplingCircularQueue);
 };
 
 
diff --git a/deps/v8/src/profiler/cpu-profiler.cc b/deps/v8/src/profiler/cpu-profiler.cc
index 6ee7539dda7246..a18e16359ef87f 100644
--- a/deps/v8/src/profiler/cpu-profiler.cc
+++ b/deps/v8/src/profiler/cpu-profiler.cc
@@ -321,12 +321,17 @@ void* SamplingEventsProcessor::operator new(size_t size) {
 void SamplingEventsProcessor::operator delete(void* ptr) { AlignedFree(ptr); }
 
 ProfilerCodeObserver::ProfilerCodeObserver(Isolate* isolate)
-    : isolate_(isolate), processor_(nullptr) {
+    : isolate_(isolate), code_map_(strings_), processor_(nullptr) {
   CreateEntriesForRuntimeCallStats();
   LogBuiltins();
 }
 
-void ProfilerCodeObserver::ClearCodeMap() { code_map_.Clear(); }
+void ProfilerCodeObserver::ClearCodeMap() {
+  code_map_.Clear();
+  // We don't currently expect any references to refcounted strings to be
+  // maintained with zero profiles after the code map is cleared.
+  DCHECK(strings_.empty());
+}
 
 void ProfilerCodeObserver::CodeEventHandler(
     const CodeEventsContainer& evt_rec) {
@@ -445,22 +450,24 @@ DEFINE_LAZY_LEAKY_OBJECT_GETTER(CpuProfilersManager, GetProfilersManager)
 CpuProfiler::CpuProfiler(Isolate* isolate, CpuProfilingNamingMode naming_mode,
                          CpuProfilingLoggingMode logging_mode)
     : CpuProfiler(isolate, naming_mode, logging_mode,
-                  new CpuProfilesCollection(isolate), nullptr, nullptr) {}
+                  new CpuProfilesCollection(isolate), nullptr, nullptr,
+                  new ProfilerCodeObserver(isolate)) {}
 
 CpuProfiler::CpuProfiler(Isolate* isolate, CpuProfilingNamingMode naming_mode,
                          CpuProfilingLoggingMode logging_mode,
                          CpuProfilesCollection* test_profiles,
                          Symbolizer* test_symbolizer,
-                         ProfilerEventsProcessor* test_processor)
+                         ProfilerEventsProcessor* test_processor,
+                         ProfilerCodeObserver* test_code_observer)
     : isolate_(isolate),
       naming_mode_(naming_mode),
       logging_mode_(logging_mode),
       base_sampling_interval_(base::TimeDelta::FromMicroseconds(
           FLAG_cpu_profiler_sampling_interval)),
+      code_observer_(test_code_observer),
       profiles_(test_profiles),
       symbolizer_(test_symbolizer),
       processor_(test_processor),
-      code_observer_(isolate),
       is_profiling_(false) {
   profiles_->set_cpu_profiler(this);
   GetProfilersManager()->AddProfiler(isolate, this);
@@ -491,7 +498,7 @@ void CpuProfiler::ResetProfiles() {
   symbolizer_.reset();
   if (!profiling_scope_) {
     profiler_listener_.reset();
-    code_observer_.ClearCodeMap();
+    code_observer_->ClearCodeMap();
   }
 }
 
@@ -500,7 +507,8 @@ void CpuProfiler::EnableLogging() {
 
   if (!profiler_listener_) {
     profiler_listener_.reset(
-        new ProfilerListener(isolate_, &code_observer_, naming_mode_));
+        new ProfilerListener(isolate_, code_observer_.get(),
+                             *code_observer_->strings(), naming_mode_));
   }
   profiling_scope_.reset(
       new ProfilingScope(isolate_, profiler_listener_.get()));
@@ -568,12 +576,12 @@ void CpuProfiler::StartProcessorIfNotStarted() {
   }
 
   if (!symbolizer_) {
-    symbolizer_ = std::make_unique<Symbolizer>(code_observer_.code_map());
+    symbolizer_ = std::make_unique<Symbolizer>(code_observer_->code_map());
   }
 
   base::TimeDelta sampling_interval = ComputeSamplingInterval();
   processor_.reset(new SamplingEventsProcessor(
-      isolate_, symbolizer_.get(), &code_observer_, profiles_.get(),
+      isolate_, symbolizer_.get(), code_observer_.get(), profiles_.get(),
       sampling_interval, use_precise_sampling_));
   is_profiling_ = true;
 
diff --git a/deps/v8/src/profiler/cpu-profiler.h b/deps/v8/src/profiler/cpu-profiler.h
index e7ca3fbd7b23b9..572fe853fb52c2 100644
--- a/deps/v8/src/profiler/cpu-profiler.h
+++ b/deps/v8/src/profiler/cpu-profiler.h
@@ -129,7 +129,7 @@ class CodeEventsContainer {
 
 // Maintains the number of active CPU profilers in an isolate, and routes
 // logging to a given ProfilerListener.
-class ProfilingScope {
+class V8_NODISCARD ProfilingScope {
  public:
   ProfilingScope(Isolate* isolate, ProfilerListener* listener);
   ~ProfilingScope();
@@ -236,16 +236,18 @@ class V8_EXPORT_PRIVATE SamplingEventsProcessor
                                      // low sampling intervals on Windows.
 };
 
-// Builds and maintains a CodeMap tracking code objects on the VM heap. While
-// alive, logs generated code, callbacks, and builtins from the isolate.
-// Redirects events to the profiler events processor when present.
+// Builds and maintains a CodeMap tracking code objects on the VM heap, as well
+// as strings owned by them. While alive, logs generated code, callbacks, and
+// builtins from the isolate. Redirects events to the profiler events
+// processor when present.
 class V8_EXPORT_PRIVATE ProfilerCodeObserver : public CodeEventObserver {
  public:
   explicit ProfilerCodeObserver(Isolate*);
 
   void CodeEventHandler(const CodeEventsContainer& evt_rec) override;
-
   CodeMap* code_map() { return &code_map_; }
+  StringsStorage* strings() { return &strings_; }
+
   void ClearCodeMap();
 
  private:
@@ -267,6 +269,7 @@ class V8_EXPORT_PRIVATE ProfilerCodeObserver : public CodeEventObserver {
   void clear_processor() { processor_ = nullptr; }
 
   Isolate* const isolate_;
+  StringsStorage strings_;
   CodeMap code_map_;
   ProfilerEventsProcessor* processor_;
 };
@@ -299,9 +302,12 @@ class V8_EXPORT_PRIVATE CpuProfiler {
   CpuProfiler(Isolate* isolate, CpuProfilingNamingMode naming_mode,
               CpuProfilingLoggingMode logging_mode,
               CpuProfilesCollection* profiles, Symbolizer* test_symbolizer,
-              ProfilerEventsProcessor* test_processor);
+              ProfilerEventsProcessor* test_processor,
+              ProfilerCodeObserver* test_code_observer);
 
   ~CpuProfiler();
+  CpuProfiler(const CpuProfiler&) = delete;
+  CpuProfiler& operator=(const CpuProfiler&) = delete;
 
   static void CollectSample(Isolate* isolate);
 
@@ -335,7 +341,7 @@ class V8_EXPORT_PRIVATE CpuProfiler {
   ProfilerListener* profiler_listener_for_test() const {
     return profiler_listener_.get();
   }
-  CodeMap* code_map_for_test() { return code_observer_.code_map(); }
+  CodeMap* code_map_for_test() { return code_observer_->code_map(); }
 
  private:
   void StartProcessorIfNotStarted();
@@ -359,15 +365,13 @@ class V8_EXPORT_PRIVATE CpuProfiler {
   // Sampling interval to which per-profile sampling intervals will be clamped
   // to a multiple of, or used as the default if unspecified.
   base::TimeDelta base_sampling_interval_;
+  std::unique_ptr<ProfilerCodeObserver> code_observer_;
   std::unique_ptr<CpuProfilesCollection> profiles_;
   std::unique_ptr<Symbolizer> symbolizer_;
   std::unique_ptr<ProfilerEventsProcessor> processor_;
   std::unique_ptr<ProfilerListener> profiler_listener_;
   std::unique_ptr<ProfilingScope> profiling_scope_;
-  ProfilerCodeObserver code_observer_;
   bool is_profiling_;
-
-  DISALLOW_COPY_AND_ASSIGN(CpuProfiler);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/heap-profiler.cc b/deps/v8/src/profiler/heap-profiler.cc
index f742b7e1cca636..e62f0b22e78468 100644
--- a/deps/v8/src/profiler/heap-profiler.cc
+++ b/deps/v8/src/profiler/heap-profiler.cc
@@ -191,7 +191,7 @@ void HeapProfiler::ObjectMoveEvent(Address from, Address to, int size) {
 }
 
 void HeapProfiler::AllocationEvent(Address addr, int size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (allocation_tracker_) {
     allocation_tracker_->AllocationEvent(addr, size);
   }
diff --git a/deps/v8/src/profiler/heap-profiler.h b/deps/v8/src/profiler/heap-profiler.h
index 67fd1e5bd8ad3b..ebf737523cc71e 100644
--- a/deps/v8/src/profiler/heap-profiler.h
+++ b/deps/v8/src/profiler/heap-profiler.h
@@ -28,6 +28,8 @@ class HeapProfiler : public HeapObjectAllocationTracker {
  public:
   explicit HeapProfiler(Heap* heap);
   ~HeapProfiler() override;
+  HeapProfiler(const HeapProfiler&) = delete;
+  HeapProfiler& operator=(const HeapProfiler&) = delete;
 
   HeapSnapshot* TakeSnapshot(v8::ActivityControl* control,
                              v8::HeapProfiler::ObjectNameResolver* resolver,
@@ -109,8 +111,6 @@ class HeapProfiler : public HeapObjectAllocationTracker {
       build_embedder_graph_callbacks_;
   std::pair<v8::HeapProfiler::GetDetachednessCallback, void*>
       get_detachedness_callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(HeapProfiler);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/heap-snapshot-generator.cc b/deps/v8/src/profiler/heap-snapshot-generator.cc
index 2907a215c626ca..b6b67e38fd7d4a 100644
--- a/deps/v8/src/profiler/heap-snapshot-generator.cc
+++ b/deps/v8/src/profiler/heap-snapshot-generator.cc
@@ -1106,11 +1106,10 @@ void V8HeapExplorer::ExtractMapReferences(HeapEntry* entry, Map map) {
 
 void V8HeapExplorer::ExtractSharedFunctionInfoReferences(
     HeapEntry* entry, SharedFunctionInfo shared) {
-  String shared_name = shared.DebugName();
-  const char* name = nullptr;
-  if (shared_name != ReadOnlyRoots(heap_).empty_string()) {
-    name = names_->GetName(shared_name);
-    TagObject(shared.GetCode(), names_->GetFormatted("(code for %s)", name));
+  std::unique_ptr<char[]> name = shared.DebugNameCStr();
+  if (name[0] != '\0') {
+    TagObject(shared.GetCode(),
+              names_->GetFormatted("(code for %s)", name.get()));
   } else {
     TagObject(shared.GetCode(),
               names_->GetFormatted("(%s code)",
@@ -1355,7 +1354,7 @@ void V8HeapExplorer::ExtractPropertyReferences(JSObject js_obj,
   } else if (js_obj.IsJSGlobalObject()) {
     // We assume that global objects can only have slow properties.
     GlobalDictionary dictionary =
-        JSGlobalObject::cast(js_obj).global_dictionary();
+        JSGlobalObject::cast(js_obj).global_dictionary(kAcquireLoad);
     ReadOnlyRoots roots(isolate);
     for (InternalIndex i : dictionary.IterateEntries()) {
       if (!dictionary.IsKey(roots, dictionary.KeyAt(i))) continue;
@@ -1365,6 +1364,17 @@ void V8HeapExplorer::ExtractPropertyReferences(JSObject js_obj,
       PropertyDetails details = cell.property_details();
       SetDataOrAccessorPropertyReference(details.kind(), entry, name, value);
     }
+  } else if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    OrderedNameDictionary dictionary = js_obj.property_dictionary_ordered();
+    ReadOnlyRoots roots(isolate);
+    for (InternalIndex i : dictionary.IterateEntries()) {
+      Object k = dictionary.KeyAt(i);
+      if (!dictionary.IsKey(roots, k)) continue;
+      Object value = dictionary.ValueAt(i);
+      PropertyDetails details = dictionary.DetailsAt(i);
+      SetDataOrAccessorPropertyReference(details.kind(), entry, Name::cast(k),
+                                         value);
+    }
   } else {
     NameDictionary dictionary = js_obj.property_dictionary();
     ReadOnlyRoots roots(isolate);
@@ -1430,7 +1440,7 @@ void V8HeapExplorer::ExtractInternalReferences(JSObject js_obj,
 
 JSFunction V8HeapExplorer::GetConstructor(JSReceiver receiver) {
   Isolate* isolate = receiver.GetIsolate();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   HandleScope scope(isolate);
   MaybeHandle<JSFunction> maybe_constructor =
       JSReceiver::GetConstructor(handle(receiver, isolate));
@@ -1443,7 +1453,7 @@ JSFunction V8HeapExplorer::GetConstructor(JSReceiver receiver) {
 String V8HeapExplorer::GetConstructorName(JSObject object) {
   Isolate* isolate = object.GetIsolate();
   if (object.IsJSFunction()) return ReadOnlyRoots(isolate).closure_string();
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   HandleScope scope(isolate);
   return *JSReceiver::GetConstructorName(handle(object, isolate));
 }
@@ -1990,6 +2000,9 @@ void NativeObjectsExplorer::MergeNodeIntoEntry(
   entry->set_name(MergeNames(
       names_, EmbedderGraphNodeName(names_, original_node), entry->name()));
   entry->set_type(EmbedderGraphNodeType(original_node));
+  DCHECK_GE(entry->self_size() + original_node->SizeInBytes(),
+            entry->self_size());
+  entry->add_self_size(original_node->SizeInBytes());
 }
 
 HeapEntry* NativeObjectsExplorer::EntryForEmbedderGraphNode(
@@ -2019,7 +2032,7 @@ bool NativeObjectsExplorer::IterateAndExtractReferences(
   if (FLAG_heap_profiler_use_embedder_graph &&
       snapshot_->profiler()->HasBuildEmbedderGraphCallback()) {
     v8::HandleScope scope(reinterpret_cast<v8::Isolate*>(isolate_));
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     EmbedderGraphImpl graph;
     snapshot_->profiler()->BuildEmbedderGraph(isolate_, &graph);
     for (const auto& node : graph.nodes()) {
@@ -2070,7 +2083,7 @@ HeapSnapshotGenerator::HeapSnapshotGenerator(
 }
 
 namespace {
-class NullContextForSnapshotScope {
+class V8_NODISCARD NullContextForSnapshotScope {
  public:
   explicit NullContextForSnapshotScope(Isolate* isolate)
       : isolate_(isolate), prev_(isolate->context()) {
@@ -2196,7 +2209,7 @@ class OutputStreamWriter {
     const char* s_end = s + n;
     while (s < s_end) {
       int s_chunk_size =
-          Min(chunk_size_ - chunk_pos_, static_cast<int>(s_end - s));
+          std::min(chunk_size_ - chunk_pos_, static_cast<int>(s_end - s));
       DCHECK_GT(s_chunk_size, 0);
       MemCopy(chunk_.begin() + chunk_pos_, s, s_chunk_size);
       s += s_chunk_size;
diff --git a/deps/v8/src/profiler/heap-snapshot-generator.h b/deps/v8/src/profiler/heap-snapshot-generator.h
index df95787f96cb8d..12fd9450a9b54d 100644
--- a/deps/v8/src/profiler/heap-snapshot-generator.h
+++ b/deps/v8/src/profiler/heap-snapshot-generator.h
@@ -126,6 +126,7 @@ class HeapEntry {
   void set_name(const char* name) { name_ = name; }
   SnapshotObjectId id() const { return id_; }
   size_t self_size() const { return self_size_; }
+  void add_self_size(size_t size) { self_size_ += size; }
   unsigned trace_node_id() const { return trace_node_id_; }
   int index() const { return index_; }
   V8_INLINE int children_count() const;
@@ -188,6 +189,8 @@ class HeapEntry {
 class HeapSnapshot {
  public:
   explicit HeapSnapshot(HeapProfiler* profiler, bool global_objects_as_roots);
+  HeapSnapshot(const HeapSnapshot&) = delete;
+  HeapSnapshot& operator=(const HeapSnapshot&) = delete;
   void Delete();
 
   HeapProfiler* profiler() const { return profiler_; }
@@ -242,8 +245,6 @@ class HeapSnapshot {
   std::vector<SourceLocation> locations_;
   SnapshotObjectId max_snapshot_js_object_id_ = -1;
   bool treat_global_objects_as_roots_;
-
-  DISALLOW_COPY_AND_ASSIGN(HeapSnapshot);
 };
 
 
@@ -260,6 +261,8 @@ class HeapObjectsMap {
   };
 
   explicit HeapObjectsMap(Heap* heap);
+  HeapObjectsMap(const HeapObjectsMap&) = delete;
+  HeapObjectsMap& operator=(const HeapObjectsMap&) = delete;
 
   Heap* heap() const { return heap_; }
 
@@ -308,8 +311,6 @@ class HeapObjectsMap {
   // Map from NativeObject to EntryInfo index in entries_.
   std::unordered_map<NativeObject, size_t> merged_native_entries_map_;
   Heap* heap_;
-
-  DISALLOW_COPY_AND_ASSIGN(HeapObjectsMap);
 };
 
 // A typedef for referencing anything that can be snapshotted living
@@ -337,6 +338,8 @@ class V8_EXPORT_PRIVATE V8HeapExplorer : public HeapEntriesAllocator {
                  SnapshottingProgressReportingInterface* progress,
                  v8::HeapProfiler::ObjectNameResolver* resolver);
   ~V8HeapExplorer() override = default;
+  V8HeapExplorer(const V8HeapExplorer&) = delete;
+  V8HeapExplorer& operator=(const V8HeapExplorer&) = delete;
 
   HeapEntry* AllocateEntry(HeapThing ptr) override;
   int EstimateObjectsCount();
@@ -462,8 +465,6 @@ class V8_EXPORT_PRIVATE V8HeapExplorer : public HeapEntriesAllocator {
 
   friend class IndexedReferencesExtractor;
   friend class RootsReferencesExtractor;
-
-  DISALLOW_COPY_AND_ASSIGN(V8HeapExplorer);
 };
 
 // An implementation of retained native objects extractor.
@@ -471,6 +472,8 @@ class NativeObjectsExplorer {
  public:
   NativeObjectsExplorer(HeapSnapshot* snapshot,
                         SnapshottingProgressReportingInterface* progress);
+  NativeObjectsExplorer(const NativeObjectsExplorer&) = delete;
+  NativeObjectsExplorer& operator=(const NativeObjectsExplorer&) = delete;
   bool IterateAndExtractReferences(HeapSnapshotGenerator* generator);
 
  private:
@@ -491,8 +494,6 @@ class NativeObjectsExplorer {
   static HeapThing const kNativesRootObject;
 
   friend class GlobalHandlesExtractor;
-
-  DISALLOW_COPY_AND_ASSIGN(NativeObjectsExplorer);
 };
 
 class HeapSnapshotGenerator : public SnapshottingProgressReportingInterface {
@@ -505,6 +506,8 @@ class HeapSnapshotGenerator : public SnapshottingProgressReportingInterface {
                         v8::ActivityControl* control,
                         v8::HeapProfiler::ObjectNameResolver* resolver,
                         Heap* heap);
+  HeapSnapshotGenerator(const HeapSnapshotGenerator&) = delete;
+  HeapSnapshotGenerator& operator=(const HeapSnapshotGenerator&) = delete;
   bool GenerateSnapshot();
 
   HeapEntry* FindEntry(HeapThing ptr) {
@@ -538,8 +541,6 @@ class HeapSnapshotGenerator : public SnapshottingProgressReportingInterface {
   int progress_counter_;
   int progress_total_;
   Heap* heap_;
-
-  DISALLOW_COPY_AND_ASSIGN(HeapSnapshotGenerator);
 };
 
 class OutputStreamWriter;
@@ -552,6 +553,9 @@ class HeapSnapshotJSONSerializer {
         next_node_id_(1),
         next_string_id_(1),
         writer_(nullptr) {}
+  HeapSnapshotJSONSerializer(const HeapSnapshotJSONSerializer&) = delete;
+  HeapSnapshotJSONSerializer& operator=(const HeapSnapshotJSONSerializer&) =
+      delete;
   void Serialize(v8::OutputStream* stream);
 
  private:
@@ -591,8 +595,6 @@ class HeapSnapshotJSONSerializer {
 
   friend class HeapSnapshotJSONSerializerEnumerator;
   friend class HeapSnapshotJSONSerializerIterator;
-
-  DISALLOW_COPY_AND_ASSIGN(HeapSnapshotJSONSerializer);
 };
 
 
diff --git a/deps/v8/src/profiler/profile-generator.cc b/deps/v8/src/profiler/profile-generator.cc
index f3344c57a010ea..fa6c452ba70e61 100644
--- a/deps/v8/src/profiler/profile-generator.cc
+++ b/deps/v8/src/profiler/profile-generator.cc
@@ -71,7 +71,6 @@ void SourcePositionTable::print() const {
   }
 }
 
-const char* const CodeEntry::kWasmResourceNamePrefix = "wasm ";
 const char* const CodeEntry::kEmptyResourceName = "";
 const char* const CodeEntry::kEmptyBailoutReason = "";
 const char* const CodeEntry::kNoDeoptReason = "";
@@ -222,6 +221,25 @@ CodeEntry::RareData* CodeEntry::EnsureRareData() {
   return rare_data_.get();
 }
 
+void CodeEntry::ReleaseStrings(StringsStorage& strings) {
+  if (name_) {
+    strings.Release(name_);
+    name_ = nullptr;
+  }
+  if (resource_name_) {
+    strings.Release(resource_name_);
+    resource_name_ = nullptr;
+  }
+
+  if (rare_data_) {
+    // All inline entries are exclusively owned by the CodeEntry. They'll be
+    // deallocated when the CodeEntry is deallocated.
+    for (auto& entry : rare_data_->inline_entries_) {
+      entry->ReleaseStrings(strings);
+    }
+  }
+}
+
 void CodeEntry::print() const {
   base::OS::Print("CodeEntry: at %p\n", this);
 
@@ -642,30 +660,36 @@ void CpuProfile::Print() const {
   ProfilerStats::Instance()->Clear();
 }
 
-CodeMap::CodeMap() = default;
+CodeMap::CodeMap(StringsStorage& function_and_resource_names)
+    : function_and_resource_names_(function_and_resource_names) {}
 
 CodeMap::~CodeMap() { Clear(); }
 
 void CodeMap::Clear() {
-  // First clean the free list as it's otherwise impossible to tell
-  // the slot type.
-  unsigned free_slot = free_list_head_;
-  while (free_slot != kNoFreeSlot) {
-    unsigned next_slot = code_entries_[free_slot].next_free_slot;
-    code_entries_[free_slot].entry = nullptr;
-    free_slot = next_slot;
+  for (auto& slot : code_map_) {
+    if (CodeEntry* entry = slot.second.entry) {
+      entry->ReleaseStrings(function_and_resource_names_);
+      delete entry;
+    } else {
+      // We expect all entries in the code mapping to contain a CodeEntry.
+      UNREACHABLE();
+    }
+  }
+
+  // Free all CodeEntry objects that are no longer in the map, but in a profile.
+  // TODO(acomminos): Remove this deque after we refcount CodeEntry objects.
+  for (CodeEntry* entry : used_entries_) {
+    DCHECK(entry->used());
+    DeleteCodeEntry(entry);
   }
-  for (auto slot : code_entries_) delete slot.entry;
 
-  code_entries_.clear();
   code_map_.clear();
-  free_list_head_ = kNoFreeSlot;
+  used_entries_.clear();
 }
 
 void CodeMap::AddCode(Address addr, CodeEntry* entry, unsigned size) {
   ClearCodesInRange(addr, addr + size);
-  unsigned index = AddCodeEntry(addr, entry);
-  code_map_.emplace(addr, CodeEntryMapInfo{index, size});
+  code_map_.emplace(addr, CodeEntryMapInfo{entry, size});
 }
 
 void CodeMap::ClearCodesInRange(Address start, Address end) {
@@ -676,8 +700,10 @@ void CodeMap::ClearCodesInRange(Address start, Address end) {
   }
   auto right = left;
   for (; right != code_map_.end() && right->first < end; ++right) {
-    if (!entry(right->second.index)->used()) {
-      DeleteCodeEntry(right->second.index);
+    if (!right->second.entry->used()) {
+      DeleteCodeEntry(right->second.entry);
+    } else {
+      used_entries_.push_back(right->second.entry);
     }
   }
   code_map_.erase(left, right);
@@ -689,7 +715,7 @@ CodeEntry* CodeMap::FindEntry(Address addr, Address* out_instruction_start) {
   --it;
   Address start_address = it->first;
   Address end_address = start_address + it->second.size;
-  CodeEntry* ret = addr < end_address ? entry(it->second.index) : nullptr;
+  CodeEntry* ret = addr < end_address ? it->second.entry : nullptr;
   DCHECK(!ret || (addr >= start_address && addr < end_address));
   if (ret && out_instruction_start) *out_instruction_start = start_address;
   return ret;
@@ -706,27 +732,15 @@ void CodeMap::MoveCode(Address from, Address to) {
   code_map_.emplace(to, info);
 }
 
-unsigned CodeMap::AddCodeEntry(Address start, CodeEntry* entry) {
-  if (free_list_head_ == kNoFreeSlot) {
-    code_entries_.push_back(CodeEntrySlotInfo{entry});
-    return static_cast<unsigned>(code_entries_.size()) - 1;
-  }
-  unsigned index = free_list_head_;
-  free_list_head_ = code_entries_[index].next_free_slot;
-  code_entries_[index].entry = entry;
-  return index;
-}
-
-void CodeMap::DeleteCodeEntry(unsigned index) {
-  delete code_entries_[index].entry;
-  code_entries_[index].next_free_slot = free_list_head_;
-  free_list_head_ = index;
+void CodeMap::DeleteCodeEntry(CodeEntry* entry) {
+  entry->ReleaseStrings(function_and_resource_names_);
+  delete entry;
 }
 
 void CodeMap::Print() {
   for (const auto& pair : code_map_) {
     base::OS::Print("%p %5d %s\n", reinterpret_cast<void*>(pair.first),
-                    pair.second.size, entry(pair.second.index)->name());
+                    pair.second.size, pair.second.entry->name());
   }
 }
 
diff --git a/deps/v8/src/profiler/profile-generator.h b/deps/v8/src/profiler/profile-generator.h
index 9183d56d42113b..74f1bee35a5271 100644
--- a/deps/v8/src/profiler/profile-generator.h
+++ b/deps/v8/src/profiler/profile-generator.h
@@ -31,6 +31,8 @@ struct TickSample;
 class V8_EXPORT_PRIVATE SourcePositionTable : public Malloced {
  public:
   SourcePositionTable() = default;
+  SourcePositionTable(const SourcePositionTable&) = delete;
+  SourcePositionTable& operator=(const SourcePositionTable&) = delete;
 
   void SetPosition(int pc_offset, int line, int inlining_id);
   int GetSourceLineNumber(int pc_offset) const;
@@ -51,20 +53,22 @@ class V8_EXPORT_PRIVATE SourcePositionTable : public Malloced {
   // the pc offset, so that we can save space and look up items using binary
   // search.
   std::vector<SourcePositionTuple> pc_offsets_to_lines_;
-  DISALLOW_COPY_AND_ASSIGN(SourcePositionTable);
 };
 
 struct CodeEntryAndLineNumber;
 
 class CodeEntry {
  public:
-  // CodeEntry doesn't own name strings, just references them.
+  // CodeEntry may reference strings (|name|, |resource_name|) managed by a
+  // StringsStorage instance. These must be freed via ReleaseStrings.
   inline CodeEntry(CodeEventListener::LogEventsAndTags tag, const char* name,
                    const char* resource_name = CodeEntry::kEmptyResourceName,
                    int line_number = v8::CpuProfileNode::kNoLineNumberInfo,
                    int column_number = v8::CpuProfileNode::kNoColumnNumberInfo,
                    std::unique_ptr<SourcePositionTable> line_info = nullptr,
                    bool is_shared_cross_origin = false);
+  CodeEntry(const CodeEntry&) = delete;
+  CodeEntry& operator=(const CodeEntry&) = delete;
 
   const char* name() const { return name_; }
   const char* resource_name() const { return resource_name_; }
@@ -138,7 +142,6 @@ class CodeEntry {
     return TagField::decode(bit_field_);
   }
 
-  static const char* const kWasmResourceNamePrefix;
   V8_EXPORT_PRIVATE static const char* const kEmptyResourceName;
   static const char* const kEmptyBailoutReason;
   static const char* const kNoDeoptReason;
@@ -161,6 +164,12 @@ class CodeEntry {
   }
   V8_INLINE static CodeEntry* root_entry() { return kRootEntry.Pointer(); }
 
+  // Releases strings owned by this CodeEntry, which may be allocated in the
+  // provided StringsStorage instance. This instance is not stored directly
+  // with the CodeEntry in order to reduce memory footprint.
+  // Called before every destruction.
+  void ReleaseStrings(StringsStorage& strings);
+
   void print() const;
 
  private:
@@ -219,8 +228,6 @@ class CodeEntry {
   int position_;
   std::unique_ptr<SourcePositionTable> line_info_;
   std::unique_ptr<RareData> rare_data_;
-
-  DISALLOW_COPY_AND_ASSIGN(CodeEntry);
 };
 
 struct CodeEntryAndLineNumber {
@@ -236,6 +243,8 @@ class V8_EXPORT_PRIVATE ProfileNode {
  public:
   inline ProfileNode(ProfileTree* tree, CodeEntry* entry, ProfileNode* parent,
                      int line_number = 0);
+  ProfileNode(const ProfileNode&) = delete;
+  ProfileNode& operator=(const ProfileNode&) = delete;
 
   ProfileNode* FindChild(
       CodeEntry* entry,
@@ -295,14 +304,14 @@ class V8_EXPORT_PRIVATE ProfileNode {
   std::unordered_map<int, int> line_ticks_;
 
   std::vector<CpuProfileDeoptInfo> deopt_infos_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfileNode);
 };
 
 class V8_EXPORT_PRIVATE ProfileTree {
  public:
   explicit ProfileTree(Isolate* isolate);
   ~ProfileTree();
+  ProfileTree(const ProfileTree&) = delete;
+  ProfileTree& operator=(const ProfileTree&) = delete;
 
   using ProfilingMode = v8::CpuProfilingMode;
 
@@ -337,8 +346,6 @@ class V8_EXPORT_PRIVATE ProfileTree {
   unsigned next_node_id_;
   ProfileNode* root_;
   Isolate* isolate_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfileTree);
 };
 
 class CpuProfiler;
@@ -353,6 +360,8 @@ class CpuProfile {
 
   V8_EXPORT_PRIVATE CpuProfile(CpuProfiler* profiler, const char* title,
                                CpuProfilingOptions options);
+  CpuProfile(const CpuProfile&) = delete;
+  CpuProfile& operator=(const CpuProfile&) = delete;
 
   // Checks whether or not the given TickSample should be (sub)sampled, given
   // the sampling interval of the profiler that recorded it (in microseconds).
@@ -398,14 +407,16 @@ class CpuProfile {
   base::TimeDelta next_sample_delta_;
 
   static std::atomic<uint32_t> last_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(CpuProfile);
 };
 
 class V8_EXPORT_PRIVATE CodeMap {
  public:
-  CodeMap();
+  // Creates a new CodeMap with an associated StringsStorage to store the
+  // strings of CodeEntry objects within.
+  explicit CodeMap(StringsStorage& function_and_resource_names);
   ~CodeMap();
+  CodeMap(const CodeMap&) = delete;
+  CodeMap& operator=(const CodeMap&) = delete;
 
   void AddCode(Address addr, CodeEntry* entry, unsigned size);
   void MoveCode(Address from, Address to);
@@ -416,34 +427,24 @@ class V8_EXPORT_PRIVATE CodeMap {
 
  private:
   struct CodeEntryMapInfo {
-    unsigned index;
-    unsigned size;
-  };
-
-  union CodeEntrySlotInfo {
     CodeEntry* entry;
-    unsigned next_free_slot;
+    unsigned size;
   };
 
-  static constexpr unsigned kNoFreeSlot = std::numeric_limits<unsigned>::max();
-
   void ClearCodesInRange(Address start, Address end);
-  unsigned AddCodeEntry(Address start, CodeEntry*);
-  void DeleteCodeEntry(unsigned index);
+  void DeleteCodeEntry(CodeEntry*);
 
-  CodeEntry* entry(unsigned index) { return code_entries_[index].entry; }
-
-  // Added state here needs to be dealt with in Clear() as well.
-  std::deque<CodeEntrySlotInfo> code_entries_;
   std::map<Address, CodeEntryMapInfo> code_map_;
-  unsigned free_list_head_ = kNoFreeSlot;
-
-  DISALLOW_COPY_AND_ASSIGN(CodeMap);
+  std::deque<CodeEntry*> used_entries_;  // Entries that are no longer in the
+                                         // map, but used by a profile.
+  StringsStorage& function_and_resource_names_;
 };
 
 class V8_EXPORT_PRIVATE CpuProfilesCollection {
  public:
   explicit CpuProfilesCollection(Isolate* isolate);
+  CpuProfilesCollection(const CpuProfilesCollection&) = delete;
+  CpuProfilesCollection& operator=(const CpuProfilesCollection&) = delete;
 
   void set_cpu_profiler(CpuProfiler* profiler) { profiler_ = profiler; }
   CpuProfilingStatus StartProfiling(const char* title,
@@ -479,8 +480,6 @@ class V8_EXPORT_PRIVATE CpuProfilesCollection {
   // Accessed by VM thread and profile generator thread.
   std::vector<std::unique_ptr<CpuProfile>> current_profiles_;
   base::Semaphore current_profiles_semaphore_;
-
-  DISALLOW_COPY_AND_ASSIGN(CpuProfilesCollection);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/profiler-listener.cc b/deps/v8/src/profiler/profiler-listener.cc
index a477f9ad0bdd0a..bf76b541930bbc 100644
--- a/deps/v8/src/profiler/profiler-listener.cc
+++ b/deps/v8/src/profiler/profiler-listener.cc
@@ -25,8 +25,12 @@ namespace internal {
 
 ProfilerListener::ProfilerListener(Isolate* isolate,
                                    CodeEventObserver* observer,
+                                   StringsStorage& function_and_resource_names,
                                    CpuProfilingNamingMode naming_mode)
-    : isolate_(isolate), observer_(observer), naming_mode_(naming_mode) {}
+    : isolate_(isolate),
+      observer_(observer),
+      function_and_resource_names_(function_and_resource_names),
+      naming_mode_(naming_mode) {}
 
 ProfilerListener::~ProfilerListener() = default;
 
@@ -63,7 +67,7 @@ void ProfilerListener::CodeCreateEvent(LogEventsAndTags tag,
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->instruction_start = code->InstructionStart();
-  rec->entry = new CodeEntry(tag, GetName(shared->DebugName()),
+  rec->entry = new CodeEntry(tag, GetName(shared->DebugNameCStr().get()),
                              GetName(InferScriptName(*script_name, *shared)),
                              CpuProfileNode::kNoLineNumberInfo,
                              CpuProfileNode::kNoColumnNumberInfo, nullptr);
@@ -78,9 +82,12 @@ namespace {
 CodeEntry* GetOrInsertCachedEntry(
     std::unordered_set<std::unique_ptr<CodeEntry>, CodeEntry::Hasher,
                        CodeEntry::Equals>* entries,
-    std::unique_ptr<CodeEntry> search_value) {
+    std::unique_ptr<CodeEntry> search_value, StringsStorage& strings) {
   auto it = entries->find(search_value);
-  if (it != entries->end()) return it->get();
+  if (it != entries->end()) {
+    search_value->ReleaseStrings(strings);
+    return it->get();
+  }
   CodeEntry* ret = search_value.get();
   entries->insert(std::move(search_value));
   return ret;
@@ -168,7 +175,8 @@ void ProfilerListener::CodeCreateEvent(LogEventsAndTags tag,
           // Create a canonical CodeEntry for each inlined frame and then re-use
           // them for subsequent inline stacks to avoid a lot of duplication.
           CodeEntry* cached_entry = GetOrInsertCachedEntry(
-              &cached_inline_entries, std::move(inline_entry));
+              &cached_inline_entries, std::move(inline_entry),
+              function_and_resource_names_);
 
           inline_stack.push_back({cached_entry, line_number});
         }
@@ -193,14 +201,17 @@ void ProfilerListener::CodeCreateEvent(LogEventsAndTags tag,
 
 void ProfilerListener::CodeCreateEvent(LogEventsAndTags tag,
                                        const wasm::WasmCode* code,
-                                       wasm::WasmName name) {
+                                       wasm::WasmName name,
+                                       const char* source_url, int code_offset,
+                                       int script_id) {
+  DCHECK_NOT_NULL(source_url);
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->instruction_start = code->instruction_start();
-  rec->entry =
-      new CodeEntry(tag, GetName(name), CodeEntry::kWasmResourceNamePrefix,
-                    CpuProfileNode::kNoLineNumberInfo,
-                    CpuProfileNode::kNoColumnNumberInfo, nullptr, true);
+  rec->entry = new CodeEntry(tag, GetName(name), GetName(source_url), 1,
+                             code_offset + 1, nullptr, true);
+  rec->entry->set_script_id(script_id);
+  rec->entry->set_position(code_offset);
   rec->instruction_size = code->instructions().length();
   DispatchCodeEvent(evt_rec);
 }
@@ -250,7 +261,7 @@ void ProfilerListener::RegExpCodeCreateEvent(Handle<AbstractCode> code,
 }
 
 void ProfilerListener::CodeMoveEvent(AbstractCode from, AbstractCode to) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_MOVE);
   CodeMoveEventRecord* rec = &evt_rec.CodeMoveEventRecord_;
   rec->from_instruction_start = from.InstructionStart();
@@ -305,7 +316,7 @@ Name ProfilerListener::InferScriptName(Name name, SharedFunctionInfo info) {
 const char* ProfilerListener::GetFunctionName(SharedFunctionInfo shared) {
   switch (naming_mode_) {
     case kDebugNaming:
-      return GetName(shared.DebugName());
+      return GetName(shared.DebugNameCStr().get());
     case kStandardNaming:
       return GetName(shared.Name());
     default:
diff --git a/deps/v8/src/profiler/profiler-listener.h b/deps/v8/src/profiler/profiler-listener.h
index 7cdf8e09b41697..c264ef3e661185 100644
--- a/deps/v8/src/profiler/profiler-listener.h
+++ b/deps/v8/src/profiler/profiler-listener.h
@@ -27,8 +27,11 @@ class CodeEventObserver {
 class V8_EXPORT_PRIVATE ProfilerListener : public CodeEventListener {
  public:
   ProfilerListener(Isolate*, CodeEventObserver*,
+                   StringsStorage& function_and_resource_names,
                    CpuProfilingNamingMode mode = kDebugNaming);
   ~ProfilerListener() override;
+  ProfilerListener(const ProfilerListener&) = delete;
+  ProfilerListener& operator=(const ProfilerListener&) = delete;
 
   void CodeCreateEvent(LogEventsAndTags tag, Handle<AbstractCode> code,
                        const char* name) override;
@@ -41,7 +44,8 @@ class V8_EXPORT_PRIVATE ProfilerListener : public CodeEventListener {
                        Handle<SharedFunctionInfo> shared,
                        Handle<Name> script_name, int line, int column) override;
   void CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                       wasm::WasmName name) override;
+                       wasm::WasmName name, const char* source_url,
+                       int code_offset, int script_id) override;
 
   void CallbackEvent(Handle<Name> name, Address entry_point) override;
   void GetterCallbackEvent(Handle<Name> name, Address entry_point) override;
@@ -86,10 +90,8 @@ class V8_EXPORT_PRIVATE ProfilerListener : public CodeEventListener {
 
   Isolate* isolate_;
   CodeEventObserver* observer_;
-  StringsStorage function_and_resource_names_;
+  StringsStorage& function_and_resource_names_;
   const CpuProfilingNamingMode naming_mode_;
-
-  DISALLOW_COPY_AND_ASSIGN(ProfilerListener);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/sampling-heap-profiler.cc b/deps/v8/src/profiler/sampling-heap-profiler.cc
index 19a15481fed196..aef0170bb48488 100644
--- a/deps/v8/src/profiler/sampling-heap-profiler.cc
+++ b/deps/v8/src/profiler/sampling-heap-profiler.cc
@@ -72,7 +72,7 @@ SamplingHeapProfiler::~SamplingHeapProfiler() {
 }
 
 void SamplingHeapProfiler::SampleObject(Address soon_object, size_t size) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
 
   // Check if the area is iterable by confirming that it starts with a map.
   DCHECK((*ObjectSlot(soon_object)).IsMap());
@@ -190,7 +190,7 @@ SamplingHeapProfiler::AllocationNode* SamplingHeapProfiler::AddStack() {
   // the first element in the list.
   for (auto it = stack.rbegin(); it != stack.rend(); ++it) {
     SharedFunctionInfo shared = *it;
-    const char* name = this->names()->GetName(shared.DebugName());
+    const char* name = this->names()->GetCopy(shared.DebugNameCStr().get());
     int script_id = v8::UnboundScript::kNoScriptId;
     if (shared.script().IsScript()) {
       Script script = Script::cast(shared.script());
diff --git a/deps/v8/src/profiler/sampling-heap-profiler.h b/deps/v8/src/profiler/sampling-heap-profiler.h
index 5a611e8ba76a8c..6a1010b9993193 100644
--- a/deps/v8/src/profiler/sampling-heap-profiler.h
+++ b/deps/v8/src/profiler/sampling-heap-profiler.h
@@ -25,6 +25,8 @@ namespace internal {
 class AllocationProfile : public v8::AllocationProfile {
  public:
   AllocationProfile() = default;
+  AllocationProfile(const AllocationProfile&) = delete;
+  AllocationProfile& operator=(const AllocationProfile&) = delete;
 
   v8::AllocationProfile::Node* GetRootNode() override {
     return nodes_.size() == 0 ? nullptr : &nodes_.front();
@@ -39,8 +41,6 @@ class AllocationProfile : public v8::AllocationProfile {
   std::vector<v8::AllocationProfile::Sample> samples_;
 
   friend class SamplingHeapProfiler;
-
-  DISALLOW_COPY_AND_ASSIGN(AllocationProfile);
 };
 
 class SamplingHeapProfiler {
@@ -55,6 +55,8 @@ class SamplingHeapProfiler {
           script_position_(start_position),
           name_(name),
           id_(id) {}
+    AllocationNode(const AllocationNode&) = delete;
+    AllocationNode& operator=(const AllocationNode&) = delete;
 
     AllocationNode* FindChildNode(FunctionId id) {
       auto it = children_.find(id);
@@ -95,8 +97,6 @@ class SamplingHeapProfiler {
     bool pinned_ = false;
 
     friend class SamplingHeapProfiler;
-
-    DISALLOW_COPY_AND_ASSIGN(AllocationNode);
   };
 
   struct Sample {
@@ -107,19 +107,20 @@ class SamplingHeapProfiler {
           global(reinterpret_cast<v8::Isolate*>(profiler_->isolate_), local_),
           profiler(profiler_),
           sample_id(sample_id) {}
+    Sample(const Sample&) = delete;
+    Sample& operator=(const Sample&) = delete;
     const size_t size;
     AllocationNode* const owner;
     Global<Value> global;
     SamplingHeapProfiler* const profiler;
     const uint64_t sample_id;
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(Sample);
   };
 
   SamplingHeapProfiler(Heap* heap, StringsStorage* names, uint64_t rate,
                        int stack_depth, v8::HeapProfiler::SamplingFlags flags);
   ~SamplingHeapProfiler();
+  SamplingHeapProfiler(const SamplingHeapProfiler&) = delete;
+  SamplingHeapProfiler& operator=(const SamplingHeapProfiler&) = delete;
 
   v8::AllocationProfile* GetAllocationProfile();
   StringsStorage* names() const { return names_; }
@@ -193,8 +194,6 @@ class SamplingHeapProfiler {
   const int stack_depth_;
   const uint64_t rate_;
   v8::HeapProfiler::SamplingFlags flags_;
-
-  DISALLOW_COPY_AND_ASSIGN(SamplingHeapProfiler);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/strings-storage.cc b/deps/v8/src/profiler/strings-storage.cc
index 92143e1ce03d17..bc5940312265fc 100644
--- a/deps/v8/src/profiler/strings-storage.cc
+++ b/deps/v8/src/profiler/strings-storage.cc
@@ -49,6 +49,7 @@ const char* StringsStorage::GetFormatted(const char* format, ...) {
 }
 
 const char* StringsStorage::AddOrDisposeString(char* str, int len) {
+  base::MutexGuard guard(&mutex_);
   base::HashMap::Entry* entry = GetEntry(str, len);
   if (entry->value == nullptr) {
     // New entry added.
@@ -74,7 +75,7 @@ const char* StringsStorage::GetVFormatted(const char* format, va_list args) {
 const char* StringsStorage::GetName(Name name) {
   if (name.IsString()) {
     String str = String::cast(name);
-    int length = Min(FLAG_heap_snapshot_string_limit, str.length());
+    int length = std::min(FLAG_heap_snapshot_string_limit, str.length());
     int actual_length = 0;
     std::unique_ptr<char[]> data = str.ToCString(
         DISALLOW_NULLS, ROBUST_STRING_TRAVERSAL, 0, length, &actual_length);
@@ -92,7 +93,7 @@ const char* StringsStorage::GetName(int index) {
 const char* StringsStorage::GetConsName(const char* prefix, Name name) {
   if (name.IsString()) {
     String str = String::cast(name);
-    int length = Min(FLAG_heap_snapshot_string_limit, str.length());
+    int length = std::min(FLAG_heap_snapshot_string_limit, str.length());
     int actual_length = 0;
     std::unique_ptr<char[]> data = str.ToCString(
         DISALLOW_NULLS, ROBUST_STRING_TRAVERSAL, 0, length, &actual_length);
@@ -101,19 +102,33 @@ const char* StringsStorage::GetConsName(const char* prefix, Name name) {
     char* cons_result = NewArray<char>(cons_length);
     snprintf(cons_result, cons_length, "%s%s", prefix, data.get());
 
-    return AddOrDisposeString(cons_result, cons_length);
+    return AddOrDisposeString(cons_result, cons_length - 1);
   } else if (name.IsSymbol()) {
     return "<symbol>";
   }
   return "";
 }
 
+namespace {
+
+inline uint32_t ComputeStringHash(const char* str, int len) {
+  uint32_t raw_hash_field =
+      StringHasher::HashSequentialString(str, len, kZeroHashSeed);
+  return raw_hash_field >> Name::kHashShift;
+}
+
+}  // namespace
+
 bool StringsStorage::Release(const char* str) {
+  base::MutexGuard guard(&mutex_);
   int len = static_cast<int>(strlen(str));
-  uint32_t hash = StringHasher::HashSequentialString(str, len, kZeroHashSeed);
+  uint32_t hash = ComputeStringHash(str, len);
   base::HashMap::Entry* entry = names_.Lookup(const_cast<char*>(str), hash);
-  DCHECK(entry);
-  if (!entry) {
+
+  // If an entry wasn't found or the address of the found entry doesn't match
+  // the one passed in, this string wasn't managed by this StringsStorage
+  // instance (i.e. a constant). Ignore this.
+  if (!entry || entry->key != str) {
     return false;
   }
 
@@ -133,7 +148,7 @@ size_t StringsStorage::GetStringCountForTesting() const {
 }
 
 base::HashMap::Entry* StringsStorage::GetEntry(const char* str, int len) {
-  uint32_t hash = StringHasher::HashSequentialString(str, len, kZeroHashSeed);
+  uint32_t hash = ComputeStringHash(str, len);
   return names_.LookupOrInsert(const_cast<char*>(str), hash);
 }
 
diff --git a/deps/v8/src/profiler/strings-storage.h b/deps/v8/src/profiler/strings-storage.h
index 4948957f83c5b5..cac4a9fce92982 100644
--- a/deps/v8/src/profiler/strings-storage.h
+++ b/deps/v8/src/profiler/strings-storage.h
@@ -9,6 +9,7 @@
 
 #include "src/base/compiler-specific.h"
 #include "src/base/hashmap.h"
+#include "src/base/platform/mutex.h"
 #include "src/common/globals.h"
 
 namespace v8 {
@@ -22,6 +23,8 @@ class V8_EXPORT_PRIVATE StringsStorage {
  public:
   StringsStorage();
   ~StringsStorage();
+  StringsStorage(const StringsStorage&) = delete;
+  StringsStorage& operator=(const StringsStorage&) = delete;
 
   // Copies the given c-string and stores it, returning the stored copy, or just
   // returns the existing string in storage if it already exists.
@@ -36,13 +39,16 @@ class V8_EXPORT_PRIVATE StringsStorage {
   // result.
   const char* GetConsName(const char* prefix, Name name);
   // Reduces the refcount of the given string, freeing it if no other
-  // references are made to it.
-  // Returns true if the string was successfully unref'd.
+  // references are made to it. Returns true if the string was successfully
+  // unref'd, or false if the string was not present in the table.
   bool Release(const char* str);
 
   // Returns the number of strings in the store.
   size_t GetStringCountForTesting() const;
 
+  // Returns true if the strings table is empty.
+  bool empty() const { return names_.occupancy() == 0; }
+
  private:
   static bool StringsMatch(void* key1, void* key2);
   // Adds the string to storage and returns it, or if a matching string exists
@@ -53,8 +59,7 @@ class V8_EXPORT_PRIVATE StringsStorage {
   const char* GetVFormatted(const char* format, va_list args);
 
   base::CustomMatcherHashMap names_;
-
-  DISALLOW_COPY_AND_ASSIGN(StringsStorage);
+  base::Mutex mutex_;
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/symbolizer.h b/deps/v8/src/profiler/symbolizer.h
index f18339e7f17167..76a1af28e884cd 100644
--- a/deps/v8/src/profiler/symbolizer.h
+++ b/deps/v8/src/profiler/symbolizer.h
@@ -17,6 +17,8 @@ class CodeMap;
 class V8_EXPORT_PRIVATE Symbolizer {
  public:
   explicit Symbolizer(CodeMap* code_map);
+  Symbolizer(const Symbolizer&) = delete;
+  Symbolizer& operator=(const Symbolizer&) = delete;
 
   struct SymbolizedSample {
     ProfileStackTrace stack_trace;
@@ -34,8 +36,6 @@ class V8_EXPORT_PRIVATE Symbolizer {
                        Address* out_instruction_start = nullptr);
 
   CodeMap* const code_map_;
-
-  DISALLOW_COPY_AND_ASSIGN(Symbolizer);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/profiler/tick-sample.cc b/deps/v8/src/profiler/tick-sample.cc
index 45fc9118560a51..7cffbd3cda9359 100644
--- a/deps/v8/src/profiler/tick-sample.cc
+++ b/deps/v8/src/profiler/tick-sample.cc
@@ -156,14 +156,17 @@ DISABLE_ASAN void TickSample::Init(Isolate* v8_isolate,
   SampleInfo info;
   RegisterState regs = reg_state;
   if (!GetStackSample(v8_isolate, &regs, record_c_entry_frame, stack,
-                      kMaxFramesCount, &info, use_simulator_reg_state)) {
+                      kMaxFramesCount, &info, &state,
+                      use_simulator_reg_state)) {
     // It is executing JS but failed to collect a stack trace.
     // Mark the sample as spoiled.
     pc = nullptr;
     return;
   }
 
-  state = info.vm_state;
+  if (state != StateTag::EXTERNAL) {
+    state = info.vm_state;
+  }
   pc = regs.pc;
   frames_count = static_cast<unsigned>(info.frames_count);
   has_external_callback = info.external_callback_entry != nullptr;
@@ -193,6 +196,7 @@ bool TickSample::GetStackSample(Isolate* v8_isolate, RegisterState* regs,
                                 RecordCEntryFrame record_c_entry_frame,
                                 void** frames, size_t frames_limit,
                                 v8::SampleInfo* sample_info,
+                                StateTag* out_state,
                                 bool use_simulator_reg_state) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
   sample_info->frames_count = 0;
@@ -243,6 +247,23 @@ bool TickSample::GetStackSample(Isolate* v8_isolate, RegisterState* regs,
             ? nullptr
             : reinterpret_cast<void*>(*external_callback_entry_ptr);
   }
+  // 'Fast API calls' are similar to fast C calls (see frames.cc) in that
+  // they don't build an exit frame when entering C from JS. They have the
+  // added speciality of having separate "fast" and "default" callbacks, the
+  // latter being the regular API callback called before the JS function is
+  // optimized. When TurboFan optimizes the JS caller, the fast callback
+  // gets executed instead of the default one, therefore we need to store
+  // its address in the sample.
+  IsolateData* isolate_data = isolate->isolate_data();
+  Address fast_c_fp = isolate_data->fast_c_call_caller_fp();
+  if (fast_c_fp != kNullAddress &&
+      isolate_data->fast_api_call_target() != kNullAddress) {
+    sample_info->external_callback_entry =
+        reinterpret_cast<void*>(isolate_data->fast_api_call_target());
+    if (out_state) {
+      *out_state = StateTag::EXTERNAL;
+    }
+  }
 
   i::SafeStackFrameIterator it(isolate, reinterpret_cast<i::Address>(regs->pc),
                                reinterpret_cast<i::Address>(regs->fp),
diff --git a/deps/v8/src/profiler/tick-sample.h b/deps/v8/src/profiler/tick-sample.h
index 69cedef0ba4bef..777c3d192dce05 100644
--- a/deps/v8/src/profiler/tick-sample.h
+++ b/deps/v8/src/profiler/tick-sample.h
@@ -56,6 +56,13 @@ struct V8_EXPORT TickSample {
    * \param sample_info The sample info is filled up by the function
    *                    provides number of actual captured stack frames and
    *                    the current VM state.
+   * \param out_state Output parameter. If non-nullptr pointer is provided,
+   *                  and the execution is currently in a fast API call,
+   *                  records StateTag::EXTERNAL to it. The caller could then
+   *                  use this as a marker to not take into account the actual
+   *                  VM state recorded in |sample_info|. In the case of fast
+   *                  API calls, the VM state must be EXTERNAL, as the callback
+   *                  is always an external C++ function.
    * \param use_simulator_reg_state When set to true and V8 is running under a
    *                                simulator, the method will use the simulator
    *                                register state rather than the one provided
@@ -69,6 +76,7 @@ struct V8_EXPORT TickSample {
                              RecordCEntryFrame record_c_entry_frame,
                              void** frames, size_t frames_limit,
                              v8::SampleInfo* sample_info,
+                             StateTag* out_state = nullptr,
                              bool use_simulator_reg_state = true);
 
   void print() const;
diff --git a/deps/v8/src/profiler/tracing-cpu-profiler.h b/deps/v8/src/profiler/tracing-cpu-profiler.h
index 7a8fabe9581e2c..3adcaa63d71ee1 100644
--- a/deps/v8/src/profiler/tracing-cpu-profiler.h
+++ b/deps/v8/src/profiler/tracing-cpu-profiler.h
@@ -23,6 +23,8 @@ class TracingCpuProfilerImpl final
  public:
   explicit TracingCpuProfilerImpl(Isolate*);
   ~TracingCpuProfilerImpl() override;
+  TracingCpuProfilerImpl(const TracingCpuProfilerImpl&) = delete;
+  TracingCpuProfilerImpl& operator=(const TracingCpuProfilerImpl&) = delete;
 
   // v8::TracingController::TraceStateObserver
   void OnTraceEnabled() final;
@@ -36,8 +38,6 @@ class TracingCpuProfilerImpl final
   std::unique_ptr<CpuProfiler> profiler_;
   bool profiling_enabled_;
   base::Mutex mutex_;
-
-  DISALLOW_COPY_AND_ASSIGN(TracingCpuProfilerImpl);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.cc b/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.cc
index 32fed3703bd6cb..d8871904b863e0 100644
--- a/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.cc
+++ b/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.cc
@@ -51,34 +51,35 @@ namespace internal {
  *
  * The stack will have the following structure:
  *
- *  Location    Name               Description
- *              (as referred to in
- *              the code)
+ *  Location     Name               Description
+ *               (as referred to
+ *               in the code)
  *
- *  - fp[104]  Address regexp      Address of the JSRegExp object. Unused in
- *                                 native code, passed to match signature of
- *                                 the interpreter.
- *  - fp[96]   isolate             Address of the current isolate.
- *  ^^^ sp when called ^^^
- *  - fp[88]    lr                 Return from the RegExp code.
- *  - fp[80]    r29                Old frame pointer (CalleeSaved).
- *  - fp[0..72] r19-r28            Backup of CalleeSaved registers.
- *  - fp[-8]    direct_call        1 => Direct call from JavaScript code.
- *                                 0 => Call through the runtime system.
- *  - fp[-16]   stack_base         High end of the memory area to use as
- *                                 the backtracking stack.
- *  - fp[-24]   output_size        Output may fit multiple sets of matches.
- *  - fp[-32]   input              Handle containing the input string.
- *  - fp[-40]   success_counter
+ *  - fp[104]    Address regexp     Address of the JSRegExp object. Unused in
+ *                                  native code, passed to match signature of
+ *                                  the interpreter.
+ *  - fp[96]     isolate            Address of the current isolate.
+ *  ^^^^^^^^^ sp when called ^^^^^^^^^
+ *  - fp[16..88] r19-r28            Backup of CalleeSaved registers.
+ *  - fp[8]      lr                 Return from the RegExp code.
+ *  - fp[0]      fp                 Old frame pointer.
+ *  ^^^^^^^^^ fp ^^^^^^^^^
+ *  - fp[-8]     direct_call        1 => Direct call from JavaScript code.
+ *                                  0 => Call through the runtime system.
+ *  - fp[-16]    stack_base         High end of the memory area to use as
+ *                                  the backtracking stack.
+ *  - fp[-24]    output_size        Output may fit multiple sets of matches.
+ *  - fp[-32]    input              Handle containing the input string.
+ *  - fp[-40]    success_counter
  *  ^^^^^^^^^^^^^ From here and downwards we store 32 bit values ^^^^^^^^^^^^^
- *  - fp[-44]   register N         Capture registers initialized with
- *  - fp[-48]   register N + 1     non_position_value.
- *              ...                The first kNumCachedRegisters (N) registers
- *              ...                are cached in x0 to x7.
- *              ...                Only positions must be stored in the first
- *  -           ...                num_saved_registers_ registers.
- *  -           ...
- *  -           register N + num_registers - 1
+ *  - fp[-44]    register N         Capture registers initialized with
+ *  - fp[-48]    register N + 1     non_position_value.
+ *               ...                The first kNumCachedRegisters (N) registers
+ *               ...                are cached in x0 to x7.
+ *               ...                Only positions must be stored in the first
+ *  -            ...                num_saved_registers_ registers.
+ *  -            ...
+ *  -            register N + num_registers - 1
  *  ^^^^^^^^^ sp ^^^^^^^^^
  *
  * The first num_saved_registers_ registers are initialized to point to
@@ -745,11 +746,10 @@ Handle<HeapObject> RegExpMacroAssemblerARM64::GetCode(Handle<String> source) {
   CPURegList argument_registers(x0, x5, x6, x7);
 
   CPURegList registers_to_retain = kCalleeSaved;
-  registers_to_retain.Combine(fp);
-  registers_to_retain.Combine(lr);
+  DCHECK_EQ(registers_to_retain.Count(), kNumCalleeSavedRegisters);
 
-  DCHECK(registers_to_retain.IncludesAliasOf(lr));
-  __ PushCPURegList<TurboAssembler::kSignLR>(registers_to_retain);
+  __ PushCPURegList<TurboAssembler::kDontStoreLR>(registers_to_retain);
+  __ Push<TurboAssembler::kSignLR>(lr, fp);
   __ PushCPURegList(argument_registers);
 
   // Set frame pointer in place.
@@ -1042,9 +1042,10 @@ Handle<HeapObject> RegExpMacroAssemblerARM64::GetCode(Handle<String> source) {
 
   // Set stack pointer back to first register to retain
   __ Mov(sp, fp);
+  __ Pop<TurboAssembler::kAuthLR>(fp, lr);
 
   // Restore registers.
-  __ PopCPURegList<TurboAssembler::kAuthLR>(registers_to_retain);
+  __ PopCPURegList<TurboAssembler::kDontLoadLR>(registers_to_retain);
 
   __ Ret();
 
diff --git a/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.h b/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.h
index 6d60271a43cc00..ad4695b164ee87 100644
--- a/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.h
+++ b/deps/v8/src/regexp/arm64/regexp-macro-assembler-arm64.h
@@ -101,18 +101,19 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerARM64
 
  private:
   // Above the frame pointer - Stored registers and stack passed parameters.
-  // Callee-saved registers x19-x29, where x29 is the old frame pointer.
-  static const int kCalleeSavedRegisters = 0;
-  // Return address.
-  // It is placed above the 11 callee-saved registers.
-  static const int kReturnAddress =
-      kCalleeSavedRegisters + 11 * kSystemPointerSize;
+  static const int kFramePointer = 0;
+  static const int kReturnAddress = kFramePointer + kSystemPointerSize;
+  // Callee-saved registers (x19-x28).
+  static const int kNumCalleeSavedRegisters = 10;
+  static const int kCalleeSavedRegisters = kReturnAddress + kSystemPointerSize;
   // Stack parameter placed by caller.
-  static const int kIsolate = kReturnAddress + kSystemPointerSize;
+  // It is placed above the FP, LR and the callee-saved registers.
+  static const int kIsolate =
+      kCalleeSavedRegisters + kNumCalleeSavedRegisters * kSystemPointerSize;
 
   // Below the frame pointer.
   // Register parameters stored by setup code.
-  static const int kDirectCall = kCalleeSavedRegisters - kSystemPointerSize;
+  static const int kDirectCall = -kSystemPointerSize;
   static const int kStackBase = kDirectCall - kSystemPointerSize;
   static const int kOutputSize = kStackBase - kSystemPointerSize;
   static const int kInput = kOutputSize - kSystemPointerSize;
diff --git a/deps/v8/src/regexp/experimental/experimental-interpreter.cc b/deps/v8/src/regexp/experimental/experimental-interpreter.cc
index fffca782febc36..f870de9bfe4a9d 100644
--- a/deps/v8/src/regexp/experimental/experimental-interpreter.cc
+++ b/deps/v8/src/regexp/experimental/experimental-interpreter.cc
@@ -5,6 +5,7 @@
 #include "src/regexp/experimental/experimental-interpreter.h"
 
 #include "src/base/optional.h"
+#include "src/common/assert-scope.h"
 #include "src/objects/fixed-array-inl.h"
 #include "src/objects/string-inl.h"
 #include "src/regexp/experimental/experimental.h"
@@ -53,7 +54,7 @@ bool SatisfiesAssertion(RegExpAssertion::AssertionType type,
 }
 
 Vector<RegExpInstruction> ToInstructionVector(
-    ByteArray raw_bytes, const DisallowHeapAllocation& no_gc) {
+    ByteArray raw_bytes, const DisallowGarbageCollection& no_gc) {
   RegExpInstruction* inst_begin =
       reinterpret_cast<RegExpInstruction*>(raw_bytes.GetDataStartAddress());
   int inst_num = raw_bytes.length() / sizeof(RegExpInstruction);
@@ -62,12 +63,12 @@ Vector<RegExpInstruction> ToInstructionVector(
 }
 
 template <class Character>
-Vector<const Character> ToCharacterVector(String str,
-                                          const DisallowHeapAllocation& no_gc);
+Vector<const Character> ToCharacterVector(
+    String str, const DisallowGarbageCollection& no_gc);
 
 template <>
 Vector<const uint8_t> ToCharacterVector<uint8_t>(
-    String str, const DisallowHeapAllocation& no_gc) {
+    String str, const DisallowGarbageCollection& no_gc) {
   DCHECK(str.IsFlat());
   String::FlatContent content = str.GetFlatContent(no_gc);
   DCHECK(content.IsOneByte());
@@ -76,7 +77,7 @@ Vector<const uint8_t> ToCharacterVector<uint8_t>(
 
 template <>
 Vector<const uc16> ToCharacterVector<uc16>(
-    String str, const DisallowHeapAllocation& no_gc) {
+    String str, const DisallowGarbageCollection& no_gc) {
   DCHECK(str.IsFlat());
   String::FlatContent content = str.GetFlatContent(no_gc);
   DCHECK(content.IsTwoByte());
@@ -242,7 +243,7 @@ class NfaInterpreter {
       if (check.JsHasOverflowed()) {
         // We abort the interpreter now anyway, so gc can't invalidate any
         // pointers.
-        AllowHeapAllocation yes_gc;
+        AllowGarbageCollection yes_gc;
         isolate_->StackOverflow();
         return RegExp::kInternalRegExpException;
       } else if (check.InterruptRequested()) {
@@ -255,7 +256,7 @@ class NfaInterpreter {
 
         Object result;
         {
-          AllowHeapAllocation yes_gc;
+          AllowGarbageCollection yes_gc;
           result = isolate_->stack_guard()->HandleInterrupts();
         }
         if (result.IsException(isolate_)) {
@@ -511,7 +512,7 @@ class NfaInterpreter {
 
   const RegExp::CallOrigin call_origin_;
 
-  const DisallowHeapAllocation no_gc_;
+  DisallowGarbageCollection no_gc_;
 
   ByteArray bytecode_object_;
   Vector<const RegExpInstruction> bytecode_;
@@ -558,7 +559,7 @@ int ExperimentalRegExpInterpreter::FindMatches(
     int register_count_per_match, String input, int start_index,
     int32_t* output_registers, int output_register_count, Zone* zone) {
   DCHECK(input.IsFlat());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (input.GetFlatContent(no_gc).IsOneByte()) {
     NfaInterpreter<uint8_t> interpreter(isolate, call_origin, bytecode,
diff --git a/deps/v8/src/regexp/experimental/experimental.cc b/deps/v8/src/regexp/experimental/experimental.cc
index 56c0596bb42ace..d23c34c573d9a3 100644
--- a/deps/v8/src/regexp/experimental/experimental.cc
+++ b/deps/v8/src/regexp/experimental/experimental.cc
@@ -4,6 +4,7 @@
 
 #include "src/regexp/experimental/experimental.h"
 
+#include "src/common/assert-scope.h"
 #include "src/objects/js-regexp-inl.h"
 #include "src/regexp/experimental/experimental-compiler.h"
 #include "src/regexp/experimental/experimental-interpreter.h"
@@ -50,7 +51,7 @@ Handle<ByteArray> VectorToByteArray(Isolate* isolate, Vector<T> data) {
 
   int byte_length = sizeof(T) * data.length();
   Handle<ByteArray> byte_array = isolate->factory()->NewByteArray(byte_length);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   MemCopy(byte_array->GetDataStartAddress(), data.begin(), byte_length);
   return byte_array;
 }
@@ -144,7 +145,9 @@ int32_t ExecRawImpl(Isolate* isolate, RegExp::CallOrigin call_origin,
                     ByteArray bytecode, String subject, int capture_count,
                     int32_t* output_registers, int32_t output_register_count,
                     int32_t subject_index) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
+  // TODO(cbruni): remove once gcmole is fixed.
+  DisableGCMole no_gc_mole;
 
   int register_count_per_match =
       JSRegExp::RegistersForCaptureCount(capture_count);
@@ -171,7 +174,7 @@ int32_t ExperimentalRegExp::ExecRaw(Isolate* isolate,
                                     int32_t output_register_count,
                                     int32_t subject_index) {
   DCHECK(FLAG_enable_experimental_regexp_engine);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (FLAG_trace_experimental_regexp_engine) {
     String source = String::cast(regexp.DataAt(JSRegExp::kSourceIndex));
@@ -196,7 +199,7 @@ int32_t ExperimentalRegExp::MatchForCallFromJs(
   DCHECK_NOT_NULL(output_registers);
   DCHECK(call_origin == RegExp::CallOrigin::kFromJs);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DisallowJavascriptExecution no_js(isolate);
   DisallowHandleAllocation no_handles;
   DisallowHandleDereference no_deref;
@@ -273,7 +276,7 @@ int32_t ExperimentalRegExp::OneshotExecRaw(Isolate* isolate,
       CompileImpl(isolate, regexp);
   if (!compilation_result.has_value()) return RegExp::kInternalRegExpException;
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return ExecRawImpl(isolate, RegExp::kFromRuntime,
                      *compilation_result->bytecode, *subject,
                      regexp->CaptureCount(), output_registers,
diff --git a/deps/v8/src/regexp/regexp-ast.cc b/deps/v8/src/regexp/regexp-ast.cc
index 561d11eef5da2d..dd9e719c9487c6 100644
--- a/deps/v8/src/regexp/regexp-ast.cc
+++ b/deps/v8/src/regexp/regexp-ast.cc
@@ -309,8 +309,8 @@ RegExpDisjunction::RegExpDisjunction(ZoneList<RegExpTree*>* alternatives)
   max_match_ = first_alternative->max_match();
   for (int i = 1; i < alternatives->length(); i++) {
     RegExpTree* alternative = alternatives->at(i);
-    min_match_ = Min(min_match_, alternative->min_match());
-    max_match_ = Max(max_match_, alternative->max_match());
+    min_match_ = std::min(min_match_, alternative->min_match());
+    max_match_ = std::max(max_match_, alternative->max_match());
   }
 }
 
diff --git a/deps/v8/src/regexp/regexp-ast.h b/deps/v8/src/regexp/regexp-ast.h
index 73c3eb70b55907..c038c640f49b72 100644
--- a/deps/v8/src/regexp/regexp-ast.h
+++ b/deps/v8/src/regexp/regexp-ast.h
@@ -59,7 +59,7 @@ class Interval {
     else if (from_ == kNone)
       return that;
     else
-      return Interval(Min(from_, that.from_), Max(to_, that.to_));
+      return Interval(std::min(from_, that.from_), std::max(to_, that.to_));
   }
 
   bool Contains(int value) { return (from_ <= value) && (value <= to_); }
diff --git a/deps/v8/src/regexp/regexp-bytecode-peephole.cc b/deps/v8/src/regexp/regexp-bytecode-peephole.cc
index f61df5a72a857e..64817dd1d8412e 100644
--- a/deps/v8/src/regexp/regexp-bytecode-peephole.cc
+++ b/deps/v8/src/regexp/regexp-bytecode-peephole.cc
@@ -996,7 +996,8 @@ void RegExpBytecodePeephole::EmitArgument(int start_pc, const byte* bytecode,
       EmitValue(GetValue<uint64_t>(bytecode, arg_pos));
       break;
     default:
-      CopyRangeToOutput(bytecode, arg_pos, Min(arg.length, arg.new_length));
+      CopyRangeToOutput(bytecode, arg_pos,
+                        std::min(arg.length, arg.new_length));
       if (arg.length < arg.new_length) {
         SetRange(0x00, arg.new_length - arg.length);
       }
diff --git a/deps/v8/src/regexp/regexp-bytecodes.cc b/deps/v8/src/regexp/regexp-bytecodes.cc
index fbf8273ab4fe2c..3eeceb2b141bd1 100644
--- a/deps/v8/src/regexp/regexp-bytecodes.cc
+++ b/deps/v8/src/regexp/regexp-bytecodes.cc
@@ -12,16 +12,17 @@ namespace v8 {
 namespace internal {
 
 void RegExpBytecodeDisassembleSingle(const byte* code_base, const byte* pc) {
-  PrintF("%s", RegExpBytecodeName(*pc));
+  int bytecode = *reinterpret_cast<const int32_t*>(pc) & BYTECODE_MASK;
+  PrintF("%s", RegExpBytecodeName(bytecode));
 
   // Args and the bytecode as hex.
-  for (int i = 0; i < RegExpBytecodeLength(*pc); i++) {
+  for (int i = 0; i < RegExpBytecodeLength(bytecode); i++) {
     PrintF(", %02x", pc[i]);
   }
   PrintF(" ");
 
   // Args as ascii.
-  for (int i = 1; i < RegExpBytecodeLength(*pc); i++) {
+  for (int i = 1; i < RegExpBytecodeLength(bytecode); i++) {
     unsigned char b = pc[i];
     PrintF("%c", std::isprint(b) ? b : '.');
   }
diff --git a/deps/v8/src/regexp/regexp-compiler-tonode.cc b/deps/v8/src/regexp/regexp-compiler-tonode.cc
index 90e3ecffab605a..9fac408f508bc6 100644
--- a/deps/v8/src/regexp/regexp-compiler-tonode.cc
+++ b/deps/v8/src/regexp/regexp-compiler-tonode.cc
@@ -595,7 +595,7 @@ void RegExpDisjunction::RationalizeConsecutiveAtoms(RegExpCompiler* compiler) {
         if (new_prefix != common_prefix) break;
       }
 #endif  // V8_INTL_SUPPORT
-      prefix_length = Min(prefix_length, atom->length());
+      prefix_length = std::min(prefix_length, atom->length());
       i++;
     }
     if (i > first_with_prefix + 2) {
@@ -1150,7 +1150,7 @@ void CharacterRange::AddCaseEquivalents(Isolate* isolate, Zone* zone,
     CharacterRange range = ranges->at(i);
     uc32 from = range.from();
     if (from > String::kMaxUtf16CodeUnit) continue;
-    uc32 to = Min(range.to(), String::kMaxUtf16CodeUnitU);
+    uc32 to = std::min({range.to(), String::kMaxUtf16CodeUnitU});
     // Nothing to be done for surrogates.
     if (from >= kLeadSurrogateStart && to <= kTrailSurrogateEnd) continue;
     if (is_one_byte && !RangeContainsLatin1Equivalents(range)) {
@@ -1193,7 +1193,7 @@ void CharacterRange::AddCaseEquivalents(Isolate* isolate, Zone* zone,
     CharacterRange range = ranges->at(i);
     uc32 bottom = range.from();
     if (bottom > String::kMaxUtf16CodeUnit) continue;
-    uc32 top = Min(range.to(), String::kMaxUtf16CodeUnitU);
+    uc32 top = std::min({range.to(), String::kMaxUtf16CodeUnitU});
     // Nothing to be done for surrogates.
     if (bottom >= kLeadSurrogateStart && top <= kTrailSurrogateEnd) continue;
     if (is_one_byte && !RangeContainsLatin1Equivalents(range)) {
@@ -1333,16 +1333,16 @@ static int InsertRangeInCanonicalList(ZoneList<CharacterRange>* list, int count,
   if (start_pos + 1 == end_pos) {
     // Replace single existing range at position start_pos.
     CharacterRange to_replace = list->at(start_pos);
-    int new_from = Min(to_replace.from(), from);
-    int new_to = Max(to_replace.to(), to);
+    int new_from = std::min(to_replace.from(), from);
+    int new_to = std::max(to_replace.to(), to);
     list->at(start_pos) = CharacterRange::Range(new_from, new_to);
     return count;
   }
   // Replace a number of existing ranges from start_pos to end_pos - 1.
   // Move the remaining ranges down.
 
-  int new_from = Min(list->at(start_pos).from(), from);
-  int new_to = Max(list->at(end_pos - 1).to(), to);
+  int new_from = std::min(list->at(start_pos).from(), from);
+  int new_to = std::max(list->at(end_pos - 1).to(), to);
   if (end_pos < count) {
     MoveRanges(list, end_pos, start_pos + 1, count - end_pos);
   }
diff --git a/deps/v8/src/regexp/regexp-compiler.cc b/deps/v8/src/regexp/regexp-compiler.cc
index fe032bcfddc18f..2b712d3c3c3041 100644
--- a/deps/v8/src/regexp/regexp-compiler.cc
+++ b/deps/v8/src/regexp/regexp-compiler.cc
@@ -2123,7 +2123,7 @@ void AssertionNode::EmitBoundaryCheck(RegExpCompiler* compiler, Trace* trace) {
   BoyerMooreLookahead* lookahead = bm_info(not_at_start);
   if (lookahead == nullptr) {
     int eats_at_least =
-        Min(kMaxLookaheadForBoyerMoore, EatsAtLeast(not_at_start));
+        std::min(kMaxLookaheadForBoyerMoore, EatsAtLeast(not_at_start));
     if (eats_at_least >= 1) {
       BoyerMooreLookahead* bm =
           zone()->New<BoyerMooreLookahead>(eats_at_least, compiler, zone());
@@ -2468,7 +2468,7 @@ void Trace::AdvanceCurrentPositionInTrace(int by, RegExpCompiler* compiler) {
     compiler->SetRegExpTooBig();
     cp_offset_ = 0;
   }
-  bound_checked_up_to_ = Max(0, bound_checked_up_to_ - by);
+  bound_checked_up_to_ = std::max(0, bound_checked_up_to_ - by);
 }
 
 void TextNode::MakeCaseIndependent(Isolate* isolate, bool is_one_byte) {
@@ -2537,7 +2537,16 @@ int ChoiceNode::GreedyLoopTextLengthForAlternative(
     SeqRegExpNode* seq_node = static_cast<SeqRegExpNode*>(node);
     node = seq_node->on_success();
   }
-  return read_backward() ? -length : length;
+  if (read_backward()) {
+    length = -length;
+  }
+  // Check that we can jump by the whole text length. If not, return sentinel
+  // to indicate the we can't construct a greedy loop.
+  if (length < RegExpMacroAssembler::kMinCPOffset ||
+      length > RegExpMacroAssembler::kMaxCPOffset) {
+    return kNodeIsTooComplexForGreedyLoops;
+  }
+  return length;
 }
 
 void LoopChoiceNode::AddLoopAlternative(GuardedAlternative alt) {
@@ -2576,7 +2585,7 @@ void LoopChoiceNode::Emit(RegExpCompiler* compiler, Trace* trace) {
 
 int ChoiceNode::CalculatePreloadCharacters(RegExpCompiler* compiler,
                                            int eats_at_least) {
-  int preload_characters = Min(4, eats_at_least);
+  int preload_characters = std::min(4, eats_at_least);
   DCHECK_LE(preload_characters, 4);
   if (compiler->macro_assembler()->CanReadUnaligned()) {
     bool one_byte = compiler->one_byte();
@@ -3150,7 +3159,7 @@ int ChoiceNode::EmitOptimizedUnanchoredSearch(RegExpCompiler* compiler,
   // small alternation.
   BoyerMooreLookahead* bm = bm_info(false);
   if (bm == nullptr) {
-    eats_at_least = Min(kMaxLookaheadForBoyerMoore, EatsAtLeast(false));
+    eats_at_least = std::min(kMaxLookaheadForBoyerMoore, EatsAtLeast(false));
     if (eats_at_least >= 1) {
       bm = zone()->New<BoyerMooreLookahead>(eats_at_least, compiler, zone());
       GuardedAlternative alt0 = alternatives_->at(0);
@@ -3787,7 +3796,7 @@ void TextNode::FillInBMInfo(Isolate* isolate, int initial_offset, int budget,
         for (int k = 0; k < ranges->length(); k++) {
           CharacterRange& range = ranges->at(k);
           if (static_cast<int>(range.from()) > max_char) continue;
-          int to = Min(max_char, static_cast<int>(range.to()));
+          int to = std::min(max_char, static_cast<int>(range.to()));
           bm->SetInterval(offset, Interval(range.from(), to));
         }
       }
diff --git a/deps/v8/src/regexp/regexp-interpreter.cc b/deps/v8/src/regexp/regexp-interpreter.cc
index a73a9d3fcc4c2c..ac2654cd5fd980 100644
--- a/deps/v8/src/regexp/regexp-interpreter.cc
+++ b/deps/v8/src/regexp/regexp-interpreter.cc
@@ -207,8 +207,8 @@ IrregexpInterpreter::Result ThrowStackOverflow(Isolate* isolate,
                                                RegExp::CallOrigin call_origin) {
   CHECK(call_origin == RegExp::CallOrigin::kFromRuntime);
   // We abort interpreter execution after the stack overflow is thrown, and thus
-  // allow allocation here despite the outer DisallowHeapAllocationScope.
-  AllowHeapAllocation yes_gc;
+  // allow allocation here despite the outer DisallowGarbageCollectionScope.
+  AllowGarbageCollection yes_gc;
   isolate->StackOverflow();
   return IrregexpInterpreter::EXCEPTION;
 }
@@ -230,7 +230,7 @@ void UpdateCodeAndSubjectReferences(
     Handle<String> subject_string, ByteArray* code_array_out,
     const byte** code_base_out, const byte** pc_out, String* subject_string_out,
     Vector<const Char>* subject_string_vector_out) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (*code_base_out != code_array->GetDataStartAddress()) {
     *code_array_out = *code_array;
@@ -252,7 +252,7 @@ IrregexpInterpreter::Result HandleInterrupts(
     Isolate* isolate, RegExp::CallOrigin call_origin, ByteArray* code_array_out,
     String* subject_string_out, const byte** code_base_out,
     Vector<const Char>* subject_string_vector_out, const byte** pc_out) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   StackLimitCheck check(isolate);
   bool js_has_overflowed = check.JsHasOverflowed();
@@ -282,7 +282,7 @@ IrregexpInterpreter::Result HandleInterrupts(
           String::IsOneByteRepresentationUnderneath(*subject_string_out);
       Object result;
       {
-        AllowHeapAllocation yes_gc;
+        AllowGarbageCollection yes_gc;
         result = isolate->stack_guard()->HandleInterrupts();
       }
       if (result.IsException(isolate)) {
@@ -384,7 +384,7 @@ IrregexpInterpreter::Result RawMatch(
     int output_register_count, int total_register_count, int current,
     uint32_t current_char, RegExp::CallOrigin call_origin,
     const uint32_t backtrack_limit) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
 #if V8_USE_COMPUTED_GOTO
 
@@ -799,7 +799,7 @@ IrregexpInterpreter::Result RawMatch(
       int len = registers[LoadPacked24Unsigned(insn) + 1] - from;
       if (from >= 0 && len > 0) {
         if (current + len > subject.length() ||
-            CompareChars(&subject[from], &subject[current], len) != 0) {
+            !CompareCharsEqual(&subject[from], &subject[current], len)) {
           SET_PC_FROM_OFFSET(Load32Aligned(pc + 4));
           DISPATCH();
         }
@@ -813,7 +813,7 @@ IrregexpInterpreter::Result RawMatch(
       int len = registers[LoadPacked24Unsigned(insn) + 1] - from;
       if (from >= 0 && len > 0) {
         if (current - len < 0 ||
-            CompareChars(&subject[from], &subject[current - len], len) != 0) {
+            !CompareCharsEqual(&subject[from], &subject[current - len], len)) {
           SET_PC_FROM_OFFSET(Load32Aligned(pc + 4));
           DISPATCH();
         }
@@ -1078,7 +1078,7 @@ IrregexpInterpreter::Result IrregexpInterpreter::MatchInternal(
   //    aborts afterwards, and thus possible-moved objects are never used.
   // 2. When handling interrupts. We manually relocate unhandlified references
   //    after interrupts have run.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   uc16 previous_char = '\n';
   String::FlatContent subject_content = subject_string.GetFlatContent(no_gc);
@@ -1112,7 +1112,7 @@ IrregexpInterpreter::Result IrregexpInterpreter::MatchForCallFromJs(
   DCHECK_NOT_NULL(output_registers);
   DCHECK(call_origin == RegExp::CallOrigin::kFromJs);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DisallowJavascriptExecution no_js(isolate);
   DisallowHandleAllocation no_handles;
   DisallowHandleDereference no_deref;
diff --git a/deps/v8/src/regexp/regexp-macro-assembler.cc b/deps/v8/src/regexp/regexp-macro-assembler.cc
index 62a72b16618c96..db45e21ca0424d 100644
--- a/deps/v8/src/regexp/regexp-macro-assembler.cc
+++ b/deps/v8/src/regexp/regexp-macro-assembler.cc
@@ -36,7 +36,7 @@ int RegExpMacroAssembler::CaseInsensitiveCompareNonUnicode(Address byte_offset1,
   // This function is not allowed to cause a garbage collection.
   // A GC might move the calling generated code and invalidate the
   // return address on the stack.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_EQ(0, byte_length % 2);
   size_t length = byte_length / 2;
   uc16* substring1 = reinterpret_cast<uc16*>(byte_offset1);
@@ -63,7 +63,7 @@ int RegExpMacroAssembler::CaseInsensitiveCompareUnicode(Address byte_offset1,
   // This function is not allowed to cause a garbage collection.
   // A GC might move the calling generated code and invalidate the
   // return address on the stack.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_EQ(0, byte_length % 2);
 
 #ifdef V8_INTL_SUPPORT
@@ -169,7 +169,7 @@ int NativeRegExpMacroAssembler::CheckStackGuardState(
     Isolate* isolate, int start_index, RegExp::CallOrigin call_origin,
     Address* return_address, Code re_code, Address* subject,
     const byte** input_start, const byte** input_end) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Address old_pc = PointerAuthentication::AuthenticatePC(return_address, 0);
   DCHECK_LE(re_code.raw_instruction_start(), old_pc);
   DCHECK_LE(old_pc, re_code.raw_instruction_end());
@@ -204,22 +204,25 @@ int NativeRegExpMacroAssembler::CheckStackGuardState(
   bool is_one_byte = String::IsOneByteRepresentationUnderneath(*subject_handle);
   int return_value = 0;
 
-  if (js_has_overflowed) {
-    AllowHeapAllocation yes_gc;
-    isolate->StackOverflow();
-    return_value = EXCEPTION;
-  } else if (check.InterruptRequested()) {
-    AllowHeapAllocation yes_gc;
-    Object result = isolate->stack_guard()->HandleInterrupts();
-    if (result.IsException(isolate)) return_value = EXCEPTION;
-  }
+  {
+    DisableGCMole no_gc_mole;
+    if (js_has_overflowed) {
+      AllowGarbageCollection yes_gc;
+      isolate->StackOverflow();
+      return_value = EXCEPTION;
+    } else if (check.InterruptRequested()) {
+      AllowGarbageCollection yes_gc;
+      Object result = isolate->stack_guard()->HandleInterrupts();
+      if (result.IsException(isolate)) return_value = EXCEPTION;
+    }
 
-  if (*code_handle != re_code) {  // Return address no longer valid
-    // Overwrite the return address on the stack.
-    intptr_t delta = code_handle->address() - re_code.address();
-    Address new_pc = old_pc + delta;
-    // TODO(v8:10026): avoid replacing a signed pointer.
-    PointerAuthentication::ReplacePC(return_address, new_pc, 0);
+    if (*code_handle != re_code) {  // Return address no longer valid
+      // Overwrite the return address on the stack.
+      intptr_t delta = code_handle->address() - re_code.address();
+      Address new_pc = old_pc + delta;
+      // TODO(v8:10026): avoid replacing a signed pointer.
+      PointerAuthentication::ReplacePC(return_address, new_pc, 0);
+    }
   }
 
   // If we continue, we need to update the subject string addresses.
@@ -252,7 +255,7 @@ int NativeRegExpMacroAssembler::Match(Handle<JSRegExp> regexp,
   DCHECK_LE(previous_index, subject->length());
 
   // No allocations before calling the regexp, but we can't use
-  // DisallowHeapAllocation, since regexps might be preempted, and another
+  // DisallowGarbageCollection, since regexps might be preempted, and another
   // thread might do allocation anyway.
 
   String subject_ptr = *subject;
@@ -280,7 +283,7 @@ int NativeRegExpMacroAssembler::Match(Handle<JSRegExp> regexp,
   // String is now either Sequential or External
   int char_size_shift = is_one_byte ? 0 : 1;
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   const byte* input_start =
       subject_ptr.AddressOfCharacterAt(start_offset + slice_offset, no_gc);
   int byte_length = char_length << char_size_shift;
@@ -322,7 +325,7 @@ int NativeRegExpMacroAssembler::Execute(
     // but haven't created the exception yet. Additionally, we allow heap
     // allocation because even though it invalidates {input_start} and
     // {input_end}, we are about to return anyway.
-    AllowHeapAllocation allow_allocation;
+    AllowGarbageCollection allow_allocation;
     isolate->StackOverflow();
   }
   return result;
diff --git a/deps/v8/src/regexp/regexp-parser.cc b/deps/v8/src/regexp/regexp-parser.cc
index 622baadc07cd67..3c7d909c545c1f 100644
--- a/deps/v8/src/regexp/regexp-parser.cc
+++ b/deps/v8/src/regexp/regexp-parser.cc
@@ -1789,7 +1789,7 @@ RegExpTree* RegExpParser::ParseCharacterClass(const RegExpBuilder* builder) {
 #undef CHECK_FAILED
 
 bool RegExpParser::Parse(RegExpCompileData* result,
-                         const DisallowHeapAllocation&) {
+                         const DisallowGarbageCollection&) {
   DCHECK(result != nullptr);
   RegExpTree* tree = ParsePattern();
   if (failed()) {
@@ -1820,7 +1820,7 @@ bool RegExpParser::ParseRegExp(Isolate* isolate, Zone* zone,
   RegExpParser parser(input, flags, isolate, zone);
   bool success;
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     success = parser.Parse(result, no_gc);
   }
   if (success) {
diff --git a/deps/v8/src/regexp/regexp-parser.h b/deps/v8/src/regexp/regexp-parser.h
index 23afe9f9392276..33389690ca60b6 100644
--- a/deps/v8/src/regexp/regexp-parser.h
+++ b/deps/v8/src/regexp/regexp-parser.h
@@ -161,7 +161,7 @@ class V8_EXPORT_PRIVATE RegExpParser {
                           JSRegExp::Flags flags, RegExpCompileData* result);
 
  private:
-  bool Parse(RegExpCompileData* result, const DisallowHeapAllocation&);
+  bool Parse(RegExpCompileData* result, const DisallowGarbageCollection&);
 
   RegExpTree* ParsePattern();
   RegExpTree* ParseDisjunction();
diff --git a/deps/v8/src/regexp/regexp-stack.h b/deps/v8/src/regexp/regexp-stack.h
index 25a213e471bdd7..d527f0e0fd3056 100644
--- a/deps/v8/src/regexp/regexp-stack.h
+++ b/deps/v8/src/regexp/regexp-stack.h
@@ -19,7 +19,7 @@ class RegExpStack;
 // Since there is only one stack area, the Irregexp implementation is not
 // re-entrant. I.e., no regular expressions may be executed in the same thread
 // during a preempted Irregexp execution.
-class RegExpStackScope {
+class V8_NODISCARD RegExpStackScope {
  public:
   // Create and delete an instance to control the life-time of a growing stack.
 
@@ -35,7 +35,6 @@ class RegExpStackScope {
   RegExpStack* regexp_stack_;
 };
 
-
 class RegExpStack {
  public:
   RegExpStack();
diff --git a/deps/v8/src/regexp/regexp.cc b/deps/v8/src/regexp/regexp.cc
index b62ad1fff816c4..f4497842e210f0 100644
--- a/deps/v8/src/regexp/regexp.cc
+++ b/deps/v8/src/regexp/regexp.cc
@@ -127,7 +127,7 @@ bool RegExp::IsUnmodifiedRegExp(Isolate* isolate, Handle<JSRegExp> regexp) {
 // Identifies the sort of regexps where the regexp engine is faster
 // than the code used for atom matches.
 static bool HasFewDifferentCharacters(Handle<String> pattern) {
-  int length = Min(kMaxLookaheadForBoyerMoore, pattern->length());
+  int length = std::min(kMaxLookaheadForBoyerMoore, pattern->length());
   if (length <= kPatternTooShortForBoyerMoore) return false;
   const int kMod = 128;
   bool character_found[kMod];
@@ -318,7 +318,7 @@ int RegExpImpl::AtomExecRaw(Isolate* isolate, Handle<JSRegExp> regexp,
   DCHECK_LE(index, subject->length());
 
   subject = String::Flatten(isolate, subject);
-  DisallowHeapAllocation no_gc;  // ensure vectors stay valid
+  DisallowGarbageCollection no_gc;  // ensure vectors stay valid
 
   String needle = String::cast(regexp->DataAt(JSRegExp::kAtomPatternIndex));
   int needle_len = needle.length();
@@ -728,7 +728,7 @@ Handle<RegExpMatchInfo> RegExp::SetLastMatchInfo(
 
   int capture_register_count =
       JSRegExp::RegistersForCaptureCount(capture_count);
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (match != nullptr) {
     for (int i = 0; i < capture_register_count; i += 2) {
       result->SetCapture(i, match[i]);
@@ -799,7 +799,7 @@ bool RegExpImpl::Compile(Isolate* isolate, Zone* zone, RegExpCompileData* data,
   sample_subject = String::Flatten(isolate, sample_subject);
   int chars_sampled = 0;
   int half_way = (sample_subject->length() - kSampleSize) / 2;
-  for (int i = Max(0, half_way);
+  for (int i = std::max(0, half_way);
        i < sample_subject->length() && chars_sampled < kSampleSize;
        i++, chars_sampled++) {
     compiler.frequency_collator()->CountCharacter(sample_subject->Get(i));
@@ -975,8 +975,8 @@ RegExpGlobalCache::RegExpGlobalCache(Handle<JSRegExp> regexp,
         register_array_size_ = registers_per_match_;
         max_matches_ = 1;
       } else {
-        register_array_size_ = Max(registers_per_match_,
-                                   Isolate::kJSRegexpStaticOffsetsVectorSize);
+        register_array_size_ = std::max(
+            {registers_per_match_, Isolate::kJSRegexpStaticOffsetsVectorSize});
       }
       break;
     }
@@ -989,8 +989,8 @@ RegExpGlobalCache::RegExpGlobalCache(Handle<JSRegExp> regexp,
       }
       registers_per_match_ =
           JSRegExp::RegistersForCaptureCount(regexp->CaptureCount());
-      register_array_size_ =
-          Max(registers_per_match_, Isolate::kJSRegexpStaticOffsetsVectorSize);
+      register_array_size_ = std::max(
+          {registers_per_match_, Isolate::kJSRegexpStaticOffsetsVectorSize});
       break;
     }
   }
@@ -1058,7 +1058,7 @@ int32_t* RegExpGlobalCache::FetchNext() {
         break;
       case JSRegExp::EXPERIMENTAL: {
         DCHECK(ExperimentalRegExp::IsCompiled(regexp_, isolate_));
-        DisallowHeapAllocation no_gc;
+        DisallowGarbageCollection no_gc;
         num_matches_ = ExperimentalRegExp::ExecRaw(
             isolate_, RegExp::kFromRuntime, *regexp_, *subject_,
             register_array_, register_array_size_, last_end_index);
@@ -1123,7 +1123,7 @@ Object RegExpResultsCache::Lookup(Heap* heap, String key_string,
     cache = heap->regexp_multiple_cache();
   }
 
-  uint32_t hash = key_string.Hash();
+  uint32_t hash = key_string.hash();
   uint32_t index = ((hash & (kRegExpResultsCacheSize - 1)) &
                     ~(kArrayEntriesPerCacheEntry - 1));
   if (cache.get(index + kStringOffset) != key_string ||
@@ -1158,7 +1158,7 @@ void RegExpResultsCache::Enter(Isolate* isolate, Handle<String> key_string,
     cache = factory->regexp_multiple_cache();
   }
 
-  uint32_t hash = key_string->Hash();
+  uint32_t hash = key_string->hash();
   uint32_t index = ((hash & (kRegExpResultsCacheSize - 1)) &
                     ~(kArrayEntriesPerCacheEntry - 1));
   if (cache->get(index + kStringOffset) == Smi::zero()) {
diff --git a/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc b/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc
index 9d2e62e1cba230..bd9ef127dd1de6 100644
--- a/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc
+++ b/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc
@@ -121,7 +121,7 @@ RegExpMacroAssemblerS390::RegExpMacroAssemblerS390(Isolate* isolate, Zone* zone,
   // If the code gets too big or corrupted, an internal exception will be
   // raised, and we will exit right away.
   __ bind(&internal_failure_label_);
-  __ LoadImmP(r2, Operand(FAILURE));
+  __ mov(r2, Operand(FAILURE));
   __ Ret();
   __ bind(&start_label_);  // And then continue from here.
 }
@@ -146,7 +146,7 @@ int RegExpMacroAssemblerS390::stack_limit_slack() {
 
 void RegExpMacroAssemblerS390::AdvanceCurrentPosition(int by) {
   if (by != 0) {
-    __ AddP(current_input_offset(), Operand(by * char_size()));
+    __ AddS64(current_input_offset(), Operand(by * char_size()));
   }
 }
 
@@ -155,12 +155,12 @@ void RegExpMacroAssemblerS390::AdvanceRegister(int reg, int by) {
   DCHECK_GT(num_registers_, reg);
   if (by != 0) {
     if (CpuFeatures::IsSupported(GENERAL_INSTR_EXT) && is_int8(by)) {
-      __ AddMI(register_location(reg), Operand(by));
+      __ agsi(register_location(reg), Operand(by));
     } else {
-      __ LoadP(r2, register_location(reg), r0);
+      __ LoadU64(r2, register_location(reg), r0);
       __ mov(r0, Operand(by));
-      __ AddRR(r2, r0);
-      __ StoreP(r2, register_location(reg));
+      __ agr(r2, r0);
+      __ StoreU64(r2, register_location(reg));
     }
   }
 }
@@ -169,10 +169,10 @@ void RegExpMacroAssemblerS390::Backtrack() {
   CheckPreemption();
   if (has_backtrack_limit()) {
     Label next;
-    __ LoadP(r2, MemOperand(frame_pointer(), kBacktrackCount), r0);
-    __ AddP(r2, r2, Operand(1));
-    __ StoreP(r2, MemOperand(frame_pointer(), kBacktrackCount), r0);
-    __ CmpLogicalP(r2, Operand(backtrack_limit()));
+    __ LoadU64(r2, MemOperand(frame_pointer(), kBacktrackCount), r0);
+    __ AddS64(r2, r2, Operand(1));
+    __ StoreU64(r2, MemOperand(frame_pointer(), kBacktrackCount), r0);
+    __ CmpU64(r2, Operand(backtrack_limit()));
     __ bne(&next);
 
     // Backtrack limit exceeded.
@@ -187,49 +187,49 @@ void RegExpMacroAssemblerS390::Backtrack() {
   }
   // Pop Code offset from backtrack stack, add Code and jump to location.
   Pop(r2);
-  __ AddP(r2, code_pointer());
+  __ AddS64(r2, code_pointer());
   __ b(r2);
 }
 
 void RegExpMacroAssemblerS390::Bind(Label* label) { __ bind(label); }
 
 void RegExpMacroAssemblerS390::CheckCharacter(uint32_t c, Label* on_equal) {
-  __ CmpLogicalP(current_character(), Operand(c));
+  __ CmpU64(current_character(), Operand(c));
   BranchOrBacktrack(eq, on_equal);
 }
 
 void RegExpMacroAssemblerS390::CheckCharacterGT(uc16 limit, Label* on_greater) {
-  __ CmpLogicalP(current_character(), Operand(limit));
+  __ CmpU64(current_character(), Operand(limit));
   BranchOrBacktrack(gt, on_greater);
 }
 
 void RegExpMacroAssemblerS390::CheckAtStart(int cp_offset, Label* on_at_start) {
-  __ LoadP(r3, MemOperand(frame_pointer(), kStringStartMinusOne));
-  __ AddP(r2, current_input_offset(),
-          Operand(-char_size() + cp_offset * char_size()));
-  __ CmpP(r2, r3);
+  __ LoadU64(r3, MemOperand(frame_pointer(), kStringStartMinusOne));
+  __ AddS64(r2, current_input_offset(),
+            Operand(-char_size() + cp_offset * char_size()));
+  __ CmpS64(r2, r3);
   BranchOrBacktrack(eq, on_at_start);
 }
 
 void RegExpMacroAssemblerS390::CheckNotAtStart(int cp_offset,
                                                Label* on_not_at_start) {
-  __ LoadP(r3, MemOperand(frame_pointer(), kStringStartMinusOne));
-  __ AddP(r2, current_input_offset(),
-          Operand(-char_size() + cp_offset * char_size()));
-  __ CmpP(r2, r3);
+  __ LoadU64(r3, MemOperand(frame_pointer(), kStringStartMinusOne));
+  __ AddS64(r2, current_input_offset(),
+            Operand(-char_size() + cp_offset * char_size()));
+  __ CmpS64(r2, r3);
   BranchOrBacktrack(ne, on_not_at_start);
 }
 
 void RegExpMacroAssemblerS390::CheckCharacterLT(uc16 limit, Label* on_less) {
-  __ CmpLogicalP(current_character(), Operand(limit));
+  __ CmpU64(current_character(), Operand(limit));
   BranchOrBacktrack(lt, on_less);
 }
 
 void RegExpMacroAssemblerS390::CheckGreedyLoop(Label* on_equal) {
   Label backtrack_non_equal;
-  __ CmpP(current_input_offset(), MemOperand(backtrack_stackpointer(), 0));
+  __ CmpS64(current_input_offset(), MemOperand(backtrack_stackpointer(), 0));
   __ bne(&backtrack_non_equal);
-  __ AddP(backtrack_stackpointer(), Operand(kSystemPointerSize));
+  __ AddS64(backtrack_stackpointer(), Operand(kSystemPointerSize));
 
   BranchOrBacktrack(al, on_equal);
   __ bind(&backtrack_non_equal);
@@ -238,10 +238,10 @@ void RegExpMacroAssemblerS390::CheckGreedyLoop(Label* on_equal) {
 void RegExpMacroAssemblerS390::CheckNotBackReferenceIgnoreCase(
     int start_reg, bool read_backward, bool unicode, Label* on_no_match) {
   Label fallthrough;
-  __ LoadP(r2, register_location(start_reg));      // Index of start of
-                                                   // capture
-  __ LoadP(r3, register_location(start_reg + 1));  // Index of end
-  __ SubP(r3, r3, r2);
+  __ LoadU64(r2, register_location(start_reg));      // Index of start of
+                                                     // capture
+  __ LoadU64(r3, register_location(start_reg + 1));  // Index of end
+  __ SubS64(r3, r3, r2);
 
   // At this point, the capture registers are either both set or both cleared.
   // If the capture length is zero, then the capture is either empty or cleared.
@@ -250,12 +250,12 @@ void RegExpMacroAssemblerS390::CheckNotBackReferenceIgnoreCase(
 
   // Check that there are enough characters left in the input.
   if (read_backward) {
-    __ LoadP(r5, MemOperand(frame_pointer(), kStringStartMinusOne));
-    __ AddP(r5, r5, r3);
-    __ CmpP(current_input_offset(), r5);
+    __ LoadU64(r5, MemOperand(frame_pointer(), kStringStartMinusOne));
+    __ AddS64(r5, r5, r3);
+    __ CmpS64(current_input_offset(), r5);
     BranchOrBacktrack(le, on_no_match);
   } else {
-    __ AddP(r0, r3, current_input_offset());
+    __ AddS64(r0, r3, current_input_offset());
     BranchOrBacktrack(gt, on_no_match);
   }
 
@@ -266,10 +266,10 @@ void RegExpMacroAssemblerS390::CheckNotBackReferenceIgnoreCase(
 
     // r2 - offset of start of capture
     // r3 - length of capture
-    __ AddP(r2, end_of_input_address());
-    __ AddP(r4, current_input_offset(), end_of_input_address());
+    __ AddS64(r2, end_of_input_address());
+    __ AddS64(r4, current_input_offset(), end_of_input_address());
     if (read_backward) {
-      __ SubP(r4, r4, r3);  // Offset by length when matching backwards.
+      __ SubS64(r4, r4, r3);  // Offset by length when matching backwards.
     }
     __ mov(r1, Operand::Zero());
 
@@ -279,30 +279,30 @@ void RegExpMacroAssemblerS390::CheckNotBackReferenceIgnoreCase(
 
     Label loop;
     __ bind(&loop);
-    __ LoadlB(r5, MemOperand(r2, r1));
-    __ LoadlB(r6, MemOperand(r4, r1));
+    __ LoadU8(r5, MemOperand(r2, r1));
+    __ LoadU8(r6, MemOperand(r4, r1));
 
-    __ CmpP(r6, r5);
+    __ CmpS64(r6, r5);
     __ beq(&loop_check);
 
     // Mismatch, try case-insensitive match (converting letters to lower-case).
     __ Or(r5, Operand(0x20));  // Convert capture character to lower-case.
     __ Or(r6, Operand(0x20));  // Also convert input character.
-    __ CmpP(r6, r5);
+    __ CmpS64(r6, r5);
     __ bne(&fail);
-    __ SubP(r5, Operand('a'));
-    __ CmpLogicalP(r5, Operand('z' - 'a'));  // Is r5 a lowercase letter?
+    __ SubS64(r5, Operand('a'));
+    __ CmpU64(r5, Operand('z' - 'a'));       // Is r5 a lowercase letter?
     __ ble(&loop_check);                     // In range 'a'-'z'.
     // Latin-1: Check for values in range [224,254] but not 247.
-    __ SubP(r5, Operand(224 - 'a'));
-    __ CmpLogicalP(r5, Operand(254 - 224));
+    __ SubS64(r5, Operand(224 - 'a'));
+    __ CmpU64(r5, Operand(254 - 224));
     __ bgt(&fail);                           // Weren't Latin-1 letters.
-    __ CmpLogicalP(r5, Operand(247 - 224));  // Check for 247.
+    __ CmpU64(r5, Operand(247 - 224));       // Check for 247.
     __ beq(&fail);
 
     __ bind(&loop_check);
     __ la(r1, MemOperand(r1, char_size()));
-    __ CmpP(r1, r3);
+    __ CmpS64(r1, r3);
     __ blt(&loop);
     __ b(&success);
 
@@ -311,15 +311,16 @@ void RegExpMacroAssemblerS390::CheckNotBackReferenceIgnoreCase(
 
     __ bind(&success);
     // Compute new value of character position after the matched part.
-    __ SubP(current_input_offset(), r4, end_of_input_address());
+    __ SubS64(current_input_offset(), r4, end_of_input_address());
     if (read_backward) {
-      __ LoadP(r2, register_location(start_reg));  // Index of start of capture
-      __ LoadP(r3,
-               register_location(start_reg + 1));  // Index of end of capture
-      __ AddP(current_input_offset(), current_input_offset(), r2);
-      __ SubP(current_input_offset(), current_input_offset(), r3);
+      __ LoadU64(r2,
+                 register_location(start_reg));  // Index of start of capture
+      __ LoadU64(r3,
+                 register_location(start_reg + 1));  // Index of end of capture
+      __ AddS64(current_input_offset(), current_input_offset(), r2);
+      __ SubS64(current_input_offset(), current_input_offset(), r3);
     }
-    __ AddP(current_input_offset(), r1);
+    __ AddS64(current_input_offset(), r1);
   } else {
     DCHECK(mode_ == UC16);
     int argument_count = 4;
@@ -336,15 +337,15 @@ void RegExpMacroAssemblerS390::CheckNotBackReferenceIgnoreCase(
     //   r5: Isolate* isolate.
 
     // Address of start of capture.
-    __ AddP(r2, end_of_input_address());
+    __ AddS64(r2, end_of_input_address());
     // Length of capture.
-    __ LoadRR(r4, r3);
+    __ mov(r4, r3);
     // Save length in callee-save register for use on return.
-    __ LoadRR(r6, r3);
+    __ mov(r6, r3);
     // Address of current input position.
-    __ AddP(r3, current_input_offset(), end_of_input_address());
+    __ AddS64(r3, current_input_offset(), end_of_input_address());
     if (read_backward) {
-      __ SubP(r3, r3, r6);
+      __ SubS64(r3, r3, r6);
     }
 // Isolate.
     __ mov(r5, Operand(ExternalReference::isolate_address(isolate())));
@@ -360,14 +361,14 @@ void RegExpMacroAssemblerS390::CheckNotBackReferenceIgnoreCase(
     }
 
     // Check if function returned non-zero for success or zero for failure.
-    __ CmpP(r2, Operand::Zero());
+    __ CmpS64(r2, Operand::Zero());
     BranchOrBacktrack(eq, on_no_match);
 
     // On success, advance position by length of capture.
     if (read_backward) {
-      __ SubP(current_input_offset(), current_input_offset(), r6);
+      __ SubS64(current_input_offset(), current_input_offset(), r6);
     } else {
-      __ AddP(current_input_offset(), current_input_offset(), r6);
+      __ AddS64(current_input_offset(), current_input_offset(), r6);
     }
   }
 
@@ -380,9 +381,9 @@ void RegExpMacroAssemblerS390::CheckNotBackReference(int start_reg,
   Label fallthrough;
 
   // Find length of back-referenced capture.
-  __ LoadP(r2, register_location(start_reg));
-  __ LoadP(r3, register_location(start_reg + 1));
-  __ SubP(r3, r3, r2);  // Length to check.
+  __ LoadU64(r2, register_location(start_reg));
+  __ LoadU64(r3, register_location(start_reg + 1));
+  __ SubS64(r3, r3, r2);  // Length to check.
 
   // At this point, the capture registers are either both set or both cleared.
   // If the capture length is zero, then the capture is either empty or cleared.
@@ -391,12 +392,12 @@ void RegExpMacroAssemblerS390::CheckNotBackReference(int start_reg,
 
   // Check that there are enough characters left in the input.
   if (read_backward) {
-    __ LoadP(r5, MemOperand(frame_pointer(), kStringStartMinusOne));
-    __ AddP(r5, r5, r3);
-    __ CmpP(current_input_offset(), r5);
+    __ LoadU64(r5, MemOperand(frame_pointer(), kStringStartMinusOne));
+    __ AddS64(r5, r5, r3);
+    __ CmpS64(current_input_offset(), r5);
     BranchOrBacktrack(le, on_no_match);
   } else {
-    __ AddP(r0, r3, current_input_offset());
+    __ AddS64(r0, r3, current_input_offset());
     BranchOrBacktrack(gt, on_no_match, cr0);
   }
 
@@ -405,42 +406,43 @@ void RegExpMacroAssemblerS390::CheckNotBackReference(int start_reg,
   __ la(r2, MemOperand(r2, end_of_input_address()));
   __ la(r4, MemOperand(current_input_offset(), end_of_input_address()));
   if (read_backward) {
-    __ SubP(r4, r4, r3);  // Offset by length when matching backwards.
+    __ SubS64(r4, r4, r3);  // Offset by length when matching backwards.
   }
   __ mov(r1, Operand::Zero());
 
   Label loop;
   __ bind(&loop);
   if (mode_ == LATIN1) {
-    __ LoadlB(r5, MemOperand(r2, r1));
-    __ LoadlB(r6, MemOperand(r4, r1));
+    __ LoadU8(r5, MemOperand(r2, r1));
+    __ LoadU8(r6, MemOperand(r4, r1));
   } else {
     DCHECK(mode_ == UC16);
-    __ LoadLogicalHalfWordP(r5, MemOperand(r2, r1));
-    __ LoadLogicalHalfWordP(r6, MemOperand(r4, r1));
+    __ LoadU16(r5, MemOperand(r2, r1));
+    __ LoadU16(r6, MemOperand(r4, r1));
   }
   __ la(r1, MemOperand(r1, char_size()));
-  __ CmpP(r5, r6);
+  __ CmpS64(r5, r6);
   BranchOrBacktrack(ne, on_no_match);
-  __ CmpP(r1, r3);
+  __ CmpS64(r1, r3);
   __ blt(&loop);
 
   // Move current character position to position after match.
-  __ SubP(current_input_offset(), r4, end_of_input_address());
+  __ SubS64(current_input_offset(), r4, end_of_input_address());
   if (read_backward) {
-    __ LoadP(r2, register_location(start_reg));  // Index of start of capture
-    __ LoadP(r3, register_location(start_reg + 1));  // Index of end of capture
-    __ AddP(current_input_offset(), current_input_offset(), r2);
-    __ SubP(current_input_offset(), current_input_offset(), r3);
+    __ LoadU64(r2, register_location(start_reg));  // Index of start of capture
+    __ LoadU64(r3,
+               register_location(start_reg + 1));  // Index of end of capture
+    __ AddS64(current_input_offset(), current_input_offset(), r2);
+    __ SubS64(current_input_offset(), current_input_offset(), r3);
   }
-  __ AddP(current_input_offset(), r1);
+  __ AddS64(current_input_offset(), r1);
 
   __ bind(&fallthrough);
 }
 
 void RegExpMacroAssemblerS390::CheckNotCharacter(unsigned c,
                                                  Label* on_not_equal) {
-  __ CmpLogicalP(current_character(), Operand(c));
+  __ CmpU64(current_character(), Operand(c));
   BranchOrBacktrack(ne, on_not_equal);
 }
 
@@ -448,7 +450,7 @@ void RegExpMacroAssemblerS390::CheckCharacterAfterAnd(uint32_t c, uint32_t mask,
                                                       Label* on_equal) {
   __ AndP(r2, current_character(), Operand(mask));
   if (c != 0) {
-    __ CmpLogicalP(r2, Operand(c));
+    __ CmpU64(r2, Operand(c));
   }
   BranchOrBacktrack(eq, on_equal);
 }
@@ -458,7 +460,7 @@ void RegExpMacroAssemblerS390::CheckNotCharacterAfterAnd(unsigned c,
                                                          Label* on_not_equal) {
   __ AndP(r2, current_character(), Operand(mask));
   if (c != 0) {
-    __ CmpLogicalP(r2, Operand(c));
+    __ CmpU64(r2, Operand(c));
   }
   BranchOrBacktrack(ne, on_not_equal);
 }
@@ -469,7 +471,7 @@ void RegExpMacroAssemblerS390::CheckNotCharacterAfterMinusAnd(
   __ lay(r2, MemOperand(current_character(), -minus));
   __ And(r2, Operand(mask));
   if (c != 0) {
-    __ CmpLogicalP(r2, Operand(c));
+    __ CmpU64(r2, Operand(c));
   }
   BranchOrBacktrack(ne, on_not_equal);
 }
@@ -477,14 +479,14 @@ void RegExpMacroAssemblerS390::CheckNotCharacterAfterMinusAnd(
 void RegExpMacroAssemblerS390::CheckCharacterInRange(uc16 from, uc16 to,
                                                      Label* on_in_range) {
   __ lay(r2, MemOperand(current_character(), -from));
-  __ CmpLogicalP(r2, Operand(to - from));
+  __ CmpU64(r2, Operand(to - from));
   BranchOrBacktrack(le, on_in_range);  // Unsigned lower-or-same condition.
 }
 
 void RegExpMacroAssemblerS390::CheckCharacterNotInRange(
     uc16 from, uc16 to, Label* on_not_in_range) {
   __ lay(r2, MemOperand(current_character(), -from));
-  __ CmpLogicalP(r2, Operand(to - from));
+  __ CmpU64(r2, Operand(to - from));
   BranchOrBacktrack(gt, on_not_in_range);  // Unsigned higher condition.
 }
 
@@ -496,9 +498,9 @@ void RegExpMacroAssemblerS390::CheckBitInTable(Handle<ByteArray> table,
     __ AndP(r3, current_character(), Operand(kTableSize - 1));
     index = r3;
   }
-  __ LoadlB(r2,
+  __ LoadU8(r2,
             MemOperand(r2, index, (ByteArray::kHeaderSize - kHeapObjectTag)));
-  __ CmpP(r2, Operand::Zero());
+  __ CmpS64(r2, Operand::Zero());
   BranchOrBacktrack(ne, on_bit_set);
 }
 
@@ -512,14 +514,14 @@ bool RegExpMacroAssemblerS390::CheckSpecialCharacterClass(uc16 type,
       if (mode_ == LATIN1) {
         // One byte space characters are '\t'..'\r', ' ' and \u00a0.
         Label success;
-        __ CmpP(current_character(), Operand(' '));
+        __ CmpS64(current_character(), Operand(' '));
         __ beq(&success);
         // Check range 0x09..0x0D
-        __ SubP(r2, current_character(), Operand('\t'));
-        __ CmpLogicalP(r2, Operand('\r' - '\t'));
+        __ SubS64(r2, current_character(), Operand('\t'));
+        __ CmpU64(r2, Operand('\r' - '\t'));
         __ ble(&success);
         // \u00a0 (NBSP).
-        __ CmpLogicalP(r2, Operand(0x00A0 - '\t'));
+        __ CmpU64(r2, Operand(0x00A0 - '\t'));
         BranchOrBacktrack(ne, on_no_match);
         __ bind(&success);
         return true;
@@ -530,29 +532,29 @@ bool RegExpMacroAssemblerS390::CheckSpecialCharacterClass(uc16 type,
       return false;
     case 'd':
       // Match ASCII digits ('0'..'9')
-      __ SubP(r2, current_character(), Operand('0'));
-      __ CmpLogicalP(r2, Operand('9' - '0'));
+      __ SubS64(r2, current_character(), Operand('0'));
+      __ CmpU64(r2, Operand('9' - '0'));
       BranchOrBacktrack(gt, on_no_match);
       return true;
     case 'D':
       // Match non ASCII-digits
-      __ SubP(r2, current_character(), Operand('0'));
-      __ CmpLogicalP(r2, Operand('9' - '0'));
+      __ SubS64(r2, current_character(), Operand('0'));
+      __ CmpU64(r2, Operand('9' - '0'));
       BranchOrBacktrack(le, on_no_match);
       return true;
     case '.': {
       // Match non-newlines (not 0x0A('\n'), 0x0D('\r'), 0x2028 and 0x2029)
       __ XorP(r2, current_character(), Operand(0x01));
       // See if current character is '\n'^1 or '\r'^1, i.e., 0x0B or 0x0C
-      __ SubP(r2, Operand(0x0B));
-      __ CmpLogicalP(r2, Operand(0x0C - 0x0B));
+      __ SubS64(r2, Operand(0x0B));
+      __ CmpU64(r2, Operand(0x0C - 0x0B));
       BranchOrBacktrack(le, on_no_match);
       if (mode_ == UC16) {
         // Compare original value to 0x2028 and 0x2029, using the already
         // computed (current_char ^ 0x01 - 0x0B). I.e., check for
         // 0x201D (0x2028 - 0x0B) or 0x201E.
-        __ SubP(r2, Operand(0x2028 - 0x0B));
-        __ CmpLogicalP(r2, Operand(1));
+        __ SubS64(r2, Operand(0x2028 - 0x0B));
+        __ CmpU64(r2, Operand(1));
         BranchOrBacktrack(le, on_no_match);
       }
       return true;
@@ -561,8 +563,8 @@ bool RegExpMacroAssemblerS390::CheckSpecialCharacterClass(uc16 type,
       // Match newlines (0x0A('\n'), 0x0D('\r'), 0x2028 and 0x2029)
       __ XorP(r2, current_character(), Operand(0x01));
       // See if current character is '\n'^1 or '\r'^1, i.e., 0x0B or 0x0C
-      __ SubP(r2, Operand(0x0B));
-      __ CmpLogicalP(r2, Operand(0x0C - 0x0B));
+      __ SubS64(r2, Operand(0x0B));
+      __ CmpU64(r2, Operand(0x0C - 0x0B));
       if (mode_ == LATIN1) {
         BranchOrBacktrack(gt, on_no_match);
       } else {
@@ -571,8 +573,8 @@ bool RegExpMacroAssemblerS390::CheckSpecialCharacterClass(uc16 type,
         // Compare original value to 0x2028 and 0x2029, using the already
         // computed (current_char ^ 0x01 - 0x0B). I.e., check for
         // 0x201D (0x2028 - 0x0B) or 0x201E.
-        __ SubP(r2, Operand(0x2028 - 0x0B));
-        __ CmpLogicalP(r2, Operand(1));
+        __ SubS64(r2, Operand(0x2028 - 0x0B));
+        __ CmpU64(r2, Operand(1));
         BranchOrBacktrack(gt, on_no_match);
         __ bind(&done);
       }
@@ -581,14 +583,14 @@ bool RegExpMacroAssemblerS390::CheckSpecialCharacterClass(uc16 type,
     case 'w': {
       if (mode_ != LATIN1) {
         // Table is 1256 entries, so all LATIN1 characters can be tested.
-        __ CmpP(current_character(), Operand('z'));
+        __ CmpS64(current_character(), Operand('z'));
         BranchOrBacktrack(gt, on_no_match);
       }
       ExternalReference map =
           ExternalReference::re_word_character_map(isolate());
       __ mov(r2, Operand(map));
-      __ LoadlB(r2, MemOperand(r2, current_character()));
-      __ CmpLogicalP(r2, Operand::Zero());
+      __ LoadU8(r2, MemOperand(r2, current_character()));
+      __ CmpU64(r2, Operand::Zero());
       BranchOrBacktrack(eq, on_no_match);
       return true;
     }
@@ -596,14 +598,14 @@ bool RegExpMacroAssemblerS390::CheckSpecialCharacterClass(uc16 type,
       Label done;
       if (mode_ != LATIN1) {
         // Table is 256 entries, so all LATIN characters can be tested.
-        __ CmpLogicalP(current_character(), Operand('z'));
+        __ CmpU64(current_character(), Operand('z'));
         __ bgt(&done);
       }
       ExternalReference map =
           ExternalReference::re_word_character_map(isolate());
       __ mov(r2, Operand(map));
-      __ LoadlB(r2, MemOperand(r2, current_character()));
-      __ CmpLogicalP(r2, Operand::Zero());
+      __ LoadU8(r2, MemOperand(r2, current_character()));
+      __ CmpU64(r2, Operand::Zero());
       BranchOrBacktrack(ne, on_no_match);
       if (mode_ != LATIN1) {
         __ bind(&done);
@@ -620,7 +622,7 @@ bool RegExpMacroAssemblerS390::CheckSpecialCharacterClass(uc16 type,
 }
 
 void RegExpMacroAssemblerS390::Fail() {
-  __ LoadImmP(r2, Operand(FAILURE));
+  __ mov(r2, Operand(FAILURE));
   __ b(&exit_label_);
 }
 
@@ -674,13 +676,13 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
   //
   // Set frame pointer in space for it if this is not a direct call
   // from generated code.
-  __ LoadRR(frame_pointer(), sp);
+  __ mov(frame_pointer(), sp);
   __ lay(sp, MemOperand(sp, -10 * kSystemPointerSize));
   STATIC_ASSERT(kSuccessfulCaptures == kInputString - kSystemPointerSize);
   __ mov(r1, Operand::Zero());  // success counter
   STATIC_ASSERT(kStringStartMinusOne ==
                 kSuccessfulCaptures - kSystemPointerSize);
-  __ LoadRR(r0, r1);            // offset of location
+  __ mov(r0, r1);  // offset of location
   __ StoreMultipleP(r0, r9, MemOperand(sp, 0));
   STATIC_ASSERT(kBacktrackCount == kStringStartMinusOne - kSystemPointerSize);
   __ Push(r1);  // The backtrack counter.
@@ -691,13 +693,13 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
   ExternalReference stack_limit =
       ExternalReference::address_of_jslimit(isolate());
   __ mov(r2, Operand(stack_limit));
-  __ LoadP(r2, MemOperand(r2));
-  __ SubP(r2, sp, r2);
+  __ LoadU64(r2, MemOperand(r2));
+  __ SubS64(r2, sp, r2);
   // Handle it if the stack pointer is already below the stack limit.
   __ ble(&stack_limit_hit);
   // Check if there is room for the variable number of registers above
   // the stack limit.
-  __ CmpLogicalP(r2, Operand(num_registers_ * kSystemPointerSize));
+  __ CmpU64(r2, Operand(num_registers_ * kSystemPointerSize));
   __ bge(&stack_ok);
   // Exit with OutOfMemory exception. There is not enough space on the stack
   // for our working registers.
@@ -706,7 +708,7 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
 
   __ bind(&stack_limit_hit);
   CallCheckStackGuardState(r2);
-  __ CmpP(r2, Operand::Zero());
+  __ CmpS64(r2, Operand::Zero());
   // If returned value is non-zero, we exit with the returned value as result.
   __ bne(&return_r2);
 
@@ -715,32 +717,32 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
   // Allocate space on stack for registers.
   __ lay(sp, MemOperand(sp, (-num_registers_ * kSystemPointerSize)));
   // Load string end.
-  __ LoadP(end_of_input_address(), MemOperand(frame_pointer(), kInputEnd));
+  __ LoadU64(end_of_input_address(), MemOperand(frame_pointer(), kInputEnd));
   // Load input start.
-  __ LoadP(r4, MemOperand(frame_pointer(), kInputStart));
+  __ LoadU64(r4, MemOperand(frame_pointer(), kInputStart));
   // Find negative length (offset of start relative to end).
-  __ SubP(current_input_offset(), r4, end_of_input_address());
-  __ LoadP(r3, MemOperand(frame_pointer(), kStartIndex));
+  __ SubS64(current_input_offset(), r4, end_of_input_address());
+  __ LoadU64(r3, MemOperand(frame_pointer(), kStartIndex));
   // Set r1 to address of char before start of the input string
   // (effectively string position -1).
-  __ LoadRR(r1, r4);
-  __ SubP(r1, current_input_offset(), Operand(char_size()));
+  __ mov(r1, r4);
+  __ SubS64(r1, current_input_offset(), Operand(char_size()));
   if (mode_ == UC16) {
-    __ ShiftLeftP(r0, r3, Operand(1));
-    __ SubP(r1, r1, r0);
+    __ ShiftLeftU64(r0, r3, Operand(1));
+    __ SubS64(r1, r1, r0);
   } else {
-    __ SubP(r1, r1, r3);
+    __ SubS64(r1, r1, r3);
   }
   // Store this value in a local variable, for use when clearing
   // position registers.
-  __ StoreP(r1, MemOperand(frame_pointer(), kStringStartMinusOne));
+  __ StoreU64(r1, MemOperand(frame_pointer(), kStringStartMinusOne));
 
   // Initialize code pointer register
   __ mov(code_pointer(), Operand(masm_->CodeObject()));
 
   Label load_char_start_regexp, start_regexp;
   // Load newline if index is at start, previous character otherwise.
-  __ CmpP(r3, Operand::Zero());
+  __ CmpS64(r3, Operand::Zero());
   __ bne(&load_char_start_regexp);
   __ mov(current_character(), Operand('\n'));
   __ b(&start_regexp);
@@ -758,22 +760,22 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
       // One slot beyond address of register 0.
       __ lay(r3,
              MemOperand(frame_pointer(), kRegisterZero + kSystemPointerSize));
-      __ Load(r4, Operand(num_saved_registers_));
+      __ mov(r4, Operand(num_saved_registers_));
       Label init_loop;
       __ bind(&init_loop);
-      __ StoreP(r1, MemOperand(r3, -kSystemPointerSize));
+      __ StoreU64(r1, MemOperand(r3, -kSystemPointerSize));
       __ lay(r3, MemOperand(r3, -kSystemPointerSize));
       __ BranchOnCount(r4, &init_loop);
     } else {
       for (int i = 0; i < num_saved_registers_; i++) {
-        __ StoreP(r1, register_location(i));
+        __ StoreU64(r1, register_location(i));
       }
     }
   }
 
   // Initialize backtrack stack pointer.
-  __ LoadP(backtrack_stackpointer(),
-           MemOperand(frame_pointer(), kStackHighEnd));
+  __ LoadU64(backtrack_stackpointer(),
+             MemOperand(frame_pointer(), kStackHighEnd));
 
   __ b(&start_label_);
 
@@ -783,16 +785,16 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
     __ bind(&success_label_);
     if (num_saved_registers_ > 0) {
       // copy captures to output
-      __ LoadP(r0, MemOperand(frame_pointer(), kInputStart));
-      __ LoadP(r2, MemOperand(frame_pointer(), kRegisterOutput));
-      __ LoadP(r4, MemOperand(frame_pointer(), kStartIndex));
-      __ SubP(r0, end_of_input_address(), r0);
+      __ LoadU64(r0, MemOperand(frame_pointer(), kInputStart));
+      __ LoadU64(r2, MemOperand(frame_pointer(), kRegisterOutput));
+      __ LoadU64(r4, MemOperand(frame_pointer(), kStartIndex));
+      __ SubS64(r0, end_of_input_address(), r0);
       // r0 is length of input in bytes.
       if (mode_ == UC16) {
-        __ ShiftRightP(r0, r0, Operand(1));
+        __ ShiftRightU64(r0, r0, Operand(1));
       }
       // r0 is length of input in characters.
-      __ AddP(r0, r4);
+      __ AddS64(r0, r4);
       // r0 is length of string in characters.
 
       DCHECK_EQ(0, num_saved_registers_ % 2);
@@ -805,97 +807,99 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
           // TODO(john.yan): Can be optimized by SIMD instructions
           __ LoadMultipleP(r3, r6, register_location(i + 3));
           if (mode_ == UC16) {
-            __ ShiftRightArithP(r3, r3, Operand(1));
-            __ ShiftRightArithP(r4, r4, Operand(1));
-            __ ShiftRightArithP(r5, r5, Operand(1));
-            __ ShiftRightArithP(r6, r6, Operand(1));
+            __ ShiftRightS64(r3, r3, Operand(1));
+            __ ShiftRightS64(r4, r4, Operand(1));
+            __ ShiftRightS64(r5, r5, Operand(1));
+            __ ShiftRightS64(r6, r6, Operand(1));
           }
-          __ AddP(r3, r0);
-          __ AddP(r4, r0);
-          __ AddP(r5, r0);
-          __ AddP(r6, r0);
-          __ StoreW(r3,
-                    MemOperand(r2, -(num_saved_registers_ - i - 3) * kIntSize));
-          __ StoreW(r4,
-                    MemOperand(r2, -(num_saved_registers_ - i - 2) * kIntSize));
-          __ StoreW(r5,
-                    MemOperand(r2, -(num_saved_registers_ - i - 1) * kIntSize));
-          __ StoreW(r6, MemOperand(r2, -(num_saved_registers_ - i) * kIntSize));
+          __ AddS64(r3, r0);
+          __ AddS64(r4, r0);
+          __ AddS64(r5, r0);
+          __ AddS64(r6, r0);
+          __ StoreU32(
+              r3, MemOperand(r2, -(num_saved_registers_ - i - 3) * kIntSize));
+          __ StoreU32(
+              r4, MemOperand(r2, -(num_saved_registers_ - i - 2) * kIntSize));
+          __ StoreU32(
+              r5, MemOperand(r2, -(num_saved_registers_ - i - 1) * kIntSize));
+          __ StoreU32(r6,
+                      MemOperand(r2, -(num_saved_registers_ - i) * kIntSize));
           i += 4;
         } else {
           __ LoadMultipleP(r3, r4, register_location(i + 1));
           if (mode_ == UC16) {
-            __ ShiftRightArithP(r3, r3, Operand(1));
-            __ ShiftRightArithP(r4, r4, Operand(1));
+            __ ShiftRightS64(r3, r3, Operand(1));
+            __ ShiftRightS64(r4, r4, Operand(1));
           }
-          __ AddP(r3, r0);
-          __ AddP(r4, r0);
-          __ StoreW(r3,
-                    MemOperand(r2, -(num_saved_registers_ - i - 1) * kIntSize));
-          __ StoreW(r4, MemOperand(r2, -(num_saved_registers_ - i) * kIntSize));
+          __ AddS64(r3, r0);
+          __ AddS64(r4, r0);
+          __ StoreU32(
+              r3, MemOperand(r2, -(num_saved_registers_ - i - 1) * kIntSize));
+          __ StoreU32(r4,
+                      MemOperand(r2, -(num_saved_registers_ - i) * kIntSize));
           i += 2;
         }
       }
       if (global_with_zero_length_check()) {
         // Keep capture start in r6 for the zero-length check later.
-        __ LoadP(r6, register_location(0));
+        __ LoadU64(r6, register_location(0));
       }
     }
 
     if (global()) {
       // Restart matching if the regular expression is flagged as global.
-      __ LoadP(r2, MemOperand(frame_pointer(), kSuccessfulCaptures));
-      __ LoadP(r3, MemOperand(frame_pointer(), kNumOutputRegisters));
-      __ LoadP(r4, MemOperand(frame_pointer(), kRegisterOutput));
+      __ LoadU64(r2, MemOperand(frame_pointer(), kSuccessfulCaptures));
+      __ LoadU64(r3, MemOperand(frame_pointer(), kNumOutputRegisters));
+      __ LoadU64(r4, MemOperand(frame_pointer(), kRegisterOutput));
       // Increment success counter.
-      __ AddP(r2, Operand(1));
-      __ StoreP(r2, MemOperand(frame_pointer(), kSuccessfulCaptures));
+      __ AddS64(r2, Operand(1));
+      __ StoreU64(r2, MemOperand(frame_pointer(), kSuccessfulCaptures));
       // Capture results have been stored, so the number of remaining global
       // output registers is reduced by the number of stored captures.
-      __ SubP(r3, Operand(num_saved_registers_));
+      __ SubS64(r3, Operand(num_saved_registers_));
       // Check whether we have enough room for another set of capture results.
-      __ CmpP(r3, Operand(num_saved_registers_));
+      __ CmpS64(r3, Operand(num_saved_registers_));
       __ blt(&return_r2);
 
-      __ StoreP(r3, MemOperand(frame_pointer(), kNumOutputRegisters));
+      __ StoreU64(r3, MemOperand(frame_pointer(), kNumOutputRegisters));
       // Advance the location for output.
-      __ AddP(r4, Operand(num_saved_registers_ * kIntSize));
-      __ StoreP(r4, MemOperand(frame_pointer(), kRegisterOutput));
+      __ AddS64(r4, Operand(num_saved_registers_ * kIntSize));
+      __ StoreU64(r4, MemOperand(frame_pointer(), kRegisterOutput));
 
       // Prepare r2 to initialize registers with its value in the next run.
-      __ LoadP(r2, MemOperand(frame_pointer(), kStringStartMinusOne));
+      __ LoadU64(r2, MemOperand(frame_pointer(), kStringStartMinusOne));
 
       if (global_with_zero_length_check()) {
         // Special case for zero-length matches.
         // r6: capture start index
-        __ CmpP(current_input_offset(), r6);
+        __ CmpS64(current_input_offset(), r6);
         // Not a zero-length match, restart.
         __ bne(&load_char_start_regexp);
         // Offset from the end is zero if we already reached the end.
-        __ CmpP(current_input_offset(), Operand::Zero());
+        __ CmpS64(current_input_offset(), Operand::Zero());
         __ beq(&exit_label_);
         // Advance current position after a zero-length match.
         Label advance;
         __ bind(&advance);
-        __ AddP(current_input_offset(), Operand((mode_ == UC16) ? 2 : 1));
+        __ AddS64(current_input_offset(), Operand((mode_ == UC16) ? 2 : 1));
         if (global_unicode()) CheckNotInSurrogatePair(0, &advance);
       }
 
       __ b(&load_char_start_regexp);
     } else {
-      __ LoadImmP(r2, Operand(SUCCESS));
+      __ mov(r2, Operand(SUCCESS));
     }
   }
 
   // Exit and return r2
   __ bind(&exit_label_);
   if (global()) {
-    __ LoadP(r2, MemOperand(frame_pointer(), kSuccessfulCaptures));
+    __ LoadU64(r2, MemOperand(frame_pointer(), kSuccessfulCaptures));
   }
 
   __ bind(&return_r2);
   // Skip sp past regexp registers and local variables..
-  __ LoadRR(sp, frame_pointer());
+  __ mov(sp, frame_pointer());
   // Restore registers r6..r15.
   __ LoadMultipleP(r6, sp, MemOperand(sp, 6 * kSystemPointerSize));
 
@@ -914,13 +918,13 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
     SafeCallTarget(&check_preempt_label_);
 
     CallCheckStackGuardState(r2);
-    __ CmpP(r2, Operand::Zero());
+    __ CmpS64(r2, Operand::Zero());
     // If returning non-zero, we should end execution with the given
     // result as return value.
     __ bne(&return_r2);
 
     // String might have moved: Reload end of string from frame.
-    __ LoadP(end_of_input_address(), MemOperand(frame_pointer(), kInputEnd));
+    __ LoadU64(end_of_input_address(), MemOperand(frame_pointer(), kInputEnd));
     SafeReturn();
   }
 
@@ -932,17 +936,17 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
     // Call GrowStack(backtrack_stackpointer(), &stack_base)
     static const int num_arguments = 3;
     __ PrepareCallCFunction(num_arguments, r2);
-    __ LoadRR(r2, backtrack_stackpointer());
-    __ AddP(r3, frame_pointer(), Operand(kStackHighEnd));
+    __ mov(r2, backtrack_stackpointer());
+    __ AddS64(r3, frame_pointer(), Operand(kStackHighEnd));
     __ mov(r4, Operand(ExternalReference::isolate_address(isolate())));
     ExternalReference grow_stack = ExternalReference::re_grow_stack(isolate());
     __ CallCFunction(grow_stack, num_arguments);
     // If return nullptr, we have failed to grow the stack, and
     // must exit with a stack-overflow exception.
-    __ CmpP(r2, Operand::Zero());
+    __ CmpS64(r2, Operand::Zero());
     __ beq(&exit_with_exception);
     // Otherwise use return value as new stack pointer.
-    __ LoadRR(backtrack_stackpointer(), r2);
+    __ mov(backtrack_stackpointer(), r2);
     // Restore saved registers and continue.
     SafeReturn();
   }
@@ -951,13 +955,13 @@ Handle<HeapObject> RegExpMacroAssemblerS390::GetCode(Handle<String> source) {
     // If any of the code above needed to exit with an exception.
     __ bind(&exit_with_exception);
     // Exit with Result EXCEPTION(-1) to signal thrown exception.
-    __ LoadImmP(r2, Operand(EXCEPTION));
+    __ mov(r2, Operand(EXCEPTION));
     __ b(&return_r2);
   }
 
   if (fallback_label_.is_linked()) {
     __ bind(&fallback_label_);
-    __ LoadImmP(r2, Operand(FALLBACK_TO_EXPERIMENTAL));
+    __ mov(r2, Operand(FALLBACK_TO_EXPERIMENTAL));
     __ b(&return_r2);
   }
 
@@ -976,21 +980,21 @@ void RegExpMacroAssemblerS390::GoTo(Label* to) { BranchOrBacktrack(al, to); }
 
 void RegExpMacroAssemblerS390::IfRegisterGE(int reg, int comparand,
                                             Label* if_ge) {
-  __ LoadP(r2, register_location(reg), r0);
-  __ CmpP(r2, Operand(comparand));
+  __ LoadU64(r2, register_location(reg), r0);
+  __ CmpS64(r2, Operand(comparand));
   BranchOrBacktrack(ge, if_ge);
 }
 
 void RegExpMacroAssemblerS390::IfRegisterLT(int reg, int comparand,
                                             Label* if_lt) {
-  __ LoadP(r2, register_location(reg), r0);
-  __ CmpP(r2, Operand(comparand));
+  __ LoadU64(r2, register_location(reg), r0);
+  __ CmpS64(r2, Operand(comparand));
   BranchOrBacktrack(lt, if_lt);
 }
 
 void RegExpMacroAssemblerS390::IfRegisterEqPos(int reg, Label* if_eq) {
-  __ LoadP(r2, register_location(reg), r0);
-  __ CmpP(r2, current_input_offset());
+  __ LoadU64(r2, register_location(reg), r0);
+  __ CmpS64(r2, current_input_offset());
   BranchOrBacktrack(eq, if_eq);
 }
 
@@ -1005,7 +1009,7 @@ void RegExpMacroAssemblerS390::PopCurrentPosition() {
 
 void RegExpMacroAssemblerS390::PopRegister(int register_index) {
   Pop(r2);
-  __ StoreP(r2, register_location(register_index));
+  __ StoreU64(r2, register_location(register_index));
 }
 
 void RegExpMacroAssemblerS390::PushBacktrack(Label* label) {
@@ -1025,24 +1029,24 @@ void RegExpMacroAssemblerS390::PushCurrentPosition() {
 
 void RegExpMacroAssemblerS390::PushRegister(int register_index,
                                             StackCheckFlag check_stack_limit) {
-  __ LoadP(r2, register_location(register_index), r0);
+  __ LoadU64(r2, register_location(register_index), r0);
   Push(r2);
   if (check_stack_limit) CheckStackLimit();
 }
 
 void RegExpMacroAssemblerS390::ReadCurrentPositionFromRegister(int reg) {
-  __ LoadP(current_input_offset(), register_location(reg), r0);
+  __ LoadU64(current_input_offset(), register_location(reg), r0);
 }
 
 void RegExpMacroAssemblerS390::ReadStackPointerFromRegister(int reg) {
-  __ LoadP(backtrack_stackpointer(), register_location(reg), r0);
-  __ LoadP(r2, MemOperand(frame_pointer(), kStackHighEnd));
-  __ AddP(backtrack_stackpointer(), r2);
+  __ LoadU64(backtrack_stackpointer(), register_location(reg), r0);
+  __ LoadU64(r2, MemOperand(frame_pointer(), kStackHighEnd));
+  __ AddS64(backtrack_stackpointer(), r2);
 }
 
 void RegExpMacroAssemblerS390::SetCurrentPositionFromEnd(int by) {
   Label after_position;
-  __ CmpP(current_input_offset(), Operand(-by * char_size()));
+  __ CmpS64(current_input_offset(), Operand(-by * char_size()));
   __ bge(&after_position);
   __ mov(current_input_offset(), Operand(-by * char_size()));
   // On RegExp code entry (where this operation is used), the character before
@@ -1055,7 +1059,7 @@ void RegExpMacroAssemblerS390::SetCurrentPositionFromEnd(int by) {
 void RegExpMacroAssemblerS390::SetRegister(int register_index, int to) {
   DCHECK(register_index >= num_saved_registers_);  // Reserved for positions!
   __ mov(r2, Operand(to));
-  __ StoreP(r2, register_location(register_index));
+  __ StoreU64(r2, register_location(register_index));
 }
 
 bool RegExpMacroAssemblerS390::Succeed() {
@@ -1066,25 +1070,25 @@ bool RegExpMacroAssemblerS390::Succeed() {
 void RegExpMacroAssemblerS390::WriteCurrentPositionToRegister(int reg,
                                                               int cp_offset) {
   if (cp_offset == 0) {
-    __ StoreP(current_input_offset(), register_location(reg));
+    __ StoreU64(current_input_offset(), register_location(reg));
   } else {
-    __ AddP(r2, current_input_offset(), Operand(cp_offset * char_size()));
-    __ StoreP(r2, register_location(reg));
+    __ AddS64(r2, current_input_offset(), Operand(cp_offset * char_size()));
+    __ StoreU64(r2, register_location(reg));
   }
 }
 
 void RegExpMacroAssemblerS390::ClearRegisters(int reg_from, int reg_to) {
   DCHECK(reg_from <= reg_to);
-  __ LoadP(r2, MemOperand(frame_pointer(), kStringStartMinusOne));
+  __ LoadU64(r2, MemOperand(frame_pointer(), kStringStartMinusOne));
   for (int reg = reg_from; reg <= reg_to; reg++) {
-    __ StoreP(r2, register_location(reg));
+    __ StoreU64(r2, register_location(reg));
   }
 }
 
 void RegExpMacroAssemblerS390::WriteStackPointerToRegister(int reg) {
-  __ LoadP(r3, MemOperand(frame_pointer(), kStackHighEnd));
-  __ SubP(r2, backtrack_stackpointer(), r3);
-  __ StoreP(r2, register_location(reg));
+  __ LoadU64(r3, MemOperand(frame_pointer(), kStackHighEnd));
+  __ SubS64(r2, backtrack_stackpointer(), r3);
+  __ StoreU64(r2, register_location(reg));
 }
 
 // Private methods:
@@ -1096,7 +1100,7 @@ void RegExpMacroAssemblerS390::CallCheckStackGuardState(Register scratch) {
   static constexpr int num_arguments = 3;
   __ PrepareCallCFunction(num_arguments, scratch);
   // RegExp code frame pointer.
-  __ LoadRR(r4, frame_pointer());
+  __ mov(r4, frame_pointer());
   // Code of self.
   __ mov(r3, Operand(masm_->CodeObject()));
   // r2 becomes return address pointer.
@@ -1108,7 +1112,7 @@ void RegExpMacroAssemblerS390::CallCheckStackGuardState(Register scratch) {
   __ StoreReturnAddressAndCall(ip);
 
   if (base::OS::ActivationFrameAlignment() > kSystemPointerSize) {
-    __ LoadP(
+    __ LoadU64(
         sp, MemOperand(sp, (kNumRequiredStackFrameSlots * kSystemPointerSize)));
   } else {
     __ la(sp,
@@ -1161,12 +1165,12 @@ MemOperand RegExpMacroAssemblerS390::register_location(int register_index) {
 void RegExpMacroAssemblerS390::CheckPosition(int cp_offset,
                                              Label* on_outside_input) {
   if (cp_offset >= 0) {
-    __ CmpP(current_input_offset(), Operand(-cp_offset * char_size()));
+    __ CmpS64(current_input_offset(), Operand(-cp_offset * char_size()));
     BranchOrBacktrack(ge, on_outside_input);
   } else {
-    __ LoadP(r3, MemOperand(frame_pointer(), kStringStartMinusOne));
-    __ AddP(r2, current_input_offset(), Operand(cp_offset * char_size()));
-    __ CmpP(r2, r3);
+    __ LoadU64(r3, MemOperand(frame_pointer(), kStringStartMinusOne));
+    __ AddS64(r2, current_input_offset(), Operand(cp_offset * char_size()));
+    __ CmpS64(r2, r3);
     BranchOrBacktrack(le, on_outside_input);
   }
 }
@@ -1199,16 +1203,16 @@ void RegExpMacroAssemblerS390::SafeCall(Label* to, Condition cond,
 void RegExpMacroAssemblerS390::SafeReturn() {
   __ pop(r14);
   __ mov(ip, Operand(masm_->CodeObject()));
-  __ AddP(r14, ip);
+  __ AddS64(r14, ip);
   __ Ret();
 }
 
 void RegExpMacroAssemblerS390::SafeCallTarget(Label* name) {
   __ bind(name);
   __ CleanseP(r14);
-  __ LoadRR(r0, r14);
+  __ mov(r0, r14);
   __ mov(ip, Operand(masm_->CodeObject()));
-  __ SubP(r0, r0, ip);
+  __ SubS64(r0, r0, ip);
   __ push(r0);
 }
 
@@ -1216,12 +1220,12 @@ void RegExpMacroAssemblerS390::Push(Register source) {
   DCHECK(source != backtrack_stackpointer());
   __ lay(backtrack_stackpointer(),
          MemOperand(backtrack_stackpointer(), -kSystemPointerSize));
-  __ StoreP(source, MemOperand(backtrack_stackpointer()));
+  __ StoreU64(source, MemOperand(backtrack_stackpointer()));
 }
 
 void RegExpMacroAssemblerS390::Pop(Register target) {
   DCHECK(target != backtrack_stackpointer());
-  __ LoadP(target, MemOperand(backtrack_stackpointer()));
+  __ LoadU64(target, MemOperand(backtrack_stackpointer()));
   __ la(backtrack_stackpointer(),
         MemOperand(backtrack_stackpointer(), kSystemPointerSize));
 }
@@ -1231,7 +1235,7 @@ void RegExpMacroAssemblerS390::CheckPreemption() {
   ExternalReference stack_limit =
       ExternalReference::address_of_jslimit(isolate());
   __ mov(r2, Operand(stack_limit));
-  __ CmpLogicalP(sp, MemOperand(r2));
+  __ CmpU64(sp, MemOperand(r2));
   SafeCall(&check_preempt_label_, le);
 }
 
@@ -1239,7 +1243,7 @@ void RegExpMacroAssemblerS390::CheckStackLimit() {
   ExternalReference stack_limit =
       ExternalReference::address_of_regexp_stack_limit_address(isolate());
   __ mov(r2, Operand(stack_limit));
-  __ CmpLogicalP(backtrack_stackpointer(), MemOperand(r2));
+  __ CmpU64(backtrack_stackpointer(), MemOperand(r2));
   SafeCall(&stack_overflow_label_, le);
 }
 
@@ -1250,11 +1254,11 @@ void RegExpMacroAssemblerS390::CallCFunctionUsingStub(
   __ mov(code_pointer(), Operand(function));
   Label ret;
   __ larl(r14, &ret);
-  __ StoreP(r14, MemOperand(sp, kStackFrameRASlot * kSystemPointerSize));
+  __ StoreU64(r14, MemOperand(sp, kStackFrameRASlot * kSystemPointerSize));
   __ b(code_pointer());
   __ bind(&ret);
   if (base::OS::ActivationFrameAlignment() > kSystemPointerSize) {
-    __ LoadP(
+    __ LoadU64(
         sp, MemOperand(sp, (kNumRequiredStackFrameSlots * kSystemPointerSize)));
   } else {
     __ la(sp,
@@ -1270,7 +1274,7 @@ void RegExpMacroAssemblerS390::LoadCurrentCharacterUnchecked(int cp_offset,
     // using load reverse for big-endian platforms
     if (characters == 4) {
 #if V8_TARGET_LITTLE_ENDIAN
-      __ LoadlW(current_character(),
+      __ LoadU32(current_character(),
                 MemOperand(current_input_offset(), end_of_input_address(),
                            cp_offset * char_size()));
 #else
@@ -1280,7 +1284,7 @@ void RegExpMacroAssemblerS390::LoadCurrentCharacterUnchecked(int cp_offset,
 #endif
     } else if (characters == 2) {
 #if V8_TARGET_LITTLE_ENDIAN
-      __ LoadLogicalHalfWordP(current_character(),
+      __ LoadU16(current_character(),
                 MemOperand(current_input_offset(), end_of_input_address(),
                            cp_offset * char_size()));
 #else
@@ -1290,14 +1294,14 @@ void RegExpMacroAssemblerS390::LoadCurrentCharacterUnchecked(int cp_offset,
 #endif
     } else {
       DCHECK_EQ(1, characters);
-      __ LoadlB(current_character(),
+      __ LoadU8(current_character(),
                 MemOperand(current_input_offset(), end_of_input_address(),
                            cp_offset * char_size()));
     }
   } else {
     DCHECK(mode_ == UC16);
     if (characters == 2) {
-      __ LoadlW(current_character(),
+      __ LoadU32(current_character(),
                 MemOperand(current_input_offset(), end_of_input_address(),
                            cp_offset * char_size()));
 #if !V8_TARGET_LITTLE_ENDIAN
@@ -1306,7 +1310,7 @@ void RegExpMacroAssemblerS390::LoadCurrentCharacterUnchecked(int cp_offset,
 #endif
     } else {
       DCHECK_EQ(1, characters);
-      __ LoadLogicalHalfWordP(
+      __ LoadU16(
           current_character(),
                 MemOperand(current_input_offset(), end_of_input_address(),
                            cp_offset * char_size()));
diff --git a/deps/v8/src/roots/roots.h b/deps/v8/src/roots/roots.h
index 744176e35e1019..28531ee5793a66 100644
--- a/deps/v8/src/roots/roots.h
+++ b/deps/v8/src/roots/roots.h
@@ -109,10 +109,6 @@ class Symbol;
   V(Map, small_ordered_name_dictionary_map, SmallOrderedNameDictionaryMap)     \
   V(Map, source_text_module_map, SourceTextModuleMap)                          \
   V(Map, synthetic_module_map, SyntheticModuleMap)                             \
-  V(Map, uncompiled_data_without_preparse_data_map,                            \
-    UncompiledDataWithoutPreparseDataMap)                                      \
-  V(Map, uncompiled_data_with_preparse_data_map,                               \
-    UncompiledDataWithPreparseDataMap)                                         \
   V(Map, wasm_type_info_map, WasmTypeInfoMap)                                  \
   V(Map, weak_fixed_array_map, WeakFixedArrayMap)                              \
   V(Map, weak_array_list_map, WeakArrayListMap)                                \
@@ -133,10 +129,6 @@ class Symbol;
   V(Map, external_internalized_string_map, ExternalInternalizedStringMap)      \
   V(Map, external_one_byte_internalized_string_map,                            \
     ExternalOneByteInternalizedStringMap)                                      \
-  V(Map, uncached_external_internalized_string_map,                            \
-    UncachedExternalInternalizedStringMap)                                     \
-  V(Map, uncached_external_one_byte_internalized_string_map,                   \
-    UncachedExternalOneByteInternalizedStringMap)                              \
   V(Map, uncached_external_one_byte_string_map,                                \
     UncachedExternalOneByteStringMap)                                          \
   /* Oddball maps */                                                           \
@@ -209,6 +201,7 @@ class Symbol;
   V(Map, wasm_rttcanon_externref_map, WasmRttExternrefMap)                     \
   V(Map, wasm_rttcanon_funcref_map, WasmRttFuncrefMap)                         \
   V(Map, wasm_rttcanon_i31ref_map, WasmRttI31refMap)                           \
+  V(Map, wasm_rttcanon_anyref_map, WasmRttAnyrefMap)                           \
   /* Canonical empty values */                                                 \
   V(Script, empty_script, EmptyScript)                                         \
   V(FeedbackCell, many_closures_cell, ManyClosuresCell)                        \
diff --git a/deps/v8/src/runtime/runtime-classes.cc b/deps/v8/src/runtime/runtime-classes.cc
index fa647b2c04165c..3e9b9bfd098c43 100644
--- a/deps/v8/src/runtime/runtime-classes.cc
+++ b/deps/v8/src/runtime/runtime-classes.cc
@@ -7,6 +7,7 @@
 #include <limits>
 
 #include "src/builtins/accessors.h"
+#include "src/common/globals.h"
 #include "src/common/message-template.h"
 #include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
@@ -120,10 +121,9 @@ RUNTIME_FUNCTION(Runtime_HomeObjectSymbol) {
 namespace {
 
 template <typename Dictionary>
-Handle<Name> KeyToName(Isolate* isolate, Handle<Object> key);
-
-template <>
-Handle<Name> KeyToName<NameDictionary>(Isolate* isolate, Handle<Object> key) {
+Handle<Name> KeyToName(Isolate* isolate, Handle<Object> key) {
+  STATIC_ASSERT((std::is_same<Dictionary, OrderedNameDictionary>::value ||
+                 std::is_same<Dictionary, NameDictionary>::value));
   DCHECK(key->IsName());
   return Handle<Name>::cast(key);
 }
@@ -200,7 +200,7 @@ Object GetMethodWithSharedNameAndSetHomeObject(
     Isolate* isolate,
     RuntimeArguments& args,  // NOLINT(runtime/references)
     Object index, JSObject home_object) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int int_index = Smi::ToInt(index);
 
   // Class constructor and prototype values do not require post processing.
@@ -291,12 +291,13 @@ bool SubstituteValues(Isolate* isolate, Handle<Dictionary> dictionary,
   return true;
 }
 
+template <typename Dictionary>
 void UpdateProtectors(Isolate* isolate, Handle<JSObject> receiver,
-                      Handle<NameDictionary> properties_dictionary) {
+                      Handle<Dictionary> properties_dictionary) {
   ReadOnlyRoots roots(isolate);
   for (InternalIndex i : properties_dictionary->IterateEntries()) {
     Object maybe_key = properties_dictionary->KeyAt(i);
-    if (!NameDictionary::IsKey(roots, maybe_key)) continue;
+    if (!Dictionary::IsKey(roots, maybe_key)) continue;
     Handle<Name> name(Name::cast(maybe_key), isolate);
     LookupIterator::UpdateProtector(isolate, receiver, name);
   }
@@ -351,7 +352,7 @@ bool AddDescriptorsByTemplate(
           isolate, handle(AccessorPair::cast(value), isolate));
       value = *pair;
     }
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     Name name = descriptors_template->GetKey(i);
     DCHECK(name.IsUniqueName());
     PropertyDetails details = descriptors_template->GetDetails(i);
@@ -421,9 +422,23 @@ bool AddDescriptorsByTemplate(
   return true;
 }
 
+// TODO(v8:7569): This is a workaround for the Handle vs MaybeHandle difference
+// in the return types of the different Add functions:
+// OrderedNameDictionary::Add returns MaybeHandle, NameDictionary::Add returns
+// Handle.
+template <typename T>
+Handle<T> ToHandle(Handle<T> h) {
+  return h;
+}
+template <typename T>
+Handle<T> ToHandle(MaybeHandle<T> h) {
+  return h.ToHandleChecked();
+}
+
+template <typename Dictionary>
 bool AddDescriptorsByTemplate(
     Isolate* isolate, Handle<Map> map,
-    Handle<NameDictionary> properties_dictionary_template,
+    Handle<Dictionary> properties_dictionary_template,
     Handle<NumberDictionary> elements_dictionary_template,
     Handle<FixedArray> computed_properties, Handle<JSObject> receiver,
     bool install_name_accessor,
@@ -431,7 +446,7 @@ bool AddDescriptorsByTemplate(
   int computed_properties_length = computed_properties->length();
 
   // Shallow-copy properties template.
-  Handle<NameDictionary> properties_dictionary =
+  Handle<Dictionary> properties_dictionary =
       ShallowCopyDictionaryTemplate(isolate, properties_dictionary_template);
   Handle<NumberDictionary> elements_dictionary =
       ShallowCopyDictionaryTemplate(isolate, elements_dictionary_template);
@@ -465,18 +480,17 @@ bool AddDescriptorsByTemplate(
   }
 
   // Replace all indices with proper methods.
-  if (!SubstituteValues<NameDictionary>(isolate, properties_dictionary,
-                                        receiver, args,
-                                        &install_name_accessor)) {
+  if (!SubstituteValues<Dictionary>(isolate, properties_dictionary, receiver,
+                                    args, &install_name_accessor)) {
     return false;
   }
   if (install_name_accessor) {
     PropertyAttributes attribs =
         static_cast<PropertyAttributes>(DONT_ENUM | READ_ONLY);
     PropertyDetails details(kAccessor, attribs, PropertyCellType::kNoCell);
-    Handle<NameDictionary> dict = NameDictionary::Add(
+    Handle<Dictionary> dict = ToHandle(Dictionary::Add(
         isolate, properties_dictionary, isolate->factory()->name_string(),
-        isolate->factory()->function_name_accessor(), details);
+        isolate->factory()->function_name_accessor(), details));
     CHECK_EQ(*dict, *properties_dictionary);
   }
 
@@ -530,23 +544,8 @@ bool InitClassPrototype(Isolate* isolate,
 
   Handle<Object> properties_template(
       class_boilerplate->instance_properties_template(), isolate);
-  if (properties_template->IsNameDictionary()) {
-    Handle<NameDictionary> properties_dictionary_template =
-        Handle<NameDictionary>::cast(properties_template);
 
-    map->set_is_dictionary_map(true);
-    map->set_is_migration_target(false);
-    map->set_may_have_interesting_symbols(true);
-    map->set_construction_counter(Map::kNoSlackTracking);
-
-    // Class prototypes do not have a name accessor.
-    const bool install_name_accessor = false;
-
-    return AddDescriptorsByTemplate(
-        isolate, map, properties_dictionary_template,
-        elements_dictionary_template, computed_properties, prototype,
-        install_name_accessor, args);
-  } else {
+  if (properties_template->IsDescriptorArray()) {
     Handle<DescriptorArray> descriptors_template =
         Handle<DescriptorArray>::cast(properties_template);
 
@@ -556,6 +555,30 @@ bool InitClassPrototype(Isolate* isolate,
     return AddDescriptorsByTemplate(isolate, map, descriptors_template,
                                     elements_dictionary_template, prototype,
                                     args);
+  } else {
+    map->set_is_dictionary_map(true);
+    map->set_is_migration_target(false);
+    map->set_may_have_interesting_symbols(true);
+    map->set_construction_counter(Map::kNoSlackTracking);
+
+    // Class prototypes do not have a name accessor.
+    const bool install_name_accessor = false;
+
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      Handle<OrderedNameDictionary> properties_dictionary_template =
+          Handle<OrderedNameDictionary>::cast(properties_template);
+      return AddDescriptorsByTemplate(
+          isolate, map, properties_dictionary_template,
+          elements_dictionary_template, computed_properties, prototype,
+          install_name_accessor, args);
+    } else {
+      Handle<NameDictionary> properties_dictionary_template =
+          Handle<NameDictionary>::cast(properties_template);
+      return AddDescriptorsByTemplate(
+          isolate, map, properties_dictionary_template,
+          elements_dictionary_template, computed_properties, prototype,
+          install_name_accessor, args);
+    }
   }
 }
 
@@ -582,10 +605,14 @@ bool InitClassConstructor(
   Handle<Object> properties_template(
       class_boilerplate->static_properties_template(), isolate);
 
-  if (properties_template->IsNameDictionary()) {
-    Handle<NameDictionary> properties_dictionary_template =
-        Handle<NameDictionary>::cast(properties_template);
+  if (properties_template->IsDescriptorArray()) {
+    Handle<DescriptorArray> descriptors_template =
+        Handle<DescriptorArray>::cast(properties_template);
 
+    return AddDescriptorsByTemplate(isolate, map, descriptors_template,
+                                    elements_dictionary_template, constructor,
+                                    args);
+  } else {
     map->set_is_dictionary_map(true);
     map->InitializeDescriptors(isolate,
                                ReadOnlyRoots(isolate).empty_descriptor_array(),
@@ -597,17 +624,22 @@ bool InitClassConstructor(
     // All class constructors have a name accessor.
     const bool install_name_accessor = true;
 
-    return AddDescriptorsByTemplate(
-        isolate, map, properties_dictionary_template,
-        elements_dictionary_template, computed_properties, constructor,
-        install_name_accessor, args);
-  } else {
-    Handle<DescriptorArray> descriptors_template =
-        Handle<DescriptorArray>::cast(properties_template);
+    if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+      Handle<OrderedNameDictionary> properties_dictionary_template =
+          Handle<OrderedNameDictionary>::cast(properties_template);
 
-    return AddDescriptorsByTemplate(isolate, map, descriptors_template,
-                                    elements_dictionary_template, constructor,
-                                    args);
+      return AddDescriptorsByTemplate(
+          isolate, map, properties_dictionary_template,
+          elements_dictionary_template, computed_properties, constructor,
+          install_name_accessor, args);
+    } else {
+      Handle<NameDictionary> properties_dictionary_template =
+          Handle<NameDictionary>::cast(properties_template);
+      return AddDescriptorsByTemplate(
+          isolate, map, properties_dictionary_template,
+          elements_dictionary_template, computed_properties, constructor,
+          install_name_accessor, args);
+    }
   }
 }
 
@@ -668,7 +700,8 @@ MaybeHandle<Object> DefineClass(
     LOG(isolate,
         MapEvent("InitialMap", empty_map, handle(constructor->map(), isolate),
                  "init class constructor",
-                 handle(constructor->shared().DebugName(), isolate)));
+                 SharedFunctionInfo::DebugName(
+                     handle(constructor->shared(), isolate))));
     LOG(isolate,
         MapEvent("InitialMap", empty_map, handle(prototype->map(), isolate),
                  "init class prototype"));
diff --git a/deps/v8/src/runtime/runtime-compiler.cc b/deps/v8/src/runtime/runtime-compiler.cc
index 898279cdb6b8dc..5377e80548e0cd 100644
--- a/deps/v8/src/runtime/runtime-compiler.cc
+++ b/deps/v8/src/runtime/runtime-compiler.cc
@@ -21,43 +21,6 @@
 namespace v8 {
 namespace internal {
 
-RUNTIME_FUNCTION(Runtime_CompileLazy) {
-  HandleScope scope(isolate);
-  DCHECK_EQ(1, args.length());
-  CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
-
-  Handle<SharedFunctionInfo> sfi(function->shared(), isolate);
-
-#ifdef DEBUG
-  if (FLAG_trace_lazy && !sfi->is_compiled()) {
-    PrintF("[unoptimized: ");
-    function->PrintName();
-    PrintF("]\n");
-  }
-#endif
-
-  StackLimitCheck check(isolate);
-  if (check.JsHasOverflowed(kStackSpaceRequiredForCompilation * KB)) {
-    return isolate->StackOverflow();
-  }
-  IsCompiledScope is_compiled_scope;
-  if (!Compiler::Compile(function, Compiler::KEEP_EXCEPTION,
-                         &is_compiled_scope)) {
-    return ReadOnlyRoots(isolate).exception();
-  }
-  if (sfi->may_have_cached_code()) {
-    Handle<Code> code;
-    if (sfi->TryGetCachedCode(isolate).ToHandle(&code)) {
-      function->set_code(*code);
-      JSFunction::EnsureFeedbackVector(function, &is_compiled_scope);
-      if (FLAG_trace_turbo_nci) CompilationCacheCode::TraceHit(sfi, code);
-      return *code;
-    }
-  }
-  DCHECK(function->is_compiled());
-  return function->code();
-}
-
 namespace {
 
 // Returns false iff an exception was thrown.
@@ -102,12 +65,73 @@ Object CompileOptimized(Isolate* isolate, Handle<JSFunction> function,
     return ReadOnlyRoots(isolate).exception();
   }
 
+  // As a post-condition of CompileOptimized, the function *must* be compiled,
+  // i.e. the installed Code object must not be the CompileLazy builtin.
   DCHECK(function->is_compiled());
   return function->code();
 }
 
+void TryInstallNCICode(Isolate* isolate, Handle<JSFunction> function,
+                       Handle<SharedFunctionInfo> sfi,
+                       IsCompiledScope* is_compiled_scope) {
+  // This function should only be called if there's a possibility that cached
+  // code exists.
+  DCHECK(sfi->may_have_cached_code());
+  DCHECK_EQ(function->shared(), *sfi);
+
+  Handle<Code> code;
+  if (sfi->TryGetCachedCode(isolate).ToHandle(&code)) {
+    function->set_code(*code);
+    JSFunction::EnsureFeedbackVector(function, is_compiled_scope);
+    if (FLAG_trace_turbo_nci) CompilationCacheCode::TraceHit(sfi, code);
+  }
+}
+
 }  // namespace
 
+RUNTIME_FUNCTION(Runtime_CompileLazy) {
+  HandleScope scope(isolate);
+  DCHECK_EQ(1, args.length());
+  CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+
+  Handle<SharedFunctionInfo> sfi(function->shared(), isolate);
+
+#ifdef DEBUG
+  if (FLAG_trace_lazy && !sfi->is_compiled()) {
+    PrintF("[unoptimized: ");
+    function->PrintName();
+    PrintF("]\n");
+  }
+#endif
+
+  StackLimitCheck check(isolate);
+  if (check.JsHasOverflowed(kStackSpaceRequiredForCompilation * KB)) {
+    return isolate->StackOverflow();
+  }
+  IsCompiledScope is_compiled_scope;
+  if (!Compiler::Compile(function, Compiler::KEEP_EXCEPTION,
+                         &is_compiled_scope)) {
+    return ReadOnlyRoots(isolate).exception();
+  }
+  if (sfi->may_have_cached_code()) {
+    TryInstallNCICode(isolate, function, sfi, &is_compiled_scope);
+  }
+  DCHECK(function->is_compiled());
+  return function->code();
+}
+
+RUNTIME_FUNCTION(Runtime_TryInstallNCICode) {
+  HandleScope scope(isolate);
+  DCHECK_EQ(1, args.length());
+  CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+  DCHECK(function->is_compiled());
+  Handle<SharedFunctionInfo> sfi(function->shared(), isolate);
+  IsCompiledScope is_compiled_scope(*sfi, isolate);
+  TryInstallNCICode(isolate, function, sfi, &is_compiled_scope);
+  DCHECK(function->is_compiled());
+  return function->code();
+}
+
 RUNTIME_FUNCTION(Runtime_CompileOptimized_Concurrent) {
   HandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
@@ -132,9 +156,10 @@ RUNTIME_FUNCTION(Runtime_FunctionFirstExecution) {
             OptimizationMarker::kLogFirstExecution);
   DCHECK(FLAG_log_function_events);
   Handle<SharedFunctionInfo> sfi(function->shared(), isolate);
-  LOG(isolate, FunctionEvent(
-                   "first-execution", Script::cast(sfi->script()).id(), 0,
-                   sfi->StartPosition(), sfi->EndPosition(), sfi->DebugName()));
+  Handle<String> name = SharedFunctionInfo::DebugName(sfi);
+  LOG(isolate,
+      FunctionEvent("first-execution", Script::cast(sfi->script()).id(), 0,
+                    sfi->StartPosition(), sfi->EndPosition(), *name));
   function->feedback_vector().ClearOptimizationMarker();
   // Return the code to continue execution, we don't care at this point whether
   // this is for lazy compilation or has been eagerly complied.
@@ -194,7 +219,6 @@ RUNTIME_FUNCTION(Runtime_NotifyDeoptimized) {
   Deoptimizer* deoptimizer = Deoptimizer::Grab(isolate);
   DCHECK(CodeKindCanDeoptimize(deoptimizer->compiled_code()->kind()));
   DCHECK(deoptimizer->compiled_code()->is_turbofanned());
-  DCHECK(AllowHeapAllocation::IsAllowed());
   DCHECK(AllowGarbageCollection::IsAllowed());
   DCHECK(isolate->context().is_null());
 
@@ -311,7 +335,7 @@ RUNTIME_FUNCTION(Runtime_CompileForOnStackReplacement) {
 
     // Possibly compile for NCI caching.
     if (!MaybeSpawnNativeContextIndependentCompilationJob(
-            function, FLAG_concurrent_recompilation
+            function, isolate->concurrent_recompilation_enabled()
                           ? ConcurrencyMode::kConcurrent
                           : ConcurrencyMode::kNotConcurrent)) {
       return Object();
diff --git a/deps/v8/src/runtime/runtime-debug.cc b/deps/v8/src/runtime/runtime-debug.cc
index 175e81829cf5cb..ce91550684452a 100644
--- a/deps/v8/src/runtime/runtime-debug.cc
+++ b/deps/v8/src/runtime/runtime-debug.cc
@@ -77,7 +77,7 @@ RUNTIME_FUNCTION_RETURN_PAIR(Runtime_DebugBreakOnBytecode) {
   // Make sure to only access these objects after the side effect check, as the
   // check can allocate on failure.
   SharedFunctionInfo shared = interpreted_frame->function().shared();
-  BytecodeArray bytecode_array = shared.GetBytecodeArray();
+  BytecodeArray bytecode_array = shared.GetBytecodeArray(isolate);
   int bytecode_offset = interpreted_frame->GetBytecodeOffset();
   Bytecode bytecode = Bytecodes::FromByte(bytecode_array.get(bytecode_offset));
 
@@ -306,13 +306,79 @@ MaybeHandle<JSArray> Runtime::GetInternalProperties(Isolate* isolate,
     return factory->NewJSArrayWithElements(result);
   } else if (object->IsJSArrayBuffer()) {
     Handle<JSArrayBuffer> js_array_buffer = Handle<JSArrayBuffer>::cast(object);
-    Handle<FixedArray> result = factory->NewFixedArray(1 * 2);
-
-    Handle<String> is_detached_str =
-        factory->NewStringFromAsciiChecked("[[IsDetached]]");
-    result->set(0, *is_detached_str);
-    result->set(1, isolate->heap()->ToBoolean(js_array_buffer->was_detached()));
-    return factory->NewJSArrayWithElements(result);
+    if (js_array_buffer->was_detached()) {
+      // Mark a detached JSArrayBuffer and such and don't even try to
+      // create views for it, since the TypedArray constructors will
+      // throw a TypeError when the underlying buffer is detached.
+      Handle<FixedArray> result = factory->NewFixedArray(1 * 2);
+      Handle<String> is_detached_str =
+          factory->NewStringFromAsciiChecked("[[IsDetached]]");
+      result->set(0, *is_detached_str);
+      result->set(1, isolate->heap()->ToBoolean(true));
+      return factory->NewJSArrayWithElements(result, PACKED_ELEMENTS);
+    }
+    const size_t byte_length = js_array_buffer->byte_length();
+    static const ExternalArrayType kTypes[] = {
+        kExternalInt8Array,
+        kExternalUint8Array,
+        kExternalInt16Array,
+        kExternalInt32Array,
+    };
+    Handle<FixedArray> result =
+        factory->NewFixedArray((2 + arraysize(kTypes)) * 2);
+    int index = 0;
+    for (auto type : kTypes) {
+      switch (type) {
+#define TYPED_ARRAY_CASE(Type, type, TYPE, ctype)                            \
+  case kExternal##Type##Array: {                                             \
+    if ((byte_length % sizeof(ctype)) != 0) continue;                        \
+    Handle<String> typed_array_str =                                         \
+        factory->NewStringFromStaticChars("[[" #Type "Array]]");             \
+    Handle<JSTypedArray> js_typed_array =                                    \
+        factory->NewJSTypedArray(kExternal##Type##Array, js_array_buffer, 0, \
+                                 byte_length / sizeof(ctype));               \
+    result->set(index++, *typed_array_str);                                  \
+    result->set(index++, *js_typed_array);                                   \
+    break;                                                                   \
+  }
+        TYPED_ARRAYS(TYPED_ARRAY_CASE)
+#undef TYPED_ARRAY_CASE
+        default:
+          UNREACHABLE();
+      }
+    }
+    Handle<String> byte_length_str =
+        factory->NewStringFromAsciiChecked("[[ArrayBufferByteLength]]");
+    result->set(index++, *byte_length_str);
+    Handle<Object> byte_length_obj = factory->NewNumberFromSize(byte_length);
+    result->set(index++, *byte_length_obj);
+    Handle<String> buffer_data_str =
+        factory->NewStringFromAsciiChecked("[[ArrayBufferData]]");
+    result->set(index++, *buffer_data_str);
+    // Use the backing store pointer as a unique ID
+    EmbeddedVector<char, 32> buffer_data_vec;
+    int len =
+        SNPrintF(buffer_data_vec, V8PRIxPTR_FMT,
+                 reinterpret_cast<Address>(js_array_buffer->backing_store()));
+    Handle<String> buffer_id =
+        factory->InternalizeUtf8String(buffer_data_vec.SubVector(0, len));
+    result->set(index++, *buffer_id);
+
+    return factory->NewJSArrayWithElements(result, PACKED_ELEMENTS, index);
+  } else if (object->IsWasmModuleObject()) {
+    auto module_object = Handle<WasmModuleObject>::cast(object);
+    Handle<FixedArray> result = factory->NewFixedArray(2 * 2);
+    Handle<String> exports_str =
+        factory->NewStringFromStaticChars("[[Exports]]");
+    Handle<JSArray> exports_obj = wasm::GetExports(isolate, module_object);
+    result->set(0, *exports_str);
+    result->set(1, *exports_obj);
+    Handle<String> imports_str =
+        factory->NewStringFromStaticChars("[[Imports]]");
+    Handle<JSArray> imports_obj = wasm::GetImports(isolate, module_object);
+    result->set(2, *imports_str);
+    result->set(3, *imports_obj);
+    return factory->NewJSArrayWithElements(result, PACKED_ELEMENTS);
   }
   return factory->NewJSArray(0);
 }
@@ -486,18 +552,6 @@ RUNTIME_FUNCTION(Runtime_CollectGarbage) {
   return ReadOnlyRoots(isolate).undefined_value();
 }
 
-
-// Gets the current heap usage.
-RUNTIME_FUNCTION(Runtime_GetHeapUsage) {
-  SealHandleScope shs(isolate);
-  DCHECK_EQ(0, args.length());
-  int usage = static_cast<int>(isolate->heap()->SizeOfObjects());
-  if (!Smi::IsValid(usage)) {
-    return *isolate->factory()->NewNumberFromInt(usage);
-  }
-  return Smi::FromInt(usage);
-}
-
 namespace {
 
 int ScriptLinePosition(Handle<Script> script, int line) {
@@ -543,11 +597,12 @@ Handle<Object> GetJSPositionInfo(Handle<Script> script, int position,
     return isolate->factory()->null_value();
   }
 
-  Handle<String> source = handle(String::cast(script->source()), isolate);
-  Handle<String> sourceText = script->type() == Script::TYPE_WASM
-                                  ? isolate->factory()->empty_string()
-                                  : isolate->factory()->NewSubString(
-                                        source, info.line_start, info.line_end);
+  Handle<String> sourceText =
+      script->type() == Script::TYPE_WASM
+          ? isolate->factory()->empty_string()
+          : isolate->factory()->NewSubString(
+                handle(String::cast(script->source()), isolate),
+                info.line_start, info.line_end);
 
   Handle<JSObject> jsinfo =
       isolate->factory()->NewJSObject(isolate->object_function());
diff --git a/deps/v8/src/runtime/runtime-generator.cc b/deps/v8/src/runtime/runtime-generator.cc
index 7225e430123f16..a67a6f09c69e3d 100644
--- a/deps/v8/src/runtime/runtime-generator.cc
+++ b/deps/v8/src/runtime/runtime-generator.cc
@@ -55,7 +55,7 @@ RUNTIME_FUNCTION(Runtime_CreateJSGeneratorObject) {
   // Underlying function needs to have bytecode available.
   DCHECK(function->shared().HasBytecodeArray());
   int size = function->shared().internal_formal_parameter_count() +
-             function->shared().GetBytecodeArray().register_count();
+             function->shared().GetBytecodeArray(isolate).register_count();
   Handle<FixedArray> parameters_and_registers =
       isolate->factory()->NewFixedArray(size);
 
@@ -126,7 +126,7 @@ RUNTIME_FUNCTION(Runtime_GeneratorGetResumeMode) {
 // Return true if {generator}'s PC has a catch handler. This allows
 // catch prediction to happen from the AsyncGeneratorResumeNext stub.
 RUNTIME_FUNCTION(Runtime_AsyncGeneratorHasCatchHandlerForPC) {
-  DisallowHeapAllocation no_allocation_scope;
+  DisallowGarbageCollection no_gc_scope;
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_CHECKED(JSAsyncGeneratorObject, generator, 0);
 
@@ -140,7 +140,7 @@ RUNTIME_FUNCTION(Runtime_AsyncGeneratorHasCatchHandlerForPC) {
 
   SharedFunctionInfo shared = generator.function().shared();
   DCHECK(shared.HasBytecodeArray());
-  HandlerTable handler_table(shared.GetBytecodeArray());
+  HandlerTable handler_table(shared.GetBytecodeArray(isolate));
 
   int pc = Smi::cast(generator.input_or_debug_pos()).value();
   HandlerTable::CatchPrediction catch_prediction = HandlerTable::ASYNC_AWAIT;
diff --git a/deps/v8/src/runtime/runtime-internal.cc b/deps/v8/src/runtime/runtime-internal.cc
index ce58c9bce5f92f..e51085c00e7ff4 100644
--- a/deps/v8/src/runtime/runtime-internal.cc
+++ b/deps/v8/src/runtime/runtime-internal.cc
@@ -526,7 +526,7 @@ RUNTIME_FUNCTION(Runtime_GetAndResetRuntimeCallStats) {
     if (args[0].IsString()) {
       // With a string argument, the results are appended to that file.
       CONVERT_ARG_HANDLE_CHECKED(String, arg0, 0);
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       String::FlatContent flat = arg0->GetFlatContent(no_gc);
       const char* filename =
           reinterpret_cast<const char*>(&(flat.ToOneByteVector()[0]));
diff --git a/deps/v8/src/runtime/runtime-literals.cc b/deps/v8/src/runtime/runtime-literals.cc
index 3a9075fc7d4c63..dfe738cdba7b93 100644
--- a/deps/v8/src/runtime/runtime-literals.cc
+++ b/deps/v8/src/runtime/runtime-literals.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "src/ast/ast.h"
+#include "src/common/globals.h"
 #include "src/execution/arguments-inl.h"
 #include "src/execution/isolate-inl.h"
 #include "src/logging/counters.h"
@@ -133,15 +134,30 @@ MaybeHandle<JSObject> JSObjectWalkVisitor<ContextObject>::StructureWalk(
         }
       }
     } else {
-      Handle<NameDictionary> dict(copy->property_dictionary(isolate), isolate);
-      for (InternalIndex i : dict->IterateEntries()) {
-        Object raw = dict->ValueAt(isolate, i);
-        if (!raw.IsJSObject(isolate)) continue;
-        DCHECK(dict->KeyAt(isolate, i).IsName());
-        Handle<JSObject> value(JSObject::cast(raw), isolate);
-        ASSIGN_RETURN_ON_EXCEPTION(
-            isolate, value, VisitElementOrProperty(copy, value), JSObject);
-        if (copying) dict->ValueAtPut(i, *value);
+      if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+        Handle<OrderedNameDictionary> dict(
+            copy->property_dictionary_ordered(isolate), isolate);
+        for (InternalIndex i : dict->IterateEntries()) {
+          Object raw = dict->ValueAt(i);
+          if (!raw.IsJSObject(isolate)) continue;
+          DCHECK(dict->KeyAt(i).IsName());
+          Handle<JSObject> value(JSObject::cast(raw), isolate);
+          ASSIGN_RETURN_ON_EXCEPTION(
+              isolate, value, VisitElementOrProperty(copy, value), JSObject);
+          if (copying) dict->ValueAtPut(i, *value);
+        }
+      } else {
+        Handle<NameDictionary> dict(copy->property_dictionary(isolate),
+                                    isolate);
+        for (InternalIndex i : dict->IterateEntries()) {
+          Object raw = dict->ValueAt(isolate, i);
+          if (!raw.IsJSObject(isolate)) continue;
+          DCHECK(dict->KeyAt(isolate, i).IsName());
+          Handle<JSObject> value(JSObject::cast(raw), isolate);
+          ASSIGN_RETURN_ON_EXCEPTION(
+              isolate, value, VisitElementOrProperty(copy, value), JSObject);
+          if (copying) dict->ValueAtPut(i, *value);
+        }
       }
     }
 
diff --git a/deps/v8/src/runtime/runtime-object.cc b/deps/v8/src/runtime/runtime-object.cc
index 993adf47dd7d72..2bb98e674cd29a 100644
--- a/deps/v8/src/runtime/runtime-object.cc
+++ b/deps/v8/src/runtime/runtime-object.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "src/ast/prettyprinter.h"
+#include "src/common/globals.h"
 #include "src/common/message-template.h"
 #include "src/debug/debug.h"
 #include "src/execution/arguments-inl.h"
@@ -147,12 +148,12 @@ bool DeleteObjectPropertyFast(Isolate* isolate, Handle<JSReceiver> receiver,
   // Zap the property to avoid keeping objects alive. Zapping is not necessary
   // for properties stored in the descriptor array.
   if (details.location() == kField) {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
 
     // Invalidate slots manually later in case we delete an in-object tagged
     // property. In this case we might later store an untagged value in the
     // recorded slot.
-    isolate->heap()->NotifyObjectLayoutChange(*receiver, no_allocation,
+    isolate->heap()->NotifyObjectLayoutChange(*receiver, no_gc,
                                               InvalidateRecordedSlots::kNo);
     FieldIndex index =
         FieldIndex::ForPropertyIndex(*receiver_map, details.field_index());
@@ -365,11 +366,21 @@ RUNTIME_FUNCTION(Runtime_AddDictionaryProperty) {
 
   DCHECK(name->IsUniqueName());
 
-  Handle<NameDictionary> dictionary(receiver->property_dictionary(), isolate);
   PropertyDetails property_details(kData, NONE, PropertyCellType::kNoCell);
-  dictionary =
-      NameDictionary::Add(isolate, dictionary, name, value, property_details);
-  receiver->SetProperties(*dictionary);
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    Handle<OrderedNameDictionary> dictionary(
+        receiver->property_dictionary_ordered(), isolate);
+    dictionary = OrderedNameDictionary::Add(isolate, dictionary, name, value,
+                                            property_details)
+                     .ToHandleChecked();
+    receiver->SetProperties(*dictionary);
+  } else {
+    Handle<NameDictionary> dictionary(receiver->property_dictionary(), isolate);
+    dictionary =
+        NameDictionary::Add(isolate, dictionary, name, value, property_details);
+    receiver->SetProperties(*dictionary);
+  }
+
   return *value;
 }
 
@@ -620,11 +631,11 @@ RUNTIME_FUNCTION(Runtime_GetProperty) {
       Handle<Name> key = Handle<Name>::cast(key_obj);
       key_obj = key = isolate->factory()->InternalizeName(key);
 
-      DisallowHeapAllocation no_allocation;
+      DisallowGarbageCollection no_gc;
       if (holder->IsJSGlobalObject()) {
         // Attempt dictionary lookup.
         GlobalDictionary dictionary =
-            JSGlobalObject::cast(*holder).global_dictionary();
+            JSGlobalObject::cast(*holder).global_dictionary(kAcquireLoad);
         InternalIndex entry = dictionary.FindEntry(isolate, key);
         if (entry.is_found()) {
           PropertyCell cell = dictionary.CellAt(entry);
@@ -636,11 +647,21 @@ RUNTIME_FUNCTION(Runtime_GetProperty) {
         }
       } else if (!holder->HasFastProperties()) {
         // Attempt dictionary lookup.
-        NameDictionary dictionary = holder->property_dictionary();
-        InternalIndex entry = dictionary.FindEntry(isolate, key);
-        if ((entry.is_found()) &&
-            (dictionary.DetailsAt(entry).kind() == kData)) {
-          return dictionary.ValueAt(entry);
+        if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+          OrderedNameDictionary dictionary =
+              holder->property_dictionary_ordered();
+          InternalIndex entry = dictionary.FindEntry(isolate, *key);
+          if (entry.is_found() &&
+              (dictionary.DetailsAt(entry).kind() == kData)) {
+            return dictionary.ValueAt(entry);
+          }
+        } else {
+          NameDictionary dictionary = holder->property_dictionary();
+          InternalIndex entry = dictionary.FindEntry(isolate, key);
+          if ((entry.is_found()) &&
+              (dictionary.DetailsAt(entry).kind() == kData)) {
+            return dictionary.ValueAt(entry);
+          }
         }
       }
     } else if (key_obj->IsSmi()) {
@@ -760,10 +781,19 @@ RUNTIME_FUNCTION(Runtime_ShrinkPropertyDictionary) {
   HandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSReceiver, receiver, 0);
-  Handle<NameDictionary> dictionary(receiver->property_dictionary(), isolate);
-  Handle<NameDictionary> new_properties =
-      NameDictionary::Shrink(isolate, dictionary);
-  receiver->SetProperties(*new_properties);
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    Handle<OrderedNameDictionary> dictionary(
+        receiver->property_dictionary_ordered(), isolate);
+    Handle<OrderedNameDictionary> new_properties =
+        OrderedNameDictionary::Shrink(isolate, dictionary);
+    receiver->SetProperties(*new_properties);
+  } else {
+    Handle<NameDictionary> dictionary(receiver->property_dictionary(), isolate);
+    Handle<NameDictionary> new_properties =
+        NameDictionary::Shrink(isolate, dictionary);
+    receiver->SetProperties(*new_properties);
+  }
+
   return Smi::zero();
 }
 
@@ -846,7 +876,7 @@ RUNTIME_FUNCTION(Runtime_GetDerivedMap) {
 }
 
 RUNTIME_FUNCTION(Runtime_CompleteInobjectSlackTrackingForMap) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   HandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
 
@@ -1039,7 +1069,9 @@ RUNTIME_FUNCTION(Runtime_SetDataProperties) {
     return ReadOnlyRoots(isolate).undefined_value();
   }
 
-  MAYBE_RETURN(JSReceiver::SetOrCopyDataProperties(isolate, target, source),
+  MAYBE_RETURN(JSReceiver::SetOrCopyDataProperties(
+                   isolate, target, source,
+                   PropertiesEnumerationMode::kEnumerationOrder),
                ReadOnlyRoots(isolate).exception());
   return ReadOnlyRoots(isolate).undefined_value();
 }
@@ -1055,9 +1087,11 @@ RUNTIME_FUNCTION(Runtime_CopyDataProperties) {
     return ReadOnlyRoots(isolate).undefined_value();
   }
 
-  MAYBE_RETURN(JSReceiver::SetOrCopyDataProperties(isolate, target, source,
-                                                   nullptr, false),
-               ReadOnlyRoots(isolate).exception());
+  MAYBE_RETURN(
+      JSReceiver::SetOrCopyDataProperties(
+          isolate, target, source,
+          PropertiesEnumerationMode::kPropertyAdditionOrder, nullptr, false),
+      ReadOnlyRoots(isolate).exception());
   return ReadOnlyRoots(isolate).undefined_value();
 }
 
@@ -1090,8 +1124,10 @@ RUNTIME_FUNCTION(Runtime_CopyDataPropertiesWithExcludedProperties) {
 
   Handle<JSObject> target =
       isolate->factory()->NewJSObject(isolate->object_function());
-  MAYBE_RETURN(JSReceiver::SetOrCopyDataProperties(isolate, target, source,
-                                                   &excluded_properties, false),
+  MAYBE_RETURN(JSReceiver::SetOrCopyDataProperties(
+                   isolate, target, source,
+                   PropertiesEnumerationMode::kPropertyAdditionOrder,
+                   &excluded_properties, false),
                ReadOnlyRoots(isolate).exception());
   return *target;
 }
diff --git a/deps/v8/src/runtime/runtime-promise.cc b/deps/v8/src/runtime/runtime-promise.cc
index dcc2c69013e0a7..c1ee96faccad09 100644
--- a/deps/v8/src/runtime/runtime-promise.cc
+++ b/deps/v8/src/runtime/runtime-promise.cc
@@ -259,7 +259,6 @@ RUNTIME_FUNCTION(Runtime_ResolvePromise) {
 // A helper function to be called when constructing AggregateError objects. This
 // takes care of the Error-related construction, e.g., stack traces.
 RUNTIME_FUNCTION(Runtime_ConstructAggregateErrorHelper) {
-  DCHECK(FLAG_harmony_promise_any);
   HandleScope scope(isolate);
   DCHECK_EQ(3, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSFunction, target, 0);
@@ -278,7 +277,6 @@ RUNTIME_FUNCTION(Runtime_ConstructAggregateErrorHelper) {
 // A helper function to be called when constructing AggregateError objects. This
 // takes care of the Error-related construction, e.g., stack traces.
 RUNTIME_FUNCTION(Runtime_ConstructInternalAggregateErrorHelper) {
-  DCHECK(FLAG_harmony_promise_any);
   HandleScope scope(isolate);
   DCHECK_GE(args.length(), 1);
   CONVERT_ARG_HANDLE_CHECKED(Smi, message, 0);
diff --git a/deps/v8/src/runtime/runtime-regexp.cc b/deps/v8/src/runtime/runtime-regexp.cc
index f6d76a1ecccb60..ec3a60dcfc5107 100644
--- a/deps/v8/src/runtime/runtime-regexp.cc
+++ b/deps/v8/src/runtime/runtime-regexp.cc
@@ -316,7 +316,7 @@ bool CompiledReplacement::Compile(Isolate* isolate, Handle<JSRegExp> regexp,
                                   Handle<String> replacement, int capture_count,
                                   int subject_length) {
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent content = replacement->GetFlatContent(no_gc);
     DCHECK(content.IsFlat());
 
@@ -454,7 +454,7 @@ void FindStringIndices(Isolate* isolate, Vector<const SubjectChar> subject,
 void FindStringIndicesDispatch(Isolate* isolate, String subject, String pattern,
                                std::vector<int>* indices, unsigned int limit) {
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent subject_content = subject.GetFlatContent(no_gc);
     String::FlatContent pattern_content = pattern.GetFlatContent(no_gc);
     DCHECK(subject_content.IsFlat());
@@ -570,7 +570,7 @@ V8_WARN_UNUSED_RESULT static Object StringReplaceGlobalAtomRegExpWithString(
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, untyped_res, maybe_res);
   Handle<ResultSeqString> result = Handle<ResultSeqString>::cast(untyped_res);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   for (int index : *indices) {
     // Copy non-matched subject content.
     if (subject_pos < index) {
@@ -728,7 +728,7 @@ V8_WARN_UNUSED_RESULT static Object StringReplaceGlobalRegExpWithEmptyString(
   int prev = 0;
   int position = 0;
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   do {
     start = current_match[0];
     end = current_match[1];
diff --git a/deps/v8/src/runtime/runtime-scopes.cc b/deps/v8/src/runtime/runtime-scopes.cc
index ed16900abf26af..275fd2f529a9b9 100644
--- a/deps/v8/src/runtime/runtime-scopes.cc
+++ b/deps/v8/src/runtime/runtime-scopes.cc
@@ -157,8 +157,9 @@ RUNTIME_FUNCTION(Runtime_DeclareModuleExports) {
       index = Smi::ToInt(declarations->get(++i));
       Handle<FeedbackCell> feedback_cell =
           closure_feedback_cell_array->GetFeedbackCell(feedback_index);
-      value = *isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          sfi, context, feedback_cell, AllocationType::kOld);
+      value = *Factory::JSFunctionBuilder(isolate, sfi, context)
+                   .set_feedback_cell(feedback_cell)
+                   .Build();
     }
 
     Cell::cast(exports->get(index - 1)).set_value(value);
@@ -204,8 +205,9 @@ RUNTIME_FUNCTION(Runtime_DeclareGlobals) {
       int index = Smi::ToInt(declarations->get(++i));
       Handle<FeedbackCell> feedback_cell =
           closure_feedback_cell_array->GetFeedbackCell(index);
-      value = isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          sfi, context, feedback_cell, AllocationType::kOld);
+      value = Factory::JSFunctionBuilder(isolate, sfi, context)
+                  .set_feedback_cell(feedback_cell)
+                  .Build();
     }
 
     // Compute the property attributes. According to ECMA-262,
@@ -412,7 +414,7 @@ Handle<JSObject> NewSloppyArguments(Isolate* isolate, Handle<JSFunction> callee,
   int parameter_count = callee->shared().internal_formal_parameter_count();
   if (argument_count > 0) {
     if (parameter_count > 0) {
-      int mapped_count = Min(argument_count, parameter_count);
+      int mapped_count = std::min(argument_count, parameter_count);
 
       // Store the context and the arguments array at the beginning of the
       // parameter map.
@@ -519,7 +521,7 @@ RUNTIME_FUNCTION(Runtime_NewStrictArguments) {
   if (argument_count) {
     Handle<FixedArray> array =
         isolate->factory()->NewUninitializedFixedArray(argument_count);
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     WriteBarrierMode mode = array->GetWriteBarrierMode(no_gc);
     for (int i = 0; i < argument_count; i++) {
       array->set(i, *arguments[i], mode);
@@ -545,7 +547,7 @@ RUNTIME_FUNCTION(Runtime_NewRestParameter) {
       PACKED_ELEMENTS, num_elements, num_elements,
       DONT_INITIALIZE_ARRAY_ELEMENTS);
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArray elements = FixedArray::cast(result->elements());
     WriteBarrierMode mode = elements.GetWriteBarrierMode(no_gc);
     for (int i = 0; i < num_elements; i++) {
@@ -561,10 +563,10 @@ RUNTIME_FUNCTION(Runtime_NewClosure) {
   CONVERT_ARG_HANDLE_CHECKED(SharedFunctionInfo, shared, 0);
   CONVERT_ARG_HANDLE_CHECKED(FeedbackCell, feedback_cell, 1);
   Handle<Context> context(isolate->context(), isolate);
-  Handle<JSFunction> function =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          shared, context, feedback_cell, AllocationType::kYoung);
-  return *function;
+  return *Factory::JSFunctionBuilder{isolate, shared, context}
+              .set_feedback_cell(feedback_cell)
+              .set_allocation_type(AllocationType::kYoung)
+              .Build();
 }
 
 RUNTIME_FUNCTION(Runtime_NewClosure_Tenured) {
@@ -575,10 +577,10 @@ RUNTIME_FUNCTION(Runtime_NewClosure_Tenured) {
   Handle<Context> context(isolate->context(), isolate);
   // The caller ensures that we pretenure closures that are assigned
   // directly to properties.
-  Handle<JSFunction> function =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          shared, context, feedback_cell, AllocationType::kOld);
-  return *function;
+  return *Factory::JSFunctionBuilder{isolate, shared, context}
+              .set_feedback_cell(feedback_cell)
+              .set_allocation_type(AllocationType::kOld)
+              .Build();
 }
 
 RUNTIME_FUNCTION(Runtime_NewFunctionContext) {
diff --git a/deps/v8/src/runtime/runtime-strings.cc b/deps/v8/src/runtime/runtime-strings.cc
index 992a9c19a23226..2e761c4bfcf21c 100644
--- a/deps/v8/src/runtime/runtime-strings.cc
+++ b/deps/v8/src/runtime/runtime-strings.cc
@@ -139,15 +139,6 @@ RUNTIME_FUNCTION(Runtime_StringReplaceOneCharWithString) {
   return isolate->StackOverflow();
 }
 
-RUNTIME_FUNCTION(Runtime_StringTrim) {
-  HandleScope scope(isolate);
-  DCHECK_EQ(2, args.length());
-  Handle<String> string = args.at<String>(0);
-  CONVERT_SMI_ARG_CHECKED(mode, 1);
-  String::TrimMode trim_mode = static_cast<String::TrimMode>(mode);
-  return *String::Trim(isolate, string, trim_mode);
-}
-
 // ES6 #sec-string.prototype.includes
 // String.prototype.includes(searchString [, position])
 RUNTIME_FUNCTION(Runtime_StringIncludes) {
@@ -300,7 +291,7 @@ RUNTIME_FUNCTION(Runtime_StringBuilderConcat) {
   bool one_byte = special->IsOneByteRepresentation();
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     FixedArray fixed_array = FixedArray::cast(array->elements());
     if (fixed_array.length() < array_length) {
       array_length = fixed_array.length();
@@ -327,7 +318,7 @@ RUNTIME_FUNCTION(Runtime_StringBuilderConcat) {
     Handle<SeqOneByteString> answer;
     ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
         isolate, answer, isolate->factory()->NewRawOneByteString(length));
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     StringBuilderConcatHelper(*special, answer->GetChars(no_gc),
                               FixedArray::cast(array->elements()),
                               array_length);
@@ -336,7 +327,7 @@ RUNTIME_FUNCTION(Runtime_StringBuilderConcat) {
     Handle<SeqTwoByteString> answer;
     ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
         isolate, answer, isolate->factory()->NewRawTwoByteString(length));
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     StringBuilderConcatHelper(*special, answer->GetChars(no_gc),
                               FixedArray::cast(array->elements()),
                               array_length);
@@ -351,7 +342,7 @@ RUNTIME_FUNCTION(Runtime_StringBuilderConcat) {
 // the length of the successfully copied prefix.
 static int CopyCachedOneByteCharsToArray(Heap* heap, const uint8_t* chars,
                                          FixedArray elements, int length) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   FixedArray one_byte_cache = heap->single_character_string_cache();
   Object undefined = ReadOnlyRoots(heap).undefined_value();
   int i;
@@ -383,7 +374,8 @@ RUNTIME_FUNCTION(Runtime_StringToArray) {
   CONVERT_NUMBER_CHECKED(uint32_t, limit, Uint32, args[1]);
 
   s = String::Flatten(isolate, s);
-  const int length = static_cast<int>(Min<uint32_t>(s->length(), limit));
+  const int length =
+      static_cast<int>(std::min(static_cast<uint32_t>(s->length()), limit));
 
   Handle<FixedArray> elements;
   int position = 0;
@@ -391,7 +383,7 @@ RUNTIME_FUNCTION(Runtime_StringToArray) {
     // Try using cached chars where possible.
     elements = isolate->factory()->NewUninitializedFixedArray(length);
 
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent content = s->GetFlatContent(no_gc);
     if (content.IsOneByte()) {
       Vector<const uint8_t> chars = content.ToOneByteVector();
@@ -485,29 +477,6 @@ RUNTIME_FUNCTION(Runtime_StringMaxLength) {
   return Smi::FromInt(String::kMaxLength);
 }
 
-RUNTIME_FUNCTION(Runtime_StringCompareSequence) {
-  HandleScope handle_scope(isolate);
-  DCHECK_EQ(3, args.length());
-  CONVERT_ARG_HANDLE_CHECKED(String, string, 0);
-  CONVERT_ARG_HANDLE_CHECKED(String, search_string, 1);
-  CONVERT_NUMBER_CHECKED(int, start, Int32, args[2]);
-
-  // Check if start + searchLength is in bounds.
-  DCHECK_LE(start + search_string->length(), string->length());
-
-  FlatStringReader string_reader(isolate, String::Flatten(isolate, string));
-  FlatStringReader search_reader(isolate,
-                                 String::Flatten(isolate, search_string));
-
-  for (int i = 0; i < search_string->length(); i++) {
-    if (string_reader.Get(start + i) != search_reader.Get(i)) {
-      return ReadOnlyRoots(isolate).false_value();
-    }
-  }
-
-  return ReadOnlyRoots(isolate).true_value();
-}
-
 RUNTIME_FUNCTION(Runtime_StringEscapeQuotes) {
   HandleScope handle_scope(isolate);
   DCHECK_EQ(1, args.length());
diff --git a/deps/v8/src/runtime/runtime-test.cc b/deps/v8/src/runtime/runtime-test.cc
index 41e34aaff63940..202a0a8785b9c1 100644
--- a/deps/v8/src/runtime/runtime-test.cc
+++ b/deps/v8/src/runtime/runtime-test.cc
@@ -63,11 +63,10 @@ bool IsWasmCompileAllowed(v8::Isolate* isolate, v8::Local<v8::Value> value,
   DCHECK_GT(GetPerIsolateWasmControls()->count(isolate), 0);
   const WasmCompileControls& ctrls = GetPerIsolateWasmControls()->at(isolate);
   return (is_async && ctrls.AllowAnySizeForAsync) ||
-         (value->IsArrayBuffer() &&
-          v8::Local<v8::ArrayBuffer>::Cast(value)->ByteLength() <=
-              ctrls.MaxWasmBufferSize) ||
+         (value->IsArrayBuffer() && value.As<v8::ArrayBuffer>()->ByteLength() <=
+                                        ctrls.MaxWasmBufferSize) ||
          (value->IsArrayBufferView() &&
-          v8::Local<v8::ArrayBufferView>::Cast(value)->ByteLength() <=
+          value.As<v8::ArrayBufferView>()->ByteLength() <=
               ctrls.MaxWasmBufferSize);
 }
 
@@ -251,10 +250,10 @@ RUNTIME_FUNCTION(Runtime_IsConcurrentRecompilationSupported) {
       isolate->concurrent_recompilation_enabled());
 }
 
-RUNTIME_FUNCTION(Runtime_DynamicMapChecksEnabled) {
+RUNTIME_FUNCTION(Runtime_DynamicCheckMapsEnabled) {
   SealHandleScope shs(isolate);
   DCHECK_EQ(0, args.length());
-  return isolate->heap()->ToBoolean(FLAG_turboprop_dynamic_map_checks);
+  return isolate->heap()->ToBoolean(FLAG_turbo_dynamic_map_checks);
 }
 
 RUNTIME_FUNCTION(Runtime_OptimizeFunctionOnNextCall) {
@@ -492,8 +491,8 @@ RUNTIME_FUNCTION(Runtime_NeverOptimizeFunction) {
   if (!function_object->IsJSFunction()) return CrashUnlessFuzzing(isolate);
   Handle<JSFunction> function = Handle<JSFunction>::cast(function_object);
   SharedFunctionInfo sfi = function->shared();
-  if (sfi.abstract_code().kind() != CodeKind::INTERPRETED_FUNCTION &&
-      sfi.abstract_code().kind() != CodeKind::BUILTIN) {
+  if (sfi.abstract_code(isolate).kind() != CodeKind::INTERPRETED_FUNCTION &&
+      sfi.abstract_code(isolate).kind() != CodeKind::BUILTIN) {
     return CrashUnlessFuzzing(isolate);
   }
   sfi.DisableOptimization(BailoutReason::kNeverOptimize);
@@ -708,8 +707,8 @@ RUNTIME_FUNCTION(Runtime_SetAllocationTimeout) {
 namespace {
 
 int FixedArrayLenFromSize(int size) {
-  return Min((size - FixedArray::kHeaderSize) / kTaggedSize,
-             FixedArray::kMaxRegularLength);
+  return std::min({(size - FixedArray::kHeaderSize) / kTaggedSize,
+                   FixedArray::kMaxRegularLength});
 }
 
 void FillUpOneNewSpacePage(Isolate* isolate, Heap* heap) {
@@ -752,6 +751,18 @@ RUNTIME_FUNCTION(Runtime_SimulateNewspaceFull) {
   return ReadOnlyRoots(isolate).undefined_value();
 }
 
+RUNTIME_FUNCTION(Runtime_ScheduleGCInStackCheck) {
+  SealHandleScope shs(isolate);
+  DCHECK_EQ(0, args.length());
+  isolate->RequestInterrupt(
+      [](v8::Isolate* isolate, void*) {
+        isolate->RequestGarbageCollectionForTesting(
+            v8::Isolate::kFullGarbageCollection);
+      },
+      nullptr);
+  return ReadOnlyRoots(isolate).undefined_value();
+}
+
 static void DebugPrintImpl(MaybeObject maybe_object) {
   StdoutStream os;
   if (maybe_object->IsCleared()) {
@@ -1179,13 +1190,13 @@ RUNTIME_FUNCTION(Runtime_IsWasmCode) {
 }
 
 RUNTIME_FUNCTION(Runtime_IsWasmTrapHandlerEnabled) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_EQ(0, args.length());
   return isolate->heap()->ToBoolean(trap_handler::IsTrapHandlerEnabled());
 }
 
 RUNTIME_FUNCTION(Runtime_IsThreadInWasm) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   DCHECK_EQ(0, args.length());
   return isolate->heap()->ToBoolean(trap_handler::IsThreadInWasm());
 }
@@ -1327,6 +1338,34 @@ TYPED_ARRAYS(FIXED_TYPED_ARRAYS_CHECK_RUNTIME_FUNCTION)
 
 #undef FIXED_TYPED_ARRAYS_CHECK_RUNTIME_FUNCTION
 
+RUNTIME_FUNCTION(Runtime_IsConcatSpreadableProtector) {
+  SealHandleScope shs(isolate);
+  DCHECK_EQ(0, args.length());
+  return isolate->heap()->ToBoolean(
+      Protectors::IsIsConcatSpreadableLookupChainIntact(isolate));
+}
+
+RUNTIME_FUNCTION(Runtime_TypedArraySpeciesProtector) {
+  SealHandleScope shs(isolate);
+  DCHECK_EQ(0, args.length());
+  return isolate->heap()->ToBoolean(
+      Protectors::IsTypedArraySpeciesLookupChainIntact(isolate));
+}
+
+RUNTIME_FUNCTION(Runtime_RegExpSpeciesProtector) {
+  SealHandleScope shs(isolate);
+  DCHECK_EQ(0, args.length());
+  return isolate->heap()->ToBoolean(
+      Protectors::IsRegExpSpeciesLookupChainIntact(isolate));
+}
+
+RUNTIME_FUNCTION(Runtime_PromiseSpeciesProtector) {
+  SealHandleScope shs(isolate);
+  DCHECK_EQ(0, args.length());
+  return isolate->heap()->ToBoolean(
+      Protectors::IsPromiseSpeciesLookupChainIntact(isolate));
+}
+
 RUNTIME_FUNCTION(Runtime_ArraySpeciesProtector) {
   SealHandleScope shs(isolate);
   DCHECK_EQ(0, args.length());
@@ -1355,6 +1394,12 @@ RUNTIME_FUNCTION(Runtime_StringIteratorProtector) {
       Protectors::IsStringIteratorLookupChainIntact(isolate));
 }
 
+RUNTIME_FUNCTION(Runtime_ArrayIteratorProtector) {
+  SealHandleScope shs(isolate);
+  DCHECK_EQ(0, args.length());
+  return isolate->heap()->ToBoolean(
+      Protectors::IsArrayIteratorLookupChainIntact(isolate));
+}
 // For use by tests and fuzzers. It
 //
 // 1. serializes a snapshot of the current isolate,
@@ -1575,7 +1620,7 @@ RUNTIME_FUNCTION(Runtime_CompleteInobjectSlackTracking) {
 
 RUNTIME_FUNCTION(Runtime_FreezeWasmLazyCompilation) {
   DCHECK_EQ(1, args.length());
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CONVERT_ARG_CHECKED(WasmInstanceObject, instance, 0);
 
   instance.module_object().native_module()->set_lazy_compile_frozen(true);
@@ -1612,7 +1657,8 @@ RUNTIME_FUNCTION(Runtime_EnableCodeLoggingForTesting) {
                          Handle<Name> script_name, int line, int column) final {
     }
     void CodeCreateEvent(LogEventsAndTags tag, const wasm::WasmCode* code,
-                         wasm::WasmName name) final {}
+                         wasm::WasmName name, const char* source_url,
+                         int code_offset, int script_id) final {}
 
     void CallbackEvent(Handle<Name> name, Address entry_point) final {}
     void GetterCallbackEvent(Handle<Name> name, Address entry_point) final {}
diff --git a/deps/v8/src/runtime/runtime-typedarray.cc b/deps/v8/src/runtime/runtime-typedarray.cc
index c5bc52da91666f..b73cfc9769a100 100644
--- a/deps/v8/src/runtime/runtime-typedarray.cc
+++ b/deps/v8/src/runtime/runtime-typedarray.cc
@@ -111,7 +111,7 @@ RUNTIME_FUNCTION(Runtime_TypedArraySortFast) {
     std::memcpy(data_copy_ptr, static_cast<void*>(array->DataPtr()), bytes);
   }
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   switch (array->type()) {
 #define TYPED_ARRAY_SORT(Type, type, TYPE, ctype)                          \
diff --git a/deps/v8/src/runtime/runtime-wasm.cc b/deps/v8/src/runtime/runtime-wasm.cc
index 76753b97fbe1a7..db6420f29547e7 100644
--- a/deps/v8/src/runtime/runtime-wasm.cc
+++ b/deps/v8/src/runtime/runtime-wasm.cc
@@ -64,7 +64,7 @@ Context GetNativeContextFromWasmInstanceOnStackTop(Isolate* isolate) {
   return GetWasmInstanceOnStackTop(isolate).native_context();
 }
 
-class ClearThreadInWasmScope {
+class V8_NODISCARD ClearThreadInWasmScope {
  public:
   ClearThreadInWasmScope() {
     DCHECK_IMPLIES(trap_handler::IsTrapHandlerEnabled(),
@@ -90,7 +90,8 @@ Object ThrowWasmError(Isolate* isolate, MessageTemplate message) {
 
 RUNTIME_FUNCTION(Runtime_WasmIsValidRefValue) {
   // This code is called from wrappers, so the "thread is wasm" flag is not set.
-  DCHECK(!trap_handler::IsThreadInWasm());
+  DCHECK_IMPLIES(trap_handler::IsTrapHandlerEnabled(),
+                 !trap_handler::IsThreadInWasm());
   HandleScope scope(isolate);
   DCHECK_EQ(3, args.length());
   CONVERT_ARG_HANDLE_CHECKED(WasmInstanceObject, instance, 0)
@@ -201,18 +202,33 @@ RUNTIME_FUNCTION(Runtime_WasmCompileLazy) {
 
   DCHECK(isolate->context().is_null());
   isolate->set_context(instance->native_context());
-  auto* native_module = instance->module_object().native_module();
-  bool success = wasm::CompileLazy(isolate, native_module, func_index);
+  Handle<WasmModuleObject> module_object{instance->module_object(), isolate};
+  bool success = wasm::CompileLazy(isolate, module_object, func_index);
   if (!success) {
     DCHECK(isolate->has_pending_exception());
     return ReadOnlyRoots(isolate).exception();
   }
 
-  Address entrypoint = native_module->GetCallTargetForFunction(func_index);
+  Address entrypoint =
+      module_object->native_module()->GetCallTargetForFunction(func_index);
 
   return Object(entrypoint);
 }
 
+namespace {
+void ReplaceWrapper(Isolate* isolate, Handle<WasmInstanceObject> instance,
+                    int function_index, Handle<Code> wrapper_code) {
+  Handle<WasmExternalFunction> exported_function =
+      WasmInstanceObject::GetWasmExternalFunction(isolate, instance,
+                                                  function_index)
+          .ToHandleChecked();
+  exported_function->set_code(*wrapper_code);
+  WasmExportedFunctionData function_data =
+      exported_function->shared().wasm_exported_function_data();
+  function_data.set_wrapper_code(*wrapper_code);
+}
+}  // namespace
+
 RUNTIME_FUNCTION(Runtime_WasmCompileWrapper) {
   HandleScope scope(isolate);
   DCHECK_EQ(2, args.length());
@@ -226,25 +242,40 @@ RUNTIME_FUNCTION(Runtime_WasmCompileWrapper) {
   const wasm::WasmFunction function = module->functions[function_index];
   const wasm::FunctionSig* sig = function.sig;
 
-  MaybeHandle<WasmExternalFunction> maybe_result =
+  // The start function is not guaranteed to be registered as
+  // an exported function (although it is called as one).
+  // If there is no entry for the start function,
+  // the tier-up is abandoned.
+  MaybeHandle<WasmExternalFunction> maybe_exported_function =
       WasmInstanceObject::GetWasmExternalFunction(isolate, instance,
                                                   function_index);
-
-  Handle<WasmExternalFunction> result;
-  if (!maybe_result.ToHandle(&result)) {
-    // We expect the result to be empty in the case of the start function,
-    // which is not an exported function to begin with.
+  Handle<WasmExternalFunction> exported_function;
+  if (!maybe_exported_function.ToHandle(&exported_function)) {
     DCHECK_EQ(function_index, module->start_function_index);
     return ReadOnlyRoots(isolate).undefined_value();
   }
 
-  Handle<Code> wrapper =
+  Handle<Code> wrapper_code =
       wasm::JSToWasmWrapperCompilationUnit::CompileSpecificJSToWasmWrapper(
           isolate, sig, module);
 
-  result->set_code(*wrapper);
+  // Replace the wrapper for the function that triggered the tier-up.
+  // This is to verify that the wrapper is replaced, even if the function
+  // is implicitly exported and is not part of the export_table.
+  ReplaceWrapper(isolate, instance, function_index, wrapper_code);
 
-  function_data->set_wrapper_code(*wrapper);
+  // Iterate over all exports to replace eagerly the wrapper for all functions
+  // that share the signature of the function that tiered up.
+  for (wasm::WasmExport exp : module->export_table) {
+    if (exp.kind != wasm::kExternalFunction) {
+      continue;
+    }
+    int index = static_cast<int>(exp.index);
+    wasm::WasmFunction function = module->functions[index];
+    if (function.sig == sig && index != function_index) {
+      ReplaceWrapper(isolate, instance, index, wrapper_code);
+    }
+  }
 
   return ReadOnlyRoots(isolate).undefined_value();
 }
diff --git a/deps/v8/src/runtime/runtime.cc b/deps/v8/src/runtime/runtime.cc
index 63be622b0df6f6..4dcb99f0a15a76 100644
--- a/deps/v8/src/runtime/runtime.cc
+++ b/deps/v8/src/runtime/runtime.cc
@@ -5,6 +5,7 @@
 #include "src/runtime/runtime.h"
 
 #include "src/base/hashmap.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/reloc-info.h"
 #include "src/execution/isolate.h"
 #include "src/handles/handles-inl.h"
@@ -65,9 +66,7 @@ struct IntrinsicFunctionIdentifier {
     const IntrinsicFunctionIdentifier* rhs =
         static_cast<IntrinsicFunctionIdentifier*>(key2);
     if (lhs->length_ != rhs->length_) return false;
-    return CompareCharsUnsigned(reinterpret_cast<const uint8_t*>(lhs->data_),
-                                reinterpret_cast<const uint8_t*>(rhs->data_),
-                                rhs->length_) == 0;
+    return CompareCharsEqual(lhs->data_, rhs->data_, rhs->length_);
   }
 
   uint32_t Hash() {
@@ -256,8 +255,8 @@ const Runtime::Function* Runtime::RuntimeFunctionTable(Isolate* isolate) {
   if (!isolate->runtime_state()->redirected_intrinsic_functions()) {
     size_t function_count = arraysize(kIntrinsicFunctions);
     Function* redirected_functions = new Function[function_count];
-    memcpy(redirected_functions, kIntrinsicFunctions,
-           sizeof(kIntrinsicFunctions));
+    base::Memcpy(redirected_functions, kIntrinsicFunctions,
+                 sizeof(kIntrinsicFunctions));
     for (size_t i = 0; i < function_count; i++) {
       ExternalReference redirected_entry =
           ExternalReference::Create(static_cast<Runtime::FunctionId>(i));
diff --git a/deps/v8/src/runtime/runtime.h b/deps/v8/src/runtime/runtime.h
index a0041ec2c0d08f..311238c9d56fe3 100644
--- a/deps/v8/src/runtime/runtime.h
+++ b/deps/v8/src/runtime/runtime.h
@@ -112,7 +112,8 @@ namespace internal {
   F(FunctionFirstExecution, 1, 1)         \
   F(InstantiateAsmJs, 4, 1)               \
   F(NotifyDeoptimized, 0, 1)              \
-  F(ResolvePossiblyDirectEval, 6, 1)
+  F(ResolvePossiblyDirectEval, 6, 1)      \
+  F(TryInstallNCICode, 1, 1)
 
 #define FOR_EACH_INTRINSIC_DATE(F, I) F(DateCurrentTime, 0, 1)
 
@@ -136,7 +137,6 @@ namespace internal {
   F(GetBreakLocations, 1, 1)                    \
   F(GetGeneratorScopeCount, 1, 1)               \
   F(GetGeneratorScopeDetails, 2, 1)             \
-  F(GetHeapUsage, 0, 1)                         \
   F(HandleDebuggerStatement, 0, 1)              \
   F(IsBreakOnException, 1, 1)                   \
   F(LiveEditPatchScript, 2, 1)                  \
@@ -438,10 +438,8 @@ namespace internal {
   F(StringLessThanOrEqual, 2, 1)          \
   F(StringMaxLength, 0, 1)                \
   F(StringReplaceOneCharWithString, 3, 1) \
-  F(StringCompareSequence, 3, 1)          \
   F(StringSubstring, 3, 1)                \
-  F(StringToArray, 2, 1)                  \
-  F(StringTrim, 2, 1)
+  F(StringToArray, 2, 1)
 
 #define FOR_EACH_INTRINSIC_SYMBOL(F, I)    \
   F(CreatePrivateNameSymbol, 1, 1)         \
@@ -470,7 +468,7 @@ namespace internal {
   F(DisallowCodegenFromStrings, 1, 1)         \
   F(DisallowWasmCodegen, 1, 1)                \
   F(DisassembleFunction, 1, 1)                \
-  F(DynamicMapChecksEnabled, 0, 1)            \
+  F(DynamicCheckMapsEnabled, 0, 1)            \
   F(EnableCodeLoggingForTesting, 0, 1)        \
   F(EnsureFeedbackVectorForFunction, 1, 1)    \
   F(FreezeWasmLazyCompilation, 1, 1)          \
@@ -521,6 +519,7 @@ namespace internal {
   F(RegexpTypeTag, 1, 1)                      \
   F(RegexpIsUnmodified, 1, 1)                 \
   F(MapIteratorProtector, 0, 1)               \
+  F(ArrayIteratorProtector, 0, 1)             \
   F(NeverOptimizeFunction, 1, 1)              \
   F(NotifyContextDisposed, 0, 1)              \
   F(OptimizeFunctionOnNextCall, -1, 1)        \
@@ -539,11 +538,13 @@ namespace internal {
   F(SetWasmInstantiateControls, 0, 1)         \
   F(SetWasmThreadsEnabled, 1, 1)              \
   F(SimulateNewspaceFull, 0, 1)               \
+  F(ScheduleGCInStackCheck, 0, 1)             \
   F(StringIteratorProtector, 0, 1)            \
   F(SystemBreak, 0, 1)                        \
   F(TraceEnter, 0, 1)                         \
   F(TraceExit, 1, 1)                          \
   F(TurbofanStaticAssert, 1, 1)               \
+  F(TypedArraySpeciesProtector, 0, 1)         \
   F(UnblockConcurrentRecompilation, 0, 1)     \
   F(WasmGetNumberOfInstances, 1, 1)           \
   F(WasmNumCodeSpaces, 1, 1)                  \
@@ -553,7 +554,10 @@ namespace internal {
   F(WasmTraceEnter, 0, 1)                     \
   F(WasmTraceExit, 1, 1)                      \
   F(WasmTraceMemory, 1, 1)                    \
-  I(DeoptimizeNow, 0, 1)
+  I(DeoptimizeNow, 0, 1)                      \
+  F(PromiseSpeciesProtector, 0, 1)            \
+  F(IsConcatSpreadableProtector, 0, 1)        \
+  F(RegExpSpeciesProtector, 0, 1)
 
 #define FOR_EACH_INTRINSIC_TYPEDARRAY(F, I) \
   F(ArrayBufferDetach, 1, 1)                \
@@ -778,6 +782,8 @@ class Runtime : public AllStatic {
 
 class RuntimeState {
  public:
+  RuntimeState(const RuntimeState&) = delete;
+  RuntimeState& operator=(const RuntimeState&) = delete;
 #ifndef V8_INTL_SUPPORT
   unibrow::Mapping<unibrow::ToUppercase, 128>* to_upper_mapping() {
     return &to_upper_mapping_;
@@ -807,8 +813,6 @@ class RuntimeState {
 
   friend class Isolate;
   friend class Runtime;
-
-  DISALLOW_COPY_AND_ASSIGN(RuntimeState);
 };
 
 V8_EXPORT_PRIVATE std::ostream& operator<<(std::ostream&, Runtime::FunctionId);
diff --git a/deps/v8/src/snapshot/code-serializer.cc b/deps/v8/src/snapshot/code-serializer.cc
index f90ef62badaf4f..1e5c51c0728d06 100644
--- a/deps/v8/src/snapshot/code-serializer.cc
+++ b/deps/v8/src/snapshot/code-serializer.cc
@@ -169,7 +169,7 @@ void CodeSerializer::SerializeObjectImpl(Handle<HeapObject> obj) {
       debug_info = sfi->GetDebugInfo();
       if (debug_info.HasInstrumentedBytecodeArray()) {
         debug_bytecode_array = debug_info.DebugBytecodeArray();
-        sfi->SetDebugBytecodeArray(debug_info.OriginalBytecodeArray());
+        sfi->SetActiveBytecodeArray(debug_info.OriginalBytecodeArray());
       }
       sfi->set_script_or_debug_info(debug_info.script(), kReleaseStore);
     }
@@ -181,7 +181,7 @@ void CodeSerializer::SerializeObjectImpl(Handle<HeapObject> obj) {
     if (!debug_info.is_null()) {
       sfi->set_script_or_debug_info(debug_info, kReleaseStore);
       if (!debug_bytecode_array.is_null()) {
-        sfi->SetDebugBytecodeArray(debug_bytecode_array);
+        sfi->SetActiveBytecodeArray(debug_bytecode_array);
       }
     }
     return;
@@ -242,7 +242,7 @@ void CreateInterpreterDataForDeserializedCode(Isolate* isolate,
         Handle<InterpreterData>::cast(isolate->factory()->NewStruct(
             INTERPRETER_DATA_TYPE, AllocationType::kOld));
 
-    interpreter_data->set_bytecode_array(info->GetBytecodeArray());
+    interpreter_data->set_bytecode_array(info->GetBytecodeArray(isolate));
     interpreter_data->set_interpreter_trampoline(*code);
 
     info->set_interpreter_data(*interpreter_data);
@@ -386,9 +386,10 @@ MaybeHandle<SharedFunctionInfo> CodeSerializer::Deserialize(
           int column_num =
               script->GetColumnNumber(shared_info->StartPosition()) + 1;
           PROFILE(isolate,
-                  CodeCreateEvent(CodeEventListener::SCRIPT_TAG,
-                                  handle(shared_info->abstract_code(), isolate),
-                                  shared_info, name, line_num, column_num));
+                  CodeCreateEvent(
+                      CodeEventListener::SCRIPT_TAG,
+                      handle(shared_info->abstract_code(isolate), isolate),
+                      shared_info, name, line_num, column_num));
         }
       }
     }
diff --git a/deps/v8/src/snapshot/code-serializer.h b/deps/v8/src/snapshot/code-serializer.h
index 8ca9721d162fe9..88cfee822b542c 100644
--- a/deps/v8/src/snapshot/code-serializer.h
+++ b/deps/v8/src/snapshot/code-serializer.h
@@ -71,7 +71,7 @@ class CodeSerializer : public Serializer {
 
   bool SerializeReadOnlyObject(Handle<HeapObject> obj);
 
-  DISALLOW_HEAP_ALLOCATION(no_gc_)
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
   uint32_t source_hash_;
 };
 
diff --git a/deps/v8/src/snapshot/context-serializer.cc b/deps/v8/src/snapshot/context-serializer.cc
index 8060f2845c3355..72a5572c7cc2de 100644
--- a/deps/v8/src/snapshot/context-serializer.cc
+++ b/deps/v8/src/snapshot/context-serializer.cc
@@ -20,7 +20,7 @@ namespace {
 // During serialization, puts the native context into a state understood by the
 // serializer (e.g. by clearing lists of Code objects).  After serialization,
 // the original state is restored.
-class SanitizeNativeContextScope final {
+class V8_NODISCARD SanitizeNativeContextScope final {
  public:
   SanitizeNativeContextScope(Isolate* isolate, NativeContext native_context,
                              bool allow_active_isolate_for_testing,
diff --git a/deps/v8/src/snapshot/deserializer.cc b/deps/v8/src/snapshot/deserializer.cc
index 5a729b35d3aaf5..b1e1d61588d86c 100644
--- a/deps/v8/src/snapshot/deserializer.cc
+++ b/deps/v8/src/snapshot/deserializer.cc
@@ -5,6 +5,7 @@
 #include "src/snapshot/deserializer.h"
 
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/common/assert-scope.h"
 #include "src/common/external-pointer.h"
@@ -191,7 +192,7 @@ class SlotAccessorForHandle {
 template <typename TSlot>
 int Deserializer::WriteAddress(TSlot dest, Address value) {
   DCHECK(!next_reference_is_weak_);
-  memcpy(dest.ToVoidPtr(), &value, kSystemPointerSize);
+  base::Memcpy(dest.ToVoidPtr(), &value, kSystemPointerSize);
   STATIC_ASSERT(IsAligned(kSystemPointerSize, TSlot::kSlotDataSize));
   return (kSystemPointerSize / TSlot::kSlotDataSize);
 }
@@ -288,7 +289,7 @@ void Deserializer::LogNewMapEvents() {
 }
 
 void Deserializer::WeakenDescriptorArrays() {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   for (Handle<DescriptorArray> descriptor_array : new_descriptor_arrays_) {
     DCHECK(descriptor_array->IsStrongDescriptorArray());
     descriptor_array->set_map(ReadOnlyRoots(isolate()).descriptor_array_map());
@@ -305,12 +306,12 @@ void Deserializer::LogScriptEvents(Script script) {
 }
 
 StringTableInsertionKey::StringTableInsertionKey(Handle<String> string)
-    : StringTableKey(ComputeHashField(*string), string->length()),
+    : StringTableKey(ComputeRawHashField(*string), string->length()),
       string_(string) {
   DCHECK(string->IsInternalizedString());
 }
 
-bool StringTableInsertionKey::IsMatch(String string) {
+bool StringTableInsertionKey::IsMatch(Isolate* isolate, String string) {
   // We want to compare the content of two strings here.
   return string_->SlowEquals(string);
 }
@@ -319,10 +320,10 @@ Handle<String> StringTableInsertionKey::AsHandle(Isolate* isolate) {
   return string_;
 }
 
-uint32_t StringTableInsertionKey::ComputeHashField(String string) {
-  // Make sure hash_field() is computed.
-  string.Hash();
-  return string.hash_field();
+uint32_t StringTableInsertionKey::ComputeRawHashField(String string) {
+  // Make sure raw_hash_field() is computed.
+  string.EnsureHash();
+  return string.raw_hash_field();
 }
 
 void Deserializer::PostProcessNewObject(Handle<Map> map, Handle<HeapObject> obj,
@@ -335,7 +336,7 @@ void Deserializer::PostProcessNewObject(Handle<Map> map, Handle<HeapObject> obj,
     if (InstanceTypeChecker::IsString(instance_type)) {
       // Uninitialize hash field as we need to recompute the hash.
       Handle<String> string = Handle<String>::cast(obj);
-      string->set_hash_field(String::kEmptyHashField);
+      string->set_raw_hash_field(String::kEmptyHashField);
       // Rehash strings before read-only space is sealed. Strings outside
       // read-only space are rehashed lazily. (e.g. when rehashing dictionaries)
       if (space == SnapshotSpace::kReadOnlyHeap) {
diff --git a/deps/v8/src/snapshot/deserializer.h b/deps/v8/src/snapshot/deserializer.h
index 62f7ea39e032cf..e0409a4fd61f3c 100644
--- a/deps/v8/src/snapshot/deserializer.h
+++ b/deps/v8/src/snapshot/deserializer.h
@@ -269,16 +269,16 @@ class StringTableInsertionKey final : public StringTableKey {
  public:
   explicit StringTableInsertionKey(Handle<String> string);
 
-  bool IsMatch(String string) override;
+  bool IsMatch(Isolate* isolate, String string);
 
   V8_WARN_UNUSED_RESULT Handle<String> AsHandle(Isolate* isolate);
   V8_WARN_UNUSED_RESULT Handle<String> AsHandle(LocalIsolate* isolate);
 
  private:
-  uint32_t ComputeHashField(String string);
+  uint32_t ComputeRawHashField(String string);
 
   Handle<String> string_;
-  DISALLOW_HEAP_ALLOCATION(no_gc)
+  DISALLOW_GARBAGE_COLLECTION(no_gc)
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/snapshot/embedded/embedded-file-writer.h b/deps/v8/src/snapshot/embedded/embedded-file-writer.h
index 6a90e5c685c8a4..3ed9208f41bd7d 100644
--- a/deps/v8/src/snapshot/embedded/embedded-file-writer.h
+++ b/deps/v8/src/snapshot/embedded/embedded-file-writer.h
@@ -15,6 +15,7 @@
 #include "src/snapshot/embedded/platform-embedded-file-writer-base.h"
 
 #if defined(V8_OS_WIN64)
+#include "src/base/platform/wrappers.h"
 #include "src/diagnostics/unwinding-info-win64.h"
 #endif  // V8_OS_WIN64
 
@@ -113,7 +114,7 @@ class EmbeddedFileWriter : public EmbeddedFileWriterInterface {
     WriteCodeSection(writer.get(), blob);
     WriteFileEpilogue(writer.get(), blob);
 
-    fclose(fp);
+    base::Fclose(fp);
   }
 
   static FILE* GetFileDescriptorOrDie(const char* filename) {
diff --git a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
index 1cd402d8ba1e3f..cf380b015d7753 100644
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/snapshot/embedded/platform-embedded-file-writer-aix.h"
 #include "src/snapshot/embedded/platform-embedded-file-writer-generic.h"
@@ -59,11 +60,11 @@ int PlatformEmbeddedFileWriterBase::WriteByteChunk(const uint8_t* data) {
       break;
     case 16:
 #ifdef V8_TARGET_BIG_ENDIAN
-      memcpy(&high, data, kHalfSize);
-      memcpy(&low, data + kHalfSize, kHalfSize);
+      base::Memcpy(&high, data, kHalfSize);
+      base::Memcpy(&low, data + kHalfSize, kHalfSize);
 #else
-      memcpy(&high, data + kHalfSize, kHalfSize);
-      memcpy(&low, data, kHalfSize);
+      base::Memcpy(&high, data + kHalfSize, kHalfSize);
+      base::Memcpy(&low, data, kHalfSize);
 #endif  // V8_TARGET_BIG_ENDIAN
       break;
     default:
diff --git a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
index 8acfd0d176785a..e2d5dcb41cf0be 100644
--- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
+++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
@@ -124,9 +124,7 @@ void PlatformEmbeddedFileWriterGeneric::DeclareFunctionBegin(const char* name,
 
 void PlatformEmbeddedFileWriterGeneric::DeclareFunctionEnd(const char* name) {}
 
-void PlatformEmbeddedFileWriterGeneric::FilePrologue() {
-  // TODO(v8:10026): Add ELF note required for BTI.
-}
+void PlatformEmbeddedFileWriterGeneric::FilePrologue() {}
 
 void PlatformEmbeddedFileWriterGeneric::DeclareExternalFilename(
     int fileid, const char* filename) {
diff --git a/deps/v8/src/snapshot/mksnapshot.cc b/deps/v8/src/snapshot/mksnapshot.cc
index 19aa71df640569..4cccc8d173568d 100644
--- a/deps/v8/src/snapshot/mksnapshot.cc
+++ b/deps/v8/src/snapshot/mksnapshot.cc
@@ -5,10 +5,12 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
+
 #include <iomanip>
 
 #include "include/libplatform/libplatform.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-arch.h"
 #include "src/codegen/source-position-table.h"
 #include "src/flags/flags.h"
@@ -47,7 +49,7 @@ class SnapshotFileWriter {
 
     FILE* fp = GetFileDescriptorOrDie(snapshot_blob_path_);
     size_t written = fwrite(blob.begin(), 1, blob.length(), fp);
-    fclose(fp);
+    v8::base::Fclose(fp);
     if (written != static_cast<size_t>(blob.length())) {
       i::PrintF("Writing snapshot file failed.. Aborting.\n");
       remove(snapshot_blob_path_);
@@ -64,7 +66,7 @@ class SnapshotFileWriter {
     WriteSnapshotFileData(fp, blob);
     WriteSnapshotFileSuffix(fp);
 
-    fclose(fp);
+    v8::base::Fclose(fp);
   }
 
   static void WriteSnapshotFilePrefix(FILE* fp) {
@@ -139,7 +141,7 @@ char* GetExtraCode(char* filename, const char* description) {
     }
     i += read;
   }
-  fclose(file);
+  v8::base::Fclose(file);
   return chars;
 }
 
diff --git a/deps/v8/src/snapshot/serializer.cc b/deps/v8/src/snapshot/serializer.cc
index a0088315d3acf3..c10c097e65c403 100644
--- a/deps/v8/src/snapshot/serializer.cc
+++ b/deps/v8/src/snapshot/serializer.cc
@@ -608,7 +608,7 @@ void Serializer::ObjectSerializer::SerializeExternalStringAsSequentialString() {
 
 // Clear and later restore the next link in the weak cell or allocation site.
 // TODO(all): replace this with proper iteration of weak slots in serializer.
-class UnlinkWeakNextScope {
+class V8_NODISCARD UnlinkWeakNextScope {
  public:
   explicit UnlinkWeakNextScope(Heap* heap, Handle<HeapObject> object) {
     if (object->IsAllocationSite() &&
@@ -631,7 +631,7 @@ class UnlinkWeakNextScope {
  private:
   Handle<HeapObject> object_;
   Handle<Object> next_;
-  DISALLOW_HEAP_ALLOCATION(no_gc_)
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 };
 
 void Serializer::ObjectSerializer::Serialize() {
diff --git a/deps/v8/src/snapshot/serializer.h b/deps/v8/src/snapshot/serializer.h
index e04d08b256ede5..d523401942b949 100644
--- a/deps/v8/src/snapshot/serializer.h
+++ b/deps/v8/src/snapshot/serializer.h
@@ -151,7 +151,7 @@ class ObjectCacheIndexMap {
   }
 
  private:
-  DisallowHeapAllocation no_allocation_;
+  DISALLOW_GARBAGE_COLLECTION(no_gc_)
 
   IdentityMap<int, base::DefaultAllocationPolicy> map_;
   int next_index_;
@@ -178,7 +178,7 @@ class Serializer : public SerializerDeserializer {
   using PendingObjectReferences = std::vector<int>*;
 
   class ObjectSerializer;
-  class RecursionScope {
+  class V8_NODISCARD RecursionScope {
    public:
     explicit RecursionScope(Serializer* serializer) : serializer_(serializer) {
       serializer_->recursion_depth_++;
@@ -332,7 +332,7 @@ class Serializer : public SerializerDeserializer {
 
   // Disallow GC during serialization.
   // TODO(leszeks, v8:10815): Remove this constraint.
-  DISALLOW_HEAP_ALLOCATION(no_gc)
+  DISALLOW_GARBAGE_COLLECTION(no_gc)
 
   Isolate* isolate_;
   HotObjectsList hot_objects_;
diff --git a/deps/v8/src/snapshot/snapshot-source-sink.h b/deps/v8/src/snapshot/snapshot-source-sink.h
index f0686af3c0e9f7..fc61453afa150f 100644
--- a/deps/v8/src/snapshot/snapshot-source-sink.h
+++ b/deps/v8/src/snapshot/snapshot-source-sink.h
@@ -9,6 +9,7 @@
 
 #include "src/base/atomicops.h"
 #include "src/base/logging.h"
+#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/snapshot/snapshot-utils.h"
 #include "src/utils/utils.h"
@@ -51,7 +52,7 @@ class SnapshotByteSource final {
   void Advance(int by) { position_ += by; }
 
   void CopyRaw(void* to, int number_of_bytes) {
-    memcpy(to, data_ + position_, number_of_bytes);
+    base::Memcpy(to, data_ + position_, number_of_bytes);
     position_ += number_of_bytes;
   }
 
@@ -61,7 +62,7 @@ class SnapshotByteSource final {
     for (base::AtomicWord* p = start; p < end;
          ++p, position_ += sizeof(base::AtomicWord)) {
       base::AtomicWord val;
-      memcpy(&val, data_ + position_, sizeof(base::AtomicWord));
+      base::Memcpy(&val, data_ + position_, sizeof(base::AtomicWord));
       base::Relaxed_Store(p, val);
     }
   }
@@ -73,7 +74,7 @@ class SnapshotByteSource final {
     for (AtomicTagged_t* p = start; p < end;
          ++p, position_ += sizeof(AtomicTagged_t)) {
       AtomicTagged_t val;
-      memcpy(&val, data_ + position_, sizeof(AtomicTagged_t));
+      base::Memcpy(&val, data_ + position_, sizeof(AtomicTagged_t));
       base::Relaxed_Store(p, val);
     }
   }
diff --git a/deps/v8/src/snapshot/startup-serializer.cc b/deps/v8/src/snapshot/startup-serializer.cc
index 88d3c77c66d424..6a16f2e4e75f9c 100644
--- a/deps/v8/src/snapshot/startup-serializer.cc
+++ b/deps/v8/src/snapshot/startup-serializer.cc
@@ -23,7 +23,7 @@ namespace {
 
 // The isolate roots may not point at context-specific objects during
 // serialization.
-class SanitizeIsolateScope final {
+class V8_NODISCARD SanitizeIsolateScope final {
  public:
   SanitizeIsolateScope(Isolate* isolate, bool allow_active_isolate_for_testing,
                        const DisallowGarbageCollection& no_gc)
diff --git a/deps/v8/src/strings/string-builder-inl.h b/deps/v8/src/strings/string-builder-inl.h
index eecb9c4ae352ff..80b88963c08ae6 100644
--- a/deps/v8/src/strings/string-builder-inl.h
+++ b/deps/v8/src/strings/string-builder-inl.h
@@ -191,7 +191,7 @@ class IncrementalStringBuilder {
   class NoExtend {
    public:
     NoExtend(Handle<String> string, int offset,
-             const DisallowHeapAllocation& no_gc) {
+             const DisallowGarbageCollection& no_gc) {
       DCHECK(string->IsSeqOneByteString() || string->IsSeqTwoByteString());
       if (sizeof(DestChar) == 1) {
         start_ = reinterpret_cast<DestChar*>(
@@ -214,7 +214,7 @@ class IncrementalStringBuilder {
    private:
     DestChar* start_;
     DestChar* cursor_;
-    DISALLOW_HEAP_ALLOCATION(no_gc_)
+    DISALLOW_GARBAGE_COLLECTION(no_gc_)
   };
 
   template <typename DestChar>
@@ -241,7 +241,7 @@ class IncrementalStringBuilder {
   class NoExtendBuilder : public NoExtend<DestChar> {
    public:
     NoExtendBuilder(IncrementalStringBuilder* builder, int required_length,
-                    const DisallowHeapAllocation& no_gc)
+                    const DisallowGarbageCollection& no_gc)
         : NoExtend<DestChar>(builder->current_part(), builder->current_index_,
                              no_gc),
           builder_(builder) {
diff --git a/deps/v8/src/strings/string-builder.cc b/deps/v8/src/strings/string-builder.cc
index cfb9a554121e9b..5faf8aff4d650f 100644
--- a/deps/v8/src/strings/string-builder.cc
+++ b/deps/v8/src/strings/string-builder.cc
@@ -14,7 +14,7 @@ namespace internal {
 template <typename sinkchar>
 void StringBuilderConcatHelper(String special, sinkchar* sink,
                                FixedArray fixed_array, int array_length) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int position = 0;
   for (int i = 0; i < array_length; i++) {
     Object element = fixed_array.get(i);
@@ -55,7 +55,7 @@ template void StringBuilderConcatHelper<uc16>(String special, uc16* sink,
 
 int StringBuilderConcatLength(int special_length, FixedArray fixed_array,
                               int array_length, bool* one_byte) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   int position = 0;
   for (int i = 0; i < array_length; i++) {
     int increment = 0;
@@ -200,7 +200,7 @@ MaybeHandle<String> ReplacementStringBuilder::ToString() {
         isolate, seq, isolate->factory()->NewRawOneByteString(character_count_),
         String);
 
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     uint8_t* char_buffer = seq->GetChars(no_gc);
     StringBuilderConcatHelper(*subject_, char_buffer, *array_builder_.array(),
                               array_builder_.length());
@@ -212,7 +212,7 @@ MaybeHandle<String> ReplacementStringBuilder::ToString() {
         isolate, seq, isolate->factory()->NewRawTwoByteString(character_count_),
         String);
 
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     uc16* char_buffer = seq->GetChars(no_gc);
     StringBuilderConcatHelper(*subject_, char_buffer, *array_builder_.array(),
                               array_builder_.length());
@@ -224,7 +224,7 @@ MaybeHandle<String> ReplacementStringBuilder::ToString() {
 void ReplacementStringBuilder::AddElement(Handle<Object> element) {
   DCHECK(element->IsSmi() || element->IsString());
   EnsureCapacity(1);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   array_builder_.Add(*element);
 }
 
@@ -304,7 +304,7 @@ void IncrementalStringBuilder::AppendStringByCopy(Handle<String> string) {
   Handle<SeqOneByteString> part =
       Handle<SeqOneByteString>::cast(current_part());
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::WriteToFlat(*string, part->GetChars(no_gc) + current_index_, 0,
                         string->length());
   }
diff --git a/deps/v8/src/strings/string-case.cc b/deps/v8/src/strings/string-case.cc
index 88370a81e321c3..e87973f0af30b3 100644
--- a/deps/v8/src/strings/string-case.cc
+++ b/deps/v8/src/strings/string-case.cc
@@ -65,7 +65,7 @@ int FastAsciiConvert(char* dst, const char* src, int length,
   char* saved_dst = dst;
 #endif
   const char* saved_src = src;
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   // We rely on the distance between upper and lower case letters
   // being a known power of 2.
   DCHECK_EQ('a' - 'A', 1 << 5);
diff --git a/deps/v8/src/strings/string-hasher.h b/deps/v8/src/strings/string-hasher.h
index aadddea65f2713..839fbc46a281a9 100644
--- a/deps/v8/src/strings/string-hasher.h
+++ b/deps/v8/src/strings/string-hasher.h
@@ -13,6 +13,8 @@ namespace internal {
 template <typename T>
 class Vector;
 
+// Helper class for incrementally calculating string hashes in a form suitable
+// for storing into Name::raw_hash_field.
 class V8_EXPORT_PRIVATE StringHasher final {
  public:
   StringHasher() = delete;
diff --git a/deps/v8/src/strings/string-search.h b/deps/v8/src/strings/string-search.h
index d10a80882ce8aa..410e078daa67ee 100644
--- a/deps/v8/src/strings/string-search.h
+++ b/deps/v8/src/strings/string-search.h
@@ -57,7 +57,7 @@ class StringSearch : private StringSearchBase {
   StringSearch(Isolate* isolate, Vector<const PatternChar> pattern)
       : isolate_(isolate),
         pattern_(pattern),
-        start_(Max(0, pattern.length() - kBMMaxShift)) {
+        start_(std::max(0, pattern.length() - kBMMaxShift)) {
     if (sizeof(PatternChar) > sizeof(SubjectChar)) {
       if (!IsOneByteString(pattern_)) {
         strategy_ = &FailSearch;
@@ -173,7 +173,7 @@ class StringSearch : private StringSearchBase {
   Vector<const PatternChar> pattern_;
   // Pointer to implementation of the search.
   SearchFunction strategy_;
-  // Cache value of Max(0, pattern_length() - kBMMaxShift)
+  // Cache value of max(0, pattern_length() - kBMMaxShift)
   int start_;
 };
 
@@ -184,8 +184,8 @@ inline T AlignDown(T value, U alignment) {
 }
 
 inline uint8_t GetHighestValueByte(uc16 character) {
-  return Max(static_cast<uint8_t>(character & 0xFF),
-             static_cast<uint8_t>(character >> 8));
+  return std::max(static_cast<uint8_t>(character & 0xFF),
+                  static_cast<uint8_t>(character >> 8));
 }
 
 inline uint8_t GetHighestValueByte(uint8_t character) { return character; }
@@ -545,7 +545,7 @@ template <typename SubjectChar, typename PatternChar>
 intptr_t SearchStringRaw(Isolate* isolate, const SubjectChar* subject_ptr,
                          int subject_length, const PatternChar* pattern_ptr,
                          int pattern_length, int start_index) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   Vector<const SubjectChar> subject(subject_ptr, subject_length);
   Vector<const PatternChar> pattern(pattern_ptr, pattern_length);
   return SearchString(isolate, subject, pattern, start_index);
diff --git a/deps/v8/src/strings/string-stream.h b/deps/v8/src/strings/string-stream.h
index 3a2ba0dd354285..d0624abb6ed75d 100644
--- a/deps/v8/src/strings/string-stream.h
+++ b/deps/v8/src/strings/string-stream.h
@@ -47,6 +47,8 @@ class FixedStringAllocator final : public StringAllocator {
   FixedStringAllocator(char* buffer, unsigned length)
       : buffer_(buffer), length_(length) {}
   ~FixedStringAllocator() override = default;
+  FixedStringAllocator(const FixedStringAllocator&) = delete;
+  FixedStringAllocator& operator=(const FixedStringAllocator&) = delete;
 
   char* allocate(unsigned bytes) override;
   char* grow(unsigned* bytes) override;
@@ -54,7 +56,6 @@ class FixedStringAllocator final : public StringAllocator {
  private:
   char* buffer_;
   unsigned length_;
-  DISALLOW_COPY_AND_ASSIGN(FixedStringAllocator);
 };
 
 template <std::size_t kInlineSize>
diff --git a/deps/v8/src/strings/uri.cc b/deps/v8/src/strings/uri.cc
index f54108c1d19e49..925a5fca722ff1 100644
--- a/deps/v8/src/strings/uri.cc
+++ b/deps/v8/src/strings/uri.cc
@@ -137,7 +137,7 @@ bool IntoTwoByte(int index, bool is_uri, int uri_length,
 bool IntoOneAndTwoByte(Handle<String> uri, bool is_uri,
                        std::vector<uint8_t>* one_byte_buffer,
                        std::vector<uc16>* two_byte_buffer) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   String::FlatContent uri_content = uri->GetFlatContent(no_gc);
 
   int uri_length = uri->length();
@@ -194,7 +194,7 @@ MaybeHandle<String> Uri::Decode(Isolate* isolate, Handle<String> uri,
       isolate, result, isolate->factory()->NewRawTwoByteString(result_length),
       String);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   uc16* chars = result->GetChars(no_gc);
   if (!one_byte_buffer.empty()) {
     CopyChars(chars, one_byte_buffer.data(), one_byte_buffer.size());
@@ -284,7 +284,7 @@ MaybeHandle<String> Uri::Encode(Isolate* isolate, Handle<String> uri,
   buffer.reserve(uri_length);
 
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     String::FlatContent uri_content = uri->GetFlatContent(no_gc);
 
     for (int k = 0; k < uri_length; k++) {
@@ -308,7 +308,7 @@ MaybeHandle<String> Uri::Encode(Isolate* isolate, Handle<String> uri,
         continue;
       }
 
-      AllowHeapAllocation allocate_error_and_return;
+      AllowGarbageCollection allocate_error_and_return;
       THROW_NEW_ERROR(isolate, NewURIError(), String);
     }
   }
@@ -346,8 +346,8 @@ MaybeHandle<String> UnescapeSlow(Isolate* isolate, Handle<String> string,
 
   int unescaped_length = 0;
   {
-    DisallowHeapAllocation no_allocation;
-    Vector<const Char> vector = string->GetCharVector<Char>(no_allocation);
+    DisallowGarbageCollection no_gc;
+    Vector<const Char> vector = string->GetCharVector<Char>(no_gc);
     for (int i = start_index; i < length; unescaped_length++) {
       int step;
       if (UnescapeChar(vector, i, length, &step) >
@@ -369,8 +369,8 @@ MaybeHandle<String> UnescapeSlow(Isolate* isolate, Handle<String> string,
     Handle<SeqOneByteString> dest = isolate->factory()
                                         ->NewRawOneByteString(unescaped_length)
                                         .ToHandleChecked();
-    DisallowHeapAllocation no_allocation;
-    Vector<const Char> vector = string->GetCharVector<Char>(no_allocation);
+    DisallowGarbageCollection no_gc;
+    Vector<const Char> vector = string->GetCharVector<Char>(no_gc);
     for (int i = start_index; i < length; dest_position++) {
       int step;
       dest->SeqOneByteStringSet(dest_position,
@@ -382,8 +382,8 @@ MaybeHandle<String> UnescapeSlow(Isolate* isolate, Handle<String> string,
     Handle<SeqTwoByteString> dest = isolate->factory()
                                         ->NewRawTwoByteString(unescaped_length)
                                         .ToHandleChecked();
-    DisallowHeapAllocation no_allocation;
-    Vector<const Char> vector = string->GetCharVector<Char>(no_allocation);
+    DisallowGarbageCollection no_gc;
+    Vector<const Char> vector = string->GetCharVector<Char>(no_gc);
     for (int i = start_index; i < length; dest_position++) {
       int step;
       dest->SeqTwoByteStringSet(dest_position,
@@ -419,9 +419,9 @@ static MaybeHandle<String> UnescapePrivate(Isolate* isolate,
                                            Handle<String> source) {
   int index;
   {
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     StringSearch<uint8_t, Char> search(isolate, StaticOneByteVector("%"));
-    index = search.Search(source->GetCharVector<Char>(no_allocation), 0);
+    index = search.Search(source->GetCharVector<Char>(no_gc), 0);
     if (index < 0) return source;
   }
   return UnescapeSlow<Char>(isolate, source, index);
@@ -435,8 +435,8 @@ static MaybeHandle<String> EscapePrivate(Isolate* isolate,
   int length = string->length();
 
   {
-    DisallowHeapAllocation no_allocation;
-    Vector<const Char> vector = string->GetCharVector<Char>(no_allocation);
+    DisallowGarbageCollection no_gc;
+    Vector<const Char> vector = string->GetCharVector<Char>(no_gc);
     for (int i = 0; i < length; i++) {
       uint16_t c = vector[i];
       if (c >= 256) {
@@ -463,8 +463,8 @@ static MaybeHandle<String> EscapePrivate(Isolate* isolate,
   int dest_position = 0;
 
   {
-    DisallowHeapAllocation no_allocation;
-    Vector<const Char> vector = string->GetCharVector<Char>(no_allocation);
+    DisallowGarbageCollection no_gc;
+    Vector<const Char> vector = string->GetCharVector<Char>(no_gc);
     for (int i = 0; i < length; i++) {
       uint16_t c = vector[i];
       if (c >= 256) {
diff --git a/deps/v8/src/tasks/cancelable-task.h b/deps/v8/src/tasks/cancelable-task.h
index 9592902c950f8e..d35be6ea87a4a3 100644
--- a/deps/v8/src/tasks/cancelable-task.h
+++ b/deps/v8/src/tasks/cancelable-task.h
@@ -37,6 +37,8 @@ class V8_EXPORT_PRIVATE CancelableTaskManager {
   CancelableTaskManager();
 
   ~CancelableTaskManager();
+  CancelableTaskManager(const CancelableTaskManager&) = delete;
+  CancelableTaskManager& operator=(const CancelableTaskManager&) = delete;
 
   // Registers a new cancelable {task}. Returns the unique {id} of the task that
   // can be used to try to abort a task by calling {Abort}.
@@ -87,8 +89,6 @@ class V8_EXPORT_PRIVATE CancelableTaskManager {
   bool canceled_;
 
   friend class Cancelable;
-
-  DISALLOW_COPY_AND_ASSIGN(CancelableTaskManager);
 };
 
 class V8_EXPORT_PRIVATE Cancelable {
@@ -97,6 +97,8 @@ class V8_EXPORT_PRIVATE Cancelable {
       : parent_(parent), id_(parent->Register(this)) {}
 
   virtual ~Cancelable();
+  Cancelable(const Cancelable&) = delete;
+  Cancelable& operator=(const Cancelable&) = delete;
 
   // Never invoke after handing over the task to the platform! The reason is
   // that {Cancelable} is used in combination with {v8::Task} and handed to
@@ -137,8 +139,6 @@ class V8_EXPORT_PRIVATE Cancelable {
   CancelableTaskManager* const parent_;
   std::atomic<Status> status_{kWaiting};
   const CancelableTaskManager::Id id_;
-
-  DISALLOW_COPY_AND_ASSIGN(Cancelable);
 };
 
 // Multiple inheritance can be used because Task is a pure interface.
@@ -147,6 +147,8 @@ class V8_EXPORT_PRIVATE CancelableTask : public Cancelable,
  public:
   explicit CancelableTask(Isolate* isolate);
   explicit CancelableTask(CancelableTaskManager* manager);
+  CancelableTask(const CancelableTask&) = delete;
+  CancelableTask& operator=(const CancelableTask&) = delete;
 
   // Task overrides.
   void Run() final {
@@ -156,9 +158,6 @@ class V8_EXPORT_PRIVATE CancelableTask : public Cancelable,
   }
 
   virtual void RunInternal() = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CancelableTask);
 };
 
 // Multiple inheritance can be used because IdleTask is a pure interface.
@@ -166,6 +165,8 @@ class CancelableIdleTask : public Cancelable, public IdleTask {
  public:
   explicit CancelableIdleTask(Isolate* isolate);
   explicit CancelableIdleTask(CancelableTaskManager* manager);
+  CancelableIdleTask(const CancelableIdleTask&) = delete;
+  CancelableIdleTask& operator=(const CancelableIdleTask&) = delete;
 
   // IdleTask overrides.
   void Run(double deadline_in_seconds) final {
@@ -175,9 +176,6 @@ class CancelableIdleTask : public Cancelable, public IdleTask {
   }
 
   virtual void RunInternal(double deadline_in_seconds) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CancelableIdleTask);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/tasks/operations-barrier.cc b/deps/v8/src/tasks/operations-barrier.cc
new file mode 100644
index 00000000000000..289b4d61fc7f69
--- /dev/null
+++ b/deps/v8/src/tasks/operations-barrier.cc
@@ -0,0 +1,34 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "src/tasks/operations-barrier.h"
+
+namespace v8 {
+namespace internal {
+
+OperationsBarrier::Token OperationsBarrier::TryLock() {
+  base::MutexGuard guard(&mutex_);
+  if (cancelled_) return Token(nullptr);
+  ++operations_count_;
+  return Token(this);
+}
+
+void OperationsBarrier::CancelAndWait() {
+  base::MutexGuard guard(&mutex_);
+  DCHECK(!cancelled_);
+  cancelled_ = true;
+  while (operations_count_ > 0) {
+    release_condition_.Wait(&mutex_);
+  }
+}
+
+void OperationsBarrier::Release() {
+  base::MutexGuard guard(&mutex_);
+  if (--operations_count_ == 0 && cancelled_) {
+    release_condition_.NotifyOne();
+  }
+}
+
+}  // namespace internal
+}  // namespace v8
diff --git a/deps/v8/src/tasks/operations-barrier.h b/deps/v8/src/tasks/operations-barrier.h
new file mode 100644
index 00000000000000..ac8b7c779dc04f
--- /dev/null
+++ b/deps/v8/src/tasks/operations-barrier.h
@@ -0,0 +1,114 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_TASKS_OPERATIONS_BARRIER_H_
+#define V8_TASKS_OPERATIONS_BARRIER_H_
+
+#include <cstdint>
+
+#include "src/base/macros.h"
+#include "src/base/platform/condition-variable.h"
+#include "src/base/platform/mutex.h"
+
+namespace v8 {
+namespace internal {
+
+// A thread-safe barrier to manage lifetime of muti-threaded operations.
+//
+// The barrier is used to determine if operations are allowed, and to keep track
+// of how many are currently active. Users will call TryLock() before starting
+// such operations. If the call succeeds the user can run the operation and the
+// barrier will keep track of it until the user signals that the operation is
+// completed. No operations are allowed after CancelAndWait() is called.
+//
+// There is no explicit way of telling the barrier when an operation is
+// completed, instead for convenience TryLock() will return a RAII
+// like object that will do so on destruction.
+//
+// For example:
+//
+// OperationsBarrier barrier_;
+//
+// void TearDown() {
+//   barrier_.CancelAndWait();
+// }
+//
+// void MaybeRunOperation() {
+//   if (token = barrier_.TryLock()) Process();
+// }
+//
+class V8_EXPORT_PRIVATE OperationsBarrier {
+ public:
+  // The owner of a Token which evaluates to true can safely perform an
+  // operation while being certain it happens-before CancelAndWait(). Releasing
+  // this Token relinquishes this right.
+  //
+  // This class is thread-safe.
+  class Token {
+   public:
+    Token() = default;
+    ~Token() {
+      if (outer_) outer_->Release();
+    }
+    Token(const Token&) = delete;
+    Token(Token&& other) V8_NOEXCEPT : outer_(other.outer_) {
+      other.outer_ = nullptr;
+    }
+
+    Token& operator=(const Token&) = delete;
+    Token& operator=(Token&& other) V8_NOEXCEPT {
+      DCHECK_NE(this, &other);
+      if (outer_) outer_->Release();
+      outer_ = other.outer_;
+      other.outer_ = nullptr;
+      return *this;
+    }
+
+    operator bool() const { return !!outer_; }
+
+   private:
+    friend class OperationsBarrier;
+    explicit Token(OperationsBarrier* outer) : outer_(outer) {}
+    OperationsBarrier* outer_ = nullptr;
+  };
+
+  OperationsBarrier() = default;
+
+  // Users must call CancelAndWait() before destroying an instance of this
+  // class.
+  ~OperationsBarrier() { DCHECK(cancelled_); }
+
+  OperationsBarrier(const OperationsBarrier&) = delete;
+  OperationsBarrier& operator=(const OperationsBarrier&) = delete;
+
+  // Returns a RAII like object that implicitly converts to true if operations
+  // are allowed i.e. if this call happens-before CancelAndWait(), otherwise the
+  // object will convert to false. On successful return, this OperationsBarrier
+  // will keep track of the operation until the returned object goes out of
+  // scope.
+  Token TryLock();
+
+  // Prevents further calls to TryLock() from succeeding and waits for
+  // all the ongoing operations to complete.
+  //
+  // Attention: Can only be called once.
+  void CancelAndWait();
+
+  bool cancelled() const { return cancelled_; }
+
+ private:
+  void Release();
+
+  // Mutex and condition variable enabling concurrent register and removing, as
+  // well as waiting for background tasks on {CancelAndWait}.
+  base::Mutex mutex_;
+  base::ConditionVariable release_condition_;
+  bool cancelled_ = false;
+  size_t operations_count_{0};
+};
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_TASKS_OPERATIONS_BARRIER_H_
diff --git a/deps/v8/src/third_party/vtune/vtune-jit.cc b/deps/v8/src/third_party/vtune/vtune-jit.cc
index d9393c842c92f2..08fbfbfe397c89 100644
--- a/deps/v8/src/third_party/vtune/vtune-jit.cc
+++ b/deps/v8/src/third_party/vtune/vtune-jit.cc
@@ -146,7 +146,8 @@ static std::string GetFunctionNameFromMixedName(const char* str, int length) {
 
   while (str[index++] != ':' && (index < length)) {}
 
-  if (str[index] == '*' || str[index] == '~' ) index++;
+  const char state = str[index];
+  if (state == '*' || state == '+' || state == '-' || state == '~') index++;
   if (index >= length) return std::string();
 
   start_ptr = const_cast<char*>(str + index);
@@ -194,8 +195,7 @@ void VTUNEJITInterface::event_handler(const v8::JitCodeEvent* event) {
         if (*script != NULL) {
           // Get the source file name and set it to jmethod.source_file_name
           if ((*script->GetScriptName())->IsString()) {
-            Local<String> script_name =
-                Local<String>::Cast(script->GetScriptName());
+            Local<String> script_name = script->GetScriptName().As<String>();
             temp_file_name.reset(
                 new char[script_name->Utf8Length(event->isolate) + 1]);
             script_name->WriteUtf8(event->isolate, temp_file_name.get());
diff --git a/deps/v8/src/torque/ast.h b/deps/v8/src/torque/ast.h
index a51535d392bb10..0b73c1c42f45a3 100644
--- a/deps/v8/src/torque/ast.h
+++ b/deps/v8/src/torque/ast.h
@@ -931,6 +931,7 @@ struct ClassFieldExpression {
   bool weak;
   bool const_qualified;
   bool generate_verify;
+  bool relaxed_write;
 };
 
 struct LabelAndTypes {
diff --git a/deps/v8/src/torque/cfg.h b/deps/v8/src/torque/cfg.h
index 4cacb58edb3a64..a340a697b46f41 100644
--- a/deps/v8/src/torque/cfg.h
+++ b/deps/v8/src/torque/cfg.h
@@ -212,7 +212,7 @@ class CfgAssembler {
   Block* current_block_ = cfg_.start();
 };
 
-class CfgAssemblerScopedTemporaryBlock {
+class V8_NODISCARD CfgAssemblerScopedTemporaryBlock {
  public:
   CfgAssemblerScopedTemporaryBlock(CfgAssembler* assembler, Block* block)
       : assembler_(assembler), saved_block_(block) {
diff --git a/deps/v8/src/torque/constants.h b/deps/v8/src/torque/constants.h
index 54c54c5819a089..f8b57efaa00747 100644
--- a/deps/v8/src/torque/constants.h
+++ b/deps/v8/src/torque/constants.h
@@ -31,6 +31,7 @@ static const char* const JS_FUNCTION_TYPE_STRING = "JSFunction";
 static const char* const MAP_TYPE_STRING = "Map";
 static const char* const OBJECT_TYPE_STRING = "Object";
 static const char* const HEAP_OBJECT_TYPE_STRING = "HeapObject";
+static const char* const TAGGED_ZERO_PATTERN_TYPE_STRING = "TaggedZeroPattern";
 static const char* const JSANY_TYPE_STRING = "JSAny";
 static const char* const JSOBJECT_TYPE_STRING = "JSObject";
 static const char* const SMI_TYPE_STRING = "Smi";
@@ -68,7 +69,8 @@ static const char* const CONST_FLOAT64_TYPE_STRING = "constexpr float64";
 static const char* const TORQUE_INTERNAL_NAMESPACE_STRING = "torque_internal";
 static const char* const MUTABLE_REFERENCE_TYPE_STRING = "MutableReference";
 static const char* const CONST_REFERENCE_TYPE_STRING = "ConstReference";
-static const char* const SLICE_TYPE_STRING = "Slice";
+static const char* const MUTABLE_SLICE_TYPE_STRING = "MutableSlice";
+static const char* const CONST_SLICE_TYPE_STRING = "ConstSlice";
 static const char* const WEAK_TYPE_STRING = "Weak";
 static const char* const SMI_TAGGED_TYPE_STRING = "SmiTagged";
 static const char* const UNINITIALIZED_ITERATOR_TYPE_STRING =
@@ -103,6 +105,8 @@ static const char* const ANNOTATION_EXPORT = "@export";
 static const char* const ANNOTATION_DO_NOT_GENERATE_CAST = "@doNotGenerateCast";
 static const char* const ANNOTATION_USE_PARENT_TYPE_CHECKER =
     "@useParentTypeChecker";
+// Generate C++ accessors with relaxed write semantics.
+static const char* const ANNOTATION_RELAXED_WRITE = "@relaxedWrite";
 
 inline bool IsConstexprName(const std::string& name) {
   return name.substr(0, std::strlen(CONSTEXPR_TYPE_PREFIX)) ==
diff --git a/deps/v8/src/torque/contextual.h b/deps/v8/src/torque/contextual.h
index 9aea5bf2e3ebb2..76723e03c03c77 100644
--- a/deps/v8/src/torque/contextual.h
+++ b/deps/v8/src/torque/contextual.h
@@ -35,7 +35,7 @@ class ContextualVariable {
   // variable is restored to the state before the {Scope} was created. Scopes
   // have to follow a stack discipline:  A {Scope} has to be destructed before
   // any older scope is destructed.
-  class Scope {
+  class V8_NODISCARD Scope {
    public:
     template <class... Args>
     explicit Scope(Args&&... args)
@@ -47,6 +47,8 @@ class ContextualVariable {
       DCHECK_EQ(this, Top());
       Top() = previous_;
     }
+    Scope(const Scope&) = delete;
+    Scope& operator=(const Scope&) = delete;
 
     VarType& Value() { return value_; }
 
@@ -58,7 +60,6 @@ class ContextualVariable {
                   "Curiously Recurring Template Pattern");
 
     DISALLOW_NEW_AND_DELETE()
-    DISALLOW_COPY_AND_ASSIGN(Scope);
   };
 
   // Access the most recent active {Scope}. There has to be an active {Scope}
diff --git a/deps/v8/src/torque/earley-parser.h b/deps/v8/src/torque/earley-parser.h
index e0dca24ad2b095..8a94ff861b5c47 100644
--- a/deps/v8/src/torque/earley-parser.h
+++ b/deps/v8/src/torque/earley-parser.h
@@ -167,6 +167,8 @@ class ParseResultIterator {
     // Check that all parse results have been used.
     CHECK_EQ(results_.size(), i_);
   }
+  ParseResultIterator(const ParseResultIterator&) = delete;
+  ParseResultIterator& operator=(const ParseResultIterator&) = delete;
 
   ParseResult Next() {
     CHECK_LT(i_, results_.size());
@@ -184,8 +186,6 @@ class ParseResultIterator {
   std::vector<ParseResult> results_;
   size_t i_ = 0;
   MatchedInput matched_input_;
-
-  DISALLOW_COPY_AND_ASSIGN(ParseResultIterator);
 };
 
 struct LexerResult {
@@ -251,6 +251,10 @@ class Symbol {
   Symbol() : Symbol({}) {}
   Symbol(std::initializer_list<Rule> rules) { *this = rules; }
 
+  // Disallow copying and moving to ensure Symbol has a stable address.
+  Symbol(const Symbol&) = delete;
+  Symbol& operator=(const Symbol&) = delete;
+
   V8_EXPORT_PRIVATE Symbol& operator=(std::initializer_list<Rule> rules);
 
   bool IsTerminal() const { return rules_.empty(); }
@@ -267,9 +271,6 @@ class Symbol {
 
  private:
   std::vector<std::unique_ptr<Rule>> rules_;
-
-  // Disallow copying and moving to ensure Symbol has a stable address.
-  DISALLOW_COPY_AND_ASSIGN(Symbol);
 };
 
 // Items are the core datastructure of Earley's algorithm.
diff --git a/deps/v8/src/torque/global-context.h b/deps/v8/src/torque/global-context.h
index 7ccbc851c64982..cd6ddef8b22115 100644
--- a/deps/v8/src/torque/global-context.h
+++ b/deps/v8/src/torque/global-context.h
@@ -60,14 +60,28 @@ class GlobalContext : public ContextualClass<GlobalContext> {
   }
 
   struct PerFileStreams {
+    PerFileStreams() : file(SourceId::Invalid()) {}
+    SourceId file;
     std::stringstream csa_headerfile;
     std::stringstream csa_ccfile;
     std::stringstream class_definition_headerfile;
+
+    // The beginning of the generated -inl.inc file, which includes declarations
+    // for functions corresponding to Torque macros.
+    std::stringstream class_definition_inline_headerfile_macro_declarations;
+    // The second part of the generated -inl.inc file, which includes
+    // definitions for functions declared in the first part.
+    std::stringstream class_definition_inline_headerfile_macro_definitions;
+    // The portion of the generated -inl.inc file containing member function
+    // definitions for the generated class.
     std::stringstream class_definition_inline_headerfile;
+
     std::stringstream class_definition_ccfile;
   };
   static PerFileStreams& GeneratedPerFile(SourceId file) {
-    return Get().generated_per_file_[file];
+    PerFileStreams& result = Get().generated_per_file_[file];
+    result.file = file;
+    return result;
   }
 
   static void SetInstanceTypesInitialized() {
@@ -77,13 +91,15 @@ class GlobalContext : public ContextualClass<GlobalContext> {
   static bool IsInstanceTypesInitialized() {
     return Get().instance_types_initialized_;
   }
-  static void EnsureInCCOutputList(TorqueMacro* macro) {
+  static void EnsureInCCOutputList(TorqueMacro* macro, SourceId source) {
     GlobalContext& c = Get();
-    if (c.macros_for_cc_output_set_.insert(macro).second) {
-      c.macros_for_cc_output_.push_back(macro);
+    auto item = std::make_pair(macro, source);
+    if (c.macros_for_cc_output_set_.insert(item).second) {
+      c.macros_for_cc_output_.push_back(item);
     }
   }
-  static const std::vector<TorqueMacro*>& AllMacrosForCCOutput() {
+  static const std::vector<std::pair<TorqueMacro*, SourceId>>&
+  AllMacrosForCCOutput() {
     return Get().macros_for_cc_output_;
   }
 
@@ -96,8 +112,8 @@ class GlobalContext : public ContextualClass<GlobalContext> {
   std::set<std::string> cpp_includes_;
   std::map<SourceId, PerFileStreams> generated_per_file_;
   std::map<std::string, size_t> fresh_ids_;
-  std::vector<TorqueMacro*> macros_for_cc_output_;
-  std::unordered_set<TorqueMacro*> macros_for_cc_output_set_;
+  std::vector<std::pair<TorqueMacro*, SourceId>> macros_for_cc_output_;
+  std::set<std::pair<TorqueMacro*, SourceId>> macros_for_cc_output_set_;
   bool instance_types_initialized_ = false;
 
   friend class LanguageServerData;
diff --git a/deps/v8/src/torque/implementation-visitor.cc b/deps/v8/src/torque/implementation-visitor.cc
index 00504b5eff0aaf..9e2e4faef33986 100644
--- a/deps/v8/src/torque/implementation-visitor.cc
+++ b/deps/v8/src/torque/implementation-visitor.cc
@@ -66,9 +66,10 @@ void ImplementationVisitor::BeginGeneratedFiles() {
   }
 
   for (SourceId file : SourceFileMap::AllSources()) {
+    auto& streams = GlobalContext::GeneratedPerFile(file);
     // Output beginning of CSA .cc file.
     {
-      std::ostream& out = GlobalContext::GeneratedPerFile(file).csa_ccfile;
+      std::ostream& out = streams.csa_ccfile;
 
       for (const std::string& include_path : GlobalContext::CppIncludes()) {
         out << "#include " << StringLiteralQuote(include_path) << "\n";
@@ -87,12 +88,12 @@ void ImplementationVisitor::BeginGeneratedFiles() {
     }
     // Output beginning of CSA .h file.
     {
-      std::ostream& out = GlobalContext::GeneratedPerFile(file).csa_headerfile;
-      std::string headerDefine =
+      std::ostream& out = streams.csa_headerfile;
+      std::string header_define =
           "V8_GEN_TORQUE_GENERATED_" +
-          UnderlinifyPath(SourceFileMap::PathFromV8Root(file)) + "_H_";
-      out << "#ifndef " << headerDefine << "\n";
-      out << "#define " << headerDefine << "\n\n";
+          UnderlinifyPath(SourceFileMap::PathFromV8Root(file)) + "_CSA_H_";
+      out << "#ifndef " << header_define << "\n";
+      out << "#define " << header_define << "\n\n";
       out << "#include \"src/builtins/torque-csa-header-includes.h\"\n";
       out << "\n";
 
@@ -102,7 +103,6 @@ void ImplementationVisitor::BeginGeneratedFiles() {
     }
     // Output beginning of class definition .cc file.
     {
-      auto& streams = GlobalContext::GeneratedPerFile(file);
       std::ostream& out = streams.class_definition_ccfile;
       if (contains_class_definitions.count(file) != 0) {
         out << "#include \""
@@ -120,28 +120,28 @@ void ImplementationVisitor::BeginGeneratedFiles() {
 
 void ImplementationVisitor::EndGeneratedFiles() {
   for (SourceId file : SourceFileMap::AllSources()) {
+    auto& streams = GlobalContext::GeneratedPerFile(file);
     {
-      std::ostream& out = GlobalContext::GeneratedPerFile(file).csa_ccfile;
+      std::ostream& out = streams.csa_ccfile;
 
       out << "}  // namespace internal\n"
           << "}  // namespace v8\n"
           << "\n";
     }
     {
-      std::ostream& out = GlobalContext::GeneratedPerFile(file).csa_headerfile;
+      std::ostream& out = streams.csa_headerfile;
 
-      std::string headerDefine =
+      std::string header_define =
           "V8_GEN_TORQUE_GENERATED_" +
-          UnderlinifyPath(SourceFileMap::PathFromV8Root(file)) + "_H_";
+          UnderlinifyPath(SourceFileMap::PathFromV8Root(file)) + "_CSA_H_";
 
       out << "}  // namespace internal\n"
           << "}  // namespace v8\n"
           << "\n";
-      out << "#endif  // " << headerDefine << "\n";
+      out << "#endif  // " << header_define << "\n";
     }
     {
-      std::ostream& out =
-          GlobalContext::GeneratedPerFile(file).class_definition_ccfile;
+      std::ostream& out = streams.class_definition_ccfile;
 
       out << "} // namespace v8\n";
       out << "} // namespace internal\n";
@@ -149,46 +149,6 @@ void ImplementationVisitor::EndGeneratedFiles() {
   }
 }
 
-void ImplementationVisitor::BeginRuntimeMacrosFile() {
-  std::ostream& source = runtime_macros_cc_;
-  std::ostream& header = runtime_macros_h_;
-
-  source << "#include \"torque-generated/runtime-macros.h\"\n\n";
-  source << "#include \"src/torque/runtime-macro-shims.h\"\n";
-  for (const std::string& include_path : GlobalContext::CppIncludes()) {
-    source << "#include " << StringLiteralQuote(include_path) << "\n";
-  }
-  source << "\n";
-
-  source << "namespace v8 {\n"
-         << "namespace internal {\n"
-         << "\n";
-
-  const char* kHeaderDefine = "V8_GEN_TORQUE_GENERATED_RUNTIME_MACROS_H_";
-  header << "#ifndef " << kHeaderDefine << "\n";
-  header << "#define " << kHeaderDefine << "\n\n";
-  header << "#include \"src/builtins/torque-csa-header-includes.h\"\n";
-  header << "\n";
-
-  header << "namespace v8 {\n"
-         << "namespace internal {\n"
-         << "\n";
-}
-
-void ImplementationVisitor::EndRuntimeMacrosFile() {
-  std::ostream& source = runtime_macros_cc_;
-  std::ostream& header = runtime_macros_h_;
-
-  source << "}  // namespace internal\n"
-         << "}  // namespace v8\n"
-         << "\n";
-
-  header << "\n}  // namespace internal\n"
-         << "}  // namespace v8\n"
-         << "\n";
-  header << "#endif  // V8_GEN_TORQUE_GENERATED_RUNTIME_MACROS_H_\n";
-}
-
 void ImplementationVisitor::Visit(NamespaceConstant* decl) {
   Signature signature{{}, base::nullopt, {{}, false}, 0, decl->type(),
                       {}, false};
@@ -356,13 +316,21 @@ void ImplementationVisitor::VisitMacroCommon(Macro* macro) {
   GenerateMacroFunctionDeclaration(csa_headerfile(), macro);
   csa_headerfile() << ";\n";
 
+  // Avoid multiple-definition errors since it is possible for multiple
+  // generated -inl.inc files to all contain function definitions for the same
+  // Torque macro.
+  if (output_type_ == OutputType::kCC) {
+    csa_ccfile() << "#ifndef V8_INTERNAL_DEFINED_" << macro->CCName() << "\n";
+    csa_ccfile() << "#define V8_INTERNAL_DEFINED_" << macro->CCName() << "\n";
+  }
+
   GenerateMacroFunctionDeclaration(csa_ccfile(), macro);
   csa_ccfile() << " {\n";
 
   if (output_type_ == OutputType::kCC) {
     // For now, generated C++ is only for field offset computations. If we ever
     // generate C++ code that can allocate, then it should be handlified.
-    csa_ccfile() << "  DisallowHeapAllocation no_gc;\n";
+    csa_ccfile() << "  DisallowGarbageCollection no_gc;\n";
   } else {
     csa_ccfile() << "  compiler::CodeAssembler ca_(state_);\n";
     csa_ccfile()
@@ -469,7 +437,12 @@ void ImplementationVisitor::VisitMacroCommon(Macro* macro) {
     }
     csa_ccfile() << ";\n";
   }
-  csa_ccfile() << "}\n\n";
+  csa_ccfile() << "}\n";
+  if (output_type_ == OutputType::kCC) {
+    csa_ccfile() << "#endif //  V8_INTERNAL_DEFINED_" << macro->CCName()
+                 << "\n";
+  }
+  csa_ccfile() << "\n";
 }
 
 void ImplementationVisitor::Visit(TorqueMacro* macro) {
@@ -1380,7 +1353,8 @@ LocationReference ImplementationVisitor::GenerateFieldReferenceForInit(
     VisitResult length =
         GenerateCopy(layout.array_lengths.at(field.name_and_type.name));
     result_range.Extend(length.stack_range());
-    const Type* slice_type = TypeOracle::GetSliceType(field.name_and_type.type);
+    const Type* slice_type =
+        TypeOracle::GetMutableSliceType(field.name_and_type.type);
     return LocationReference::HeapSlice(VisitResult(slice_type, result_range));
   } else {
     // Const fields are writable during initialization.
@@ -1696,13 +1670,13 @@ void ImplementationVisitor::GenerateImplementation(const std::string& dir) {
     WriteFile(base_filename + "-tq-csa.h", streams.csa_headerfile.str());
     WriteFile(base_filename + "-tq.inc",
               streams.class_definition_headerfile.str());
-    WriteFile(base_filename + "-tq-inl.inc",
-              streams.class_definition_inline_headerfile.str());
+    WriteFile(
+        base_filename + "-tq-inl.inc",
+        streams.class_definition_inline_headerfile_macro_declarations.str() +
+            streams.class_definition_inline_headerfile_macro_definitions.str() +
+            streams.class_definition_inline_headerfile.str());
     WriteFile(base_filename + "-tq.cc", streams.class_definition_ccfile.str());
   }
-
-  WriteFile(dir + "/runtime-macros.h", runtime_macros_h_.str());
-  WriteFile(dir + "/runtime-macros.cc", runtime_macros_cc_.str());
 }
 
 void ImplementationVisitor::GenerateMacroFunctionDeclaration(std::ostream& o,
@@ -1718,6 +1692,9 @@ std::vector<std::string> ImplementationVisitor::GenerateFunctionDeclaration(
     const Signature& signature, const NameVector& parameter_names,
     bool pass_code_assembler_state) {
   std::vector<std::string> generated_parameter_names;
+  if (output_type_ == OutputType::kCC) {
+    o << "inline ";
+  }
   if (signature.return_type->IsVoidOrNever()) {
     o << "void";
   } else {
@@ -2235,8 +2212,8 @@ LocationReference ImplementationVisitor::GetLocationReference(
   VisitResult index = Visit(expr->index);
   if (reference.IsHeapSlice()) {
     Arguments arguments{{index}, {}};
-    const AggregateType* slice_type =
-        AggregateType::cast(reference.heap_slice().type());
+    const StructType* slice_type =
+        *reference.heap_slice().type()->StructSupertype();
     Method* method = LookupMethod("AtIndex", slice_type, arguments, {});
     // The reference has to be treated like a normal value when calling methods
     // on the underlying slice implementation.
@@ -2676,10 +2653,12 @@ VisitResult ImplementationVisitor::GenerateCall(
 
     // If we're currently generating a C++ macro and it's calling another macro,
     // then we need to make sure that we also generate C++ code for the called
-    // macro.
+    // macro within the same -inl.inc file.
     if (output_type_ == OutputType::kCC && !inline_macro) {
       if (auto* torque_macro = TorqueMacro::DynamicCast(macro)) {
-        GlobalContext::EnsureInCCOutputList(torque_macro);
+        auto* streams = CurrentFileStreams::Get();
+        SourceId file = streams ? streams->file : SourceId::Invalid();
+        GlobalContext::EnsureInCCOutputList(torque_macro, file);
       }
     }
 
@@ -2953,7 +2932,7 @@ VisitResult ImplementationVisitor::Visit(CallMethodExpression* expr) {
     target = LocationReference::Temporary(result, "this parameter");
   }
   const AggregateType* target_type =
-      AggregateType::DynamicCast(*target.ReferencedType());
+      (*target.ReferencedType())->AggregateSupertype().value_or(nullptr);
   if (!target_type) {
     ReportError("target of method call not a struct or class type");
   }
@@ -3175,11 +3154,11 @@ void ImplementationVisitor::VisitAllDeclarables() {
 
   // Do the same for macros which generate C++ code.
   output_type_ = OutputType::kCC;
-  const std::vector<TorqueMacro*>& cc_macros =
+  const std::vector<std::pair<TorqueMacro*, SourceId>>& cc_macros =
       GlobalContext::AllMacrosForCCOutput();
   for (size_t i = 0; i < cc_macros.size(); ++i) {
     try {
-      Visit(static_cast<Declarable*>(cc_macros[i]));
+      Visit(static_cast<Declarable*>(cc_macros[i].first), cc_macros[i].second);
     } catch (TorqueAbortCompilation&) {
       // Recover from compile errors here. The error is recorded already.
     }
@@ -3187,11 +3166,13 @@ void ImplementationVisitor::VisitAllDeclarables() {
   output_type_ = OutputType::kCSA;
 }
 
-void ImplementationVisitor::Visit(Declarable* declarable) {
+void ImplementationVisitor::Visit(Declarable* declarable,
+                                  base::Optional<SourceId> file) {
   CurrentScope::Scope current_scope(declarable->ParentScope());
   CurrentSourcePosition::Scope current_source_position(declarable->Position());
   CurrentFileStreams::Scope current_file_streams(
-      &GlobalContext::GeneratedPerFile(declarable->Position().source));
+      &GlobalContext::GeneratedPerFile(file ? *file
+                                            : declarable->Position().source));
   if (Callable* callable = Callable::DynamicCast(declarable)) {
     if (!callable->ShouldGenerateExternalCode(output_type_))
       CurrentFileStreams::Get() = nullptr;
@@ -3735,7 +3716,8 @@ void CppClassGenerator::GenerateClass() {
        << "    \"Pass in " << super_->name()
        << " as second template parameter for " << gen_name_ << ".\");\n";
   hdr_ << " public: \n";
-  hdr_ << "  using Super = P;\n\n";
+  hdr_ << "  using Super = P;\n";
+  hdr_ << "  using TorqueGeneratedClass = " << gen_name_ << "<D,P>;\n\n";
   if (!type_->ShouldExport() && !type_->IsExtern()) {
     hdr_ << " protected: // not extern or @export\n";
   }
@@ -3781,8 +3763,9 @@ void CppClassGenerator::GenerateClass() {
   if (!index_fields.has_value()) {
     hdr_ << "  // SizeFor implementations not generated due to complex array "
             "lengths\n\n";
-  } else if (!type_->IsAbstract() &&
-             !type_->IsSubtypeOf(TypeOracle::GetJSObjectType())) {
+  } else if (type_->ShouldGenerateBodyDescriptor() ||
+             (!type_->IsAbstract() &&
+              !type_->IsSubtypeOf(TypeOracle::GetJSObjectType()))) {
     hdr_ << "  V8_INLINE static constexpr int32_t SizeFor(";
     bool first = true;
     for (const Field& field : *index_fields) {
@@ -3805,9 +3788,9 @@ void CppClassGenerator::GenerateClass() {
         hdr_ << "    size += " << index_name_and_type.name << " * "
              << field_size << ";\n";
       }
-      if (type_->size().Alignment() < TargetArchitecture::TaggedSize()) {
-        hdr_ << "    size = OBJECT_POINTER_ALIGN(size);\n";
-      }
+    }
+    if (type_->size().Alignment() < TargetArchitecture::TaggedSize()) {
+      hdr_ << "    size = OBJECT_POINTER_ALIGN(size);\n";
     }
     hdr_ << "    return size;\n";
     hdr_ << "  }\n\n";
@@ -4060,12 +4043,15 @@ void CppClassGenerator::GenerateFieldAccessorForSmi(const Field& f) {
     inl_ << "int i, ";
   }
   inl_ << type << " value) {\n";
+  const char* write_macro =
+      f.relaxed_write ? "RELAXED_WRITE_FIELD" : "WRITE_FIELD";
   if (f.index) {
     GenerateBoundsDCheck(inl_, "i", type_, f);
     inl_ << "  int offset = " << offset << " + i * kTaggedSize;\n";
-    inl_ << "  WRITE_FIELD(*this, offset, Smi::FromInt(value));\n";
+    inl_ << "  " << write_macro << "(*this, offset, Smi::FromInt(value));\n";
   } else {
-    inl_ << "  WRITE_FIELD(*this, " << offset << ", Smi::FromInt(value));\n";
+    inl_ << "  " << write_macro << "(*this, " << offset
+         << ", Smi::FromInt(value));\n";
   }
   inl_ << "}\n\n";
 }
@@ -4105,12 +4091,6 @@ void CppClassGenerator::GenerateFieldAccessorForTagged(const Field& f) {
   inl_ << type << " " << gen_name_ << "<D, P>::" << name
        << "(IsolateRoot isolate" << (f.index ? ", int i" : "") << ") const {\n";
 
-  // TODO(tebbi): The distinction between relaxed and non-relaxed accesses here
-  // is pretty arbitrary and just tries to preserve what was there before.
-  // It currently doesn't really make a difference due to concurrent marking
-  // turning all loads and stores to be relaxed. We should probably drop the
-  // distinction at some point, even though in principle non-relaxed operations
-  // would give us TSAN protection.
   if (f.index) {
     GenerateBoundsDCheck(inl_, "i", type_, f);
     inl_ << "  int offset = " << offset << " + i * kTaggedSize;\n";
@@ -4135,16 +4115,15 @@ void CppClassGenerator::GenerateFieldAccessorForTagged(const Field& f) {
   if (!type_check.empty()) {
     inl_ << "  SLOW_DCHECK(" << type_check << ");\n";
   }
+  const char* write_macro =
+      strong_pointer ? (f.relaxed_write ? "RELAXED_WRITE_FIELD" : "WRITE_FIELD")
+                     : "RELAXED_WRITE_WEAK_FIELD";
   if (f.index) {
     GenerateBoundsDCheck(inl_, "i", type_, f);
-    const char* write_macro =
-        strong_pointer ? "WRITE_FIELD" : "RELAXED_WRITE_WEAK_FIELD";
     inl_ << "  int offset = " << offset << " + i * kTaggedSize;\n";
     offset = "offset";
     inl_ << "  " << write_macro << "(*this, offset, value);\n";
   } else {
-    const char* write_macro =
-        strong_pointer ? "RELAXED_WRITE_FIELD" : "RELAXED_WRITE_WEAK_FIELD";
     inl_ << "  " << write_macro << "(*this, " << offset << ", value);\n";
   }
   const char* write_barrier = strong_pointer ? "CONDITIONAL_WRITE_BARRIER"
@@ -4178,8 +4157,8 @@ void ImplementationVisitor::GenerateClassDefinitions(
   std::string forward_declarations_filename = "class-forward-declarations.h";
 
   {
-    factory_impl << "#include \"src/heap/factory.h\"\n";
-    factory_impl << "#include \"src/heap/factory-inl.h\"\n";
+    factory_impl << "#include \"src/heap/factory-base.h\"\n";
+    factory_impl << "#include \"src/heap/factory-base-inl.h\"\n";
     factory_impl << "#include \"src/heap/heap.h\"\n";
     factory_impl << "#include \"src/heap/heap-inl.h\"\n";
     factory_impl << "#include \"src/execution/isolate.h\"\n";
@@ -4222,24 +4201,25 @@ void ImplementationVisitor::GenerateClassDefinitions(
       }
       if (type->ShouldExport() && !type->IsAbstract() &&
           !type->HasCustomMap()) {
-        factory_header << type->HandlifiedCppTypeName() << " New"
-                       << type->name() << "(";
-        factory_impl << type->HandlifiedCppTypeName() << " Factory::New"
-                     << type->name() << "(";
-
+        std::string return_type = type->HandlifiedCppTypeName();
+        std::string function_name = "New" + type->name();
+        std::stringstream parameters;
         for (const Field& f : type->ComputeAllFields()) {
           if (f.name_and_type.name == "map") continue;
           if (!f.index) {
             std::string type_string =
                 f.name_and_type.type->HandlifiedCppTypeName();
-            factory_header << type_string << " " << f.name_and_type.name
-                           << ", ";
-            factory_impl << type_string << " " << f.name_and_type.name << ", ";
+            parameters << type_string << " " << f.name_and_type.name << ", ";
           }
         }
+        parameters << "AllocationType allocation_type";
 
-        factory_header << "AllocationType allocation_type);\n";
-        factory_impl << "AllocationType allocation_type) {\n";
+        factory_header << return_type << " " << function_name << "("
+                       << parameters.str() << ");\n";
+        factory_impl << "template <typename Impl>\n";
+        factory_impl << return_type
+                     << " TorqueGeneratedFactory<Impl>::" << function_name
+                     << "(" << parameters.str() << ") {\n";
 
         factory_impl << " int size = ";
         const ClassType* super = type->GetSuperClass();
@@ -4260,25 +4240,22 @@ void ImplementationVisitor::GenerateClassDefinitions(
         }
 
         factory_impl << ");\n";
-        factory_impl << "  ReadOnlyRoots roots(isolate());\n";
+        factory_impl << "  Map map = factory()->read_only_roots()."
+                     << SnakeifyString(type->name()) << "_map();";
         factory_impl << "  HeapObject result =\n";
-        factory_impl << "    "
-                        "isolate()->heap()->AllocateRawWith<Heap::kRetryOrFail>"
-                        "(size, allocation_type);\n";
+        factory_impl << "    factory()->AllocateRawWithImmortalMap(size, "
+                        "allocation_type, map);\n";
         factory_impl << "    WriteBarrierMode write_barrier_mode =\n"
                      << "       allocation_type == AllocationType::kYoung\n"
                      << "       ? SKIP_WRITE_BARRIER : UPDATE_WRITE_BARRIER;\n";
-        factory_impl << "  result.set_map_after_allocation(roots."
-                     << SnakeifyString(type->name())
-                     << "_map(), write_barrier_mode);\n";
         factory_impl << "  " << type->HandlifiedCppTypeName()
                      << " result_handle(" << type->name()
-                     << "::cast(result), isolate());\n";
+                     << "::cast(result), factory()->isolate());\n";
 
         for (const Field& f : type->ComputeAllFields()) {
           if (f.name_and_type.name == "map") continue;
           if (!f.index) {
-            factory_impl << "  result_handle->set_"
+            factory_impl << "  result_handle->TorqueGeneratedClass::set_"
                          << SnakeifyString(f.name_and_type.name) << "(";
             if (f.name_and_type.type->IsSubtypeOf(
                     TypeOracle::GetTaggedType()) &&
@@ -4294,6 +4271,16 @@ void ImplementationVisitor::GenerateClassDefinitions(
 
         factory_impl << "  return result_handle;\n";
         factory_impl << "}\n\n";
+
+        factory_impl << "template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE) "
+                     << return_type
+                     << "TorqueGeneratedFactory<Factory>::" << function_name
+                     << "(" << parameters.str() << ");\n";
+        factory_impl << "template EXPORT_TEMPLATE_DEFINE(V8_EXPORT_PRIVATE) "
+                     << return_type << "TorqueGeneratedFactory<LocalFactory>::"
+                     << function_name << "(" << parameters.str() << ");\n";
+
+        factory_impl << "\n\n";
       }
     }
 
@@ -4420,8 +4407,8 @@ base::Optional<std::string> MatchSimpleBodyDescriptor(const ClassType* type) {
                     "BodyDescriptor<", start_offset, ">");
   }
   if (!has_weak_pointers) {
-    return ToString("FixedRangeDescriptor<", start_offset, ", ", end_offset,
-                    ", ", *type->size().SingleValue(), ">");
+    return ToString("FixedRangeBodyDescriptor<", start_offset, ", ", end_offset,
+                    ">");
   }
   return base::nullopt;
 }
@@ -4679,13 +4666,15 @@ void ImplementationVisitor::GenerateClassVerifiers(
     cc_contents << "#include \"torque-generated/" << file_name << ".h\"\n";
     cc_contents << "#include "
                    "\"src/objects/all-objects-inl.h\"\n";
-    cc_contents << "#include \"torque-generated/runtime-macros.h\"\n";
 
     IncludeObjectMacrosScope object_macros(cc_contents);
 
     NamespaceScope h_namespaces(h_contents, {"v8", "internal"});
     NamespaceScope cc_namespaces(cc_contents, {"v8", "internal"});
 
+    cc_contents
+        << "#include \"torque-generated/test/torque/test-torque-tq-inl.inc\"\n";
+
     // Generate forward declarations to avoid including any headers.
     h_contents << "class Isolate;\n";
     for (const ClassType* type : TypeOracle::GetClasses()) {
diff --git a/deps/v8/src/torque/implementation-visitor.h b/deps/v8/src/torque/implementation-visitor.h
index 8846b435028111..037697e6980226 100644
--- a/deps/v8/src/torque/implementation-visitor.h
+++ b/deps/v8/src/torque/implementation-visitor.h
@@ -64,7 +64,9 @@ class LocationReference {
   static LocationReference HeapSlice(VisitResult heap_slice) {
     LocationReference result;
     DCHECK(Type::MatchUnaryGeneric(heap_slice.type(),
-                                   TypeOracle::GetSliceGeneric()));
+                                   TypeOracle::GetConstSliceGeneric()) ||
+           Type::MatchUnaryGeneric(heap_slice.type(),
+                                   TypeOracle::GetMutableSliceGeneric()));
     result.heap_slice_ = std::move(heap_slice);
     return result;
   }
@@ -142,8 +144,12 @@ class LocationReference {
       return *TypeOracle::MatchReferenceGeneric(heap_reference().type());
     }
     if (IsHeapSlice()) {
-      return *Type::MatchUnaryGeneric(heap_slice().type(),
-                                      TypeOracle::GetSliceGeneric());
+      if (auto type = Type::MatchUnaryGeneric(
+              heap_slice().type(), TypeOracle::GetMutableSliceGeneric())) {
+        return *type;
+      }
+      return Type::MatchUnaryGeneric(heap_slice().type(),
+                                     TypeOracle::GetConstSliceGeneric());
     }
     if (IsBitFieldAccess()) {
       return bit_field_->name_and_type.type;
@@ -278,6 +284,8 @@ class Binding : public T {
 
     manager_->current_bindings_[name_] = previous_binding_;
   }
+  Binding(const Binding&) = delete;
+  Binding& operator=(const Binding&) = delete;
 
   std::string BindingTypeString() const;
   bool CheckWritten() const;
@@ -300,7 +308,6 @@ class Binding : public T {
   SourcePosition declaration_position_ = CurrentSourcePosition::Get();
   bool used_;
   bool written_;
-  DISALLOW_COPY_AND_ASSIGN(Binding);
 };
 
 template <class T>
@@ -504,7 +511,7 @@ class ImplementationVisitor {
   VisitResult Visit(FieldAccessExpression* expr);
 
   void VisitAllDeclarables();
-  void Visit(Declarable* delarable);
+  void Visit(Declarable* delarable, base::Optional<SourceId> file = {});
   void Visit(TypeAlias* decl);
   VisitResult InlineMacro(Macro* macro,
                           base::Optional<LocationReference> this_reference,
@@ -554,10 +561,6 @@ class ImplementationVisitor {
 
   void BeginGeneratedFiles();
   void EndGeneratedFiles();
-  // TODO(tebbi): Switch to per-file generation for runtime macros and merge
-  // these functions into {Begin,End}GeneratedFiles().
-  void BeginRuntimeMacrosFile();
-  void EndRuntimeMacrosFile();
 
   void GenerateImplementation(const std::string& dir);
 
@@ -598,7 +601,7 @@ class ImplementationVisitor {
   //   // ... create temporary slots ...
   //   result = stack_scope.Yield(surviving_slots);
   // }
-  class StackScope {
+  class V8_NODISCARD StackScope {
    public:
     explicit StackScope(ImplementationVisitor* visitor) : visitor_(visitor) {
       base_ = visitor_->assembler().CurrentStack().AboveTop();
@@ -765,33 +768,19 @@ class ImplementationVisitor {
 
   std::ostream& csa_ccfile() {
     if (auto* streams = CurrentFileStreams::Get()) {
-      return output_type_ == OutputType::kCSA ? streams->csa_ccfile
-                                              : runtime_macros_cc_;
+      return output_type_ == OutputType::kCSA
+                 ? streams->csa_ccfile
+                 : streams
+                       ->class_definition_inline_headerfile_macro_definitions;
     }
     return null_stream_;
   }
   std::ostream& csa_headerfile() {
     if (auto* streams = CurrentFileStreams::Get()) {
-      return output_type_ == OutputType::kCSA ? streams->csa_headerfile
-                                              : runtime_macros_h_;
-    }
-    return null_stream_;
-  }
-  std::ostream& class_definition_headerfile() {
-    if (auto* streams = CurrentFileStreams::Get()) {
-      return streams->class_definition_headerfile;
-    }
-    return null_stream_;
-  }
-  std::ostream& class_definition_inline_headerfile() {
-    if (auto* streams = CurrentFileStreams::Get()) {
-      return streams->class_definition_inline_headerfile;
-    }
-    return null_stream_;
-  }
-  std::ostream& class_definition_ccfile() {
-    if (auto* streams = CurrentFileStreams::Get()) {
-      return streams->class_definition_ccfile;
+      return output_type_ == OutputType::kCSA
+                 ? streams->csa_headerfile
+                 : streams
+                       ->class_definition_inline_headerfile_macro_declarations;
     }
     return null_stream_;
   }
@@ -843,14 +832,6 @@ class ImplementationVisitor {
   std::unordered_map<const Expression*, const Identifier*>
       bitfield_expressions_;
 
-  // The contents of the runtime macros output files. These contain all Torque
-  // macros that have been generated using the C++ backend. They're not yet
-  // split per source file like CSA macros, but eventually we should change them
-  // to generate -inl.inc files so that callers can easily inline their
-  // contents.
-  std::stringstream runtime_macros_cc_;
-  std::stringstream runtime_macros_h_;
-
   OutputType output_type_ = OutputType::kCSA;
 };
 
diff --git a/deps/v8/src/torque/instructions.cc b/deps/v8/src/torque/instructions.cc
index 6acef3018cde69..90f392e00068d8 100644
--- a/deps/v8/src/torque/instructions.cc
+++ b/deps/v8/src/torque/instructions.cc
@@ -595,7 +595,9 @@ DefinitionLocation UnsafeCastInstruction::GetValueDefinition() const {
 void LoadReferenceInstruction::TypeInstruction(Stack<const Type*>* stack,
                                                ControlFlowGraph* cfg) const {
   ExpectType(TypeOracle::GetIntPtrType(), stack->Pop());
-  ExpectSubtype(stack->Pop(), TypeOracle::GetHeapObjectType());
+  ExpectSubtype(stack->Pop(), TypeOracle::GetUnionType(
+                                  TypeOracle::GetHeapObjectType(),
+                                  TypeOracle::GetTaggedZeroPatternType()));
   DCHECK_EQ(std::vector<const Type*>{type}, LowerType(type));
   stack->Push(type);
 }
@@ -615,7 +617,9 @@ void StoreReferenceInstruction::TypeInstruction(Stack<const Type*>* stack,
                                                 ControlFlowGraph* cfg) const {
   ExpectSubtype(stack->Pop(), type);
   ExpectType(TypeOracle::GetIntPtrType(), stack->Pop());
-  ExpectSubtype(stack->Pop(), TypeOracle::GetHeapObjectType());
+  ExpectSubtype(stack->Pop(), TypeOracle::GetUnionType(
+                                  TypeOracle::GetHeapObjectType(),
+                                  TypeOracle::GetTaggedZeroPatternType()));
 }
 
 void StoreReferenceInstruction::RecomputeDefinitionLocations(
diff --git a/deps/v8/src/torque/runtime-macro-shims.h b/deps/v8/src/torque/runtime-macro-shims.h
index 89e566bc6229ef..a7c017f93d3b27 100644
--- a/deps/v8/src/torque/runtime-macro-shims.h
+++ b/deps/v8/src/torque/runtime-macro-shims.h
@@ -8,10 +8,13 @@
 #ifndef V8_TORQUE_RUNTIME_MACRO_SHIMS_H_
 #define V8_TORQUE_RUNTIME_MACRO_SHIMS_H_
 
-#include "src/objects/smi.h"
+#include <cstdint>
 
 namespace v8 {
 namespace internal {
+
+class Isolate;
+
 namespace TorqueRuntimeMacroShims {
 namespace CodeStubAssembler {
 
@@ -26,7 +29,10 @@ inline intptr_t IntPtrMul(Isolate* isolate, intptr_t a, intptr_t b) {
 inline intptr_t Signed(Isolate* isolate, uintptr_t u) {
   return static_cast<intptr_t>(u);
 }
-inline int32_t SmiUntag(Isolate* isolate, Smi s) { return s.value(); }
+template <typename Smi>
+inline int32_t SmiUntag(Isolate* isolate, Smi s) {
+  return s.value();
+}
 
 }  // namespace CodeStubAssembler
 }  // namespace TorqueRuntimeMacroShims
diff --git a/deps/v8/src/torque/torque-compiler.cc b/deps/v8/src/torque/torque-compiler.cc
index 9e00412ca16584..88b3b945669b6d 100644
--- a/deps/v8/src/torque/torque-compiler.cc
+++ b/deps/v8/src/torque/torque-compiler.cc
@@ -76,7 +76,6 @@ void CompileCurrentAst(TorqueCompilerOptions options) {
 
   implementation_visitor.GenerateInstanceTypes(output_directory);
   implementation_visitor.BeginGeneratedFiles();
-  implementation_visitor.BeginRuntimeMacrosFile();
 
   implementation_visitor.VisitAllDeclarables();
 
@@ -96,7 +95,6 @@ void CompileCurrentAst(TorqueCompilerOptions options) {
   implementation_visitor.GenerateCSATypes(output_directory);
 
   implementation_visitor.EndGeneratedFiles();
-  implementation_visitor.EndRuntimeMacrosFile();
   implementation_visitor.GenerateImplementation(output_directory);
 
   if (GlobalContext::collect_language_server_data()) {
diff --git a/deps/v8/src/torque/torque-parser.cc b/deps/v8/src/torque/torque-parser.cc
index d71d204b92f209..b8845e60ab371d 100644
--- a/deps/v8/src/torque/torque-parser.cc
+++ b/deps/v8/src/torque/torque-parser.cc
@@ -1281,6 +1281,9 @@ base::Optional<ParseResult> MakeEnumDeclaration(
     NamingConventionError("Type", name, "UpperCamelCase");
   }
 
+  if (constexpr_generates_opt && *constexpr_generates_opt == name) {
+    Lint("Unnecessary 'constexpr' clause for enum ", name);
+  }
   auto constexpr_generates =
       constexpr_generates_opt ? *constexpr_generates_opt : name;
   const bool generate_nonconstexpr = base_type_expression.has_value();
@@ -1830,17 +1833,7 @@ base::Optional<ParseResult> MakeNumberLiteralExpression(
   // Meanwhile, we type it as constexpr float64 when out of int32 range.
   double value = 0;
   try {
-#if defined(V8_OS_SOLARIS)
-    // stod() on Solaris does not currently support hex strings. Use strtol()
-    // specifically for hex literals until stod() support is available.
-    if (number.find("0x") || number.find("0X")) {
-      value = static_cast<double>(strtol(number.c_str(), nullptr, 0));
-    } else {
-      value = std::stod(number);
-    }
-#else
     value = std::stod(number);
-#endif // !defined(V8_OS_SOLARIS)
   } catch (const std::out_of_range&) {
     Error("double literal out-of-range").Throw();
   }
@@ -1949,9 +1942,11 @@ base::Optional<ParseResult> MakeAnnotation(ParseResultIterator* child_results) {
 }
 
 base::Optional<ParseResult> MakeClassField(ParseResultIterator* child_results) {
-  AnnotationSet annotations(child_results, {ANNOTATION_NO_VERIFIER},
+  AnnotationSet annotations(child_results,
+                            {ANNOTATION_NO_VERIFIER, ANNOTATION_RELAXED_WRITE},
                             {ANNOTATION_IF, ANNOTATION_IFNOT});
   bool generate_verify = !annotations.Contains(ANNOTATION_NO_VERIFIER);
+  bool relaxed_write = annotations.Contains(ANNOTATION_RELAXED_WRITE);
   std::vector<ConditionalAnnotation> conditions;
   base::Optional<std::string> if_condition =
       annotations.GetStringParam(ANNOTATION_IF);
@@ -1974,7 +1969,8 @@ base::Optional<ParseResult> MakeClassField(ParseResultIterator* child_results) {
                                           std::move(conditions),
                                           weak,
                                           const_qualified,
-                                          generate_verify}};
+                                          generate_verify,
+                                          relaxed_write}};
 }
 
 base::Optional<ParseResult> MakeStructField(
diff --git a/deps/v8/src/torque/type-oracle.h b/deps/v8/src/torque/type-oracle.h
index d81f297ac6de81..88b4b829d95c2a 100644
--- a/deps/v8/src/torque/type-oracle.h
+++ b/deps/v8/src/torque/type-oracle.h
@@ -97,9 +97,13 @@ class TypeOracle : public ContextualClass<TypeOracle> {
   static base::Optional<const Type*> MatchReferenceGeneric(
       const Type* reference_type, bool* is_const = nullptr);
 
-  static GenericType* GetSliceGeneric() {
+  static GenericType* GetMutableSliceGeneric() {
     return Declarations::LookupUniqueGenericType(
-        QualifiedName({TORQUE_INTERNAL_NAMESPACE_STRING}, SLICE_TYPE_STRING));
+        QualifiedName(MUTABLE_SLICE_TYPE_STRING));
+  }
+  static GenericType* GetConstSliceGeneric() {
+    return Declarations::LookupUniqueGenericType(
+        QualifiedName(CONST_SLICE_TYPE_STRING));
   }
 
   static GenericType* GetWeakGeneric() {
@@ -122,8 +126,11 @@ class TypeOracle : public ContextualClass<TypeOracle> {
     return GetReferenceType(referenced_type, false);
   }
 
-  static const Type* GetSliceType(const Type* referenced_type) {
-    return GetGenericTypeInstance(GetSliceGeneric(), {referenced_type});
+  static const Type* GetMutableSliceType(const Type* referenced_type) {
+    return GetGenericTypeInstance(GetMutableSliceGeneric(), {referenced_type});
+  }
+  static const Type* GetConstSliceType(const Type* referenced_type) {
+    return GetGenericTypeInstance(GetConstSliceGeneric(), {referenced_type});
   }
 
   static const std::vector<const BuiltinPointerType*>&
@@ -202,6 +209,10 @@ class TypeOracle : public ContextualClass<TypeOracle> {
     return Get().GetBuiltinType(HEAP_OBJECT_TYPE_STRING);
   }
 
+  static const Type* GetTaggedZeroPatternType() {
+    return Get().GetBuiltinType(TAGGED_ZERO_PATTERN_TYPE_STRING);
+  }
+
   static const Type* GetJSAnyType() {
     return Get().GetBuiltinType(JSANY_TYPE_STRING);
   }
diff --git a/deps/v8/src/torque/type-visitor.cc b/deps/v8/src/torque/type-visitor.cc
index a706fc561dd8d2..b0441399c01400 100644
--- a/deps/v8/src/torque/type-visitor.cc
+++ b/deps/v8/src/torque/type-visitor.cc
@@ -212,6 +212,7 @@ const StructType* TypeVisitor::ComputeType(
             offset.SingleValue(),
             false,
             field.const_qualified,
+            false,
             false};
     auto optional_size = SizeOf(f.name_and_type.type);
     struct_type->RegisterField(f);
@@ -299,7 +300,12 @@ const ClassType* TypeVisitor::ComputeType(
   if (flags & ClassFlag::kExtern) {
     if (decl->generates) {
       bool enforce_tnode_type = true;
-      generates = ComputeGeneratesType(decl->generates, enforce_tnode_type);
+      std::string explicit_generates =
+          ComputeGeneratesType(decl->generates, enforce_tnode_type);
+      if (explicit_generates == generates) {
+        Lint("Unnecessary 'generates' clause for class ", decl->name->value);
+      }
+      generates = explicit_generates;
     }
     if (flags & ClassFlag::kExport) {
       Error("cannot export a class that is marked extern");
@@ -313,8 +319,7 @@ const ClassType* TypeVisitor::ComputeType(
         Error("non-external classes must have defined layouts");
       }
     }
-    flags = flags | ClassFlag::kGeneratePrint | ClassFlag::kGenerateVerify |
-            ClassFlag::kGenerateBodyDescriptor;
+    flags = flags | ClassFlag::kGeneratePrint | ClassFlag::kGenerateVerify;
   }
   if (!(flags & ClassFlag::kExtern) &&
       (flags & ClassFlag::kHasSameInstanceTypeAsParent)) {
@@ -428,7 +433,8 @@ void TypeVisitor::VisitClassFieldsAndMethods(
          class_offset.SingleValue(),
          field_expression.weak,
          field_expression.const_qualified,
-         field_expression.generate_verify});
+         field_expression.generate_verify,
+         field_expression.relaxed_write});
     ResidueClass field_size = std::get<0>(field.GetFieldSizeInformation());
     if (field.index) {
       // Validate that a value at any index in a packed array is aligned
diff --git a/deps/v8/src/torque/types.cc b/deps/v8/src/torque/types.cc
index 70dc0fb9fe7ae0..848fb21e089ad2 100644
--- a/deps/v8/src/torque/types.cc
+++ b/deps/v8/src/torque/types.cc
@@ -128,6 +128,15 @@ base::Optional<const StructType*> Type::StructSupertype() const {
   return base::nullopt;
 }
 
+base::Optional<const AggregateType*> Type::AggregateSupertype() const {
+  for (const Type* t = this; t != nullptr; t = t->parent()) {
+    if (auto* aggregate_type = AggregateType::DynamicCast(t)) {
+      return aggregate_type;
+    }
+  }
+  return base::nullopt;
+}
+
 // static
 const Type* Type::CommonSupertype(const Type* a, const Type* b) {
   int diff = a->Depth() - b->Depth();
@@ -462,6 +471,11 @@ std::vector<Method*> AggregateType::Methods(const std::string& name) const {
   std::vector<Method*> result;
   std::copy_if(methods_.begin(), methods_.end(), std::back_inserter(result),
                [name](Macro* macro) { return macro->ReadableName() == name; });
+  if (result.empty() && parent() != nullptr) {
+    if (auto aggregate_parent = parent()->AggregateSupertype()) {
+      return (*aggregate_parent)->Methods(name);
+    }
+  }
   return result;
 }
 
@@ -511,16 +525,6 @@ void ClassType::Finalize() const {
   TypeVisitor::VisitClassFieldsAndMethods(const_cast<ClassType*>(this),
                                           this->decl_);
   is_finalized_ = true;
-  if (GenerateCppClassDefinitions() || !IsExtern()) {
-    for (const Field& f : fields()) {
-      if (f.is_weak) {
-        Error("Generation of C++ class for Torque class ", name(),
-              " is not supported yet, because field ", f.name_and_type.name,
-              ": ", *f.name_and_type.type, " is a weak field.")
-            .Position(f.pos);
-      }
-    }
-  }
   CheckForDuplicateFields();
 }
 
@@ -785,26 +789,24 @@ void ClassType::GenerateSliceAccessor(size_t field_index) {
   //
   // If the field has a known offset (in this example, 16):
   // FieldSliceClassNameFieldName(o: ClassName) {
-  //   return torque_internal::Slice<FieldType> {
+  //     return torque_internal::unsafe::New{Const,Mutable}Slice<FieldType>(
   //     object: o,
   //     offset: 16,
   //     length: torque_internal::%IndexedFieldLength<ClassName>(
-  //                 o, "field_name")),
-  //     unsafeMarker: torque_internal::Unsafe {}
-  //   };
+  //                 o, "field_name")
+  //   );
   // }
   //
   // If the field has an unknown offset, and the previous field is named p, and
   // an item in the previous field has size 4:
   // FieldSliceClassNameFieldName(o: ClassName) {
   //   const previous = &o.p;
-  //   return torque_internal::Slice<FieldType> {
+  //     return torque_internal::unsafe::New{Const,Mutable}Slice<FieldType>(
   //     object: o,
   //     offset: previous.offset + 4 * previous.length,
   //     length: torque_internal::%IndexedFieldLength<ClassName>(
-  //                 o, "field_name")),
-  //     unsafeMarker: torque_internal::Unsafe {}
-  //   };
+  //                 o, "field_name")
+  //   );
   // }
   const Field& field = fields_[field_index];
   std::string macro_name = GetSliceMacroName(field);
@@ -813,7 +815,10 @@ void ClassType::GenerateSliceAccessor(size_t field_index) {
   signature.parameter_names.push_back(parameter_identifier);
   signature.parameter_types.types.push_back(this);
   signature.parameter_types.var_args = false;
-  signature.return_type = TypeOracle::GetSliceType(field.name_and_type.type);
+  signature.return_type =
+      field.const_qualified
+          ? TypeOracle::GetConstSliceType(field.name_and_type.type)
+          : TypeOracle::GetMutableSliceType(field.name_and_type.type);
 
   std::vector<Statement*> statements;
   Expression* offset_expression = nullptr;
@@ -873,25 +878,18 @@ void ClassType::GenerateSliceAccessor(size_t field_index) {
       {parameter, MakeNode<StringLiteralExpression>(
                       StringLiteralQuote(field.name_and_type.name))});
 
-  // torque_internal::Unsafe {}
-  Expression* unsafe_expression = MakeStructExpression(
-      MakeBasicTypeExpression({"torque_internal"}, "Unsafe"), {});
-
-  // torque_internal::Slice<FieldType> {
+  // torque_internal::unsafe::New{Const,Mutable}Slice<FieldType>(
   //   object: o,
   //   offset: <<offset_expression>>,
   //   length: torque_internal::%IndexedFieldLength<ClassName>(
-  //               o, "field_name")),
-  //   unsafeMarker: torque_internal::Unsafe {}
-  // }
-  Expression* slice_expression = MakeStructExpression(
-      MakeBasicTypeExpression(
-          {"torque_internal"}, "Slice",
-          {MakeNode<PrecomputedTypeExpression>(field.name_and_type.type)}),
-      {{MakeNode<Identifier>("object"), parameter},
-       {MakeNode<Identifier>("offset"), offset_expression},
-       {MakeNode<Identifier>("length"), length_expression},
-       {MakeNode<Identifier>("unsafeMarker"), unsafe_expression}});
+  //               o, "field_name")
+  // )
+  IdentifierExpression* new_struct = MakeIdentifierExpression(
+      {"torque_internal", "unsafe"},
+      field.const_qualified ? "NewConstSlice" : "NewMutableSlice",
+      {MakeNode<PrecomputedTypeExpression>(field.name_and_type.type)});
+  Expression* slice_expression = MakeCallExpression(
+      new_struct, {parameter, offset_expression, length_expression});
 
   statements.push_back(MakeNode<ReturnStatement>(slice_expression));
   Statement* block =
@@ -899,13 +897,11 @@ void ClassType::GenerateSliceAccessor(size_t field_index) {
 
   Macro* macro = Declarations::DeclareMacro(macro_name, true, base::nullopt,
                                             signature, block, base::nullopt);
-  GlobalContext::EnsureInCCOutputList(TorqueMacro::cast(macro));
+  GlobalContext::EnsureInCCOutputList(TorqueMacro::cast(macro),
+                                      macro->Position().source);
 }
 
 bool ClassType::HasStaticSize() const {
-  // Abstract classes don't have instances directly, so asking this question
-  // doesn't make sense.
-  DCHECK(!IsAbstract());
   if (IsSubtypeOf(TypeOracle::GetJSObjectType()) && !IsShape()) return false;
   return size().SingleValue().has_value();
 }
diff --git a/deps/v8/src/torque/types.h b/deps/v8/src/torque/types.h
index 25c849597db7e3..115bc5350d098d 100644
--- a/deps/v8/src/torque/types.h
+++ b/deps/v8/src/torque/types.h
@@ -139,6 +139,7 @@ class V8_EXPORT_PRIVATE Type : public TypeBase {
   std::string GetConstexprGeneratedTypeName() const;
   base::Optional<const ClassType*> ClassSupertype() const;
   base::Optional<const StructType*> StructSupertype() const;
+  base::Optional<const AggregateType*> AggregateSupertype() const;
   virtual std::vector<TypeChecker> GetTypeCheckers() const { return {}; }
   virtual std::string GetRuntimeType() const;
   static const Type* CommonSupertype(const Type* a, const Type* b);
@@ -227,6 +228,7 @@ struct Field {
   bool is_weak;
   bool const_qualified;
   bool generate_verify;
+  bool relaxed_write;
 };
 
 std::ostream& operator<<(std::ostream& os, const Field& name_and_type);
@@ -668,8 +670,8 @@ class ClassType final : public AggregateType {
                            (!HasUndefinedLayout() && !IsShape()));
   }
   bool ShouldGenerateBodyDescriptor() const {
-    if (IsAbstract()) return false;
-    return flags_ & ClassFlag::kGenerateBodyDescriptor || !IsExtern();
+    return flags_ & ClassFlag::kGenerateBodyDescriptor ||
+           (!IsAbstract() && !IsExtern());
   }
   bool DoNotGenerateCast() const {
     return flags_ & ClassFlag::kDoNotGenerateCast;
diff --git a/deps/v8/src/torque/utils.h b/deps/v8/src/torque/utils.h
index f935bf6e2266ab..0198ca2b5fd4e0 100644
--- a/deps/v8/src/torque/utils.h
+++ b/deps/v8/src/torque/utils.h
@@ -365,7 +365,7 @@ inline bool StringEndsWith(const std::string& s, const std::string& suffix) {
   return s.substr(s.size() - suffix.size()) == suffix;
 }
 
-class IfDefScope {
+class V8_NODISCARD IfDefScope {
  public:
   IfDefScope(std::ostream& os, std::string d);
   ~IfDefScope();
@@ -377,7 +377,7 @@ class IfDefScope {
   std::string d_;
 };
 
-class NamespaceScope {
+class V8_NODISCARD NamespaceScope {
  public:
   NamespaceScope(std::ostream& os,
                  std::initializer_list<std::string> namespaces);
@@ -390,7 +390,7 @@ class NamespaceScope {
   std::vector<std::string> d_;
 };
 
-class IncludeGuardScope {
+class V8_NODISCARD IncludeGuardScope {
  public:
   IncludeGuardScope(std::ostream& os, std::string file_name);
   ~IncludeGuardScope();
@@ -402,7 +402,7 @@ class IncludeGuardScope {
   std::string d_;
 };
 
-class IncludeObjectMacrosScope {
+class V8_NODISCARD IncludeObjectMacrosScope {
  public:
   explicit IncludeObjectMacrosScope(std::ostream& os);
   ~IncludeObjectMacrosScope();
diff --git a/deps/v8/src/tracing/trace-categories.h b/deps/v8/src/tracing/trace-categories.h
index 28c66a31014caf..11b786ffbb3507 100644
--- a/deps/v8/src/tracing/trace-categories.h
+++ b/deps/v8/src/tracing/trace-categories.h
@@ -27,6 +27,7 @@ PERFETTO_DEFINE_TEST_CATEGORY_PREFIXES("v8-cat", "cat", "v8.Test2");
 // List of categories used by built-in V8 trace events.
 // clang-format off
 PERFETTO_DEFINE_CATEGORIES(
+    perfetto::Category("cppgc"),
     perfetto::Category("V8.HandleInterrupts"),
     perfetto::Category("v8"),
     perfetto::Category("v8.console"),
@@ -36,6 +37,7 @@ PERFETTO_DEFINE_CATEGORIES(
     perfetto::Category::Group("devtools.timeline,v8"),
     perfetto::Category::Group("devtools.timeline,"
                               TRACE_DISABLED_BY_DEFAULT("v8.gc")),
+    perfetto::Category(TRACE_DISABLED_BY_DEFAULT("cppgc")),
     perfetto::Category(TRACE_DISABLED_BY_DEFAULT("devtools.timeline")),
     perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8")),
     perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.compile")),
@@ -49,10 +51,11 @@ PERFETTO_DEFINE_CATEGORIES(
     perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.stack_trace")),
     perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.turbofan")),
     perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.wasm.detailed")),
+    perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.wasm.turbofan")),
     perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.zone_stats")),
     perfetto::Category::Group("v8,devtools.timeline"),
     perfetto::Category::Group(TRACE_DISABLED_BY_DEFAULT("v8.turbofan") ","
-                              TRACE_DISABLED_BY_DEFAULT("v8.wasm.detailed")));
+                              TRACE_DISABLED_BY_DEFAULT("v8.wasm.turbofan")));
 // clang-format on
 
 #endif  // defined(V8_USE_PERFETTO)
diff --git a/deps/v8/src/tracing/trace-event.h b/deps/v8/src/tracing/trace-event.h
index 816e79c523245f..c2fe38849eb539 100644
--- a/deps/v8/src/tracing/trace-event.h
+++ b/deps/v8/src/tracing/trace-event.h
@@ -18,6 +18,7 @@
 #include "include/v8-platform.h"
 #include "src/base/atomicops.h"
 #include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
 
 // This header file defines implementation details of how the trace macros in
 // trace_event_common.h collect and store trace events. Anything not
@@ -434,7 +435,7 @@ SetTraceValue(T arg, unsigned char* type, uint64_t* value) {
     *type = value_type_id;                                                  \
     *value = 0;                                                             \
     STATIC_ASSERT(sizeof(arg) <= sizeof(*value));                           \
-    memcpy(value, &arg, sizeof(arg));                                       \
+    base::Memcpy(value, &arg, sizeof(arg));                                 \
   }
 INTERNAL_DECLARE_SET_TRACE_VALUE(double, TRACE_VALUE_TYPE_DOUBLE)
 INTERNAL_DECLARE_SET_TRACE_VALUE(const void*, TRACE_VALUE_TYPE_POINTER)
diff --git a/deps/v8/src/tracing/traced-value.h b/deps/v8/src/tracing/traced-value.h
index 3b1d09059de655..ec2d67f095cc10 100644
--- a/deps/v8/src/tracing/traced-value.h
+++ b/deps/v8/src/tracing/traced-value.h
@@ -25,6 +25,8 @@ class V8_EXPORT_PRIVATE TracedValue : public ConvertableToTraceFormat
 {
  public:
   ~TracedValue() override;
+  TracedValue(const TracedValue&) = delete;
+  TracedValue& operator=(const TracedValue&) = delete;
 
   static std::unique_ptr<TracedValue> Create();
 
@@ -78,8 +80,6 @@ class V8_EXPORT_PRIVATE TracedValue : public ConvertableToTraceFormat
 
   std::string data_;
   bool first_item_;
-
-  DISALLOW_COPY_AND_ASSIGN(TracedValue);
 };
 
 }  // namespace tracing
diff --git a/deps/v8/src/trap-handler/handler-inside-posix.cc b/deps/v8/src/trap-handler/handler-inside-posix.cc
index b943d3222aabf5..a59803a0b21475 100644
--- a/deps/v8/src/trap-handler/handler-inside-posix.cc
+++ b/deps/v8/src/trap-handler/handler-inside-posix.cc
@@ -60,8 +60,6 @@ class SigUnmaskStack {
     pthread_sigmask(SIG_UNBLOCK, &sigs, &old_mask_);
   }
 
-  // We'd normally use DISALLOW_COPY_AND_ASSIGN, but we're avoiding a dependency
-  // on base/macros.h
   SigUnmaskStack(const SigUnmaskStack&) = delete;
   void operator=(const SigUnmaskStack&) = delete;
 
diff --git a/deps/v8/src/trap-handler/trap-handler-internal.h b/deps/v8/src/trap-handler/trap-handler-internal.h
index f564b100828f44..843cd34b704092 100644
--- a/deps/v8/src/trap-handler/trap-handler-internal.h
+++ b/deps/v8/src/trap-handler/trap-handler-internal.h
@@ -35,8 +35,6 @@ class MetadataLock {
   MetadataLock();
   ~MetadataLock();
 
-  // We'd normally use DISALLOW_COPY_AND_ASSIGN, but we're avoiding a dependency
-  // on base/macros.h
   MetadataLock(const MetadataLock&) = delete;
   void operator=(const MetadataLock&) = delete;
 };
diff --git a/deps/v8/src/utils/address-map.h b/deps/v8/src/utils/address-map.h
index d4de76ca8c8914..6a9c513bc6c00c 100644
--- a/deps/v8/src/utils/address-map.h
+++ b/deps/v8/src/utils/address-map.h
@@ -56,6 +56,8 @@ class HeapObjectToIndexHashMap : public PointerToIndexHashMap<HeapObject> {};
 class RootIndexMap {
  public:
   explicit RootIndexMap(Isolate* isolate);
+  RootIndexMap(const RootIndexMap&) = delete;
+  RootIndexMap& operator=(const RootIndexMap&) = delete;
 
   // Returns true on successful lookup and sets *|out_root_list|.
   bool Lookup(HeapObject obj, RootIndex* out_root_list) const {
@@ -70,8 +72,6 @@ class RootIndexMap {
 
  private:
   HeapObjectToIndexHashMap* map_;
-
-  DISALLOW_COPY_AND_ASSIGN(RootIndexMap);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/utils/allocation.cc b/deps/v8/src/utils/allocation.cc
index 022ac82ea6fa28..db4d3ac13b6f32 100644
--- a/deps/v8/src/utils/allocation.cc
+++ b/deps/v8/src/utils/allocation.cc
@@ -18,6 +18,8 @@
 
 #if V8_LIBC_BIONIC
 #include <malloc.h>  // NOLINT
+
+#include "src/base/platform/wrappers.h"
 #endif
 
 namespace v8 {
@@ -93,7 +95,7 @@ void* Malloced::operator new(size_t size) {
   return result;
 }
 
-void Malloced::operator delete(void* p) { free(p); }
+void Malloced::operator delete(void* p) { base::Free(p); }
 
 char* StrDup(const char* str) {
   size_t length = strlen(str);
@@ -115,7 +117,7 @@ char* StrNDup(const char* str, size_t n) {
 void* AllocWithRetry(size_t size) {
   void* result = nullptr;
   for (int i = 0; i < kAllocationTries; ++i) {
-    result = malloc(size);
+    result = base::Malloc(size);
     if (result != nullptr) break;
     if (!OnCriticalMemoryPressure(size)) break;
   }
@@ -142,9 +144,9 @@ void AlignedFree(void* ptr) {
   _aligned_free(ptr);
 #elif V8_LIBC_BIONIC
   // Using free is not correct in general, but for V8_LIBC_BIONIC it is.
-  free(ptr);
+  base::Free(ptr);
 #else
-  free(ptr);
+  base::Free(ptr);
 #endif
 }
 
diff --git a/deps/v8/src/utils/allocation.h b/deps/v8/src/utils/allocation.h
index a82012310b8efe..283685b45ea8b0 100644
--- a/deps/v8/src/utils/allocation.h
+++ b/deps/v8/src/utils/allocation.h
@@ -161,6 +161,9 @@ class VirtualMemory final {
   // Empty VirtualMemory object, controlling no reserved memory.
   V8_EXPORT_PRIVATE VirtualMemory();
 
+  VirtualMemory(const VirtualMemory&) = delete;
+  VirtualMemory& operator=(const VirtualMemory&) = delete;
+
   // Reserves virtual memory containing an area of the given size that is
   // aligned per |alignment| rounded up to the |page_allocator|'s allocate page
   // size. The |size| must be aligned with |page_allocator|'s commit page size.
@@ -247,8 +250,6 @@ class VirtualMemory final {
   // Page allocator that controls the virtual memory.
   v8::PageAllocator* page_allocator_ = nullptr;
   base::AddressRegion region_;
-
-  DISALLOW_COPY_AND_ASSIGN(VirtualMemory);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/utils/detachable-vector.h b/deps/v8/src/utils/detachable-vector.h
index 232e89f18398ad..e921ea7c7a0d0d 100644
--- a/deps/v8/src/utils/detachable-vector.h
+++ b/deps/v8/src/utils/detachable-vector.h
@@ -11,6 +11,7 @@
 
 #include "src/base/logging.h"
 #include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace internal {
diff --git a/deps/v8/src/utils/identity-map.h b/deps/v8/src/utils/identity-map.h
index 20b5f100bf0e96..b5db881f3fe602 100644
--- a/deps/v8/src/utils/identity-map.h
+++ b/deps/v8/src/utils/identity-map.h
@@ -28,6 +28,8 @@ struct IdentityMapFindResult {
 // instantions.
 class V8_EXPORT_PRIVATE IdentityMapBase {
  public:
+  IdentityMapBase(const IdentityMapBase&) = delete;
+  IdentityMapBase& operator=(const IdentityMapBase&) = delete;
   bool empty() const { return size_ == 0; }
   int size() const { return size_; }
   int capacity() const { return capacity_; }
@@ -90,8 +92,6 @@ class V8_EXPORT_PRIVATE IdentityMapBase {
   StrongRootsEntry* strong_roots_entry_;
   uintptr_t* values_;
   bool is_iterable_;
-
-  DISALLOW_COPY_AND_ASSIGN(IdentityMapBase);
 };
 
 // Implements an identity map from object addresses to a given value type {V}.
@@ -110,6 +110,8 @@ class IdentityMap : public IdentityMapBase {
   explicit IdentityMap(Heap* heap,
                        AllocationPolicy allocator = AllocationPolicy())
       : IdentityMapBase(heap), allocator_(allocator) {}
+  IdentityMap(const IdentityMap&) = delete;
+  IdentityMap& operator=(const IdentityMap&) = delete;
   ~IdentityMap() override { Clear(); }
 
   // Searches this map for the given key using the object's address
@@ -182,12 +184,14 @@ class IdentityMap : public IdentityMapBase {
     friend class IdentityMap;
   };
 
-  class IteratableScope {
+  class V8_NODISCARD IteratableScope {
    public:
     explicit IteratableScope(IdentityMap* map) : map_(map) {
       CHECK(!map_->is_iterable());
       map_->EnableIteration();
     }
+    IteratableScope(const IteratableScope&) = delete;
+    IteratableScope& operator=(const IteratableScope&) = delete;
     ~IteratableScope() {
       CHECK(map_->is_iterable());
       map_->DisableIteration();
@@ -198,7 +202,6 @@ class IdentityMap : public IdentityMapBase {
 
    private:
     IdentityMap* map_;
-    DISALLOW_COPY_AND_ASSIGN(IteratableScope);
   };
 
  protected:
@@ -217,7 +220,6 @@ class IdentityMap : public IdentityMapBase {
 
  private:
   AllocationPolicy allocator_;
-  DISALLOW_COPY_AND_ASSIGN(IdentityMap);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/utils/locked-queue.h b/deps/v8/src/utils/locked-queue.h
index 7594cc93c33f5c..cc7ef1bc35de9b 100644
--- a/deps/v8/src/utils/locked-queue.h
+++ b/deps/v8/src/utils/locked-queue.h
@@ -20,6 +20,8 @@ template <typename Record>
 class LockedQueue final {
  public:
   inline LockedQueue();
+  LockedQueue(const LockedQueue&) = delete;
+  LockedQueue& operator=(const LockedQueue&) = delete;
   inline ~LockedQueue();
   inline void Enqueue(Record record);
   inline bool Dequeue(Record* record);
@@ -33,8 +35,6 @@ class LockedQueue final {
   base::Mutex tail_mutex_;
   Node* head_;
   Node* tail_;
-
-  DISALLOW_COPY_AND_ASSIGN(LockedQueue);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/utils/memcopy.h b/deps/v8/src/utils/memcopy.h
index ebb936d008a4d7..5f51625f5d89ad 100644
--- a/deps/v8/src/utils/memcopy.h
+++ b/deps/v8/src/utils/memcopy.h
@@ -8,10 +8,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <algorithm>
 
 #include "src/base/logging.h"
 #include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
 
 namespace v8 {
 namespace internal {
@@ -43,7 +45,7 @@ using MemCopyUint8Function = void (*)(uint8_t* dest, const uint8_t* src,
 V8_EXPORT_PRIVATE extern MemCopyUint8Function memcopy_uint8_function;
 V8_INLINE void MemCopyUint8Wrapper(uint8_t* dest, const uint8_t* src,
                                    size_t chars) {
-  memcpy(dest, src, chars);
+  base::Memcpy(dest, src, chars);
 }
 // For values < 16, the assembler function is slower than the inlined C code.
 const size_t kMinComplexMemCopy = 16;
@@ -64,7 +66,7 @@ using MemCopyUint8Function = void (*)(uint8_t* dest, const uint8_t* src,
 V8_EXPORT_PRIVATE extern MemCopyUint8Function memcopy_uint8_function;
 V8_INLINE void MemCopyUint8Wrapper(uint8_t* dest, const uint8_t* src,
                                    size_t chars) {
-  memcpy(dest, src, chars);
+  base::Memcpy(dest, src, chars);
 }
 // For values < 16, the assembler function is slower than the inlined C code.
 const size_t kMinComplexMemCopy = 16;
@@ -83,9 +85,9 @@ inline void MemCopy(void* dest, const void* src, size_t size) {
   // fixed sizes to a sequence of move instructions. This avoids the overhead of
   // the general {memcpy} function.
   switch (size) {
-#define CASE(N)           \
-  case N:                 \
-    memcpy(dest, src, N); \
+#define CASE(N)                 \
+  case N:                       \
+    base::Memcpy(dest, src, N); \
     return;
     CASE(1)
     CASE(2)
@@ -105,7 +107,7 @@ inline void MemCopy(void* dest, const void* src, size_t size) {
     CASE(16)
 #undef CASE
     default:
-      memcpy(dest, src, size);
+      base::Memcpy(dest, src, size);
       return;
   }
 }
diff --git a/deps/v8/src/utils/scoped-list.h b/deps/v8/src/utils/scoped-list.h
index 66112fafecf72d..76ffe3657300c6 100644
--- a/deps/v8/src/utils/scoped-list.h
+++ b/deps/v8/src/utils/scoped-list.h
@@ -24,7 +24,7 @@ class ZoneList;
 // add any entries if there is a ScopedList with the same backing in an inner
 // scope.
 template <typename T, typename TBacking = T>
-class ScopedList final {
+class V8_NODISCARD ScopedList final {
   // The backing can either be the same type as the list type, or, for pointers,
   // we additionally allow a void* backing store.
   static_assert((std::is_same<TBacking, T>::value) ||
diff --git a/deps/v8/src/utils/utils-inl.h b/deps/v8/src/utils/utils-inl.h
index b44d3229a13fc1..385175debac3d0 100644
--- a/deps/v8/src/utils/utils-inl.h
+++ b/deps/v8/src/utils/utils-inl.h
@@ -15,7 +15,7 @@
 namespace v8 {
 namespace internal {
 
-class TimedScope {
+class V8_NODISCARD TimedScope {
  public:
   explicit TimedScope(double* result)
       : start_(TimestampMs()), result_(result) {}
diff --git a/deps/v8/src/utils/utils.cc b/deps/v8/src/utils/utils.cc
index 827fd511c6bbf3..de4bdcdd1afe1a 100644
--- a/deps/v8/src/utils/utils.cc
+++ b/deps/v8/src/utils/utils.cc
@@ -6,11 +6,13 @@
 
 #include <stdarg.h>
 #include <sys/stat.h>
+
 #include <vector>
 
 #include "src/base/functional.h"
 #include "src/base/logging.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/utils/memcopy.h"
 
 namespace v8 {
@@ -202,7 +204,7 @@ std::vector<char> ReadCharsFromFile(FILE* file, bool* exists, bool verbose,
   for (ptrdiff_t i = 0; i < size && feof(file) == 0;) {
     ptrdiff_t read = fread(result.data() + i, 1, size - i, file);
     if (read != (size - i) && ferror(file) != 0) {
-      fclose(file);
+      base::Fclose(file);
       *exists = false;
       return std::vector<char>();
     }
@@ -216,7 +218,7 @@ std::vector<char> ReadCharsFromFile(const char* filename, bool* exists,
                                     bool verbose) {
   FILE* file = base::OS::FOpen(filename, "rb");
   std::vector<char> result = ReadCharsFromFile(file, exists, verbose, filename);
-  if (file != nullptr) fclose(file);
+  if (file != nullptr) base::Fclose(file);
   return result;
 }
 
@@ -261,7 +263,7 @@ int WriteChars(const char* filename, const char* str, int size, bool verbose) {
     return 0;
   }
   int written = WriteCharsToFile(str, size, f);
-  fclose(f);
+  base::Fclose(f);
   return written;
 }
 
diff --git a/deps/v8/src/utils/utils.h b/deps/v8/src/utils/utils.h
index af8f34030f6c28..ae963250e73b95 100644
--- a/deps/v8/src/utils/utils.h
+++ b/deps/v8/src/utils/utils.h
@@ -66,18 +66,6 @@ static T ArithmeticShiftRight(T x, int shift) {
   }
 }
 
-// Returns the maximum of the two parameters.
-template <typename T>
-constexpr T Max(T a, T b) {
-  return std::max(a, b);
-}
-
-// Returns the minimum of the two parameters.
-template <typename T>
-constexpr T Min(T a, T b) {
-  return std::min(a, b);
-}
-
 // Returns the maximum of the two parameters according to JavaScript semantics.
 template <typename T>
 T JSMax(T x, T y) {
@@ -347,48 +335,56 @@ class SetOncePointer {
   T* pointer_ = nullptr;
 };
 
+// Compare 8bit/16bit chars to 8bit/16bit chars.
+template <typename lchar, typename rchar>
+inline bool CompareCharsEqualUnsigned(const lchar* lhs, const rchar* rhs,
+                                      size_t chars) {
+  STATIC_ASSERT(std::is_unsigned<lchar>::value);
+  STATIC_ASSERT(std::is_unsigned<rchar>::value);
+  if (sizeof(*lhs) == sizeof(*rhs)) {
+    // memcmp compares byte-by-byte, but for equality it doesn't matter whether
+    // two-byte char comparison is little- or big-endian.
+    return memcmp(lhs, rhs, chars * sizeof(*lhs)) == 0;
+  }
+  for (const lchar* limit = lhs + chars; lhs < limit; ++lhs, ++rhs) {
+    if (*lhs != *rhs) return false;
+  }
+  return true;
+}
+
+template <typename lchar, typename rchar>
+inline bool CompareCharsEqual(const lchar* lhs, const rchar* rhs,
+                              size_t chars) {
+  using ulchar = typename std::make_unsigned<lchar>::type;
+  using urchar = typename std::make_unsigned<rchar>::type;
+  return CompareCharsEqualUnsigned(reinterpret_cast<const ulchar*>(lhs),
+                                   reinterpret_cast<const urchar*>(rhs), chars);
+}
+
 // Compare 8bit/16bit chars to 8bit/16bit chars.
 template <typename lchar, typename rchar>
 inline int CompareCharsUnsigned(const lchar* lhs, const rchar* rhs,
                                 size_t chars) {
-  const lchar* limit = lhs + chars;
+  STATIC_ASSERT(std::is_unsigned<lchar>::value);
+  STATIC_ASSERT(std::is_unsigned<rchar>::value);
   if (sizeof(*lhs) == sizeof(char) && sizeof(*rhs) == sizeof(char)) {
     // memcmp compares byte-by-byte, yielding wrong results for two-byte
     // strings on little-endian systems.
     return memcmp(lhs, rhs, chars);
   }
-  while (lhs < limit) {
+  for (const lchar* limit = lhs + chars; lhs < limit; ++lhs, ++rhs) {
     int r = static_cast<int>(*lhs) - static_cast<int>(*rhs);
     if (r != 0) return r;
-    ++lhs;
-    ++rhs;
   }
   return 0;
 }
 
 template <typename lchar, typename rchar>
 inline int CompareChars(const lchar* lhs, const rchar* rhs, size_t chars) {
-  DCHECK_LE(sizeof(lchar), 2);
-  DCHECK_LE(sizeof(rchar), 2);
-  if (sizeof(lchar) == 1) {
-    if (sizeof(rchar) == 1) {
-      return CompareCharsUnsigned(reinterpret_cast<const uint8_t*>(lhs),
-                                  reinterpret_cast<const uint8_t*>(rhs), chars);
-    } else {
-      return CompareCharsUnsigned(reinterpret_cast<const uint8_t*>(lhs),
-                                  reinterpret_cast<const uint16_t*>(rhs),
-                                  chars);
-    }
-  } else {
-    if (sizeof(rchar) == 1) {
-      return CompareCharsUnsigned(reinterpret_cast<const uint16_t*>(lhs),
-                                  reinterpret_cast<const uint8_t*>(rhs), chars);
-    } else {
-      return CompareCharsUnsigned(reinterpret_cast<const uint16_t*>(lhs),
-                                  reinterpret_cast<const uint16_t*>(rhs),
-                                  chars);
-    }
-  }
+  using ulchar = typename std::make_unsigned<lchar>::type;
+  using urchar = typename std::make_unsigned<rchar>::type;
+  return CompareCharsUnsigned(reinterpret_cast<const ulchar*>(lhs),
+                              reinterpret_cast<const urchar*>(rhs), chars);
 }
 
 // Calculate 10^exponent.
diff --git a/deps/v8/src/utils/vector.h b/deps/v8/src/utils/vector.h
index 506221748440c3..dad7abf0273895 100644
--- a/deps/v8/src/utils/vector.h
+++ b/deps/v8/src/utils/vector.h
@@ -141,7 +141,7 @@ class Vector {
 };
 
 template <typename T>
-class ScopedVector : public Vector<T> {
+class V8_NODISCARD ScopedVector : public Vector<T> {
  public:
   explicit ScopedVector(size_t length)
       : Vector<T>(NewArray<T>(length), length) {}
@@ -308,15 +308,14 @@ template <typename T, size_t kSize>
 class EmbeddedVector : public Vector<T> {
  public:
   EmbeddedVector() : Vector<T>(buffer_, kSize) {}
-
   explicit EmbeddedVector(const T& initial_value) : Vector<T>(buffer_, kSize) {
     std::fill_n(buffer_, kSize, initial_value);
   }
+  EmbeddedVector(const EmbeddedVector&) = delete;
+  EmbeddedVector& operator=(const EmbeddedVector&) = delete;
 
  private:
   T buffer_[kSize];
-
-  DISALLOW_COPY_AND_ASSIGN(EmbeddedVector);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h b/deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h
index af969f387e5505..bee45ad9af8637 100644
--- a/deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h
+++ b/deps/v8/src/wasm/baseline/arm/liftoff-assembler-arm.h
@@ -5,6 +5,7 @@
 #ifndef V8_WASM_BASELINE_ARM_LIFTOFF_ASSEMBLER_ARM_H_
 #define V8_WASM_BASELINE_ARM_LIFTOFF_ASSEMBLER_ARM_H_
 
+#include "src/base/platform/wrappers.h"
 #include "src/heap/memory-chunk.h"
 #include "src/wasm/baseline/liftoff-assembler.h"
 #include "src/wasm/baseline/liftoff-register.h"
@@ -15,6 +16,31 @@ namespace wasm {
 
 namespace liftoff {
 
+inline constexpr Condition ToCondition(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return eq;
+    case kUnequal:
+      return ne;
+    case kSignedLessThan:
+      return lt;
+    case kSignedLessEqual:
+      return le;
+    case kSignedGreaterThan:
+      return gt;
+    case kSignedGreaterEqual:
+      return ge;
+    case kUnsignedLessThan:
+      return lo;
+    case kUnsignedLessEqual:
+      return ls;
+    case kUnsignedGreaterThan:
+      return hi;
+    case kUnsignedGreaterEqual:
+      return hs;
+  }
+}
+
 //  half
 //  slot        Frame
 //  -----+--------------------+---------------------------
@@ -71,7 +97,7 @@ inline MemOperand GetMemOp(LiftoffAssembler* assm,
 inline Register CalculateActualAddress(LiftoffAssembler* assm,
                                        UseScratchRegisterScope* temps,
                                        Register addr_reg, Register offset_reg,
-                                       int32_t offset_imm,
+                                       uintptr_t offset_imm,
                                        Register result_reg = no_reg) {
   if (offset_reg == no_reg && offset_imm == 0) {
     if (result_reg == no_reg) {
@@ -94,7 +120,7 @@ inline Register CalculateActualAddress(LiftoffAssembler* assm,
   return actual_addr_reg;
 }
 
-inline Condition MakeUnsigned(Condition cond) {
+inline LiftoffCondition MakeUnsigned(LiftoffCondition cond) {
   switch (cond) {
     case kSignedLessThan:
       return kUnsignedLessThan;
@@ -138,14 +164,14 @@ template <void (Assembler::*op)(Register, Register, const Operand&, SBit,
           void (Assembler::*op_with_carry)(Register, Register, const Operand&,
                                            SBit, Condition)>
 inline void I64BinopI(LiftoffAssembler* assm, LiftoffRegister dst,
-                      LiftoffRegister lhs, int32_t imm) {
+                      LiftoffRegister lhs, int64_t imm) {
   // The compiler allocated registers such that either {dst == lhs} or there is
   // no overlap between the two.
   DCHECK_NE(dst.low_gp(), lhs.high_gp());
-  (assm->*op)(dst.low_gp(), lhs.low_gp(), Operand(imm), SetCC, al);
-  // Top half of the immediate sign extended, either 0 or -1.
-  int32_t sign_extend = imm < 0 ? -1 : 0;
-  (assm->*op_with_carry)(dst.high_gp(), lhs.high_gp(), Operand(sign_extend),
+  int32_t imm_low_word = static_cast<int32_t>(imm);
+  int32_t imm_high_word = static_cast<int32_t>(imm >> 32);
+  (assm->*op)(dst.low_gp(), lhs.low_gp(), Operand(imm_low_word), SetCC, al);
+  (assm->*op_with_carry)(dst.high_gp(), lhs.high_gp(), Operand(imm_high_word),
                          LeaveCC, al);
 }
 
@@ -277,6 +303,7 @@ inline void Store(LiftoffAssembler* assm, LiftoffRegister src, MemOperand dst,
     case ValueType::kI32:
     case ValueType::kOptRef:
     case ValueType::kRef:
+    case ValueType::kRtt:
       assm->str(src.gp(), dst);
       break;
     case ValueType::kI64:
@@ -310,6 +337,7 @@ inline void Load(LiftoffAssembler* assm, LiftoffRegister dst, MemOperand src,
     case ValueType::kI32:
     case ValueType::kOptRef:
     case ValueType::kRef:
+    case ValueType::kRtt:
       assm->ldr(dst.gp(), src);
       break;
     case ValueType::kI64:
@@ -445,17 +473,26 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   Pop(lr, fp);
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
-#ifdef USE_SIMULATOR
+void LiftoffAssembler::AlignFrameSize() {}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
+  // The frame_size includes the frame marker. The frame marker has already been
+  // pushed on the stack though, so we don't need to allocate memory for it
+  // anymore.
+  int frame_size = GetTotalFrameSize() - kSystemPointerSize;
+
   // When using the simulator, deal with Liftoff which allocates the stack
   // before checking it.
   // TODO(arm): Remove this when the stack check mechanism will be updated.
+  // Note: This check is only needed for simulator runs, but we run it
+  // unconditionally to make sure that the simulator executes the same code
+  // that's also executed on native hardware (see https://crbug.com/v8/11041).
   if (frame_size > KB / 2) {
     bailout(kOtherReason,
             "Stack limited to 512 bytes to avoid a bug in StackCheck");
     return;
   }
-#endif
+
   PatchingAssembler patching_assembler(AssemblerOptions{},
                                        buffer_start_ + offset,
                                        liftoff::kPatchInstructionsRequired);
@@ -661,13 +698,18 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
   STATIC_ASSERT(kTaggedSize == kInt32Size);
-  // Store the value.
-  MemOperand dst_op(dst_addr, offset_imm);
-  str(src.gp(), dst_op);
+  {
+    // Store the value.
+    UseScratchRegisterScope temps(this);
+    MemOperand dst_op =
+        liftoff::GetMemOp(this, &temps, dst_addr, offset_reg, offset_imm);
+    str(src.gp(), dst_op);
+  }
   // The write barrier.
   Label write_barrier;
   Label exit;
@@ -1462,7 +1504,7 @@ void LiftoffAssembler::FillStackSlotsWithZero(int start, int size) {
   }
 
 I32_BINOP_I(i32_add, add)
-I32_BINOP(i32_sub, sub)
+I32_BINOP_I(i32_sub, sub)
 I32_BINOP(i32_mul, mul)
 I32_BINOP_I(i32_and, and_)
 I32_BINOP_I(i32_or, orr)
@@ -1624,7 +1666,7 @@ void LiftoffAssembler::emit_i64_add(LiftoffRegister dst, LiftoffRegister lhs,
 }
 
 void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
-                                     int32_t imm) {
+                                     int64_t imm) {
   liftoff::I64BinopI<&Assembler::add, &Assembler::adc>(this, dst, lhs, imm);
 }
 
@@ -2118,25 +2160,40 @@ void LiftoffAssembler::emit_jump(Label* label) { b(label); }
 
 void LiftoffAssembler::emit_jump(Register target) { bx(target); }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
-  DCHECK_EQ(type, kWasmI32);
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+
   if (rhs == no_reg) {
+    DCHECK_EQ(type, kWasmI32);
     cmp(lhs, Operand(0));
   } else {
+    DCHECK(type == kWasmI32 ||
+           (type.is_reference_type() &&
+            (liftoff_cond == kEqual || liftoff_cond == kUnequal)));
     cmp(lhs, rhs);
   }
   b(label, cond);
 }
 
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int32_t imm) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  cmp(lhs, Operand(imm));
+  b(label, cond);
+}
+
 void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   clz(dst, src);
   mov(dst, Operand(dst, LSR, kRegSizeInBitsLog2));
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   cmp(lhs, rhs);
   mov(dst, Operand(0), LeaveCC);
   mov(dst, Operand(1), LeaveCC, cond);
@@ -2148,13 +2205,15 @@ void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
   mov(dst, Operand(dst, LSR, 5));
 }
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
   // For signed i64 comparisons, we still need to use unsigned comparison for
   // the low word (the only bit carrying signedness information is the MSB in
   // the high word).
-  Condition unsigned_cond = liftoff::MakeUnsigned(cond);
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  Condition unsigned_cond =
+      liftoff::ToCondition(liftoff::MakeUnsigned(liftoff_cond));
   Label set_cond;
   Label cont;
   LiftoffRegister dest = LiftoffRegister(dst);
@@ -2166,7 +2225,7 @@ void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
   // equal, compare the low word and use that for set_cond.
   cmp(lhs.high_gp(), rhs.high_gp());
   if (unsigned_cond == cond) {
-    cmp(lhs.low_gp(), rhs.low_gp(), kEqual);
+    cmp(lhs.low_gp(), rhs.low_gp(), eq);
     if (!speculative_move) {
       mov(dst, Operand(0));
     }
@@ -2190,9 +2249,10 @@ void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
   }
 }
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   VFPCompareAndSetFlags(liftoff::GetFloatRegister(lhs),
                         liftoff::GetFloatRegister(rhs));
   mov(dst, Operand(0), LeaveCC);
@@ -2203,9 +2263,10 @@ void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
   }
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   VFPCompareAndSetFlags(lhs, rhs);
   mov(dst, Operand(0), LeaveCC);
   mov(dst, Operand(1), LeaveCC, cond);
@@ -2222,8 +2283,15 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
   return false;
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  tst(obj, Operand(kSmiTagMask));
+  Condition condition = mode == kJumpOnSmi ? eq : ne;
+  b(condition, target);
+}
+
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
@@ -2290,6 +2358,13 @@ void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
   }
 }
 
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  bailout(kSimd, "loadlane");
+}
+
 void LiftoffAssembler::emit_i8x16_swizzle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs) {
@@ -2785,6 +2860,39 @@ void LiftoffAssembler::emit_i64x2_mul(LiftoffRegister dst, LiftoffRegister lhs,
   vmlal(NeonU32, dst_neon, tmp1.low(), tmp2.low());
 }
 
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  vmull(NeonS32, liftoff::GetSimd128Register(dst), src1.low_fp(),
+        src2.low_fp());
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  vmull(NeonU32, liftoff::GetSimd128Register(dst), src1.low_fp(),
+        src2.low_fp());
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  vmull(NeonS32, liftoff::GetSimd128Register(dst), src1.high_fp(),
+        src2.high_fp());
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  vmull(NeonU32, liftoff::GetSimd128Register(dst), src1.high_fp(),
+        src2.high_fp());
+}
+
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  bailout(kSimd, "i64x2_bitmask");
+}
+
 void LiftoffAssembler::emit_i32x4_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   vdup(Neon32, liftoff::GetSimd128Register(dst), src.gp());
@@ -2950,6 +3058,34 @@ void LiftoffAssembler::emit_i32x4_dot_i16x8_s(LiftoffRegister dst,
   vpadd(Neon32, dest.high(), scratch.low(), scratch.high());
 }
 
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  vmull(NeonS16, liftoff::GetSimd128Register(dst), src1.low_fp(),
+        src2.low_fp());
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  vmull(NeonU16, liftoff::GetSimd128Register(dst), src1.low_fp(),
+        src2.low_fp());
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  vmull(NeonS16, liftoff::GetSimd128Register(dst), src1.high_fp(),
+        src2.high_fp());
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  vmull(NeonU16, liftoff::GetSimd128Register(dst), src1.high_fp(),
+        src2.high_fp());
+}
+
 void LiftoffAssembler::emit_i16x8_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   vdup(Neon16, liftoff::GetSimd128Register(dst), src.gp());
@@ -3135,6 +3271,32 @@ void LiftoffAssembler::emit_i16x8_replace_lane(LiftoffRegister dst,
               imm_lane_idx);
 }
 
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  vmull(NeonS8, liftoff::GetSimd128Register(dst), src1.low_fp(), src2.low_fp());
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  vmull(NeonU8, liftoff::GetSimd128Register(dst), src1.low_fp(), src2.low_fp());
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  vmull(NeonS8, liftoff::GetSimd128Register(dst), src1.high_fp(),
+        src2.high_fp());
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  vmull(NeonU8, liftoff::GetSimd128Register(dst), src1.high_fp(),
+        src2.high_fp());
+}
+
 void LiftoffAssembler::emit_i8x16_shuffle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs,
@@ -3530,7 +3692,7 @@ void LiftoffAssembler::emit_f64x2_le(LiftoffRegister dst, LiftoffRegister lhs,
 void LiftoffAssembler::emit_s128_const(LiftoffRegister dst,
                                        const uint8_t imms[16]) {
   uint64_t vals[2];
-  memcpy(vals, imms, sizeof(vals));
+  base::Memcpy(vals, imms, sizeof(vals));
   vmov(dst.low_fp(), Double(vals[0]));
   vmov(dst.high_fp(), Double(vals[1]));
 }
@@ -3757,6 +3919,24 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   }
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  int spill_space_size = 0;
+  while (!all_spills.is_empty()) {
+    LiftoffRegister reg = all_spills.GetLastRegSet();
+    if (ref_spills.has(reg)) {
+      safepoint.DefinePointerSlot(spill_offset);
+    }
+    all_spills.clear(reg);
+    ++spill_offset;
+    spill_space_size += kSystemPointerSize;
+  }
+  // Record the number of additional spill slots.
+  RecordOolSpillSpaceSize(spill_space_size);
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   Drop(num_stack_slots);
   Ret();
@@ -3929,6 +4109,8 @@ void LiftoffStackSlots::Construct() {
             asm_->push(reg.gp());
           } break;
           case ValueType::kI32:
+          case ValueType::kRef:
+          case ValueType::kOptRef:
             asm_->push(src.reg().gp());
             break;
           case ValueType::kF32:
diff --git a/deps/v8/src/wasm/baseline/arm64/liftoff-assembler-arm64.h b/deps/v8/src/wasm/baseline/arm64/liftoff-assembler-arm64.h
index 402f0d2e84fd08..815586ecd198ff 100644
--- a/deps/v8/src/wasm/baseline/arm64/liftoff-assembler-arm64.h
+++ b/deps/v8/src/wasm/baseline/arm64/liftoff-assembler-arm64.h
@@ -5,6 +5,7 @@
 #ifndef V8_WASM_BASELINE_ARM64_LIFTOFF_ASSEMBLER_ARM64_H_
 #define V8_WASM_BASELINE_ARM64_LIFTOFF_ASSEMBLER_ARM64_H_
 
+#include "src/base/platform/wrappers.h"
 #include "src/heap/memory-chunk.h"
 #include "src/wasm/baseline/liftoff-assembler.h"
 
@@ -14,6 +15,31 @@ namespace wasm {
 
 namespace liftoff {
 
+inline constexpr Condition ToCondition(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return eq;
+    case kUnequal:
+      return ne;
+    case kSignedLessThan:
+      return lt;
+    case kSignedLessEqual:
+      return le;
+    case kSignedGreaterThan:
+      return gt;
+    case kSignedGreaterEqual:
+      return ge;
+    case kUnsignedLessThan:
+      return lo;
+    case kUnsignedLessEqual:
+      return ls;
+    case kUnsignedGreaterThan:
+      return hi;
+    case kUnsignedGreaterEqual:
+      return hs;
+  }
+}
+
 // Liftoff Frames.
 //
 //  slot      Frame
@@ -53,6 +79,7 @@ inline CPURegister GetRegFromType(const LiftoffRegister& reg, ValueType type) {
     case ValueType::kI64:
     case ValueType::kRef:
     case ValueType::kOptRef:
+    case ValueType::kRtt:
       return reg.gp().X();
     case ValueType::kF32:
       return reg.fp().S();
@@ -98,6 +125,8 @@ inline MemOperand GetMemOp(LiftoffAssembler* assm,
   if (offset.is_valid()) {
     if (offset_imm == 0) return MemOperand(addr.X(), offset.W(), UXTW);
     Register tmp = temps->AcquireW();
+    // TODO(clemensb): Do a 64-bit addition if memory64 is used.
+    DCHECK_GE(kMaxUInt32, offset_imm);
     assm->Add(tmp, offset.W(), offset_imm);
     return MemOperand(addr.X(), tmp, UXTW);
   }
@@ -179,6 +208,10 @@ inline void EmitAllTrue(LiftoffAssembler* assm, LiftoffRegister dst,
 int LiftoffAssembler::PrepareStackFrame() {
   int offset = pc_offset();
   InstructionAccurateScope scope(this, 1);
+  // Next we reserve the memory for the whole stack frame. We do not know yet
+  // how big the stack frame will be so we just emit a placeholder instruction.
+  // PatchPrepareStackFrame will patch this in order to increase the stack
+  // appropriately.
   sub(sp, sp, 0);
   return offset;
 }
@@ -218,7 +251,13 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   Sub(sp, x16, stack_param_delta * 8);
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
+void LiftoffAssembler::AlignFrameSize() {
+  // The frame_size includes the frame marker. The frame marker has already been
+  // pushed on the stack though, so we don't need to allocate memory for it
+  // anymore.
+  int initial_frame_size = GetTotalFrameSize() - 2 * kSystemPointerSize;
+  int frame_size = initial_frame_size;
+
   static_assert(kStackSlotSize == kXRegSize,
                 "kStackSlotSize must equal kXRegSize");
   // The stack pointer is required to be quadword aligned.
@@ -234,6 +273,23 @@ void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
       return;
     }
   }
+  if (frame_size > initial_frame_size) {
+    // Record the padding, as it is needed for GC offsets later.
+    max_used_spill_offset_ += (frame_size - initial_frame_size);
+  }
+}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
+  // The frame_size includes the frame marker. The frame marker has already been
+  // pushed on the stack though, so we don't need to allocate memory for it
+  // anymore.
+  int frame_size = GetTotalFrameSize() - 2 * kSystemPointerSize;
+
+  // The stack pointer is required to be quadword aligned.
+  // Misalignment will cause a stack alignment fault.
+  DCHECK_EQ(frame_size, RoundUp(frame_size, kQuadWordSizeInBytes));
+  DCHECK(IsImmAddSub(frame_size));
+
 #ifdef USE_SIMULATOR
   // When using the simulator, deal with Liftoff which allocates the stack
   // before checking it.
@@ -349,11 +405,14 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
   // Store the value.
-  MemOperand dst_op(dst_addr, offset_imm);
+  UseScratchRegisterScope temps(this);
+  MemOperand dst_op =
+      liftoff::GetMemOp(this, &temps, dst_addr, offset_reg, offset_imm);
   StoreTaggedField(src.gp(), dst_op);
   // The write barrier.
   Label write_barrier;
@@ -374,7 +433,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
 }
 
 void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
-                            Register offset_reg, uint32_t offset_imm,
+                            Register offset_reg, uintptr_t offset_imm,
                             LoadType type, LiftoffRegList pinned,
                             uint32_t* protected_load_pc, bool is_load_mem) {
   UseScratchRegisterScope temps(this);
@@ -425,7 +484,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
 }
 
 void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
-                             uint32_t offset_imm, LiftoffRegister src,
+                             uintptr_t offset_imm, LiftoffRegister src,
                              StoreType type, LiftoffRegList pinned,
                              uint32_t* protected_store_pc, bool is_store_mem) {
   UseScratchRegisterScope temps(this);
@@ -465,7 +524,7 @@ namespace liftoff {
 
 inline Register CalculateActualAddress(LiftoffAssembler* lasm,
                                        Register addr_reg, Register offset_reg,
-                                       int32_t offset_imm,
+                                       uintptr_t offset_imm,
                                        Register result_reg) {
   DCHECK_NE(offset_reg, no_reg);
   DCHECK_NE(addr_reg, no_reg);
@@ -479,7 +538,7 @@ inline Register CalculateActualAddress(LiftoffAssembler* lasm,
 enum class Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
 
 inline void AtomicBinop(LiftoffAssembler* lasm, Register dst_addr,
-                        Register offset_reg, uint32_t offset_imm,
+                        Register offset_reg, uintptr_t offset_imm,
                         LiftoffRegister value, LiftoffRegister result,
                         StoreType type, Binop op) {
   LiftoffRegList pinned =
@@ -576,7 +635,7 @@ inline void AtomicBinop(LiftoffAssembler* lasm, Register dst_addr,
 }  // namespace liftoff
 
 void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
-                                  Register offset_reg, uint32_t offset_imm,
+                                  Register offset_reg, uintptr_t offset_imm,
                                   LoadType type, LiftoffRegList pinned) {
   UseScratchRegisterScope temps(this);
   Register src_reg = liftoff::CalculateActualAddress(
@@ -603,7 +662,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
 }
 
 void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
-                                   uint32_t offset_imm, LiftoffRegister src,
+                                   uintptr_t offset_imm, LiftoffRegister src,
                                    StoreType type, LiftoffRegList pinned) {
   UseScratchRegisterScope temps(this);
   Register dst_reg = liftoff::CalculateActualAddress(
@@ -630,42 +689,42 @@ void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
 }
 
 void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, dst_addr, offset_reg, offset_imm, value, result,
                        type, liftoff::Binop::kAdd);
 }
 
 void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, dst_addr, offset_reg, offset_imm, value, result,
                        type, liftoff::Binop::kSub);
 }
 
 void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, dst_addr, offset_reg, offset_imm, value, result,
                        type, liftoff::Binop::kAnd);
 }
 
 void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
-                                uint32_t offset_imm, LiftoffRegister value,
+                                uintptr_t offset_imm, LiftoffRegister value,
                                 LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, dst_addr, offset_reg, offset_imm, value, result,
                        type, liftoff::Binop::kOr);
 }
 
 void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, dst_addr, offset_reg, offset_imm, value, result,
                        type, liftoff::Binop::kXor);
 }
 
 void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
-                                      uint32_t offset_imm,
+                                      uintptr_t offset_imm,
                                       LiftoffRegister value,
                                       LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, dst_addr, offset_reg, offset_imm, value, result,
@@ -673,7 +732,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
 }
 
 void LiftoffAssembler::AtomicCompareExchange(
-    Register dst_addr, Register offset_reg, uint32_t offset_imm,
+    Register dst_addr, Register offset_reg, uintptr_t offset_imm,
     LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result,
     StoreType type) {
   LiftoffRegList pinned =
@@ -956,7 +1015,7 @@ void LiftoffAssembler::FillStackSlotsWithZero(int start, int size) {
   }
 
 I32_BINOP_I(i32_add, Add)
-I32_BINOP(i32_sub, Sub)
+I32_BINOP_I(i32_sub, Sub)
 I32_BINOP(i32_mul, Mul)
 I32_BINOP_I(i32_and, And)
 I32_BINOP_I(i32_or, Orr)
@@ -964,7 +1023,7 @@ I32_BINOP_I(i32_xor, Eor)
 I32_SHIFTOP(i32_shl, Lsl)
 I32_SHIFTOP(i32_sar, Asr)
 I32_SHIFTOP(i32_shr, Lsr)
-I64_BINOP_I(i64_add, Add)
+I64_BINOP(i64_add, Add)
 I64_BINOP(i64_sub, Sub)
 I64_BINOP(i64_mul, Mul)
 I64_BINOP_I(i64_and, And)
@@ -1010,6 +1069,11 @@ FP64_UNOP(f64_sqrt, Fsqrt)
 #undef I32_SHIFTOP
 #undef I64_SHIFTOP
 
+void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
+                                     int64_t imm) {
+  Add(dst.gp().X(), lhs.gp().X(), imm);
+}
+
 void LiftoffAssembler::emit_i32_clz(Register dst, Register src) {
   Clz(dst.W(), src.W());
 }
@@ -1398,9 +1462,10 @@ void LiftoffAssembler::emit_jump(Label* label) { B(label); }
 
 void LiftoffAssembler::emit_jump(Register target) { Br(target); }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   switch (type.kind()) {
     case ValueType::kI32:
       if (rhs.is_valid()) {
@@ -1409,6 +1474,12 @@ void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
         Cmp(lhs.W(), wzr);
       }
       break;
+    case ValueType::kRef:
+    case ValueType::kOptRef:
+    case ValueType::kRtt:
+      DCHECK(rhs.is_valid());
+      DCHECK(liftoff_cond == kEqual || liftoff_cond == kUnequal);
+      V8_FALLTHROUGH;
     case ValueType::kI64:
       if (rhs.is_valid()) {
         Cmp(lhs.X(), rhs.X());
@@ -1422,13 +1493,23 @@ void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
   B(label, cond);
 }
 
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int32_t imm) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  Cmp(lhs.W(), Operand(imm));
+  B(label, cond);
+}
+
 void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   Cmp(src.W(), wzr);
   Cset(dst.W(), eq);
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Cmp(lhs.W(), rhs.W());
   Cset(dst.W(), cond);
 }
@@ -1438,16 +1519,18 @@ void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
   Cset(dst.W(), eq);
 }
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Cmp(lhs.gp().X(), rhs.gp().X());
   Cset(dst.W(), cond);
 }
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Fcmp(lhs.S(), rhs.S());
   Cset(dst.W(), cond);
   if (cond != ne) {
@@ -1456,9 +1539,10 @@ void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
   }
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Fcmp(lhs.D(), rhs.D());
   Cset(dst.W(), cond);
   if (cond != ne) {
@@ -1474,8 +1558,15 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
   return false;
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  Label* smi_label = mode == kJumpOnSmi ? target : nullptr;
+  Label* not_smi_label = mode == kJumpOnNotSmi ? target : nullptr;
+  JumpIfSmi(obj, smi_label, not_smi_label);
+}
+
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
@@ -1539,6 +1630,13 @@ void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
   }
 }
 
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  bailout(kSimd, "loadlane");
+}
+
 void LiftoffAssembler::emit_i8x16_swizzle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs) {
@@ -1890,6 +1988,35 @@ void LiftoffAssembler::emit_i64x2_mul(LiftoffRegister dst, LiftoffRegister lhs,
   Add(dst.fp().V2D(), dst.fp().V2D(), tmp1.V2D());
 }
 
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  Smull(dst.fp().V2D(), src1.fp().V2S(), src2.fp().V2S());
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  Umull(dst.fp().V2D(), src1.fp().V2S(), src2.fp().V2S());
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  Smull2(dst.fp().V2D(), src1.fp().V4S(), src2.fp().V4S());
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  Umull2(dst.fp().V2D(), src1.fp().V4S(), src2.fp().V4S());
+}
+
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  bailout(kSimd, "i64x2_bitmask");
+}
+
 void LiftoffAssembler::emit_i32x4_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   Dup(dst.fp().V4S(), src.gp().W());
@@ -2031,6 +2158,30 @@ void LiftoffAssembler::emit_i32x4_dot_i16x8_s(LiftoffRegister dst,
   Addp(dst.fp().V4S(), tmp1, tmp2);
 }
 
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  Smull(dst.fp().V4S(), src1.fp().V4H(), src2.fp().V4H());
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  Umull(dst.fp().V4S(), src1.fp().V4H(), src2.fp().V4H());
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  Smull2(dst.fp().V4S(), src1.fp().V8H(), src2.fp().V8H());
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  Umull2(dst.fp().V4S(), src1.fp().V8H(), src2.fp().V8H());
+}
+
 void LiftoffAssembler::emit_i16x8_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   Dup(dst.fp().V8H(), src.gp().W());
@@ -2532,7 +2683,7 @@ void LiftoffAssembler::emit_f64x2_le(LiftoffRegister dst, LiftoffRegister lhs,
 void LiftoffAssembler::emit_s128_const(LiftoffRegister dst,
                                        const uint8_t imms[16]) {
   uint64_t vals[2];
-  memcpy(vals, imms, sizeof(vals));
+  base::Memcpy(vals, imms, sizeof(vals));
   Movi(dst.fp().V16B(), vals[1], vals[0]);
 }
 
@@ -2709,6 +2860,30 @@ void LiftoffAssembler::emit_i16x8_abs(LiftoffRegister dst,
   Abs(dst.fp().V8H(), src.fp().V8H());
 }
 
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  Smull(dst.fp().V8H(), src1.fp().V8B(), src2.fp().V8B());
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  Umull(dst.fp().V8H(), src1.fp().V8B(), src2.fp().V8B());
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  Smull2(dst.fp().V8H(), src1.fp().V16B(), src2.fp().V16B());
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  Umull2(dst.fp().V8H(), src1.fp().V16B(), src2.fp().V16B());
+}
+
 void LiftoffAssembler::emit_i32x4_abs(LiftoffRegister dst,
                                       LiftoffRegister src) {
   Abs(dst.fp().V4S(), src.fp().V4S());
@@ -2738,6 +2913,30 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   PopCPURegList(liftoff::PadRegList(regs.GetGpList()));
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  int spill_space_size = 0;
+  bool needs_padding =
+      (base::bits::CountPopulation(all_spills.GetGpList()) & 1) != 0;
+  if (needs_padding) {
+    spill_space_size += kSystemPointerSize;
+    ++spill_offset;
+  }
+  while (!all_spills.is_empty()) {
+    LiftoffRegister reg = all_spills.GetLastRegSet();
+    if (ref_spills.has(reg)) {
+      safepoint.DefinePointerSlot(spill_offset);
+    }
+    all_spills.clear(reg);
+    ++spill_offset;
+    spill_space_size += kSystemPointerSize;
+  }
+  // Record the number of additional spill slots.
+  RecordOolSpillSpaceSize(spill_space_size);
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   DropSlots(num_stack_slots);
   Ret();
diff --git a/deps/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h b/deps/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
index 5e640093c4366d..890337fe12e162 100644
--- a/deps/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
+++ b/deps/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
@@ -5,6 +5,7 @@
 #ifndef V8_WASM_BASELINE_IA32_LIFTOFF_ASSEMBLER_IA32_H_
 #define V8_WASM_BASELINE_IA32_LIFTOFF_ASSEMBLER_IA32_H_
 
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler.h"
 #include "src/heap/memory-chunk.h"
 #include "src/wasm/baseline/liftoff-assembler.h"
@@ -21,6 +22,31 @@ namespace wasm {
 
 namespace liftoff {
 
+inline constexpr Condition ToCondition(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return equal;
+    case kUnequal:
+      return not_equal;
+    case kSignedLessThan:
+      return less;
+    case kSignedLessEqual:
+      return less_equal;
+    case kSignedGreaterThan:
+      return greater;
+    case kSignedGreaterEqual:
+      return greater_equal;
+    case kUnsignedLessThan:
+      return below;
+    case kUnsignedLessEqual:
+      return below_equal;
+    case kUnsignedGreaterThan:
+      return above;
+    case kUnsignedGreaterEqual:
+      return above_equal;
+  }
+}
+
 // ebp-4 holds the stack marker, ebp-8 is the instance parameter.
 constexpr int kInstanceOffset = 8;
 
@@ -45,6 +71,7 @@ inline void Load(LiftoffAssembler* assm, LiftoffRegister dst, Register base,
     case ValueType::kI32:
     case ValueType::kOptRef:
     case ValueType::kRef:
+    case ValueType::kRtt:
       assm->mov(dst.gp(), src);
       break;
     case ValueType::kI64:
@@ -93,6 +120,8 @@ inline void Store(LiftoffAssembler* assm, Register base, int32_t offset,
 inline void push(LiftoffAssembler* assm, LiftoffRegister reg, ValueType type) {
   switch (type.kind()) {
     case ValueType::kI32:
+    case ValueType::kRef:
+    case ValueType::kOptRef:
       assm->push(reg.gp());
       break;
     case ValueType::kI64:
@@ -158,6 +187,10 @@ constexpr int kSubSpSize = 6;  // 6 bytes for "sub esp, <imm32>"
 
 int LiftoffAssembler::PrepareStackFrame() {
   int offset = pc_offset();
+  // Next we reserve the memory for the whole stack frame. We do not know yet
+  // how big the stack frame will be so we just emit a placeholder instruction.
+  // PatchPrepareStackFrame will patch this in order to increase the stack
+  // appropriately.
   sub_sp_32(0);
   DCHECK_EQ(liftoff::kSubSpSize, pc_offset() - offset);
   return offset;
@@ -184,7 +217,13 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   pop(ebp);
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
+void LiftoffAssembler::AlignFrameSize() {}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
+  // The frame_size includes the frame marker. The frame marker has already been
+  // pushed on the stack though, so we don't need to allocate memory for it
+  // anymore.
+  int frame_size = GetTotalFrameSize() - kSystemPointerSize;
   DCHECK_EQ(frame_size % kSystemPointerSize, 0);
   // We can't run out of space, just pass anything big enough to not cause the
   // assembler to try to grow the buffer.
@@ -229,7 +268,8 @@ constexpr int LiftoffAssembler::StaticStackFrameSize() {
 }
 
 int LiftoffAssembler::SlotSizeForType(ValueType type) {
-  return type.element_size_bytes();
+  return type.is_reference_type() ? kSystemPointerSize
+                                  : type.element_size_bytes();
 }
 
 bool LiftoffAssembler::NeedsAlignment(ValueType type) {
@@ -291,6 +331,7 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
@@ -298,7 +339,9 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
   DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
   STATIC_ASSERT(kTaggedSize == kInt32Size);
   Register scratch = pinned.set(GetUnusedRegister(kGpReg, pinned)).gp();
-  Operand dst_op = Operand(dst_addr, offset_imm);
+  Operand dst_op = offset_reg == no_reg
+                       ? Operand(dst_addr, offset_imm)
+                       : Operand(dst_addr, offset_reg, times_1, offset_imm);
   mov(dst_op, src.gp());
 
   Label write_barrier;
@@ -1075,7 +1118,7 @@ void LiftoffAssembler::Move(DoubleRegister dst, DoubleRegister src,
     movsd(dst, src);
   } else {
     DCHECK_EQ(kWasmS128, type);
-    movapd(dst, src);
+    Movaps(dst, src);
   }
 }
 
@@ -1086,6 +1129,7 @@ void LiftoffAssembler::Spill(int offset, LiftoffRegister reg, ValueType type) {
     case ValueType::kI32:
     case ValueType::kOptRef:
     case ValueType::kRef:
+    case ValueType::kRtt:
       mov(dst, reg.gp());
       break;
     case ValueType::kI64:
@@ -1195,6 +1239,16 @@ void LiftoffAssembler::emit_i32_sub(Register dst, Register lhs, Register rhs) {
   }
 }
 
+void LiftoffAssembler::emit_i32_subi(Register dst, Register lhs, int32_t imm) {
+  if (dst != lhs) {
+    // We'll have to implement an UB-safe version if we need this corner case.
+    DCHECK_NE(imm, kMinInt);
+    lea(dst, Operand(lhs, -imm));
+  } else {
+    sub(dst, Immediate(imm));
+  }
+}
+
 namespace liftoff {
 template <void (Assembler::*op)(Register, Register)>
 void EmitCommutativeBinOp(LiftoffAssembler* assm, Register dst, Register lhs,
@@ -1453,20 +1507,21 @@ inline void OpWithCarry(LiftoffAssembler* assm, LiftoffRegister dst,
 template <void (Assembler::*op)(Register, const Immediate&),
           void (Assembler::*op_with_carry)(Register, int32_t)>
 inline void OpWithCarryI(LiftoffAssembler* assm, LiftoffRegister dst,
-                         LiftoffRegister lhs, int32_t imm) {
+                         LiftoffRegister lhs, int64_t imm) {
   // The compiler allocated registers such that either {dst == lhs} or there is
   // no overlap between the two.
   DCHECK_NE(dst.low_gp(), lhs.high_gp());
 
+  int32_t imm_low_word = static_cast<int32_t>(imm);
+  int32_t imm_high_word = static_cast<int32_t>(imm >> 32);
+
   // First, compute the low half of the result.
   if (dst.low_gp() != lhs.low_gp()) assm->mov(dst.low_gp(), lhs.low_gp());
-  (assm->*op)(dst.low_gp(), Immediate(imm));
+  (assm->*op)(dst.low_gp(), Immediate(imm_low_word));
 
   // Now compute the upper half.
   if (dst.high_gp() != lhs.high_gp()) assm->mov(dst.high_gp(), lhs.high_gp());
-  // Top half of the immediate sign extended, either 0 or -1.
-  int32_t sign_extend = imm < 0 ? -1 : 0;
-  (assm->*op_with_carry)(dst.high_gp(), sign_extend);
+  (assm->*op_with_carry)(dst.high_gp(), imm_high_word);
 }
 }  // namespace liftoff
 
@@ -1476,7 +1531,7 @@ void LiftoffAssembler::emit_i64_add(LiftoffRegister dst, LiftoffRegister lhs,
 }
 
 void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
-                                     int32_t imm) {
+                                     int64_t imm) {
   liftoff::OpWithCarryI<&Assembler::add, &Assembler::adc>(this, dst, lhs, imm);
 }
 
@@ -2330,11 +2385,17 @@ void LiftoffAssembler::emit_jump(Label* label) { jmp(label); }
 
 void LiftoffAssembler::emit_jump(Register target) { jmp(target); }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   if (rhs != no_reg) {
     switch (type.kind()) {
+      case ValueType::kRef:
+      case ValueType::kOptRef:
+      case ValueType::kRtt:
+        DCHECK(liftoff_cond == kEqual || liftoff_cond == kUnequal);
+        V8_FALLTHROUGH;
       case ValueType::kI32:
         cmp(lhs, rhs);
         break;
@@ -2349,6 +2410,14 @@ void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
   j(cond, label);
 }
 
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int imm) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  cmp(lhs, Immediate(imm));
+  j(cond, label);
+}
+
 namespace liftoff {
 
 // Setcc into dst register, given a scratch byte register (might be the same as
@@ -2372,8 +2441,10 @@ void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   liftoff::setcc_32(this, equal, dst);
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   cmp(lhs, rhs);
   liftoff::setcc_32(this, cond, dst);
 }
@@ -2391,7 +2462,7 @@ void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
 }
 
 namespace liftoff {
-inline Condition cond_make_unsigned(Condition cond) {
+inline LiftoffCondition cond_make_unsigned(LiftoffCondition cond) {
   switch (cond) {
     case kSignedLessThan:
       return kUnsignedLessThan;
@@ -2407,9 +2478,13 @@ inline Condition cond_make_unsigned(Condition cond) {
 }
 }  // namespace liftoff
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  Condition unsigned_cond =
+      liftoff::ToCondition(liftoff::cond_make_unsigned(liftoff_cond));
+
   // Get the tmp byte register out here, such that we don't conditionally spill
   // (this cannot be reflected in the cache state).
   Register tmp_byte_reg = liftoff::GetTmpByteRegister(this, dst);
@@ -2417,7 +2492,6 @@ void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
   // For signed i64 comparisons, we still need to use unsigned comparison for
   // the low word (the only bit carrying signedness information is the MSB in
   // the high word).
-  Condition unsigned_cond = liftoff::cond_make_unsigned(cond);
   Label setcc;
   Label cont;
   // Compare high word first. If it differs, use if for the setcc. If it's
@@ -2464,15 +2538,17 @@ void EmitFloatSetCond(LiftoffAssembler* assm, Condition cond, Register dst,
 }
 }  // namespace liftoff
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   liftoff::EmitFloatSetCond<&Assembler::ucomiss>(this, cond, dst, lhs, rhs);
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   liftoff::EmitFloatSetCond<&Assembler::ucomisd>(this, cond, dst, lhs, rhs);
 }
 
@@ -2483,6 +2559,13 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
   return false;
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  test_b(obj, Immediate(kSmiTagMask));
+  Condition condition = mode == kJumpOnSmi ? zero : not_zero;
+  j(condition, target);
+}
+
 namespace liftoff {
 template <void (Assembler::*avx_op)(XMMRegister, XMMRegister, XMMRegister),
           void (Assembler::*sse_op)(XMMRegister, XMMRegister)>
@@ -2627,7 +2710,7 @@ inline void EmitAllTrue(LiftoffAssembler* assm, LiftoffRegister dst,
 }  // namespace liftoff
 
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
@@ -2676,6 +2759,13 @@ void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
   }
 }
 
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  bailout(kSimd, "loadlane");
+}
+
 void LiftoffAssembler::emit_i8x16_shuffle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs,
@@ -3013,7 +3103,7 @@ void LiftoffAssembler::emit_f64x2_le(LiftoffRegister dst, LiftoffRegister lhs,
 void LiftoffAssembler::emit_s128_const(LiftoffRegister dst,
                                        const uint8_t imms[16]) {
   uint64_t vals[2];
-  memcpy(vals, imms, sizeof(vals));
+  base::Memcpy(vals, imms, sizeof(vals));
   TurboAssembler::Move(dst.fp(), vals[0]);
 
   uint64_t high = vals[1];
@@ -3057,17 +3147,16 @@ void LiftoffAssembler::emit_s128_select(LiftoffRegister dst,
                                         LiftoffRegister src1,
                                         LiftoffRegister src2,
                                         LiftoffRegister mask) {
-  if (CpuFeatures::IsSupported(AVX)) {
-    CpuFeatureScope scope(this, AVX);
-    vxorps(liftoff::kScratchDoubleReg, src1.fp(), src2.fp());
-    vandps(liftoff::kScratchDoubleReg, liftoff::kScratchDoubleReg, mask.fp());
-    vxorps(dst.fp(), liftoff::kScratchDoubleReg, src2.fp());
+  // Ensure that we don't overwrite any inputs with the movdqu below.
+  DCHECK_NE(dst, src1);
+  DCHECK_NE(dst, src2);
+  if (!CpuFeatures::IsSupported(AVX) && dst != mask) {
+    movdqu(dst.fp(), mask.fp());
+    S128Select(dst.fp(), dst.fp(), src1.fp(), src2.fp(),
+               liftoff::kScratchDoubleReg);
   } else {
-    movaps(liftoff::kScratchDoubleReg, src1.fp());
-    xorps(liftoff::kScratchDoubleReg, src2.fp());
-    andps(liftoff::kScratchDoubleReg, mask.fp());
-    if (dst.fp() != src2.fp()) movaps(dst.fp(), src2.fp());
-    xorps(dst.fp(), liftoff::kScratchDoubleReg);
+    S128Select(dst.fp(), mask.fp(), src1.fp(), src2.fp(),
+               liftoff::kScratchDoubleReg);
   }
 }
 
@@ -3457,6 +3546,34 @@ void LiftoffAssembler::emit_i16x8_max_u(LiftoffRegister dst,
       this, dst, lhs, rhs, base::Optional<CpuFeature>(SSE4_1));
 }
 
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/true, /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/true, /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/false, /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/false, /*is_signed=*/false);
+}
+
 void LiftoffAssembler::emit_i32x4_neg(LiftoffRegister dst,
                                       LiftoffRegister src) {
   if (dst.fp() == src.fp()) {
@@ -3574,6 +3691,61 @@ void LiftoffAssembler::emit_i32x4_dot_i16x8_s(LiftoffRegister dst,
       this, dst, lhs, rhs);
 }
 
+namespace liftoff {
+// Helper function to check for register aliasing, AVX support, and moves
+// registers around before calling the actual macro-assembler function.
+inline void I32x4ExtMulHelper(LiftoffAssembler* assm, XMMRegister dst,
+                              XMMRegister src1, XMMRegister src2, bool low,
+                              bool is_signed) {
+  // I32x4ExtMul requires dst == src1 if AVX is not supported.
+  if (CpuFeatures::IsSupported(AVX) || dst == src1) {
+    assm->I32x4ExtMul(dst, src1, src2, liftoff::kScratchDoubleReg, low,
+                      is_signed);
+  } else if (dst != src2) {
+    // dst != src1 && dst != src2
+    assm->movaps(dst, src1);
+    assm->I32x4ExtMul(dst, dst, src2, liftoff::kScratchDoubleReg, low,
+                      is_signed);
+  } else {
+    // dst == src2
+    // Extended multiplication is commutative,
+    assm->movaps(dst, src2);
+    assm->I32x4ExtMul(dst, dst, src1, liftoff::kScratchDoubleReg, low,
+                      is_signed);
+  }
+}
+}  // namespace liftoff
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(), /*low=*/true,
+                             /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(), /*low=*/true,
+                             /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(),
+                             /*low=*/false,
+                             /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(),
+                             /*low=*/false,
+                             /*is_signed=*/false);
+}
+
 void LiftoffAssembler::emit_i64x2_neg(LiftoffRegister dst,
                                       LiftoffRegister src) {
   DoubleRegister reg =
@@ -3584,7 +3756,7 @@ void LiftoffAssembler::emit_i64x2_neg(LiftoffRegister dst,
     vpsubq(dst.fp(), reg, src.fp());
   } else {
     psubq(reg, src.fp());
-    if (dst.fp() != reg) movapd(dst.fp(), reg);
+    if (dst.fp() != reg) movaps(dst.fp(), reg);
   }
 }
 
@@ -3698,6 +3870,39 @@ void LiftoffAssembler::emit_i64x2_mul(LiftoffRegister dst, LiftoffRegister lhs,
   Paddq(dst.fp(), dst.fp(), tmp2.fp());
 }
 
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/true, /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/true, /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/false, /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), liftoff::kScratchDoubleReg,
+              /*low=*/false, /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  Movmskpd(dst.gp(), src.fp());
+}
+
 void LiftoffAssembler::emit_f32x4_abs(LiftoffRegister dst,
                                       LiftoffRegister src) {
   if (dst.fp() == src.fp()) {
@@ -3947,13 +4152,13 @@ void LiftoffAssembler::emit_f64x2_min(LiftoffRegister dst, LiftoffRegister lhs,
     vminpd(dst.fp(), rhs.fp(), lhs.fp());
   } else if (dst.fp() == lhs.fp() || dst.fp() == rhs.fp()) {
     XMMRegister src = dst.fp() == lhs.fp() ? rhs.fp() : lhs.fp();
-    movapd(liftoff::kScratchDoubleReg, src);
+    movaps(liftoff::kScratchDoubleReg, src);
     minpd(liftoff::kScratchDoubleReg, dst.fp());
     minpd(dst.fp(), src);
   } else {
-    movapd(liftoff::kScratchDoubleReg, lhs.fp());
+    movaps(liftoff::kScratchDoubleReg, lhs.fp());
     minpd(liftoff::kScratchDoubleReg, rhs.fp());
-    movapd(dst.fp(), rhs.fp());
+    movaps(dst.fp(), rhs.fp());
     minpd(dst.fp(), lhs.fp());
   }
   // propagate -0's and NaNs, which may be non-canonical.
@@ -3975,13 +4180,13 @@ void LiftoffAssembler::emit_f64x2_max(LiftoffRegister dst, LiftoffRegister lhs,
     vmaxpd(dst.fp(), rhs.fp(), lhs.fp());
   } else if (dst.fp() == lhs.fp() || dst.fp() == rhs.fp()) {
     XMMRegister src = dst.fp() == lhs.fp() ? rhs.fp() : lhs.fp();
-    movapd(liftoff::kScratchDoubleReg, src);
+    movaps(liftoff::kScratchDoubleReg, src);
     maxpd(liftoff::kScratchDoubleReg, dst.fp());
     maxpd(dst.fp(), src);
   } else {
-    movapd(liftoff::kScratchDoubleReg, lhs.fp());
+    movaps(liftoff::kScratchDoubleReg, lhs.fp());
     maxpd(liftoff::kScratchDoubleReg, rhs.fp());
-    movapd(dst.fp(), rhs.fp());
+    movaps(dst.fp(), rhs.fp());
     maxpd(dst.fp(), lhs.fp());
   }
   // Find discrepancies.
@@ -4068,7 +4273,7 @@ void LiftoffAssembler::emit_i32x4_uconvert_f32x4(LiftoffRegister dst,
   Cvttps2dq(tmp, tmp);
   Pxor(tmp, liftoff::kScratchDoubleReg);
   Pxor(liftoff::kScratchDoubleReg, liftoff::kScratchDoubleReg);
-  Pmaxsd(tmp, liftoff::kScratchDoubleReg);
+  Pmaxsd(tmp, tmp, liftoff::kScratchDoubleReg);
   // Convert to int. Overflow lanes above max_signed will be 0x80000000.
   Cvttps2dq(dst.fp(), dst.fp());
   // Add (src-max_signed) for overflow lanes.
@@ -4429,6 +4634,24 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   }
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  int spill_space_size = 0;
+  while (!all_spills.is_empty()) {
+    LiftoffRegister reg = all_spills.GetFirstRegSet();
+    if (ref_spills.has(reg)) {
+      safepoint.DefinePointerSlot(spill_offset);
+    }
+    all_spills.clear(reg);
+    ++spill_offset;
+    spill_space_size += kSystemPointerSize;
+  }
+  // Record the number of additional spill slots.
+  RecordOolSpillSpaceSize(spill_space_size);
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   DCHECK_LT(num_stack_slots,
             (1 << 16) / kSystemPointerSize);  // 16 bit immediate
diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler-defs.h b/deps/v8/src/wasm/baseline/liftoff-assembler-defs.h
index 781fb87dbcf425..a4d7fd1221c831 100644
--- a/deps/v8/src/wasm/baseline/liftoff-assembler-defs.h
+++ b/deps/v8/src/wasm/baseline/liftoff-assembler-defs.h
@@ -69,66 +69,19 @@ constexpr RegList kLiftoffAssemblerFpCacheRegs = CPURegister::ListOf(
     d0, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11, d12, d13, d14, d16, d17,
     d18, d19, d20, d21, d22, d23, d24, d25, d26, d27, d28, d29);
 
-#else
-
-constexpr RegList kLiftoffAssemblerGpCacheRegs = 0xff;
+#elif V8_TARGET_ARCH_S390X
 
-constexpr RegList kLiftoffAssemblerFpCacheRegs = 0xff;
-
-#endif
+constexpr RegList kLiftoffAssemblerGpCacheRegs =
+    Register::ListOf(r2, r3, r4, r5, r6, r7, r8);
 
-#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64
-
-constexpr Condition kEqual = equal;
-constexpr Condition kUnequal = not_equal;
-constexpr Condition kSignedLessThan = less;
-constexpr Condition kSignedLessEqual = less_equal;
-constexpr Condition kSignedGreaterThan = greater;
-constexpr Condition kSignedGreaterEqual = greater_equal;
-constexpr Condition kUnsignedLessThan = below;
-constexpr Condition kUnsignedLessEqual = below_equal;
-constexpr Condition kUnsignedGreaterThan = above;
-constexpr Condition kUnsignedGreaterEqual = above_equal;
-
-#elif V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64
-
-constexpr Condition kEqual = eq;
-constexpr Condition kUnequal = ne;
-constexpr Condition kSignedLessThan = lt;
-constexpr Condition kSignedLessEqual = le;
-constexpr Condition kSignedGreaterThan = gt;
-constexpr Condition kSignedGreaterEqual = ge;
-constexpr Condition kUnsignedLessThan = ult;
-constexpr Condition kUnsignedLessEqual = ule;
-constexpr Condition kUnsignedGreaterThan = ugt;
-constexpr Condition kUnsignedGreaterEqual = uge;
-
-#elif V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_ARM64
-
-constexpr Condition kEqual = eq;
-constexpr Condition kUnequal = ne;
-constexpr Condition kSignedLessThan = lt;
-constexpr Condition kSignedLessEqual = le;
-constexpr Condition kSignedGreaterThan = gt;
-constexpr Condition kSignedGreaterEqual = ge;
-constexpr Condition kUnsignedLessThan = lo;
-constexpr Condition kUnsignedLessEqual = ls;
-constexpr Condition kUnsignedGreaterThan = hi;
-constexpr Condition kUnsignedGreaterEqual = hs;
+constexpr RegList kLiftoffAssemblerFpCacheRegs = DoubleRegister::ListOf(
+    d0, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11, d12);
 
 #else
 
-// On unimplemented platforms, just make this compile.
-constexpr Condition kEqual = static_cast<Condition>(0);
-constexpr Condition kUnequal = static_cast<Condition>(0);
-constexpr Condition kSignedLessThan = static_cast<Condition>(0);
-constexpr Condition kSignedLessEqual = static_cast<Condition>(0);
-constexpr Condition kSignedGreaterThan = static_cast<Condition>(0);
-constexpr Condition kSignedGreaterEqual = static_cast<Condition>(0);
-constexpr Condition kUnsignedLessThan = static_cast<Condition>(0);
-constexpr Condition kUnsignedLessEqual = static_cast<Condition>(0);
-constexpr Condition kUnsignedGreaterThan = static_cast<Condition>(0);
-constexpr Condition kUnsignedGreaterEqual = static_cast<Condition>(0);
+constexpr RegList kLiftoffAssemblerGpCacheRegs = 0xff;
+
+constexpr RegList kLiftoffAssemblerFpCacheRegs = 0xff;
 
 #endif
 
diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.cc b/deps/v8/src/wasm/baseline/liftoff-assembler.cc
index dea5221ac63b5c..587430a107126f 100644
--- a/deps/v8/src/wasm/baseline/liftoff-assembler.cc
+++ b/deps/v8/src/wasm/baseline/liftoff-assembler.cc
@@ -7,6 +7,7 @@
 #include <sstream>
 
 #include "src/base/optional.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler-inl.h"
 #include "src/compiler/linkage.h"
@@ -495,21 +496,45 @@ void LiftoffAssembler::CacheState::Split(const CacheState& source) {
   *this = source;
 }
 
+namespace {
+int GetSafepointIndexForStackSlot(const VarState& slot) {
+  // index = 0 is for the stack slot at 'fp + kFixedFrameSizeAboveFp -
+  // kSystemPointerSize', the location of the current stack slot is 'fp -
+  // slot.offset()'. The index we need is therefore '(fp +
+  // kFixedFrameSizeAboveFp - kSystemPointerSize) - (fp - slot.offset())' =
+  // 'slot.offset() + kFixedFrameSizeAboveFp - kSystemPointerSize'.
+  // Concretely, the index of the first stack slot is '4'.
+  return (slot.offset() + StandardFrameConstants::kFixedFrameSizeAboveFp -
+          kSystemPointerSize) /
+         kSystemPointerSize;
+}
+}  // namespace
+
+void LiftoffAssembler::CacheState::GetTaggedSlotsForOOLCode(
+    ZoneVector<int>* slots, LiftoffRegList* spills,
+    SpillLocation spill_location) {
+  for (const auto& slot : stack_state) {
+    if (!slot.type().is_reference_type()) continue;
+
+    if (spill_location == SpillLocation::kTopOfStack && slot.is_reg()) {
+      // Registers get spilled just before the call to the runtime. In {spills}
+      // we store which of the spilled registers contain references, so that we
+      // can add the spill slots to the safepoint.
+      spills->set(slot.reg());
+      continue;
+    }
+    DCHECK_IMPLIES(slot.is_reg(), spill_location == SpillLocation::kStackSlots);
+
+    slots->push_back(GetSafepointIndexForStackSlot(slot));
+  }
+}
+
 void LiftoffAssembler::CacheState::DefineSafepoint(Safepoint& safepoint) {
-  for (auto slot : stack_state) {
+  for (const auto& slot : stack_state) {
     DCHECK(!slot.is_reg());
 
     if (slot.type().is_reference_type()) {
-      // index = 0 is for the stack slot at 'fp + kFixedFrameSizeAboveFp -
-      // kSystemPointerSize', the location of the current stack slot is 'fp -
-      // slot.offset()'. The index we need is therefore '(fp +
-      // kFixedFrameSizeAboveFp - kSystemPointerSize) - (fp - slot.offset())' =
-      // 'slot.offset() + kFixedFrameSizeAboveFp - kSystemPointerSize'.
-      auto index =
-          (slot.offset() + StandardFrameConstants::kFixedFrameSizeAboveFp -
-           kSystemPointerSize) /
-          kSystemPointerSize;
-      safepoint.DefinePointerSlot(index);
+      safepoint.DefinePointerSlot(GetSafepointIndexForStackSlot(slot));
     }
   }
 }
@@ -520,7 +545,8 @@ int LiftoffAssembler::GetTotalFrameSlotCountForGC() const {
   // that the offset of the first spill slot is kSystemPointerSize and not
   // '0'. Therefore we don't have to add '+1' here.
   return (max_used_spill_offset_ +
-          StandardFrameConstants::kFixedFrameSizeAboveFp) /
+          StandardFrameConstants::kFixedFrameSizeAboveFp +
+          ool_spill_space_size_) /
          kSystemPointerSize;
 }
 
@@ -538,7 +564,7 @@ LiftoffAssembler::LiftoffAssembler(std::unique_ptr<AssemblerBuffer> buffer)
 
 LiftoffAssembler::~LiftoffAssembler() {
   if (num_locals_ > kInlineLocalTypes) {
-    free(more_local_types_);
+    base::Free(more_local_types_);
   }
 }
 
@@ -578,14 +604,25 @@ LiftoffRegister LiftoffAssembler::PeekToRegister(int index,
   DCHECK_LT(index, cache_state_.stack_state.size());
   VarState& slot = cache_state_.stack_state.end()[-1 - index];
   if (slot.is_reg()) {
-    cache_state_.dec_used(slot.reg());
     return slot.reg();
   }
   LiftoffRegister reg = LoadToRegister(slot, pinned);
+  cache_state_.inc_used(reg);
   slot.MakeRegister(reg);
   return reg;
 }
 
+void LiftoffAssembler::DropValues(int count) {
+  for (int i = 0; i < count; ++i) {
+    DCHECK(!cache_state_.stack_state.empty());
+    VarState slot = cache_state_.stack_state.back();
+    cache_state_.stack_state.pop_back();
+    if (slot.is_reg()) {
+      cache_state_.dec_used(slot.reg());
+    }
+  }
+}
+
 void LiftoffAssembler::PrepareLoopArgs(int num) {
   for (int i = 0; i < num; ++i) {
     VarState& slot = cache_state_.stack_state.end()[-1 - i];
@@ -865,8 +902,6 @@ void LiftoffAssembler::PrepareCall(const FunctionSig* sig,
 
 void LiftoffAssembler::FinishCall(const FunctionSig* sig,
                                   compiler::CallDescriptor* call_descriptor) {
-  // Offset of the current return value relative to the stack pointer.
-  int return_offset = 0;
   int call_desc_return_idx = 0;
   for (ValueType return_type : sig->returns()) {
     DCHECK_LT(call_desc_return_idx, call_descriptor->ReturnCount());
@@ -888,10 +923,11 @@ void LiftoffAssembler::FinishCall(const FunctionSig* sig,
       } else {
         DCHECK(loc.IsCallerFrameSlot());
         reg_pair[pair_idx] = GetUnusedRegister(rc, pinned);
-        LoadReturnStackSlot(reg_pair[pair_idx], return_offset, lowered_type);
-        const int type_size = lowered_type.element_size_bytes();
-        const int slot_size = RoundUp<kSystemPointerSize>(type_size);
-        return_offset += slot_size;
+        // Get slot offset relative to the stack pointer.
+        int offset = call_descriptor->GetOffsetToReturns();
+        int return_slot = -loc.GetLocation() - offset - 1;
+        LoadReturnStackSlot(reg_pair[pair_idx],
+                            return_slot * kSystemPointerSize, lowered_type);
       }
       if (pair_idx == 0) {
         pinned.set(reg_pair[0]);
@@ -904,7 +940,8 @@ void LiftoffAssembler::FinishCall(const FunctionSig* sig,
                                                          reg_pair[1].gp()));
     }
   }
-  RecordUsedSpillOffset(TopSpillOffset() + return_offset);
+  int return_slots = static_cast<int>(call_descriptor->StackReturnCount());
+  RecordUsedSpillOffset(TopSpillOffset() + return_slots * kSystemPointerSize);
 }
 
 void LiftoffAssembler::Move(LiftoffRegister dst, LiftoffRegister src,
@@ -1123,8 +1160,8 @@ void LiftoffAssembler::set_num_locals(uint32_t num_locals) {
   DCHECK_EQ(0, num_locals_);  // only call this once.
   num_locals_ = num_locals;
   if (num_locals > kInlineLocalTypes) {
-    more_local_types_ =
-        reinterpret_cast<ValueType*>(malloc(num_locals * sizeof(ValueType)));
+    more_local_types_ = reinterpret_cast<ValueType*>(
+        base::Malloc(num_locals * sizeof(ValueType)));
     DCHECK_NOT_NULL(more_local_types_);
   }
 }
diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h
index 895abbbbb45bc2..94f91ab0fd13fe 100644
--- a/deps/v8/src/wasm/baseline/liftoff-assembler.h
+++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h
@@ -30,6 +30,44 @@ class CallDescriptor;
 
 namespace wasm {
 
+enum LiftoffCondition {
+  kEqual,
+  kUnequal,
+  kSignedLessThan,
+  kSignedLessEqual,
+  kSignedGreaterThan,
+  kSignedGreaterEqual,
+  kUnsignedLessThan,
+  kUnsignedLessEqual,
+  kUnsignedGreaterThan,
+  kUnsignedGreaterEqual
+};
+
+inline constexpr LiftoffCondition Negate(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return kUnequal;
+    case kUnequal:
+      return kEqual;
+    case kSignedLessThan:
+      return kSignedGreaterEqual;
+    case kSignedLessEqual:
+      return kSignedGreaterThan;
+    case kSignedGreaterEqual:
+      return kSignedLessThan;
+    case kSignedGreaterThan:
+      return kSignedLessEqual;
+    case kUnsignedLessThan:
+      return kUnsignedGreaterEqual;
+    case kUnsignedLessEqual:
+      return kUnsignedGreaterThan;
+    case kUnsignedGreaterEqual:
+      return kUnsignedLessThan;
+    case kUnsignedGreaterThan:
+      return kUnsignedLessEqual;
+  }
+}
+
 class LiftoffAssembler : public TurboAssembler {
  public:
   // Each slot in our stack frame currently has exactly 8 bytes.
@@ -135,6 +173,19 @@ class LiftoffAssembler : public TurboAssembler {
     // Disallow copy construction.
     CacheState(const CacheState&) = delete;
 
+    enum class SpillLocation { kTopOfStack, kStackSlots };
+    // Generates two lists of locations that contain references. {slots}
+    // contains the indices of slots on the value stack that contain references.
+    // {spills} contains all registers that contain references. The
+    // {spill_location} defines where register values will be spilled for a
+    // function call within the out-of-line code. {kStackSlots} means that the
+    // values in the registers will be written back to their stack slots.
+    // {kTopOfStack} means that the registers will be spilled on the stack with
+    // a {push} instruction.
+    void GetTaggedSlotsForOOLCode(/*out*/ ZoneVector<int>* slots,
+                                  /*out*/ LiftoffRegList* spills,
+                                  SpillLocation spill_location);
+
     void DefineSafepoint(Safepoint& safepoint);
 
     base::SmallVector<VarState, 8> stack_state;
@@ -291,16 +342,30 @@ class LiftoffAssembler : public TurboAssembler {
     return LoadToRegister(slot, pinned);
   }
 
+  // Use this to pop a value into a register that has no other uses, so it
+  // can be modified.
+  LiftoffRegister PopToModifiableRegister(LiftoffRegList pinned = {}) {
+    ValueType type = cache_state_.stack_state.back().type();
+    LiftoffRegister reg = PopToRegister(pinned);
+    if (cache_state()->is_free(reg)) return reg;
+
+    pinned.set(reg);
+    LiftoffRegister new_reg = GetUnusedRegister(reg.reg_class(), pinned);
+    Move(new_reg, reg, type);
+    return new_reg;
+  }
+
   // Returns the register which holds the value of stack slot {index}. If the
   // value is not stored in a register yet, a register is allocated for it. The
   // register is then assigned to the stack slot. The value stack height is not
   // modified. The top of the stack is index 0, i.e. {PopToRegister()} and
   // {PeekToRegister(0)} should result in the same register.
-  // {PeekToRegister} already decrements the used count of the register of the
-  // stack slot. Therefore the register must not be popped by {PopToRegister}
-  // but discarded with {stack_state.pop_back(count)}.
+  // When the value is finally popped, the use counter of its register has to be
+  // decremented. This can be done by popping the value with {DropValues}.
   LiftoffRegister PeekToRegister(int index, LiftoffRegList pinned);
 
+  void DropValues(int count);
+
   // Ensure that the loop inputs are either in a register or spilled to the
   // stack, so that we can merge different values on the back-edge.
   void PrepareLoopArgs(int num);
@@ -414,6 +479,10 @@ class LiftoffAssembler : public TurboAssembler {
     if (offset >= max_used_spill_offset_) max_used_spill_offset_ = offset;
   }
 
+  void RecordOolSpillSpaceSize(int size) {
+    if (size > ool_spill_space_size_) ool_spill_space_size_ = size;
+  }
+
   // Load parameters into the right registers / stack slots for the call.
   void PrepareBuiltinCall(const FunctionSig* sig,
                           compiler::CallDescriptor* call_descriptor,
@@ -469,7 +538,8 @@ class LiftoffAssembler : public TurboAssembler {
   inline int PrepareStackFrame();
   inline void PrepareTailCall(int num_callee_stack_params,
                               int stack_param_delta);
-  inline void PatchPrepareStackFrame(int offset, int frame_size);
+  inline void AlignFrameSize();
+  inline void PatchPrepareStackFrame(int offset);
   inline void FinishCode();
   inline void AbortCompilation();
   inline static constexpr int StaticStackFrameSize();
@@ -485,49 +555,66 @@ class LiftoffAssembler : public TurboAssembler {
   inline void LoadTaggedPointer(Register dst, Register src_addr,
                                 Register offset_reg, int32_t offset_imm,
                                 LiftoffRegList pinned);
-  inline void StoreTaggedPointer(Register dst_addr, int32_t offset_imm,
-                                 LiftoffRegister src, LiftoffRegList pinned);
+  inline void StoreTaggedPointer(Register dst_addr, Register offset_reg,
+                                 int32_t offset_imm, LiftoffRegister src,
+                                 LiftoffRegList pinned);
+  inline void LoadFixedArrayLengthAsInt32(LiftoffRegister dst, Register array,
+                                          LiftoffRegList pinned) {
+    int offset = FixedArray::kLengthOffset - kHeapObjectTag;
+    if (SmiValuesAre32Bits()) {
+#if V8_TARGET_LITTLE_ENDIAN
+      DCHECK_EQ(kSmiShiftSize + kSmiTagSize, 4 * kBitsPerByte);
+      offset += 4;
+#endif
+      Load(dst, array, no_reg, offset, LoadType::kI32Load, pinned);
+    } else {
+      DCHECK(SmiValuesAre31Bits());
+      Load(dst, array, no_reg, offset, LoadType::kI32Load, pinned);
+      emit_i32_sari(dst.gp(), dst.gp(), kSmiTagSize);
+    }
+  }
   inline void Load(LiftoffRegister dst, Register src_addr, Register offset_reg,
-                   uint32_t offset_imm, LoadType type, LiftoffRegList pinned,
+                   uintptr_t offset_imm, LoadType type, LiftoffRegList pinned,
                    uint32_t* protected_load_pc = nullptr,
                    bool is_load_mem = false);
-  inline void Store(Register dst_addr, Register offset_reg, uint32_t offset_imm,
-                    LiftoffRegister src, StoreType type, LiftoffRegList pinned,
+  inline void Store(Register dst_addr, Register offset_reg,
+                    uintptr_t offset_imm, LiftoffRegister src, StoreType type,
+                    LiftoffRegList pinned,
                     uint32_t* protected_store_pc = nullptr,
                     bool is_store_mem = false);
   inline void AtomicLoad(LiftoffRegister dst, Register src_addr,
-                         Register offset_reg, uint32_t offset_imm,
+                         Register offset_reg, uintptr_t offset_imm,
                          LoadType type, LiftoffRegList pinned);
   inline void AtomicStore(Register dst_addr, Register offset_reg,
-                          uint32_t offset_imm, LiftoffRegister src,
+                          uintptr_t offset_imm, LiftoffRegister src,
                           StoreType type, LiftoffRegList pinned);
 
   inline void AtomicAdd(Register dst_addr, Register offset_reg,
-                        uint32_t offset_imm, LiftoffRegister value,
+                        uintptr_t offset_imm, LiftoffRegister value,
                         LiftoffRegister result, StoreType type);
 
   inline void AtomicSub(Register dst_addr, Register offset_reg,
-                        uint32_t offset_imm, LiftoffRegister value,
+                        uintptr_t offset_imm, LiftoffRegister value,
                         LiftoffRegister result, StoreType type);
 
   inline void AtomicAnd(Register dst_addr, Register offset_reg,
-                        uint32_t offset_imm, LiftoffRegister value,
+                        uintptr_t offset_imm, LiftoffRegister value,
                         LiftoffRegister result, StoreType type);
 
   inline void AtomicOr(Register dst_addr, Register offset_reg,
-                       uint32_t offset_imm, LiftoffRegister value,
+                       uintptr_t offset_imm, LiftoffRegister value,
                        LiftoffRegister result, StoreType type);
 
   inline void AtomicXor(Register dst_addr, Register offset_reg,
-                        uint32_t offset_imm, LiftoffRegister value,
+                        uintptr_t offset_imm, LiftoffRegister value,
                         LiftoffRegister result, StoreType type);
 
   inline void AtomicExchange(Register dst_addr, Register offset_reg,
-                             uint32_t offset_imm, LiftoffRegister value,
+                             uintptr_t offset_imm, LiftoffRegister value,
                              LiftoffRegister result, StoreType type);
 
   inline void AtomicCompareExchange(Register dst_addr, Register offset_reg,
-                                    uint32_t offset_imm,
+                                    uintptr_t offset_imm,
                                     LiftoffRegister expected,
                                     LiftoffRegister new_value,
                                     LiftoffRegister value, StoreType type);
@@ -557,6 +644,7 @@ class LiftoffAssembler : public TurboAssembler {
   inline void emit_i32_add(Register dst, Register lhs, Register rhs);
   inline void emit_i32_addi(Register dst, Register lhs, int32_t imm);
   inline void emit_i32_sub(Register dst, Register lhs, Register rhs);
+  inline void emit_i32_subi(Register dst, Register lhs, int32_t imm);
   inline void emit_i32_mul(Register dst, Register lhs, Register rhs);
   inline void emit_i32_divs(Register dst, Register lhs, Register rhs,
                             Label* trap_div_by_zero,
@@ -589,7 +677,7 @@ class LiftoffAssembler : public TurboAssembler {
   inline void emit_i64_add(LiftoffRegister dst, LiftoffRegister lhs,
                            LiftoffRegister rhs);
   inline void emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
-                            int32_t imm);
+                            int64_t imm);
   inline void emit_i64_sub(LiftoffRegister dst, LiftoffRegister lhs,
                            LiftoffRegister rhs);
   inline void emit_i64_mul(LiftoffRegister dst, LiftoffRegister lhs,
@@ -667,11 +755,20 @@ class LiftoffAssembler : public TurboAssembler {
     }
   }
 
-  inline void emit_ptrsize_addi(Register dst, Register lhs, int32_t imm) {
+  inline void emit_ptrsize_addi(Register dst, Register lhs, intptr_t imm) {
     if (kSystemPointerSize == 8) {
       emit_i64_addi(LiftoffRegister(dst), LiftoffRegister(lhs), imm);
     } else {
-      emit_i32_addi(dst, lhs, imm);
+      emit_i32_addi(dst, lhs, static_cast<int32_t>(imm));
+    }
+  }
+
+  inline void emit_ptrsize_set_cond(LiftoffCondition condition, Register dst,
+                                    LiftoffRegister lhs, LiftoffRegister rhs) {
+    if (kSystemPointerSize == 8) {
+      emit_i64_set_cond(condition, dst, lhs, rhs);
+    } else {
+      emit_i32_set_cond(condition, dst, lhs.gp(), rhs.gp());
     }
   }
 
@@ -746,18 +843,20 @@ class LiftoffAssembler : public TurboAssembler {
   inline void emit_jump(Label*);
   inline void emit_jump(Register);
 
-  inline void emit_cond_jump(Condition, Label*, ValueType value, Register lhs,
-                             Register rhs = no_reg);
+  inline void emit_cond_jump(LiftoffCondition, Label*, ValueType value,
+                             Register lhs, Register rhs = no_reg);
+  inline void emit_i32_cond_jumpi(LiftoffCondition liftoff_cond, Label* label,
+                                  Register lhs, int imm);
   // Set {dst} to 1 if condition holds, 0 otherwise.
   inline void emit_i32_eqz(Register dst, Register src);
-  inline void emit_i32_set_cond(Condition, Register dst, Register lhs,
+  inline void emit_i32_set_cond(LiftoffCondition, Register dst, Register lhs,
                                 Register rhs);
   inline void emit_i64_eqz(Register dst, LiftoffRegister src);
-  inline void emit_i64_set_cond(Condition condition, Register dst,
+  inline void emit_i64_set_cond(LiftoffCondition condition, Register dst,
                                 LiftoffRegister lhs, LiftoffRegister rhs);
-  inline void emit_f32_set_cond(Condition condition, Register dst,
+  inline void emit_f32_set_cond(LiftoffCondition condition, Register dst,
                                 DoubleRegister lhs, DoubleRegister rhs);
-  inline void emit_f64_set_cond(Condition condition, Register dst,
+  inline void emit_f64_set_cond(LiftoffCondition condition, Register dst,
                                 DoubleRegister lhs, DoubleRegister rhs);
 
   // Optional select support: Returns false if generic code (via branches)
@@ -766,10 +865,16 @@ class LiftoffAssembler : public TurboAssembler {
                           LiftoffRegister true_value,
                           LiftoffRegister false_value, ValueType type);
 
+  enum SmiCheckMode { kJumpOnSmi, kJumpOnNotSmi };
+  inline void emit_smi_check(Register obj, Label* target, SmiCheckMode mode);
+
   inline void LoadTransform(LiftoffRegister dst, Register src_addr,
-                            Register offset_reg, uint32_t offset_imm,
+                            Register offset_reg, uintptr_t offset_imm,
                             LoadType type, LoadTransformationKind transform,
                             uint32_t* protected_load_pc);
+  inline void LoadLane(LiftoffRegister dst, LiftoffRegister src, Register addr,
+                       Register offset_reg, uintptr_t offset_imm, LoadType type,
+                       uint8_t lane, uint32_t* protected_load_pc);
   inline void emit_i8x16_shuffle(LiftoffRegister dst, LiftoffRegister lhs,
                                  LiftoffRegister rhs, const uint8_t shuffle[16],
                                  bool is_swizzle);
@@ -919,6 +1024,18 @@ class LiftoffAssembler : public TurboAssembler {
                                LiftoffRegister rhs);
   inline void emit_i16x8_max_u(LiftoffRegister dst, LiftoffRegister lhs,
                                LiftoffRegister rhs);
+  inline void emit_i16x8_extmul_low_i8x16_s(LiftoffRegister dst,
+                                            LiftoffRegister src1,
+                                            LiftoffRegister src2);
+  inline void emit_i16x8_extmul_low_i8x16_u(LiftoffRegister dst,
+                                            LiftoffRegister src1,
+                                            LiftoffRegister src2);
+  inline void emit_i16x8_extmul_high_i8x16_s(LiftoffRegister dst,
+                                             LiftoffRegister src1,
+                                             LiftoffRegister src2);
+  inline void emit_i16x8_extmul_high_i8x16_u(LiftoffRegister dst,
+                                             LiftoffRegister src1,
+                                             LiftoffRegister src2);
   inline void emit_i32x4_neg(LiftoffRegister dst, LiftoffRegister src);
   inline void emit_v32x4_anytrue(LiftoffRegister dst, LiftoffRegister src);
   inline void emit_v32x4_alltrue(LiftoffRegister dst, LiftoffRegister src);
@@ -951,6 +1068,18 @@ class LiftoffAssembler : public TurboAssembler {
                                LiftoffRegister rhs);
   inline void emit_i32x4_dot_i16x8_s(LiftoffRegister dst, LiftoffRegister lhs,
                                      LiftoffRegister rhs);
+  inline void emit_i32x4_extmul_low_i16x8_s(LiftoffRegister dst,
+                                            LiftoffRegister src1,
+                                            LiftoffRegister src2);
+  inline void emit_i32x4_extmul_low_i16x8_u(LiftoffRegister dst,
+                                            LiftoffRegister src1,
+                                            LiftoffRegister src2);
+  inline void emit_i32x4_extmul_high_i16x8_s(LiftoffRegister dst,
+                                             LiftoffRegister src1,
+                                             LiftoffRegister src2);
+  inline void emit_i32x4_extmul_high_i16x8_u(LiftoffRegister dst,
+                                             LiftoffRegister src1,
+                                             LiftoffRegister src2);
   inline void emit_i64x2_neg(LiftoffRegister dst, LiftoffRegister src);
   inline void emit_i64x2_shl(LiftoffRegister dst, LiftoffRegister lhs,
                              LiftoffRegister rhs);
@@ -970,6 +1099,19 @@ class LiftoffAssembler : public TurboAssembler {
                              LiftoffRegister rhs);
   inline void emit_i64x2_mul(LiftoffRegister dst, LiftoffRegister lhs,
                              LiftoffRegister rhs);
+  inline void emit_i64x2_extmul_low_i32x4_s(LiftoffRegister dst,
+                                            LiftoffRegister src1,
+                                            LiftoffRegister src2);
+  inline void emit_i64x2_extmul_low_i32x4_u(LiftoffRegister dst,
+                                            LiftoffRegister src1,
+                                            LiftoffRegister src2);
+  inline void emit_i64x2_extmul_high_i32x4_s(LiftoffRegister dst,
+                                             LiftoffRegister src1,
+                                             LiftoffRegister src2);
+  inline void emit_i64x2_extmul_high_i32x4_u(LiftoffRegister dst,
+                                             LiftoffRegister src1,
+                                             LiftoffRegister src2);
+  inline void emit_i64x2_bitmask(LiftoffRegister dst, LiftoffRegister src);
   inline void emit_f32x4_abs(LiftoffRegister dst, LiftoffRegister src);
   inline void emit_f32x4_neg(LiftoffRegister dst, LiftoffRegister src);
   inline void emit_f32x4_sqrt(LiftoffRegister dst, LiftoffRegister src);
@@ -1111,6 +1253,11 @@ class LiftoffAssembler : public TurboAssembler {
   inline void PushRegisters(LiftoffRegList);
   inline void PopRegisters(LiftoffRegList);
 
+  inline void RecordSpillsInSafepoint(Safepoint& safepoint,
+                                      LiftoffRegList all_spills,
+                                      LiftoffRegList ref_spills,
+                                      int spill_offset);
+
   inline void DropStackSlotsAndRet(uint32_t num_stack_slots);
 
   // Execute a C call. Arguments are pushed to the stack and a pointer to this
@@ -1186,7 +1333,10 @@ class LiftoffAssembler : public TurboAssembler {
   static_assert(sizeof(ValueType) == 4,
                 "Reconsider this inlining if ValueType gets bigger");
   CacheState cache_state_;
+  // The maximum spill offset for slots in the value stack.
   int max_used_spill_offset_ = StaticStackFrameSize();
+  // The amount of memory needed for register spills in OOL code.
+  int ool_spill_space_size_ = 0;
   LiftoffBailoutReason bailout_reason_ = kSuccess;
   const char* bailout_detail_ = nullptr;
 
@@ -1234,28 +1384,28 @@ void EmitI64IndependentHalfOperation(LiftoffAssembler* assm,
 template <void (LiftoffAssembler::*op)(Register, Register, int32_t)>
 void EmitI64IndependentHalfOperationImm(LiftoffAssembler* assm,
                                         LiftoffRegister dst,
-                                        LiftoffRegister lhs, int32_t imm) {
-  // Top half of the immediate sign extended, either 0 or -1.
-  int32_t sign_extend = imm < 0 ? -1 : 0;
+                                        LiftoffRegister lhs, int64_t imm) {
+  int32_t low_word = static_cast<int32_t>(imm);
+  int32_t high_word = static_cast<int32_t>(imm >> 32);
   // If {dst.low_gp()} does not overlap with {lhs.high_gp()},
   // just first compute the lower half, then the upper half.
   if (dst.low() != lhs.high()) {
-    (assm->*op)(dst.low_gp(), lhs.low_gp(), imm);
-    (assm->*op)(dst.high_gp(), lhs.high_gp(), sign_extend);
+    (assm->*op)(dst.low_gp(), lhs.low_gp(), low_word);
+    (assm->*op)(dst.high_gp(), lhs.high_gp(), high_word);
     return;
   }
   // If {dst.high_gp()} does not overlap with {lhs.low_gp()},
   // we can compute this the other way around.
   if (dst.high() != lhs.low()) {
-    (assm->*op)(dst.high_gp(), lhs.high_gp(), sign_extend);
-    (assm->*op)(dst.low_gp(), lhs.low_gp(), imm);
+    (assm->*op)(dst.high_gp(), lhs.high_gp(), high_word);
+    (assm->*op)(dst.low_gp(), lhs.low_gp(), low_word);
     return;
   }
   // Otherwise, we need a temporary register.
   Register tmp =
       assm->GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(lhs)).gp();
-  (assm->*op)(tmp, lhs.low_gp(), imm);
-  (assm->*op)(dst.high_gp(), lhs.high_gp(), sign_extend);
+  (assm->*op)(tmp, lhs.low_gp(), low_word);
+  (assm->*op)(dst.high_gp(), lhs.high_gp(), high_word);
   assm->Move(dst.low_gp(), tmp, kWasmI32);
 }
 }  // namespace liftoff
diff --git a/deps/v8/src/wasm/baseline/liftoff-compiler.cc b/deps/v8/src/wasm/baseline/liftoff-compiler.cc
index 1ead202ea07cfa..9a42bbf50c778e 100644
--- a/deps/v8/src/wasm/baseline/liftoff-compiler.cc
+++ b/deps/v8/src/wasm/baseline/liftoff-compiler.cc
@@ -5,6 +5,7 @@
 #include "src/wasm/baseline/liftoff-compiler.h"
 
 #include "src/base/optional.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 // TODO(clemensb): Remove dependences on compiler stuff.
 #include "src/codegen/external-reference.h"
@@ -121,18 +122,7 @@ compiler::CallDescriptor* GetLoweredCallDescriptor(
              : call_desc;
 }
 
-constexpr ValueType kSupportedTypesArr[] = {
-    kWasmI32,  kWasmI64,       kWasmF32,    kWasmF64,
-    kWasmS128, kWasmExternRef, kWasmFuncRef};
-constexpr Vector<const ValueType> kSupportedTypes =
-    ArrayVector(kSupportedTypesArr);
-
-constexpr ValueType kSupportedTypesWithoutRefsArr[] = {
-    kWasmI32, kWasmI64, kWasmF32, kWasmF64, kWasmS128};
-constexpr Vector<const ValueType> kSupportedTypesWithoutRefs =
-    ArrayVector(kSupportedTypesWithoutRefsArr);
-
-constexpr Condition GetCompareCondition(WasmOpcode opcode) {
+constexpr LiftoffCondition GetCompareCondition(WasmOpcode opcode) {
   switch (opcode) {
     case kExprI32Eq:
       return kEqual;
@@ -300,38 +290,60 @@ class LiftoffCompiler {
     explicit SpilledRegistersForInspection(Zone* zone) : entries(zone) {}
   };
 
+  struct OutOfLineSafepointInfo {
+    ZoneVector<int> slots;
+    LiftoffRegList spills;
+
+    explicit OutOfLineSafepointInfo(Zone* zone) : slots(zone) {}
+  };
+
   struct OutOfLineCode {
     MovableLabel label;
     MovableLabel continuation;
     WasmCode::RuntimeStubId stub;
     WasmCodePosition position;
     LiftoffRegList regs_to_save;
+    OutOfLineSafepointInfo* safepoint_info;
     uint32_t pc;  // for trap handler.
     // These two pointers will only be used for debug code:
-    DebugSideTableBuilder::EntryBuilder* debug_sidetable_entry_builder;
     SpilledRegistersForInspection* spilled_registers;
+    DebugSideTableBuilder::EntryBuilder* debug_sidetable_entry_builder;
 
     // Named constructors:
     static OutOfLineCode Trap(
-        WasmCode::RuntimeStubId s, WasmCodePosition pos, uint32_t pc,
-        DebugSideTableBuilder::EntryBuilder* debug_sidetable_entry_builder,
-        SpilledRegistersForInspection* spilled_registers) {
+        WasmCode::RuntimeStubId s, WasmCodePosition pos,
+        SpilledRegistersForInspection* spilled_registers,
+        OutOfLineSafepointInfo* safepoint_info, uint32_t pc,
+        DebugSideTableBuilder::EntryBuilder* debug_sidetable_entry_builder) {
       DCHECK_LT(0, pos);
-      return {{},
-              {},
-              s,
-              pos,
-              {},
-              pc,
-              debug_sidetable_entry_builder,
-              spilled_registers};
+      return {
+          {},                            // label
+          {},                            // continuation
+          s,                             // stub
+          pos,                           // position
+          {},                            // regs_to_save
+          safepoint_info,                // safepoint_info
+          pc,                            // pc
+          spilled_registers,             // spilled_registers
+          debug_sidetable_entry_builder  // debug_side_table_entry_builder
+      };
     }
     static OutOfLineCode StackCheck(
         WasmCodePosition pos, LiftoffRegList regs_to_save,
         SpilledRegistersForInspection* spilled_regs,
+        OutOfLineSafepointInfo* safepoint_info,
         DebugSideTableBuilder::EntryBuilder* debug_sidetable_entry_builder) {
-      return {{},           {}, WasmCode::kWasmStackGuard,     pos,
-              regs_to_save, 0,  debug_sidetable_entry_builder, spilled_regs};
+      return {
+          {},                            // label
+          {},                            // continuation
+          WasmCode::kWasmStackGuard,     // stub
+          pos,                           // position
+          regs_to_save,                  // regs_to_save
+          safepoint_info,                // safepoint_info
+          0,                             // pc
+          spilled_regs,                  // spilled_registers
+          debug_sidetable_entry_builder  // debug_side_table_entry_builder
+      };
     }
   };
 
@@ -391,6 +403,13 @@ class LiftoffCompiler {
     decoder->errorf(decoder->pc_offset(), "unsupported liftoff operation: %s",
                     detail);
     UnuseLabels(decoder);
+    // --liftoff-only ensures that tests actually exercise the Liftoff path
+    // without bailing out. Bailing out due to (simulated) lack of CPU support
+    // is okay though.
+    if (FLAG_liftoff_only && reason != kMissingCPUFeature) {
+      FATAL("--liftoff-only: treating bailout as fatal error. Cause: %s",
+            detail);
+    }
   }
 
   bool DidAssemblerBailout(FullDecoder* decoder) {
@@ -399,47 +418,41 @@ class LiftoffCompiler {
     return true;
   }
 
-  LiftoffBailoutReason BailoutReasonForType(ValueType type) {
+  bool CheckSupportedType(FullDecoder* decoder, ValueType type,
+                          const char* context) {
+    LiftoffBailoutReason bailout_reason = kOtherReason;
     switch (type.kind()) {
+      case ValueType::kI32:
+      case ValueType::kI64:
+      case ValueType::kF32:
+      case ValueType::kF64:
+        return true;
       case ValueType::kS128:
-        return kSimd;
-      case ValueType::kOptRef:
+        if (CpuFeatures::SupportsWasmSimd128()) return true;
+        bailout_reason = kMissingCPUFeature;
+        break;
       case ValueType::kRef:
+      case ValueType::kOptRef:
+      case ValueType::kRtt:
+      case ValueType::kI8:
+      case ValueType::kI16:
+        if (FLAG_experimental_liftoff_extern_ref) return true;
         if (type.is_reference_to(HeapType::kExn)) {
-          return kExceptionHandling;
+          bailout_reason = kExceptionHandling;
         } else {
-          return kRefTypes;
+          bailout_reason = kRefTypes;
         }
+        break;
       case ValueType::kBottom:
-        return kMultiValue;
-      default:
-        return kOtherReason;
-    }
-  }
-
-  bool CheckSupportedType(FullDecoder* decoder,
-                          Vector<const ValueType> supported_types,
-                          ValueType type, const char* context) {
-    // Special case for kWasm128 which requires specific hardware support.
-    if (type == kWasmS128 && (!CpuFeatures::SupportsWasmSimd128())) {
-      unsupported(decoder, kSimd, "simd");
-      return false;
-    }
-    // Check supported types.
-    for (ValueType supported : supported_types) {
-      if (type == supported) return true;
+      case ValueType::kStmt:
+        UNREACHABLE();
     }
-    LiftoffBailoutReason bailout_reason = BailoutReasonForType(type);
     EmbeddedVector<char, 128> buffer;
     SNPrintF(buffer, "%s %s", type.name().c_str(), context);
     unsupported(decoder, bailout_reason, buffer.begin());
     return false;
   }
 
-  int GetSafepointTableOffset() const {
-    return safepoint_table_builder_.GetCodeOffset();
-  }
-
   void UnuseLabels(FullDecoder* decoder) {
 #ifdef DEBUG
     auto Unuse = [](Label* label) {
@@ -509,12 +522,20 @@ class LiftoffCompiler {
     LiftoffRegList regs_to_save = __ cache_state()->used_registers;
     SpilledRegistersForInspection* spilled_regs = nullptr;
     Register limit_address = __ GetUnusedRegister(kGpReg, {}).gp();
+
+    OutOfLineSafepointInfo* safepoint_info =
+        compilation_zone_->New<OutOfLineSafepointInfo>(compilation_zone_);
+    __ cache_state()->GetTaggedSlotsForOOLCode(
+        &safepoint_info->slots, &safepoint_info->spills,
+        for_debugging_
+            ? LiftoffAssembler::CacheState::SpillLocation::kStackSlots
+            : LiftoffAssembler::CacheState::SpillLocation::kTopOfStack);
     if (V8_UNLIKELY(for_debugging_)) {
       regs_to_save = {};
       spilled_regs = GetSpilledRegistersForInspection();
     }
     out_of_line_code_.push_back(OutOfLineCode::StackCheck(
-        position, regs_to_save, spilled_regs,
+        position, regs_to_save, spilled_regs, safepoint_info,
         RegisterDebugSideTableEntry(DebugSideTableBuilder::kAssumeSpilling)));
     OutOfLineCode& ool = out_of_line_code_.back();
     LOAD_INSTANCE_FIELD(limit_address, StackLimitAddress, kSystemPointerSize);
@@ -556,12 +577,7 @@ class LiftoffCompiler {
 
   void StartFunctionBody(FullDecoder* decoder, Control* block) {
     for (uint32_t i = 0; i < __ num_locals(); ++i) {
-      if (!CheckSupportedType(decoder,
-                              FLAG_experimental_liftoff_extern_ref
-                                  ? kSupportedTypes
-                                  : kSupportedTypesWithoutRefs,
-                              __ local_type(i), "param"))
-        return;
+      if (!CheckSupportedType(decoder, __ local_type(i), "param")) return;
     }
 
     // Input 0 is the call target, the instance is at 1.
@@ -627,16 +643,9 @@ class LiftoffCompiler {
            ++param_idx) {
         ValueType type = decoder->local_type(param_idx);
         if (type.is_reference_type()) {
-          Register isolate_root = __ GetUnusedRegister(kGpReg, {}).gp();
-          // We can re-use the isolate_root register as result register.
-          Register result = isolate_root;
-
-          LOAD_INSTANCE_FIELD(isolate_root, IsolateRoot, kSystemPointerSize);
-          __ LoadTaggedPointer(
-              result, isolate_root, no_reg,
-              IsolateData::root_slot_offset(RootIndex::kNullValue), {});
-          __ Spill(__ cache_state()->stack_state.back().offset(),
-                   LiftoffRegister(result), type);
+          LiftoffRegister result = __ GetUnusedRegister(kGpReg, {});
+          LoadNullValue(result.gp(), {});
+          __ Spill(__ cache_state()->stack_state.back().offset(), result, type);
         }
       }
     }
@@ -733,8 +742,28 @@ class LiftoffCompiler {
     source_position_table_builder_.AddPosition(
         __ pc_offset(), SourcePosition(ool->position), true);
     __ CallRuntimeStub(ool->stub);
-    // TODO(ahaas): Define a proper safepoint here.
-    safepoint_table_builder_.DefineSafepoint(&asm_, Safepoint::kNoLazyDeopt);
+    Safepoint safepoint = safepoint_table_builder_.DefineSafepoint(
+        &asm_, Safepoint::kNoLazyDeopt);
+
+    if (ool->safepoint_info) {
+      for (auto index : ool->safepoint_info->slots) {
+        safepoint.DefinePointerSlot(index);
+      }
+
+      int total_frame_size = __ GetTotalFrameSize();
+      LiftoffRegList gp_regs = ool->regs_to_save & kGpCacheRegList;
+      // {total_frame_size} is the highest offset from the FP that is used to
+      // store a value. The offset of the first spill slot should therefore be
+      // {(total_frame_size / kSystemPointerSize) + 1}. However, spill slots
+      // don't start at offset '0' but at offset '-1' (or
+      // {-kSystemPointerSize}). Therefore we have to add another '+ 1' to the
+      // index of the first spill slot.
+      int index = (total_frame_size / kSystemPointerSize) + 2;
+
+      __ RecordSpillsInSafepoint(safepoint, gp_regs,
+                                 ool->safepoint_info->spills, index);
+    }
+
     DCHECK_EQ(!debug_sidetable_builder_, !ool->debug_sidetable_entry_builder);
     if (V8_UNLIKELY(ool->debug_sidetable_entry_builder)) {
       ool->debug_sidetable_entry_builder->set_pc_offset(__ pc_offset());
@@ -756,11 +785,15 @@ class LiftoffCompiler {
 
   void FinishFunction(FullDecoder* decoder) {
     if (DidAssemblerBailout(decoder)) return;
+    __ AlignFrameSize();
+#if DEBUG
+    int frame_size = __ GetTotalFrameSize();
+#endif
     for (OutOfLineCode& ool : out_of_line_code_) {
       GenerateOutOfLineCode(&ool);
     }
-    __ PatchPrepareStackFrame(pc_offset_stack_frame_construction_,
-                              __ GetTotalFrameSize());
+    DCHECK_EQ(frame_size, __ GetTotalFrameSize());
+    __ PatchPrepareStackFrame(pc_offset_stack_frame_construction_);
     __ FinishCode();
     safepoint_table_builder_.Emit(&asm_, __ GetTotalFrameSlotCountForGC());
     __ MaybeEmitOutOfLineConstantPool();
@@ -879,10 +912,24 @@ class LiftoffCompiler {
     unsupported(decoder, kExceptionHandling, "try");
   }
 
-  void Catch(FullDecoder* decoder, Control* block, Value* exception) {
+  void CatchException(FullDecoder* decoder,
+                      const ExceptionIndexImmediate<validate>& imm,
+                      Control* block, Vector<Value> values) {
     unsupported(decoder, kExceptionHandling, "catch");
   }
 
+  void Delegate(FullDecoder* decoder, uint32_t depth, Control* block) {
+    unsupported(decoder, kExceptionHandling, "delegate");
+  }
+
+  void Rethrow(FullDecoder* decoder, Control* block) {
+    unsupported(decoder, kExceptionHandling, "rethrow");
+  }
+
+  void CatchAll(FullDecoder* decoder, Control* block) {
+    unsupported(decoder, kExceptionHandling, "catch-all");
+  }
+
   void If(FullDecoder* decoder, const Value& cond, Control* if_block) {
     DCHECK_EQ(if_block, decoder->control_at(0));
     DCHECK(if_block->is_if());
@@ -1218,9 +1265,22 @@ class LiftoffCompiler {
               __ emit_type_conversion(kExprI64UConvertI32, dst, c_call_dst,
                                       nullptr);
             });
-      case kExprRefIsNull:
-        unsupported(decoder, kRefTypes, "ref_is_null");
+      case kExprRefIsNull: {
+        if (!FLAG_experimental_liftoff_extern_ref) {
+          unsupported(decoder, kRefTypes, "ref_is_null");
+          return;
+        }
+        LiftoffRegList pinned;
+        LiftoffRegister ref = pinned.set(__ PopToRegister());
+        LiftoffRegister null = __ GetUnusedRegister(kGpReg, pinned);
+        LoadNullValue(null.gp(), pinned);
+        // Prefer to overwrite one of the input registers with the result
+        // of the comparison.
+        LiftoffRegister dst = __ GetUnusedRegister(kGpReg, {ref, null}, {});
+        __ emit_ptrsize_set_cond(kEqual, dst.gp(), ref, null);
+        __ PushRegister(kWasmI32, dst);
         return;
+      }
       default:
         UNREACHABLE();
     }
@@ -1589,6 +1649,11 @@ class LiftoffCompiler {
             EmitDivOrRem64CCall(dst, lhs, rhs, ext_ref, rem_by_zero);
           }
         });
+      case kExprRefEq: {
+        return EmitBinOp<ValueType::kOptRef, kI32>(
+            BindFirst(&LiftoffAssembler::emit_ptrsize_set_cond, kEqual));
+      }
+
       default:
         UNREACHABLE();
     }
@@ -1632,15 +1697,9 @@ class LiftoffCompiler {
       unsupported(decoder, kRefTypes, "ref_null");
       return;
     }
-    Register isolate_root = __ GetUnusedRegister(kGpReg, {}).gp();
-    // We can re-use the isolate_root register as result register.
-    Register result = isolate_root;
-
-    LOAD_INSTANCE_FIELD(isolate_root, IsolateRoot, kSystemPointerSize);
-    __ LoadTaggedPointer(result, isolate_root, no_reg,
-                         IsolateData::root_slot_offset(RootIndex::kNullValue),
-                         {});
-    __ PushRegister(type, LiftoffRegister(result));
+    LiftoffRegister null = __ GetUnusedRegister(kGpReg, {});
+    LoadNullValue(null.gp(), {});
+    __ PushRegister(type, null);
   }
 
   void RefFunc(FullDecoder* decoder, uint32_t function_index, Value* result) {
@@ -1648,15 +1707,13 @@ class LiftoffCompiler {
   }
 
   void RefAsNonNull(FullDecoder* decoder, const Value& arg, Value* result) {
-    unsupported(decoder, kRefTypes, "ref.as_non_null");
+    LiftoffRegList pinned;
+    LiftoffRegister obj = pinned.set(__ PopToRegister(pinned));
+    MaybeEmitNullCheck(decoder, obj.gp(), pinned, arg.type);
+    __ PushRegister(ValueType::Ref(arg.type.heap_type(), kNonNullable), obj);
   }
 
-  void Drop(FullDecoder* decoder, const Value& value) {
-    auto& slot = __ cache_state()->stack_state.back();
-    // If the dropped slot contains a register, decrement it's use count.
-    if (slot.is_reg()) __ cache_state()->dec_used(slot.reg());
-    __ cache_state()->stack_state.pop_back();
-  }
+  void Drop(FullDecoder* decoder) { __ DropValues(1); }
 
   void TraceFunctionExit(FullDecoder* decoder) {
     DEBUG_CODE_COMMENT("trace function exit");
@@ -1810,11 +1867,7 @@ class LiftoffCompiler {
   void GlobalGet(FullDecoder* decoder, Value* result,
                  const GlobalIndexImmediate<validate>& imm) {
     const auto* global = &env_->module->globals[imm.index];
-    if (!CheckSupportedType(decoder,
-                            FLAG_experimental_liftoff_extern_ref
-                                ? kSupportedTypes
-                                : kSupportedTypesWithoutRefs,
-                            global->type, "global")) {
+    if (!CheckSupportedType(decoder, global->type, "global")) {
       return;
     }
 
@@ -1849,11 +1902,7 @@ class LiftoffCompiler {
   void GlobalSet(FullDecoder* decoder, const Value& value,
                  const GlobalIndexImmediate<validate>& imm) {
     auto* global = &env_->module->globals[imm.index];
-    if (!CheckSupportedType(decoder,
-                            FLAG_experimental_liftoff_extern_ref
-                                ? kSupportedTypes
-                                : kSupportedTypesWithoutRefs,
-                            global->type, "global")) {
+    if (!CheckSupportedType(decoder, global->type, "global")) {
       return;
     }
 
@@ -1868,7 +1917,7 @@ class LiftoffCompiler {
           pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
       LOAD_TAGGED_PTR_INSTANCE_FIELD(globals_buffer, TaggedGlobalsBuffer);
       LiftoffRegister value = pinned.set(__ PopToRegister(pinned));
-      __ StoreTaggedPointer(globals_buffer,
+      __ StoreTaggedPointer(globals_buffer, no_reg,
                             wasm::ObjectAccess::ElementOffsetInTaggedFixedArray(
                                 imm.global->offset),
                             value, pinned);
@@ -1882,14 +1931,67 @@ class LiftoffCompiler {
     __ Store(addr, no_reg, offset, reg, type, {}, nullptr, true);
   }
 
-  void TableGet(FullDecoder* decoder, const Value& index, Value* result,
+  void TableGet(FullDecoder* decoder, const Value&, Value*,
                 const TableIndexImmediate<validate>& imm) {
-    unsupported(decoder, kRefTypes, "table_get");
+    LiftoffRegList pinned;
+
+    LiftoffRegister table_index_reg =
+        pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+    __ LoadConstant(table_index_reg, WasmValue(imm.index));
+    LiftoffAssembler::VarState table_index(kPointerValueType, table_index_reg,
+                                           0);
+
+    LiftoffAssembler::VarState index = __ cache_state()->stack_state.back();
+
+    WasmCode::RuntimeStubId target = WasmCode::kWasmTableGet;
+    compiler::CallDescriptor* call_descriptor =
+        GetBuiltinCallDescriptor<WasmTableGetDescriptor>(compilation_zone_);
+
+    ValueType result_type = env_->module->tables[imm.index].type;
+    ValueType sig_reps[] = {result_type, kWasmI32, kWasmI32};
+    FunctionSig sig(1, 2, sig_reps);
+
+    __ PrepareBuiltinCall(&sig, call_descriptor, {table_index, index});
+    __ CallRuntimeStub(target);
+    DefineSafepoint();
+
+    // Pop parameters from the value stack.
+    __ cache_state()->stack_state.pop_back(1);
+
+    RegisterDebugSideTableEntry(DebugSideTableBuilder::kDidSpill);
+
+    __ PushRegister(result_type, LiftoffRegister(kReturnRegister0));
   }
 
-  void TableSet(FullDecoder* decoder, const Value& index, const Value& value,
+  void TableSet(FullDecoder* decoder, const Value&, const Value&,
                 const TableIndexImmediate<validate>& imm) {
-    unsupported(decoder, kRefTypes, "table_set");
+    LiftoffRegList pinned;
+
+    LiftoffRegister table_index_reg =
+        pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+    __ LoadConstant(table_index_reg, WasmValue(imm.index));
+    LiftoffAssembler::VarState table_index(kPointerValueType, table_index_reg,
+                                           0);
+
+    LiftoffAssembler::VarState value = __ cache_state()->stack_state.end()[-1];
+    LiftoffAssembler::VarState index = __ cache_state()->stack_state.end()[-2];
+
+    WasmCode::RuntimeStubId target = WasmCode::kWasmTableSet;
+    compiler::CallDescriptor* call_descriptor =
+        GetBuiltinCallDescriptor<WasmTableSetDescriptor>(compilation_zone_);
+
+    ValueType sig_reps[] = {kWasmI32, kWasmI32,
+                            env_->module->tables[imm.index].type};
+    FunctionSig sig(0, 3, sig_reps);
+
+    __ PrepareBuiltinCall(&sig, call_descriptor, {table_index, index, value});
+    __ CallRuntimeStub(target);
+    DefineSafepoint();
+
+    // Pop parameters from the value stack.
+    __ cache_state()->stack_state.pop_back(2);
+
+    RegisterDebugSideTableEntry(DebugSideTableBuilder::kDidSpill);
   }
 
   void Unreachable(FullDecoder* decoder) {
@@ -1934,8 +2036,6 @@ class LiftoffCompiler {
     __ jmp(target->label.get());
   }
 
-  void Br(FullDecoder* decoder, Control* target) { BrImpl(target); }
-
   void BrOrRet(FullDecoder* decoder, uint32_t depth) {
     if (depth == decoder->control_depth() - 1) {
       ReturnImpl(decoder);
@@ -1965,7 +2065,7 @@ class LiftoffCompiler {
       outstanding_op_ = kNoOutstandingOp;
     } else {
       // Otherwise, it's an i32 compare opcode.
-      Condition cond = NegateCondition(GetCompareCondition(outstanding_op_));
+      LiftoffCondition cond = Negate(GetCompareCondition(outstanding_op_));
       Register rhs = value;
       Register lhs = __ PopToRegister(LiftoffRegList::ForRegs(rhs)).gp();
       __ emit_cond_jump(cond, &cont_false, kWasmI32, lhs, rhs);
@@ -2070,6 +2170,7 @@ class LiftoffCompiler {
       if (!slot.is_reg()) continue;
       spilled->entries.push_back(SpilledRegistersForInspection::Entry{
           slot.offset(), slot.reg(), slot.type()});
+      __ RecordUsedSpillOffset(slot.offset());
     }
     return spilled;
   }
@@ -2077,22 +2178,35 @@ class LiftoffCompiler {
   Label* AddOutOfLineTrap(WasmCodePosition position,
                           WasmCode::RuntimeStubId stub, uint32_t pc = 0) {
     DCHECK(FLAG_wasm_bounds_checks);
-
+    OutOfLineSafepointInfo* safepoint_info = nullptr;
+    if (V8_UNLIKELY(for_debugging_)) {
+      // Execution does not return after a trap. Therefore we don't have to
+      // define a safepoint for traps that would preserve references on the
+      // stack. However, if this is debug code, then we have to preserve the
+      // references so that they can be inspected.
+      safepoint_info =
+          compilation_zone_->New<OutOfLineSafepointInfo>(compilation_zone_);
+      __ cache_state()->GetTaggedSlotsForOOLCode(
+          &safepoint_info->slots, &safepoint_info->spills,
+          LiftoffAssembler::CacheState::SpillLocation::kStackSlots);
+    }
     out_of_line_code_.push_back(OutOfLineCode::Trap(
-        stub, position, pc,
-        RegisterDebugSideTableEntry(DebugSideTableBuilder::kAssumeSpilling),
+        stub, position,
         V8_UNLIKELY(for_debugging_) ? GetSpilledRegistersForInspection()
-                                    : nullptr));
+                                    : nullptr,
+        safepoint_info, pc,
+        RegisterDebugSideTableEntry(DebugSideTableBuilder::kAssumeSpilling)));
     return out_of_line_code_.back().label.get();
   }
 
   enum ForceCheck : bool { kDoForceCheck = true, kDontForceCheck = false };
 
-  // Returns true if the memory access is statically known to be out of bounds
-  // (a jump to the trap was generated then); return false otherwise.
-  bool BoundsCheckMem(FullDecoder* decoder, uint32_t access_size,
-                      uint64_t offset, Register index, LiftoffRegList pinned,
-                      ForceCheck force_check) {
+  // Returns {no_reg} if the memory access is statically known to be out of
+  // bounds (a jump to the trap was generated then); return the GP {index}
+  // register otherwise (holding the ptrsized index).
+  Register BoundsCheckMem(FullDecoder* decoder, uint32_t access_size,
+                          uint64_t offset, LiftoffRegister index,
+                          LiftoffRegList pinned, ForceCheck force_check) {
     // If the offset does not fit in a uintptr_t, this can never succeed on this
     // machine.
     const bool statically_oob =
@@ -2100,11 +2214,22 @@ class LiftoffCompiler {
         !base::IsInBounds<uintptr_t>(offset, access_size,
                                      env_->max_memory_size);
 
+    // After bounds checking, we know that the index must be ptrsize, hence only
+    // look at the lower word on 32-bit systems (the high word is bounds-checked
+    // further down).
+    Register index_ptrsize =
+        kNeedI64RegPair && index.is_gp_pair() ? index.low_gp() : index.gp();
+
     if (!force_check && !statically_oob &&
         (!FLAG_wasm_bounds_checks || env_->use_trap_handler)) {
-      return false;
+      // With trap handlers we should not have a register pair as input (we
+      // would only return the lower half).
+      DCHECK_IMPLIES(env_->use_trap_handler, index.is_gp());
+      return index_ptrsize;
     }
 
+    DEBUG_CODE_COMMENT("bounds check memory");
+
     // TODO(wasm): This adds protected instruction information for the jump
     // instruction we are about to generate. It would be better to just not add
     // protected instruction info when the pc is 0.
@@ -2115,41 +2240,50 @@ class LiftoffCompiler {
     if (statically_oob) {
       __ emit_jump(trap_label);
       decoder->SetSucceedingCodeDynamicallyUnreachable();
-      return true;
+      return no_reg;
+    }
+
+    // Convert the index to ptrsize, bounds-checking the high word on 32-bit
+    // systems for memory64.
+    if (!env_->module->is_memory64) {
+      __ emit_u32_to_intptr(index_ptrsize, index_ptrsize);
+    } else if (kSystemPointerSize == kInt32Size) {
+      DCHECK_GE(kMaxUInt32, env_->max_memory_size);
+      // Unary "unequal" means "not equals zero".
+      __ emit_cond_jump(kUnequal, trap_label, kWasmI32, index.high_gp());
     }
 
     uintptr_t end_offset = offset + access_size - 1u;
 
-    // If the end offset is larger than the smallest memory, dynamically check
-    // the end offset against the actual memory size, which is not known at
-    // compile time. Otherwise, only one check is required (see below).
+    pinned.set(index_ptrsize);
     LiftoffRegister end_offset_reg =
         pinned.set(__ GetUnusedRegister(kGpReg, pinned));
-    Register mem_size = __ GetUnusedRegister(kGpReg, pinned).gp();
-    LOAD_INSTANCE_FIELD(mem_size, MemorySize, kSystemPointerSize);
+    LiftoffRegister mem_size = __ GetUnusedRegister(kGpReg, pinned);
+    LOAD_INSTANCE_FIELD(mem_size.gp(), MemorySize, kSystemPointerSize);
 
     __ LoadConstant(end_offset_reg, WasmValue::ForUintPtr(end_offset));
 
-    if (end_offset >= env_->min_memory_size) {
-      __ emit_cond_jump(kUnsignedGreaterEqual, trap_label,
-                        LiftoffAssembler::kWasmIntPtr, end_offset_reg.gp(),
-                        mem_size);
+    // If the end offset is larger than the smallest memory, dynamically check
+    // the end offset against the actual memory size, which is not known at
+    // compile time. Otherwise, only one check is required (see below).
+    if (end_offset > env_->min_memory_size) {
+      __ emit_cond_jump(kUnsignedGreaterEqual, trap_label, kPointerValueType,
+                        end_offset_reg.gp(), mem_size.gp());
     }
 
-    // Just reuse the end_offset register for computing the effective size.
+    // Just reuse the end_offset register for computing the effective size
+    // (which is >= 0 because of the check above).
     LiftoffRegister effective_size_reg = end_offset_reg;
-    __ emit_ptrsize_sub(effective_size_reg.gp(), mem_size, end_offset_reg.gp());
-
-    __ emit_u32_to_intptr(index, index);
+    __ emit_ptrsize_sub(effective_size_reg.gp(), mem_size.gp(),
+                        end_offset_reg.gp());
 
-    __ emit_cond_jump(kUnsignedGreaterEqual, trap_label,
-                      LiftoffAssembler::kWasmIntPtr, index,
-                      effective_size_reg.gp());
-    return false;
+    __ emit_cond_jump(kUnsignedGreaterEqual, trap_label, kPointerValueType,
+                      index_ptrsize, effective_size_reg.gp());
+    return index_ptrsize;
   }
 
   void AlignmentCheckMem(FullDecoder* decoder, uint32_t access_size,
-                         uint32_t offset, Register index,
+                         uintptr_t offset, Register index,
                          LiftoffRegList pinned) {
     Label* trap_label = AddOutOfLineTrap(
         decoder->position(), WasmCode::kThrowWasmTrapUnalignedAccess, 0);
@@ -2165,16 +2299,16 @@ class LiftoffCompiler {
       // Then we can also avoid using the temp register here.
       __ emit_i32_andi(address, index, align_mask);
       __ emit_cond_jump(kUnequal, trap_label, kWasmI32, address);
-      return;
+    } else {
+      // For alignment checks we only look at the lower 32-bits in {offset}.
+      __ emit_i32_addi(address, index, static_cast<uint32_t>(offset));
+      __ emit_i32_andi(address, address, align_mask);
+      __ emit_cond_jump(kUnequal, trap_label, kWasmI32, address);
     }
-    __ emit_i32_addi(address, index, offset);
-    __ emit_i32_andi(address, address, align_mask);
-
-    __ emit_cond_jump(kUnequal, trap_label, kWasmI32, address);
   }
 
   void TraceMemoryOperation(bool is_store, MachineRepresentation rep,
-                            Register index, uint32_t offset,
+                            Register index, uintptr_t offset,
                             WasmCodePosition position) {
     // Before making the runtime call, spill all cache registers.
     __ SpillAllRegisters();
@@ -2183,7 +2317,9 @@ class LiftoffCompiler {
     // Get one register for computing the effective offset (offset + index).
     LiftoffRegister effective_offset =
         pinned.set(__ GetUnusedRegister(kGpReg, pinned));
-    __ LoadConstant(effective_offset, WasmValue(offset));
+    // TODO(clemensb): Do a 64-bit addition here if memory64 is used.
+    DCHECK_GE(kMaxUInt32, offset);
+    __ LoadConstant(effective_offset, WasmValue(static_cast<uint32_t>(offset)));
     __ emit_i32_add(effective_offset.gp(), effective_offset.gp(), index);
 
     // Get a register to hold the stack slot for MemoryTracingInfo.
@@ -2228,7 +2364,7 @@ class LiftoffCompiler {
     __ DeallocateStackSlot(sizeof(MemoryTracingInfo));
   }
 
-  Register AddMemoryMasking(Register index, uint32_t* offset,
+  Register AddMemoryMasking(Register index, uintptr_t* offset,
                             LiftoffRegList* pinned) {
     if (!FLAG_untrusted_code_mitigations || env_->use_trap_handler) {
       return index;
@@ -2237,31 +2373,38 @@ class LiftoffCompiler {
     // Make sure that we can overwrite {index}.
     if (__ cache_state()->is_used(LiftoffRegister(index))) {
       Register old_index = index;
-      pinned->clear(LiftoffRegister(old_index));
+      pinned->clear(LiftoffRegister{old_index});
       index = pinned->set(__ GetUnusedRegister(kGpReg, *pinned)).gp();
-      if (index != old_index) __ Move(index, old_index, kWasmI32);
+      if (index != old_index) {
+        __ Move(index, old_index, kPointerValueType);
+      }
     }
     Register tmp = __ GetUnusedRegister(kGpReg, *pinned).gp();
-    __ emit_ptrsize_addi(index, index, *offset);
     LOAD_INSTANCE_FIELD(tmp, MemoryMask, kSystemPointerSize);
+    if (*offset) __ emit_ptrsize_addi(index, index, *offset);
     __ emit_ptrsize_and(index, index, tmp);
     *offset = 0;
     return index;
   }
 
+  void Prefetch(FullDecoder* decoder,
+                const MemoryAccessImmediate<validate>& imm,
+                const Value& index_val, bool temporal) {
+    unsupported(decoder, kSimd, "simd prefetch");
+  }
+
   void LoadMem(FullDecoder* decoder, LoadType type,
                const MemoryAccessImmediate<validate>& imm,
                const Value& index_val, Value* result) {
     ValueType value_type = type.value_type();
-    if (!CheckSupportedType(decoder, kSupportedTypes, value_type, "load"))
-      return;
-    LiftoffRegList pinned;
-    Register index = pinned.set(__ PopToRegister()).gp();
-    if (BoundsCheckMem(decoder, type.size(), imm.offset, index, pinned,
-                       kDontForceCheck)) {
-      return;
-    }
-    uint32_t offset = imm.offset;
+    if (!CheckSupportedType(decoder, value_type, "load")) return;
+    LiftoffRegister full_index = __ PopToRegister();
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, {}, kDontForceCheck);
+    if (index == no_reg) return;
+
+    uintptr_t offset = imm.offset;
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(index);
     index = AddMemoryMasking(index, &offset, &pinned);
     DEBUG_CODE_COMMENT("load from memory");
     Register addr = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
@@ -2289,24 +2432,22 @@ class LiftoffCompiler {
                      const Value& index_val, Value* result) {
     // LoadTransform requires SIMD support, so check for it here. If
     // unsupported, bailout and let TurboFan lower the code.
-    if (!CheckSupportedType(decoder, kSupportedTypes, kWasmS128,
-                            "LoadTransform")) {
+    if (!CheckSupportedType(decoder, kWasmS128, "LoadTransform")) {
       return;
     }
 
-    LiftoffRegList pinned;
-    Register index = pinned.set(__ PopToRegister()).gp();
+    LiftoffRegister full_index = __ PopToRegister();
     // For load splats and load zero, LoadType is the size of the load, and for
     // load extends, LoadType is the size of the lane, and it always loads 8
     // bytes.
     uint32_t access_size =
         transform == LoadTransformationKind::kExtend ? 8 : type.size();
-    if (BoundsCheckMem(decoder, access_size, imm.offset, index, pinned,
-                       kDontForceCheck)) {
-      return;
-    }
+    Register index = BoundsCheckMem(decoder, access_size, imm.offset,
+                                    full_index, {}, kDontForceCheck);
+    if (index == no_reg) return;
 
-    uint32_t offset = imm.offset;
+    uintptr_t offset = imm.offset;
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(index);
     index = AddMemoryMasking(index, &offset, &pinned);
     DEBUG_CODE_COMMENT("load with transformation");
     Register addr = __ GetUnusedRegister(kGpReg, pinned).gp();
@@ -2333,26 +2474,59 @@ class LiftoffCompiler {
     }
   }
 
-  void LoadLane(FullDecoder* decoder, LoadType type, const Value& value,
-                const Value& index, const MemoryAccessImmediate<validate>& imm,
-                const uint8_t laneidx, Value* result) {
-    unsupported(decoder, kSimd, "simd load lane");
+  void LoadLane(FullDecoder* decoder, LoadType type, const Value& _value,
+                const Value& _index, const MemoryAccessImmediate<validate>& imm,
+                const uint8_t laneidx, Value* _result) {
+    if (!CheckSupportedType(decoder, kWasmS128, "LoadLane")) {
+      return;
+    }
+
+    LiftoffRegList pinned;
+    LiftoffRegister value = pinned.set(__ PopToRegister());
+    LiftoffRegister full_index = __ PopToRegister();
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, pinned, kDontForceCheck);
+    if (index == no_reg) return;
+
+    uintptr_t offset = imm.offset;
+    pinned.set(index);
+    index = AddMemoryMasking(index, &offset, &pinned);
+    DEBUG_CODE_COMMENT("load lane");
+    Register addr = __ GetUnusedRegister(kGpReg, pinned).gp();
+    LOAD_INSTANCE_FIELD(addr, MemoryStart, kSystemPointerSize);
+    LiftoffRegister result = __ GetUnusedRegister(reg_class_for(kS128), {});
+    uint32_t protected_load_pc = 0;
+
+    __ LoadLane(result, value, addr, index, offset, type, laneidx,
+                &protected_load_pc);
+    if (env_->use_trap_handler) {
+      AddOutOfLineTrap(decoder->position(),
+                       WasmCode::kThrowWasmTrapMemOutOfBounds,
+                       protected_load_pc);
+    }
+
+    __ PushRegister(ValueType::Primitive(kS128), result);
+
+    if (FLAG_trace_wasm_memory) {
+      TraceMemoryOperation(false, type.mem_type().representation(), index,
+                           offset, decoder->position());
+    }
   }
 
   void StoreMem(FullDecoder* decoder, StoreType type,
                 const MemoryAccessImmediate<validate>& imm,
                 const Value& index_val, const Value& value_val) {
     ValueType value_type = type.value_type();
-    if (!CheckSupportedType(decoder, kSupportedTypes, value_type, "store"))
-      return;
+    if (!CheckSupportedType(decoder, value_type, "store")) return;
     LiftoffRegList pinned;
     LiftoffRegister value = pinned.set(__ PopToRegister());
-    Register index = pinned.set(__ PopToRegister(pinned)).gp();
-    if (BoundsCheckMem(decoder, type.size(), imm.offset, index, pinned,
-                       kDontForceCheck)) {
-      return;
-    }
-    uint32_t offset = imm.offset;
+    LiftoffRegister full_index = __ PopToRegister(pinned);
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, pinned, kDontForceCheck);
+    if (index == no_reg) return;
+
+    uintptr_t offset = imm.offset;
+    pinned.set(index);
     index = AddMemoryMasking(index, &offset, &pinned);
     DEBUG_CODE_COMMENT("store to memory");
     Register addr = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
@@ -2465,7 +2639,24 @@ class LiftoffCompiler {
   }
 
   void BrOnNull(FullDecoder* decoder, const Value& ref_object, uint32_t depth) {
-    unsupported(decoder, kRefTypes, "br_on_null");
+    // Before branching, materialize all constants. This avoids repeatedly
+    // materializing them for each conditional branch.
+    if (depth != decoder->control_depth() - 1) {
+      __ MaterializeMergedConstants(
+          decoder->control_at(depth)->br_merge()->arity);
+    }
+
+    Label cont_false;
+    LiftoffRegList pinned;
+    LiftoffRegister ref = pinned.set(__ PopToRegister(pinned));
+    Register null = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
+    LoadNullValue(null, pinned);
+    __ emit_cond_jump(kUnequal, &cont_false, ref_object.type, ref.gp(), null);
+
+    BrOrRet(decoder, depth);
+    __ bind(&cont_false);
+    __ PushRegister(ValueType::Ref(ref_object.type.heap_type(), kNonNullable),
+                    ref);
   }
 
   template <ValueType::Kind src_type, ValueType::Kind result_type,
@@ -2732,6 +2923,18 @@ class LiftoffCompiler {
         return EmitBinOp<kS128, kS128>(&LiftoffAssembler::emit_i16x8_max_s);
       case wasm::kExprI16x8MaxU:
         return EmitBinOp<kS128, kS128>(&LiftoffAssembler::emit_i16x8_max_u);
+      case wasm::kExprI16x8ExtMulLowI8x16S:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i16x8_extmul_low_i8x16_s);
+      case wasm::kExprI16x8ExtMulLowI8x16U:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i16x8_extmul_low_i8x16_u);
+      case wasm::kExprI16x8ExtMulHighI8x16S:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i16x8_extmul_high_i8x16_s);
+      case wasm::kExprI16x8ExtMulHighI8x16U:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i16x8_extmul_high_i8x16_u);
       case wasm::kExprI32x4Neg:
         return EmitUnOp<kS128, kS128>(&LiftoffAssembler::emit_i32x4_neg);
       case wasm::kExprV32x4AnyTrue:
@@ -2766,6 +2969,18 @@ class LiftoffCompiler {
       case wasm::kExprI32x4DotI16x8S:
         return EmitBinOp<kS128, kS128>(
             &LiftoffAssembler::emit_i32x4_dot_i16x8_s);
+      case wasm::kExprI32x4ExtMulLowI16x8S:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i32x4_extmul_low_i16x8_s);
+      case wasm::kExprI32x4ExtMulLowI16x8U:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i32x4_extmul_low_i16x8_u);
+      case wasm::kExprI32x4ExtMulHighI16x8S:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i32x4_extmul_high_i16x8_s);
+      case wasm::kExprI32x4ExtMulHighI16x8U:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i32x4_extmul_high_i16x8_u);
       case wasm::kExprI64x2Neg:
         return EmitUnOp<kS128, kS128>(&LiftoffAssembler::emit_i64x2_neg);
       case wasm::kExprI64x2Shl:
@@ -2783,6 +2998,20 @@ class LiftoffCompiler {
         return EmitBinOp<kS128, kS128>(&LiftoffAssembler::emit_i64x2_sub);
       case wasm::kExprI64x2Mul:
         return EmitBinOp<kS128, kS128>(&LiftoffAssembler::emit_i64x2_mul);
+      case wasm::kExprI64x2ExtMulLowI32x4S:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i64x2_extmul_low_i32x4_s);
+      case wasm::kExprI64x2ExtMulLowI32x4U:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i64x2_extmul_low_i32x4_u);
+      case wasm::kExprI64x2ExtMulHighI32x4S:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i64x2_extmul_high_i32x4_s);
+      case wasm::kExprI64x2ExtMulHighI32x4U:
+        return EmitBinOp<kS128, kS128>(
+            &LiftoffAssembler::emit_i64x2_extmul_high_i32x4_u);
+      case wasm::kExprI64x2BitMask:
+        return EmitUnOp<kS128, kI32>(&LiftoffAssembler::emit_i64x2_bitmask);
       case wasm::kExprF32x4Abs:
         return EmitUnOp<kS128, kS128>(&LiftoffAssembler::emit_f32x4_abs);
       case wasm::kExprF32x4Neg:
@@ -3046,7 +3275,7 @@ class LiftoffCompiler {
     LiftoffRegister dst = __ GetUnusedRegister(result_rc, {lhs, rhs}, {});
 
     uint8_t shuffle[kSimd128Size];
-    memcpy(shuffle, imm.value, sizeof(shuffle));
+    base::Memcpy(shuffle, imm.value, sizeof(shuffle));
     bool is_swizzle;
     bool needs_swap;
     wasm::SimdShuffle::CanonicalizeShuffle(lhs == rhs, shuffle, &needs_swap,
@@ -3065,23 +3294,18 @@ class LiftoffCompiler {
   void Rethrow(FullDecoder* decoder, const Value& exception) {
     unsupported(decoder, kExceptionHandling, "rethrow");
   }
-  void BrOnException(FullDecoder* decoder, const Value& exception,
-                     const ExceptionIndexImmediate<validate>& imm,
-                     uint32_t depth, Vector<Value> values) {
-    unsupported(decoder, kExceptionHandling, "br_on_exn");
-  }
-
   void AtomicStoreMem(FullDecoder* decoder, StoreType type,
                       const MemoryAccessImmediate<validate>& imm) {
     LiftoffRegList pinned;
     LiftoffRegister value = pinned.set(__ PopToRegister());
-    Register index = pinned.set(__ PopToRegister(pinned)).gp();
-    if (BoundsCheckMem(decoder, type.size(), imm.offset, index, pinned,
-                       kDoForceCheck)) {
-      return;
-    }
+    LiftoffRegister full_index = __ PopToRegister(pinned);
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, pinned, kDoForceCheck);
+    if (index == no_reg) return;
+
+    pinned.set(index);
     AlignmentCheckMem(decoder, type.size(), imm.offset, index, pinned);
-    uint32_t offset = imm.offset;
+    uintptr_t offset = imm.offset;
     index = AddMemoryMasking(index, &offset, &pinned);
     DEBUG_CODE_COMMENT("atomic store to memory");
     Register addr = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
@@ -3098,14 +3322,14 @@ class LiftoffCompiler {
   void AtomicLoadMem(FullDecoder* decoder, LoadType type,
                      const MemoryAccessImmediate<validate>& imm) {
     ValueType value_type = type.value_type();
-    LiftoffRegList pinned;
-    Register index = pinned.set(__ PopToRegister()).gp();
-    if (BoundsCheckMem(decoder, type.size(), imm.offset, index, pinned,
-                       kDoForceCheck)) {
-      return;
-    }
+    LiftoffRegister full_index = __ PopToRegister();
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, {}, kDoForceCheck);
+    if (index == no_reg) return;
+
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(index);
     AlignmentCheckMem(decoder, type.size(), imm.offset, index, pinned);
-    uint32_t offset = imm.offset;
+    uintptr_t offset = imm.offset;
     index = AddMemoryMasking(index, &offset, &pinned);
     DEBUG_CODE_COMMENT("atomic load from memory");
     Register addr = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
@@ -3124,7 +3348,7 @@ class LiftoffCompiler {
   void AtomicBinop(FullDecoder* decoder, StoreType type,
                    const MemoryAccessImmediate<validate>& imm,
                    void (LiftoffAssembler::*emit_fn)(Register, Register,
-                                                     uint32_t, LiftoffRegister,
+                                                     uintptr_t, LiftoffRegister,
                                                      LiftoffRegister,
                                                      StoreType)) {
     ValueType result_type = type.value_type();
@@ -3146,14 +3370,15 @@ class LiftoffCompiler {
     LiftoffRegister result =
         pinned.set(__ GetUnusedRegister(value.reg_class(), pinned));
 #endif
-    Register index = pinned.set(__ PopToRegister(pinned)).gp();
-    if (BoundsCheckMem(decoder, type.size(), imm.offset, index, pinned,
-                       kDoForceCheck)) {
-      return;
-    }
+    LiftoffRegister full_index = __ PopToRegister(pinned);
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, pinned, kDoForceCheck);
+    if (index == no_reg) return;
+
+    pinned.set(index);
     AlignmentCheckMem(decoder, type.size(), imm.offset, index, pinned);
 
-    uint32_t offset = imm.offset;
+    uintptr_t offset = imm.offset;
     index = AddMemoryMasking(index, &offset, &pinned);
     Register addr = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
     LOAD_INSTANCE_FIELD(addr, MemoryStart, kSystemPointerSize);
@@ -3170,25 +3395,24 @@ class LiftoffCompiler {
     // complete address calculation first, so that the address only needs a
     // single register. Afterwards we load all remaining values into the
     // other registers.
-    LiftoffRegList pinned;
-    Register index_reg = pinned.set(__ PeekToRegister(2, pinned)).gp();
-    if (BoundsCheckMem(decoder, type.size(), imm.offset, index_reg, pinned,
-                       kDoForceCheck)) {
-      return;
-    }
-    AlignmentCheckMem(decoder, type.size(), imm.offset, index_reg, pinned);
+    LiftoffRegister full_index = __ PeekToRegister(2, {});
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, {}, kDoForceCheck);
+    if (index == no_reg) return;
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(index);
+    AlignmentCheckMem(decoder, type.size(), imm.offset, index, pinned);
 
-    uint32_t offset = imm.offset;
-    index_reg = AddMemoryMasking(index_reg, &offset, &pinned);
+    uintptr_t offset = imm.offset;
+    index = AddMemoryMasking(index, &offset, &pinned);
     Register addr = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
     LOAD_INSTANCE_FIELD(addr, MemoryStart, kSystemPointerSize);
-    __ emit_i32_add(addr, addr, index_reg);
-    pinned.clear(LiftoffRegister(index_reg));
+    __ emit_i32_add(addr, addr, index);
+    pinned.clear(LiftoffRegister(index));
     LiftoffRegister new_value = pinned.set(__ PopToRegister(pinned));
     LiftoffRegister expected = pinned.set(__ PopToRegister(pinned));
 
     // Pop the index from the stack.
-    __ cache_state()->stack_state.pop_back(1);
+    __ DropValues(1);
 
     LiftoffRegister result = expected;
 
@@ -3203,14 +3427,14 @@ class LiftoffCompiler {
     LiftoffRegList pinned;
     LiftoffRegister new_value = pinned.set(__ PopToRegister());
     LiftoffRegister expected = pinned.set(__ PopToRegister(pinned));
-    Register index = pinned.set(__ PopToRegister(pinned)).gp();
-    if (BoundsCheckMem(decoder, type.size(), imm.offset, index, pinned,
-                       kDoForceCheck)) {
-      return;
-    }
+    LiftoffRegister full_index = __ PopToRegister(pinned);
+    Register index = BoundsCheckMem(decoder, type.size(), imm.offset,
+                                    full_index, pinned, kDoForceCheck);
+    if (index == no_reg) return;
+    pinned.set(index);
     AlignmentCheckMem(decoder, type.size(), imm.offset, index, pinned);
 
-    uint32_t offset = imm.offset;
+    uintptr_t offset = imm.offset;
     index = AddMemoryMasking(index, &offset, &pinned);
     Register addr = pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
     LOAD_INSTANCE_FIELD(addr, MemoryStart, kSystemPointerSize);
@@ -3237,26 +3461,25 @@ class LiftoffCompiler {
 
   void AtomicWait(FullDecoder* decoder, ValueType type,
                   const MemoryAccessImmediate<validate>& imm) {
-    LiftoffRegList pinned;
-    Register index_reg = pinned.set(__ PeekToRegister(2, pinned)).gp();
-    if (BoundsCheckMem(decoder, type.element_size_bytes(), imm.offset,
-                       index_reg, pinned, kDoForceCheck)) {
-      return;
-    }
+    LiftoffRegister full_index = __ PeekToRegister(2, {});
+    Register index_reg =
+        BoundsCheckMem(decoder, type.element_size_bytes(), imm.offset,
+                       full_index, {}, kDoForceCheck);
+    if (index_reg == no_reg) return;
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(index_reg);
     AlignmentCheckMem(decoder, type.element_size_bytes(), imm.offset, index_reg,
                       pinned);
 
-    uint32_t offset = imm.offset;
+    uintptr_t offset = imm.offset;
     index_reg = AddMemoryMasking(index_reg, &offset, &pinned);
     Register index_plus_offset =
         __ cache_state()->is_used(LiftoffRegister(index_reg))
             ? pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp()
             : index_reg;
+    // TODO(clemensb): Skip this if memory is 64 bit.
+    __ emit_ptrsize_zeroextend_i32(index_plus_offset, index_reg);
     if (offset) {
-      __ emit_i32_addi(index_plus_offset, index_reg, offset);
-      __ emit_ptrsize_zeroextend_i32(index_plus_offset, index_plus_offset);
-    } else {
-      __ emit_ptrsize_zeroextend_i32(index_plus_offset, index_reg);
+      __ emit_ptrsize_addi(index_plus_offset, index_plus_offset, offset);
     }
 
     LiftoffAssembler::VarState timeout =
@@ -3305,7 +3528,7 @@ class LiftoffCompiler {
     __ CallRuntimeStub(target);
     DefineSafepoint();
     // Pop parameters from the value stack.
-    __ cache_state()->stack_state.pop_back(3);
+    __ DropValues(3);
 
     RegisterDebugSideTableEntry(DebugSideTableBuilder::kDidSpill);
 
@@ -3314,26 +3537,25 @@ class LiftoffCompiler {
 
   void AtomicNotify(FullDecoder* decoder,
                     const MemoryAccessImmediate<validate>& imm) {
-    LiftoffRegList pinned;
-    Register index_reg = pinned.set(__ PeekToRegister(1, pinned)).gp();
-    if (BoundsCheckMem(decoder, kWasmI32.element_size_bytes(), imm.offset,
-                       index_reg, pinned, kDoForceCheck)) {
-      return;
-    }
+    LiftoffRegister full_index = __ PeekToRegister(1, {});
+    Register index_reg =
+        BoundsCheckMem(decoder, kWasmI32.element_size_bytes(), imm.offset,
+                       full_index, {}, kDoForceCheck);
+    if (index_reg == no_reg) return;
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(index_reg);
     AlignmentCheckMem(decoder, kWasmI32.element_size_bytes(), imm.offset,
                       index_reg, pinned);
 
-    uint32_t offset = imm.offset;
+    uintptr_t offset = imm.offset;
     index_reg = AddMemoryMasking(index_reg, &offset, &pinned);
     Register index_plus_offset =
         __ cache_state()->is_used(LiftoffRegister(index_reg))
             ? pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp()
             : index_reg;
+    // TODO(clemensb): Skip this if memory is 64 bit.
+    __ emit_ptrsize_zeroextend_i32(index_plus_offset, index_reg);
     if (offset) {
-      __ emit_i32_addi(index_plus_offset, index_reg, offset);
-      __ emit_ptrsize_zeroextend_i32(index_plus_offset, index_plus_offset);
-    } else {
-      __ emit_ptrsize_zeroextend_i32(index_plus_offset, index_reg);
+      __ emit_ptrsize_addi(index_plus_offset, index_plus_offset, offset);
     }
 
     ValueType sig_reps[] = {kWasmI32, kPointerValueType, kWasmI32};
@@ -3349,7 +3571,7 @@ class LiftoffCompiler {
     __ CallRuntimeStub(WasmCode::kWasmAtomicNotify);
     DefineSafepoint();
     // Pop parameters from the value stack.
-    __ cache_state()->stack_state.pop_back(2);
+    __ DropValues(2);
 
     RegisterDebugSideTableEntry(DebugSideTableBuilder::kDidSpill);
 
@@ -3631,20 +3853,21 @@ class LiftoffCompiler {
 
   void ElemDrop(FullDecoder* decoder, const ElemDropImmediate<validate>& imm) {
     LiftoffRegList pinned;
-    Register seg_size_array =
+    Register dropped_elem_segments =
         pinned.set(__ GetUnusedRegister(kGpReg, pinned)).gp();
-    LOAD_INSTANCE_FIELD(seg_size_array, DroppedElemSegments,
+    LOAD_INSTANCE_FIELD(dropped_elem_segments, DroppedElemSegments,
                         kSystemPointerSize);
 
     LiftoffRegister seg_index =
         pinned.set(__ GetUnusedRegister(kGpReg, pinned));
     __ LoadConstant(seg_index, WasmValue(imm.index));
 
-    // Set the length of the segment to '0' to drop it.
+    // Mark the segment as dropped by setting its value in the dropped
+    // segments list to 1.
     LiftoffRegister one_reg = pinned.set(__ GetUnusedRegister(kGpReg, pinned));
     __ LoadConstant(one_reg, WasmValue(1));
-    __ Store(seg_size_array, seg_index.gp(), 0, one_reg, StoreType::kI32Store,
-             pinned);
+    __ Store(dropped_elem_segments, seg_index.gp(), 0, one_reg,
+             StoreType::kI32Store8, pinned);
   }
 
   void TableCopy(FullDecoder* decoder, const TableCopyImmediate<validate>& imm,
@@ -3714,104 +3937,452 @@ class LiftoffCompiler {
     unsupported(decoder, kRefTypes, "table.fill");
   }
 
+  void StructNew(FullDecoder* decoder,
+                 const StructIndexImmediate<validate>& imm, const Value& rtt,
+                 bool initial_values_on_stack) {
+    ValueType struct_value_type = ValueType::Ref(imm.index, kNonNullable);
+    WasmCode::RuntimeStubId target = WasmCode::kWasmAllocateStructWithRtt;
+    compiler::CallDescriptor* call_descriptor =
+        GetBuiltinCallDescriptor<WasmAllocateStructWithRttDescriptor>(
+            compilation_zone_);
+    ValueType sig_reps[] = {struct_value_type, rtt.type};
+    FunctionSig sig(1, 1, sig_reps);
+    LiftoffAssembler::VarState rtt_value =
+        __ cache_state()->stack_state.end()[-1];
+    __ PrepareBuiltinCall(&sig, call_descriptor, {rtt_value});
+    __ CallRuntimeStub(target);
+    DefineSafepoint();
+    // Drop the RTT.
+    __ cache_state()->stack_state.pop_back(1);
+
+    LiftoffRegister obj(kReturnRegister0);
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(obj);
+    for (uint32_t i = imm.struct_type->field_count(); i > 0;) {
+      i--;
+      int offset = StructFieldOffset(imm.struct_type, i);
+      ValueType field_type = imm.struct_type->field(i);
+      LiftoffRegister value = initial_values_on_stack
+                                  ? pinned.set(__ PopToRegister(pinned))
+                                  : pinned.set(__ GetUnusedRegister(
+                                        reg_class_for(field_type), pinned));
+      if (!initial_values_on_stack) {
+        if (!CheckSupportedType(decoder, field_type, "default value")) return;
+        SetDefaultValue(value, field_type, pinned);
+      }
+      StoreObjectField(obj.gp(), no_reg, offset, value, pinned, field_type);
+      pinned.clear(value);
+    }
+    __ PushRegister(struct_value_type, obj);
+  }
+
   void StructNewWithRtt(FullDecoder* decoder,
                         const StructIndexImmediate<validate>& imm,
                         const Value& rtt, const Value args[], Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "struct.new_with_rtt");
+    StructNew(decoder, imm, rtt, true);
   }
+
   void StructNewDefault(FullDecoder* decoder,
                         const StructIndexImmediate<validate>& imm,
                         const Value& rtt, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "struct.new_default_with_rtt");
+    StructNew(decoder, imm, rtt, false);
   }
+
   void StructGet(FullDecoder* decoder, const Value& struct_obj,
                  const FieldIndexImmediate<validate>& field, bool is_signed,
                  Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "struct.get");
+    const StructType* struct_type = field.struct_index.struct_type;
+    ValueType field_type = struct_type->field(field.index);
+    if (!CheckSupportedType(decoder, field_type, "field load")) return;
+    int offset = StructFieldOffset(struct_type, field.index);
+    LiftoffRegList pinned;
+    LiftoffRegister obj = pinned.set(__ PopToRegister(pinned));
+    MaybeEmitNullCheck(decoder, obj.gp(), pinned, struct_obj.type);
+    LiftoffRegister value =
+        pinned.set(__ GetUnusedRegister(reg_class_for(field_type), pinned));
+    LoadObjectField(value, obj.gp(), no_reg, offset, field_type, is_signed,
+                    pinned);
+    __ PushRegister(field_type.Unpacked(), value);
   }
+
   void StructSet(FullDecoder* decoder, const Value& struct_obj,
                  const FieldIndexImmediate<validate>& field,
                  const Value& field_value) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "struct.set");
+    const StructType* struct_type = field.struct_index.struct_type;
+    ValueType field_type = struct_type->field(field.index);
+    int offset = StructFieldOffset(struct_type, field.index);
+    LiftoffRegList pinned;
+    LiftoffRegister value = pinned.set(__ PopToRegister(pinned));
+    LiftoffRegister obj = pinned.set(__ PopToRegister(pinned));
+    MaybeEmitNullCheck(decoder, obj.gp(), pinned, struct_obj.type);
+    StoreObjectField(obj.gp(), no_reg, offset, value, pinned, field_type);
+  }
+
+  void ArrayNew(FullDecoder* decoder, const ArrayIndexImmediate<validate>& imm,
+                ValueType rtt_type, bool initial_value_on_stack) {
+    // Max length check.
+    {
+      LiftoffRegister length =
+          __ LoadToRegister(__ cache_state()->stack_state.end()[-2], {});
+      Label* trap_label = AddOutOfLineTrap(
+          decoder->position(), WasmCode::kThrowWasmTrapArrayOutOfBounds);
+      __ emit_i32_cond_jumpi(kUnsignedGreaterThan, trap_label, length.gp(),
+                             static_cast<int>(wasm::kV8MaxWasmArrayLength));
+    }
+    ValueType array_value_type = ValueType::Ref(imm.index, kNonNullable);
+    ValueType elem_type = imm.array_type->element_type();
+    int elem_size = elem_type.element_size_bytes();
+    // Allocate the array.
+    {
+      WasmCode::RuntimeStubId target = WasmCode::kWasmAllocateArrayWithRtt;
+      compiler::CallDescriptor* call_descriptor =
+          GetBuiltinCallDescriptor<WasmAllocateArrayWithRttDescriptor>(
+              compilation_zone_);
+      ValueType sig_reps[] = {array_value_type, rtt_type, kWasmI32, kWasmI32};
+      FunctionSig sig(1, 3, sig_reps);
+      LiftoffAssembler::VarState rtt_var =
+          __ cache_state()->stack_state.end()[-1];
+      LiftoffAssembler::VarState length_var =
+          __ cache_state()->stack_state.end()[-2];
+      LiftoffRegister elem_size_reg = __ GetUnusedRegister(kGpReg, {});
+      __ LoadConstant(elem_size_reg, WasmValue(elem_size));
+      LiftoffAssembler::VarState elem_size_var(kWasmI32, elem_size_reg, 0);
+      __ PrepareBuiltinCall(&sig, call_descriptor,
+                            {rtt_var, length_var, elem_size_var});
+      __ CallRuntimeStub(target);
+      DefineSafepoint();
+      // Drop the RTT.
+      __ cache_state()->stack_state.pop_back(1);
+    }
+
+    LiftoffRegister obj(kReturnRegister0);
+    LiftoffRegList pinned = LiftoffRegList::ForRegs(obj);
+    LiftoffRegister length = pinned.set(__ PopToModifiableRegister(pinned));
+    LiftoffRegister value = initial_value_on_stack
+                                ? pinned.set(__ PopToRegister(pinned))
+                                : pinned.set(__ GetUnusedRegister(
+                                      reg_class_for(elem_type), pinned));
+    if (!initial_value_on_stack) {
+      if (!CheckSupportedType(decoder, elem_type, "default value")) return;
+      SetDefaultValue(value, elem_type, pinned);
+    }
+
+    // Initialize the array's elements.
+    LiftoffRegister offset = pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+    __ LoadConstant(
+        offset,
+        WasmValue(wasm::ObjectAccess::ToTagged(WasmArray::kHeaderSize)));
+    LiftoffRegister end_offset = length;
+    if (elem_type.element_size_log2() != 0) {
+      __ emit_i32_shli(end_offset.gp(), length.gp(),
+                       elem_type.element_size_log2());
+    }
+    __ emit_i32_add(end_offset.gp(), end_offset.gp(), offset.gp());
+    Label loop, done;
+    __ bind(&loop);
+    __ emit_cond_jump(kUnsignedGreaterEqual, &done, kWasmI32, offset.gp(),
+                      end_offset.gp());
+    StoreObjectField(obj.gp(), offset.gp(), 0, value, pinned, elem_type);
+    __ emit_i32_addi(offset.gp(), offset.gp(), elem_size);
+    __ emit_jump(&loop);
+
+    __ bind(&done);
+    __ PushRegister(array_value_type, obj);
   }
 
   void ArrayNewWithRtt(FullDecoder* decoder,
                        const ArrayIndexImmediate<validate>& imm,
-                       const Value& length, const Value& initial_value,
+                       const Value& length_value, const Value& initial_value,
                        const Value& rtt, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "array.new_with_rtt");
+    ArrayNew(decoder, imm, rtt.type, true);
   }
+
   void ArrayNewDefault(FullDecoder* decoder,
                        const ArrayIndexImmediate<validate>& imm,
                        const Value& length, const Value& rtt, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "array.new_default_with_rtt");
+    ArrayNew(decoder, imm, rtt.type, false);
   }
+
   void ArrayGet(FullDecoder* decoder, const Value& array_obj,
-                const ArrayIndexImmediate<validate>& imm, const Value& index,
-                bool is_signed, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "array.get");
+                const ArrayIndexImmediate<validate>& imm,
+                const Value& index_val, bool is_signed, Value* result) {
+    LiftoffRegList pinned;
+    LiftoffRegister index = pinned.set(__ PopToModifiableRegister(pinned));
+    LiftoffRegister array = pinned.set(__ PopToRegister(pinned));
+    MaybeEmitNullCheck(decoder, array.gp(), pinned, array_obj.type);
+    BoundsCheck(decoder, array, index, pinned);
+    ValueType elem_type = imm.array_type->element_type();
+    if (!CheckSupportedType(decoder, elem_type, "array load")) return;
+    int elem_size_shift = elem_type.element_size_log2();
+    if (elem_size_shift != 0) {
+      __ emit_i32_shli(index.gp(), index.gp(), elem_size_shift);
+    }
+    LiftoffRegister value = __ GetUnusedRegister(kGpReg, {array}, pinned);
+    LoadObjectField(value, array.gp(), index.gp(),
+                    wasm::ObjectAccess::ToTagged(WasmArray::kHeaderSize),
+                    elem_type, is_signed, pinned);
+    __ PushRegister(elem_type.Unpacked(), value);
   }
+
   void ArraySet(FullDecoder* decoder, const Value& array_obj,
-                const ArrayIndexImmediate<validate>& imm, const Value& index,
-                const Value& value) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "array.set");
+                const ArrayIndexImmediate<validate>& imm,
+                const Value& index_val, const Value& value_val) {
+    LiftoffRegList pinned;
+    LiftoffRegister value = pinned.set(__ PopToRegister(pinned));
+    LiftoffRegister index = pinned.set(__ PopToModifiableRegister(pinned));
+    LiftoffRegister array = pinned.set(__ PopToRegister(pinned));
+    MaybeEmitNullCheck(decoder, array.gp(), pinned, array_obj.type);
+    BoundsCheck(decoder, array, index, pinned);
+    ValueType elem_type = imm.array_type->element_type();
+    int elem_size_shift = elem_type.element_size_log2();
+    if (elem_size_shift != 0) {
+      __ emit_i32_shli(index.gp(), index.gp(), elem_size_shift);
+    }
+    StoreObjectField(array.gp(), index.gp(),
+                     wasm::ObjectAccess::ToTagged(WasmArray::kHeaderSize),
+                     value, pinned, elem_type);
   }
+
   void ArrayLen(FullDecoder* decoder, const Value& array_obj, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "array.len");
+    LiftoffRegList pinned;
+    LiftoffRegister obj = pinned.set(__ PopToRegister(pinned));
+    MaybeEmitNullCheck(decoder, obj.gp(), pinned, array_obj.type);
+    LiftoffRegister len = pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+    int kLengthOffset = wasm::ObjectAccess::ToTagged(WasmArray::kLengthOffset);
+    LoadObjectField(len, obj.gp(), no_reg, kLengthOffset, kWasmI32, false,
+                    pinned);
+    __ PushRegister(kWasmI32, len);
   }
 
+  // 1 bit Smi tag, 31 bits Smi shift, 1 bit i31ref high-bit truncation.
+  constexpr static int kI31To32BitSmiShift = 33;
+
   void I31New(FullDecoder* decoder, const Value& input, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "i31.new");
+    LiftoffRegister src = __ PopToRegister();
+    LiftoffRegister dst = __ GetUnusedRegister(kGpReg, {src}, {});
+    if (SmiValuesAre31Bits()) {
+      STATIC_ASSERT(kSmiTag == 0);
+      __ emit_i32_shli(dst.gp(), src.gp(), kSmiTagSize);
+    } else {
+      DCHECK(SmiValuesAre32Bits());
+      __ emit_i64_shli(dst, src, kI31To32BitSmiShift);
+    }
+    __ PushRegister(kWasmI31Ref, dst);
   }
+
   void I31GetS(FullDecoder* decoder, const Value& input, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "i31.get_s");
+    LiftoffRegister src = __ PopToRegister();
+    LiftoffRegister dst = __ GetUnusedRegister(kGpReg, {src}, {});
+    if (SmiValuesAre31Bits()) {
+      __ emit_i32_sari(dst.gp(), src.gp(), kSmiTagSize);
+    } else {
+      DCHECK(SmiValuesAre32Bits());
+      __ emit_i64_sari(dst, src, kI31To32BitSmiShift);
+    }
+    __ PushRegister(kWasmI32, dst);
   }
+
   void I31GetU(FullDecoder* decoder, const Value& input, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "i31.get_u");
+    LiftoffRegister src = __ PopToRegister();
+    LiftoffRegister dst = __ GetUnusedRegister(kGpReg, {src}, {});
+    if (SmiValuesAre31Bits()) {
+      __ emit_i32_shri(dst.gp(), src.gp(), kSmiTagSize);
+    } else {
+      DCHECK(SmiValuesAre32Bits());
+      __ emit_i64_shri(dst, src, kI31To32BitSmiShift);
+    }
+    __ PushRegister(kWasmI32, dst);
   }
 
   void RttCanon(FullDecoder* decoder, const HeapTypeImmediate<validate>& imm,
                 Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "rtt.canon");
+    LiftoffRegister rtt = __ GetUnusedRegister(kGpReg, {});
+    RootIndex index;
+    switch (imm.type.representation()) {
+      case wasm::HeapType::kEq:
+        index = RootIndex::kWasmRttEqrefMap;
+        break;
+      case wasm::HeapType::kExtern:
+        index = RootIndex::kWasmRttExternrefMap;
+        break;
+      case wasm::HeapType::kFunc:
+        index = RootIndex::kWasmRttFuncrefMap;
+        break;
+      case wasm::HeapType::kI31:
+        index = RootIndex::kWasmRttI31refMap;
+        break;
+      case wasm::HeapType::kAny:
+        index = RootIndex::kWasmRttAnyrefMap;
+        break;
+      case wasm::HeapType::kBottom:
+        UNREACHABLE();
+      default:
+        // User-defined type.
+        LOAD_TAGGED_PTR_INSTANCE_FIELD(rtt.gp(), ManagedObjectMaps);
+        __ LoadTaggedPointer(
+            rtt.gp(), rtt.gp(), no_reg,
+            wasm::ObjectAccess::ElementOffsetInTaggedFixedArray(
+                imm.type.ref_index()),
+            {});
+        __ PushRegister(ValueType::Rtt(imm.type, 1), rtt);
+        return;
+    }
+    LOAD_INSTANCE_FIELD(rtt.gp(), IsolateRoot, kSystemPointerSize);
+    __ LoadTaggedPointer(rtt.gp(), rtt.gp(), no_reg,
+                         IsolateData::root_slot_offset(index), {});
+    __ PushRegister(ValueType::Rtt(imm.type, 1), rtt);
   }
+
   void RttSub(FullDecoder* decoder, const HeapTypeImmediate<validate>& imm,
               const Value& parent, Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "rtt.sub");
+    ValueType parent_value_type = parent.type;
+    ValueType rtt_value_type =
+        ValueType::Rtt(imm.type, parent_value_type.depth() + 1);
+    WasmCode::RuntimeStubId target = WasmCode::kWasmAllocateRtt;
+    compiler::CallDescriptor* call_descriptor =
+        GetBuiltinCallDescriptor<WasmAllocateRttDescriptor>(compilation_zone_);
+    ValueType sig_reps[] = {rtt_value_type, kWasmI32, parent_value_type};
+    FunctionSig sig(1, 2, sig_reps);
+    LiftoffAssembler::VarState parent_var =
+        __ cache_state()->stack_state.end()[-1];
+    LiftoffRegister type_reg = __ GetUnusedRegister(kGpReg, {});
+    __ LoadConstant(type_reg, WasmValue(imm.type.representation()));
+    LiftoffAssembler::VarState type_var(kWasmI32, type_reg, 0);
+    __ PrepareBuiltinCall(&sig, call_descriptor, {type_var, parent_var});
+    __ CallRuntimeStub(target);
+    DefineSafepoint();
+    // Drop the parent RTT.
+    __ cache_state()->stack_state.pop_back(1);
+    __ PushRegister(rtt_value_type, LiftoffRegister(kReturnRegister0));
+  }
+
+  // Falls through on match (=successful type check).
+  // Returns the register containing the object.
+  LiftoffRegister SubtypeCheck(FullDecoder* decoder, const Value& obj,
+                               const Value& rtt, Label* no_match,
+                               LiftoffRegList pinned = {},
+                               Register opt_scratch = no_reg) {
+    Label match;
+    LiftoffRegister rtt_reg = pinned.set(__ PopToRegister(pinned));
+    LiftoffRegister obj_reg = pinned.set(__ PopToRegister(pinned));
+
+    bool obj_can_be_i31 = IsSubtypeOf(kWasmI31Ref, obj.type, decoder->module_);
+    bool rtt_is_i31 = rtt.type.heap_representation() == HeapType::kI31;
+    bool i31_check_only = obj_can_be_i31 && rtt_is_i31;
+    if (i31_check_only) {
+      __ emit_smi_check(obj_reg.gp(), no_match,
+                        LiftoffAssembler::kJumpOnNotSmi);
+      // Emit no further code, just fall through to {match}.
+    } else {
+      // Reserve all temporary registers up front, so that the cache state
+      // tracking doesn't get confused by the following conditional jumps.
+      LiftoffRegister tmp1 =
+          opt_scratch != no_reg
+              ? LiftoffRegister(opt_scratch)
+              : pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+      LiftoffRegister tmp2 = pinned.set(__ GetUnusedRegister(kGpReg, pinned));
+      if (obj_can_be_i31) {
+        DCHECK(!rtt_is_i31);
+        __ emit_smi_check(obj_reg.gp(), no_match, LiftoffAssembler::kJumpOnSmi);
+      }
+      if (obj.type.is_nullable()) {
+        LoadNullValue(tmp1.gp(), pinned);
+        __ emit_cond_jump(kEqual, no_match, obj.type, obj_reg.gp(), tmp1.gp());
+      }
+
+      // At this point, the object is neither null nor an i31ref. Perform
+      // a regular type check. Check for exact match first.
+      __ LoadMap(tmp1.gp(), obj_reg.gp());
+      // {tmp1} now holds the object's map.
+      __ emit_cond_jump(kEqual, &match, rtt.type, tmp1.gp(), rtt_reg.gp());
+
+      // If the object isn't guaranteed to be an array or struct, check that.
+      // Subsequent code wouldn't handle e.g. funcrefs.
+      if (!is_data_ref_type(obj.type, decoder->module_)) {
+        EmitDataRefCheck(tmp1.gp(), no_match, tmp2, pinned);
+      }
+
+      // Constant-time subtyping check: load exactly one candidate RTT from the
+      // supertypes list.
+      // Step 1: load the WasmTypeInfo into {tmp1}.
+      constexpr int kTypeInfoOffset = wasm::ObjectAccess::ToTagged(
+          Map::kConstructorOrBackPointerOrNativeContextOffset);
+      __ LoadTaggedPointer(tmp1.gp(), tmp1.gp(), no_reg, kTypeInfoOffset,
+                           pinned);
+      // Step 2: load the super types list into {tmp1}.
+      constexpr int kSuperTypesOffset =
+          wasm::ObjectAccess::ToTagged(WasmTypeInfo::kSupertypesOffset);
+      __ LoadTaggedPointer(tmp1.gp(), tmp1.gp(), no_reg, kSuperTypesOffset,
+                           pinned);
+      // Step 3: check the list's length.
+      LiftoffRegister list_length = tmp2;
+      __ LoadFixedArrayLengthAsInt32(list_length, tmp1.gp(), pinned);
+      __ emit_i32_cond_jumpi(kUnsignedLessEqual, no_match, list_length.gp(),
+                             rtt.type.depth());
+      // Step 4: load the candidate list slot into {tmp1}, and compare it.
+      __ LoadTaggedPointer(
+          tmp1.gp(), tmp1.gp(), no_reg,
+          wasm::ObjectAccess::ElementOffsetInTaggedFixedArray(rtt.type.depth()),
+          pinned);
+      __ emit_cond_jump(kUnequal, no_match, rtt.type, tmp1.gp(), rtt_reg.gp());
+      // Fall through to {match}.
+    }
+    __ bind(&match);
+    return obj_reg;
   }
 
   void RefTest(FullDecoder* decoder, const Value& obj, const Value& rtt,
-               Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "ref.test");
+               Value* result_val) {
+    Label return_false, done;
+    LiftoffRegList pinned;
+    LiftoffRegister result = pinned.set(__ GetUnusedRegister(kGpReg, {}));
+
+    SubtypeCheck(decoder, obj, rtt, &return_false, pinned, result.gp());
+
+    __ LoadConstant(result, WasmValue(1));
+    // TODO(jkummerow): Emit near jumps on platforms where it's more efficient.
+    __ emit_jump(&done);
+
+    __ bind(&return_false);
+    __ LoadConstant(result, WasmValue(0));
+    __ bind(&done);
+    __ PushRegister(kWasmI32, result);
   }
+
   void RefCast(FullDecoder* decoder, const Value& obj, const Value& rtt,
                Value* result) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "ref.cast");
+    Label* trap_label = AddOutOfLineTrap(decoder->position(),
+                                         WasmCode::kThrowWasmTrapIllegalCast);
+    LiftoffRegister obj_reg = SubtypeCheck(decoder, obj, rtt, trap_label);
+    __ PushRegister(ValueType::Ref(rtt.type.heap_type(), kNonNullable),
+                    obj_reg);
   }
+
   void BrOnCast(FullDecoder* decoder, const Value& obj, const Value& rtt,
                 Value* result_on_branch, uint32_t depth) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "br_on_cast");
+    // Before branching, materialize all constants. This avoids repeatedly
+    // materializing them for each conditional branch.
+    if (depth != decoder->control_depth() - 1) {
+      __ MaterializeMergedConstants(
+          decoder->control_at(depth)->br_merge()->arity);
+    }
+
+    Label cont_false;
+    LiftoffRegister obj_reg = SubtypeCheck(decoder, obj, rtt, &cont_false);
+
+    __ PushRegister(rtt.type.is_bottom()
+                        ? kWasmBottom
+                        : ValueType::Ref(rtt.type.heap_type(), kNonNullable),
+                    obj_reg);
+    BrOrRet(decoder, depth);
+
+    __ bind(&cont_false);
+    // Drop the branch's value, restore original value.
+    Drop(decoder);
+    __ PushRegister(obj.type, obj_reg);
   }
 
-  void PassThrough(FullDecoder* decoder, const Value& from, Value* to) {
-    // TODO(7748): Implement.
-    unsupported(decoder, kGC, "");
+  void Forward(FullDecoder* decoder, const Value& from, Value* to) {
+    // Nothing to do here.
   }
 
  private:
@@ -3819,16 +4390,7 @@ class LiftoffCompiler {
                   const CallFunctionImmediate<validate>& imm,
                   const Value args[], Value returns[], CallKind call_kind) {
     for (ValueType ret : imm.sig->returns()) {
-      if (!CheckSupportedType(decoder,
-                              FLAG_experimental_liftoff_extern_ref
-                                  ? kSupportedTypes
-                                  : kSupportedTypesWithoutRefs,
-                              ret, "return")) {
-        // TODO(7581): Remove this once reference-types are full supported.
-        if (!ret.is_reference_type()) {
-          return;
-        }
-      }
+      if (!CheckSupportedType(decoder, ret, "return")) return;
     }
 
     auto call_descriptor =
@@ -3901,25 +4463,11 @@ class LiftoffCompiler {
       return unsupported(decoder, kRefTypes, "table index != 0");
     }
     for (ValueType ret : imm.sig->returns()) {
-      if (!CheckSupportedType(decoder,
-                              FLAG_experimental_liftoff_extern_ref
-                                  ? kSupportedTypes
-                                  : kSupportedTypesWithoutRefs,
-                              ret, "return")) {
-        return;
-      }
+      if (!CheckSupportedType(decoder, ret, "return")) return;
     }
 
-    // Pop the index.
-    Register index = __ PopToRegister().gp();
-    // If that register is still being used after popping, we move it to another
-    // register, because we want to modify that register.
-    if (__ cache_state()->is_used(LiftoffRegister(index))) {
-      Register new_index =
-          __ GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(index)).gp();
-      __ Move(new_index, index, kWasmI32);
-      index = new_index;
-    }
+    // Pop the index. We'll modify the register's contents later.
+    Register index = __ PopToModifiableRegister().gp();
 
     LiftoffRegList pinned = LiftoffRegList::ForRegs(index);
     // Get three temporary registers.
@@ -4036,6 +4584,119 @@ class LiftoffCompiler {
     __ FinishCall(imm.sig, call_descriptor);
   }
 
+  void LoadNullValue(Register null, LiftoffRegList pinned) {
+    LOAD_INSTANCE_FIELD(null, IsolateRoot, kSystemPointerSize);
+    __ LoadTaggedPointer(null, null, no_reg,
+                         IsolateData::root_slot_offset(RootIndex::kNullValue),
+                         pinned);
+  }
+
+  void MaybeEmitNullCheck(FullDecoder* decoder, Register object,
+                          LiftoffRegList pinned, ValueType type) {
+    if (!type.is_nullable()) return;
+    Label* trap_label = AddOutOfLineTrap(
+        decoder->position(), WasmCode::kThrowWasmTrapNullDereference);
+    LiftoffRegister null = __ GetUnusedRegister(kGpReg, pinned);
+    LoadNullValue(null.gp(), pinned);
+    __ emit_cond_jump(LiftoffCondition::kEqual, trap_label, type, object,
+                      null.gp());
+  }
+
+  void BoundsCheck(FullDecoder* decoder, LiftoffRegister array,
+                   LiftoffRegister index, LiftoffRegList pinned) {
+    Label* trap_label = AddOutOfLineTrap(
+        decoder->position(), WasmCode::kThrowWasmTrapArrayOutOfBounds);
+    LiftoffRegister length = __ GetUnusedRegister(kGpReg, pinned);
+    constexpr int kLengthOffset =
+        wasm::ObjectAccess::ToTagged(WasmArray::kLengthOffset);
+    __ Load(length, array.gp(), no_reg, kLengthOffset, LoadType::kI32Load,
+            pinned);
+    __ emit_cond_jump(LiftoffCondition::kUnsignedGreaterEqual, trap_label,
+                      kWasmI32, index.gp(), length.gp());
+  }
+
+  int StructFieldOffset(const StructType* struct_type, int field_index) {
+    return wasm::ObjectAccess::ToTagged(WasmStruct::kHeaderSize +
+                                        struct_type->field_offset(field_index));
+  }
+
+  void LoadObjectField(LiftoffRegister dst, Register src, Register offset_reg,
+                       int offset, ValueType type, bool is_signed,
+                       LiftoffRegList pinned) {
+    if (type.is_reference_type()) {
+      __ LoadTaggedPointer(dst.gp(), src, offset_reg, offset, pinned);
+    } else {
+      // Primitive type.
+      LoadType load_type = LoadType::ForValueType(type, is_signed);
+      __ Load(dst, src, offset_reg, offset, load_type, pinned);
+    }
+  }
+
+  void StoreObjectField(Register obj, Register offset_reg, int offset,
+                        LiftoffRegister value, LiftoffRegList pinned,
+                        ValueType type) {
+    if (type.is_reference_type()) {
+      __ StoreTaggedPointer(obj, offset_reg, offset, value, pinned);
+    } else {
+      // Primitive type.
+      StoreType store_type = StoreType::ForValueType(type);
+      __ Store(obj, offset_reg, offset, value, store_type, pinned);
+    }
+  }
+
+  void SetDefaultValue(LiftoffRegister reg, ValueType type,
+                       LiftoffRegList pinned) {
+    DCHECK(type.is_defaultable());
+    switch (type.kind()) {
+      case ValueType::kI8:
+      case ValueType::kI16:
+      case ValueType::kI32:
+        return __ LoadConstant(reg, WasmValue(int32_t{0}));
+      case ValueType::kI64:
+        return __ LoadConstant(reg, WasmValue(int64_t{0}));
+      case ValueType::kF32:
+        return __ LoadConstant(reg, WasmValue(float{0.0}));
+      case ValueType::kF64:
+        return __ LoadConstant(reg, WasmValue(double{0.0}));
+      case ValueType::kS128:
+        DCHECK(CpuFeatures::SupportsWasmSimd128());
+        return __ emit_s128_xor(reg, reg, reg);
+      case ValueType::kOptRef:
+        return LoadNullValue(reg.gp(), pinned);
+      case ValueType::kRtt:
+      case ValueType::kStmt:
+      case ValueType::kBottom:
+      case ValueType::kRef:
+        UNREACHABLE();
+    }
+  }
+
+  void EmitDataRefCheck(Register map, Label* not_data_ref, LiftoffRegister tmp,
+                        LiftoffRegList pinned) {
+    constexpr int kInstanceTypeOffset =
+        wasm::ObjectAccess::ToTagged(Map::kInstanceTypeOffset);
+    __ Load(tmp, map, no_reg, kInstanceTypeOffset, LoadType::kI32Load16U,
+            pinned);
+    // We're going to test a range of instance types with a single unsigned
+    // comparison. Statically assert that this is safe, i.e. that there are
+    // no instance types between array and struct types that might possibly
+    // occur (i.e. internal types are OK, types of Wasm objects are not).
+    // At the time of this writing:
+    // WASM_ARRAY_TYPE = 180
+    // WASM_CAPI_FUNCTION_DATA_TYPE = 181
+    // WASM_STRUCT_TYPE = 182
+    // The specific values don't matter; the relative order does.
+    static_assert(
+        WASM_STRUCT_TYPE == static_cast<InstanceType>(WASM_ARRAY_TYPE + 2),
+        "Relying on specific InstanceType values here");
+    static_assert(WASM_CAPI_FUNCTION_DATA_TYPE ==
+                      static_cast<InstanceType>(WASM_ARRAY_TYPE + 1),
+                  "Relying on specific InstanceType values here");
+    __ emit_i32_subi(tmp.gp(), tmp.gp(), WASM_ARRAY_TYPE);
+    __ emit_i32_cond_jumpi(kUnsignedGreaterThan, not_data_ref, tmp.gp(),
+                           WASM_STRUCT_TYPE - WASM_ARRAY_TYPE);
+  }
+
   static constexpr WasmOpcode kNoOutstandingOp = kExprUnreachable;
 
   LiftoffAssembler asm_;
diff --git a/deps/v8/src/wasm/baseline/liftoff-register.h b/deps/v8/src/wasm/baseline/liftoff-register.h
index 285af7dac02a75..bd2e6ed4c20635 100644
--- a/deps/v8/src/wasm/baseline/liftoff-register.h
+++ b/deps/v8/src/wasm/baseline/liftoff-register.h
@@ -58,6 +58,8 @@ static inline constexpr RegClass reg_class_for(ValueType::Kind kind) {
     case ValueType::kF32:
     case ValueType::kF64:
       return kFpReg;
+    case ValueType::kI8:
+    case ValueType::kI16:
     case ValueType::kI32:
       return kGpReg;
     case ValueType::kI64:
@@ -66,6 +68,7 @@ static inline constexpr RegClass reg_class_for(ValueType::Kind kind) {
       return kNeedS128RegPair ? kFpRegPair : kFpReg;
     case ValueType::kRef:
     case ValueType::kOptRef:
+    case ValueType::kRtt:
       return kGpReg;
     default:
       return kNoReg;  // unsupported type
diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
index 5c78eca3195c10..c12eae4c397a5e 100644
--- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
+++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h
@@ -5,6 +5,8 @@
 #ifndef V8_WASM_BASELINE_MIPS_LIFTOFF_ASSEMBLER_MIPS_H_
 #define V8_WASM_BASELINE_MIPS_LIFTOFF_ASSEMBLER_MIPS_H_
 
+#include "src/base/platform/wrappers.h"
+#include "src/heap/memory-chunk.h"
 #include "src/wasm/baseline/liftoff-assembler.h"
 
 namespace v8 {
@@ -13,6 +15,31 @@ namespace wasm {
 
 namespace liftoff {
 
+inline constexpr Condition ToCondition(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return eq;
+    case kUnequal:
+      return ne;
+    case kSignedLessThan:
+      return lt;
+    case kSignedLessEqual:
+      return le;
+    case kSignedGreaterThan:
+      return gt;
+    case kSignedGreaterEqual:
+      return ge;
+    case kUnsignedLessThan:
+      return ult;
+    case kUnsignedLessEqual:
+      return ule;
+    case kUnsignedGreaterThan:
+      return ugt;
+    case kUnsignedGreaterEqual:
+      return uge;
+  }
+}
+
 //  half
 //  slot        Frame
 //  -----+--------------------+---------------------------
@@ -63,6 +90,7 @@ inline void Load(LiftoffAssembler* assm, LiftoffRegister dst, Register base,
     case ValueType::kI32:
     case ValueType::kRef:
     case ValueType::kOptRef:
+    case ValueType::kRtt:
       assm->lw(dst.gp(), src);
       break;
     case ValueType::kI64:
@@ -87,6 +115,9 @@ inline void Store(LiftoffAssembler* assm, Register base, int32_t offset,
   MemOperand dst(base, offset);
   switch (type.kind()) {
     case ValueType::kI32:
+    case ValueType::kOptRef:
+    case ValueType::kRef:
+    case ValueType::kRtt:
       assm->Usw(src.gp(), dst);
       break;
     case ValueType::kI64:
@@ -122,6 +153,9 @@ inline void push(LiftoffAssembler* assm, LiftoffRegister reg, ValueType type) {
       assm->addiu(sp, sp, -sizeof(double));
       assm->Sdc1(reg.fp(), MemOperand(sp, 0));
       break;
+    case ValueType::kOptRef:
+      assm->push(reg.gp());
+      break;
     default:
       UNREACHABLE();
   }
@@ -300,7 +334,14 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   Pop(ra, fp);
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
+void LiftoffAssembler::AlignFrameSize() {}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
+  // The frame_size includes the frame marker. The frame marker has already been
+  // pushed on the stack though, so we don't need to allocate memory for it
+  // anymore.
+  int frame_size = GetTotalFrameSize() - kSystemPointerSize;
+
   // We can't run out of space, just pass anything big enough to not cause the
   // assembler to try to grow the buffer.
   constexpr int kAvailableSpace = 256;
@@ -385,17 +426,41 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
                                          Register offset_reg,
                                          int32_t offset_imm,
                                          LiftoffRegList pinned) {
-  DCHECK_GE(offset_imm, 0);
   STATIC_ASSERT(kTaggedSize == kInt32Size);
   Load(LiftoffRegister(dst), src_addr, offset_reg,
        static_cast<uint32_t>(offset_imm), LoadType::kI32Load, pinned);
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
-  bailout(kRefTypes, "GlobalSet");
+  STATIC_ASSERT(kTaggedSize == kInt32Size);
+  Register dst = no_reg;
+  if (offset_reg != no_reg) {
+    dst = pinned.set(GetUnusedRegister(kGpReg, pinned)).gp();
+    emit_ptrsize_add(dst, dst_addr, offset_reg);
+  }
+  MemOperand dst_op = (offset_reg != no_reg) ? MemOperand(dst, offset_imm)
+                                             : MemOperand(dst_addr, offset_imm);
+  Sw(src.gp(), dst_op);
+  // The write barrier.
+  Label write_barrier;
+  Label exit;
+  Register scratch = pinned.set(GetUnusedRegister(kGpReg, pinned)).gp();
+  CheckPageFlag(dst_addr, scratch,
+                MemoryChunk::kPointersFromHereAreInterestingMask, ne,
+                &write_barrier);
+  Branch(USE_DELAY_SLOT, &exit);
+  bind(&write_barrier);
+  JumpIfSmi(src.gp(), &exit);
+  CheckPageFlag(src.gp(), scratch,
+                MemoryChunk::kPointersToHereAreInterestingMask, eq, &exit);
+  Addu(scratch, dst_addr, offset_imm);
+  CallRecordWriteStub(dst_addr, scratch, EMIT_REMEMBERED_SET, kSaveFPRegs,
+                      wasm::WasmCode::kRecordWrite);
+  bind(&exit);
 }
 
 void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -656,6 +721,7 @@ void LiftoffAssembler::Spill(int offset, LiftoffRegister reg, ValueType type) {
     case ValueType::kI32:
     case ValueType::kRef:
     case ValueType::kOptRef:
+    case ValueType::kRtt:
       sw(reg.gp(), dst);
       break;
     case ValueType::kI64:
@@ -820,6 +886,7 @@ I32_BINOP(xor, xor_)
 
 // clang-format off
 I32_BINOP_I(add, Addu)
+I32_BINOP_I(sub, Subu)
 I32_BINOP_I(and, And)
 I32_BINOP_I(or, Or)
 I32_BINOP_I(xor, Xor)
@@ -861,9 +928,15 @@ I32_SHIFTOP_I(shr, srl)
 #undef I32_SHIFTOP_I
 
 void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
-                                     int32_t imm) {
+                                     int64_t imm) {
+  LiftoffRegister imm_reg =
+    GetUnusedRegister(kFpReg, LiftoffRegList::ForRegs(dst, lhs));
+  int32_t imm_low_word = static_cast<int32_t>(imm);
+  int32_t imm_high_word = static_cast<int32_t>(imm >> 32);
+  TurboAssembler::li(imm_reg.low_gp(), imm_low_word);
+  TurboAssembler::li(imm_reg.high_gp(), imm_high_word);
   TurboAssembler::AddPair(dst.low_gp(), dst.high_gp(), lhs.low_gp(),
-                          lhs.high_gp(), imm,
+                          lhs.high_gp(), imm_reg.low_gp(), imm_reg.high_gp(),
                           kScratchReg, kScratchReg2);
 }
 
@@ -1260,25 +1333,20 @@ bool LiftoffAssembler::emit_type_conversion(WasmOpcode opcode,
       return true;
     }
     case kExprI32SConvertF64: {
-      if ((IsMipsArchVariant(kMips32r2) || IsMipsArchVariant(kMips32r6)) &&
-          IsFp64Mode()) {
-        LiftoffRegister rounded =
-            GetUnusedRegister(kFpReg, LiftoffRegList::ForRegs(src));
-        LiftoffRegister converted_back =
-            GetUnusedRegister(kFpReg, LiftoffRegList::ForRegs(src, rounded));
-
-        // Real conversion.
-        TurboAssembler::Trunc_d_d(rounded.fp(), src.fp());
-        TurboAssembler::Trunc_w_d(kScratchDoubleReg, rounded.fp());
-        mfc1(dst.gp(), kScratchDoubleReg);
+      LiftoffRegister scratch =
+          GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(dst));
 
-        // Checking if trap.
-        cvt_d_w(converted_back.fp(), kScratchDoubleReg);
-        TurboAssembler::CompareF64(EQ, rounded.fp(), converted_back.fp());
-        TurboAssembler::BranchFalseF(trap);
-        return true;
-      }
-      bailout(kUnsupportedArchitecture, "kExprI32SConvertF64");
+      // Try a conversion to a signed integer.
+      trunc_w_d(kScratchDoubleReg, src.fp());
+      mfc1(dst.gp(), kScratchDoubleReg);
+      // Retrieve the FCSR.
+      cfc1(scratch.gp(), FCSR);
+      // Check for overflow and NaNs.
+      And(scratch.gp(), scratch.gp(),
+          kFCSROverflowCauseMask | kFCSRUnderflowCauseMask |
+              kFCSRInvalidOpCauseMask);
+      // If we had exceptions we are trap.
+      Branch(trap, ne, scratch.gp(), Operand(zero_reg));
       return true;
     }
     case kExprI32UConvertF64: {
@@ -1419,22 +1487,36 @@ void LiftoffAssembler::emit_jump(Register target) {
   TurboAssembler::Jump(target);
 }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
-  if (rhs != no_reg) {
-    TurboAssembler::Branch(label, cond, lhs, Operand(rhs));
-  } else {
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  if (rhs == no_reg) {
+    DCHECK_EQ(type, kWasmI32);
     TurboAssembler::Branch(label, cond, lhs, Operand(zero_reg));
+  } else {
+    DCHECK(type == kWasmI32 ||
+           (type.is_reference_type() &&
+            (liftoff_cond == kEqual || liftoff_cond == kUnequal)));
+    TurboAssembler::Branch(label, cond, lhs, Operand(rhs));
   }
 }
 
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int32_t imm) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  TurboAssembler::Branch(label, cond, lhs, Operand(imm));
+}
+
 void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   sltiu(dst, src, 1);
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Register tmp = dst;
   if (dst == lhs || dst == rhs) {
     tmp = GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(lhs, rhs)).gp();
@@ -1459,7 +1541,7 @@ void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
 }
 
 namespace liftoff {
-inline Condition cond_make_unsigned(Condition cond) {
+inline LiftoffCondition cond_make_unsigned(LiftoffCondition cond) {
   switch (cond) {
     case kSignedLessThan:
       return kUnsignedLessThan;
@@ -1475,15 +1557,17 @@ inline Condition cond_make_unsigned(Condition cond) {
 }
 }  // namespace liftoff
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Label low, cont;
 
   // For signed i64 comparisons, we still need to use unsigned comparison for
   // the low word (the only bit carrying signedness information is the MSB in
   // the high word).
-  Condition unsigned_cond = liftoff::cond_make_unsigned(cond);
+  Condition unsigned_cond =
+      liftoff::ToCondition(liftoff::cond_make_unsigned(liftoff_cond));
 
   Register tmp = dst;
   if (liftoff::IsRegInRegPair(lhs, dst) || liftoff::IsRegInRegPair(rhs, dst)) {
@@ -1512,7 +1596,7 @@ void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
 
 namespace liftoff {
 
-inline FPUCondition ConditionToConditionCmpFPU(Condition condition,
+inline FPUCondition ConditionToConditionCmpFPU(LiftoffCondition condition,
                                                bool* predicate) {
   switch (condition) {
     case kEqual:
@@ -1542,9 +1626,10 @@ inline FPUCondition ConditionToConditionCmpFPU(Condition condition,
 
 }  // namespace liftoff
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Label not_nan, cont;
   TurboAssembler::CompareIsNanF32(lhs, rhs);
   TurboAssembler::BranchFalseF(&not_nan);
@@ -1560,7 +1645,8 @@ void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
 
   TurboAssembler::li(dst, 1);
   bool predicate;
-  FPUCondition fcond = liftoff::ConditionToConditionCmpFPU(cond, &predicate);
+  FPUCondition fcond =
+      liftoff::ConditionToConditionCmpFPU(liftoff_cond, &predicate);
   TurboAssembler::CompareF32(fcond, lhs, rhs);
   if (predicate) {
     TurboAssembler::LoadZeroIfNotFPUCondition(dst);
@@ -1571,9 +1657,10 @@ void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
   bind(&cont);
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Label not_nan, cont;
   TurboAssembler::CompareIsNanF64(lhs, rhs);
   TurboAssembler::BranchFalseF(&not_nan);
@@ -1589,7 +1676,8 @@ void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
 
   TurboAssembler::li(dst, 1);
   bool predicate;
-  FPUCondition fcond = liftoff::ConditionToConditionCmpFPU(cond, &predicate);
+  FPUCondition fcond =
+      liftoff::ConditionToConditionCmpFPU(liftoff_cond, &predicate);
   TurboAssembler::CompareF64(fcond, lhs, rhs);
   if (predicate) {
     TurboAssembler::LoadZeroIfNotFPUCondition(dst);
@@ -1607,14 +1695,30 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
   return false;
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  UseScratchRegisterScope temps(this);
+  Register scratch = temps.Acquire();
+  And(scratch, obj, Operand(kSmiTagMask));
+  Condition condition = mode == kJumpOnSmi ? eq : ne;
+  Branch(target, condition, scratch, Operand(zero_reg));
+}
+
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
   bailout(kSimd, "load extend and load splat unimplemented");
 }
 
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  bailout(kSimd, "loadlane");
+}
+
 void LiftoffAssembler::emit_i8x16_shuffle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs,
@@ -1659,6 +1763,35 @@ void LiftoffAssembler::emit_f64x2_splat(LiftoffRegister dst,
   bailout(kSimd, "emit_f64x2_splat");
 }
 
+#define SIMD_BINOP(name, ilv_instr, dotp_instr)                          \
+  void LiftoffAssembler::emit_##name(                                    \
+      LiftoffRegister dst, LiftoffRegister src1, LiftoffRegister src2) { \
+    MSARegister dst_msa = MSARegister::from_code(dst.liftoff_code());    \
+    MSARegister src1_msa = MSARegister::from_code(src1.liftoff_code());  \
+    MSARegister src2_msa = MSARegister::from_code(src2.liftoff_code());  \
+    xor_v(kSimd128RegZero, kSimd128RegZero, kSimd128RegZero);            \
+    ilv_instr(kSimd128ScratchReg, kSimd128RegZero, src1_msa);            \
+    ilv_instr(kSimd128RegZero, kSimd128RegZero, src2_msa);               \
+    dotp_instr(dst_msa, kSimd128ScratchReg, kSimd128RegZero);            \
+  }
+
+SIMD_BINOP(i16x8_extmul_low_i8x16_s, ilvr_b, dotp_s_h)
+SIMD_BINOP(i16x8_extmul_high_i8x16_s, ilvl_b, dotp_s_h)
+SIMD_BINOP(i16x8_extmul_low_i8x16_u, ilvr_b, dotp_u_h)
+SIMD_BINOP(i16x8_extmul_high_i8x16_u, ilvl_b, dotp_u_h)
+
+SIMD_BINOP(i32x4_extmul_low_i16x8_s, ilvr_h, dotp_s_w)
+SIMD_BINOP(i32x4_extmul_high_i16x8_s, ilvl_h, dotp_s_w)
+SIMD_BINOP(i32x4_extmul_low_i16x8_u, ilvr_h, dotp_u_w)
+SIMD_BINOP(i32x4_extmul_high_i16x8_u, ilvl_h, dotp_u_w)
+
+SIMD_BINOP(i64x2_extmul_low_i32x4_s, ilvr_w, dotp_s_d)
+SIMD_BINOP(i64x2_extmul_high_i32x4_s, ilvl_w, dotp_s_d)
+SIMD_BINOP(i64x2_extmul_low_i32x4_u, ilvr_w, dotp_u_d)
+SIMD_BINOP(i64x2_extmul_high_i32x4_u, ilvl_w, dotp_u_d)
+
+#undef SIMD_BINOP
+
 void LiftoffAssembler::emit_i8x16_eq(LiftoffRegister dst, LiftoffRegister lhs,
                                      LiftoffRegister rhs) {
   bailout(kSimd, "emit_i8x16_eq");
@@ -2158,6 +2291,11 @@ void LiftoffAssembler::emit_i64x2_neg(LiftoffRegister dst,
   bailout(kSimd, "emit_i64x2_neg");
 }
 
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  bailout(kSimd, "emit_i64x2_bitmask");
+}
+
 void LiftoffAssembler::emit_i64x2_shl(LiftoffRegister dst, LiftoffRegister lhs,
                                       LiftoffRegister rhs) {
   bailout(kSimd, "emit_i64x2_shl");
@@ -2620,6 +2758,24 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   addiu(sp, sp, gp_offset);
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  int spill_space_size = 0;
+  while (!all_spills.is_empty()) {
+    LiftoffRegister reg = all_spills.GetFirstRegSet();
+    if (ref_spills.has(reg)) {
+      safepoint.DefinePointerSlot(spill_offset);
+    }
+    all_spills.clear(reg);
+    ++spill_offset;
+    spill_space_size += kSystemPointerSize;
+  }
+  // Record the number of additional spill slots.
+  RecordOolSpillSpaceSize(spill_space_size);
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   DCHECK_LT(num_stack_slots,
             (1 << 16) / kSystemPointerSize);  // 16 bit immediate
diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
index b97c49437f6207..b97b423e2051ad 100644
--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
@@ -5,6 +5,7 @@
 #ifndef V8_WASM_BASELINE_MIPS64_LIFTOFF_ASSEMBLER_MIPS64_H_
 #define V8_WASM_BASELINE_MIPS64_LIFTOFF_ASSEMBLER_MIPS64_H_
 
+#include "src/base/platform/wrappers.h"
 #include "src/heap/memory-chunk.h"
 #include "src/wasm/baseline/liftoff-assembler.h"
 
@@ -14,6 +15,31 @@ namespace wasm {
 
 namespace liftoff {
 
+inline constexpr Condition ToCondition(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return eq;
+    case kUnequal:
+      return ne;
+    case kSignedLessThan:
+      return lt;
+    case kSignedLessEqual:
+      return le;
+    case kSignedGreaterThan:
+      return gt;
+    case kSignedGreaterEqual:
+      return ge;
+    case kUnsignedLessThan:
+      return ult;
+    case kUnsignedLessEqual:
+      return ule;
+    case kUnsignedGreaterThan:
+      return ugt;
+    case kUnsignedGreaterEqual:
+      return uge;
+  }
+}
+
 // Liftoff Frames.
 //
 //  slot      Frame
@@ -47,12 +73,14 @@ inline MemOperand GetStackSlot(int offset) { return MemOperand(fp, -offset); }
 
 inline MemOperand GetInstanceOperand() { return GetStackSlot(kInstanceOffset); }
 
+template <typename T>
 inline MemOperand GetMemOp(LiftoffAssembler* assm, Register addr,
-                           Register offset, uint32_t offset_imm) {
-  if (is_uint31(offset_imm)) {
-    if (offset == no_reg) return MemOperand(addr, offset_imm);
+                           Register offset, T offset_imm) {
+  if (is_int32(offset_imm)) {
+    int32_t offset_imm32 = static_cast<int32_t>(offset_imm);
+    if (offset == no_reg) return MemOperand(addr, offset_imm32);
     assm->daddu(kScratchReg, addr, offset);
-    return MemOperand(kScratchReg, offset_imm);
+    return MemOperand(kScratchReg, offset_imm32);
   }
   // Offset immediate does not fit in 31 bits.
   assm->li(kScratchReg, offset_imm);
@@ -72,6 +100,7 @@ inline void Load(LiftoffAssembler* assm, LiftoffRegister dst, MemOperand src,
     case ValueType::kI64:
     case ValueType::kRef:
     case ValueType::kOptRef:
+    case ValueType::kRtt:
       assm->Ld(dst.gp(), src);
       break;
     case ValueType::kF32:
@@ -96,6 +125,9 @@ inline void Store(LiftoffAssembler* assm, Register base, int32_t offset,
       assm->Usw(src.gp(), dst);
       break;
     case ValueType::kI64:
+    case ValueType::kOptRef:
+    case ValueType::kRef:
+    case ValueType::kRtt:
       assm->Usd(src.gp(), dst);
       break;
     case ValueType::kF32:
@@ -285,7 +317,14 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   Pop(ra, fp);
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
+void LiftoffAssembler::AlignFrameSize() {}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
+  // The frame_size includes the frame marker. The frame marker has already been
+  // pushed on the stack though, so we don't need to allocate memory for it
+  // anymore.
+  int frame_size = GetTotalFrameSize() - kSystemPointerSize;
+
   // We can't run out of space, just pass anything big enough to not cause the
   // assembler to try to grow the buffer.
   constexpr int kAvailableSpace = 256;
@@ -369,28 +408,27 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
                                          Register offset_reg,
                                          int32_t offset_imm,
                                          LiftoffRegList pinned) {
-  DCHECK_GE(offset_imm, 0);
   STATIC_ASSERT(kTaggedSize == kInt64Size);
-  Load(LiftoffRegister(dst), src_addr, offset_reg,
-       static_cast<uint32_t>(offset_imm), LoadType::kI64Load, pinned);
+  MemOperand src_op = liftoff::GetMemOp(this, src_addr, offset_reg, offset_imm);
+  Ld(dst, src_op);
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
-  DCHECK_GE(offset_imm, 0);
-  DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
   STATIC_ASSERT(kTaggedSize == kInt64Size);
   Register scratch = pinned.set(GetUnusedRegister(kGpReg, pinned)).gp();
-  Sd(src.gp(), MemOperand(dst_addr, offset_imm));
+  MemOperand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
+  Sd(src.gp(), dst_op);
 
   Label write_barrier;
   Label exit;
   CheckPageFlag(dst_addr, scratch,
                 MemoryChunk::kPointersFromHereAreInterestingMask, ne,
                 &write_barrier);
-  b(&exit);
+  Branch(USE_DELAY_SLOT, &exit);
   bind(&write_barrier);
   JumpIfSmi(src.gp(), &exit);
   CheckPageFlag(src.gp(), scratch,
@@ -403,7 +441,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
 }
 
 void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
-                            Register offset_reg, uint32_t offset_imm,
+                            Register offset_reg, uintptr_t offset_imm,
                             LoadType type, LiftoffRegList pinned,
                             uint32_t* protected_load_pc, bool is_load_mem) {
   MemOperand src_op = liftoff::GetMemOp(this, src_addr, offset_reg, offset_imm);
@@ -458,7 +496,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
 }
 
 void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
-                             uint32_t offset_imm, LiftoffRegister src,
+                             uintptr_t offset_imm, LiftoffRegister src,
                              StoreType type, LiftoffRegList pinned,
                              uint32_t* protected_store_pc, bool is_store_mem) {
   MemOperand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
@@ -508,56 +546,56 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
 }
 
 void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
-                                  Register offset_reg, uint32_t offset_imm,
+                                  Register offset_reg, uintptr_t offset_imm,
                                   LoadType type, LiftoffRegList pinned) {
   bailout(kAtomics, "AtomicLoad");
 }
 
 void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
-                                   uint32_t offset_imm, LiftoffRegister src,
+                                   uintptr_t offset_imm, LiftoffRegister src,
                                    StoreType type, LiftoffRegList pinned) {
   bailout(kAtomics, "AtomicStore");
 }
 
 void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicAdd");
 }
 
 void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicSub");
 }
 
 void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicAnd");
 }
 
 void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
-                                uint32_t offset_imm, LiftoffRegister value,
+                                uintptr_t offset_imm, LiftoffRegister value,
                                 LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicOr");
 }
 
 void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicXor");
 }
 
 void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
-                                      uint32_t offset_imm,
+                                      uintptr_t offset_imm,
                                       LiftoffRegister value,
                                       LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicExchange");
 }
 
 void LiftoffAssembler::AtomicCompareExchange(
-    Register dst_addr, Register offset_reg, uint32_t offset_imm,
+    Register dst_addr, Register offset_reg, uintptr_t offset_imm,
     LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result,
     StoreType type) {
   bailout(kAtomics, "AtomicCompareExchange");
@@ -618,6 +656,7 @@ void LiftoffAssembler::Spill(int offset, LiftoffRegister reg, ValueType type) {
     case ValueType::kI64:
     case ValueType::kRef:
     case ValueType::kOptRef:
+    case ValueType::kRtt:
       Sd(reg.gp(), dst);
       break;
     case ValueType::kF32:
@@ -797,6 +836,7 @@ I32_BINOP(xor, xor_)
 
 // clang-format off
 I32_BINOP_I(add, Addu)
+I32_BINOP_I(sub, Subu)
 I32_BINOP_I(and, And)
 I32_BINOP_I(or, Or)
 I32_BINOP_I(xor, Xor)
@@ -836,6 +876,11 @@ I32_SHIFTOP_I(shr, srl)
 #undef I32_SHIFTOP
 #undef I32_SHIFTOP_I
 
+void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
+                                     int64_t imm) {
+  TurboAssembler::Daddu(dst.gp(), lhs.gp(), Operand(imm));
+}
+
 void LiftoffAssembler::emit_i64_mul(LiftoffRegister dst, LiftoffRegister lhs,
                                     LiftoffRegister rhs) {
   TurboAssembler::Dmul(dst.gp(), lhs.gp(), rhs.gp());
@@ -908,7 +953,6 @@ I64_BINOP(xor, xor_)
   }
 
 // clang-format off
-I64_BINOP_I(add, Daddu)
 I64_BINOP_I(and, And)
 I64_BINOP_I(or, Or)
 I64_BINOP_I(xor, Xor)
@@ -1297,22 +1341,36 @@ void LiftoffAssembler::emit_jump(Register target) {
   TurboAssembler::Jump(target);
 }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
-  if (rhs != no_reg) {
-    TurboAssembler::Branch(label, cond, lhs, Operand(rhs));
-  } else {
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  if (rhs == no_reg) {
+    DCHECK(type == kWasmI32 || type == kWasmI64);
     TurboAssembler::Branch(label, cond, lhs, Operand(zero_reg));
+  } else {
+    DCHECK((type == kWasmI32 || type == kWasmI64) ||
+           (type.is_reference_type() &&
+            (liftoff_cond == kEqual || liftoff_cond == kUnequal)));
+    TurboAssembler::Branch(label, cond, lhs, Operand(rhs));
   }
 }
 
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int32_t imm) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  TurboAssembler::Branch(label, cond, lhs, Operand(imm));
+}
+
 void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   sltiu(dst, src, 1);
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Register tmp = dst;
   if (dst == lhs || dst == rhs) {
     tmp = GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(lhs, rhs)).gp();
@@ -1332,9 +1390,10 @@ void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
   sltiu(dst, src.gp(), 1);
 }
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Register tmp = dst;
   if (dst == lhs.gp() || dst == rhs.gp()) {
     tmp = GetUnusedRegister(kGpReg, LiftoffRegList::ForRegs(lhs, rhs)).gp();
@@ -1353,7 +1412,7 @@ void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
 
 namespace liftoff {
 
-inline FPUCondition ConditionToConditionCmpFPU(Condition condition,
+inline FPUCondition ConditionToConditionCmpFPU(LiftoffCondition condition,
                                                bool* predicate) {
   switch (condition) {
     case kEqual:
@@ -1403,9 +1462,10 @@ inline void EmitAllTrue(LiftoffAssembler* assm, LiftoffRegister dst,
 
 }  // namespace liftoff
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Label not_nan, cont;
   TurboAssembler::CompareIsNanF32(lhs, rhs);
   TurboAssembler::BranchFalseF(&not_nan);
@@ -1421,7 +1481,8 @@ void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
 
   TurboAssembler::li(dst, 1);
   bool predicate;
-  FPUCondition fcond = liftoff::ConditionToConditionCmpFPU(cond, &predicate);
+  FPUCondition fcond =
+      liftoff::ConditionToConditionCmpFPU(liftoff_cond, &predicate);
   TurboAssembler::CompareF32(fcond, lhs, rhs);
   if (predicate) {
     TurboAssembler::LoadZeroIfNotFPUCondition(dst);
@@ -1432,9 +1493,10 @@ void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
   bind(&cont);
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   Label not_nan, cont;
   TurboAssembler::CompareIsNanF64(lhs, rhs);
   TurboAssembler::BranchFalseF(&not_nan);
@@ -1450,7 +1512,8 @@ void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
 
   TurboAssembler::li(dst, 1);
   bool predicate;
-  FPUCondition fcond = liftoff::ConditionToConditionCmpFPU(cond, &predicate);
+  FPUCondition fcond =
+      liftoff::ConditionToConditionCmpFPU(liftoff_cond, &predicate);
   TurboAssembler::CompareF64(fcond, lhs, rhs);
   if (predicate) {
     TurboAssembler::LoadZeroIfNotFPUCondition(dst);
@@ -1468,15 +1531,24 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
   return false;
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  UseScratchRegisterScope temps(this);
+  Register scratch = temps.Acquire();
+  And(scratch, obj, Operand(kSmiTagMask));
+  Condition condition = mode == kJumpOnSmi ? eq : ne;
+  Branch(target, condition, scratch, Operand(zero_reg));
+}
+
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
   UseScratchRegisterScope temps(this);
   Register scratch = temps.Acquire();
-  Daddu(scratch, src_addr, offset_reg);
-  MemOperand src_op = MemOperand(scratch, offset_imm);
+  MemOperand src_op =
+      liftoff::GetMemOp(this, src_addr, offset_reg, offset_imm);
   MSARegister dst_msa = dst.fp().toW();
   *protected_load_pc = pc_offset();
   MachineType memtype = type.mem_type();
@@ -1536,6 +1608,13 @@ void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
   }
 }
 
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  bailout(kSimd, "loadlane");
+}
+
 void LiftoffAssembler::emit_i8x16_shuffle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs,
@@ -1617,6 +1696,29 @@ void LiftoffAssembler::emit_f64x2_splat(LiftoffRegister dst,
   fill_d(dst.fp().toW(), kScratchReg);
 }
 
+#define SIMD_BINOP(name1, name2, type)                                   \
+  void LiftoffAssembler::emit_##name1##_extmul_low_##name2(              \
+      LiftoffRegister dst, LiftoffRegister src1, LiftoffRegister src2) { \
+    TurboAssembler::ExtMulLow(type, dst.fp().toW(), src1.fp().toW(),     \
+                              src2.fp().toW());                          \
+  }                                                                      \
+  void LiftoffAssembler::emit_##name1##_extmul_high_##name2(             \
+      LiftoffRegister dst, LiftoffRegister src1, LiftoffRegister src2) { \
+    TurboAssembler::ExtMulHigh(type, dst.fp().toW(), src1.fp().toW(),    \
+                               src2.fp().toW());                         \
+  }
+
+SIMD_BINOP(i16x8, i8x16_s, MSAS8)
+SIMD_BINOP(i16x8, i8x16_u, MSAU8)
+
+SIMD_BINOP(i32x4, i16x8_s, MSAS16)
+SIMD_BINOP(i32x4, i16x8_u, MSAU16)
+
+SIMD_BINOP(i64x2, i32x4_s, MSAS32)
+SIMD_BINOP(i64x2, i32x4_u, MSAU32)
+
+#undef SIMD_BINOP
+
 void LiftoffAssembler::emit_i8x16_eq(LiftoffRegister dst, LiftoffRegister lhs,
                                      LiftoffRegister rhs) {
   ceq_b(dst.fp().toW(), lhs.fp().toW(), rhs.fp().toW());
@@ -1754,7 +1856,7 @@ void LiftoffAssembler::emit_s128_const(LiftoffRegister dst,
                                        const uint8_t imms[16]) {
   MSARegister dst_msa = dst.fp().toW();
   uint64_t vals[2];
-  memcpy(vals, imms, sizeof(vals));
+  base::Memcpy(vals, imms, sizeof(vals));
   li(kScratchReg, vals[0]);
   insert_d(dst_msa, 0, kScratchReg);
   li(kScratchReg, vals[1]);
@@ -2174,6 +2276,15 @@ void LiftoffAssembler::emit_i64x2_neg(LiftoffRegister dst,
   subv_d(dst.fp().toW(), kSimd128RegZero, src.fp().toW());
 }
 
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  srli_d(kSimd128RegZero, src.fp().toW(), 63);
+  shf_w(kSimd128ScratchReg, kSimd128RegZero, 0x02);
+  slli_d(kSimd128ScratchReg, kSimd128ScratchReg, 1);
+  or_v(kSimd128RegZero, kSimd128RegZero, kSimd128ScratchReg);
+  copy_u_b(dst.gp(), kSimd128RegZero, 0);
+}
+
 void LiftoffAssembler::emit_i64x2_shl(LiftoffRegister dst, LiftoffRegister lhs,
                                       LiftoffRegister rhs) {
   fill_d(kSimd128ScratchReg, rhs.gp());
@@ -2795,6 +2906,24 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   daddiu(sp, sp, gp_offset);
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  int spill_space_size = 0;
+  while (!all_spills.is_empty()) {
+    LiftoffRegister reg = all_spills.GetFirstRegSet();
+    if (ref_spills.has(reg)) {
+      safepoint.DefinePointerSlot(spill_offset);
+    }
+    all_spills.clear(reg);
+    ++spill_offset;
+    spill_space_size += kSystemPointerSize;
+  }
+  // Record the number of additional spill slots.
+  RecordOolSpillSpaceSize(spill_space_size);
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   DCHECK_LT(num_stack_slots,
             (1 << 16) / kSystemPointerSize);  // 16 bit immediate
diff --git a/deps/v8/src/wasm/baseline/ppc/liftoff-assembler-ppc.h b/deps/v8/src/wasm/baseline/ppc/liftoff-assembler-ppc.h
index f75e9db459d518..1a2e95061513c7 100644
--- a/deps/v8/src/wasm/baseline/ppc/liftoff-assembler-ppc.h
+++ b/deps/v8/src/wasm/baseline/ppc/liftoff-assembler-ppc.h
@@ -57,7 +57,9 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   bailout(kUnsupportedArchitecture, "PrepareTailCall");
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
+void LiftoffAssembler::AlignFrameSize() {}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
   bailout(kUnsupportedArchitecture, "PatchPrepareStackFrame");
 }
 
@@ -112,6 +114,7 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
@@ -119,70 +122,70 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
 }
 
 void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
-                            Register offset_reg, uint32_t offset_imm,
+                            Register offset_reg, uintptr_t offset_imm,
                             LoadType type, LiftoffRegList pinned,
                             uint32_t* protected_load_pc, bool is_load_mem) {
   bailout(kUnsupportedArchitecture, "Load");
 }
 
 void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
-                             uint32_t offset_imm, LiftoffRegister src,
+                             uintptr_t offset_imm, LiftoffRegister src,
                              StoreType type, LiftoffRegList pinned,
                              uint32_t* protected_store_pc, bool is_store_mem) {
   bailout(kUnsupportedArchitecture, "Store");
 }
 
 void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
-                                  Register offset_reg, uint32_t offset_imm,
+                                  Register offset_reg, uintptr_t offset_imm,
                                   LoadType type, LiftoffRegList pinned) {
   bailout(kAtomics, "AtomicLoad");
 }
 
 void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
-                                   uint32_t offset_imm, LiftoffRegister src,
+                                   uintptr_t offset_imm, LiftoffRegister src,
                                    StoreType type, LiftoffRegList pinned) {
   bailout(kAtomics, "AtomicStore");
 }
 
 void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicAdd");
 }
 
 void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicSub");
 }
 
 void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicAnd");
 }
 
 void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
-                                uint32_t offset_imm, LiftoffRegister value,
+                                uintptr_t offset_imm, LiftoffRegister value,
                                 LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicOr");
 }
 
 void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicXor");
 }
 
 void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
-                                      uint32_t offset_imm,
+                                      uintptr_t offset_imm,
                                       LiftoffRegister value,
                                       LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicExchange");
 }
 
 void LiftoffAssembler::AtomicCompareExchange(
-    Register dst_addr, Register offset_reg, uint32_t offset_imm,
+    Register dst_addr, Register offset_reg, uintptr_t offset_imm,
     LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result,
     StoreType type) {
   bailout(kAtomics, "AtomicCompareExchange");
@@ -335,7 +338,7 @@ void LiftoffAssembler::FillStackSlotsWithZero(int start, int size) {
   }
 
 UNIMPLEMENTED_I32_BINOP_I(i32_add)
-UNIMPLEMENTED_I32_BINOP(i32_sub)
+UNIMPLEMENTED_I32_BINOP_I(i32_sub)
 UNIMPLEMENTED_I32_BINOP(i32_mul)
 UNIMPLEMENTED_I32_BINOP_I(i32_and)
 UNIMPLEMENTED_I32_BINOP_I(i32_or)
@@ -343,7 +346,7 @@ UNIMPLEMENTED_I32_BINOP_I(i32_xor)
 UNIMPLEMENTED_I32_SHIFTOP(i32_shl)
 UNIMPLEMENTED_I32_SHIFTOP(i32_sar)
 UNIMPLEMENTED_I32_SHIFTOP(i32_shr)
-UNIMPLEMENTED_I64_BINOP_I(i64_add)
+UNIMPLEMENTED_I64_BINOP(i64_add)
 UNIMPLEMENTED_I64_BINOP(i64_sub)
 UNIMPLEMENTED_I64_BINOP(i64_mul)
 #ifdef V8_TARGET_ARCH_PPC64
@@ -407,6 +410,11 @@ bool LiftoffAssembler::emit_i64_popcnt(LiftoffRegister dst,
   return true;
 }
 
+void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
+                                     int64_t imm) {
+  bailout(kUnsupportedArchitecture, "i64_addi");
+}
+
 void LiftoffAssembler::emit_i32_divs(Register dst, Register lhs, Register rhs,
                                      Label* trap_div_by_zero,
                                      Label* trap_div_unrepresentable) {
@@ -511,18 +519,25 @@ void LiftoffAssembler::emit_jump(Register target) {
   bailout(kUnsupportedArchitecture, "emit_jump");
 }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
   bailout(kUnsupportedArchitecture, "emit_cond_jump");
 }
 
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int32_t imm) {
+  bailout(kUnsupportedArchitecture, "emit_i32_cond_jumpi");
+}
+
 void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   bailout(kUnsupportedArchitecture, "emit_i32_eqz");
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
   bailout(kUnsupportedArchitecture, "emit_i32_set_cond");
 }
 
@@ -530,20 +545,20 @@ void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
   bailout(kUnsupportedArchitecture, "emit_i64_eqz");
 }
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
   bailout(kUnsupportedArchitecture, "emit_i64_set_cond");
 }
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
   bailout(kUnsupportedArchitecture, "emit_f32_set_cond");
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
   bailout(kUnsupportedArchitecture, "emit_f64_set_cond");
 }
@@ -556,13 +571,25 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
 }
 
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
   bailout(kSimd, "Load transform unimplemented");
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  bailout(kUnsupportedArchitecture, "emit_smi_check");
+}
+
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  bailout(kSimd, "loadlane");
+}
+
 void LiftoffAssembler::emit_i8x16_swizzle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs) {
@@ -833,6 +860,35 @@ void LiftoffAssembler::emit_i64x2_mul(LiftoffRegister dst, LiftoffRegister lhs,
   bailout(kUnsupportedArchitecture, "emit_i64x2mul");
 }
 
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_low_i32x4_s unsupported");
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_low_i32x4_u unsupported");
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_high_i32x4_s unsupported");
+}
+
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  bailout(kSimd, "i64x2_bitmask");
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_high_i32x4_u unsupported");
+}
+
 void LiftoffAssembler::emit_i32x4_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   bailout(kUnsupportedArchitecture, "emit_i32x4_splat");
@@ -948,6 +1004,30 @@ void LiftoffAssembler::emit_i32x4_dot_i16x8_s(LiftoffRegister dst,
   bailout(kSimd, "i32x4_dot_i16x8_s");
 }
 
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_low_i16x8_s unsupported");
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_low_i16x8_u unsupported");
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_high_i16x8_s unsupported");
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_high_i16x8_u unsupported");
+}
+
 void LiftoffAssembler::emit_i16x8_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   bailout(kUnsupportedArchitecture, "emit_i16x8splat");
@@ -1087,6 +1167,30 @@ void LiftoffAssembler::emit_i16x8_extract_lane_s(LiftoffRegister dst,
   bailout(kUnsupportedArchitecture, "emit_i16x8extractlane_s");
 }
 
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i16x8.extmul_low_i8x16_s unsupported");
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i16x8.extmul_low_i8x16_u unsupported");
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i16x8.extmul_high_i8x16_s unsupported");
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i16x8_extmul_high_i8x16_u unsupported");
+}
+
 void LiftoffAssembler::emit_i8x16_shuffle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs,
@@ -1532,6 +1636,13 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   bailout(kUnsupportedArchitecture, "PopRegisters");
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  bailout(kRefTypes, "RecordSpillsInSafepoint");
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   bailout(kUnsupportedArchitecture, "DropStackSlotsAndRet");
 }
diff --git a/deps/v8/src/wasm/baseline/s390/liftoff-assembler-s390.h b/deps/v8/src/wasm/baseline/s390/liftoff-assembler-s390.h
index a88baa114617c3..116159570566a6 100644
--- a/deps/v8/src/wasm/baseline/s390/liftoff-assembler-s390.h
+++ b/deps/v8/src/wasm/baseline/s390/liftoff-assembler-s390.h
@@ -5,8 +5,11 @@
 #ifndef V8_WASM_BASELINE_S390_LIFTOFF_ASSEMBLER_S390_H_
 #define V8_WASM_BASELINE_S390_LIFTOFF_ASSEMBLER_S390_H_
 
+#include "src/base/platform/wrappers.h"
+#include "src/codegen/assembler.h"
+#include "src/heap/memory-chunk.h"
 #include "src/wasm/baseline/liftoff-assembler.h"
-
+#include "src/wasm/simd-shuffle.h"
 
 namespace v8 {
 namespace internal {
@@ -14,6 +17,47 @@ namespace wasm {
 
 namespace liftoff {
 
+inline constexpr Condition ToCondition(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return eq;
+    case kUnequal:
+      return ne;
+    case kSignedLessThan:
+    case kUnsignedLessThan:
+      return lt;
+    case kSignedLessEqual:
+    case kUnsignedLessEqual:
+      return le;
+    case kSignedGreaterEqual:
+    case kUnsignedGreaterEqual:
+      return ge;
+    case kSignedGreaterThan:
+    case kUnsignedGreaterThan:
+      return gt;
+  }
+}
+
+inline constexpr bool UseSignedOp(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+    case kUnequal:
+    case kSignedLessThan:
+    case kSignedLessEqual:
+    case kSignedGreaterThan:
+    case kSignedGreaterEqual:
+      return true;
+    case kUnsignedLessThan:
+    case kUnsignedLessEqual:
+    case kUnsignedGreaterThan:
+    case kUnsignedGreaterEqual:
+      return false;
+    default:
+      UNREACHABLE();
+  }
+  return false;
+}
+
 //  half
 //  slot        Frame
 //  -----+--------------------+---------------------------
@@ -38,17 +82,20 @@ namespace liftoff {
 //
 constexpr int32_t kInstanceOffset = 2 * kSystemPointerSize;
 
-inline MemOperand GetHalfStackSlot(int offset, RegPairHalf half) {
-  int32_t half_offset =
-      half == kLowWord ? 0 : LiftoffAssembler::kStackSlotSize / 2;
-  return MemOperand(fp, -offset + half_offset);
+inline MemOperand GetStackSlot(uint32_t offset) {
+  return MemOperand(fp, -offset);
 }
 
+inline MemOperand GetInstanceOperand() { return GetStackSlot(kInstanceOffset); }
+
+
 }  // namespace liftoff
 
 int LiftoffAssembler::PrepareStackFrame() {
   bailout(kUnsupportedArchitecture, "PrepareStackFrame");
-  return 0;
+  int offset = pc_offset();
+  lay(sp, MemOperand(sp));
+  return offset;
 }
 
 void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
@@ -56,13 +103,32 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   bailout(kUnsupportedArchitecture, "PrepareTailCall");
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
-  bailout(kUnsupportedArchitecture, "PatchPrepareStackFrame");
+void LiftoffAssembler::AlignFrameSize() {}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
+  int frame_size = GetTotalFrameSize() - kSystemPointerSize;
+
+  constexpr int LayInstrSize = 6;
+
+#ifdef USE_SIMULATOR
+  // When using the simulator, deal with Liftoff which allocates the stack
+  // before checking it.
+  // TODO(arm): Remove this when the stack check mechanism will be updated.
+  if (frame_size > KB / 2) {
+    bailout(kOtherReason,
+            "Stack limited to 512 bytes to avoid a bug in StackCheck");
+    return;
+  }
+#endif
+  Assembler patching_assembler(
+      AssemblerOptions{},
+      ExternalAssemblerBuffer(buffer_start_ + offset, LayInstrSize + kGap));
+  patching_assembler.lay(sp, MemOperand(sp, -frame_size));
 }
 
 void LiftoffAssembler::FinishCode() {}
 
-void LiftoffAssembler::AbortCompilation() {}
+void LiftoffAssembler::AbortCompilation() { AbortedCodeGeneration(); }
 
 // static
 constexpr int LiftoffAssembler::StaticStackFrameSize() {
@@ -111,6 +177,7 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
@@ -118,70 +185,70 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
 }
 
 void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
-                            Register offset_reg, uint32_t offset_imm,
+                            Register offset_reg, uintptr_t offset_imm,
                             LoadType type, LiftoffRegList pinned,
                             uint32_t* protected_load_pc, bool is_load_mem) {
   bailout(kUnsupportedArchitecture, "Load");
 }
 
 void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
-                             uint32_t offset_imm, LiftoffRegister src,
+                             uintptr_t offset_imm, LiftoffRegister src,
                              StoreType type, LiftoffRegList pinned,
                              uint32_t* protected_store_pc, bool is_store_mem) {
   bailout(kUnsupportedArchitecture, "Store");
 }
 
 void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
-                                  Register offset_reg, uint32_t offset_imm,
+                                  Register offset_reg, uintptr_t offset_imm,
                                   LoadType type, LiftoffRegList pinned) {
   bailout(kAtomics, "AtomicLoad");
 }
 
 void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
-                                   uint32_t offset_imm, LiftoffRegister src,
+                                   uintptr_t offset_imm, LiftoffRegister src,
                                    StoreType type, LiftoffRegList pinned) {
   bailout(kAtomics, "AtomicStore");
 }
 
 void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicAdd");
 }
 
 void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicSub");
 }
 
 void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicAnd");
 }
 
 void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
-                                uint32_t offset_imm, LiftoffRegister value,
+                                uintptr_t offset_imm, LiftoffRegister value,
                                 LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicOr");
 }
 
 void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicXor");
 }
 
 void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
-                                      uint32_t offset_imm,
+                                      uintptr_t offset_imm,
                                       LiftoffRegister value,
                                       LiftoffRegister result, StoreType type) {
   bailout(kAtomics, "AtomicExchange");
 }
 
 void LiftoffAssembler::AtomicCompareExchange(
-    Register dst_addr, Register offset_reg, uint32_t offset_imm,
+    Register dst_addr, Register offset_reg, uintptr_t offset_imm,
     LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result,
     StoreType type) {
   bailout(kAtomics, "AtomicCompareExchange");
@@ -250,26 +317,25 @@ void LiftoffAssembler::FillStackSlotsWithZero(int start, int size) {
     // instructions per slot.
     uint32_t remainder = size;
     for (; remainder >= kStackSlotSize; remainder -= kStackSlotSize) {
-      StoreP(r0, liftoff::GetHalfStackSlot(start + remainder, kLowWord));
-      StoreP(r0, liftoff::GetHalfStackSlot(start + remainder, kHighWord));
+      StoreU64(r0, liftoff::GetStackSlot(start + remainder));
     }
     DCHECK(remainder == 4 || remainder == 0);
     if (remainder) {
-      StoreP(r0, liftoff::GetHalfStackSlot(start + remainder, kLowWord));
+      StoreU32(r0, liftoff::GetStackSlot(start + remainder));
     }
   } else {
     // General case for bigger counts (9 instructions).
     // Use r3 for start address (inclusive), r4 for end address (exclusive).
     push(r3);
     push(r4);
-    SubP(r3, fp, Operand(start + size));
-    SubP(r4, fp, Operand(start));
+    SubS64(r3, fp, Operand(start + size));
+    SubS64(r4, fp, Operand(start));
 
     Label loop;
     bind(&loop);
-    StoreP(r0, MemOperand(r0));
+    StoreU64(r0, MemOperand(r0));
     la(r0, MemOperand(r0, kSystemPointerSize));
-    CmpLogicalP(r3, r4);
+    CmpU64(r3, r4);
     bne(&loop);
 
     pop(r4);
@@ -339,7 +405,7 @@ void LiftoffAssembler::FillStackSlotsWithZero(int start, int size) {
   }
 
 UNIMPLEMENTED_I32_BINOP_I(i32_add)
-UNIMPLEMENTED_I32_BINOP(i32_sub)
+UNIMPLEMENTED_I32_BINOP_I(i32_sub)
 UNIMPLEMENTED_I32_BINOP(i32_mul)
 UNIMPLEMENTED_I32_BINOP_I(i32_and)
 UNIMPLEMENTED_I32_BINOP_I(i32_or)
@@ -347,7 +413,7 @@ UNIMPLEMENTED_I32_BINOP_I(i32_xor)
 UNIMPLEMENTED_I32_SHIFTOP(i32_shl)
 UNIMPLEMENTED_I32_SHIFTOP(i32_sar)
 UNIMPLEMENTED_I32_SHIFTOP(i32_shr)
-UNIMPLEMENTED_I64_BINOP_I(i64_add)
+UNIMPLEMENTED_I64_BINOP(i64_add)
 UNIMPLEMENTED_I64_BINOP(i64_sub)
 UNIMPLEMENTED_I64_BINOP(i64_mul)
 #ifdef V8_TARGET_ARCH_S390X
@@ -364,8 +430,6 @@ UNIMPLEMENTED_FP_BINOP(f32_add)
 UNIMPLEMENTED_FP_BINOP(f32_sub)
 UNIMPLEMENTED_FP_BINOP(f32_mul)
 UNIMPLEMENTED_FP_BINOP(f32_div)
-UNIMPLEMENTED_FP_BINOP(f32_min)
-UNIMPLEMENTED_FP_BINOP(f32_max)
 UNIMPLEMENTED_FP_BINOP(f32_copysign)
 UNIMPLEMENTED_FP_UNOP(f32_abs)
 UNIMPLEMENTED_FP_UNOP(f32_neg)
@@ -378,8 +442,6 @@ UNIMPLEMENTED_FP_BINOP(f64_add)
 UNIMPLEMENTED_FP_BINOP(f64_sub)
 UNIMPLEMENTED_FP_BINOP(f64_mul)
 UNIMPLEMENTED_FP_BINOP(f64_div)
-UNIMPLEMENTED_FP_BINOP(f64_min)
-UNIMPLEMENTED_FP_BINOP(f64_max)
 UNIMPLEMENTED_FP_BINOP(f64_copysign)
 UNIMPLEMENTED_FP_UNOP(f64_abs)
 UNIMPLEMENTED_FP_UNOP(f64_neg)
@@ -411,6 +473,47 @@ bool LiftoffAssembler::emit_i64_popcnt(LiftoffRegister dst,
   return true;
 }
 
+void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
+                                     int64_t imm) {
+  bailout(kUnsupportedArchitecture, "i64_addi");
+}
+
+void LiftoffAssembler::emit_f64_min(DoubleRegister dst, DoubleRegister lhs,
+                                    DoubleRegister rhs) {
+  if (CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1)) {
+    vfmin(dst, lhs, rhs, Condition(1), Condition(8), Condition(3));
+    return;
+  }
+  DoubleMin(dst, lhs, rhs);
+}
+
+void LiftoffAssembler::emit_f32_min(DoubleRegister dst, DoubleRegister lhs,
+                                    DoubleRegister rhs) {
+  if (CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1)) {
+    vfmin(dst, lhs, rhs, Condition(1), Condition(8), Condition(2));
+    return;
+  }
+  FloatMin(dst, lhs, rhs);
+}
+
+void LiftoffAssembler::emit_f64_max(DoubleRegister dst, DoubleRegister lhs,
+                                    DoubleRegister rhs) {
+  if (CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1)) {
+    vfmax(dst, lhs, rhs, Condition(1), Condition(8), Condition(3));
+    return;
+  }
+  DoubleMax(dst, lhs, rhs);
+}
+
+void LiftoffAssembler::emit_f32_max(DoubleRegister dst, DoubleRegister lhs,
+                                    DoubleRegister rhs) {
+  if (CpuFeatures::IsSupported(VECTOR_ENHANCE_FACILITY_1)) {
+    vfmax(dst, lhs, rhs, Condition(1), Condition(8), Condition(2));
+    return;
+  }
+  FloatMax(dst, lhs, rhs);
+}
+
 void LiftoffAssembler::emit_i32_divs(Register dst, Register lhs, Register rhs,
                                      Label* trap_div_by_zero,
                                      Label* trap_div_unrepresentable) {
@@ -511,45 +614,106 @@ void LiftoffAssembler::emit_jump(Label* label) {
   bailout(kUnsupportedArchitecture, "emit_jump");
 }
 
-void LiftoffAssembler::emit_jump(Register target) {
-  bailout(kUnsupportedArchitecture, "emit_jump");
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  bool use_signed = liftoff::UseSignedOp(liftoff_cond);
+
+  if (type.kind() == ValueType::kI32) {
+    if (rhs == no_reg) {
+      if (use_signed) {
+        CmpS32(lhs, Operand::Zero());
+      } else {
+        CmpU32(lhs, Operand::Zero());
+      }
+    } else {
+      if (use_signed) {
+        CmpS32(lhs, rhs);
+      } else {
+        CmpU32(lhs, rhs);
+      }
+    }
+  } else {
+    CHECK_EQ(type.kind(), ValueType::kI64);
+    if (rhs == no_reg) {
+      if (use_signed) {
+        CmpS64(lhs, Operand::Zero());
+      } else {
+        CmpU64(lhs, Operand::Zero());
+      }
+    } else {
+      if (use_signed) {
+        CmpS64(lhs, rhs);
+      } else {
+        CmpU64(lhs, rhs);
+      }
+    }
+  }
+  b(cond, label);
 }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
-  bailout(kUnsupportedArchitecture, "emit_cond_jump");
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int32_t imm) {
+  bailout(kUnsupportedArchitecture, "emit_i32_cond_jumpi");
 }
 
 void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   bailout(kUnsupportedArchitecture, "emit_i32_eqz");
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
-  bailout(kUnsupportedArchitecture, "emit_i32_set_cond");
+#define EMIT_SET_CONDITION(dst, cond) \
+  {                                   \
+    Label done;                       \
+    lghi(dst, Operand(1));            \
+    b(cond, &done);                   \
+    lghi(dst, Operand(0));            \
+    bind(&done);                      \
+  }
+
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
+  bool use_signed = liftoff::UseSignedOp(liftoff_cond);
+  if (use_signed) {
+    CmpS32(lhs, rhs);
+  } else {
+    CmpU32(lhs, rhs);
+  }
+
+  EMIT_SET_CONDITION(dst, liftoff::ToCondition(liftoff_cond));
 }
 
 void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
   bailout(kUnsupportedArchitecture, "emit_i64_eqz");
 }
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
-  bailout(kUnsupportedArchitecture, "emit_i64_set_cond");
+  bool use_signed = liftoff::UseSignedOp(liftoff_cond);
+  if (use_signed) {
+    CmpS64(lhs.gp(), rhs.gp());
+  } else {
+    CmpU64(lhs.gp(), rhs.gp());
+  }
+
+  EMIT_SET_CONDITION(dst, liftoff::ToCondition(liftoff_cond));
 }
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
-  bailout(kUnsupportedArchitecture, "emit_f32_set_cond");
+  cebr(lhs, rhs);
+  EMIT_SET_CONDITION(dst, liftoff::ToCondition(liftoff_cond));
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
-  bailout(kUnsupportedArchitecture, "emit_f64_set_cond");
+  cdbr(lhs, rhs);
+  EMIT_SET_CONDITION(dst, liftoff::ToCondition(liftoff_cond));
 }
 
 bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
@@ -559,14 +723,26 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
   return false;
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  bailout(kUnsupportedArchitecture, "emit_smi_check");
+}
+
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
   bailout(kSimd, "Load transform unimplemented");
 }
 
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  bailout(kSimd, "loadlane");
+}
+
 void LiftoffAssembler::emit_i8x16_swizzle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs) {
@@ -837,6 +1013,35 @@ void LiftoffAssembler::emit_i64x2_mul(LiftoffRegister dst, LiftoffRegister lhs,
   bailout(kUnsupportedArchitecture, "emit_i64x2mul");
 }
 
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_low_i32x4_s unsupported");
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_low_i32x4_u unsupported");
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_high_i32x4_s unsupported");
+}
+
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  bailout(kSimd, "i64x2_bitmask");
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i64x2_extmul_high_i32x4_u unsupported");
+}
+
 void LiftoffAssembler::emit_i32x4_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   bailout(kUnsupportedArchitecture, "emit_i32x4_splat");
@@ -952,6 +1157,30 @@ void LiftoffAssembler::emit_i32x4_dot_i16x8_s(LiftoffRegister dst,
   bailout(kSimd, "i32x4_dot_i16x8_s");
 }
 
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_low_i16x8_s unsupported");
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_low_i16x8_u unsupported");
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_high_i16x8_s unsupported");
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i32x4_extmul_high_i16x8_u unsupported");
+}
+
 void LiftoffAssembler::emit_i16x8_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
   bailout(kUnsupportedArchitecture, "emit_i16x8splat");
@@ -1091,6 +1320,30 @@ void LiftoffAssembler::emit_i16x8_extract_lane_s(LiftoffRegister dst,
   bailout(kUnsupportedArchitecture, "emit_i16x8extractlane_s");
 }
 
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i16x8.extmul_low_i8x16_s unsupported");
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  bailout(kSimd, "i16x8.extmul_low_i8x16_u unsupported");
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i16x8.extmul_high_i8x16_s unsupported");
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  bailout(kSimd, "i16x8_extmul_high_i8x16_u unsupported");
+}
+
 void LiftoffAssembler::emit_i8x16_shuffle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs,
@@ -1536,6 +1789,13 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   bailout(kUnsupportedArchitecture, "PopRegisters");
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  bailout(kRefTypes, "RecordSpillsInSafepoint");
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   bailout(kUnsupportedArchitecture, "DropStackSlotsAndRet");
 }
diff --git a/deps/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h b/deps/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h
index a64b0e2e374edb..a95ef95f26bdfa 100644
--- a/deps/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h
+++ b/deps/v8/src/wasm/baseline/x64/liftoff-assembler-x64.h
@@ -5,7 +5,9 @@
 #ifndef V8_WASM_BASELINE_X64_LIFTOFF_ASSEMBLER_X64_H_
 #define V8_WASM_BASELINE_X64_LIFTOFF_ASSEMBLER_X64_H_
 
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler.h"
+#include "src/codegen/cpu-features.h"
 #include "src/heap/memory-chunk.h"
 #include "src/wasm/baseline/liftoff-assembler.h"
 #include "src/wasm/simd-shuffle.h"
@@ -20,6 +22,31 @@ namespace wasm {
 
 namespace liftoff {
 
+inline constexpr Condition ToCondition(LiftoffCondition liftoff_cond) {
+  switch (liftoff_cond) {
+    case kEqual:
+      return equal;
+    case kUnequal:
+      return not_equal;
+    case kSignedLessThan:
+      return less;
+    case kSignedLessEqual:
+      return less_equal;
+    case kSignedGreaterThan:
+      return greater;
+    case kSignedGreaterEqual:
+      return greater_equal;
+    case kUnsignedLessThan:
+      return below;
+    case kUnsignedLessEqual:
+      return below_equal;
+    case kUnsignedGreaterThan:
+      return above;
+    case kUnsignedGreaterEqual:
+      return above_equal;
+  }
+}
+
 constexpr Register kScratchRegister2 = r11;
 static_assert(kScratchRegister != kScratchRegister2, "collision");
 static_assert((kLiftoffAssemblerGpCacheRegs &
@@ -42,17 +69,16 @@ inline Operand GetStackSlot(int offset) { return Operand(rbp, -offset); }
 inline Operand GetInstanceOperand() { return GetStackSlot(kInstanceOffset); }
 
 inline Operand GetMemOp(LiftoffAssembler* assm, Register addr, Register offset,
-                        uint32_t offset_imm) {
+                        uintptr_t offset_imm) {
   if (is_uint31(offset_imm)) {
-    if (offset == no_reg) return Operand(addr, offset_imm);
-    return Operand(addr, offset, times_1, offset_imm);
+    int32_t offset_imm32 = static_cast<int32_t>(offset_imm);
+    return offset == no_reg ? Operand(addr, offset_imm32)
+                            : Operand(addr, offset, times_1, offset_imm32);
   }
   // Offset immediate does not fit in 31 bits.
   Register scratch = kScratchRegister;
-  assm->movl(scratch, Immediate(offset_imm));
-  if (offset != no_reg) {
-    assm->addq(scratch, offset);
-  }
+  assm->Set(scratch, offset_imm);
+  if (offset != no_reg) assm->addq(scratch, offset);
   return Operand(addr, scratch, times_1, 0);
 }
 
@@ -65,6 +91,7 @@ inline void Load(LiftoffAssembler* assm, LiftoffRegister dst, Operand src,
     case ValueType::kI64:
     case ValueType::kOptRef:
     case ValueType::kRef:
+    case ValueType::kRtt:
       assm->movq(dst.gp(), src);
       break;
     case ValueType::kF32:
@@ -133,6 +160,10 @@ constexpr int kSubSpSize = 7;  // 7 bytes for "subq rsp, <imm32>"
 
 int LiftoffAssembler::PrepareStackFrame() {
   int offset = pc_offset();
+  // Next we reserve the memory for the whole stack frame. We do not know yet
+  // how big the stack frame will be so we just emit a placeholder instruction.
+  // PatchPrepareStackFrame will patch this in order to increase the stack
+  // appropriately.
   sub_sp_32(0);
   DCHECK_EQ(liftoff::kSubSpSize, pc_offset() - offset);
   return offset;
@@ -156,7 +187,13 @@ void LiftoffAssembler::PrepareTailCall(int num_callee_stack_params,
   popq(rbp);
 }
 
-void LiftoffAssembler::PatchPrepareStackFrame(int offset, int frame_size) {
+void LiftoffAssembler::AlignFrameSize() {}
+
+void LiftoffAssembler::PatchPrepareStackFrame(int offset) {
+  // The frame_size includes the frame marker. The frame marker has already been
+  // pushed on the stack though, so we don't need to allocate memory for it
+  // anymore.
+  int frame_size = GetTotalFrameSize() - kSystemPointerSize;
   // Need to align sp to system pointer size.
   frame_size = RoundUp(frame_size, kSystemPointerSize);
   // We can't run out of space, just pass anything big enough to not cause the
@@ -201,7 +238,8 @@ constexpr int LiftoffAssembler::StaticStackFrameSize() {
 }
 
 int LiftoffAssembler::SlotSizeForType(ValueType type) {
-  return type.element_size_bytes();
+  return type.is_reference_type() ? kSystemPointerSize
+                                  : type.element_size_bytes();
 }
 
 bool LiftoffAssembler::NeedsAlignment(ValueType type) {
@@ -275,12 +313,13 @@ void LiftoffAssembler::LoadTaggedPointer(Register dst, Register src_addr,
 }
 
 void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
+                                          Register offset_reg,
                                           int32_t offset_imm,
                                           LiftoffRegister src,
                                           LiftoffRegList pinned) {
   DCHECK_GE(offset_imm, 0);
   Register scratch = pinned.set(GetUnusedRegister(kGpReg, pinned)).gp();
-  Operand dst_op = liftoff::GetMemOp(this, dst_addr, no_reg,
+  Operand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg,
                                      static_cast<uint32_t>(offset_imm));
   StoreTaggedField(dst_op, src.gp());
 
@@ -305,18 +344,15 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst_addr,
 }
 
 void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
-                                  Register offset_reg, uint32_t offset_imm,
+                                  Register offset_reg, uintptr_t offset_imm,
                                   LoadType type, LiftoffRegList pinned) {
   Load(dst, src_addr, offset_reg, offset_imm, type, pinned, nullptr, true);
 }
 
 void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
-                            Register offset_reg, uint32_t offset_imm,
+                            Register offset_reg, uintptr_t offset_imm,
                             LoadType type, LiftoffRegList pinned,
                             uint32_t* protected_load_pc, bool is_load_mem) {
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand src_op = liftoff::GetMemOp(this, src_addr, offset_reg, offset_imm);
   if (protected_load_pc) *protected_load_pc = pc_offset();
   switch (type.value()) {
@@ -363,12 +399,9 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
 }
 
 void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
-                             uint32_t offset_imm, LiftoffRegister src,
+                             uintptr_t offset_imm, LiftoffRegister src,
                              StoreType type, LiftoffRegList /* pinned */,
                              uint32_t* protected_store_pc, bool is_store_mem) {
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
   if (protected_store_pc) *protected_store_pc = pc_offset();
   switch (type.value()) {
@@ -400,11 +433,8 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
 }
 
 void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
-                                   uint32_t offset_imm, LiftoffRegister src,
+                                   uintptr_t offset_imm, LiftoffRegister src,
                                    StoreType type, LiftoffRegList pinned) {
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
   Register src_reg = src.gp();
   if (cache_state()->is_used(src)) {
@@ -433,7 +463,7 @@ void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
 }
 
 void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   DCHECK(!cache_state()->is_used(result));
   if (cache_state()->is_used(value)) {
@@ -443,9 +473,6 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
     movq(result.gp(), value.gp());
     value = result;
   }
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
   lock();
   switch (type.value()) {
@@ -478,7 +505,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
 }
 
 void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   DCHECK(!cache_state()->is_used(result));
   if (cache_state()->is_used(value)) {
@@ -488,9 +515,6 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
     movq(result.gp(), value.gp());
     value = result;
   }
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
   switch (type.value()) {
     case StoreType::kI32Store8:
@@ -536,7 +560,7 @@ inline void AtomicBinop(LiftoffAssembler* lasm,
                         void (Assembler::*opl)(Register, Register),
                         void (Assembler::*opq)(Register, Register),
                         Register dst_addr, Register offset_reg,
-                        uint32_t offset_imm, LiftoffRegister value,
+                        uintptr_t offset_imm, LiftoffRegister value,
                         LiftoffRegister result, StoreType type) {
   DCHECK(!__ cache_state()->is_used(result));
   Register value_reg = value.gp();
@@ -546,9 +570,6 @@ inline void AtomicBinop(LiftoffAssembler* lasm,
   LiftoffRegList pinned =
       LiftoffRegList::ForRegs(dst_addr, offset_reg, value_reg);
   __ ClearRegister(rax, {&dst_addr, &offset_reg, &value_reg}, pinned);
-  if (__ emit_debug_code() && offset_reg != no_reg) {
-    __ AssertZeroExtended(offset_reg);
-  }
   Operand dst_op = liftoff::GetMemOp(lasm, dst_addr, offset_reg, offset_imm);
 
   switch (type.value()) {
@@ -613,28 +634,28 @@ inline void AtomicBinop(LiftoffAssembler* lasm,
 }  // namespace liftoff
 
 void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, &Assembler::andl, &Assembler::andq, dst_addr,
                        offset_reg, offset_imm, value, result, type);
 }
 
 void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
-                                uint32_t offset_imm, LiftoffRegister value,
+                                uintptr_t offset_imm, LiftoffRegister value,
                                 LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, &Assembler::orl, &Assembler::orq, dst_addr,
                        offset_reg, offset_imm, value, result, type);
 }
 
 void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
-                                 uint32_t offset_imm, LiftoffRegister value,
+                                 uintptr_t offset_imm, LiftoffRegister value,
                                  LiftoffRegister result, StoreType type) {
   liftoff::AtomicBinop(this, &Assembler::xorl, &Assembler::xorq, dst_addr,
                        offset_reg, offset_imm, value, result, type);
 }
 
 void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
-                                      uint32_t offset_imm,
+                                      uintptr_t offset_imm,
                                       LiftoffRegister value,
                                       LiftoffRegister result, StoreType type) {
   DCHECK(!cache_state()->is_used(result));
@@ -645,9 +666,6 @@ void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
     movq(result.gp(), value.gp());
     value = result;
   }
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
   switch (type.value()) {
     case StoreType::kI32Store8:
@@ -679,7 +697,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
 }
 
 void LiftoffAssembler::AtomicCompareExchange(
-    Register dst_addr, Register offset_reg, uint32_t offset_imm,
+    Register dst_addr, Register offset_reg, uintptr_t offset_imm,
     LiftoffRegister expected, LiftoffRegister new_value, LiftoffRegister result,
     StoreType type) {
   Register value_reg = new_value.gp();
@@ -693,9 +711,6 @@ void LiftoffAssembler::AtomicCompareExchange(
     movq(rax, expected.gp());
   }
 
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand dst_op = liftoff::GetMemOp(this, dst_addr, offset_reg, offset_imm);
 
   lock();
@@ -807,6 +822,7 @@ void LiftoffAssembler::Spill(int offset, LiftoffRegister reg, ValueType type) {
     case ValueType::kI64:
     case ValueType::kOptRef:
     case ValueType::kRef:
+    case ValueType::kRtt:
       movq(dst, reg.gp());
       break;
     case ValueType::kF32:
@@ -923,6 +939,16 @@ void LiftoffAssembler::emit_i32_sub(Register dst, Register lhs, Register rhs) {
   }
 }
 
+void LiftoffAssembler::emit_i32_subi(Register dst, Register lhs, int32_t imm) {
+  if (dst != lhs) {
+    // We'll have to implement an UB-safe version if we need this corner case.
+    DCHECK_NE(imm, kMinInt);
+    leal(dst, Operand(lhs, -imm));
+  } else {
+    subl(dst, Immediate(imm));
+  }
+}
+
 namespace liftoff {
 template <void (Assembler::*op)(Register, Register),
           void (Assembler::*mov)(Register, Register)>
@@ -943,6 +969,7 @@ void EmitCommutativeBinOpImm(LiftoffAssembler* assm, Register dst, Register lhs,
   if (dst != lhs) (assm->*mov)(dst, lhs);
   (assm->*op)(dst, Immediate(imm));
 }
+
 }  // namespace liftoff
 
 void LiftoffAssembler::emit_i32_mul(Register dst, Register lhs, Register rhs) {
@@ -1186,11 +1213,18 @@ void LiftoffAssembler::emit_i64_add(LiftoffRegister dst, LiftoffRegister lhs,
 }
 
 void LiftoffAssembler::emit_i64_addi(LiftoffRegister dst, LiftoffRegister lhs,
-                                     int32_t imm) {
-  if (lhs.gp() != dst.gp()) {
-    leaq(dst.gp(), Operand(lhs.gp(), imm));
+                                     int64_t imm) {
+  if (!is_int32(imm)) {
+    TurboAssembler::Set(kScratchRegister, imm);
+    if (lhs.gp() == dst.gp()) {
+      addq(dst.gp(), kScratchRegister);
+    } else {
+      leaq(dst.gp(), Operand(lhs.gp(), kScratchRegister, times_1, 0));
+    }
+  } else if (lhs.gp() == dst.gp()) {
+    addq(dst.gp(), Immediate(static_cast<int32_t>(imm)));
   } else {
-    addq(dst.gp(), Immediate(imm));
+    leaq(dst.gp(), Operand(lhs.gp(), static_cast<int32_t>(imm)));
   }
 }
 
@@ -1992,14 +2026,20 @@ void LiftoffAssembler::emit_jump(Label* label) { jmp(label); }
 
 void LiftoffAssembler::emit_jump(Register target) { jmp(target); }
 
-void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
-                                      ValueType type, Register lhs,
-                                      Register rhs) {
+void LiftoffAssembler::emit_cond_jump(LiftoffCondition liftoff_cond,
+                                      Label* label, ValueType type,
+                                      Register lhs, Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   if (rhs != no_reg) {
     switch (type.kind()) {
       case ValueType::kI32:
         cmpl(lhs, rhs);
         break;
+      case ValueType::kRef:
+      case ValueType::kOptRef:
+      case ValueType::kRtt:
+        DCHECK(liftoff_cond == kEqual || liftoff_cond == kUnequal);
+        V8_FALLTHROUGH;
       case ValueType::kI64:
         cmpq(lhs, rhs);
         break;
@@ -2014,14 +2054,24 @@ void LiftoffAssembler::emit_cond_jump(Condition cond, Label* label,
   j(cond, label);
 }
 
+void LiftoffAssembler::emit_i32_cond_jumpi(LiftoffCondition liftoff_cond,
+                                           Label* label, Register lhs,
+                                           int imm) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
+  cmpl(lhs, Immediate(imm));
+  j(cond, label);
+}
+
 void LiftoffAssembler::emit_i32_eqz(Register dst, Register src) {
   testl(src, src);
   setcc(equal, dst);
   movzxbl(dst, dst);
 }
 
-void LiftoffAssembler::emit_i32_set_cond(Condition cond, Register dst,
-                                         Register lhs, Register rhs) {
+void LiftoffAssembler::emit_i32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, Register lhs,
+                                         Register rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   cmpl(lhs, rhs);
   setcc(cond, dst);
   movzxbl(dst, dst);
@@ -2033,9 +2083,10 @@ void LiftoffAssembler::emit_i64_eqz(Register dst, LiftoffRegister src) {
   movzxbl(dst, dst);
 }
 
-void LiftoffAssembler::emit_i64_set_cond(Condition cond, Register dst,
-                                         LiftoffRegister lhs,
+void LiftoffAssembler::emit_i64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, LiftoffRegister lhs,
                                          LiftoffRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   cmpq(lhs.gp(), rhs.gp());
   setcc(cond, dst);
   movzxbl(dst, dst);
@@ -2066,16 +2117,18 @@ void EmitFloatSetCond(LiftoffAssembler* assm, Condition cond, Register dst,
 }
 }  // namespace liftoff
 
-void LiftoffAssembler::emit_f32_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f32_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   liftoff::EmitFloatSetCond<&TurboAssembler::Ucomiss>(this, cond, dst, lhs,
                                                       rhs);
 }
 
-void LiftoffAssembler::emit_f64_set_cond(Condition cond, Register dst,
-                                         DoubleRegister lhs,
+void LiftoffAssembler::emit_f64_set_cond(LiftoffCondition liftoff_cond,
+                                         Register dst, DoubleRegister lhs,
                                          DoubleRegister rhs) {
+  Condition cond = liftoff::ToCondition(liftoff_cond);
   liftoff::EmitFloatSetCond<&TurboAssembler::Ucomisd>(this, cond, dst, lhs,
                                                       rhs);
 }
@@ -2107,6 +2160,13 @@ bool LiftoffAssembler::emit_select(LiftoffRegister dst, Register condition,
   return true;
 }
 
+void LiftoffAssembler::emit_smi_check(Register obj, Label* target,
+                                      SmiCheckMode mode) {
+  testb(obj, Immediate(kSmiTagMask));
+  Condition condition = mode == kJumpOnSmi ? zero : not_zero;
+  j(condition, target);
+}
+
 // TODO(fanchenk): Distinguish mov* if data bypass delay matter.
 namespace liftoff {
 template <void (Assembler::*avx_op)(XMMRegister, XMMRegister, XMMRegister),
@@ -2263,13 +2323,10 @@ inline void EmitAllTrue(LiftoffAssembler* assm, LiftoffRegister dst,
 }  // namespace liftoff
 
 void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
-                                     Register offset_reg, uint32_t offset_imm,
+                                     Register offset_reg, uintptr_t offset_imm,
                                      LoadType type,
                                      LoadTransformationKind transform,
                                      uint32_t* protected_load_pc) {
-  if (emit_debug_code() && offset_reg != no_reg) {
-    AssertZeroExtended(offset_reg);
-  }
   Operand src_op = liftoff::GetMemOp(this, src_addr, offset_reg, offset_imm);
   *protected_load_pc = pc_offset();
   MachineType memtype = type.mem_type();
@@ -2318,6 +2375,26 @@ void LiftoffAssembler::LoadTransform(LiftoffRegister dst, Register src_addr,
   }
 }
 
+void LiftoffAssembler::LoadLane(LiftoffRegister dst, LiftoffRegister src,
+                                Register addr, Register offset_reg,
+                                uintptr_t offset_imm, LoadType type,
+                                uint8_t laneidx, uint32_t* protected_load_pc) {
+  Operand src_op = liftoff::GetMemOp(this, addr, offset_reg, offset_imm);
+  *protected_load_pc = pc_offset();
+
+  MachineType mem_type = type.mem_type();
+  if (mem_type == MachineType::Int8()) {
+    Pinsrb(dst.fp(), src.fp(), src_op, laneidx);
+  } else if (mem_type == MachineType::Int16()) {
+    Pinsrw(dst.fp(), src.fp(), src_op, laneidx);
+  } else if (mem_type == MachineType::Int32()) {
+    Pinsrd(dst.fp(), src.fp(), src_op, laneidx);
+  } else {
+    DCHECK_EQ(MachineType::Int64(), mem_type);
+    Pinsrq(dst.fp(), src.fp(), src_op, laneidx);
+  }
+}
+
 void LiftoffAssembler::emit_i8x16_shuffle(LiftoffRegister dst,
                                           LiftoffRegister lhs,
                                           LiftoffRegister rhs,
@@ -2396,7 +2473,7 @@ void LiftoffAssembler::emit_i64x2_splat(LiftoffRegister dst,
 
 void LiftoffAssembler::emit_f32x4_splat(LiftoffRegister dst,
                                         LiftoffRegister src) {
-  Shufps(dst.fp(), src.fp(), 0);
+  Shufps(dst.fp(), src.fp(), src.fp(), 0);
 }
 
 void LiftoffAssembler::emit_f64x2_splat(LiftoffRegister dst,
@@ -2636,7 +2713,7 @@ void LiftoffAssembler::emit_f64x2_le(LiftoffRegister dst, LiftoffRegister lhs,
 void LiftoffAssembler::emit_s128_const(LiftoffRegister dst,
                                        const uint8_t imms[16]) {
   uint64_t vals[2];
-  memcpy(vals, imms, sizeof(vals));
+  base::Memcpy(vals, imms, sizeof(vals));
   TurboAssembler::Move(dst.fp(), vals[0]);
   movq(kScratchRegister, vals[1]);
   Pinsrq(dst.fp(), kScratchRegister, uint8_t{1});
@@ -2674,17 +2751,14 @@ void LiftoffAssembler::emit_s128_select(LiftoffRegister dst,
                                         LiftoffRegister src1,
                                         LiftoffRegister src2,
                                         LiftoffRegister mask) {
-  if (CpuFeatures::IsSupported(AVX)) {
-    CpuFeatureScope scope(this, AVX);
-    vxorps(kScratchDoubleReg, src1.fp(), src2.fp());
-    vandps(kScratchDoubleReg, kScratchDoubleReg, mask.fp());
-    vxorps(dst.fp(), kScratchDoubleReg, src2.fp());
+  // Ensure that we don't overwrite any inputs with the movdqu below.
+  DCHECK_NE(dst, src1);
+  DCHECK_NE(dst, src2);
+  if (!CpuFeatures::IsSupported(AVX) && dst != mask) {
+    movdqu(dst.fp(), mask.fp());
+    S128Select(dst.fp(), dst.fp(), src1.fp(), src2.fp());
   } else {
-    movaps(kScratchDoubleReg, src1.fp());
-    xorps(kScratchDoubleReg, src2.fp());
-    andps(kScratchDoubleReg, mask.fp());
-    if (dst.fp() != src2.fp()) movaps(dst.fp(), src2.fp());
-    xorps(dst.fp(), kScratchDoubleReg);
+    S128Select(dst.fp(), mask.fp(), src1.fp(), src2.fp());
   }
 }
 
@@ -3074,6 +3148,33 @@ void LiftoffAssembler::emit_i16x8_max_u(LiftoffRegister dst,
       this, dst, lhs, rhs, base::Optional<CpuFeature>(SSE4_1));
 }
 
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/true, /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_low_i8x16_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/true,
+              /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/false,
+              /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i16x8_extmul_high_i8x16_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I16x8ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/false,
+              /*is_signed=*/false);
+}
+
 void LiftoffAssembler::emit_i32x4_neg(LiftoffRegister dst,
                                       LiftoffRegister src) {
   if (dst.fp() == src.fp()) {
@@ -3191,6 +3292,58 @@ void LiftoffAssembler::emit_i32x4_dot_i16x8_s(LiftoffRegister dst,
       this, dst, lhs, rhs);
 }
 
+namespace liftoff {
+// Helper function to check for register aliasing, AVX support, and moves
+// registers around before calling the actual macro-assembler function.
+inline void I32x4ExtMulHelper(LiftoffAssembler* assm, XMMRegister dst,
+                              XMMRegister src1, XMMRegister src2, bool low,
+                              bool is_signed) {
+  // I32x4ExtMul requires dst == src1 if AVX is not supported.
+  if (CpuFeatures::IsSupported(AVX) || dst == src1) {
+    assm->I32x4ExtMul(dst, src1, src2, low, is_signed);
+  } else if (dst != src2) {
+    // dst != src1 && dst != src2
+    assm->movaps(dst, src1);
+    assm->I32x4ExtMul(dst, dst, src2, low, is_signed);
+  } else {
+    // dst == src2
+    // Extended multiplication is commutative,
+    assm->movaps(dst, src2);
+    assm->I32x4ExtMul(dst, dst, src1, low, is_signed);
+  }
+}
+}  // namespace liftoff
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(), /*low=*/true,
+                             /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_low_i16x8_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(), /*low=*/true,
+                             /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(),
+                             /*low=*/false,
+                             /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i32x4_extmul_high_i16x8_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  liftoff::I32x4ExtMulHelper(this, dst.fp(), src1.fp(), src2.fp(),
+                             /*low=*/false,
+                             /*is_signed=*/false);
+}
+
 void LiftoffAssembler::emit_i64x2_neg(LiftoffRegister dst,
                                       LiftoffRegister src) {
   DoubleRegister reg = dst.fp() == src.fp() ? kScratchDoubleReg : dst.fp();
@@ -3280,6 +3433,38 @@ void LiftoffAssembler::emit_i64x2_mul(LiftoffRegister dst, LiftoffRegister lhs,
   Paddq(dst.fp(), tmp2.fp());
 }
 
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_s(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/true, /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_low_i32x4_u(LiftoffRegister dst,
+                                                     LiftoffRegister src1,
+                                                     LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/true,
+              /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_s(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/false,
+              /*is_signed=*/true);
+}
+
+void LiftoffAssembler::emit_i64x2_extmul_high_i32x4_u(LiftoffRegister dst,
+                                                      LiftoffRegister src1,
+                                                      LiftoffRegister src2) {
+  I64x2ExtMul(dst.fp(), src1.fp(), src2.fp(), /*low=*/false,
+              /*is_signed=*/false);
+}
+
+void LiftoffAssembler::emit_i64x2_bitmask(LiftoffRegister dst,
+                                          LiftoffRegister src) {
+  Movmskpd(dst.gp(), src.fp());
+}
+
 void LiftoffAssembler::emit_f32x4_abs(LiftoffRegister dst,
                                       LiftoffRegister src) {
   if (dst.fp() == src.fp()) {
@@ -3714,8 +3899,7 @@ void LiftoffAssembler::emit_i16x8_sconvert_i8x16_low(LiftoffRegister dst,
 
 void LiftoffAssembler::emit_i16x8_sconvert_i8x16_high(LiftoffRegister dst,
                                                       LiftoffRegister src) {
-  Palignr(dst.fp(), src.fp(), static_cast<uint8_t>(8));
-  Pmovsxbw(dst.fp(), dst.fp());
+  I16x8SConvertI8x16High(dst.fp(), src.fp());
 }
 
 void LiftoffAssembler::emit_i16x8_uconvert_i8x16_low(LiftoffRegister dst,
@@ -3725,8 +3909,7 @@ void LiftoffAssembler::emit_i16x8_uconvert_i8x16_low(LiftoffRegister dst,
 
 void LiftoffAssembler::emit_i16x8_uconvert_i8x16_high(LiftoffRegister dst,
                                                       LiftoffRegister src) {
-  Palignr(dst.fp(), src.fp(), static_cast<uint8_t>(8));
-  Pmovzxbw(dst.fp(), dst.fp());
+  I16x8UConvertI8x16High(dst.fp(), src.fp());
 }
 
 void LiftoffAssembler::emit_i32x4_sconvert_i16x8_low(LiftoffRegister dst,
@@ -3736,8 +3919,7 @@ void LiftoffAssembler::emit_i32x4_sconvert_i16x8_low(LiftoffRegister dst,
 
 void LiftoffAssembler::emit_i32x4_sconvert_i16x8_high(LiftoffRegister dst,
                                                       LiftoffRegister src) {
-  Palignr(dst.fp(), src.fp(), static_cast<uint8_t>(8));
-  Pmovsxwd(dst.fp(), dst.fp());
+  I32x4SConvertI16x8High(dst.fp(), src.fp());
 }
 
 void LiftoffAssembler::emit_i32x4_uconvert_i16x8_low(LiftoffRegister dst,
@@ -3747,8 +3929,7 @@ void LiftoffAssembler::emit_i32x4_uconvert_i16x8_low(LiftoffRegister dst,
 
 void LiftoffAssembler::emit_i32x4_uconvert_i16x8_high(LiftoffRegister dst,
                                                       LiftoffRegister src) {
-  Palignr(dst.fp(), src.fp(), static_cast<uint8_t>(8));
-  Pmovzxwd(dst.fp(), dst.fp());
+  I32x4UConvertI16x8High(dst.fp(), src.fp());
 }
 
 void LiftoffAssembler::emit_s128_and_not(LiftoffRegister dst,
@@ -3989,6 +4170,24 @@ void LiftoffAssembler::PopRegisters(LiftoffRegList regs) {
   }
 }
 
+void LiftoffAssembler::RecordSpillsInSafepoint(Safepoint& safepoint,
+                                               LiftoffRegList all_spills,
+                                               LiftoffRegList ref_spills,
+                                               int spill_offset) {
+  int spill_space_size = 0;
+  while (!all_spills.is_empty()) {
+    LiftoffRegister reg = all_spills.GetFirstRegSet();
+    if (ref_spills.has(reg)) {
+      safepoint.DefinePointerSlot(spill_offset);
+    }
+    all_spills.clear(reg);
+    ++spill_offset;
+    spill_space_size += kSystemPointerSize;
+  }
+  // Record the number of additional spill slots.
+  RecordOolSpillSpaceSize(spill_space_size);
+}
+
 void LiftoffAssembler::DropStackSlotsAndRet(uint32_t num_stack_slots) {
   DCHECK_LT(num_stack_slots,
             (1 << 16) / kSystemPointerSize);  // 16 bit immediate
diff --git a/deps/v8/src/wasm/c-api.cc b/deps/v8/src/wasm/c-api.cc
index f79833464d3087..be7c4cb54f8511 100644
--- a/deps/v8/src/wasm/c-api.cc
+++ b/deps/v8/src/wasm/c-api.cc
@@ -19,15 +19,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <cstring>
-#include <iostream>
-
 #include "src/wasm/c-api.h"
 
-#include "third_party/wasm-api/wasm.h"
+#include <cstring>
+#include <iostream>
 
 #include "include/libplatform/libplatform.h"
 #include "src/api/api-inl.h"
+#include "src/base/platform/wrappers.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/objects/js-collection-inl.h"
 #include "src/objects/managed.h"
@@ -39,6 +38,7 @@
 #include "src/wasm/wasm-objects.h"
 #include "src/wasm/wasm-result.h"
 #include "src/wasm/wasm-serialization.h"
+#include "third_party/wasm-api/wasm.h"
 
 #ifdef WASM_API_DEBUG
 #error "WASM_API_DEBUG is unsupported"
@@ -256,7 +256,6 @@ void Engine::operator delete(void* p) { ::operator delete(p); }
 auto Engine::make(own<Config>&& config) -> own<Engine> {
   i::FLAG_expose_gc = true;
   i::FLAG_experimental_wasm_reftypes = true;
-  i::FLAG_experimental_wasm_bigint = true;
   i::FLAG_experimental_wasm_mv = true;
   auto engine = new (std::nothrow) EngineImpl;
   if (!engine) return own<Engine>();
@@ -2212,22 +2211,22 @@ struct borrowed_vec {
   }
 
 // Vectors with no ownership management of elements
-#define WASM_DEFINE_VEC_PLAIN(name, Name)                           \
-  WASM_DEFINE_VEC_BASE(name, Name,                                  \
-                       wasm::vec, ) /* NOLINT(whitespace/parens) */ \
-                                                                    \
-  void wasm_##name##_vec_new(wasm_##name##_vec_t* out, size_t size, \
-                             const wasm_##name##_t data[]) {        \
-    auto v2 = wasm::vec<Name>::make_uninitialized(size);            \
-    if (v2.size() != 0) {                                           \
-      memcpy(v2.get(), data, size * sizeof(wasm_##name##_t));       \
-    }                                                               \
-    *out = release_##name##_vec(std::move(v2));                     \
-  }                                                                 \
-                                                                    \
-  void wasm_##name##_vec_copy(wasm_##name##_vec_t* out,             \
-                              wasm_##name##_vec_t* v) {             \
-    wasm_##name##_vec_new(out, v->size, v->data);                   \
+#define WASM_DEFINE_VEC_PLAIN(name, Name)                               \
+  WASM_DEFINE_VEC_BASE(name, Name,                                      \
+                       wasm::vec, ) /* NOLINT(whitespace/parens) */     \
+                                                                        \
+  void wasm_##name##_vec_new(wasm_##name##_vec_t* out, size_t size,     \
+                             const wasm_##name##_t data[]) {            \
+    auto v2 = wasm::vec<Name>::make_uninitialized(size);                \
+    if (v2.size() != 0) {                                               \
+      v8::base::Memcpy(v2.get(), data, size * sizeof(wasm_##name##_t)); \
+    }                                                                   \
+    *out = release_##name##_vec(std::move(v2));                         \
+  }                                                                     \
+                                                                        \
+  void wasm_##name##_vec_copy(wasm_##name##_vec_t* out,                 \
+                              wasm_##name##_vec_t* v) {                 \
+    wasm_##name##_vec_new(out, v->size, v->data);                       \
   }
 
 // Vectors that own their elements
diff --git a/deps/v8/src/wasm/code-space-access.h b/deps/v8/src/wasm/code-space-access.h
index 5eeb980e17eddc..b6d22160ca92f5 100644
--- a/deps/v8/src/wasm/code-space-access.h
+++ b/deps/v8/src/wasm/code-space-access.h
@@ -28,7 +28,7 @@ inline void SwitchMemoryPermissionsToExecutable() {
 
 namespace wasm {
 
-class CodeSpaceWriteScope {
+class V8_NODISCARD CodeSpaceWriteScope {
  public:
   // TODO(jkummerow): Background threads could permanently stay in
   // writable mode; only the main thread has to switch back and forth.
diff --git a/deps/v8/src/wasm/compilation-environment.h b/deps/v8/src/wasm/compilation-environment.h
index d730161ad1f9d0..a9526f702b3050 100644
--- a/deps/v8/src/wasm/compilation-environment.h
+++ b/deps/v8/src/wasm/compilation-environment.h
@@ -24,6 +24,7 @@ namespace wasm {
 
 class NativeModule;
 class WasmCode;
+class WasmEngine;
 class WasmError;
 
 enum RuntimeExceptionSupport : bool {
@@ -116,6 +117,8 @@ class V8_EXPORT_PRIVATE CompilationState {
 
   ~CompilationState();
 
+  void InitCompileJob(WasmEngine*);
+
   void CancelCompilation();
 
   void SetError();
diff --git a/deps/v8/src/wasm/function-body-decoder-impl.h b/deps/v8/src/wasm/function-body-decoder-impl.h
index 3e07806d89eddd..3631309381495f 100644
--- a/deps/v8/src/wasm/function-body-decoder-impl.h
+++ b/deps/v8/src/wasm/function-body-decoder-impl.h
@@ -11,6 +11,7 @@
 #include <inttypes.h>
 
 #include "src/base/platform/elapsed-timer.h"
+#include "src/base/platform/wrappers.h"
 #include "src/base/small-vector.h"
 #include "src/utils/bit-vector.h"
 #include "src/wasm/decoder.h"
@@ -186,19 +187,24 @@ V8_INLINE WasmFeature feature_for_heap_type(HeapType heap_type) {
       return WasmFeature::kFeature_eh;
     case HeapType::kEq:
     case HeapType::kI31:
+    case HeapType::kAny:
       return WasmFeature::kFeature_gc;
+    case HeapType::kBottom:
     default:
       UNREACHABLE();
   }
 }
 
+// If {module} is not null, the read index will be checked against the module's
+// type capacity.
 template <Decoder::ValidateFlag validate>
 HeapType read_heap_type(Decoder* decoder, const byte* pc,
-                        uint32_t* const length, const WasmFeatures& enabled) {
+                        uint32_t* const length, const WasmModule* module,
+                        const WasmFeatures& enabled) {
   int64_t heap_index = decoder->read_i33v<validate>(pc, length, "heap type");
   if (heap_index < 0) {
     int64_t min_1_byte_leb128 = -64;
-    if (heap_index < min_1_byte_leb128) {
+    if (!VALIDATE(heap_index >= min_1_byte_leb128)) {
       DecodeError<validate>(decoder, pc, "Unknown heap type %" PRId64,
                             heap_index);
       return HeapType(HeapType::kBottom);
@@ -210,7 +216,8 @@ HeapType read_heap_type(Decoder* decoder, const byte* pc,
       case kExnRefCode:
       case kEqRefCode:
       case kExternRefCode:
-      case kI31RefCode: {
+      case kI31RefCode:
+      case kAnyRefCode: {
         HeapType result = HeapType::from_code(code);
         if (!VALIDATE(enabled.contains(feature_for_heap_type(result)))) {
           DecodeError<validate>(
@@ -244,20 +251,29 @@ HeapType read_heap_type(Decoder* decoder, const byte* pc,
           type_index, kV8MaxWasmTypes);
       return HeapType(HeapType::kBottom);
     }
+    // We use capacity over size so this works mid-DecodeTypeSection.
+    if (!VALIDATE(module == nullptr || type_index < module->types.capacity())) {
+      DecodeError<validate>(decoder, pc, "Type index %u is out of bounds",
+                            type_index);
+      return HeapType(HeapType::kBottom);
+    }
     return HeapType(type_index);
   }
 }
 
-// Read a value type starting at address 'pc' in 'decoder'.
-// No bytes are consumed. The result is written into the 'result' parameter.
-// Returns the amount of bytes read, or 0 if decoding failed.
-// Registers an error if the type opcode is invalid iff validate is set.
+// Read a value type starting at address {pc} using {decoder}.
+// No bytes are consumed.
+// The length of the read value type is written in {length}.
+// Registers an error for an invalid type only if {validate} is not
+// kNoValidate.
 template <Decoder::ValidateFlag validate>
 ValueType read_value_type(Decoder* decoder, const byte* pc,
-                          uint32_t* const length, const WasmFeatures& enabled) {
+                          uint32_t* const length, const WasmModule* module,
+                          const WasmFeatures& enabled) {
   *length = 1;
   byte val = decoder->read_u8<validate>(pc, "value type opcode");
   if (decoder->failed()) {
+    *length = 0;
     return kWasmBottom;
   }
   ValueTypeCode code = static_cast<ValueTypeCode>(val);
@@ -266,7 +282,8 @@ ValueType read_value_type(Decoder* decoder, const byte* pc,
     case kExnRefCode:
     case kEqRefCode:
     case kExternRefCode:
-    case kI31RefCode: {
+    case kI31RefCode:
+    case kAnyRefCode: {
       HeapType heap_type = HeapType::from_code(code);
       ValueType result = ValueType::Ref(
           heap_type, code == kI31RefCode ? kNonNullable : kNullable);
@@ -299,7 +316,7 @@ ValueType read_value_type(Decoder* decoder, const byte* pc,
         return kWasmBottom;
       }
       HeapType heap_type =
-          read_heap_type<validate>(decoder, pc + 1, length, enabled);
+          read_heap_type<validate>(decoder, pc + 1, length, module, enabled);
       *length += 1;
       return heap_type.is_bottom() ? kWasmBottom
                                    : ValueType::Ref(heap_type, nullability);
@@ -311,9 +328,8 @@ ValueType read_value_type(Decoder* decoder, const byte* pc,
             "invalid value type 'rtt', enable with --experimental-wasm-gc");
         return kWasmBottom;
       }
-      uint32_t depth_length;
-      uint32_t depth =
-          decoder->read_u32v<validate>(pc + 1, &depth_length, "depth");
+      uint32_t depth = decoder->read_u32v<validate>(pc + 1, length, "depth");
+      *length += 1;
       if (!VALIDATE(depth <= kV8MaxRttSubtypingDepth)) {
         DecodeError<validate>(
             decoder, pc,
@@ -322,9 +338,10 @@ ValueType read_value_type(Decoder* decoder, const byte* pc,
             depth, kV8MaxRttSubtypingDepth);
         return kWasmBottom;
       }
+      uint32_t heap_type_length;
       HeapType heap_type = read_heap_type<validate>(
-          decoder, pc + depth_length + 1, length, enabled);
-      *length += depth_length + 1;
+          decoder, pc + *length, &heap_type_length, module, enabled);
+      *length += heap_type_length;
       return heap_type.is_bottom() ? kWasmBottom
                                    : ValueType::Rtt(heap_type, depth);
     }
@@ -343,9 +360,15 @@ ValueType read_value_type(Decoder* decoder, const byte* pc,
     case kVoidCode:
     case kI8Code:
     case kI16Code:
+      if (validate) {
+        DecodeError<validate>(decoder, pc, "invalid value type 0x%x", code);
+      }
       return kWasmBottom;
   }
   // Anything that doesn't match an enumeration value is an invalid type code.
+  if (validate) {
+    DecodeError<validate>(decoder, pc, "invalid value type 0x%x", code);
+  }
   return kWasmBottom;
 }
 }  // namespace value_type_reader
@@ -399,7 +422,7 @@ struct ImmF32Immediate {
     // returns a float would potentially flip NaN bits per C++ semantics, so we
     // have to inline the memcpy call directly.
     uint32_t tmp = decoder->read_u32<validate>(pc, "immf32");
-    memcpy(&value, &tmp, sizeof(value));
+    base::Memcpy(&value, &tmp, sizeof(value));
   }
 };
 
@@ -410,7 +433,7 @@ struct ImmF64Immediate {
   inline ImmF64Immediate(Decoder* decoder, const byte* pc) {
     // Avoid bit_cast because it might not preserve the signalling bit of a NaN.
     uint64_t tmp = decoder->read_u64<validate>(pc, "immf64");
-    memcpy(&value, &tmp, sizeof(value));
+    base::Memcpy(&value, &tmp, sizeof(value));
   }
 };
 
@@ -432,7 +455,7 @@ struct SelectTypeImmediate {
   ValueType type;
 
   inline SelectTypeImmediate(const WasmFeatures& enabled, Decoder* decoder,
-                             const byte* pc) {
+                             const byte* pc, const WasmModule* module) {
     uint8_t num_types =
         decoder->read_u32v<validate>(pc, &length, "number of select types");
     if (!VALIDATE(num_types == 1)) {
@@ -442,12 +465,9 @@ struct SelectTypeImmediate {
       return;
     }
     uint32_t type_length;
-    type = value_type_reader::read_value_type<validate>(decoder, pc + length,
-                                                        &type_length, enabled);
+    type = value_type_reader::read_value_type<validate>(
+        decoder, pc + length, &type_length, module, enabled);
     length += type_length;
-    if (!VALIDATE(type != kWasmBottom)) {
-      DecodeError<validate>(decoder, pc + 1, "invalid select type");
-    }
   }
 };
 
@@ -459,18 +479,21 @@ struct BlockTypeImmediate {
   const FunctionSig* sig = nullptr;
 
   inline BlockTypeImmediate(const WasmFeatures& enabled, Decoder* decoder,
-                            const byte* pc) {
+                            const byte* pc, const WasmModule* module) {
     int64_t block_type =
         decoder->read_i33v<validate>(pc, &length, "block type");
     if (block_type < 0) {
-      constexpr int64_t kVoidCode_i64_extended = (~int64_t{0x7F}) | kVoidCode;
-      if (block_type == kVoidCode_i64_extended) return;
-      type = value_type_reader::read_value_type<validate>(decoder, pc, &length,
-                                                          enabled);
-      if (!VALIDATE(type != kWasmBottom)) {
-        DecodeError<validate>(decoder, pc, "Invalid block type %" PRId64,
+      // All valid negative types are 1 byte in length, so we check against the
+      // minimum 1-byte LEB128 value.
+      constexpr int64_t min_1_byte_leb128 = -64;
+      if (!VALIDATE(block_type >= min_1_byte_leb128)) {
+        DecodeError<validate>(decoder, pc, "invalid block type %" PRId64,
                               block_type);
+        return;
       }
+      if (static_cast<ValueTypeCode>(block_type & 0x7F) == kVoidCode) return;
+      type = value_type_reader::read_value_type<validate>(decoder, pc, &length,
+                                                          module, enabled);
     } else {
       if (!VALIDATE(enabled.has_mv())) {
         DecodeError<validate>(decoder, pc,
@@ -676,13 +699,16 @@ class BranchTableIterator {
   const uint32_t table_count_;  // the count of entries, not including default.
 };
 
+template <Decoder::ValidateFlag validate>
+class WasmDecoder;
+
 template <Decoder::ValidateFlag validate>
 struct MemoryAccessImmediate {
   uint32_t alignment;
-  uint32_t offset;
+  uint64_t offset;
   uint32_t length = 0;
   inline MemoryAccessImmediate(Decoder* decoder, const byte* pc,
-                               uint32_t max_alignment) {
+                               uint32_t max_alignment, bool is_memory64) {
     uint32_t alignment_length;
     alignment =
         decoder->read_u32v<validate>(pc, &alignment_length, "alignment");
@@ -694,10 +720,15 @@ struct MemoryAccessImmediate {
           max_alignment, alignment);
     }
     uint32_t offset_length;
-    offset = decoder->read_u32v<validate>(pc + alignment_length, &offset_length,
-                                          "offset");
+    offset = is_memory64 ? decoder->read_u64v<validate>(
+                               pc + alignment_length, &offset_length, "offset")
+                         : decoder->read_u32v<validate>(
+                               pc + alignment_length, &offset_length, "offset");
     length = alignment_length + offset_length;
   }
+  // Defined below, after the definition of WasmDecoder.
+  inline MemoryAccessImmediate(WasmDecoder<validate>* decoder, const byte* pc,
+                               uint32_t max_alignment);
 };
 
 // Immediate for SIMD lane operations.
@@ -805,9 +836,9 @@ struct HeapTypeImmediate {
   uint32_t length = 1;
   HeapType type = HeapType(HeapType::kBottom);
   inline HeapTypeImmediate(const WasmFeatures& enabled, Decoder* decoder,
-                           const byte* pc) {
+                           const byte* pc, const WasmModule* module) {
     type = value_type_reader::read_heap_type<validate>(decoder, pc, &length,
-                                                       enabled);
+                                                       module, enabled);
   }
 };
 
@@ -863,7 +894,9 @@ enum ControlKind : uint8_t {
   kControlLoop,
   kControlLet,
   kControlTry,
-  kControlTryCatch
+  kControlTryCatch,
+  kControlTryCatchAll,
+  kControlTryUnwind
 };
 
 enum Reachability : uint8_t {
@@ -922,7 +955,12 @@ struct ControlBase : public PcForErrors<validate> {
   bool is_loop() const { return kind == kControlLoop; }
   bool is_incomplete_try() const { return kind == kControlTry; }
   bool is_try_catch() const { return kind == kControlTryCatch; }
-  bool is_try() const { return is_incomplete_try() || is_try_catch(); }
+  bool is_try_catchall() const { return kind == kControlTryCatchAll; }
+  bool is_try_unwind() const { return kind == kControlTryUnwind; }
+  bool is_try() const {
+    return is_incomplete_try() || is_try_catch() || is_try_catchall() ||
+           is_try_unwind();
+  }
 
   inline Merge<Value>* br_merge() {
     return is_loop() ? &this->start_merge : &this->end_merge;
@@ -943,7 +981,6 @@ struct ControlBase : public PcForErrors<validate> {
   F(Block, Control* block)                                                     \
   F(Loop, Control* block)                                                      \
   F(Try, Control* block)                                                       \
-  F(Catch, Control* block, Value* exception)                                   \
   F(If, const Value& cond, Control* if_block)                                  \
   F(FallThruTo, Control* c)                                                    \
   F(PopControl, Control* block)                                                \
@@ -959,7 +996,7 @@ struct ControlBase : public PcForErrors<validate> {
   F(RefNull, ValueType type, Value* result)                                    \
   F(RefFunc, uint32_t function_index, Value* result)                           \
   F(RefAsNonNull, const Value& arg, Value* result)                             \
-  F(Drop, const Value& value)                                                  \
+  F(Drop)                                                                      \
   F(DoReturn, Vector<Value> values)                                            \
   F(LocalGet, Value* result, const LocalIndexImmediate<validate>& imm)         \
   F(LocalSet, const Value& value, const LocalIndexImmediate<validate>& imm)    \
@@ -976,7 +1013,7 @@ struct ControlBase : public PcForErrors<validate> {
   F(Unreachable)                                                               \
   F(Select, const Value& cond, const Value& fval, const Value& tval,           \
     Value* result)                                                             \
-  F(Br, Control* target)                                                       \
+  F(BrOrRet, uint32_t depth)                                                   \
   F(BrIf, const Value& cond, uint32_t depth)                                   \
   F(BrTable, const BranchTableImmediate<validate>& imm, const Value& key)      \
   F(Else, Control* if_block)                                                   \
@@ -988,6 +1025,8 @@ struct ControlBase : public PcForErrors<validate> {
   F(LoadLane, LoadType type, const Value& value, const Value& index,           \
     const MemoryAccessImmediate<validate>& imm, const uint8_t laneidx,         \
     Value* result)                                                             \
+  F(Prefetch, const MemoryAccessImmediate<validate>& imm, const Value& index,  \
+    bool temporal)                                                             \
   F(StoreMem, StoreType type, const MemoryAccessImmediate<validate>& imm,      \
     const Value& index, const Value& value)                                    \
   F(StoreLane, StoreType type, const MemoryAccessImmediate<validate>& imm,     \
@@ -1016,10 +1055,11 @@ struct ControlBase : public PcForErrors<validate> {
     const Value& input0, const Value& input1, Value* result)                   \
   F(Throw, const ExceptionIndexImmediate<validate>& imm,                       \
     const Vector<Value>& args)                                                 \
-  F(Rethrow, const Value& exception)                                           \
-  F(BrOnException, const Value& exception,                                     \
-    const ExceptionIndexImmediate<validate>& imm, uint32_t depth,              \
-    Vector<Value> values)                                                      \
+  F(Rethrow, Control* block)                                                   \
+  F(CatchException, const ExceptionIndexImmediate<validate>& imm,              \
+    Control* block, Vector<Value> caught_values)                               \
+  F(Delegate, uint32_t depth, Control* block)                                  \
+  F(CatchAll, Control* block)                                                  \
   F(AtomicOp, WasmOpcode opcode, Vector<Value> args,                           \
     const MemoryAccessImmediate<validate>& imm, Value* result)                 \
   F(AtomicFence)                                                               \
@@ -1068,7 +1108,7 @@ struct ControlBase : public PcForErrors<validate> {
   F(RefCast, const Value& obj, const Value& rtt, Value* result)                \
   F(BrOnCast, const Value& obj, const Value& rtt, Value* result_on_branch,     \
     uint32_t depth)                                                            \
-  F(PassThrough, const Value& from, Value* to)
+  F(Forward, const Value& from, Value* to)
 
 // Generic Wasm bytecode decoder with utilities for decoding immediates,
 // lengths, etc.
@@ -1083,7 +1123,9 @@ class WasmDecoder : public Decoder {
         module_(module),
         enabled_(enabled),
         detected_(detected),
-        sig_(sig) {}
+        sig_(sig) {
+    if (sig_ && sig_->return_count() > 1) detected_->Add(kFeature_mv);
+  }
 
   Zone* zone() const { return local_types_.get_allocator().zone(); }
 
@@ -1102,18 +1144,15 @@ class WasmDecoder : public Decoder {
   }
 
   // Decodes local definitions in the current decoder.
-  // Returns true iff locals are found.
-  // Writes the total length of decoded locals in 'total_length'.
-  // If insert_position is present, the decoded locals will be inserted into the
-  // 'local_types_' of this decoder. Otherwise, this function is used just to
-  // check validity and determine the encoding length of the locals in bytes.
-  // The decoder's pc is not advanced. If no locals are found (i.e., no
-  // compressed uint32 is found at pc), this will exit as 'false' and without an
-  // error.
-  bool DecodeLocals(const byte* pc, uint32_t* total_length,
-                    const base::Optional<uint32_t> insert_position) {
+  // Returns the number of newly defined locals, or -1 if decoding failed.
+  // Writes the total length of decoded locals in {total_length}.
+  // If {insert_position} is defined, the decoded locals will be inserted into
+  // the {this->local_types_}. The decoder's pc is not advanced.
+  int DecodeLocals(const byte* pc, uint32_t* total_length,
+                   const base::Optional<uint32_t> insert_position) {
     uint32_t length;
     *total_length = 0;
+    int total_count = 0;
 
     // The 'else' value is useless, we pass it for convenience.
     auto insert_iterator = insert_position.has_value()
@@ -1121,13 +1160,11 @@ class WasmDecoder : public Decoder {
                                : local_types_.begin();
 
     // Decode local declarations, if any.
-    uint32_t entries =
-        read_u32v<kFullValidation>(pc, &length, "local decls count");
+    uint32_t entries = read_u32v<validate>(pc, &length, "local decls count");
     if (!VALIDATE(ok())) {
       DecodeError(pc + *total_length, "invalid local decls count");
-      return false;
+      return -1;
     }
-
     *total_length += length;
     TRACE("local decls count: %u\n", entries);
 
@@ -1135,28 +1172,27 @@ class WasmDecoder : public Decoder {
       if (!VALIDATE(more())) {
         DecodeError(end(),
                     "expected more local decls but reached end of input");
-        return false;
+        return -1;
       }
-      uint32_t count = read_u32v<kFullValidation>(pc + *total_length, &length,
-                                                  "local count");
+
+      uint32_t count =
+          read_u32v<validate>(pc + *total_length, &length, "local count");
       if (!VALIDATE(ok())) {
         DecodeError(pc + *total_length, "invalid local count");
-        return false;
+        return -1;
       }
       DCHECK_LE(local_types_.size(), kV8MaxWasmFunctionLocals);
       if (!VALIDATE(count <= kV8MaxWasmFunctionLocals - local_types_.size())) {
         DecodeError(pc + *total_length, "local count too large");
-        return false;
+        return -1;
       }
       *total_length += length;
 
-      ValueType type = value_type_reader::read_value_type<kFullValidation>(
-          this, pc + *total_length, &length, enabled_);
-      if (!VALIDATE(type != kWasmBottom)) {
-        DecodeError(pc + *total_length, "invalid local type");
-        return false;
-      }
+      ValueType type = value_type_reader::read_value_type<validate>(
+          this, pc + *total_length, &length, this->module_, enabled_);
+      if (!VALIDATE(type != kWasmBottom)) return -1;
       *total_length += length;
+      total_count += count;
 
       if (insert_position.has_value()) {
         // Move the insertion iterator to the end of the newly inserted locals.
@@ -1165,8 +1201,9 @@ class WasmDecoder : public Decoder {
         num_locals_ += count;
       }
     }
+
     DCHECK(ok());
-    return true;
+    return total_count;
   }
 
   // Shorthand that forwards to the {DecodeError} functions above, passing our
@@ -1176,57 +1213,72 @@ class WasmDecoder : public Decoder {
     wasm::DecodeError<validate>(this, std::forward<Args>(args)...);
   }
 
+  // Returns a BitVector of length {locals_count + 1} representing the set of
+  // variables that are assigned in the loop starting at {pc}. The additional
+  // position at the end of the vector represents possible assignments to
+  // the instance cache.
   static BitVector* AnalyzeLoopAssignment(WasmDecoder* decoder, const byte* pc,
                                           uint32_t locals_count, Zone* zone) {
     if (pc >= decoder->end()) return nullptr;
     if (*pc != kExprLoop) return nullptr;
-
-    // The number of locals_count is augmented by 2 so that 'locals_count - 2'
-    // can be used to track mem_size, and 'locals_count - 1' to track mem_start.
-    BitVector* assigned = zone->New<BitVector>(locals_count, zone);
-    int depth = 0;
+    // The number of locals_count is augmented by 1 so that the 'locals_count'
+    // index can be used to track the instance cache.
+    BitVector* assigned = zone->New<BitVector>(locals_count + 1, zone);
+    int depth = -1;  // We will increment the depth to 0 when we decode the
+                     // starting 'loop' opcode.
+    // Since 'let' can add additional locals at the beginning of the locals
+    // index space, we need to track this offset for every depth up to the
+    // current depth.
+    base::SmallVector<uint32_t, 8> local_offsets(8);
     // Iteratively process all AST nodes nested inside the loop.
     while (pc < decoder->end() && VALIDATE(decoder->ok())) {
       WasmOpcode opcode = static_cast<WasmOpcode>(*pc);
-      uint32_t length = 1;
       switch (opcode) {
         case kExprLoop:
         case kExprIf:
         case kExprBlock:
         case kExprTry:
-          length = OpcodeLength(decoder, pc);
           depth++;
+          local_offsets.resize_no_init(depth + 1);
+          // No additional locals.
+          local_offsets[depth] = depth > 0 ? local_offsets[depth - 1] : 0;
+          break;
+        case kExprLet: {
+          depth++;
+          local_offsets.resize_no_init(depth + 1);
+          BlockTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1,
+                                           nullptr);
+          uint32_t locals_length;
+          int new_locals_count = decoder->DecodeLocals(
+              pc + 1 + imm.length, &locals_length, base::Optional<uint32_t>());
+          local_offsets[depth] = local_offsets[depth - 1] + new_locals_count;
           break;
-        case kExprLocalSet:  // fallthru
+        }
+        case kExprLocalSet:
         case kExprLocalTee: {
           LocalIndexImmediate<validate> imm(decoder, pc + 1);
-          if (assigned->length() > 0 &&
-              imm.index < static_cast<uint32_t>(assigned->length())) {
-            // Unverified code might have an out-of-bounds index.
-            assigned->Add(imm.index);
+          // Unverified code might have an out-of-bounds index.
+          if (imm.index >= local_offsets[depth] &&
+              imm.index - local_offsets[depth] < locals_count) {
+            assigned->Add(imm.index - local_offsets[depth]);
           }
-          length = 1 + imm.length;
           break;
         }
         case kExprMemoryGrow:
         case kExprCallFunction:
         case kExprCallIndirect:
-        case kExprReturnCall:
-        case kExprReturnCallIndirect:
-          // Add instance cache nodes to the assigned set.
-          // TODO(titzer): make this more clear.
-          assigned->Add(locals_count - 1);
-          length = OpcodeLength(decoder, pc);
+        case kExprCallRef:
+          // Add instance cache to the assigned set.
+          assigned->Add(locals_count);
           break;
         case kExprEnd:
           depth--;
           break;
         default:
-          length = OpcodeLength(decoder, pc);
           break;
       }
-      if (depth <= 0) break;
-      pc += length;
+      if (depth < 0) break;
+      pc += OpcodeLength(decoder, pc);
     }
     return VALIDATE(decoder->ok()) ? assigned : nullptr;
   }
@@ -1397,22 +1449,30 @@ class WasmDecoder : public Decoder {
       case kExprF64x2ReplaceLane:
       case kExprI64x2ExtractLane:
       case kExprI64x2ReplaceLane:
+      case kExprS128Load64Lane:
+      case kExprS128Store64Lane:
         num_lanes = 2;
         break;
       case kExprF32x4ExtractLane:
       case kExprF32x4ReplaceLane:
       case kExprI32x4ExtractLane:
       case kExprI32x4ReplaceLane:
+      case kExprS128Load32Lane:
+      case kExprS128Store32Lane:
         num_lanes = 4;
         break;
       case kExprI16x8ExtractLaneS:
       case kExprI16x8ExtractLaneU:
       case kExprI16x8ReplaceLane:
+      case kExprS128Load16Lane:
+      case kExprS128Store16Lane:
         num_lanes = 8;
         break;
       case kExprI8x16ExtractLaneS:
       case kExprI8x16ExtractLaneU:
       case kExprI8x16ReplaceLane:
+      case kExprS128Load8Lane:
+      case kExprS128Store8Lane:
         num_lanes = 16;
         break;
       default:
@@ -1452,8 +1512,8 @@ class WasmDecoder : public Decoder {
 
   inline bool Validate(const byte* pc, BlockTypeImmediate<validate>& imm) {
     if (!Complete(imm)) {
-      DecodeError(pc, "block type index %u out of bounds (%zu types)",
-                  imm.sig_index, module_->types.size());
+      DecodeError(pc, "block type index %u is not a signature definition",
+                  imm.sig_index);
       return false;
     }
     return true;
@@ -1551,45 +1611,58 @@ class WasmDecoder : public Decoder {
     return true;
   }
 
-  inline bool Validate(const byte* pc, HeapTypeImmediate<validate>& imm) {
-    if (!VALIDATE(!imm.type.is_bottom())) {
-      DecodeError(pc, "invalid heap type");
-      return false;
-    }
-    if (!VALIDATE(imm.type.is_generic() ||
-                  module_->has_type(imm.type.ref_index()))) {
-      DecodeError(pc, "Type index %u is out of bounds", imm.type.ref_index());
-      return false;
-    }
-    return true;
-  }
-
+  // Returns the length of the opcode under {pc}.
   static uint32_t OpcodeLength(WasmDecoder* decoder, const byte* pc) {
     WasmOpcode opcode = static_cast<WasmOpcode>(*pc);
+    // We don't have information about the module here, so we just assume that
+    // memory64 is enabled when parsing memory access immediates. This is
+    // backwards-compatible; decode errors will be detected at another time when
+    // actually decoding that opcode.
+    constexpr bool kConservativelyAssumeMemory64 = true;
     switch (opcode) {
-#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
-      FOREACH_LOAD_MEM_OPCODE(DECLARE_OPCODE_CASE)
-      FOREACH_STORE_MEM_OPCODE(DECLARE_OPCODE_CASE)
-#undef DECLARE_OPCODE_CASE
-      {
-        MemoryAccessImmediate<validate> imm(decoder, pc + 1, UINT32_MAX);
+      /********** Control opcodes **********/
+      case kExprUnreachable:
+      case kExprNop:
+      case kExprElse:
+      case kExprEnd:
+      case kExprReturn:
+        return 1;
+      case kExprTry:
+      case kExprIf:
+      case kExprLoop:
+      case kExprBlock: {
+        BlockTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1,
+                                         nullptr);
         return 1 + imm.length;
       }
+      case kExprRethrow:
       case kExprBr:
-      case kExprBrIf: {
+      case kExprBrIf:
+      case kExprBrOnNull:
+      case kExprDelegate: {
         BranchDepthImmediate<validate> imm(decoder, pc + 1);
         return 1 + imm.length;
       }
-      case kExprGlobalGet:
-      case kExprGlobalSet: {
-        GlobalIndexImmediate<validate> imm(decoder, pc + 1);
-        return 1 + imm.length;
+      case kExprBrTable: {
+        BranchTableImmediate<validate> imm(decoder, pc + 1);
+        BranchTableIterator<validate> iterator(decoder, imm);
+        return 1 + iterator.length();
       }
-      case kExprTableGet:
-      case kExprTableSet: {
-        TableIndexImmediate<validate> imm(decoder, pc + 1);
+      case kExprThrow:
+      case kExprCatch: {
+        ExceptionIndexImmediate<validate> imm(decoder, pc + 1);
         return 1 + imm.length;
       }
+      case kExprLet: {
+        BlockTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1,
+                                         nullptr);
+        uint32_t locals_length;
+        int new_locals_count = decoder->DecodeLocals(
+            pc + 1 + imm.length, &locals_length, base::Optional<uint32_t>());
+        return 1 + imm.length + ((new_locals_count >= 0) ? locals_length : 0);
+      }
+
+      /********** Misc opcodes **********/
       case kExprCallFunction:
       case kExprReturnCall: {
         CallFunctionImmediate<validate> imm(decoder, pc + 1);
@@ -1601,36 +1674,16 @@ class WasmDecoder : public Decoder {
                                             pc + 1);
         return 1 + imm.length;
       }
-
-      case kExprTry:
-      case kExprIf:  // fall through
-      case kExprLoop:
-      case kExprBlock: {
-        BlockTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1);
-        return 1 + imm.length;
-      }
-
-      case kExprLet: {
-        BlockTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1);
-        uint32_t locals_length;
-        bool locals_result =
-            decoder->DecodeLocals(decoder->pc() + 1 + imm.length,
-                                  &locals_length, base::Optional<uint32_t>());
-        return 1 + imm.length + (locals_result ? locals_length : 0);
-      }
-
-      case kExprThrow: {
-        ExceptionIndexImmediate<validate> imm(decoder, pc + 1);
-        return 1 + imm.length;
-      }
-
-      case kExprBrOnExn: {
-        BranchOnExceptionImmediate<validate> imm(decoder, pc + 1);
-        return 1 + imm.length;
-      }
-
-      case kExprBrOnNull: {
-        BranchDepthImmediate<validate> imm(decoder, pc + 1);
+      case kExprCallRef:
+      case kExprReturnCallRef:
+      case kExprDrop:
+      case kExprSelect:
+      case kExprCatchAll:
+      case kExprUnwind:
+        return 1;
+      case kExprSelectWithType: {
+        SelectTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1,
+                                          nullptr);
         return 1 + imm.length;
       }
 
@@ -1640,14 +1693,15 @@ class WasmDecoder : public Decoder {
         LocalIndexImmediate<validate> imm(decoder, pc + 1);
         return 1 + imm.length;
       }
-      case kExprSelectWithType: {
-        SelectTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1);
+      case kExprGlobalGet:
+      case kExprGlobalSet: {
+        GlobalIndexImmediate<validate> imm(decoder, pc + 1);
         return 1 + imm.length;
       }
-      case kExprBrTable: {
-        BranchTableImmediate<validate> imm(decoder, pc + 1);
-        BranchTableIterator<validate> iterator(decoder, imm);
-        return 1 + iterator.length();
+      case kExprTableGet:
+      case kExprTableSet: {
+        TableIndexImmediate<validate> imm(decoder, pc + 1);
+        return 1 + imm.length;
       }
       case kExprI32Const: {
         ImmI32Immediate<validate> imm(decoder, pc + 1);
@@ -1657,8 +1711,13 @@ class WasmDecoder : public Decoder {
         ImmI64Immediate<validate> imm(decoder, pc + 1);
         return 1 + imm.length;
       }
+      case kExprF32Const:
+        return 5;
+      case kExprF64Const:
+        return 9;
       case kExprRefNull: {
-        HeapTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1);
+        HeapTypeImmediate<validate> imm(WasmFeatures::All(), decoder, pc + 1,
+                                        nullptr);
         return 1 + imm.length;
       }
       case kExprRefIsNull: {
@@ -1668,15 +1727,29 @@ class WasmDecoder : public Decoder {
         FunctionIndexImmediate<validate> imm(decoder, pc + 1);
         return 1 + imm.length;
       }
+      case kExprRefAsNonNull:
+        return 1;
+
+#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
+        // clang-format off
+      /********** Simple and memory opcodes **********/
+      FOREACH_SIMPLE_OPCODE(DECLARE_OPCODE_CASE)
+      FOREACH_SIMPLE_PROTOTYPE_OPCODE(DECLARE_OPCODE_CASE)
+        return 1;
+      FOREACH_LOAD_MEM_OPCODE(DECLARE_OPCODE_CASE)
+      FOREACH_STORE_MEM_OPCODE(DECLARE_OPCODE_CASE) {
+        MemoryAccessImmediate<validate> imm(decoder, pc + 1, UINT32_MAX,
+                                            kConservativelyAssumeMemory64);
+        return 1 + imm.length;
+      }
+      // clang-format on
       case kExprMemoryGrow:
       case kExprMemorySize: {
         MemoryIndexImmediate<validate> imm(decoder, pc + 1);
         return 1 + imm.length;
       }
-      case kExprF32Const:
-        return 5;
-      case kExprF64Const:
-        return 9;
+
+      /********** Prefixed opcodes **********/
       case kNumericPrefix: {
         uint32_t length = 0;
         opcode = decoder->read_prefixed_opcode<validate>(pc, &length);
@@ -1725,7 +1798,9 @@ class WasmDecoder : public Decoder {
             return length + imm.length;
           }
           default:
-            decoder->DecodeError(pc, "invalid numeric opcode");
+            if (validate) {
+              decoder->DecodeError(pc, "invalid numeric opcode");
+            }
             return length;
         }
       }
@@ -1733,20 +1808,18 @@ class WasmDecoder : public Decoder {
         uint32_t length = 0;
         opcode = decoder->read_prefixed_opcode<validate>(pc, &length);
         switch (opcode) {
-#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
+          // clang-format off
           FOREACH_SIMD_0_OPERAND_OPCODE(DECLARE_OPCODE_CASE)
-#undef DECLARE_OPCODE_CASE
-          return length;
-#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
+            return length;
           FOREACH_SIMD_1_OPERAND_OPCODE(DECLARE_OPCODE_CASE)
-#undef DECLARE_OPCODE_CASE
-          return length + 1;
-#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
+            return length + 1;
+          // clang-format on
           FOREACH_SIMD_MEM_OPCODE(DECLARE_OPCODE_CASE)
-#undef DECLARE_OPCODE_CASE
-          {
+          case kExprPrefetchT:
+          case kExprPrefetchNT: {
             MemoryAccessImmediate<validate> imm(decoder, pc + length,
-                                                UINT32_MAX);
+                                                UINT32_MAX,
+                                                kConservativelyAssumeMemory64);
             return length + imm.length;
           }
           case kExprS128Load8Lane:
@@ -1758,7 +1831,8 @@ class WasmDecoder : public Decoder {
           case kExprS128Store32Lane:
           case kExprS128Store64Lane: {
             MemoryAccessImmediate<validate> imm(decoder, pc + length,
-                                                UINT32_MAX);
+                                                UINT32_MAX,
+                                                kConservativelyAssumeMemory64);
             // 1 more byte for lane index immediate.
             return length + imm.length + 1;
           }
@@ -1767,7 +1841,9 @@ class WasmDecoder : public Decoder {
           case kExprI8x16Shuffle:
             return length + kSimd128Size;
           default:
-            decoder->DecodeError(pc, "invalid SIMD opcode");
+            if (validate) {
+              decoder->DecodeError(pc, "invalid SIMD opcode");
+            }
             return length;
         }
       }
@@ -1776,22 +1852,19 @@ class WasmDecoder : public Decoder {
         opcode = decoder->read_prefixed_opcode<validate>(pc, &length,
                                                          "atomic_index");
         switch (opcode) {
-#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
-          FOREACH_ATOMIC_OPCODE(DECLARE_OPCODE_CASE)
-#undef DECLARE_OPCODE_CASE
-          {
+          FOREACH_ATOMIC_OPCODE(DECLARE_OPCODE_CASE) {
             MemoryAccessImmediate<validate> imm(decoder, pc + length,
-                                                UINT32_MAX);
+                                                UINT32_MAX,
+                                                kConservativelyAssumeMemory64);
             return length + imm.length;
           }
-#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
-          FOREACH_ATOMIC_0_OPERAND_OPCODE(DECLARE_OPCODE_CASE)
-#undef DECLARE_OPCODE_CASE
-          {
+          FOREACH_ATOMIC_0_OPERAND_OPCODE(DECLARE_OPCODE_CASE) {
             return length + 1;
           }
           default:
-            decoder->DecodeError(pc, "invalid Atomics opcode");
+            if (validate) {
+              decoder->DecodeError(pc, "invalid Atomics opcode");
+            }
             return length;
         }
       }
@@ -1831,10 +1904,9 @@ class WasmDecoder : public Decoder {
             // TODO(7748): Account for rtt.sub's additional immediates if
             // they stick.
             HeapTypeImmediate<validate> imm(WasmFeatures::All(), decoder,
-                                            pc + length);
+                                            pc + length, nullptr);
             return length + imm.length;
           }
-
           case kExprI31New:
           case kExprI31GetS:
           case kExprI31GetU:
@@ -1842,21 +1914,41 @@ class WasmDecoder : public Decoder {
           case kExprRefTest:
           case kExprRefCast: {
             HeapTypeImmediate<validate> ht1(WasmFeatures::All(), decoder,
-                                            pc + length);
+                                            pc + length, nullptr);
             HeapTypeImmediate<validate> ht2(WasmFeatures::All(), decoder,
-                                            pc + length + ht1.length);
+                                            pc + length + ht1.length, nullptr);
             return length + ht1.length + ht2.length;
           }
-
           default:
             // This is unreachable except for malformed modules.
-            decoder->DecodeError(pc, "invalid gc opcode");
+            if (validate) {
+              decoder->DecodeError(pc, "invalid gc opcode");
+            }
             return length;
         }
       }
-      default:
+
+        // clang-format off
+      /********** Asmjs opcodes **********/
+      FOREACH_ASMJS_COMPAT_OPCODE(DECLARE_OPCODE_CASE)
         return 1;
+
+      // Prefixed opcodes (already handled, included here for completeness of
+      // switch)
+      FOREACH_SIMD_OPCODE(DECLARE_OPCODE_CASE)
+      FOREACH_NUMERIC_OPCODE(DECLARE_OPCODE_CASE)
+      FOREACH_ATOMIC_OPCODE(DECLARE_OPCODE_CASE)
+      FOREACH_ATOMIC_0_OPERAND_OPCODE(DECLARE_OPCODE_CASE)
+      FOREACH_GC_OPCODE(DECLARE_OPCODE_CASE)
+        UNREACHABLE();
+        // clang-format on
+#undef DECLARE_OPCODE_CASE
+    }
+    // Invalid modules will reach this point.
+    if (validate) {
+      decoder->DecodeError(pc, "invalid opcode");
     }
+    return 1;
   }
 
   // TODO(clemensb): This is only used by the interpreter; move there.
@@ -1890,7 +1982,6 @@ class WasmDecoder : public Decoder {
       case kExprBrIf:
       case kExprBrTable:
       case kExprIf:
-      case kExprRethrow:
         return {1, 0};
       case kExprLocalGet:
       case kExprGlobalGet:
@@ -1927,7 +2018,10 @@ class WasmDecoder : public Decoder {
       case kExprElse:
       case kExprTry:
       case kExprCatch:
-      case kExprBrOnExn:
+      case kExprCatchAll:
+      case kExprDelegate:
+      case kExprUnwind:
+      case kExprRethrow:
       case kExprNop:
       case kExprReturn:
       case kExprReturnCall:
@@ -2021,6 +2115,12 @@ class WasmDecoder : public Decoder {
   const FunctionSig* sig_;
 };
 
+template <Decoder::ValidateFlag validate>
+MemoryAccessImmediate<validate>::MemoryAccessImmediate(
+    WasmDecoder<validate>* decoder, const byte* pc, uint32_t max_alignment)
+    : MemoryAccessImmediate(decoder, pc, max_alignment,
+                            decoder->module_->is_memory64) {}
+
 #define CALL_INTERFACE(name, ...) interface_.name(this, ##__VA_ARGS__)
 #define CALL_INTERFACE_IF_REACHABLE(name, ...)            \
   do {                                                    \
@@ -2249,6 +2349,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
             break;
           case kControlIfElse:
           case kControlTryCatch:
+          case kControlTryCatchAll:
+          case kControlTryUnwind:
           case kControlLet:  // TODO(7748): Implement
             break;
         }
@@ -2296,7 +2398,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
 #undef BUILD_SIMPLE_OPCODE
 
   DECODE(Block) {
-    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1);
+    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1,
+                                     this->module_);
     if (!this->Validate(this->pc_ + 1, imm)) return 0;
     ArgVector args = PopArgs(imm.sig);
     Control* block = PushControl(kControlBlock);
@@ -2308,10 +2411,16 @@ class WasmFullDecoder : public WasmDecoder<validate> {
 
   DECODE(Rethrow) {
     CHECK_PROTOTYPE_OPCODE(eh);
-    Value exception = Pop(0, kWasmExnRef);
-    CALL_INTERFACE_IF_REACHABLE(Rethrow, exception);
+    BranchDepthImmediate<validate> imm(this, this->pc_ + 1);
+    if (!this->Validate(this->pc_ + 1, imm, control_.size())) return 0;
+    Control* c = control_at(imm.depth);
+    if (!VALIDATE(c->is_try_catchall() || c->is_try_catch())) {
+      this->error("rethrow not targeting catch or catch-all");
+      return 0;
+    }
+    CALL_INTERFACE_IF_REACHABLE(Rethrow, c);
     EndControl();
-    return 1;
+    return 1 + imm.length;
   }
 
   DECODE(Throw) {
@@ -2326,7 +2435,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
 
   DECODE(Try) {
     CHECK_PROTOTYPE_OPCODE(eh);
-    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1);
+    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1,
+                                     this->module_);
     if (!this->Validate(this->pc_ + 1, imm)) return 0;
     ArgVector args = PopArgs(imm.sig);
     Control* try_block = PushControl(kControlTry);
@@ -2338,6 +2448,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
 
   DECODE(Catch) {
     CHECK_PROTOTYPE_OPCODE(eh);
+    ExceptionIndexImmediate<validate> imm(this, this->pc_ + 1);
+    if (!this->Validate(this->pc_ + 1, imm)) return 0;
     if (!VALIDATE(!control_.empty())) {
       this->DecodeError("catch does not match any try");
       return 0;
@@ -2347,8 +2459,12 @@ class WasmFullDecoder : public WasmDecoder<validate> {
       this->DecodeError("catch does not match any try");
       return 0;
     }
-    if (!VALIDATE(c->is_incomplete_try())) {
-      this->DecodeError("catch already present for try");
+    if (!VALIDATE(!c->is_try_catchall())) {
+      this->DecodeError("catch after catch-all for try");
+      return 0;
+    }
+    if (!VALIDATE(!c->is_try_unwind())) {
+      this->DecodeError("catch after unwind for try");
       return 0;
     }
     c->kind = kControlTryCatch;
@@ -2356,40 +2472,94 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     DCHECK_LE(stack_ + c->stack_depth, stack_end_);
     stack_end_ = stack_ + c->stack_depth;
     c->reachability = control_at(1)->innerReachability();
+    const WasmExceptionSig* sig = imm.exception->sig;
+    EnsureStackSpace(static_cast<int>(sig->parameter_count()));
+    for (size_t i = 0, e = sig->parameter_count(); i < e; ++i) {
+      Push(sig->GetParam(i));
+    }
+    Vector<Value> values(stack_ + c->stack_depth, sig->parameter_count());
+    CALL_INTERFACE_IF_PARENT_REACHABLE(CatchException, imm, c, values);
+    current_code_reachable_ = this->ok() && c->reachable();
+    return 1 + imm.length;
+  }
+
+  DECODE(Delegate) {
+    BranchDepthImmediate<validate> imm(this, this->pc_ + 1);
+    // -1 because the current try block is not included in the count.
+    if (!this->Validate(this->pc_ + 1, imm, control_depth() - 1)) return 0;
+    Control* c = &control_.back();
+    if (!VALIDATE(c->is_incomplete_try())) {
+      this->DecodeError("delegate does not match a try");
+      return 0;
+    }
+    // +1 because the current try block is not included in the count.
+    Control* target = control_at(imm.depth + 1);
+    if (imm.depth + 1 < control_depth() - 1 && !target->is_try()) {
+      this->DecodeError(
+          "delegate target must be a try block or the function block");
+      return 0;
+    }
+    if (target->is_try_catch() || target->is_try_catchall() ||
+        target->is_try_catchall()) {
+      this->DecodeError(
+          "cannot delegate inside the catch handler of the target");
+    }
+    FallThruTo(c);
+    CALL_INTERFACE_IF_PARENT_REACHABLE(Delegate, imm.depth + 1, c);
+    current_code_reachable_ = this->ok() && control_.back().reachable();
+    EndControl();
+    PopControl(c);
+    return 1 + imm.length;
+  }
+
+  DECODE(CatchAll) {
+    CHECK_PROTOTYPE_OPCODE(eh);
+    DCHECK(!control_.empty());
+    Control* c = &control_.back();
+    if (!VALIDATE(c->is_try())) {
+      this->DecodeError("catch-all does not match a try");
+      return 0;
+    }
+    if (!VALIDATE(!c->is_try_catchall())) {
+      this->error("catch-all already present for try");
+      return 0;
+    }
+    if (!VALIDATE(!c->is_try_unwind())) {
+      this->error("cannot have catch-all after unwind");
+      return 0;
+    }
+    FallThruTo(c);
+    c->kind = kControlTryCatchAll;
+    stack_end_ = stack_ + c->stack_depth;
+    c->reachability = control_at(1)->innerReachability();
+    CALL_INTERFACE_IF_PARENT_REACHABLE(CatchAll, c);
     current_code_reachable_ = this->ok() && c->reachable();
-    Value* exception = Push(kWasmExnRef);
-    CALL_INTERFACE_IF_PARENT_REACHABLE(Catch, c, exception);
     return 1;
   }
 
-  DECODE(BrOnExn) {
+  DECODE(Unwind) {
     CHECK_PROTOTYPE_OPCODE(eh);
-    BranchOnExceptionImmediate<validate> imm(this, this->pc_ + 1);
-    if (!this->Validate(this->pc() + 1, imm, control_.size())) return 0;
-    Control* c = control_at(imm.depth.depth);
-    Value exception = Pop(0, kWasmExnRef);
-    const WasmExceptionSig* sig = imm.index.exception->sig;
-    int value_count = static_cast<int>(sig->parameter_count());
-    // TODO(wasm): This operand stack mutation is an ugly hack to make
-    // both type checking here as well as environment merging in the
-    // graph builder interface work out of the box. We should introduce
-    // special handling for both and do minimal/no stack mutation here.
-    EnsureStackSpace(value_count);
-    for (int i = 0; i < value_count; ++i) Push(sig->GetParam(i));
-    Vector<Value> values(stack_ + c->stack_depth, value_count);
-    TypeCheckBranchResult check_result = TypeCheckBranch(c, true);
-    if (this->failed()) return 0;
-    if (V8_LIKELY(check_result == kReachableBranch)) {
-      CALL_INTERFACE(BrOnException, exception, imm.index, imm.depth.depth,
-                     values);
-      c->br_merge()->reached = true;
-    } else if (check_result == kInvalidStack) {
+    if (!VALIDATE(!control_.empty())) {
+      this->DecodeError("unwind does not match any try");
       return 0;
     }
-    for (int i = value_count - 1; i >= 0; i--) Pop(i);
-    Value* pexception = Push(kWasmExnRef);
-    *pexception = exception;
-    return 1 + imm.length;
+    Control* c = &control_.back();
+    if (!VALIDATE(c->is_try())) {
+      this->DecodeError("unwind does not match any try");
+      return 0;
+    }
+    if (!VALIDATE(!c->is_try_catch() && !c->is_try_catchall() &&
+                  !c->is_try_unwind())) {
+      this->error("catch, catch-all or unwind already present for try");
+      return 0;
+    }
+    FallThruTo(c);
+    c->kind = kControlTryUnwind;
+    stack_end_ = stack_ + c->stack_depth;
+    c->reachability = control_at(1)->innerReachability();
+    CALL_INTERFACE_IF_PARENT_REACHABLE(CatchAll, c);
+    current_code_reachable_ = this->ok() && c->reachable();
+    return 1;
   }
 
   DECODE(BrOnNull) {
@@ -2397,56 +2567,63 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     BranchDepthImmediate<validate> imm(this, this->pc_ + 1);
     if (!this->Validate(this->pc_ + 1, imm, control_.size())) return 0;
     Value ref_object = Pop(0);
-    if (this->failed()) return 0;
     Control* c = control_at(imm.depth);
     TypeCheckBranchResult check_result = TypeCheckBranch(c, true);
-    if (V8_LIKELY(check_result == kReachableBranch)) {
-      switch (ref_object.type.kind()) {
-        case ValueType::kBottom:
-          // We are in unreachable code, just forward the bottom value.
-        case ValueType::kRef: {
-          Value* result = Push(ref_object.type);
-          CALL_INTERFACE(PassThrough, ref_object, result);
-          break;
+    switch (ref_object.type.kind()) {
+      case ValueType::kBottom:
+        // We are in a polymorphic stack. No need to push an additional bottom
+        // value.
+        DCHECK(check_result != kReachableBranch);
+        break;
+      case ValueType::kRef: {
+        // Simply forward the popped argument to the result.
+        Value* result = Push(ref_object.type);
+        if (V8_LIKELY(check_result == kReachableBranch)) {
+          CALL_INTERFACE(Forward, ref_object, result);
         }
-        case ValueType::kOptRef: {
-          // We need to Push the result value after calling BrOnNull on
-          // the interface. Therefore we must sync the ref_object and
-          // result nodes afterwards (in PassThrough).
-          CALL_INTERFACE(BrOnNull, ref_object, imm.depth);
+        break;
+      }
+      case ValueType::kOptRef: {
+        if (V8_LIKELY(check_result == kReachableBranch)) {
+          CALL_INTERFACE_IF_REACHABLE(BrOnNull, ref_object, imm.depth);
           Value* result =
               Push(ValueType::Ref(ref_object.type.heap_type(), kNonNullable));
-          CALL_INTERFACE(PassThrough, ref_object, result);
+          // The result of br_on_null has the same value as the argument (but a
+          // non-nullable type).
+          CALL_INTERFACE(Forward, ref_object, result);
           c->br_merge()->reached = true;
-          break;
+        } else {
+          // Even in non-reachable code, we need to push a value of the correct
+          // type to the stack.
+          Push(ValueType::Ref(ref_object.type.heap_type(), kNonNullable));
         }
-        default:
-          this->DecodeError("invalid argument type to br_on_null");
-          return 0;
+        break;
       }
-    } else if (check_result == kInvalidStack) {
-      return 0;
+      default:
+        PopTypeError(0, ref_object, "object reference");
+        return 0;
     }
     return 1 + imm.length;
   }
 
   DECODE(Let) {
     CHECK_PROTOTYPE_OPCODE(typed_funcref);
-    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1);
+    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1,
+                                     this->module_);
     if (!this->Validate(this->pc_ + 1, imm)) return 0;
-    uint32_t old_local_count = this->num_locals();
     // Temporarily add the let-defined values to the beginning of the function
     // locals.
     uint32_t locals_length;
-    if (!this->DecodeLocals(this->pc() + 1 + imm.length, &locals_length, 0)) {
+    int new_locals_count =
+        this->DecodeLocals(this->pc() + 1 + imm.length, &locals_length, 0);
+    if (new_locals_count < 0) {
       return 0;
     }
-    uint32_t num_added_locals = this->num_locals() - old_local_count;
     ArgVector let_local_values =
         PopArgs(static_cast<uint32_t>(imm.in_arity()),
-                VectorOf(this->local_types_.data(), num_added_locals));
+                VectorOf(this->local_types_.data(), new_locals_count));
     ArgVector args = PopArgs(imm.sig);
-    Control* let_block = PushControl(kControlLet, num_added_locals);
+    Control* let_block = PushControl(kControlLet, new_locals_count);
     SetBlockType(let_block, imm, args.begin());
     CALL_INTERFACE_IF_REACHABLE(Block, let_block);
     PushMergeValues(let_block, &let_block->start_merge);
@@ -2455,7 +2632,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
   }
 
   DECODE(Loop) {
-    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1);
+    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1,
+                                     this->module_);
     if (!this->Validate(this->pc_ + 1, imm)) return 0;
     ArgVector args = PopArgs(imm.sig);
     Control* block = PushControl(kControlLoop);
@@ -2466,7 +2644,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
   }
 
   DECODE(If) {
-    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1);
+    BlockTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1,
+                                     this->module_);
     if (!this->Validate(this->pc_ + 1, imm)) return 0;
     Value cond = Pop(0, kWasmI32);
     ArgVector args = PopArgs(imm.sig);
@@ -2520,6 +2699,21 @@ class WasmFullDecoder : public WasmDecoder<validate> {
       }
       if (!TypeCheckOneArmedIf(c)) return 0;
     }
+    if (c->is_try_catch()) {
+      // Emulate catch-all + re-throw.
+      FallThruTo(c);
+      c->reachability = control_at(1)->innerReachability();
+      CALL_INTERFACE_IF_PARENT_REACHABLE(CatchAll, c);
+      current_code_reachable_ = this->ok() && control_.back().reachable();
+      CALL_INTERFACE_IF_REACHABLE(Rethrow, c);
+      EndControl();
+    }
+    if (c->is_try_unwind()) {
+      // Unwind implicitly rethrows at the end.
+      CALL_INTERFACE_IF_REACHABLE(Rethrow, c);
+      EndControl();
+    }
+
     if (c->is_let()) {
       this->local_types_.erase(this->local_types_.begin(),
                                this->local_types_.begin() + c->locals_count);
@@ -2562,7 +2756,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
 
   DECODE(SelectWithType) {
     CHECK_PROTOTYPE_OPCODE(reftypes);
-    SelectTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1);
+    SelectTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1,
+                                      this->module_);
     if (this->failed()) return 0;
     Value cond = Pop(2, kWasmI32);
     Value fval = Pop(1, imm.type);
@@ -2578,14 +2773,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     Control* c = control_at(imm.depth);
     TypeCheckBranchResult check_result = TypeCheckBranch(c, false);
     if (V8_LIKELY(check_result == kReachableBranch)) {
-      if (imm.depth == control_.size() - 1) {
-        DoReturn();
-      } else {
-        CALL_INTERFACE(Br, c);
-        c->br_merge()->reached = true;
-      }
-    } else if (check_result == kInvalidStack) {
-      return 0;
+      CALL_INTERFACE_IF_REACHABLE(BrOrRet, imm.depth);
+      c->br_merge()->reached = true;
     }
     EndControl();
     return 1 + imm.length;
@@ -2595,14 +2784,11 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     BranchDepthImmediate<validate> imm(this, this->pc_ + 1);
     if (!this->Validate(this->pc_ + 1, imm, control_.size())) return 0;
     Value cond = Pop(0, kWasmI32);
-    if (this->failed()) return 0;
     Control* c = control_at(imm.depth);
     TypeCheckBranchResult check_result = TypeCheckBranch(c, true);
     if (V8_LIKELY(check_result == kReachableBranch)) {
-      CALL_INTERFACE(BrIf, cond, imm.depth);
+      CALL_INTERFACE_IF_REACHABLE(BrIf, cond, imm.depth);
       c->br_merge()->reached = true;
-    } else if (check_result == kInvalidStack) {
-      return 0;
     }
     return 1 + imm.length;
   }
@@ -2713,8 +2899,9 @@ class WasmFullDecoder : public WasmDecoder<validate> {
 
   DECODE(RefNull) {
     CHECK_PROTOTYPE_OPCODE(reftypes);
-    HeapTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1);
-    if (!this->Validate(this->pc_ + 1, imm)) return 0;
+    HeapTypeImmediate<validate> imm(this->enabled_, this, this->pc_ + 1,
+                                    this->module_);
+    if (!VALIDATE(this->ok())) return 0;
     ValueType type = ValueType::Ref(imm.type, kNullable);
     Value* value = Push(type);
     CALL_INTERFACE_IF_REACHABLE(RefNull, type, value);
@@ -2737,10 +2924,7 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         return 1;
       default:
         if (validate) {
-          this->DecodeError(
-              "invalid argument type to ref.is_null. Expected reference type, "
-              "got %s",
-              value.type.name().c_str());
+          PopTypeError(0, value, "reference type");
           return 0;
         }
         UNREACHABLE();
@@ -2767,7 +2951,7 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         // We are in unreachable code. Forward the bottom value.
       case ValueType::kRef: {
         Value* result = Push(value.type);
-        CALL_INTERFACE_IF_REACHABLE(PassThrough, value, result);
+        CALL_INTERFACE_IF_REACHABLE(Forward, value, result);
         return 1;
       }
       case ValueType::kOptRef: {
@@ -2778,10 +2962,7 @@ class WasmFullDecoder : public WasmDecoder<validate> {
       }
       default:
         if (validate) {
-          this->DecodeError(
-              "invalid agrument type to ref.as_non_null: Expected reference "
-              "type, got %s",
-              value.type.name().c_str());
+          PopTypeError(0, value, "reference type");
         }
         return 0;
     }
@@ -2813,8 +2994,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
   }
 
   DECODE(Drop) {
-    Value value = Pop(0);
-    CALL_INTERFACE_IF_REACHABLE(Drop, value);
+    Pop(0);
+    CALL_INTERFACE_IF_REACHABLE(Drop);
     return 1;
   }
 
@@ -2976,10 +3157,7 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     if (!VALIDATE(func_type.is_object_reference_type() &&
                   func_type.has_index() &&
                   this->module_->has_signature(func_type.ref_index()))) {
-      this->DecodeError(
-          "call_ref: Expected function reference on top of stack, found %s of "
-          "type %s instead",
-          SafeOpcodeNameAt(func_ref.pc()), func_type.name().c_str());
+      PopTypeError(0, func_ref, "function reference");
       return 0;
     }
     const FunctionSig* sig = this->module_->signature(func_type.ref_index());
@@ -3002,10 +3180,7 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     if (!VALIDATE(func_type.is_object_reference_type() &&
                   func_type.has_index() &&
                   this->module_->has_signature(func_type.ref_index()))) {
-      this->DecodeError(
-          "return_call_ref: Expected function reference on top of stack, found "
-          "%s of type %s instead",
-          SafeOpcodeNameAt(func_ref.pc()), func_type.name().c_str());
+      PopTypeError(0, func_ref, "function reference");
       return 0;
     }
     const FunctionSig* sig = this->module_->signature(func_type.ref_index());
@@ -3037,6 +3212,9 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         this->pc_, &opcode_length);
     if (!VALIDATE(this->ok())) return 0;
     trace_msg->AppendOpcode(full_opcode);
+    if (!CheckSimdPostMvp(full_opcode)) {
+      return 0;
+    }
     return DecodeSimdOpcode(full_opcode, opcode_length);
   }
 
@@ -3098,7 +3276,9 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     DECODE_IMPL(Throw);
     DECODE_IMPL(Try);
     DECODE_IMPL(Catch);
-    DECODE_IMPL(BrOnExn);
+    DECODE_IMPL(Delegate);
+    DECODE_IMPL(CatchAll);
+    DECODE_IMPL(Unwind);
     DECODE_IMPL(BrOnNull);
     DECODE_IMPL(Let);
     DECODE_IMPL(Loop);
@@ -3316,12 +3496,13 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     return opcode_length + imm.length;
   }
 
-  int DecodeLoadLane(LoadType type, uint32_t opcode_length) {
+  int DecodeLoadLane(WasmOpcode opcode, LoadType type, uint32_t opcode_length) {
     if (!CheckHasMemory()) return 0;
     MemoryAccessImmediate<validate> mem_imm(this, this->pc_ + opcode_length,
                                             type.size_log_2());
     SimdLaneImmediate<validate> lane_imm(
         this, this->pc_ + opcode_length + mem_imm.length);
+    if (!this->Validate(this->pc_ + opcode_length, opcode, lane_imm)) return 0;
     Value v128 = Pop(1, kWasmS128);
     Value index = Pop(0, kWasmI32);
 
@@ -3331,12 +3512,14 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     return opcode_length + mem_imm.length + lane_imm.length;
   }
 
-  int DecodeStoreLane(StoreType type, uint32_t opcode_length) {
+  int DecodeStoreLane(WasmOpcode opcode, StoreType type,
+                      uint32_t opcode_length) {
     if (!CheckHasMemory()) return 0;
     MemoryAccessImmediate<validate> mem_imm(this, this->pc_ + opcode_length,
                                             type.size_log_2());
     SimdLaneImmediate<validate> lane_imm(
         this, this->pc_ + opcode_length + mem_imm.length);
+    if (!this->Validate(this->pc_ + opcode_length, opcode, lane_imm)) return 0;
     Value v128 = Pop(1, kWasmS128);
     Value index = Pop(0, kWasmI32);
 
@@ -3391,17 +3574,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     for (int i = 0; i < br_arity; ++i) {
       if (this->enabled_.has_reftypes()) {
         // The expected type is the biggest common sub type of all targets.
-        ValueType type = (*result_types)[i];
         (*result_types)[i] =
             CommonSubtype((*result_types)[i], (*merge)[i].type, this->module_);
-        if (!VALIDATE((*result_types)[i] != kWasmBottom)) {
-          this->DecodeError(pos,
-                            "inconsistent type in br_table target %u (previous "
-                            "was %s, this one is %s)",
-                            index, type.name().c_str(),
-                            (*merge)[i].type.name().c_str());
-          return false;
-        }
       } else {
         // All target must have the same signature.
         if (!VALIDATE((*result_types)[i] == (*merge)[i].type)) {
@@ -3493,6 +3667,18 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     return opcode_length + 16;
   }
 
+  uint32_t SimdPrefetch(uint32_t opcode_length, bool temporal) {
+    if (!CheckHasMemory()) return 0;
+    // Alignment doesn't matter, set to an arbitrary value.
+    uint32_t max_alignment = 4;
+    MemoryAccessImmediate<validate> imm(this, this->pc_ + opcode_length,
+                                        max_alignment);
+    ValueType index_type = this->module_->is_memory64 ? kWasmI64 : kWasmI32;
+    Value index = Pop(0, index_type);
+    CALL_INTERFACE_IF_REACHABLE(Prefetch, imm, index, temporal);
+    return opcode_length + imm.length;
+  }
+
   uint32_t DecodeSimdOpcode(WasmOpcode opcode, uint32_t opcode_length) {
     // opcode_length is the number of bytes that this SIMD-specific opcode takes
     // up in the LEB128 encoded form.
@@ -3572,35 +3758,38 @@ class WasmFullDecoder : public WasmDecoder<validate> {
                                       LoadTransformationKind::kExtend,
                                       opcode_length);
       case kExprS128Load8Lane: {
-        return DecodeLoadLane(LoadType::kI32Load8S, opcode_length);
+        return DecodeLoadLane(opcode, LoadType::kI32Load8S, opcode_length);
       }
       case kExprS128Load16Lane: {
-        return DecodeLoadLane(LoadType::kI32Load16S, opcode_length);
+        return DecodeLoadLane(opcode, LoadType::kI32Load16S, opcode_length);
       }
       case kExprS128Load32Lane: {
-        return DecodeLoadLane(LoadType::kI32Load, opcode_length);
+        return DecodeLoadLane(opcode, LoadType::kI32Load, opcode_length);
       }
       case kExprS128Load64Lane: {
-        return DecodeLoadLane(LoadType::kI64Load, opcode_length);
+        return DecodeLoadLane(opcode, LoadType::kI64Load, opcode_length);
       }
       case kExprS128Store8Lane: {
-        return DecodeStoreLane(StoreType::kI32Store8, opcode_length);
+        return DecodeStoreLane(opcode, StoreType::kI32Store8, opcode_length);
       }
       case kExprS128Store16Lane: {
-        return DecodeStoreLane(StoreType::kI32Store16, opcode_length);
+        return DecodeStoreLane(opcode, StoreType::kI32Store16, opcode_length);
       }
       case kExprS128Store32Lane: {
-        return DecodeStoreLane(StoreType::kI32Store, opcode_length);
+        return DecodeStoreLane(opcode, StoreType::kI32Store, opcode_length);
       }
       case kExprS128Store64Lane: {
-        return DecodeStoreLane(StoreType::kI64Store, opcode_length);
+        return DecodeStoreLane(opcode, StoreType::kI64Store, opcode_length);
       }
       case kExprS128Const:
         return SimdConstOp(opcode_length);
+      case kExprPrefetchT: {
+        return SimdPrefetch(opcode_length, /*temporal=*/true);
+      }
+      case kExprPrefetchNT: {
+        return SimdPrefetch(opcode_length, /*temporal=*/false);
+      }
       default: {
-        if (!CheckSimdPostMvp(opcode)) {
-          return 0;
-        }
         const FunctionSig* sig = WasmOpcodes::Signature(opcode);
         if (!VALIDATE(sig != nullptr)) {
           this->DecodeError("invalid simd opcode");
@@ -3622,19 +3811,15 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
         Value rtt = Pop(imm.struct_type->field_count());
         if (!VALIDATE(rtt.type.is_rtt() || rtt.type.is_bottom())) {
-          this->DecodeError(
-              "struct.new_with_rtt expected rtt, found %s of type %s",
-              SafeOpcodeNameAt(rtt.pc()), rtt.type.name().c_str());
+          PopTypeError(imm.struct_type->field_count(), rtt, "rtt");
           return 0;
         }
         // TODO(7748): Drop this check if {imm} is dropped from the proposal
         // à la https://github.com/WebAssembly/function-references/pull/31.
         if (!VALIDATE(rtt.type.is_bottom() ||
                       rtt.type.heap_representation() == imm.index)) {
-          this->DecodeError(
-              "struct.new_with_rtt expected rtt for type %d, found rtt for "
-              "type %s",
-              imm.index, rtt.type.heap_type().name().c_str());
+          PopTypeError(imm.struct_type->field_count(), rtt,
+                       "rtt for type " + std::to_string(imm.index));
           return 0;
         }
         ArgVector args = PopArgs(imm.struct_type);
@@ -3651,28 +3836,23 @@ class WasmFullDecoder : public WasmDecoder<validate> {
             ValueType ftype = imm.struct_type->field(i);
             if (!VALIDATE(ftype.is_defaultable())) {
               this->DecodeError(
-                  "struct.new_default_with_rtt: struct type %d has "
-                  "non-defaultable type %s for field %d",
-                  imm.index, ftype.name().c_str(), i);
+                  "struct.new_default_with_rtt: immediate struct type %d has "
+                  "field %d of non-defaultable type %s",
+                  imm.index, i, ftype.name().c_str());
               return 0;
             }
           }
         }
         Value rtt = Pop(0);
         if (!VALIDATE(rtt.type.is_rtt() || rtt.type.is_bottom())) {
-          this->DecodeError(
-              "struct.new_default_with_rtt expected rtt, found %s of type %s",
-              SafeOpcodeNameAt(rtt.pc()), rtt.type.name().c_str());
+          PopTypeError(0, rtt, "rtt");
           return 0;
         }
         // TODO(7748): Drop this check if {imm} is dropped from the proposal
         // à la https://github.com/WebAssembly/function-references/pull/31.
         if (!VALIDATE(rtt.type.is_bottom() ||
                       rtt.type.heap_representation() == imm.index)) {
-          this->DecodeError(
-              "struct.new_default_with_rtt expected rtt for type %d, found rtt "
-              "for type %s",
-              imm.index, rtt.type.heap_type().name().c_str());
+          PopTypeError(0, rtt, "rtt for type " + std::to_string(imm.index));
           return 0;
         }
         Value* value = Push(ValueType::Ref(imm.index, kNonNullable));
@@ -3686,8 +3866,9 @@ class WasmFullDecoder : public WasmDecoder<validate> {
             field.struct_index.struct_type->field(field.index);
         if (!VALIDATE(!field_type.is_packed())) {
           this->DecodeError(
-              "struct.get used with a field of packed type. Use struct.get_s "
-              "or struct.get_u instead.");
+              "struct.get: Immediate field %d of type %d has packed type %s. "
+              "Use struct.get_s or struct.get_u instead.",
+              field.index, field.struct_index.index, field_type.name().c_str());
           return 0;
         }
         Value struct_obj =
@@ -3704,9 +3885,10 @@ class WasmFullDecoder : public WasmDecoder<validate> {
             field.struct_index.struct_type->field(field.index);
         if (!VALIDATE(field_type.is_packed())) {
           this->DecodeError(
-              "%s is only valid for packed struct fields. Use struct.get "
-              "instead.",
-              WasmOpcodes::OpcodeName(opcode));
+              "%s: Immediate field %d of type %d has non-packed type %s. Use "
+              "struct.get instead.",
+              WasmOpcodes::OpcodeName(opcode), field.index,
+              field.struct_index.index, field_type.name().c_str());
           return 0;
         }
         Value struct_obj =
@@ -3721,7 +3903,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         if (!this->Validate(this->pc_ + opcode_length, field)) return 0;
         const StructType* struct_type = field.struct_index.struct_type;
         if (!VALIDATE(struct_type->mutability(field.index))) {
-          this->DecodeError("setting immutable struct field");
+          this->DecodeError("struct.set: Field %d of type %d is immutable.",
+                            field.index, field.struct_index.index);
           return 0;
         }
         Value field_value = Pop(1, struct_type->field(field.index).Unpacked());
@@ -3735,21 +3918,14 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
         Value rtt = Pop(2);
         if (!VALIDATE(rtt.type.is_rtt() || rtt.type.is_bottom())) {
-          this->DecodeError(
-              this->pc_ + opcode_length,
-              "array.new_with_rtt expected rtt, found %s of type %s",
-              SafeOpcodeNameAt(rtt.pc()), rtt.type.name().c_str());
+          PopTypeError(2, rtt, "rtt");
           return 0;
         }
         // TODO(7748): Drop this check if {imm} is dropped from the proposal
         // à la https://github.com/WebAssembly/function-references/pull/31.
         if (!VALIDATE(rtt.type.is_bottom() ||
                       rtt.type.heap_representation() == imm.index)) {
-          this->DecodeError(
-              this->pc_ + opcode_length,
-              "array.new_with_rtt expected rtt for type %d, found "
-              "rtt for type %s",
-              imm.index, rtt.type.heap_type().name().c_str());
+          PopTypeError(2, rtt, "rtt for type " + std::to_string(imm.index));
           return 0;
         }
         Value length = Pop(1, kWasmI32);
@@ -3764,27 +3940,21 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
         if (!VALIDATE(imm.array_type->element_type().is_defaultable())) {
           this->DecodeError(
-              "array.new_default_with_rtt: array type %d has "
+              "array.new_default_with_rtt: immediate array type %d has "
               "non-defaultable element type %s",
               imm.index, imm.array_type->element_type().name().c_str());
           return 0;
         }
         Value rtt = Pop(1);
         if (!VALIDATE(rtt.type.is_rtt() || rtt.type.is_bottom())) {
-          this->DecodeError(
-              this->pc_ + opcode_length,
-              "array.new_default_with_rtt expected rtt, found %s of type %s",
-              SafeOpcodeNameAt(rtt.pc()), rtt.type.name().c_str());
+          PopTypeError(1, rtt, "rtt");
           return 0;
         }
         // TODO(7748): Drop this check if {imm} is dropped from the proposal
         // à la https://github.com/WebAssembly/function-references/pull/31.
         if (!VALIDATE(rtt.type.is_bottom() ||
                       rtt.type.heap_representation() == imm.index)) {
-          this->DecodeError(this->pc_ + opcode_length,
-                            "array.new_default_with_rtt expected rtt for type "
-                            "%d, found rtt for type %s",
-                            imm.index, rtt.type.heap_type().name().c_str());
+          PopTypeError(1, rtt, "rtt for type " + std::to_string(imm.index));
           return 0;
         }
         Value length = Pop(0, kWasmI32);
@@ -3798,8 +3968,10 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
         if (!VALIDATE(imm.array_type->element_type().is_packed())) {
           this->DecodeError(
-              "%s is only valid for packed arrays. Use array.get instead.",
-              WasmOpcodes::OpcodeName(opcode));
+              "%s: Immediate array type %d has non-packed type %s. Use "
+              "array.get instead.",
+              WasmOpcodes::OpcodeName(opcode), imm.index,
+              imm.array_type->element_type().name().c_str());
           return 0;
         }
         Value index = Pop(1, kWasmI32);
@@ -3814,8 +3986,9 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
         if (!VALIDATE(!imm.array_type->element_type().is_packed())) {
           this->DecodeError(
-              "array.get used with a field of packed type. Use array.get_s or "
-              "array.get_u instead.");
+              "array.get: Immediate array type %d has packed type %s. Use "
+              "array.get_s or array.get_u instead.",
+              imm.index, imm.array_type->element_type().name().c_str());
           return 0;
         }
         Value index = Pop(1, kWasmI32);
@@ -3829,7 +4002,8 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         ArrayIndexImmediate<validate> imm(this, this->pc_ + opcode_length);
         if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
         if (!VALIDATE(imm.array_type->mutability())) {
-          this->DecodeError("setting element of immutable array");
+          this->DecodeError("array.set: immediate array type %d is immutable",
+                            imm.index);
           return 0;
         }
         Value value = Pop(2, imm.array_type->element_type().Unpacked());
@@ -3865,10 +4039,11 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         return opcode_length;
       }
       case kExprRttCanon: {
-        HeapTypeImmediate<validate> imm(this->enabled_, this,
-                                        this->pc_ + opcode_length);
-        if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
-        Value* value = Push(ValueType::Rtt(imm.type, 1));
+        HeapTypeImmediate<validate> imm(
+            this->enabled_, this, this->pc_ + opcode_length, this->module_);
+        if (!VALIDATE(this->ok())) return 0;
+        Value* value =
+            Push(ValueType::Rtt(imm.type, imm.type == HeapType::kAny ? 0 : 1));
         CALL_INTERFACE_IF_REACHABLE(RttCanon, imm, value);
         return opcode_length + imm.length;
       }
@@ -3879,54 +4054,59 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         // If these immediates don't get dropped (in the spirit of
         // https://github.com/WebAssembly/function-references/pull/31 ),
         // implement them here.
-        HeapTypeImmediate<validate> imm(this->enabled_, this,
-                                        this->pc_ + opcode_length);
-        if (!this->Validate(this->pc_ + opcode_length, imm)) return 0;
+        HeapTypeImmediate<validate> imm(
+            this->enabled_, this, this->pc_ + opcode_length, this->module_);
+        if (!VALIDATE(this->ok())) return 0;
         Value parent = Pop(0);
         if (parent.type.is_bottom()) {
           Push(kWasmBottom);
         } else {
-          // TODO(7748): Consider exposing "IsSubtypeOfHeap(HeapType t1, t2)" so
-          // we can avoid creating (ref heaptype) wrappers here.
           if (!VALIDATE(parent.type.is_rtt() &&
-                        IsSubtypeOf(ValueType::Ref(imm.type, kNonNullable),
-                                    ValueType::Ref(parent.type.heap_type(),
-                                                   kNonNullable),
-                                    this->module_))) {
-            this->DecodeError("rtt.sub requires a supertype rtt on stack");
+                        IsHeapSubtypeOf(imm.type, parent.type.heap_type(),
+                                        this->module_))) {
+            PopTypeError(0, parent,
+                         "rtt for a supertype of type " + imm.type.name());
             return 0;
           }
           Value* value =
               Push(ValueType::Rtt(imm.type, parent.type.depth() + 1));
-          CALL_INTERFACE_IF_REACHABLE(RttSub, imm, parent, value);
+          // (rtt.sub $t (rtt.canon any)) is reduced to (rtt.canon $t),
+          // unless t == any.
+          // This is important because other canonical rtts are not cached in
+          // (rtt.canon any)'s subtype list.
+          if (parent.type == ValueType::Rtt(HeapType::kAny, 0) &&
+              imm.type != HeapType::kAny) {
+            CALL_INTERFACE_IF_REACHABLE(RttCanon, imm, value);
+          } else {
+            CALL_INTERFACE_IF_REACHABLE(RttSub, imm, parent, value);
+          }
         }
         return opcode_length + imm.length;
       }
       case kExprRefTest: {
         // "Tests whether {obj}'s runtime type is a runtime subtype of {rtt}."
-        HeapTypeImmediate<validate> obj_type(this->enabled_, this,
-                                             this->pc_ + opcode_length);
-        if (!this->Validate(this->pc_ + opcode_length, obj_type)) return 0;
+        HeapTypeImmediate<validate> obj_type(
+            this->enabled_, this, this->pc_ + opcode_length, this->module_);
         int len = opcode_length + obj_type.length;
         HeapTypeImmediate<validate> rtt_type(this->enabled_, this,
-                                             this->pc_ + len);
-        if (!this->Validate(this->pc_ + len, rtt_type)) return 0;
+                                             this->pc_ + len, this->module_);
         len += rtt_type.length;
+        if (!VALIDATE(this->ok())) return 0;
+
         // The static type of {obj} must be a supertype of the {rtt}'s type.
-        if (!VALIDATE(IsSubtypeOf(ValueType::Ref(rtt_type.type, kNonNullable),
-                                  ValueType::Ref(obj_type.type, kNonNullable),
-                                  this->module_))) {
+        if (!VALIDATE(
+                IsHeapSubtypeOf(rtt_type.type, obj_type.type, this->module_))) {
           this->DecodeError(
-              "ref.test: rtt type must be subtype of object type");
+              "ref.test: immediate rtt type %s is not a subtype of immediate "
+              "object type %s",
+              rtt_type.type.name().c_str(), obj_type.type.name().c_str());
           return 0;
         }
         Value rtt = Pop(1);
         if (!VALIDATE(
                 (rtt.type.is_rtt() && rtt.type.heap_type() == rtt_type.type) ||
                 rtt.type == kWasmBottom)) {
-          this->DecodeError("ref.test: expected rtt for type %s but got %s",
-                            rtt_type.type.name().c_str(),
-                            rtt.type.name().c_str());
+          PopTypeError(1, rtt, "rtt for type " + rtt_type.type.name());
           return 0;
         }
         Value obj = Pop(0, ValueType::Ref(obj_type.type, kNullable));
@@ -3935,28 +4115,27 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         return len;
       }
       case kExprRefCast: {
-        HeapTypeImmediate<validate> obj_type(this->enabled_, this,
-                                             this->pc_ + opcode_length);
-        if (!this->Validate(this->pc_ + opcode_length, obj_type)) return 0;
+        HeapTypeImmediate<validate> obj_type(
+            this->enabled_, this, this->pc_ + opcode_length, this->module_);
         int len = opcode_length + obj_type.length;
         HeapTypeImmediate<validate> rtt_type(this->enabled_, this,
-                                             this->pc_ + len);
-        if (!this->Validate(this->pc_ + len, rtt_type)) return 0;
+                                             this->pc_ + len, this->module_);
         len += rtt_type.length;
-        if (!VALIDATE(IsSubtypeOf(ValueType::Ref(rtt_type.type, kNonNullable),
-                                  ValueType::Ref(obj_type.type, kNonNullable),
-                                  this->module_))) {
+        if (!VALIDATE(this->ok())) return 0;
+
+        if (!VALIDATE(
+                IsHeapSubtypeOf(rtt_type.type, obj_type.type, this->module_))) {
           this->DecodeError(
-              "ref.cast: rtt type must be subtype of object type");
+              "ref.test: immediate rtt type %s is not a subtype of immediate "
+              "object type %s",
+              rtt_type.type.name().c_str(), obj_type.type.name().c_str());
           return 0;
         }
         Value rtt = Pop(1);
         if (!VALIDATE(
                 (rtt.type.is_rtt() && rtt.type.heap_type() == rtt_type.type) ||
                 rtt.type == kWasmBottom)) {
-          this->DecodeError("ref.cast: expected rtt for type %s but got %s",
-                            rtt_type.type.name().c_str(),
-                            rtt.type.name().c_str());
+          PopTypeError(1, rtt, "rtt for type " + rtt_type.type.name());
           return 0;
         }
         Value obj = Pop(0, ValueType::Ref(obj_type.type, kNullable));
@@ -3975,23 +4154,20 @@ class WasmFullDecoder : public WasmDecoder<validate> {
         // them here.
         Value rtt = Pop(1);
         if (!VALIDATE(rtt.type.is_rtt() || rtt.type.is_bottom())) {
-          this->DecodeError("br_on_cast[1]: expected rtt on stack");
+          PopTypeError(1, rtt, "rtt");
           return 0;
         }
         Value obj = Pop(0);
         if (!VALIDATE(obj.type.is_object_reference_type() ||
                       rtt.type.is_bottom())) {
-          this->DecodeError("br_on_cast[0]: expected reference on stack");
+          PopTypeError(0, obj, "reference");
           return 0;
         }
         // The static type of {obj} must be a supertype of {rtt}'s type.
-        if (!VALIDATE(
-                rtt.type.is_bottom() || obj.type.is_bottom() ||
-                IsSubtypeOf(ValueType::Ref(rtt.type.heap_type(), kNonNullable),
-                            ValueType::Ref(obj.type.heap_type(), kNonNullable),
-                            this->module_))) {
-          this->DecodeError(
-              "br_on_cast: rtt type must be a subtype of object type");
+        if (!VALIDATE(rtt.type.is_bottom() || obj.type.is_bottom() ||
+                      IsHeapSubtypeOf(rtt.type.heap_type(),
+                                      obj.type.heap_type(), this->module_))) {
+          PopTypeError(1, rtt, obj.type);
           return 0;
         }
         Control* c = control_at(branch_depth.depth);
@@ -4175,9 +4351,6 @@ class WasmFullDecoder : public WasmDecoder<validate> {
 
   void DoReturn() {
     size_t return_count = this->sig_->return_count();
-    if (return_count > 1) {
-      this->detected_->Add(kFeature_mv);
-    }
     DCHECK_GE(stack_size(), return_count);
     Vector<Value> return_values =
         Vector<Value>{stack_end_ - return_count, return_count};
@@ -4246,11 +4419,18 @@ class WasmFullDecoder : public WasmDecoder<validate> {
   // We do not inline these functions because doing so causes a large binary
   // size increase. Not inlining them should not create a performance
   // degradation, because their invocations are guarded by V8_LIKELY.
+  V8_NOINLINE void PopTypeError(int index, Value val, const char* expected) {
+    this->DecodeError(val.pc(), "%s[%d] expected %s, found %s of type %s",
+                      SafeOpcodeNameAt(this->pc_), index, expected,
+                      SafeOpcodeNameAt(val.pc()), val.type.name().c_str());
+  }
+
+  V8_NOINLINE void PopTypeError(int index, Value val, std::string expected) {
+    PopTypeError(index, val, expected.c_str());
+  }
+
   V8_NOINLINE void PopTypeError(int index, Value val, ValueType expected) {
-    this->DecodeError(val.pc(), "%s[%d] expected type %s, found %s of type %s",
-                      SafeOpcodeNameAt(this->pc_), index,
-                      expected.name().c_str(), SafeOpcodeNameAt(val.pc()),
-                      val.type.name().c_str());
+    PopTypeError(index, val, ("type " + expected.name()).c_str());
   }
 
   V8_NOINLINE void NotEnoughArgumentsError(int index) {
@@ -4311,8 +4491,6 @@ class WasmFullDecoder : public WasmDecoder<validate> {
   }
 
   bool TypeCheckMergeValues(Control* c, Merge<Value>* merge) {
-    // This is a CHECK instead of a DCHECK because {validate} is a constexpr,
-    // and a CHECK makes the whole function unreachable.
     static_assert(validate, "Call this function only within VALIDATE");
     DCHECK(merge == &c->start_merge || merge == &c->end_merge);
     DCHECK_GE(stack_size(), c->stack_depth + merge->arity);
@@ -4393,6 +4571,11 @@ class WasmFullDecoder : public WasmDecoder<validate> {
     kInvalidStack,
   };
 
+  // If the type code is reachable, check if the current stack values are
+  // compatible with a jump to {c}, based on their number and types.
+  // Otherwise, we have a polymorphic stack: check if any values that may exist
+  // on top of the stack are compatible with {c}, and push back to the stack
+  // values based on the type of {c}.
   TypeCheckBranchResult TypeCheckBranch(Control* c, bool conditional_branch) {
     if (V8_LIKELY(control_.back().reachable())) {
       // We only do type-checking here. This is only needed during validation.
diff --git a/deps/v8/src/wasm/function-body-decoder.cc b/deps/v8/src/wasm/function-body-decoder.cc
index 77c84bd615264d..aa327821fbf100 100644
--- a/deps/v8/src/wasm/function-body-decoder.cc
+++ b/deps/v8/src/wasm/function-body-decoder.cc
@@ -20,13 +20,14 @@ namespace internal {
 namespace wasm {
 
 bool DecodeLocalDecls(const WasmFeatures& enabled, BodyLocalDecls* decls,
-                      const byte* start, const byte* end) {
+                      const WasmModule* module, const byte* start,
+                      const byte* end) {
   WasmFeatures no_features = WasmFeatures::None();
   Zone* zone = decls->type_list.get_allocator().zone();
   WasmDecoder<Decoder::kFullValidation> decoder(
-      zone, nullptr, enabled, &no_features, nullptr, start, end, 0);
+      zone, module, enabled, &no_features, nullptr, start, end, 0);
   uint32_t length;
-  if (!decoder.DecodeLocals(decoder.pc(), &length, 0)) {
+  if (decoder.DecodeLocals(decoder.pc(), &length, 0) < 0) {
     decls->encoded_size = 0;
     return false;
   }
@@ -42,7 +43,7 @@ BytecodeIterator::BytecodeIterator(const byte* start, const byte* end,
                                    BodyLocalDecls* decls)
     : Decoder(start, end) {
   if (decls != nullptr) {
-    if (DecodeLocalDecls(WasmFeatures::All(), decls, start, end)) {
+    if (DecodeLocalDecls(WasmFeatures::All(), decls, nullptr, start, end)) {
       pc_ += decls->encoded_size;
       if (pc_ > end_) pc_ = end_;
     }
@@ -186,7 +187,8 @@ bool PrintRawWasmCode(AccountingAllocator* allocator, const FunctionBody& body,
       offset = 2;
     }
     if (line_numbers) line_numbers->push_back(i.position());
-    if (opcode == kExprElse || opcode == kExprCatch) {
+    if (opcode == kExprElse || opcode == kExprCatch ||
+        opcode == kExprCatchAll || opcode == kExprUnwind) {
       control_depth--;
     }
 
@@ -236,6 +238,8 @@ bool PrintRawWasmCode(AccountingAllocator* allocator, const FunctionBody& body,
     switch (opcode) {
       case kExprElse:
       case kExprCatch:
+      case kExprCatchAll:
+      case kExprUnwind:
         os << " @" << i.pc_offset();
         control_depth++;
         break;
@@ -244,7 +248,7 @@ bool PrintRawWasmCode(AccountingAllocator* allocator, const FunctionBody& body,
       case kExprBlock:
       case kExprTry: {
         BlockTypeImmediate<Decoder::kNoValidation> imm(WasmFeatures::All(), &i,
-                                                       i.pc() + 1);
+                                                       i.pc() + 1, module);
         os << " @" << i.pc_offset();
         if (decoder.Complete(imm)) {
           for (uint32_t i = 0; i < imm.out_arity(); i++) {
@@ -301,13 +305,13 @@ bool PrintRawWasmCode(AccountingAllocator* allocator, const FunctionBody& body,
   return decoder.ok();
 }
 
-BitVector* AnalyzeLoopAssignmentForTesting(Zone* zone, size_t num_locals,
+BitVector* AnalyzeLoopAssignmentForTesting(Zone* zone, uint32_t num_locals,
                                            const byte* start, const byte* end) {
   WasmFeatures no_features = WasmFeatures::None();
   WasmDecoder<Decoder::kFullValidation> decoder(
       zone, nullptr, no_features, &no_features, nullptr, start, end, 0);
   return WasmDecoder<Decoder::kFullValidation>::AnalyzeLoopAssignment(
-      &decoder, start, static_cast<uint32_t>(num_locals), zone);
+      &decoder, start, num_locals, zone);
 }
 
 }  // namespace wasm
diff --git a/deps/v8/src/wasm/function-body-decoder.h b/deps/v8/src/wasm/function-body-decoder.h
index d3144c9e4606ad..241f4ead2d08c1 100644
--- a/deps/v8/src/wasm/function-body-decoder.h
+++ b/deps/v8/src/wasm/function-body-decoder.h
@@ -67,12 +67,11 @@ struct BodyLocalDecls {
 
 V8_EXPORT_PRIVATE bool DecodeLocalDecls(const WasmFeatures& enabled,
                                         BodyLocalDecls* decls,
+                                        const WasmModule* module,
                                         const byte* start, const byte* end);
 
-V8_EXPORT_PRIVATE BitVector* AnalyzeLoopAssignmentForTesting(Zone* zone,
-                                                             size_t num_locals,
-                                                             const byte* start,
-                                                             const byte* end);
+V8_EXPORT_PRIVATE BitVector* AnalyzeLoopAssignmentForTesting(
+    Zone* zone, uint32_t num_locals, const byte* start, const byte* end);
 
 // Computes the length of the opcode at the given address.
 V8_EXPORT_PRIVATE unsigned OpcodeLength(const byte* pc, const byte* end);
diff --git a/deps/v8/src/wasm/graph-builder-interface.cc b/deps/v8/src/wasm/graph-builder-interface.cc
index ea071df57529ea..1b8edd0c24e65b 100644
--- a/deps/v8/src/wasm/graph-builder-interface.cc
+++ b/deps/v8/src/wasm/graph-builder-interface.cc
@@ -39,9 +39,10 @@ struct SsaEnv : public ZoneObject {
 
   SsaEnv(Zone* zone, State state, TFNode* control, TFNode* effect,
          uint32_t locals_size)
-      : state(state), control(control), effect(effect), locals(zone) {
-    if (locals_size > 0) locals.resize(locals_size);
-  }
+      : state(state),
+        control(control),
+        effect(effect),
+        locals(locals_size, zone) {}
 
   SsaEnv(const SsaEnv& other) V8_NOEXCEPT = default;
   SsaEnv(SsaEnv&& other) V8_NOEXCEPT : state(other.state),
@@ -54,7 +55,9 @@ struct SsaEnv : public ZoneObject {
 
   void Kill(State new_state = kControlEnd) {
     state = new_state;
-    locals.clear();
+    for (TFNode*& local : locals) {
+      local = nullptr;
+    }
     control = nullptr;
     effect = nullptr;
     instance_cache = {};
@@ -121,10 +124,8 @@ class WasmGraphBuildingInterface {
     uint32_t num_locals = decoder->num_locals();
     SsaEnv* ssa_env = decoder->zone()->New<SsaEnv>(
         decoder->zone(), SsaEnv::kReached, start, start, num_locals);
+    SetEnv(ssa_env);
 
-    // Initialize effect and control before initializing the locals default
-    // values (which might require instance loads) or loading the context.
-    builder_->SetEffectControl(start);
     // Initialize the instance parameter (index 0).
     builder_->set_instance_node(builder_->Param(kWasmInstanceParameterIndex));
     // Initialize local variables. Parameters are shifted by 1 because of the
@@ -141,7 +142,6 @@ class WasmGraphBuildingInterface {
         ssa_env->locals[index++] = node;
       }
     }
-    SetEnv(ssa_env);
     LoadContextIntoSsa(ssa_env);
 
     if (FLAG_trace_wasm) BUILD(TraceFunctionEntry, decoder->position());
@@ -280,7 +280,7 @@ class WasmGraphBuildingInterface {
     result->node = BUILD(RefAsNonNull, arg.node, decoder->position());
   }
 
-  void Drop(FullDecoder* decoder, const Value& value) {}
+  void Drop(FullDecoder* decoder) {}
 
   void DoReturn(FullDecoder* decoder, Vector<Value> values) {
     base::SmallVector<TFNode*, 8> nodes(values.size());
@@ -362,16 +362,16 @@ class WasmGraphBuildingInterface {
       if (ret_count > 0) {
         GetNodes(values.begin(), decoder->stack_value(ret_count), ret_count);
       }
+      if (FLAG_trace_wasm) {
+        BUILD(TraceFunctionExit, VectorOf(values), decoder->position());
+      }
       BUILD(Return, VectorOf(values));
     } else {
-      Br(decoder, decoder->control_at(depth));
+      Control* target = decoder->control_at(depth);
+      MergeValuesInto(decoder, target, target->br_merge());
     }
   }
 
-  void Br(FullDecoder* decoder, Control* target) {
-    MergeValuesInto(decoder, target, target->br_merge());
-  }
-
   void BrIf(FullDecoder* decoder, const Value& cond, uint32_t depth) {
     SsaEnv* fenv = ssa_env_;
     SsaEnv* tenv = Split(decoder->zone(), fenv);
@@ -419,6 +419,12 @@ class WasmGraphBuildingInterface {
     SetEnv(if_block->false_env);
   }
 
+  void Prefetch(FullDecoder* decoder,
+                const MemoryAccessImmediate<validate>& imm, const Value& index,
+                bool temporal) {
+    BUILD(Prefetch, index.node, imm.offset, imm.alignment, temporal);
+  }
+
   void LoadMem(FullDecoder* decoder, LoadType type,
                const MemoryAccessImmediate<validate>& imm, const Value& index,
                Value* result) {
@@ -439,8 +445,9 @@ class WasmGraphBuildingInterface {
   void LoadLane(FullDecoder* decoder, LoadType type, const Value& value,
                 const Value& index, const MemoryAccessImmediate<validate>& imm,
                 const uint8_t laneidx, Value* result) {
-    result->node = BUILD(LoadLane, type.mem_type(), value.node, index.node,
-                         imm.offset, laneidx, decoder->position());
+    result->node = BUILD(LoadLane, type.value_type(), type.mem_type(),
+                         value.node, index.node, imm.offset, imm.alignment,
+                         laneidx, decoder->position());
   }
 
   void StoreMem(FullDecoder* decoder, StoreType type,
@@ -565,45 +572,94 @@ class WasmGraphBuildingInterface {
     builder_->TerminateThrow(effect(), control());
   }
 
-  void Rethrow(FullDecoder* decoder, const Value& exception) {
-    BUILD(Rethrow, exception.node);
+  void Rethrow(FullDecoder* decoder, Control* block) {
+    DCHECK(block->is_try_catchall() || block->is_try_catch() ||
+           block->is_try_unwind());
+    TFNode* exception = block->try_info->exception;
+    DCHECK_NOT_NULL(exception);
+    BUILD(Rethrow, exception);
     builder_->TerminateThrow(effect(), control());
   }
 
-  void BrOnException(FullDecoder* decoder, const Value& exception,
-                     const ExceptionIndexImmediate<validate>& imm,
-                     uint32_t depth, Vector<Value> values) {
-    TFNode* if_match = nullptr;
-    TFNode* if_no_match = nullptr;
+  void CatchException(FullDecoder* decoder,
+                      const ExceptionIndexImmediate<validate>& imm,
+                      Control* block, Vector<Value> values) {
+    DCHECK(block->is_try_catch());
+
+    current_catch_ = block->previous_catch;  // Pop try scope.
+
+    // The catch block is unreachable if no possible throws in the try block
+    // exist. We only build a landing pad if some node in the try block can
+    // (possibly) throw. Otherwise the catch environments remain empty.
+    if (!block->try_info->might_throw()) {
+      block->reachability = kSpecOnlyReachable;
+      return;
+    }
+
+    TFNode* exception = block->try_info->exception;
+    SetEnv(block->try_info->catch_env);
+
+    TFNode* if_catch = nullptr;
+    TFNode* if_no_catch = nullptr;
 
     // Get the exception tag and see if it matches the expected one.
-    TFNode* caught_tag =
-        BUILD(GetExceptionTag, exception.node, decoder->position());
+    TFNode* caught_tag = BUILD(GetExceptionTag, exception);
     TFNode* exception_tag = BUILD(LoadExceptionTagFromTable, imm.index);
     TFNode* compare = BUILD(ExceptionTagEqual, caught_tag, exception_tag);
-    BUILD(BranchNoHint, compare, &if_match, &if_no_match);
-    SsaEnv* if_no_match_env = Split(decoder->zone(), ssa_env_);
-    SsaEnv* if_match_env = Steal(decoder->zone(), ssa_env_);
-    if_no_match_env->control = if_no_match;
-    if_match_env->control = if_match;
+    BUILD(BranchNoHint, compare, &if_catch, &if_no_catch);
+
+    // If the tags don't match we continue with the next tag by setting the
+    // false environment as the new {TryInfo::catch_env} here.
+    SsaEnv* if_no_catch_env = Split(decoder->zone(), ssa_env_);
+    if_no_catch_env->control = if_no_catch;
+    SsaEnv* if_catch_env = Steal(decoder->zone(), ssa_env_);
+    if_catch_env->control = if_catch;
+    block->try_info->catch_env = if_no_catch_env;
 
     // If the tags match we extract the values from the exception object and
     // push them onto the operand stack using the passed {values} vector.
-    SetEnv(if_match_env);
+    SetEnv(if_catch_env);
     base::SmallVector<TFNode*, 8> caught_values(values.size());
     Vector<TFNode*> caught_vector = VectorOf(caught_values);
-    BUILD(GetExceptionValues, exception.node, imm.exception, caught_vector);
+    BUILD(GetExceptionValues, exception, imm.exception, caught_vector);
     for (size_t i = 0, e = values.size(); i < e; ++i) {
-      values[i].node = caught_vector[i];
+      values[i].node = caught_values[i];
     }
-    BrOrRet(decoder, depth);
+  }
 
-    // If the tags don't match we fall-through here.
-    SetEnv(if_no_match_env);
+  void Delegate(FullDecoder* decoder, uint32_t depth, Control* block) {
+    DCHECK_EQ(decoder->control_at(0), block);
+    DCHECK(block->is_incomplete_try());
+
+    if (block->try_info->might_throw()) {
+      // Merge the current env into the target handler's env.
+      SetEnv(block->try_info->catch_env);
+      if (depth == decoder->control_depth() - 1) {
+        builder_->Rethrow(block->try_info->exception);
+        builder_->TerminateThrow(effect(), control());
+        current_catch_ = block->previous_catch;
+        return;
+      }
+      DCHECK(decoder->control_at(depth)->is_try());
+      TryInfo* target_try = decoder->control_at(depth)->try_info;
+      Goto(decoder, target_try->catch_env);
+
+      // Create or merge the exception.
+      if (target_try->catch_env->state == SsaEnv::kReached) {
+        target_try->exception = block->try_info->exception;
+      } else {
+        DCHECK_EQ(target_try->catch_env->state, SsaEnv::kMerged);
+        target_try->exception = builder_->CreateOrMergeIntoPhi(
+            MachineRepresentation::kTagged, target_try->catch_env->control,
+            target_try->exception, block->try_info->exception);
+      }
+    }
+    current_catch_ = block->previous_catch;
   }
 
-  void Catch(FullDecoder* decoder, Control* block, Value* exception) {
-    DCHECK(block->is_try_catch());
+  void CatchAll(FullDecoder* decoder, Control* block) {
+    DCHECK(block->is_try_catchall() || block->is_try_catch() ||
+           block->is_try_unwind());
     DCHECK_EQ(decoder->control_at(0), block);
 
     current_catch_ = block->previous_catch;  // Pop try scope.
@@ -617,8 +673,6 @@ class WasmGraphBuildingInterface {
     }
 
     SetEnv(block->try_info->catch_env);
-    DCHECK_NOT_NULL(block->try_info->exception);
-    exception->node = block->try_info->exception;
   }
 
   void AtomicOp(FullDecoder* decoder, WasmOpcode opcode, Vector<Value> args,
@@ -734,16 +788,18 @@ class WasmGraphBuildingInterface {
                        const ArrayIndexImmediate<validate>& imm,
                        const Value& length, const Value& initial_value,
                        const Value& rtt, Value* result) {
-    result->node = BUILD(ArrayNewWithRtt, imm.index, imm.array_type,
-                         length.node, initial_value.node, rtt.node);
+    result->node =
+        BUILD(ArrayNewWithRtt, imm.index, imm.array_type, length.node,
+              initial_value.node, rtt.node, decoder->position());
   }
 
   void ArrayNewDefault(FullDecoder* decoder,
                        const ArrayIndexImmediate<validate>& imm,
                        const Value& length, const Value& rtt, Value* result) {
     TFNode* initial_value = DefaultValue(imm.array_type->element_type());
-    result->node = BUILD(ArrayNewWithRtt, imm.index, imm.array_type,
-                         length.node, initial_value, rtt.node);
+    result->node =
+        BUILD(ArrayNewWithRtt, imm.index, imm.array_type, length.node,
+              initial_value, rtt.node, decoder->position());
   }
 
   void ArrayGet(FullDecoder* decoder, const Value& array_obj,
@@ -767,7 +823,11 @@ class WasmGraphBuildingInterface {
   }
 
   void ArrayLen(FullDecoder* decoder, const Value& array_obj, Value* result) {
-    result->node = BUILD(ArrayLen, array_obj.node, decoder->position());
+    CheckForNull null_check = array_obj.type.is_nullable()
+                                  ? CheckForNull::kWithNullCheck
+                                  : CheckForNull::kWithoutNullCheck;
+    result->node =
+        BUILD(ArrayLen, array_obj.node, null_check, decoder->position());
   }
 
   void I31New(FullDecoder* decoder, const Value& input, Value* result) {
@@ -792,70 +852,53 @@ class WasmGraphBuildingInterface {
     result->node = BUILD(RttSub, imm.type, parent.node);
   }
 
+  using StaticKnowledge = compiler::WasmGraphBuilder::ObjectReferenceKnowledge;
+
+  StaticKnowledge ComputeStaticKnowledge(ValueType object_type,
+                                         ValueType rtt_type,
+                                         const WasmModule* module) {
+    StaticKnowledge result;
+    result.object_can_be_null = object_type.is_nullable();
+    DCHECK(object_type.is_object_reference_type());  // Checked by validation.
+    result.object_must_be_data_ref = is_data_ref_type(object_type, module);
+    result.object_can_be_i31 = IsSubtypeOf(kWasmI31Ref, object_type, module);
+    result.rtt_is_i31 = rtt_type.heap_representation() == HeapType::kI31;
+    result.rtt_depth = rtt_type.depth();
+    return result;
+  }
+
   void RefTest(FullDecoder* decoder, const Value& object, const Value& rtt,
                Value* result) {
-    using CheckForI31 = compiler::WasmGraphBuilder::CheckForI31;
-    using RttIsI31 = compiler::WasmGraphBuilder::RttIsI31;
-    CheckForNull null_check = object.type.is_nullable()
-                                  ? CheckForNull::kWithNullCheck
-                                  : CheckForNull::kWithoutNullCheck;
-    CheckForI31 i31_check =
-        IsSubtypeOf(kWasmI31Ref, object.type, decoder->module_)
-            ? CheckForI31::kWithI31Check
-            : CheckForI31::kNoI31Check;
-    RttIsI31 rtt_is_i31 = rtt.type.heap_representation() == HeapType::kI31
-                              ? RttIsI31::kRttIsI31
-                              : RttIsI31::kRttIsNotI31;
-    result->node = BUILD(RefTest, object.node, rtt.node, null_check, i31_check,
-                         rtt_is_i31);
+    StaticKnowledge config =
+        ComputeStaticKnowledge(object.type, rtt.type, decoder->module_);
+    result->node = BUILD(RefTest, object.node, rtt.node, config);
   }
 
   void RefCast(FullDecoder* decoder, const Value& object, const Value& rtt,
                Value* result) {
-    using CheckForI31 = compiler::WasmGraphBuilder::CheckForI31;
-    using RttIsI31 = compiler::WasmGraphBuilder::RttIsI31;
-    CheckForNull null_check = object.type.is_nullable()
-                                  ? CheckForNull::kWithNullCheck
-                                  : CheckForNull::kWithoutNullCheck;
-    CheckForI31 i31_check =
-        IsSubtypeOf(kWasmI31Ref, object.type, decoder->module_)
-            ? CheckForI31::kWithI31Check
-            : CheckForI31::kNoI31Check;
-    RttIsI31 rtt_is_i31 = rtt.type.heap_representation() == HeapType::kI31
-                              ? RttIsI31::kRttIsI31
-                              : RttIsI31::kRttIsNotI31;
-    result->node = BUILD(RefCast, object.node, rtt.node, null_check, i31_check,
-                         rtt_is_i31, decoder->position());
+    StaticKnowledge config =
+        ComputeStaticKnowledge(object.type, rtt.type, decoder->module_);
+    result->node =
+        BUILD(RefCast, object.node, rtt.node, config, decoder->position());
   }
 
   void BrOnCast(FullDecoder* decoder, const Value& object, const Value& rtt,
-                Value* value_on_branch, uint32_t depth) {
-    using CheckForI31 = compiler::WasmGraphBuilder::CheckForI31;
-    using RttIsI31 = compiler::WasmGraphBuilder::RttIsI31;
-    CheckForNull null_check = object.type.is_nullable()
-                                  ? CheckForNull::kWithNullCheck
-                                  : CheckForNull::kWithoutNullCheck;
-    CheckForI31 i31_check =
-        IsSubtypeOf(kWasmI31Ref, object.type, decoder->module_)
-            ? CheckForI31::kWithI31Check
-            : CheckForI31::kNoI31Check;
-    RttIsI31 rtt_is_i31 = rtt.type.heap_representation() == HeapType::kI31
-                              ? RttIsI31::kRttIsI31
-                              : RttIsI31::kRttIsNotI31;
+                Value* value_on_branch, uint32_t br_depth) {
+    StaticKnowledge config =
+        ComputeStaticKnowledge(object.type, rtt.type, decoder->module_);
     SsaEnv* match_env = Split(decoder->zone(), ssa_env_);
     SsaEnv* no_match_env = Steal(decoder->zone(), ssa_env_);
     no_match_env->SetNotMerged();
-    BUILD(BrOnCast, object.node, rtt.node, null_check, i31_check, rtt_is_i31,
-          &match_env->control, &match_env->effect, &no_match_env->control,
-          &no_match_env->effect);
+    BUILD(BrOnCast, object.node, rtt.node, config, &match_env->control,
+          &match_env->effect, &no_match_env->control, &no_match_env->effect);
     builder_->SetControl(no_match_env->control);
     SetEnv(match_env);
     value_on_branch->node = object.node;
-    BrOrRet(decoder, depth);
+    BrOrRet(decoder, br_depth);
     SetEnv(no_match_env);
   }
 
-  void PassThrough(FullDecoder* decoder, const Value& from, Value* to) {
+  void Forward(FullDecoder* decoder, const Value& from, Value* to) {
     to->node = from.node;
   }
 
@@ -869,6 +912,7 @@ class WasmGraphBuildingInterface {
   TFNode* control() { return builder_->control(); }
 
   TryInfo* current_try_info(FullDecoder* decoder) {
+    DCHECK_LT(current_catch_, decoder->control_depth());
     return decoder->control_at(decoder->control_depth() - 1 - current_catch_)
         ->try_info;
   }
@@ -1018,7 +1062,14 @@ class WasmGraphBuildingInterface {
     switch (to->state) {
       case SsaEnv::kUnreachable: {  // Overwrite destination.
         to->state = SsaEnv::kReached;
+        // There might be an offset in the locals due to a 'let'.
+        DCHECK_EQ(ssa_env_->locals.size(), decoder->num_locals());
+        DCHECK_GE(ssa_env_->locals.size(), to->locals.size());
+        uint32_t local_count_diff =
+            static_cast<uint32_t>(ssa_env_->locals.size() - to->locals.size());
         to->locals = ssa_env_->locals;
+        to->locals.erase(to->locals.begin(),
+                         to->locals.begin() + local_count_diff);
         to->control = control();
         to->effect = effect();
         to->instance_cache = ssa_env_->instance_cache;
@@ -1036,13 +1087,19 @@ class WasmGraphBuildingInterface {
           TFNode* inputs[] = {to->effect, old_effect, merge};
           to->effect = builder_->EffectPhi(2, inputs);
         }
-        // Merge SSA values.
-        for (int i = decoder->num_locals() - 1; i >= 0; i--) {
+        // Merge locals.
+        // There might be an offset in the locals due to a 'let'.
+        DCHECK_EQ(ssa_env_->locals.size(), decoder->num_locals());
+        DCHECK_GE(ssa_env_->locals.size(), to->locals.size());
+        uint32_t local_count_diff =
+            static_cast<uint32_t>(ssa_env_->locals.size() - to->locals.size());
+        for (uint32_t i = 0; i < to->locals.size(); i++) {
           TFNode* a = to->locals[i];
-          TFNode* b = ssa_env_->locals[i];
+          TFNode* b = ssa_env_->locals[i + local_count_diff];
           if (a != b) {
             TFNode* inputs[] = {a, b, merge};
-            to->locals[i] = builder_->Phi(decoder->local_type(i), 2, inputs);
+            to->locals[i] = builder_->Phi(
+                decoder->local_type(i + local_count_diff), 2, inputs);
           }
         }
         // Start a new merge from the instance cache.
@@ -1058,10 +1115,16 @@ class WasmGraphBuildingInterface {
         to->effect =
             builder_->CreateOrMergeIntoEffectPhi(merge, to->effect, effect());
         // Merge locals.
-        for (int i = decoder->num_locals() - 1; i >= 0; i--) {
+        // There might be an offset in the locals due to a 'let'.
+        DCHECK_EQ(ssa_env_->locals.size(), decoder->num_locals());
+        DCHECK_GE(ssa_env_->locals.size(), to->locals.size());
+        uint32_t local_count_diff =
+            static_cast<uint32_t>(ssa_env_->locals.size() - to->locals.size());
+        for (uint32_t i = 0; i < to->locals.size(); i++) {
           to->locals[i] = builder_->CreateOrMergeIntoPhi(
-              decoder->local_type(i).machine_representation(), merge,
-              to->locals[i], ssa_env_->locals[i]);
+              decoder->local_type(i + local_count_diff)
+                  .machine_representation(),
+              merge, to->locals[i], ssa_env_->locals[i + local_count_diff]);
         }
         // Merge the instance caches.
         builder_->MergeInstanceCacheInto(&to->instance_cache,
@@ -1081,9 +1144,10 @@ class WasmGraphBuildingInterface {
     TFNode* effect_inputs[] = {effect(), control()};
     builder_->SetEffect(builder_->EffectPhi(1, effect_inputs));
     builder_->TerminateLoop(effect(), control());
-    // The '+ 1' here is to be able to set the instance cache as assigned.
+    // Doing a preprocessing pass to analyze loop assignments seems to pay off
+    // compared to reallocating Nodes when rearranging Phis in Goto.
     BitVector* assigned = WasmDecoder<validate>::AnalyzeLoopAssignment(
-        decoder, decoder->pc(), decoder->num_locals() + 1, decoder->zone());
+        decoder, decoder->pc(), decoder->num_locals(), decoder->zone());
     if (decoder->failed()) return;
     DCHECK_NOT_NULL(assigned);
 
@@ -1125,6 +1189,8 @@ class WasmGraphBuildingInterface {
       ssa_env_->effect = effect();
     }
     SsaEnv* result = zone->New<SsaEnv>(std::move(*from));
+    // Restore the length of {from->locals} after applying move-constructor.
+    from->locals.resize(result->locals.size());
     result->state = SsaEnv::kReached;
     return result;
   }
diff --git a/deps/v8/src/wasm/jump-table-assembler.cc b/deps/v8/src/wasm/jump-table-assembler.cc
index 90cdad4672bdd9..65752df59f1def 100644
--- a/deps/v8/src/wasm/jump-table-assembler.cc
+++ b/deps/v8/src/wasm/jump-table-assembler.cc
@@ -206,12 +206,12 @@ void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index,
   // Load function index to r7. 6 bytes
   lgfi(kWasmCompileLazyFuncIndexRegister, Operand(func_index));
   // Jump to {lazy_compile_target}. 6 bytes or 12 bytes
-  mov(r1, Operand(lazy_compile_target));
+  mov(r1, Operand(lazy_compile_target, RelocInfo::CODE_TARGET));
   b(r1);  // 2 bytes
 }
 
 bool JumpTableAssembler::EmitJumpSlot(Address target) {
-  mov(r1, Operand(target));
+  mov(r1, Operand(target, RelocInfo::CODE_TARGET));
   b(r1);
   return true;
 }
diff --git a/deps/v8/src/wasm/local-decl-encoder.cc b/deps/v8/src/wasm/local-decl-encoder.cc
index 5a2681c483124f..8130cbb6a4b931 100644
--- a/deps/v8/src/wasm/local-decl-encoder.cc
+++ b/deps/v8/src/wasm/local-decl-encoder.cc
@@ -4,6 +4,7 @@
 
 #include "src/wasm/local-decl-encoder.h"
 
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/signature.h"
 #include "src/wasm/leb-helper.h"
 
@@ -20,7 +21,7 @@ void LocalDeclEncoder::Prepend(Zone* zone, const byte** start,
   byte* buffer = zone->NewArray<byte, LocalDeclEncoderBuffer>(Size() + size);
   size_t pos = Emit(buffer);
   if (size > 0) {
-    memcpy(buffer + pos, *start, size);
+    base::Memcpy(buffer + pos, *start, size);
   }
   pos += size;
   *start = buffer;
diff --git a/deps/v8/src/wasm/module-compiler.cc b/deps/v8/src/wasm/module-compiler.cc
index 82f86786a7fcca..ca34fa9c66a3fb 100644
--- a/deps/v8/src/wasm/module-compiler.cc
+++ b/deps/v8/src/wasm/module-compiler.cc
@@ -81,7 +81,7 @@ enum class CompileStrategy : uint8_t {
 
 class CompilationStateImpl;
 
-class BackgroundCompileScope {
+class V8_NODISCARD BackgroundCompileScope {
  public:
   explicit BackgroundCompileScope(std::weak_ptr<NativeModule> native_module)
       : native_module_(native_module.lock()) {}
@@ -530,6 +530,14 @@ class CompilationStateImpl {
  public:
   CompilationStateImpl(const std::shared_ptr<NativeModule>& native_module,
                        std::shared_ptr<Counters> async_counters);
+  ~CompilationStateImpl() {
+    DCHECK(compile_job_->IsValid());
+    compile_job_->CancelAndDetach();
+  }
+
+  // Call right after the constructor, after the {compilation_state_} field in
+  // the {NativeModule} has been initialized.
+  void InitCompileJob(WasmEngine*);
 
   // Cancel all background compilation, without waiting for compile tasks to
   // finish.
@@ -585,9 +593,6 @@ class CompilationStateImpl {
   void PublishDetectedFeatures(Isolate*);
   void SchedulePublishCompilationResults(
       std::vector<std::unique_ptr<WasmCode>> unpublished_code);
-  // Ensure that a compilation job is running, and increase its concurrency if
-  // needed.
-  void ScheduleCompileJobForNewUnits();
 
   size_t NumOutstandingCompilations() const;
 
@@ -595,7 +600,10 @@ class CompilationStateImpl {
 
   void WaitForCompilationEvent(CompilationEvent event);
 
-  void SetHighPriority() { has_priority_ = true; }
+  void SetHighPriority() {
+    // TODO(wasm): Keep a lower priority for TurboFan-only jobs.
+    compile_job_->UpdatePriority(TaskPriority::kUserBlocking);
+  }
 
   bool failed() const {
     return compile_failed_.load(std::memory_order_relaxed);
@@ -658,24 +666,25 @@ class CompilationStateImpl {
 
   CompilationUnitQueues compilation_unit_queues_;
 
-  // Index of the next wrapper to compile in {js_to_wasm_wrapper_units_}.
-  std::atomic<int> js_to_wasm_wrapper_id_{0};
+  // Number of wrappers to be compiled. Initialized once, counted down in
+  // {GetNextJSToWasmWrapperCompilationUnit}.
+  std::atomic<size_t> outstanding_js_to_wasm_wrappers_{0};
   // Wrapper compilation units are stored in shared_ptrs so that they are kept
   // alive by the tasks even if the NativeModule dies.
   std::vector<std::shared_ptr<JSToWasmWrapperCompilationUnit>>
       js_to_wasm_wrapper_units_;
 
-  bool has_priority_ = false;
-
   // This mutex protects all information of this {CompilationStateImpl} which is
   // being accessed concurrently.
   mutable base::Mutex mutex_;
 
+  // The compile job handle, initialized right after construction of
+  // {CompilationStateImpl}.
+  std::unique_ptr<JobHandle> compile_job_;
+
   //////////////////////////////////////////////////////////////////////////////
   // Protected by {mutex_}:
 
-  std::shared_ptr<JobHandle> current_compile_job_;
-
   // Features detected to be used in this module. Features can be detected
   // as a module is being compiled.
   WasmFeatures detected_features_ = WasmFeatures::None();
@@ -766,6 +775,10 @@ constexpr uint32_t CompilationEnv::kMaxMemoryPagesAtRuntime;
 
 CompilationState::~CompilationState() { Impl(this)->~CompilationStateImpl(); }
 
+void CompilationState::InitCompileJob(WasmEngine* engine) {
+  Impl(this)->InitCompileJob(engine);
+}
+
 void CompilationState::CancelCompilation() { Impl(this)->CancelCompilation(); }
 
 void CompilationState::SetError() { Impl(this)->SetError(); }
@@ -1077,8 +1090,9 @@ bool IsLazyModule(const WasmModule* module) {
 
 }  // namespace
 
-bool CompileLazy(Isolate* isolate, NativeModule* native_module,
+bool CompileLazy(Isolate* isolate, Handle<WasmModuleObject> module_object,
                  int func_index) {
+  NativeModule* native_module = module_object->native_module();
   const WasmModule* module = native_module->module();
   auto enabled_features = native_module->enabled_features();
   Counters* counters = isolate->counters();
@@ -1125,7 +1139,15 @@ bool CompileLazy(Isolate* isolate, NativeModule* native_module,
       native_module->AddCompiledCode(std::move(result)));
   DCHECK_EQ(func_index, code->index());
 
-  if (WasmCode::ShouldBeLogged(isolate)) code->LogCode(isolate);
+  if (WasmCode::ShouldBeLogged(isolate)) {
+    DisallowGarbageCollection no_gc;
+    Object source_url_obj = module_object->script().source_url();
+    DCHECK(source_url_obj.IsString() || source_url_obj.IsUndefined());
+    std::unique_ptr<char[]> source_url =
+        source_url_obj.IsString() ? String::cast(source_url_obj).ToCString()
+                                  : nullptr;
+    code->LogCode(isolate, source_url.get(), module_object->script().id());
+  }
 
   counters->wasm_lazily_compiled_functions()->Increment();
 
@@ -1172,7 +1194,7 @@ CompilationExecutionResult ExecuteJSToWasmWrapperCompilationUnits(
 
   {
     BackgroundCompileScope compile_scope(native_module);
-    if (compile_scope.cancelled()) return kNoMoreUnits;
+    if (compile_scope.cancelled()) return kYield;
     wrapper_unit = compile_scope.compilation_state()
                        ->GetNextJSToWasmWrapperCompilationUnit();
     if (!wrapper_unit) return kNoMoreUnits;
@@ -1184,7 +1206,7 @@ CompilationExecutionResult ExecuteJSToWasmWrapperCompilationUnits(
     ++num_processed_wrappers;
     bool yield = delegate && delegate->ShouldYield();
     BackgroundCompileScope compile_scope(native_module);
-    if (compile_scope.cancelled()) return kNoMoreUnits;
+    if (compile_scope.cancelled()) return kYield;
     if (yield ||
         !(wrapper_unit = compile_scope.compilation_state()
                              ->GetNextJSToWasmWrapperCompilationUnit())) {
@@ -1215,8 +1237,9 @@ const char* GetCompilationEventName(const WasmCompilationUnit& unit,
 
 // Run by the {BackgroundCompileJob} (on any thread).
 CompilationExecutionResult ExecuteCompilationUnits(
-    std::weak_ptr<NativeModule> native_module, Counters* counters,
-    JobDelegate* delegate, CompileBaselineOnly baseline_only) {
+    std::weak_ptr<NativeModule> native_module, WasmEngine* wasm_engine,
+    Counters* counters, JobDelegate* delegate,
+    CompileBaselineOnly baseline_only) {
   TRACE_EVENT0("v8.wasm", "wasm.ExecuteCompilationUnits");
 
   // Execute JS to Wasm wrapper units first, so that they are ready to be
@@ -1232,7 +1255,6 @@ CompilationExecutionResult ExecuteCompilationUnits(
   base::Optional<CompilationEnv> env;
   std::shared_ptr<WireBytesStorage> wire_bytes;
   std::shared_ptr<const WasmModule> module;
-  WasmEngine* wasm_engine;
   // Task 0 is any main thread (there might be multiple from multiple isolates),
   // worker threads start at 1 (thus the "+ 1").
   int task_id = delegate ? (int{delegate->GetTaskId()} + 1) : 0;
@@ -1246,14 +1268,13 @@ CompilationExecutionResult ExecuteCompilationUnits(
   // compilation unit.
   {
     BackgroundCompileScope compile_scope(native_module);
-    if (compile_scope.cancelled()) return kNoMoreUnits;
-    auto* compilation_state = compile_scope.compilation_state();
+    if (compile_scope.cancelled()) return kYield;
     env.emplace(compile_scope.native_module()->CreateCompilationEnv());
-    wire_bytes = compilation_state->GetWireBytesStorage();
+    wire_bytes = compile_scope.compilation_state()->GetWireBytesStorage();
     module = compile_scope.native_module()->shared_module();
-    wasm_engine = compile_scope.native_module()->engine();
-    queue = compilation_state->GetQueueForCompileTask(task_id);
-    unit = compilation_state->GetNextCompilationUnit(queue, baseline_only);
+    queue = compile_scope.compilation_state()->GetQueueForCompileTask(task_id);
+    unit = compile_scope.compilation_state()->GetNextCompilationUnit(
+        queue, baseline_only);
     if (!unit) return kNoMoreUnits;
   }
   TRACE_COMPILE("ExecuteCompilationUnits (task id %d)\n", task_id);
@@ -1273,7 +1294,7 @@ CompilationExecutionResult ExecuteCompilationUnits(
 
       // (synchronized): Publish the compilation result and get the next unit.
       BackgroundCompileScope compile_scope(native_module);
-      if (compile_scope.cancelled()) return kNoMoreUnits;
+      if (compile_scope.cancelled()) return kYield;
 
       if (!results_to_publish.back().succeeded()) {
         compile_scope.compilation_state()->SetError();
@@ -1460,7 +1481,6 @@ class CompilationTimeCallback {
           true,                                    // success
           native_module->liftoff_code_size(),      // code_size_in_bytes
           native_module->liftoff_bailout_count(),  // liftoff_bailout_count
-          duration.InMicroseconds(),               // wall_clock_time_in_us
           duration.InMicroseconds()                // wall_clock_duration_in_us
       };
       metrics_recorder_->DelayMainThreadEvent(event, context_id_);
@@ -1472,7 +1492,6 @@ class CompilationTimeCallback {
       v8::metrics::WasmModuleTieredUp event{
           FLAG_wasm_lazy_compilation,           // lazy
           native_module->turbofan_code_size(),  // code_size_in_bytes
-          duration.InMicroseconds(),            // wall_clock_time_in_us
           duration.InMicroseconds()             // wall_clock_duration_in_us
       };
       metrics_recorder_->DelayMainThreadEvent(event, context_id_);
@@ -1487,7 +1506,6 @@ class CompilationTimeCallback {
           false,                                   // success
           native_module->liftoff_code_size(),      // code_size_in_bytes
           native_module->liftoff_bailout_count(),  // liftoff_bailout_count
-          duration.InMicroseconds(),               // wall_clock_time_in_us
           duration.InMicroseconds()                // wall_clock_duration_in_us
       };
       metrics_recorder_->DelayMainThreadEvent(event, context_id_);
@@ -1574,29 +1592,35 @@ void CompileNativeModule(Isolate* isolate,
 class BackgroundCompileJob final : public JobTask {
  public:
   explicit BackgroundCompileJob(std::weak_ptr<NativeModule> native_module,
+                                WasmEngine* engine,
                                 std::shared_ptr<Counters> async_counters)
       : native_module_(std::move(native_module)),
+        engine_(engine),
+        engine_barrier_(engine_->GetBarrierForBackgroundCompile()),
         async_counters_(std::move(async_counters)) {}
 
   void Run(JobDelegate* delegate) override {
-    ExecuteCompilationUnits(native_module_, async_counters_.get(), delegate,
-                            kBaselineOrTopTier);
+    auto engine_scope = engine_barrier_->TryLock();
+    if (!engine_scope) return;
+    ExecuteCompilationUnits(native_module_, engine_, async_counters_.get(),
+                            delegate, kBaselineOrTopTier);
   }
 
   size_t GetMaxConcurrency(size_t worker_count) const override {
-    BackgroundCompileScope scope(native_module_);
-    if (scope.cancelled()) return 0;
+    BackgroundCompileScope compile_scope(native_module_);
+    if (compile_scope.cancelled()) return 0;
     // NumOutstandingCompilations() does not reflect the units that running
     // workers are processing, thus add the current worker count to that number.
-    size_t flag_limit =
-        static_cast<size_t>(std::max(1, FLAG_wasm_num_compilation_tasks));
     return std::min(
-        flag_limit,
-        worker_count + scope.compilation_state()->NumOutstandingCompilations());
+        static_cast<size_t>(FLAG_wasm_num_compilation_tasks),
+        worker_count +
+            compile_scope.compilation_state()->NumOutstandingCompilations());
   }
 
  private:
-  const std::weak_ptr<NativeModule> native_module_;
+  std::weak_ptr<NativeModule> native_module_;
+  WasmEngine* engine_;
+  std::shared_ptr<OperationsBarrier> engine_barrier_;
   const std::shared_ptr<Counters> async_counters_;
 };
 
@@ -1735,8 +1759,10 @@ class AsyncStreamingProcessor final : public StreamingProcessor {
   bool ProcessSection(SectionCode section_code, Vector<const uint8_t> bytes,
                       uint32_t offset) override;
 
-  bool ProcessCodeSectionHeader(int num_functions, uint32_t offset,
+  bool ProcessCodeSectionHeader(int num_functions,
+                                uint32_t functions_mismatch_error_offset,
                                 std::shared_ptr<WireBytesStorage>,
+                                int code_section_start,
                                 int code_section_length) override;
 
   bool ProcessFunctionBody(Vector<const uint8_t> bytes,
@@ -1877,7 +1903,6 @@ void AsyncCompileJob::FinishCompile(bool is_after_cache_hit) {
           !compilation_state->failed(),             // success
           native_module_->liftoff_code_size(),      // code_size_in_bytes
           native_module_->liftoff_bailout_count(),  // liftoff_bailout_count
-          duration.InMicroseconds(),                // wall_clock_time_in_us
           duration.InMicroseconds()                 // wall_clock_duration_in_us
       };
       isolate_->metrics_recorder()->DelayMainThreadEvent(event, context_id_);
@@ -1919,6 +1944,10 @@ void AsyncCompileJob::FinishCompile(bool is_after_cache_hit) {
   // We can only update the feature counts once the entire compile is done.
   compilation_state->PublishDetectedFeatures(isolate_);
 
+  // Finally, log all generated code (it does not matter if this happens
+  // repeatedly in case the script is shared).
+  native_module_->LogWasmCodes(isolate_, module_object_->script());
+
   FinishModule();
 }
 
@@ -2154,7 +2183,7 @@ class AsyncCompileJob::DecodeModule : public AsyncCompileJob::CompileStep {
     ModuleResult result;
     {
       DisallowHandleAllocation no_handle;
-      DisallowHeapAllocation no_allocation;
+      DisallowGarbageCollection no_gc;
       // Decode the module bytes.
       TRACE_COMPILE("(1) Decoding module...\n");
       TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.wasm.detailed"),
@@ -2288,6 +2317,13 @@ class AsyncCompileJob::PrepareAndStartCompile : public CompileStep {
 
       // Add compilation units and kick off compilation.
       InitializeCompilationUnits(job->isolate(), job->native_module_.get());
+      // We are in single-threaded mode, so there are no worker tasks that will
+      // do the compilation. We call {WaitForCompilationEvent} here so that the
+      // main thread paticipates and finishes the compilation.
+      if (FLAG_wasm_num_compilation_tasks == 0) {
+        compilation_state->WaitForCompilationEvent(
+            CompilationEvent::kFinishedBaselineCompilation);
+      }
     }
   }
 };
@@ -2392,7 +2428,6 @@ void AsyncStreamingProcessor::FinishAsyncCompileJobWithError(
   job_->metrics_event_.streamed = true;
   job_->metrics_event_.module_size_in_bytes = job_->wire_bytes_.length();
   job_->metrics_event_.function_count = num_functions_;
-  job_->metrics_event_.wall_clock_time_in_us = duration.InMicroseconds();
   job_->metrics_event_.wall_clock_duration_in_us = duration.InMicroseconds();
   job_->isolate_->metrics_recorder()->DelayMainThreadEvent(job_->metrics_event_,
                                                            job_->context_id_);
@@ -2472,20 +2507,22 @@ bool AsyncStreamingProcessor::ProcessSection(SectionCode section_code,
 
 // Start the code section.
 bool AsyncStreamingProcessor::ProcessCodeSectionHeader(
-    int num_functions, uint32_t offset,
+    int num_functions, uint32_t functions_mismatch_error_offset,
     std::shared_ptr<WireBytesStorage> wire_bytes_storage,
-    int code_section_length) {
+    int code_section_start, int code_section_length) {
   DCHECK_LE(0, code_section_length);
   before_code_section_ = false;
   TRACE_STREAMING("Start the code section with %d functions...\n",
                   num_functions);
+  decoder_.StartCodeSection();
   if (!decoder_.CheckFunctionsCount(static_cast<uint32_t>(num_functions),
-                                    offset)) {
+                                    functions_mismatch_error_offset)) {
     FinishAsyncCompileJobWithError(decoder_.FinishDecoding(false).error());
     return false;
   }
 
-  decoder_.set_code_section(offset, static_cast<uint32_t>(code_section_length));
+  decoder_.set_code_section(code_section_start,
+                            static_cast<uint32_t>(code_section_length));
 
   prefix_hash_ = base::hash_combine(prefix_hash_,
                                     static_cast<uint32_t>(code_section_length));
@@ -2615,7 +2652,6 @@ void AsyncStreamingProcessor::OnFinishedStream(OwnedVector<uint8_t> bytes) {
   job_->metrics_event_.streamed = true;
   job_->metrics_event_.module_size_in_bytes = job_->wire_bytes_.length();
   job_->metrics_event_.function_count = num_functions_;
-  job_->metrics_event_.wall_clock_time_in_us = duration.InMicroseconds();
   job_->metrics_event_.wall_clock_duration_in_us = duration.InMicroseconds();
   job_->isolate_->metrics_recorder()->DelayMainThreadEvent(job_->metrics_event_,
                                                            job_->context_id_);
@@ -2654,7 +2690,6 @@ void AsyncStreamingProcessor::OnFinishedStream(OwnedVector<uint8_t> bytes) {
   } else {
     job_->native_module_->SetWireBytes(
         {std::move(job_->bytes_copy_), job_->wire_bytes_.length()});
-    job_->native_module_->LogWasmCodes(job_->isolate_);
   }
   const bool needs_finish = job_->DecrementAndCheckFinisherCount();
   DCHECK_IMPLIES(!has_code_section, needs_finish);
@@ -2723,12 +2758,21 @@ CompilationStateImpl::CompilationStateImpl(
       async_counters_(std::move(async_counters)),
       compilation_unit_queues_(native_module->num_functions()) {}
 
+void CompilationStateImpl::InitCompileJob(WasmEngine* engine) {
+  DCHECK_NULL(compile_job_);
+  compile_job_ = V8::GetCurrentPlatform()->PostJob(
+      TaskPriority::kUserVisible,
+      std::make_unique<BackgroundCompileJob>(native_module_weak_, engine,
+                                             async_counters_));
+}
+
 void CompilationStateImpl::CancelCompilation() {
-  // No more callbacks after abort.
-  base::MutexGuard callbacks_guard(&callbacks_mutex_);
   // std::memory_order_relaxed is sufficient because no other state is
   // synchronized with |compile_cancelled_|.
   compile_cancelled_.store(true, std::memory_order_relaxed);
+
+  // No more callbacks after abort.
+  base::MutexGuard callbacks_guard(&callbacks_mutex_);
   callbacks_.clear();
 }
 
@@ -2923,19 +2967,22 @@ void CompilationStateImpl::AddCompilationUnits(
     Vector<WasmCompilationUnit> top_tier_units,
     Vector<std::shared_ptr<JSToWasmWrapperCompilationUnit>>
         js_to_wasm_wrapper_units) {
-  if (!baseline_units.empty() || !top_tier_units.empty()) {
-    compilation_unit_queues_.AddUnits(baseline_units, top_tier_units,
-                                      native_module_->module());
-  }
   if (!js_to_wasm_wrapper_units.empty()) {
-    // |js_to_wasm_wrapper_units_| can only be modified before background
-    // compilation started.
-    DCHECK(!current_compile_job_ || !current_compile_job_->IsRunning());
+    // |js_to_wasm_wrapper_units_| will only be initialized once.
+    DCHECK_EQ(0, outstanding_js_to_wasm_wrappers_.load());
     js_to_wasm_wrapper_units_.insert(js_to_wasm_wrapper_units_.end(),
                                      js_to_wasm_wrapper_units.begin(),
                                      js_to_wasm_wrapper_units.end());
+    // Use release semantics such that updates to {js_to_wasm_wrapper_units_}
+    // are available to other threads doing an acquire load.
+    outstanding_js_to_wasm_wrappers_.store(js_to_wasm_wrapper_units.size(),
+                                           std::memory_order_release);
+  }
+  if (!baseline_units.empty() || !top_tier_units.empty()) {
+    compilation_unit_queues_.AddUnits(baseline_units, top_tier_units,
+                                      native_module_->module());
   }
-  ScheduleCompileJobForNewUnits();
+  compile_job_->NotifyConcurrencyIncrease();
 }
 
 void CompilationStateImpl::AddTopTierCompilationUnit(WasmCompilationUnit unit) {
@@ -2945,17 +2992,23 @@ void CompilationStateImpl::AddTopTierCompilationUnit(WasmCompilationUnit unit) {
 void CompilationStateImpl::AddTopTierPriorityCompilationUnit(
     WasmCompilationUnit unit, size_t priority) {
   compilation_unit_queues_.AddTopTierPriorityUnit(unit, priority);
-  ScheduleCompileJobForNewUnits();
+  compile_job_->NotifyConcurrencyIncrease();
 }
 
 std::shared_ptr<JSToWasmWrapperCompilationUnit>
 CompilationStateImpl::GetNextJSToWasmWrapperCompilationUnit() {
-  int wrapper_id =
-      js_to_wasm_wrapper_id_.fetch_add(1, std::memory_order_relaxed);
-  if (wrapper_id < static_cast<int>(js_to_wasm_wrapper_units_.size())) {
-    return js_to_wasm_wrapper_units_[wrapper_id];
+  size_t outstanding_units =
+      outstanding_js_to_wasm_wrappers_.load(std::memory_order_relaxed);
+  // Use acquire semantics such that initialization of
+  // {js_to_wasm_wrapper_units_} is available.
+  while (outstanding_units &&
+         !outstanding_js_to_wasm_wrappers_.compare_exchange_weak(
+             outstanding_units, outstanding_units - 1,
+             std::memory_order_acquire)) {
+    // Retry with updated {outstanding_units}.
   }
-  return nullptr;
+  if (outstanding_units == 0) return nullptr;
+  return js_to_wasm_wrapper_units_[outstanding_units - 1];
 }
 
 void CompilationStateImpl::FinalizeJSToWasmWrappers(
@@ -3229,43 +3282,9 @@ void CompilationStateImpl::SchedulePublishCompilationResults(
   }
 }
 
-void CompilationStateImpl::ScheduleCompileJobForNewUnits() {
-  if (failed()) return;
-
-  std::shared_ptr<JobHandle> new_job_handle;
-  {
-    base::MutexGuard guard(&mutex_);
-    if (current_compile_job_ && current_compile_job_->IsValid()) {
-      current_compile_job_->NotifyConcurrencyIncrease();
-      return;
-    }
-
-    std::unique_ptr<JobTask> new_compile_job =
-        std::make_unique<BackgroundCompileJob>(native_module_weak_,
-                                               async_counters_);
-    // TODO(wasm): Lower priority for TurboFan-only jobs.
-    new_job_handle = V8::GetCurrentPlatform()->PostJob(
-        has_priority_ ? TaskPriority::kUserBlocking
-                      : TaskPriority::kUserVisible,
-        std::move(new_compile_job));
-    current_compile_job_ = new_job_handle;
-    // Reset the priority. Later uses of the compilation state, e.g. for
-    // debugging, should compile with the default priority again.
-    has_priority_ = false;
-  }
-
-  if (new_job_handle) {
-    native_module_->engine()->ShepherdCompileJobHandle(
-        std::move(new_job_handle));
-  }
-}
-
 size_t CompilationStateImpl::NumOutstandingCompilations() const {
-  size_t next_wrapper = js_to_wasm_wrapper_id_.load(std::memory_order_relaxed);
   size_t outstanding_wrappers =
-      next_wrapper >= js_to_wasm_wrapper_units_.size()
-          ? 0
-          : js_to_wasm_wrapper_units_.size() - next_wrapper;
+      outstanding_js_to_wasm_wrappers_.load(std::memory_order_relaxed);
   size_t outstanding_functions = compilation_unit_queues_.GetTotalSize();
   return outstanding_wrappers + outstanding_functions;
 }
@@ -3296,8 +3315,8 @@ void CompilationStateImpl::WaitForCompilationEvent(
   }
 
   constexpr JobDelegate* kNoDelegate = nullptr;
-  ExecuteCompilationUnits(native_module_weak_, async_counters_.get(),
-                          kNoDelegate, kBaselineOnly);
+  ExecuteCompilationUnits(native_module_weak_, native_module_->engine(),
+                          async_counters_.get(), kNoDelegate, kBaselineOnly);
   compilation_event_semaphore->Wait();
 }
 
@@ -3312,8 +3331,7 @@ using JSToWasmWrapperUnitMap =
 class CompileJSToWasmWrapperJob final : public JobTask {
  public:
   CompileJSToWasmWrapperJob(JSToWasmWrapperQueue* queue,
-                            JSToWasmWrapperUnitMap* compilation_units,
-                            size_t max_concurrency)
+                            JSToWasmWrapperUnitMap* compilation_units)
       : queue_(queue),
         compilation_units_(compilation_units),
         outstanding_units_(queue->size()) {}
@@ -3323,17 +3341,16 @@ class CompileJSToWasmWrapperJob final : public JobTask {
       JSToWasmWrapperCompilationUnit* unit = (*compilation_units_)[*key].get();
       unit->Execute();
       outstanding_units_.fetch_sub(1, std::memory_order_relaxed);
-      if (delegate->ShouldYield()) return;
+      if (delegate && delegate->ShouldYield()) return;
     }
   }
 
   size_t GetMaxConcurrency(size_t /* worker_count */) const override {
+    DCHECK_GE(FLAG_wasm_num_compilation_tasks, 1);
     // {outstanding_units_} includes the units that other workers are currently
     // working on, so we can safely ignore the {worker_count} and just return
     // the current number of outstanding units.
-    size_t flag_limit =
-        static_cast<size_t>(std::max(1, FLAG_wasm_num_compilation_tasks));
-    return std::min(flag_limit,
+    return std::min(static_cast<size_t>(FLAG_wasm_num_compilation_tasks),
                     outstanding_units_.load(std::memory_order_relaxed));
   }
 
@@ -3367,17 +3384,17 @@ void CompileJsToWasmWrappers(Isolate* isolate, const WasmModule* module,
     }
   }
 
-  // Execute wrapper compilation in the background.
-  int flag_value = FLAG_wasm_num_compilation_tasks;
-  size_t max_concurrency = flag_value < 1 ? std::numeric_limits<size_t>::max()
-                                          : static_cast<size_t>(flag_value);
-  auto job = std::make_unique<CompileJSToWasmWrapperJob>(
-      &queue, &compilation_units, max_concurrency);
-  auto job_handle = V8::GetCurrentPlatform()->PostJob(
-      TaskPriority::kUserVisible, std::move(job));
+  auto job =
+      std::make_unique<CompileJSToWasmWrapperJob>(&queue, &compilation_units);
+  if (FLAG_wasm_num_compilation_tasks > 0) {
+    auto job_handle = V8::GetCurrentPlatform()->PostJob(
+        TaskPriority::kUserVisible, std::move(job));
 
-  // Wait for completion, while contributing to the work.
-  job_handle->Join();
+    // Wait for completion, while contributing to the work.
+    job_handle->Join();
+  } else {
+    job->Run(nullptr);
+  }
 
   // Finalize compilation jobs in the main thread.
   // TODO(6792): Wrappers below are allocated with {Factory::NewCode}. As an
diff --git a/deps/v8/src/wasm/module-compiler.h b/deps/v8/src/wasm/module-compiler.h
index e688bb94799b63..239c39c52696d0 100644
--- a/deps/v8/src/wasm/module-compiler.h
+++ b/deps/v8/src/wasm/module-compiler.h
@@ -64,7 +64,7 @@ WasmCode* CompileImportWrapper(
 // Triggered by the WasmCompileLazy builtin. The return value indicates whether
 // compilation was successful. Lazy compilation can fail only if validation is
 // also lazy.
-bool CompileLazy(Isolate*, NativeModule*, int func_index);
+bool CompileLazy(Isolate*, Handle<WasmModuleObject>, int func_index);
 
 void TriggerTierUp(Isolate*, NativeModule*, int func_index);
 
diff --git a/deps/v8/src/wasm/module-decoder.cc b/deps/v8/src/wasm/module-decoder.cc
index 6d684d35349d5f..221afbfb6227e8 100644
--- a/deps/v8/src/wasm/module-decoder.cc
+++ b/deps/v8/src/wasm/module-decoder.cc
@@ -6,6 +6,7 @@
 
 #include "src/base/functional.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/flags/flags.h"
 #include "src/init/v8.h"
 #include "src/logging/counters.h"
@@ -310,7 +311,7 @@ class ModuleDecoderImpl : public Decoder {
     size_t rv = 0;
     if (FILE* file = base::OS::FOpen(path.c_str(), "wb")) {
       rv = fwrite(module_bytes.begin(), module_bytes.length(), 1, file);
-      fclose(file);
+      base::Fclose(file);
     }
     if (rv != 1) {
       OFStream os(stderr);
@@ -929,9 +930,10 @@ class ModuleDecoderImpl : public Decoder {
   }
 
   void DecodeCodeSection(bool verify_functions) {
-    uint32_t pos = pc_offset();
+    StartCodeSection();
+    uint32_t code_section_start = pc_offset();
     uint32_t functions_count = consume_u32v("functions count");
-    CheckFunctionsCount(functions_count, pos);
+    CheckFunctionsCount(functions_count, code_section_start);
     for (uint32_t i = 0; ok() && i < functions_count; ++i) {
       const byte* pos = pc();
       uint32_t size = consume_u32v("body size");
@@ -945,14 +947,21 @@ class ModuleDecoderImpl : public Decoder {
       if (failed()) break;
       DecodeFunctionBody(i, size, offset, verify_functions);
     }
-    DCHECK_GE(pc_offset(), pos);
-    set_code_section(pos, pc_offset() - pos);
+    DCHECK_GE(pc_offset(), code_section_start);
+    set_code_section(code_section_start, pc_offset() - code_section_start);
   }
 
-  bool CheckFunctionsCount(uint32_t functions_count, uint32_t offset) {
+  void StartCodeSection() {
+    if (ok()) {
+      // Make sure global offset were calculated before they get accessed during
+      // function compilation.
+      CalculateGlobalOffsets(module_.get());
+    }
+  }
+
+  bool CheckFunctionsCount(uint32_t functions_count, uint32_t error_offset) {
     if (functions_count != module_->num_declared_functions) {
-      Reset(nullptr, nullptr, offset);
-      errorf(nullptr, "function body count %u mismatch (%u expected)",
+      errorf(error_offset, "function body count %u mismatch (%u expected)",
              functions_count, module_->num_declared_functions);
       return false;
     }
@@ -1206,6 +1215,10 @@ class ModuleDecoderImpl : public Decoder {
 
   ModuleResult FinishDecoding(bool verify_functions = true) {
     if (ok() && CheckMismatchedCounts()) {
+      // We calculate the global offsets here, because there may not be a global
+      // section and code section that would have triggered the calculation
+      // before. Even without the globals section the calculation is needed
+      // because globals can also be defined in the import section.
       CalculateGlobalOffsets(module_.get());
     }
 
@@ -1357,10 +1370,10 @@ class ModuleDecoderImpl : public Decoder {
       }
       case WasmInitExpr::kRefNullConst:
         return ValueType::Ref(expr.immediate().heap_type, kNullable);
-      case WasmInitExpr::kRttCanon:
-        // TODO(7748): If heaptype is "anyref" (not introduced yet),
-        // then this should be uint8_t{0}.
-        return ValueType::Rtt(expr.immediate().heap_type, uint8_t{1});
+      case WasmInitExpr::kRttCanon: {
+        uint8_t depth = expr.immediate().heap_type == HeapType::kAny ? 0 : 1;
+        return ValueType::Rtt(expr.immediate().heap_type, depth);
+      }
       case WasmInitExpr::kRttSub: {
         ValueType operand_type = TypeOf(*expr.operand());
         if (operand_type.is_rtt()) {
@@ -1406,7 +1419,18 @@ class ModuleDecoderImpl : public Decoder {
   }
 
   // Calculate individual global offsets and total size of globals table.
+  // This function should be called after all globals have been defined, which
+  // is after the import section and the global section, but before the global
+  // offsets are accessed, e.g. by the function compilers. The moment when this
+  // function should be called is not well-defined, as the global section may
+  // not exist. Therefore this function is called multiple times.
   void CalculateGlobalOffsets(WasmModule* module) {
+    if (module->globals.empty() || module->untagged_globals_buffer_size != 0 ||
+        module->tagged_globals_buffer_size != 0) {
+      // This function has already been executed before, so we don't have to
+      // execute it again.
+      return;
+    }
     uint32_t untagged_offset = 0;
     uint32_t tagged_offset = 0;
     uint32_t num_imported_mutable_globals = 0;
@@ -1624,22 +1648,6 @@ class ModuleDecoderImpl : public Decoder {
     return true;
   }
 
-  // TODO(manoskouk): This is copy-modified from function-body-decoder-impl.h.
-  // We should find a way to share this code.
-  V8_INLINE bool Validate(const byte* pc,
-                          HeapTypeImmediate<kFullValidation>& imm) {
-    if (V8_UNLIKELY(imm.type.is_bottom())) {
-      error(pc, "invalid heap type");
-      return false;
-    }
-    if (V8_UNLIKELY(!(imm.type.is_generic() ||
-                      module_->has_type(imm.type.ref_index())))) {
-      errorf(pc, "Type index %u is out of bounds", imm.type.ref_index());
-      return false;
-    }
-    return true;
-  }
-
   WasmInitExpr consume_init_expr(WasmModule* module, ValueType expected,
                                  size_t current_global_index) {
     constexpr Decoder::ValidateFlag validate = Decoder::kFullValidation;
@@ -1711,10 +1719,10 @@ class ModuleDecoderImpl : public Decoder {
                    kExprRefNull);
             return {};
           }
-          HeapTypeImmediate<Decoder::kFullValidation> imm(enabled_features_,
-                                                          this, pc() + 1);
+          HeapTypeImmediate<Decoder::kFullValidation> imm(
+              enabled_features_, this, pc() + 1, module_.get());
+          if (V8_UNLIKELY(failed())) return {};
           len = 1 + imm.length;
-          if (!Validate(pc() + 1, imm)) return {};
           stack.push_back(
               WasmInitExpr::RefNullConst(imm.type.representation()));
           break;
@@ -1762,19 +1770,19 @@ class ModuleDecoderImpl : public Decoder {
           opcode = read_prefixed_opcode<validate>(pc(), &len);
           switch (opcode) {
             case kExprRttCanon: {
-              HeapTypeImmediate<validate> imm(enabled_features_, this,
-                                              pc() + 2);
+              HeapTypeImmediate<validate> imm(enabled_features_, this, pc() + 2,
+                                              module_.get());
+              if (V8_UNLIKELY(failed())) return {};
               len += imm.length;
-              if (!Validate(pc() + len, imm)) return {};
               stack.push_back(
                   WasmInitExpr::RttCanon(imm.type.representation()));
               break;
             }
             case kExprRttSub: {
-              HeapTypeImmediate<validate> imm(enabled_features_, this,
-                                              pc() + 2);
+              HeapTypeImmediate<validate> imm(enabled_features_, this, pc() + 2,
+                                              module_.get());
+              if (V8_UNLIKELY(failed())) return {};
               len += imm.length;
-              if (!Validate(pc() + len, imm)) return {};
               if (stack.empty()) {
                 error(pc(), "calling rtt.sub without arguments");
                 return {};
@@ -1846,14 +1854,8 @@ class ModuleDecoderImpl : public Decoder {
   ValueType consume_value_type() {
     uint32_t type_length;
     ValueType result = value_type_reader::read_value_type<kFullValidation>(
-        this, this->pc(), &type_length,
+        this, this->pc(), &type_length, module_.get(),
         origin_ == kWasmOrigin ? enabled_features_ : WasmFeatures::None());
-    if (result == kWasmBottom) error(pc_, "invalid value type");
-    // We use capacity() over size() so this function works
-    // mid-DecodeTypeSection.
-    if (result.has_index() && result.ref_index() >= module_->types.capacity()) {
-      errorf(pc(), "Type index %u is out of bounds", result.ref_index());
-    }
     consume_bytes(type_length, "value type");
     return result;
   }
@@ -2106,11 +2108,12 @@ class ModuleDecoderImpl : public Decoder {
     }
 
     // We know now that the flag is valid. Time to read the rest.
-    size_t num_globals = module_.get()->globals.size();
+    size_t num_globals = module_->globals.size();
+    ValueType expected_type = module_->is_memory64 ? kWasmI64 : kWasmI32;
     if (flag == SegmentFlags::kActiveNoIndex) {
       *is_active = true;
       *index = 0;
-      *offset = consume_init_expr(module_.get(), kWasmI32, num_globals);
+      *offset = consume_init_expr(module_.get(), expected_type, num_globals);
       return;
     }
     if (flag == SegmentFlags::kPassive) {
@@ -2120,7 +2123,7 @@ class ModuleDecoderImpl : public Decoder {
     if (flag == SegmentFlags::kActiveWithIndex) {
       *is_active = true;
       *index = consume_u32v("memory index");
-      *offset = consume_init_expr(module_.get(), kWasmI32, num_globals);
+      *offset = consume_init_expr(module_.get(), expected_type, num_globals);
     }
   }
 
@@ -2143,7 +2146,7 @@ class ModuleDecoderImpl : public Decoder {
     switch (opcode) {
       case kExprRefNull: {
         HeapTypeImmediate<kFullValidation> imm(WasmFeatures::All(), this,
-                                               this->pc());
+                                               this->pc(), module_.get());
         consume_bytes(imm.length, "ref.null immediate");
         index = WasmElemSegment::kNullIndex;
         break;
@@ -2240,9 +2243,11 @@ void ModuleDecoder::DecodeFunctionBody(uint32_t index, uint32_t length,
   impl_->DecodeFunctionBody(index, length, offset, verify_functions);
 }
 
+void ModuleDecoder::StartCodeSection() { impl_->StartCodeSection(); }
+
 bool ModuleDecoder::CheckFunctionsCount(uint32_t functions_count,
-                                        uint32_t offset) {
-  return impl_->CheckFunctionsCount(functions_count, offset);
+                                        uint32_t error_offset) {
+  return impl_->CheckFunctionsCount(functions_count, error_offset);
 }
 
 ModuleResult ModuleDecoder::FinishDecoding(bool verify_functions) {
diff --git a/deps/v8/src/wasm/module-decoder.h b/deps/v8/src/wasm/module-decoder.h
index 3acd3ac5994163..331ec33c1f06fc 100644
--- a/deps/v8/src/wasm/module-decoder.h
+++ b/deps/v8/src/wasm/module-decoder.h
@@ -210,7 +210,9 @@ class ModuleDecoder {
   void DecodeSection(SectionCode section_code, Vector<const uint8_t> bytes,
                      uint32_t offset, bool verify_functions = true);
 
-  bool CheckFunctionsCount(uint32_t functions_count, uint32_t offset);
+  void StartCodeSection();
+
+  bool CheckFunctionsCount(uint32_t functions_count, uint32_t error_offset);
 
   void DecodeFunctionBody(uint32_t index, uint32_t size, uint32_t offset,
                           bool verify_functions = true);
@@ -220,6 +222,7 @@ class ModuleDecoder {
   void set_code_section(uint32_t offset, uint32_t size);
 
   const std::shared_ptr<WasmModule>& shared_module() const;
+
   WasmModule* module() const { return shared_module().get(); }
 
   bool ok();
diff --git a/deps/v8/src/wasm/module-instantiate.cc b/deps/v8/src/wasm/module-instantiate.cc
index e8b0a4f8e6ec46..63469b94c4916c 100644
--- a/deps/v8/src/wasm/module-instantiate.cc
+++ b/deps/v8/src/wasm/module-instantiate.cc
@@ -6,6 +6,7 @@
 
 #include "src/api/api.h"
 #include "src/asmjs/asm-js.h"
+#include "src/base/platform/wrappers.h"
 #include "src/logging/counters.h"
 #include "src/logging/metrics.h"
 #include "src/numbers/conversions-inl.h"
@@ -32,11 +33,6 @@ namespace wasm {
 using base::ReadLittleEndianValue;
 using base::WriteLittleEndianValue;
 
-namespace {
-byte* raw_buffer_ptr(MaybeHandle<JSArrayBuffer> buffer, int offset) {
-  return static_cast<byte*>(buffer.ToHandleChecked()->backing_store()) + offset;
-}
-
 uint32_t EvalUint32InitExpr(Handle<WasmInstanceObject> instance,
                             const WasmInitExpr& expr) {
   switch (expr.kind()) {
@@ -55,6 +51,12 @@ uint32_t EvalUint32InitExpr(Handle<WasmInstanceObject> instance,
   }
 }
 
+namespace {
+
+byte* raw_buffer_ptr(MaybeHandle<JSArrayBuffer> buffer, int offset) {
+  return static_cast<byte*>(buffer.ToHandleChecked()->backing_store()) + offset;
+}
+
 using ImportWrapperQueue = WrapperQueue<WasmImportWrapperCache::CacheKey,
                                         WasmImportWrapperCache::CacheKeyHash>;
 
@@ -602,24 +604,24 @@ MaybeHandle<WasmInstanceObject> InstanceBuilder::Build() {
   //--------------------------------------------------------------------------
   // Create maps for managed objects (GC proposal).
   // Must happen before {InitGlobals} because globals can refer to these maps.
+  // We do not need to cache the canonical rtts to (rtt.canon any)'s subtype
+  // list.
   //--------------------------------------------------------------------------
   if (enabled_.has_gc()) {
     Handle<FixedArray> maps = isolate_->factory()->NewUninitializedFixedArray(
         static_cast<int>(module_->type_kinds.size()));
-    // TODO(7748): Do we want a different sentinel here?
-    Handle<Map> anyref_sentinel_map = isolate_->factory()->null_map();
+    Handle<Map> anyref_map =
+        Handle<Map>::cast(isolate_->root_handle(RootIndex::kWasmRttAnyrefMap));
     for (int map_index = 0;
          map_index < static_cast<int>(module_->type_kinds.size());
          map_index++) {
       Handle<Map> map;
       switch (module_->type_kinds[map_index]) {
         case kWasmStructTypeCode:
-          map = CreateStructMap(isolate_, module_, map_index,
-                                anyref_sentinel_map);
+          map = CreateStructMap(isolate_, module_, map_index, anyref_map);
           break;
         case kWasmArrayTypeCode:
-          map =
-              CreateArrayMap(isolate_, module_, map_index, anyref_sentinel_map);
+          map = CreateArrayMap(isolate_, module_, map_index, anyref_map);
           break;
         case kWasmFunctionTypeCode:
           // TODO(7748): Think about canonicalizing rtts to make them work for
@@ -885,7 +887,7 @@ void InstanceBuilder::LoadDataSegments(Handle<WasmInstanceObject> instance) {
                                         instance->memory_size()));
       byte* dest = instance->memory_start() + dest_offset;
       const byte* src = wire_bytes.begin() + segment.source.offset();
-      memcpy(dest, src, size);
+      base::Memcpy(dest, src, size);
     }
   }
 }
@@ -1342,18 +1344,6 @@ bool InstanceBuilder::ProcessImportedGlobal(Handle<WasmInstanceObject> instance,
   // global in the {imported_mutable_globals_} array.
   const WasmGlobal& global = module_->globals[global_index];
 
-  // The mutable-global proposal allows importing i64 values, but only if
-  // they are passed as a WebAssembly.Global object.
-  //
-  // However, the bigint proposal allows importing constant i64 values,
-  // as non WebAssembly.Global object.
-  if (global.type == kWasmI64 && !enabled_.has_bigint() &&
-      !value->IsWasmGlobalObject()) {
-    ReportLinkError("global import cannot have type i64", import_index,
-                    module_name, import_name);
-    return false;
-  }
-
   // SIMD proposal allows modules to define an imported v128 global, and only
   // supports importing a WebAssembly.Global object for this global, but also
   // defines constructing a WebAssembly.Global of v128 to be a TypeError.
@@ -1411,7 +1401,7 @@ bool InstanceBuilder::ProcessImportedGlobal(Handle<WasmInstanceObject> instance,
     return true;
   }
 
-  if (enabled_.has_bigint() && global.type == kWasmI64 && value->IsBigInt()) {
+  if (global.type == kWasmI64 && value->IsBigInt()) {
     WriteGlobalValue(global, BigInt::cast(*value).AsInt64());
     return true;
   }
@@ -1598,6 +1588,8 @@ Handle<Object> InstanceBuilder::RecursivelyEvaluateGlobalInitializer(
           return isolate_->root_handle(RootIndex::kWasmRttFuncrefMap);
         case wasm::HeapType::kI31:
           return isolate_->root_handle(RootIndex::kWasmRttI31refMap);
+        case wasm::HeapType::kAny:
+          return isolate_->root_handle(RootIndex::kWasmRttAnyrefMap);
         case wasm::HeapType::kExn:
           UNIMPLEMENTED();  // TODO(jkummerow): This is going away?
         case wasm::HeapType::kBottom:
@@ -1675,8 +1667,8 @@ void InstanceBuilder::InitGlobals(Handle<WasmInstanceObject> instance) {
           size_t size = (global.type == kWasmI64 || global.type == kWasmF64)
                             ? sizeof(double)
                             : sizeof(int32_t);
-          memcpy(raw_buffer_ptr(untagged_globals_, new_offset),
-                 raw_buffer_ptr(untagged_globals_, old_offset), size);
+          base::Memcpy(raw_buffer_ptr(untagged_globals_, new_offset),
+                       raw_buffer_ptr(untagged_globals_, old_offset), size);
         }
         break;
       }
@@ -1879,7 +1871,7 @@ void InstanceBuilder::ProcessExports(Handle<WasmInstanceObject> instance) {
     v8::Maybe<bool> status = JSReceiver::DefineOwnProperty(
         isolate_, export_to, name, &desc, Just(kThrowOnError));
     if (!status.IsJust()) {
-      DisallowHeapAllocation no_gc;
+      DisallowGarbageCollection no_gc;
       TruncatedUserString<> trunc_name(name->GetCharVector<uint8_t>(no_gc));
       thrower_->LinkError("export of %.*s failed.", trunc_name.length(),
                           trunc_name.start());
diff --git a/deps/v8/src/wasm/module-instantiate.h b/deps/v8/src/wasm/module-instantiate.h
index 13ab8d99b3c4b7..ea245a646e14ae 100644
--- a/deps/v8/src/wasm/module-instantiate.h
+++ b/deps/v8/src/wasm/module-instantiate.h
@@ -16,6 +16,7 @@ namespace internal {
 class Isolate;
 class JSArrayBuffer;
 class JSReceiver;
+class WasmInitExpr;
 class WasmModuleObject;
 class WasmInstanceObject;
 
@@ -37,6 +38,9 @@ bool LoadElemSegment(Isolate* isolate, Handle<WasmInstanceObject> instance,
                      uint32_t table_index, uint32_t segment_index, uint32_t dst,
                      uint32_t src, uint32_t count) V8_WARN_UNUSED_RESULT;
 
+uint32_t EvalUint32InitExpr(Handle<WasmInstanceObject> instance,
+                            const WasmInitExpr& expr);
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/src/wasm/simd-shuffle.cc b/deps/v8/src/wasm/simd-shuffle.cc
index c252a631827e3e..1d3a2775b879ef 100644
--- a/deps/v8/src/wasm/simd-shuffle.cc
+++ b/deps/v8/src/wasm/simd-shuffle.cc
@@ -58,6 +58,25 @@ bool SimdShuffle::TryMatchIdentity(const uint8_t* shuffle) {
   return true;
 }
 
+bool SimdShuffle::TryMatch32x4Rotate(const uint8_t* shuffle,
+                                     uint8_t* shuffle32x4, bool is_swizzle) {
+  uint8_t offset;
+  bool is_concat = TryMatchConcat(shuffle, &offset);
+  DCHECK_NE(offset, 0);  // 0 is identity, it should not be matched.
+  // Since we already have a concat shuffle, we know that the indices goes from:
+  // [ offset, ..., 15, 0, ... ], it suffices to check that the offset points
+  // to the low byte of a 32x4 element.
+  if (!is_concat || !is_swizzle || offset % 4 != 0) {
+    return false;
+  }
+
+  uint8_t offset_32 = offset / 4;
+  for (int i = 0; i < 4; i++) {
+    shuffle32x4[i] = (offset_32 + i) % 4;
+  }
+  return true;
+}
+
 bool SimdShuffle::TryMatch32x4Shuffle(const uint8_t* shuffle,
                                       uint8_t* shuffle32x4) {
   for (int i = 0; i < 4; ++i) {
diff --git a/deps/v8/src/wasm/simd-shuffle.h b/deps/v8/src/wasm/simd-shuffle.h
index 9b824c728e5646..48630fbb801a79 100644
--- a/deps/v8/src/wasm/simd-shuffle.h
+++ b/deps/v8/src/wasm/simd-shuffle.h
@@ -51,6 +51,12 @@ class V8_EXPORT_PRIVATE SimdShuffle {
     return true;
   }
 
+  // Tries to match a 32x4 rotate, only makes sense if the inputs are equal
+  // (is_swizzle). A rotation is a shuffle like [1, 2, 3, 0]. This will always
+  // match a Concat, but can have better codegen.
+  static bool TryMatch32x4Rotate(const uint8_t* shuffle, uint8_t* shuffle32x4,
+                                 bool is_swizzle);
+
   // Tries to match an 8x16 byte shuffle to an equivalent 32x4 shuffle. If
   // successful, it writes the 32x4 shuffle word indices. E.g.
   // [0 1 2 3 8 9 10 11 4 5 6 7 12 13 14 15] == [0 2 1 3]
diff --git a/deps/v8/src/wasm/streaming-decoder.cc b/deps/v8/src/wasm/streaming-decoder.cc
index d1312edd336e74..1556036bbabb07 100644
--- a/deps/v8/src/wasm/streaming-decoder.cc
+++ b/deps/v8/src/wasm/streaming-decoder.cc
@@ -4,6 +4,7 @@
 
 #include "src/wasm/streaming-decoder.h"
 
+#include "src/base/platform/wrappers.h"
 #include "src/handles/handles.h"
 #include "src/objects/descriptor-array.h"
 #include "src/objects/dictionary.h"
@@ -62,7 +63,8 @@ class V8_EXPORT_PRIVATE AsyncStreamingDecoder : public StreamingDecoder {
               1 + length_bytes.length() + payload_length)),
           payload_offset_(1 + length_bytes.length()) {
       bytes_.start()[0] = id;
-      memcpy(bytes_.start() + 1, &length_bytes.first(), length_bytes.length());
+      base::Memcpy(bytes_.start() + 1, &length_bytes.first(),
+                   length_bytes.length());
     }
 
     SectionCode section_code() const {
@@ -182,13 +184,13 @@ class V8_EXPORT_PRIVATE AsyncStreamingDecoder : public StreamingDecoder {
 
   void StartCodeSection(int num_functions,
                         std::shared_ptr<WireBytesStorage> wire_bytes_storage,
-                        int code_section_length) {
+                        int code_section_start, int code_section_length) {
     if (!ok()) return;
     // The offset passed to {ProcessCodeSectionHeader} is an error offset and
     // not the start offset of a buffer. Therefore we need the -1 here.
     if (!processor_->ProcessCodeSectionHeader(
             num_functions, module_offset() - 1, std::move(wire_bytes_storage),
-            code_section_length)) {
+            code_section_start, code_section_length)) {
       Fail();
     }
   }
@@ -252,7 +254,7 @@ size_t AsyncStreamingDecoder::DecodingState::ReadBytes(
   Vector<uint8_t> remaining_buf = buffer() + offset();
   size_t num_bytes = std::min(bytes.size(), remaining_buf.size());
   TRACE_STREAMING("ReadBytes(%zu bytes)\n", num_bytes);
-  memcpy(remaining_buf.begin(), &bytes.first(), num_bytes);
+  base::Memcpy(remaining_buf.begin(), &bytes.first(), num_bytes);
   set_offset(offset() + num_bytes);
   return num_bytes;
 }
@@ -288,12 +290,12 @@ void AsyncStreamingDecoder::Finish() {
 #define BYTES(x) (x & 0xFF), (x >> 8) & 0xFF, (x >> 16) & 0xFF, (x >> 24) & 0xFF
     uint8_t module_header[]{BYTES(kWasmMagic), BYTES(kWasmVersion)};
 #undef BYTES
-    memcpy(cursor, module_header, arraysize(module_header));
+    base::Memcpy(cursor, module_header, arraysize(module_header));
     cursor += arraysize(module_header);
   }
   for (const auto& buffer : section_buffers_) {
     DCHECK_LE(cursor - bytes.start() + buffer->length(), total_size_);
-    memcpy(cursor, buffer->bytes().begin(), buffer->length());
+    base::Memcpy(cursor, buffer->bytes().begin(), buffer->length());
     cursor += buffer->length();
   }
   processor_->OnFinishedStream(std::move(bytes));
@@ -512,7 +514,7 @@ size_t AsyncStreamingDecoder::DecodeVarInt32::ReadBytes(
   Vector<uint8_t> remaining_buf = buf + offset();
   size_t new_bytes = std::min(bytes.size(), remaining_buf.size());
   TRACE_STREAMING("ReadBytes of a VarInt\n");
-  memcpy(remaining_buf.begin(), &bytes.first(), new_bytes);
+  base::Memcpy(remaining_buf.begin(), &bytes.first(), new_bytes);
   buf.Truncate(offset() + new_bytes);
   Decoder decoder(buf,
                   streaming->module_offset() - static_cast<uint32_t>(offset()));
@@ -626,7 +628,7 @@ AsyncStreamingDecoder::DecodeNumberOfFunctions::NextWithValue(
   if (payload_buf.size() < bytes_consumed_) {
     return streaming->Error("invalid code section length");
   }
-  memcpy(payload_buf.begin(), buffer().begin(), bytes_consumed_);
+  base::Memcpy(payload_buf.begin(), buffer().begin(), bytes_consumed_);
 
   // {value} is the number of functions.
   if (value_ == 0) {
@@ -636,12 +638,16 @@ AsyncStreamingDecoder::DecodeNumberOfFunctions::NextWithValue(
     return std::make_unique<DecodeSectionID>(streaming->module_offset());
   }
 
+  DCHECK_GE(kMaxInt, section_buffer_->module_offset() +
+                         section_buffer_->payload_offset());
+  int code_section_start = static_cast<int>(section_buffer_->module_offset() +
+                                            section_buffer_->payload_offset());
   DCHECK_GE(kMaxInt, payload_buf.length());
   int code_section_len = static_cast<int>(payload_buf.length());
   DCHECK_GE(kMaxInt, value_);
   streaming->StartCodeSection(static_cast<int>(value_),
                               streaming->section_buffers_.back(),
-                              code_section_len);
+                              code_section_start, code_section_len);
   if (!streaming->ok()) return nullptr;
   return std::make_unique<DecodeFunctionLength>(
       section_buffer_, section_buffer_->payload_offset() + bytes_consumed_,
@@ -657,7 +663,7 @@ AsyncStreamingDecoder::DecodeFunctionLength::NextWithValue(
   if (fun_length_buffer.size() < bytes_consumed_) {
     return streaming->Error("read past code section end");
   }
-  memcpy(fun_length_buffer.begin(), buffer().begin(), bytes_consumed_);
+  base::Memcpy(fun_length_buffer.begin(), buffer().begin(), bytes_consumed_);
 
   // {value} is the length of the function.
   if (value_ == 0) return streaming->Error("invalid function length (0)");
diff --git a/deps/v8/src/wasm/streaming-decoder.h b/deps/v8/src/wasm/streaming-decoder.h
index bdf3218d1ef829..4f46a63455a23e 100644
--- a/deps/v8/src/wasm/streaming-decoder.h
+++ b/deps/v8/src/wasm/streaming-decoder.h
@@ -39,6 +39,7 @@ class V8_EXPORT_PRIVATE StreamingProcessor {
   // finished successfully and the decoding should continue.
   virtual bool ProcessCodeSectionHeader(int num_functions, uint32_t offset,
                                         std::shared_ptr<WireBytesStorage>,
+                                        int code_section_start,
                                         int code_section_length) = 0;
 
   // Process a function body. Returns true if the processing finished
diff --git a/deps/v8/src/wasm/value-type.h b/deps/v8/src/wasm/value-type.h
index 3731511c241148..95990a14e70b2e 100644
--- a/deps/v8/src/wasm/value-type.h
+++ b/deps/v8/src/wasm/value-type.h
@@ -35,12 +35,12 @@ class Simd128;
   V(I8, 0, I8, Int8, 'b', "i8")          \
   V(I16, 1, I16, Int16, 'h', "i16")
 
-#define FOREACH_VALUE_TYPE(V)                                               \
-  V(Stmt, -1, Void, None, 'v', "<stmt>")                                    \
-  FOREACH_NUMERIC_VALUE_TYPE(V)                                             \
-  V(Rtt, kSystemPointerSizeLog2, Rtt, TaggedPointer, 't', "rtt")            \
-  V(Ref, kSystemPointerSizeLog2, Ref, TaggedPointer, 'r', "ref")            \
-  V(OptRef, kSystemPointerSizeLog2, OptRef, TaggedPointer, 'n', "ref null") \
+#define FOREACH_VALUE_TYPE(V)                                    \
+  V(Stmt, -1, Void, None, 'v', "<stmt>")                         \
+  FOREACH_NUMERIC_VALUE_TYPE(V)                                  \
+  V(Rtt, kTaggedSizeLog2, Rtt, TaggedPointer, 't', "rtt")        \
+  V(Ref, kTaggedSizeLog2, Ref, AnyTagged, 'r', "ref")            \
+  V(OptRef, kTaggedSizeLog2, OptRef, AnyTagged, 'n', "ref null") \
   V(Bottom, -1, Void, None, '*', "<bot>")
 
 // Represents a WebAssembly heap type, as per the typed-funcref and gc
@@ -57,6 +57,7 @@ class HeapType {
     kEq,                      // shorthand: q
     kExn,                     // shorthand: x
     kI31,                     // shorthand: j
+    kAny,                     // shorthand: a
     // This value is used to represent failures in the parsing of heap types and
     // does not correspond to a wasm heap type.
     kBottom
@@ -64,7 +65,7 @@ class HeapType {
   // Internal use only; defined in the public section to make it easy to
   // check that they are defined correctly:
   static constexpr Representation kFirstSentinel = kFunc;
-  static constexpr Representation kLastSentinel = kI31;
+  static constexpr Representation kLastSentinel = kAny;
 
   static constexpr HeapType from_code(uint8_t code) {
     switch (code) {
@@ -78,6 +79,8 @@ class HeapType {
         return HeapType(kExn);
       case ValueTypeCode::kI31RefCode:
         return HeapType(kI31);
+      case ValueTypeCode::kAnyRefCode:
+        return HeapType(kAny);
       default:
         return HeapType(kBottom);
     }
@@ -130,6 +133,8 @@ class HeapType {
         return std::string("exn");
       case kI31:
         return std::string("i31");
+      case kAny:
+        return std::string("any");
       default:
         return std::to_string(representation_);
     }
@@ -151,6 +156,8 @@ class HeapType {
         return mask | kEqRefCode;
       case kI31:
         return mask | kI31RefCode;
+      case kAny:
+        return mask | kAnyRefCode;
       default:
         return static_cast<int32_t>(representation_);
     }
@@ -366,6 +373,8 @@ class ValueType {
             return kEqRefCode;
           case HeapType::kExn:
             return kExnRefCode;
+          case HeapType::kAny:
+            return kAnyRefCode;
           default:
             return kOptRefCode;
         }
@@ -503,6 +512,7 @@ constexpr ValueType kWasmExternRef =
     ValueType::Ref(HeapType::kExtern, kNullable);
 constexpr ValueType kWasmEqRef = ValueType::Ref(HeapType::kEq, kNullable);
 constexpr ValueType kWasmI31Ref = ValueType::Ref(HeapType::kI31, kNonNullable);
+constexpr ValueType kWasmAnyRef = ValueType::Ref(HeapType::kAny, kNullable);
 
 #define FOREACH_WASMVALUE_CTYPES(V) \
   V(kI32, int32_t)                  \
@@ -548,7 +558,7 @@ class LoadType {
   constexpr ValueType value_type() const { return kValueType[val_]; }
   constexpr MachineType mem_type() const { return kMemType[val_]; }
 
-  static LoadType ForValueType(ValueType type) {
+  static LoadType ForValueType(ValueType type, bool is_signed = false) {
     switch (type.kind()) {
       case ValueType::kI32:
         return kI32Load;
@@ -560,6 +570,10 @@ class LoadType {
         return kF64Load;
       case ValueType::kS128:
         return kS128Load;
+      case ValueType::kI8:
+        return is_signed ? kI32Load8S : kI32Load8U;
+      case ValueType::kI16:
+        return is_signed ? kI32Load16S : kI32Load16U;
       default:
         UNREACHABLE();
     }
@@ -632,6 +646,10 @@ class StoreType {
         return kF64Store;
       case ValueType::kS128:
         return kS128Store;
+      case ValueType::kI8:
+        return kI32Store8;
+      case ValueType::kI16:
+        return kI32Store16;
       default:
         UNREACHABLE();
     }
diff --git a/deps/v8/src/wasm/wasm-code-manager.cc b/deps/v8/src/wasm/wasm-code-manager.cc
index cd9052459975d5..9cd1e68f24adcd 100644
--- a/deps/v8/src/wasm/wasm-code-manager.cc
+++ b/deps/v8/src/wasm/wasm-code-manager.cc
@@ -35,6 +35,7 @@
 #include "src/wasm/wasm-objects.h"
 
 #if defined(V8_OS_WIN64)
+#include "src/base/platform/wrappers.h"
 #include "src/diagnostics/unwinding-info-win64.h"
 #endif  // V8_OS_WIN64
 
@@ -182,7 +183,7 @@ std::unique_ptr<const byte[]> WasmCode::ConcatenateBytes(
   byte* ptr = result.get();
   for (auto& vec : vectors) {
     if (vec.empty()) continue;  // Avoid nullptr in {memcpy}.
-    memcpy(ptr, vec.begin(), vec.size());
+    base::Memcpy(ptr, vec.begin(), vec.size());
     ptr += vec.size();
   }
   return result;
@@ -216,21 +217,20 @@ bool WasmCode::ShouldBeLogged(Isolate* isolate) {
          isolate->is_profiling();
 }
 
-void WasmCode::LogCode(Isolate* isolate) const {
+void WasmCode::LogCode(Isolate* isolate, const char* source_url,
+                       int script_id) const {
   DCHECK(ShouldBeLogged(isolate));
   if (IsAnonymous()) return;
 
-  ModuleWireBytes wire_bytes(native_module()->wire_bytes());
-  WireBytesRef name_ref =
-      native_module()->module()->lazily_generated_names.LookupFunctionName(
-          wire_bytes, index(),
-          VectorOf(native_module()->module()->export_table));
+  ModuleWireBytes wire_bytes(native_module_->wire_bytes());
+  const WasmModule* module = native_module_->module();
+  WireBytesRef name_ref = module->lazily_generated_names.LookupFunctionName(
+      wire_bytes, index(), VectorOf(module->export_table));
   WasmName name = wire_bytes.GetNameOrNull(name_ref);
 
-  const WasmDebugSymbols& debug_symbols =
-      native_module()->module()->debug_symbols;
+  const WasmDebugSymbols& debug_symbols = module->debug_symbols;
   auto load_wasm_source_map = isolate->wasm_load_source_map_callback();
-  auto source_map = native_module()->GetWasmSourceMap();
+  auto source_map = native_module_->GetWasmSourceMap();
   if (!source_map && debug_symbols.type == WasmDebugSymbols::Type::SourceMap &&
       !debug_symbols.external_url.is_empty() && load_wasm_source_map) {
     WasmName external_url =
@@ -240,7 +240,7 @@ void WasmCode::LogCode(Isolate* isolate) const {
     v8::Isolate* v8_isolate = reinterpret_cast<v8::Isolate*>(isolate);
     Local<v8::String> source_map_str =
         load_wasm_source_map(v8_isolate, external_url_string.c_str());
-    native_module()->SetWasmSourceMap(
+    native_module_->SetWasmSourceMap(
         std::make_unique<WasmModuleSourceMap>(v8_isolate, source_map_str));
   }
 
@@ -250,7 +250,7 @@ void WasmCode::LogCode(Isolate* isolate) const {
     size_t prefix_len = name_buffer.size();
     constexpr size_t kMaxSigLength = 128;
     name_buffer.resize(prefix_len + kMaxSigLength);
-    const FunctionSig* sig = native_module()->module()->functions[index_].sig;
+    const FunctionSig* sig = module->functions[index_].sig;
     size_t sig_length =
         PrintSignature(VectorOf(&name_buffer[prefix_len], kMaxSigLength), sig);
     name_buffer.resize(prefix_len + sig_length);
@@ -267,8 +267,9 @@ void WasmCode::LogCode(Isolate* isolate) const {
                  "wasm-function[%d]", index()));
     name = VectorOf(name_buffer);
   }
-  PROFILE(isolate,
-          CodeCreateEvent(CodeEventListener::FUNCTION_TAG, this, name));
+  int code_offset = module->functions[index_].code.offset();
+  PROFILE(isolate, CodeCreateEvent(CodeEventListener::FUNCTION_TAG, this, name,
+                                   source_url, code_offset, script_id));
 
   if (!source_positions().empty()) {
     LOG_CODE_EVENT(isolate, CodeLinePosInfoRecordEvent(instruction_start(),
@@ -412,7 +413,7 @@ void WasmCode::Disassemble(const char* name, std::ostream& os,
       table.PrintEntry(i, os);
       os << " (sp -> fp)";
       SafepointEntry entry = table.GetEntry(i);
-      if (entry.trampoline_pc() != -1) {
+      if (entry.trampoline_pc() != SafepointEntry::kNoTrampolinePC) {
         os << " trampoline: " << std::hex << entry.trampoline_pc() << std::dec;
       }
       if (entry.has_deoptimization_index()) {
@@ -800,15 +801,17 @@ NativeModule::NativeModule(WasmEngine* engine, const WasmFeatures& enabled,
                            std::shared_ptr<const WasmModule> module,
                            std::shared_ptr<Counters> async_counters,
                            std::shared_ptr<NativeModule>* shared_this)
-    : code_allocator_(engine->code_manager(), std::move(code_space),
+    : engine_(engine),
+      engine_scope_(engine->GetBarrierForBackgroundCompile()->TryLock()),
+      code_allocator_(engine->code_manager(), std::move(code_space),
                       async_counters),
       enabled_features_(enabled),
       module_(std::move(module)),
       import_wrapper_cache_(std::unique_ptr<WasmImportWrapperCache>(
           new WasmImportWrapperCache())),
-      engine_(engine),
       use_trap_handler_(trap_handler::IsTrapHandlerEnabled() ? kUseTrapHandler
                                                              : kNoTrapHandler) {
+  DCHECK(engine_scope_);
   // We receive a pointer to an empty {std::shared_ptr}, and install ourselve
   // there.
   DCHECK_NOT_NULL(shared_this);
@@ -816,6 +819,7 @@ NativeModule::NativeModule(WasmEngine* engine, const WasmFeatures& enabled,
   shared_this->reset(this);
   compilation_state_ =
       CompilationState::New(*shared_this, std::move(async_counters));
+  compilation_state_->InitCompileJob(engine);
   DCHECK_NOT_NULL(module_);
   if (module_->num_declared_functions > 0) {
     code_table_ =
@@ -836,8 +840,8 @@ void NativeModule::ReserveCodeTableForTesting(uint32_t max_functions) {
   DCHECK_LE(module_->num_declared_functions, max_functions);
   auto new_table = std::make_unique<WasmCode*[]>(max_functions);
   if (module_->num_declared_functions > 0) {
-    memcpy(new_table.get(), code_table_.get(),
-           module_->num_declared_functions * sizeof(WasmCode*));
+    base::Memcpy(new_table.get(), code_table_.get(),
+                 module_->num_declared_functions * sizeof(WasmCode*));
   }
   code_table_ = std::move(new_table);
 
@@ -855,19 +859,25 @@ void NativeModule::ReserveCodeTableForTesting(uint32_t max_functions) {
   code_space_data_[0].jump_table = main_jump_table_;
 }
 
-void NativeModule::LogWasmCodes(Isolate* isolate) {
+void NativeModule::LogWasmCodes(Isolate* isolate, Script script) {
+  DisallowGarbageCollection no_gc;
   if (!WasmCode::ShouldBeLogged(isolate)) return;
 
   TRACE_EVENT1("v8.wasm", "wasm.LogWasmCodes", "functions",
                module_->num_declared_functions);
 
-  // TODO(titzer): we skip the logging of the import wrappers
-  // here, but they should be included somehow.
-  int start = module_->num_imported_functions;
-  int end = start + module_->num_declared_functions;
+  Object source_url_obj = script.source_url();
+  DCHECK(source_url_obj.IsString() || source_url_obj.IsUndefined());
+  std::unique_ptr<char[]> source_url =
+      source_url_obj.IsString() ? String::cast(source_url_obj).ToCString()
+                                : nullptr;
+
+  // Log all owned code, not just the current entries in the code table. This
+  // will also include import wrappers.
   WasmCodeRefScope code_ref_scope;
-  for (int func_index = start; func_index < end; ++func_index) {
-    if (WasmCode* code = GetCode(func_index)) code->LogCode(isolate);
+  base::MutexGuard lock(&allocation_mutex_);
+  for (auto& owned_entry : owned_code_) {
+    owned_entry.second->LogCode(isolate, source_url.get(), script.id());
   }
 }
 
@@ -914,7 +924,8 @@ WasmCode* NativeModule::AddCodeForTesting(Handle<Code> code) {
 
   Vector<uint8_t> dst_code_bytes =
       code_allocator_.AllocateForCode(this, instructions.size());
-  memcpy(dst_code_bytes.begin(), instructions.begin(), instructions.size());
+  base::Memcpy(dst_code_bytes.begin(), instructions.begin(),
+               instructions.size());
 
   // Apply the relocation delta by iterating over the RelocInfo.
   intptr_t delta = reinterpret_cast<Address>(dst_code_bytes.begin()) -
@@ -1039,8 +1050,8 @@ std::unique_ptr<WasmCode> NativeModule::AddCodeWithCodeSpace(
   const int instr_size = desc.instr_size;
 
   CODE_SPACE_WRITE_SCOPE
-  memcpy(dst_code_bytes.begin(), desc.buffer,
-         static_cast<size_t>(desc.instr_size));
+  base::Memcpy(dst_code_bytes.begin(), desc.buffer,
+               static_cast<size_t>(desc.instr_size));
 
   // Apply the relocation delta by iterating over the RelocInfo.
   intptr_t delta = dst_code_bytes.begin() - desc.buffer;
@@ -1174,7 +1185,7 @@ WasmCode* NativeModule::PublishCodeLocked(std::unique_ptr<WasmCode> code) {
   return result;
 }
 
-WasmCode* NativeModule::AddDeserializedCode(
+std::unique_ptr<WasmCode> NativeModule::AllocateDeserializedCode(
     int index, Vector<const byte> instructions, int stack_slots,
     int tagged_parameter_slots, int safepoint_table_offset,
     int handler_table_offset, int constant_pool_offset,
@@ -1182,22 +1193,15 @@ WasmCode* NativeModule::AddDeserializedCode(
     Vector<const byte> protected_instructions_data,
     Vector<const byte> reloc_info, Vector<const byte> source_position_table,
     WasmCode::Kind kind, ExecutionTier tier) {
-  // CodeSpaceWriteScope is provided by the caller.
   Vector<uint8_t> dst_code_bytes =
       code_allocator_.AllocateForCode(this, instructions.size());
   UpdateCodeSize(dst_code_bytes.size(), tier, kNoDebugging);
-  memcpy(dst_code_bytes.begin(), instructions.begin(), instructions.size());
 
-  std::unique_ptr<WasmCode> code{new WasmCode{
+  return std::unique_ptr<WasmCode>{new WasmCode{
       this, index, dst_code_bytes, stack_slots, tagged_parameter_slots,
       safepoint_table_offset, handler_table_offset, constant_pool_offset,
       code_comments_offset, unpadded_binary_size, protected_instructions_data,
       reloc_info, source_position_table, kind, tier, kNoDebugging}};
-
-  // Note: we do not flush the i-cache here, since the code needs to be
-  // relocated anyway. The caller is responsible for flushing the i-cache later.
-
-  return PublishCode(std::move(code));
 }
 
 std::vector<WasmCode*> NativeModule::SnapshotCodeTable() const {
diff --git a/deps/v8/src/wasm/wasm-code-manager.h b/deps/v8/src/wasm/wasm-code-manager.h
index f017b977b5f4cb..994365a961d36d 100644
--- a/deps/v8/src/wasm/wasm-code-manager.h
+++ b/deps/v8/src/wasm/wasm-code-manager.h
@@ -19,6 +19,7 @@
 #include "src/base/optional.h"
 #include "src/builtins/builtins-definitions.h"
 #include "src/handles/handles.h"
+#include "src/tasks/operations-barrier.h"
 #include "src/trap-handler/trap-handler.h"
 #include "src/utils/vector.h"
 #include "src/wasm/compilation-environment.h"
@@ -83,7 +84,10 @@ struct WasmModule;
   V(I32PairToBigInt)                     \
   V(I64ToBigInt)                         \
   V(RecordWrite)                         \
-  V(ToNumber)
+  V(ToNumber)                            \
+  V(WasmAllocateArrayWithRtt)            \
+  V(WasmAllocateRtt)                     \
+  V(WasmAllocateStructWithRtt)
 
 // Sorted, disjoint and non-overlapping memory regions. A region is of the
 // form [start, end). So there's no [start, end), [end, other_end),
@@ -199,7 +203,7 @@ class V8_EXPORT_PRIVATE WasmCode final {
                    Address current_pc = kNullAddress) const;
 
   static bool ShouldBeLogged(Isolate* isolate);
-  void LogCode(Isolate* isolate) const;
+  void LogCode(Isolate* isolate, const char* source_url, int script_id) const;
 
   WasmCode(const WasmCode&) = delete;
   WasmCode& operator=(const WasmCode&) = delete;
@@ -497,7 +501,7 @@ class V8_EXPORT_PRIVATE NativeModule final {
   WasmCode* PublishCode(std::unique_ptr<WasmCode>);
   std::vector<WasmCode*> PublishCode(Vector<std::unique_ptr<WasmCode>>);
 
-  WasmCode* AddDeserializedCode(
+  std::unique_ptr<WasmCode> AllocateDeserializedCode(
       int index, Vector<const byte> instructions, int stack_slots,
       int tagged_parameter_slots, int safepoint_table_offset,
       int handler_table_offset, int constant_pool_offset,
@@ -571,7 +575,7 @@ class V8_EXPORT_PRIVATE NativeModule final {
   // on the fly, and bypass the instance builder pipeline.
   void ReserveCodeTableForTesting(uint32_t max_functions);
 
-  void LogWasmCodes(Isolate* isolate);
+  void LogWasmCodes(Isolate*, Script);
 
   CompilationState* compilation_state() { return compilation_state_.get(); }
 
@@ -718,6 +722,16 @@ class V8_EXPORT_PRIVATE NativeModule final {
   // Hold the {allocation_mutex_} when calling {PublishCodeLocked}.
   WasmCode* PublishCodeLocked(std::unique_ptr<WasmCode>);
 
+  // -- Fields of {NativeModule} start here.
+
+  WasmEngine* const engine_;
+  // Keep the engine alive as long as this NativeModule is alive. In its
+  // destructor, the NativeModule still communicates with the WasmCodeManager,
+  // owned by the engine. This fields comes before other fields which also still
+  // access the engine (like the code allocator), so that it's destructor runs
+  // last.
+  OperationsBarrier::Token engine_scope_;
+
   // {WasmCodeAllocator} manages all code reservations and allocations for this
   // {NativeModule}.
   WasmCodeAllocator code_allocator_;
@@ -790,7 +804,6 @@ class V8_EXPORT_PRIVATE NativeModule final {
   // End of fields protected by {allocation_mutex_}.
   //////////////////////////////////////////////////////////////////////////////
 
-  WasmEngine* const engine_;
   int modification_scope_depth_ = 0;
   UseTrapHandler use_trap_handler_ = kNoTrapHandler;
   bool lazy_compile_frozen_ = false;
@@ -887,7 +900,7 @@ class V8_EXPORT_PRIVATE WasmCodeManager final {
 //    and even if we did, the resulting set of pages may be fragmented.
 //    Currently, we try and keep the number of syscalls low.
 // -  similar argument for debug time.
-class NativeModuleModificationScope final {
+class V8_NODISCARD NativeModuleModificationScope final {
  public:
   explicit NativeModuleModificationScope(NativeModule* native_module);
   ~NativeModuleModificationScope();
@@ -899,7 +912,7 @@ class NativeModuleModificationScope final {
 // {WasmCodeRefScope}s form a perfect stack. New {WasmCode} pointers generated
 // by e.g. creating new code or looking up code by its address are added to the
 // top-most {WasmCodeRefScope}.
-class V8_EXPORT_PRIVATE WasmCodeRefScope {
+class V8_EXPORT_PRIVATE V8_NODISCARD WasmCodeRefScope {
  public:
   WasmCodeRefScope();
   WasmCodeRefScope(const WasmCodeRefScope&) = delete;
diff --git a/deps/v8/src/wasm/wasm-constants.h b/deps/v8/src/wasm/wasm-constants.h
index 31a519ee2e24ee..2c47e994f2ff2f 100644
--- a/deps/v8/src/wasm/wasm-constants.h
+++ b/deps/v8/src/wasm/wasm-constants.h
@@ -33,7 +33,7 @@ enum ValueTypeCode : uint8_t {
   kI16Code = 0x79,
   kFuncRefCode = 0x70,
   kExternRefCode = 0x6f,
-  // kAnyCode = 0x6e, // TODO(7748): Implement
+  kAnyRefCode = 0x6e,
   kEqRefCode = 0x6d,
   kOptRefCode = 0x6c,
   kRefCode = 0x6b,
@@ -123,10 +123,20 @@ constexpr uint32_t kExceptionAttribute = 0;
 
 constexpr int kAnonymousFuncIndex = -1;
 
-// The number of calls to an exported wasm function that will be handled
-// by the generic wrapper. Once this threshold is reached, a specific wrapper
+// The number of calls to an exported Wasm function that will be handled
+// by the generic wrapper. Once the budget is exhausted, a specific wrapper
 // is to be compiled for the function's signature.
-constexpr uint32_t kGenericWrapperThreshold = 6;
+// The abstract goal of the tiering strategy for the js-to-wasm wrappers is to
+// use the generic wrapper as much as possible (less space, no need to compile),
+// but fall back to compiling a specific wrapper for any function (signature)
+// that is used often enough for the generic wrapper's small execution penalty
+// to start adding up.
+// So, when choosing a value for the initial budget, we are interested in a
+// value that skips on tiering up functions that are called only a few times and
+// the tier-up only wastes resources, but triggers compilation of specific
+// wrappers early on for those functions that have the potential to be called
+// often enough.
+constexpr uint32_t kGenericWrapperBudget = 1000;
 
 }  // namespace wasm
 }  // namespace internal
diff --git a/deps/v8/src/wasm/wasm-debug-evaluate.cc b/deps/v8/src/wasm/wasm-debug-evaluate.cc
deleted file mode 100644
index bbd75f6b188f11..00000000000000
--- a/deps/v8/src/wasm/wasm-debug-evaluate.cc
+++ /dev/null
@@ -1,446 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "src/wasm/wasm-debug-evaluate.h"
-
-#include <algorithm>
-#include <limits>
-
-#include "src/api/api-inl.h"
-#include "src/codegen/machine-type.h"
-#include "src/compiler/wasm-compiler.h"
-#include "src/execution/frames-inl.h"
-#include "src/wasm/value-type.h"
-#include "src/wasm/wasm-arguments.h"
-#include "src/wasm/wasm-constants.h"
-#include "src/wasm/wasm-debug.h"
-#include "src/wasm/wasm-module.h"
-#include "src/wasm/wasm-objects.h"
-#include "src/wasm/wasm-result.h"
-#include "src/wasm/wasm-value.h"
-
-namespace v8 {
-namespace internal {
-namespace wasm {
-namespace {
-
-static Handle<String> V8String(Isolate* isolate, const char* str) {
-  return isolate->factory()->NewStringFromAsciiChecked(str);
-}
-
-static bool CheckSignature(ValueType return_type,
-                           std::initializer_list<ValueType> argument_types,
-                           const FunctionSig* sig, ErrorThrower* thrower) {
-  if (sig->return_count() != 1 && return_type != kWasmBottom) {
-    thrower->CompileError("Invalid return type. Got none, expected %s",
-                          return_type.name().c_str());
-    return false;
-  }
-
-  if (sig->return_count() == 1) {
-    if (sig->GetReturn(0) != return_type) {
-      thrower->CompileError("Invalid return type. Got %s, expected %s",
-                            sig->GetReturn(0).name().c_str(),
-                            return_type.name().c_str());
-      return false;
-    }
-  }
-
-  if (sig->parameter_count() != argument_types.size()) {
-    thrower->CompileError("Invalid number of arguments. Expected %zu, got %zu",
-                          sig->parameter_count(), argument_types.size());
-    return false;
-  }
-  size_t p = 0;
-  for (ValueType argument_type : argument_types) {
-    if (sig->GetParam(p) != argument_type) {
-      thrower->CompileError(
-          "Invalid argument type for argument %zu. Got %s, expected %s", p,
-          sig->GetParam(p).name().c_str(), argument_type.name().c_str());
-      return false;
-    }
-    ++p;
-  }
-  return true;
-}
-
-static bool CheckRangeOutOfBounds(uint32_t offset, uint32_t size,
-                                  size_t allocation_size,
-                                  wasm::ErrorThrower* thrower) {
-  if (size > std::numeric_limits<uint32_t>::max() - offset) {
-    thrower->RuntimeError("Overflowing memory range\n");
-    return true;
-  }
-  if (offset + size > allocation_size) {
-    thrower->RuntimeError("Illegal access to out-of-bounds memory");
-    return true;
-  }
-  return false;
-}
-
-class DebugEvaluatorProxy {
- public:
-  explicit DebugEvaluatorProxy(Isolate* isolate, CommonFrame* frame)
-      : isolate_(isolate), frame_(frame) {}
-
-  static void GetMemoryTrampoline(
-      const v8::FunctionCallbackInfo<v8::Value>& args) {
-    DebugEvaluatorProxy& proxy = GetProxy(args);
-
-    uint32_t offset = proxy.GetArgAsUInt32(args, 0);
-    uint32_t size = proxy.GetArgAsUInt32(args, 1);
-    uint32_t result = proxy.GetArgAsUInt32(args, 2);
-
-    proxy.GetMemory(offset, size, result);
-  }
-
-  // void __getMemory(uint32_t offset, uint32_t size, void* result);
-  void GetMemory(uint32_t offset, uint32_t size, uint32_t result) {
-    wasm::ScheduledErrorThrower thrower(isolate_, "debug evaluate proxy");
-    // Check all overflows.
-    if (CheckRangeOutOfBounds(offset, size, debuggee_->memory_size(),
-                              &thrower) ||
-        CheckRangeOutOfBounds(result, size, evaluator_->memory_size(),
-                              &thrower)) {
-      return;
-    }
-
-    std::memcpy(&evaluator_->memory_start()[result],
-                &debuggee_->memory_start()[offset], size);
-  }
-
-  // void* __sbrk(intptr_t increment);
-  uint32_t Sbrk(uint32_t increment) {
-    if (increment > 0 && evaluator_->memory_size() <=
-                             std::numeric_limits<uint32_t>::max() - increment) {
-      Handle<WasmMemoryObject> memory(evaluator_->memory_object(), isolate_);
-      uint32_t new_pages =
-          (increment - 1 + wasm::kWasmPageSize) / wasm::kWasmPageSize;
-      WasmMemoryObject::Grow(isolate_, memory, new_pages);
-    }
-    return static_cast<uint32_t>(evaluator_->memory_size());
-  }
-
-  static void SbrkTrampoline(const v8::FunctionCallbackInfo<v8::Value>& args) {
-    DebugEvaluatorProxy& proxy = GetProxy(args);
-    uint32_t size = proxy.GetArgAsUInt32(args, 0);
-
-    uint32_t result = proxy.Sbrk(size);
-    args.GetReturnValue().Set(result);
-  }
-
-  // void __getLocal(uint32_t local,  void* result);
-  void GetLocal(uint32_t local, uint32_t result_offset) {
-    DCHECK(frame_->is_wasm());
-    wasm::DebugInfo* debug_info =
-        WasmFrame::cast(frame_)->native_module()->GetDebugInfo();
-    WasmValue result = debug_info->GetLocalValue(
-        local, frame_->pc(), frame_->fp(), frame_->callee_fp());
-    WriteResult(result, result_offset);
-  }
-
-  void GetGlobal(uint32_t global, uint32_t result_offset) {
-    DCHECK(frame_->is_wasm());
-
-    const WasmGlobal& global_variable =
-        WasmFrame::cast(frame_)->native_module()->module()->globals.at(global);
-
-    Handle<WasmInstanceObject> instance(
-        WasmFrame::cast(frame_)->wasm_instance(), isolate_);
-    WasmValue result =
-        WasmInstanceObject::GetGlobalValue(instance, global_variable);
-    WriteResult(result, result_offset);
-  }
-
-  void GetOperand(uint32_t operand, uint32_t result_offset) {
-    DCHECK(frame_->is_wasm());
-    wasm::DebugInfo* debug_info =
-        WasmFrame::cast(frame_)->native_module()->GetDebugInfo();
-    WasmValue result = debug_info->GetStackValue(
-        operand, frame_->pc(), frame_->fp(), frame_->callee_fp());
-
-    WriteResult(result, result_offset);
-  }
-
-  static void GetLocalTrampoline(
-      const v8::FunctionCallbackInfo<v8::Value>& args) {
-    DebugEvaluatorProxy& proxy = GetProxy(args);
-    uint32_t local = proxy.GetArgAsUInt32(args, 0);
-    uint32_t result = proxy.GetArgAsUInt32(args, 1);
-
-    proxy.GetLocal(local, result);
-  }
-
-  static void GetGlobalTrampoline(
-      const v8::FunctionCallbackInfo<v8::Value>& args) {
-    DebugEvaluatorProxy& proxy = GetProxy(args);
-    uint32_t global = proxy.GetArgAsUInt32(args, 0);
-    uint32_t result = proxy.GetArgAsUInt32(args, 1);
-
-    proxy.GetGlobal(global, result);
-  }
-
-  static void GetOperandTrampoline(
-      const v8::FunctionCallbackInfo<v8::Value>& args) {
-    DebugEvaluatorProxy& proxy = GetProxy(args);
-    uint32_t operand = proxy.GetArgAsUInt32(args, 0);
-    uint32_t result = proxy.GetArgAsUInt32(args, 1);
-
-    proxy.GetOperand(operand, result);
-  }
-
-  Handle<JSObject> CreateImports() {
-    Handle<JSObject> imports_obj =
-        isolate_->factory()->NewJSObject(isolate_->object_function());
-    Handle<JSObject> import_module_obj =
-        isolate_->factory()->NewJSObject(isolate_->object_function());
-    Object::SetProperty(isolate_, imports_obj, V8String(isolate_, "env"),
-                        import_module_obj)
-        .Assert();
-
-    AddImport(import_module_obj, "__getOperand",
-              DebugEvaluatorProxy::GetOperandTrampoline);
-    AddImport(import_module_obj, "__getGlobal",
-              DebugEvaluatorProxy::GetGlobalTrampoline);
-    AddImport(import_module_obj, "__getLocal",
-              DebugEvaluatorProxy::GetLocalTrampoline);
-    AddImport(import_module_obj, "__getMemory",
-              DebugEvaluatorProxy::GetMemoryTrampoline);
-    AddImport(import_module_obj, "__sbrk", DebugEvaluatorProxy::SbrkTrampoline);
-
-    return imports_obj;
-  }
-
-  void SetInstances(Handle<WasmInstanceObject> evaluator,
-                    Handle<WasmInstanceObject> debuggee) {
-    evaluator_ = evaluator;
-    debuggee_ = debuggee;
-  }
-
- private:
-  template <typename T>
-  void WriteResultImpl(const WasmValue& result, uint32_t result_offset) {
-    wasm::ScheduledErrorThrower thrower(isolate_, "debug evaluate proxy");
-    T val = result.to<T>();
-    STATIC_ASSERT(static_cast<uint32_t>(sizeof(T)) == sizeof(T));
-    if (CheckRangeOutOfBounds(result_offset, sizeof(T),
-                              evaluator_->memory_size(), &thrower)) {
-      return;
-    }
-    memcpy(&evaluator_->memory_start()[result_offset], &val, sizeof(T));
-  }
-
-  void WriteResult(const WasmValue& result, uint32_t result_offset) {
-    switch (result.type().kind()) {
-      case ValueType::kI32:
-        WriteResultImpl<uint32_t>(result, result_offset);
-        break;
-      case ValueType::kI64:
-        WriteResultImpl<int64_t>(result, result_offset);
-        break;
-      case ValueType::kF32:
-        WriteResultImpl<float>(result, result_offset);
-        break;
-      case ValueType::kF64:
-        WriteResultImpl<double>(result, result_offset);
-        break;
-      default:
-        UNIMPLEMENTED();
-    }
-  }
-
-  uint32_t GetArgAsUInt32(const v8::FunctionCallbackInfo<v8::Value>& args,
-                          int index) {
-    // No type/range checks needed on his because this is only called for {args}
-    // where we have performed a signature check via {VerifyEvaluatorInterface}
-    double number = Utils::OpenHandle(*args[index])->Number();
-    return static_cast<uint32_t>(number);
-  }
-
-  static DebugEvaluatorProxy& GetProxy(
-      const v8::FunctionCallbackInfo<v8::Value>& args) {
-    return *reinterpret_cast<DebugEvaluatorProxy*>(
-        args.Data().As<v8::External>()->Value());
-  }
-
-  template <typename CallableT>
-  void AddImport(Handle<JSObject> import_module_obj, const char* function_name,
-                 CallableT callback) {
-    v8::Isolate* api_isolate = reinterpret_cast<v8::Isolate*>(isolate_);
-    v8::Local<v8::Context> context = api_isolate->GetCurrentContext();
-    std::string data;
-    v8::Local<v8::Function> v8_function =
-        v8::Function::New(context, callback,
-                          v8::External::New(api_isolate, this))
-            .ToLocalChecked();
-
-    Handle<JSReceiver> wrapped_function = Utils::OpenHandle(*v8_function);
-
-    Object::SetProperty(isolate_, import_module_obj,
-                        V8String(isolate_, function_name), wrapped_function)
-        .Assert();
-  }
-
-  Isolate* isolate_;
-  CommonFrame* frame_;
-  Handle<WasmInstanceObject> evaluator_;
-  Handle<WasmInstanceObject> debuggee_;
-};
-
-static bool VerifyEvaluatorInterface(const WasmModule* raw_module,
-                                     const ModuleWireBytes& bytes,
-                                     ErrorThrower* thrower) {
-  for (const WasmImport imported : raw_module->import_table) {
-    if (imported.kind != ImportExportKindCode::kExternalFunction) continue;
-    const WasmFunction& F = raw_module->functions.at(imported.index);
-    std::string module_name(bytes.start() + imported.module_name.offset(),
-                            bytes.start() + imported.module_name.end_offset());
-    std::string field_name(bytes.start() + imported.field_name.offset(),
-                           bytes.start() + imported.field_name.end_offset());
-
-    if (module_name == "env") {
-      if (field_name == "__getMemory") {
-        // void __getMemory(uint32_t offset, uint32_t size, void* result);
-        if (CheckSignature(kWasmBottom, {kWasmI32, kWasmI32, kWasmI32}, F.sig,
-                           thrower)) {
-          continue;
-        }
-      } else if (field_name == "__getOperand") {
-        // void __getOperand(uint32_t local,  void* result)
-        if (CheckSignature(kWasmBottom, {kWasmI32, kWasmI32}, F.sig, thrower)) {
-          continue;
-        }
-      } else if (field_name == "__getGlobal") {
-        // void __getGlobal(uint32_t local,  void* result)
-        if (CheckSignature(kWasmBottom, {kWasmI32, kWasmI32}, F.sig, thrower)) {
-          continue;
-        }
-      } else if (field_name == "__getLocal") {
-        // void __getLocal(uint32_t local,  void* result)
-        if (CheckSignature(kWasmBottom, {kWasmI32, kWasmI32}, F.sig, thrower)) {
-          continue;
-        }
-      } else if (field_name == "__debug") {
-        // void __debug(uint32_t flag, uint32_t value)
-        if (CheckSignature(kWasmBottom, {kWasmI32, kWasmI32}, F.sig, thrower)) {
-          continue;
-        }
-      } else if (field_name == "__sbrk") {
-        // uint32_t __sbrk(uint32_t increment)
-        if (CheckSignature(kWasmI32, {kWasmI32}, F.sig, thrower)) {
-          continue;
-        }
-      }
-    }
-
-    if (!thrower->error()) {
-      thrower->LinkError("Unknown import \"%s\" \"%s\"", module_name.c_str(),
-                         field_name.c_str());
-    }
-
-    return false;
-  }
-  for (const WasmExport& exported : raw_module->export_table) {
-    if (exported.kind != ImportExportKindCode::kExternalFunction) continue;
-    const WasmFunction& F = raw_module->functions.at(exported.index);
-    std::string field_name(bytes.start() + exported.name.offset(),
-                           bytes.start() + exported.name.end_offset());
-    if (field_name == "wasm_format") {
-      if (!CheckSignature(kWasmI32, {}, F.sig, thrower)) return false;
-    }
-  }
-  return true;
-}
-}  // namespace
-
-Maybe<std::string> DebugEvaluateImpl(
-    Vector<const byte> snippet, Handle<WasmInstanceObject> debuggee_instance,
-    CommonFrame* frame) {
-  Isolate* isolate = debuggee_instance->GetIsolate();
-  HandleScope handle_scope(isolate);
-  WasmEngine* engine = isolate->wasm_engine();
-  wasm::ErrorThrower thrower(isolate, "wasm debug evaluate");
-
-  // Create module object.
-  wasm::ModuleWireBytes bytes(snippet);
-  wasm::WasmFeatures features = wasm::WasmFeatures::FromIsolate(isolate);
-  Handle<WasmModuleObject> evaluator_module;
-  if (!engine->SyncCompile(isolate, features, &thrower, bytes)
-           .ToHandle(&evaluator_module)) {
-    return Nothing<std::string>();
-  }
-
-  // Verify interface.
-  const WasmModule* raw_module = evaluator_module->module();
-  if (!VerifyEvaluatorInterface(raw_module, bytes, &thrower)) {
-    return Nothing<std::string>();
-  }
-
-  // Set up imports.
-  DebugEvaluatorProxy proxy(isolate, frame);
-  Handle<JSObject> imports = proxy.CreateImports();
-
-  // Instantiate Module.
-  Handle<WasmInstanceObject> evaluator_instance;
-  if (!engine->SyncInstantiate(isolate, &thrower, evaluator_module, imports, {})
-           .ToHandle(&evaluator_instance)) {
-    return Nothing<std::string>();
-  }
-
-  proxy.SetInstances(evaluator_instance, debuggee_instance);
-
-  Handle<JSObject> exports_obj(evaluator_instance->exports_object(), isolate);
-  Handle<Object> entry_point_obj;
-  bool get_property_success =
-      Object::GetProperty(isolate, exports_obj,
-                          V8String(isolate, "wasm_format"))
-          .ToHandle(&entry_point_obj);
-  if (!get_property_success ||
-      !WasmExportedFunction::IsWasmExportedFunction(*entry_point_obj)) {
-    thrower.LinkError("Missing export: \"wasm_format\"");
-    return Nothing<std::string>();
-  }
-  Handle<WasmExportedFunction> entry_point =
-      Handle<WasmExportedFunction>::cast(entry_point_obj);
-
-  // TODO(wasm): Cache this code.
-  Handle<Code> wasm_entry = compiler::CompileCWasmEntry(
-      isolate, entry_point->sig(), debuggee_instance->module());
-
-  CWasmArgumentsPacker packer(4 /* uint32_t return value, no parameters. */);
-  Execution::CallWasm(isolate, wasm_entry, entry_point->GetWasmCallTarget(),
-                      evaluator_instance, packer.argv());
-  if (isolate->has_pending_exception()) return Nothing<std::string>();
-
-  uint32_t offset = packer.Pop<uint32_t>();
-  if (CheckRangeOutOfBounds(offset, 0, evaluator_instance->memory_size(),
-                            &thrower)) {
-    return Nothing<std::string>();
-  }
-
-  // Copy the zero-terminated string result but don't overflow.
-  std::string result;
-  byte* heap = evaluator_instance->memory_start() + offset;
-  for (; offset < evaluator_instance->memory_size(); ++offset, ++heap) {
-    if (*heap == 0) return Just(result);
-    result.push_back(*heap);
-  }
-
-  thrower.RuntimeError("The evaluation returned an invalid result");
-  return Nothing<std::string>();
-}
-
-MaybeHandle<String> DebugEvaluate(Vector<const byte> snippet,
-                                  Handle<WasmInstanceObject> debuggee_instance,
-                                  CommonFrame* frame) {
-  Maybe<std::string> result =
-      DebugEvaluateImpl(snippet, debuggee_instance, frame);
-  if (result.IsNothing()) return {};
-  std::string result_str = result.ToChecked();
-  return V8String(debuggee_instance->GetIsolate(), result_str.c_str());
-}
-
-}  // namespace wasm
-}  // namespace internal
-}  // namespace v8
diff --git a/deps/v8/src/wasm/wasm-debug-evaluate.h b/deps/v8/src/wasm/wasm-debug-evaluate.h
deleted file mode 100644
index ab84a736a83eb0..00000000000000
--- a/deps/v8/src/wasm/wasm-debug-evaluate.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef V8_WASM_WASM_DEBUG_EVALUATE_H_
-#define V8_WASM_WASM_DEBUG_EVALUATE_H_
-
-#include "src/base/macros.h"
-#include "src/handles/maybe-handles.h"
-#include "src/wasm/wasm-objects.h"
-
-namespace v8 {
-namespace internal {
-namespace wasm {
-
-MaybeHandle<String> V8_EXPORT_PRIVATE
-DebugEvaluate(Vector<const byte> snippet,
-              Handle<WasmInstanceObject> debuggee_instance, CommonFrame* frame);
-
-}  // namespace wasm
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_WASM_WASM_DEBUG_EVALUATE_H_
diff --git a/deps/v8/src/wasm/wasm-debug.cc b/deps/v8/src/wasm/wasm-debug.cc
index 5da55250457688..0851bdcfed90cb 100644
--- a/deps/v8/src/wasm/wasm-debug.cc
+++ b/deps/v8/src/wasm/wasm-debug.cc
@@ -8,13 +8,11 @@
 #include <unordered_map>
 
 #include "src/base/optional.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/common/assert-scope.h"
 #include "src/compiler/wasm-compiler.h"
-#include "src/debug/debug-scopes.h"
-#include "src/debug/debug.h"
 #include "src/execution/frames-inl.h"
-#include "src/execution/isolate.h"
 #include "src/heap/factory.h"
 #include "src/wasm/baseline/liftoff-compiler.h"
 #include "src/wasm/baseline/liftoff-register.h"
@@ -35,86 +33,6 @@ namespace wasm {
 
 namespace {
 
-template <bool internal, typename... Args>
-Handle<String> PrintFToOneByteString(Isolate* isolate, const char* format,
-                                     Args... args) {
-  // Maximum length of a formatted value name ("arg#%d", "local#%d",
-  // "global#%d", i32 constants, i64 constants), including null character.
-  static constexpr int kMaxStrLen = 21;
-  EmbeddedVector<char, kMaxStrLen> value;
-  int len = SNPrintF(value, format, args...);
-  CHECK(len > 0 && len < value.length());
-  Vector<const uint8_t> name =
-      Vector<const uint8_t>::cast(value.SubVector(0, len));
-  return internal
-             ? isolate->factory()->InternalizeString(name)
-             : isolate->factory()->NewStringFromOneByte(name).ToHandleChecked();
-}
-
-Handle<Object> WasmValueToValueObject(Isolate* isolate, WasmValue value) {
-  Handle<ByteArray> bytes;
-  switch (value.type().kind()) {
-    case ValueType::kI32: {
-      int32_t val = value.to_i32();
-      bytes = isolate->factory()->NewByteArray(sizeof(val));
-      memcpy(bytes->GetDataStartAddress(), &val, sizeof(val));
-      break;
-    }
-    case ValueType::kI64: {
-      int64_t val = value.to_i64();
-      bytes = isolate->factory()->NewByteArray(sizeof(val));
-      memcpy(bytes->GetDataStartAddress(), &val, sizeof(val));
-      break;
-    }
-    case ValueType::kF32: {
-      float val = value.to_f32();
-      bytes = isolate->factory()->NewByteArray(sizeof(val));
-      memcpy(bytes->GetDataStartAddress(), &val, sizeof(val));
-      break;
-    }
-    case ValueType::kF64: {
-      double val = value.to_f64();
-      bytes = isolate->factory()->NewByteArray(sizeof(val));
-      memcpy(bytes->GetDataStartAddress(), &val, sizeof(val));
-      break;
-    }
-    case ValueType::kS128: {
-      Simd128 s128 = value.to_s128();
-      bytes = isolate->factory()->NewByteArray(kSimd128Size);
-      memcpy(bytes->GetDataStartAddress(), s128.bytes(), kSimd128Size);
-      break;
-    }
-    case ValueType::kOptRef: {
-      if (value.type().is_reference_to(HeapType::kExtern)) {
-        return isolate->factory()->NewWasmValue(
-            static_cast<int32_t>(HeapType::kExtern), value.to_externref());
-      } else {
-        // TODO(7748): Implement.
-        UNIMPLEMENTED();
-      }
-    }
-    default: {
-      // TODO(7748): Implement.
-      UNIMPLEMENTED();
-    }
-  }
-  return isolate->factory()->NewWasmValue(
-      static_cast<int32_t>(value.type().kind()), bytes);
-}
-
-MaybeHandle<String> GetLocalNameString(Isolate* isolate,
-                                       NativeModule* native_module,
-                                       int func_index, int local_index) {
-  WireBytesRef name_ref =
-      native_module->GetDebugInfo()->GetLocalName(func_index, local_index);
-  ModuleWireBytes wire_bytes{native_module->wire_bytes()};
-  // Bounds were checked during decoding.
-  DCHECK(wire_bytes.BoundsCheck(name_ref));
-  WasmName name = wire_bytes.GetNameOrNull(name_ref);
-  if (name.size() == 0) return {};
-  return isolate->factory()->NewStringFromUtf8(name);
-}
-
 enum ReturnLocation { kAfterBreakpoint, kAfterWasmCall };
 
 Address FindNewPC(WasmFrame* frame, WasmCode* wasm_code, int byte_offset,
@@ -189,60 +107,6 @@ void DebugSideTable::Entry::Print(std::ostream& os) const {
   os << " ]\n";
 }
 
-Handle<JSObject> GetModuleScopeObject(Handle<WasmInstanceObject> instance) {
-  Isolate* isolate = instance->GetIsolate();
-
-  Handle<JSObject> module_scope_object =
-      isolate->factory()->NewJSObjectWithNullProto();
-
-  Handle<String> instance_name =
-      isolate->factory()->InternalizeString(StaticCharVector("instance"));
-  JSObject::AddProperty(isolate, module_scope_object, instance_name, instance,
-                        NONE);
-
-  if (instance->has_memory_object()) {
-    Handle<String> name;
-    // TODO(duongn): extend the logic when multiple memories are supported.
-    const uint32_t memory_index = 0;
-    if (!WasmInstanceObject::GetMemoryNameOrNull(isolate, instance,
-                                                 memory_index)
-             .ToHandle(&name)) {
-      const char* label = "memory%d";
-      name = PrintFToOneByteString<true>(isolate, label, memory_index);
-    }
-    Handle<JSArrayBuffer> memory_buffer(
-        instance->memory_object().array_buffer(), isolate);
-    Handle<JSTypedArray> uint8_array = isolate->factory()->NewJSTypedArray(
-        kExternalUint8Array, memory_buffer, 0, memory_buffer->byte_length());
-    JSObject::AddProperty(isolate, module_scope_object, name, uint8_array,
-                          NONE);
-  }
-
-  auto& globals = instance->module()->globals;
-  if (globals.size() > 0) {
-    Handle<JSObject> globals_obj =
-        isolate->factory()->NewJSObjectWithNullProto();
-    Handle<String> globals_name =
-        isolate->factory()->InternalizeString(StaticCharVector("globals"));
-    JSObject::AddProperty(isolate, module_scope_object, globals_name,
-                          globals_obj, NONE);
-
-    for (uint32_t i = 0; i < globals.size(); ++i) {
-      Handle<String> name;
-      if (!WasmInstanceObject::GetGlobalNameOrNull(isolate, instance, i)
-               .ToHandle(&name)) {
-        const char* label = "global%d";
-        name = PrintFToOneByteString<true>(isolate, label, i);
-      }
-      WasmValue value =
-          WasmInstanceObject::GetGlobalValue(instance, globals[i]);
-      Handle<Object> value_obj = WasmValueToValueObject(isolate, value);
-      JSObject::AddProperty(isolate, globals_obj, name, value_obj, NONE);
-    }
-  }
-  return module_scope_object;
-}
-
 class DebugInfoImpl {
  public:
   explicit DebugInfoImpl(NativeModule* native_module)
@@ -287,68 +151,6 @@ class DebugInfoImpl {
     return module->functions[scope.code->index()];
   }
 
-  Handle<JSObject> GetLocalScopeObject(Isolate* isolate, Address pc, Address fp,
-                                       Address debug_break_fp) {
-    FrameInspectionScope scope(this, pc);
-    Handle<JSObject> local_scope_object =
-        isolate->factory()->NewJSObjectWithNullProto();
-
-    if (!scope.is_inspectable()) return local_scope_object;
-
-    auto* module = native_module_->module();
-    auto* function = &module->functions[scope.code->index()];
-
-    // Fill parameters and locals.
-    int num_locals = static_cast<int>(scope.debug_side_table->num_locals());
-    DCHECK_LE(static_cast<int>(function->sig->parameter_count()), num_locals);
-    for (int i = 0; i < num_locals; ++i) {
-      Handle<Name> name;
-      if (!GetLocalNameString(isolate, native_module_, function->func_index, i)
-               .ToHandle(&name)) {
-        name = PrintFToOneByteString<true>(isolate, "var%d", i);
-      }
-      WasmValue value =
-          GetValue(scope.debug_side_table_entry, i, fp, debug_break_fp);
-      Handle<Object> value_obj = WasmValueToValueObject(isolate, value);
-      // {name} can be a string representation of an element index.
-      LookupIterator::Key lookup_key{isolate, name};
-      LookupIterator it(isolate, local_scope_object, lookup_key,
-                        local_scope_object,
-                        LookupIterator::OWN_SKIP_INTERCEPTOR);
-      if (it.IsFound()) continue;
-      Object::AddDataProperty(&it, value_obj, NONE,
-                              Just(ShouldThrow::kThrowOnError),
-                              StoreOrigin::kNamed)
-          .Check();
-    }
-    return local_scope_object;
-  }
-
-  Handle<JSObject> GetStackScopeObject(Isolate* isolate, Address pc, Address fp,
-                                       Address debug_break_fp) {
-    FrameInspectionScope scope(this, pc);
-    Handle<JSObject> stack_scope_obj =
-        isolate->factory()->NewJSObjectWithNullProto();
-
-    if (!scope.is_inspectable()) return stack_scope_obj;
-
-    // Fill stack values.
-    // Use an object without prototype instead of an Array, for nicer displaying
-    // in DevTools. For Arrays, the length field and prototype is displayed,
-    // which does not make too much sense here.
-    int num_locals = static_cast<int>(scope.debug_side_table->num_locals());
-    int value_count = scope.debug_side_table_entry->num_values();
-    for (int i = num_locals; i < value_count; ++i) {
-      WasmValue value =
-          GetValue(scope.debug_side_table_entry, i, fp, debug_break_fp);
-      Handle<Object> value_obj = WasmValueToValueObject(isolate, value);
-      JSObject::AddDataElement(stack_scope_obj,
-                               static_cast<uint32_t>(i - num_locals), value_obj,
-                               NONE);
-    }
-    return stack_scope_obj;
-  }
-
   WireBytesRef GetLocalName(int func_index, int local_index) {
     base::MutexGuard guard(&mutex_);
     if (!local_names_) {
@@ -487,39 +289,30 @@ class DebugInfoImpl {
   void FloodWithBreakpoints(WasmFrame* frame, ReturnLocation return_location) {
     // 0 is an invalid offset used to indicate flooding.
     int offset = 0;
-    WasmCodeRefScope wasm_code_ref_scope;
     DCHECK(frame->wasm_code()->is_liftoff());
     // Generate an additional source position for the current byte offset.
     base::MutexGuard guard(&mutex_);
     WasmCode* new_code = RecompileLiftoffWithBreakpoints(
         frame->function_index(), VectorOf(&offset, 1), 0);
     UpdateReturnAddress(frame, new_code, return_location);
-  }
-
-  void PrepareStep(Isolate* isolate, StackFrameId break_frame_id) {
-    StackTraceFrameIterator it(isolate, break_frame_id);
-    DCHECK(!it.done());
-    DCHECK(it.frame()->is_wasm());
-    WasmFrame* frame = WasmFrame::cast(it.frame());
-    StepAction step_action = isolate->debug()->last_step_action();
-
-    // If we are flooding the top frame, the return location is after a
-    // breakpoints. Otherwise, it's after a call.
-    ReturnLocation return_location = kAfterBreakpoint;
 
-    // If we are at a return instruction, then any stepping action is equivalent
-    // to StepOut, and we need to flood the parent function.
-    if (IsAtReturn(frame) || step_action == StepOut) {
-      it.Advance();
-      if (it.done() || !it.frame()->is_wasm()) return;
-      frame = WasmFrame::cast(it.frame());
-      return_location = kAfterWasmCall;
-    }
+    per_isolate_data_[frame->isolate()].stepping_frame = frame->id();
+  }
 
-    FloodWithBreakpoints(frame, return_location);
+  bool PrepareStep(WasmFrame* frame) {
+    WasmCodeRefScope wasm_code_ref_scope;
+    wasm::WasmCode* code = frame->wasm_code();
+    if (!code->is_liftoff()) return false;  // Cannot step in TurboFan code.
+    if (IsAtReturn(frame)) return false;    // Will return after this step.
+    FloodWithBreakpoints(frame, kAfterBreakpoint);
+    return true;
+  }
 
-    base::MutexGuard guard(&mutex_);
-    per_isolate_data_[isolate].stepping_frame = frame->id();
+  void PrepareStepOutTo(WasmFrame* frame) {
+    WasmCodeRefScope wasm_code_ref_scope;
+    wasm::WasmCode* code = frame->wasm_code();
+    if (!code->is_liftoff()) return;  // Cannot step out to TurboFan code.
+    FloodWithBreakpoints(frame, kAfterWasmCall);
   }
 
   void ClearStepping(Isolate* isolate) {
@@ -793,7 +586,7 @@ class DebugInfoImpl {
   }
 
   bool IsAtReturn(WasmFrame* frame) {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     int position = frame->position();
     NativeModule* native_module =
         frame->wasm_instance().module_object().native_module();
@@ -858,18 +651,6 @@ const wasm::WasmFunction& DebugInfo::GetFunctionAtAddress(Address pc) {
   return impl_->GetFunctionAtAddress(pc);
 }
 
-Handle<JSObject> DebugInfo::GetLocalScopeObject(Isolate* isolate, Address pc,
-                                                Address fp,
-                                                Address debug_break_fp) {
-  return impl_->GetLocalScopeObject(isolate, pc, fp, debug_break_fp);
-}
-
-Handle<JSObject> DebugInfo::GetStackScopeObject(Isolate* isolate, Address pc,
-                                                Address fp,
-                                                Address debug_break_fp) {
-  return impl_->GetStackScopeObject(isolate, pc, fp, debug_break_fp);
-}
-
 WireBytesRef DebugInfo::GetLocalName(int func_index, int local_index) {
   return impl_->GetLocalName(func_index, local_index);
 }
@@ -879,8 +660,12 @@ void DebugInfo::SetBreakpoint(int func_index, int offset,
   impl_->SetBreakpoint(func_index, offset, current_isolate);
 }
 
-void DebugInfo::PrepareStep(Isolate* isolate, StackFrameId break_frame_id) {
-  impl_->PrepareStep(isolate, break_frame_id);
+bool DebugInfo::PrepareStep(WasmFrame* frame) {
+  return impl_->PrepareStep(frame);
+}
+
+void DebugInfo::PrepareStepOutTo(WasmFrame* frame) {
+  impl_->PrepareStepOutTo(frame);
 }
 
 void DebugInfo::ClearStepping(Isolate* isolate) {
@@ -1161,7 +946,7 @@ bool WasmScript::GetPossibleBreakpoints(
     wasm::NativeModule* native_module, const v8::debug::Location& start,
     const v8::debug::Location& end,
     std::vector<v8::debug::BreakLocation>* locations) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   const wasm::WasmModule* module = native_module->module();
   const std::vector<wasm::WasmFunction>& functions = module->functions;
diff --git a/deps/v8/src/wasm/wasm-debug.h b/deps/v8/src/wasm/wasm-debug.h
index 82fe974952c856..337578fe06d738 100644
--- a/deps/v8/src/wasm/wasm-debug.h
+++ b/deps/v8/src/wasm/wasm-debug.h
@@ -20,11 +20,9 @@ namespace internal {
 
 template <typename T>
 class Handle;
-class JSObject;
 template <typename T>
 class Vector;
 class WasmFrame;
-class WasmInstanceObject;
 
 namespace wasm {
 
@@ -136,10 +134,6 @@ class DebugSideTable {
   std::vector<Entry> entries_;
 };
 
-// Get the module scope for a given instance. This will contain the wasm memory
-// (if the instance has a memory) and the values of all globals.
-Handle<JSObject> GetModuleScopeObject(Handle<WasmInstanceObject>);
-
 // Debug info per NativeModule, created lazily on demand.
 // Implementation in {wasm-debug.cc} using PIMPL.
 class V8_EXPORT_PRIVATE DebugInfo {
@@ -160,17 +154,15 @@ class V8_EXPORT_PRIVATE DebugInfo {
   WasmValue GetStackValue(int index, Address pc, Address fp,
                           Address debug_break_fp);
 
-  Handle<JSObject> GetLocalScopeObject(Isolate*, Address pc, Address fp,
-                                       Address debug_break_fp);
-
-  Handle<JSObject> GetStackScopeObject(Isolate*, Address pc, Address fp,
-                                       Address debug_break_fp);
-
   WireBytesRef GetLocalName(int func_index, int local_index);
 
   void SetBreakpoint(int func_index, int offset, Isolate* current_isolate);
 
-  void PrepareStep(Isolate*, StackFrameId);
+  // Returns true if we stay inside the passed frame (or a called frame) after
+  // the step. False if the frame will return after the step.
+  bool PrepareStep(WasmFrame*);
+
+  void PrepareStepOutTo(WasmFrame*);
 
   void ClearStepping(Isolate*);
 
diff --git a/deps/v8/src/wasm/wasm-engine.cc b/deps/v8/src/wasm/wasm-engine.cc
index 9f962f76bd9311..3dd8fa0ce7006b 100644
--- a/deps/v8/src/wasm/wasm-engine.cc
+++ b/deps/v8/src/wasm/wasm-engine.cc
@@ -27,6 +27,7 @@
 #include "src/wasm/wasm-objects-inl.h"
 
 #ifdef V8_ENABLE_WASM_GDB_REMOTE_DEBUGGING
+#include "src/base/platform/wrappers.h"
 #include "src/debug/wasm/gdb-server/gdb-server.h"
 #endif  // V8_ENABLE_WASM_GDB_REMOTE_DEBUGGING
 
@@ -128,9 +129,17 @@ class WasmGCForegroundTask : public CancelableTask {
 
 class WeakScriptHandle {
  public:
-  explicit WeakScriptHandle(Handle<Script> handle) {
+  explicit WeakScriptHandle(Handle<Script> script) : script_id_(script->id()) {
+    DCHECK(script->source_url().IsString() ||
+           script->source_url().IsUndefined());
+    if (script->source_url().IsString()) {
+      std::unique_ptr<char[]> source_url =
+          String::cast(script->source_url()).ToCString();
+      // Convert from {unique_ptr} to {shared_ptr}.
+      source_url_ = {source_url.release(), source_url.get_deleter()};
+    }
     auto global_handle =
-        handle->GetIsolate()->global_handles()->Create(*handle);
+        script->GetIsolate()->global_handles()->Create(*script);
     location_ = std::make_unique<Address*>(global_handle.location());
     GlobalHandles::MakeWeak(location_.get());
   }
@@ -145,12 +154,27 @@ class WeakScriptHandle {
 
   WeakScriptHandle(WeakScriptHandle&&) V8_NOEXCEPT = default;
 
-  Handle<Script> handle() { return Handle<Script>(*location_); }
+  Handle<Script> handle() const { return Handle<Script>(*location_); }
+
+  int script_id() const { return script_id_; }
+
+  const std::shared_ptr<const char>& source_url() const { return source_url_; }
 
  private:
   // Store the location in a unique_ptr so that its address stays the same even
   // when this object is moved/copied.
   std::unique_ptr<Address*> location_;
+
+  // Store the script ID independent of the weak handle, such that it's always
+  // available.
+  int script_id_;
+
+  // Similar for the source URL. We cannot dereference the Handle from arbitrary
+  // threads, but we need the URL available for code logging.
+  // The shared pointer is kept alive by unlogged code, even if this entry is
+  // collected in the meantime.
+  // TODO(chromium:1132260): Revisit this for huge URLs.
+  std::shared_ptr<const char> source_url_;
 };
 
 }  // namespace
@@ -350,8 +374,13 @@ struct WasmEngine::IsolateInfo {
   // The currently scheduled LogCodesTask.
   LogCodesTask* log_codes_task = nullptr;
 
-  // The vector of code objects that still need to be logged in this isolate.
-  std::vector<WasmCode*> code_to_log;
+  // Maps script ID to vector of code objects that still need to be logged, and
+  // the respective source URL.
+  struct CodeToLogPerScript {
+    std::vector<WasmCode*> code;
+    std::shared_ptr<const char> source_url;
+  };
+  std::unordered_map<int, CodeToLogPerScript> code_to_log;
 
   // The foreground task runner of the isolate (can be called from background).
   std::shared_ptr<v8::TaskRunner> foreground_task_runner;
@@ -395,32 +424,7 @@ WasmEngine::~WasmEngine() {
   gdb_server_.reset();
 #endif  // V8_ENABLE_WASM_GDB_REMOTE_DEBUGGING
 
-  // Collect the live modules into a vector first, then cancel them while
-  // releasing our lock. This will allow the background tasks to finish.
-  std::vector<std::shared_ptr<NativeModule>> live_modules;
-  {
-    base::MutexGuard guard(&mutex_);
-    for (auto& entry : native_modules_) {
-      if (auto shared_ptr = entry.second->weak_ptr.lock()) {
-        live_modules.emplace_back(std::move(shared_ptr));
-      }
-    }
-  }
-
-  for (auto& native_module : live_modules) {
-    native_module->compilation_state()->CancelCompilation();
-  }
-  live_modules.clear();
-
-  // Now wait for all background compile tasks to actually finish.
-  std::vector<std::shared_ptr<JobHandle>> compile_job_handles;
-  {
-    base::MutexGuard guard(&mutex_);
-    compile_job_handles = compile_job_handles_;
-  }
-  for (auto& job_handle : compile_job_handles) {
-    if (job_handle->IsValid()) job_handle->Cancel();
-  }
+  operations_barrier_->CancelAndWait();
 
   // All AsyncCompileJobs have been canceled.
   DCHECK(async_compile_jobs_.empty());
@@ -507,7 +511,7 @@ MaybeHandle<WasmModuleObject> WasmEngine::SyncCompile(
   }
 
   // Transfer ownership of the WasmModule to the {Managed<WasmModule>} generated
-  // in {CompileToModuleObject}.
+  // in {CompileToNativeModule}.
   Handle<FixedArray> export_wrappers;
   std::shared_ptr<NativeModule> native_module =
       CompileToNativeModule(isolate, enabled, thrower,
@@ -525,7 +529,11 @@ MaybeHandle<WasmModuleObject> WasmEngine::SyncCompile(
   }
 #endif
 
-  Handle<Script> script = GetOrCreateScript(isolate, native_module);
+  constexpr Vector<const char> kNoSourceUrl;
+  Handle<Script> script =
+      GetOrCreateScript(isolate, native_module, kNoSourceUrl);
+
+  native_module->LogWasmCodes(isolate, *script);
 
   // Create the compiled module object and populate with compiled functions
   // and information needed at instantiation time. This object needs to be
@@ -596,7 +604,7 @@ void WasmEngine::AsyncCompile(
     if (is_shared) {
       // Make a copy of the wire bytes to avoid concurrent modification.
       std::unique_ptr<uint8_t[]> copy(new uint8_t[bytes.length()]);
-      memcpy(copy.get(), bytes.start(), bytes.length());
+      base::Memcpy(copy.get(), bytes.start(), bytes.length());
       ModuleWireBytes bytes_copy(copy.get(), copy.get() + bytes.length());
       module_object = SyncCompile(isolate, enabled, &thrower, bytes_copy);
     } else {
@@ -624,7 +632,7 @@ void WasmEngine::AsyncCompile(
   // Make a copy of the wire bytes in case the user program changes them
   // during asynchronous compilation.
   std::unique_ptr<byte[]> copy(new byte[bytes.length()]);
-  memcpy(copy.get(), bytes.start(), bytes.length());
+  base::Memcpy(copy.get(), bytes.start(), bytes.length());
 
   AsyncCompileJob* job =
       CreateAsyncCompileJob(isolate, enabled, std::move(copy), bytes.length(),
@@ -723,63 +731,64 @@ std::shared_ptr<NativeModule> WasmEngine::ExportNativeModule(
 namespace {
 Handle<Script> CreateWasmScript(Isolate* isolate,
                                 std::shared_ptr<NativeModule> native_module,
-                                Vector<const char> source_url = {}) {
+                                Vector<const char> source_url) {
   Handle<Script> script =
-      isolate->factory()->NewScript(isolate->factory()->empty_string());
+      isolate->factory()->NewScript(isolate->factory()->undefined_value());
   script->set_compilation_state(Script::COMPILATION_STATE_COMPILED);
   script->set_context_data(isolate->native_context()->debug_context_id());
   script->set_type(Script::TYPE_WASM);
 
   Vector<const uint8_t> wire_bytes = native_module->wire_bytes();
-  int hash = StringHasher::HashSequentialString(
-      reinterpret_cast<const char*>(wire_bytes.begin()), wire_bytes.length(),
-      kZeroHashSeed);
-
-  const int kBufferSize = 32;
-  char buffer[kBufferSize];
 
-  // Script name is "<module_name>-hash" if name is available and "hash"
-  // otherwise.
+  // The source URL of the script is
+  // - the original source URL if available (from the streaming API),
+  // - wasm://wasm/<module name>-<hash> if a module name has been set, or
+  // - wasm://wasm/<hash> otherwise.
   const WasmModule* module = native_module->module();
-  Handle<String> name_str;
-  if (module->name.is_set()) {
-    int name_chars = SNPrintF(ArrayVector(buffer), "-%08x", hash);
-    DCHECK(name_chars >= 0 && name_chars < kBufferSize);
-    Handle<String> name_hash =
-        isolate->factory()
-            ->NewStringFromOneByte(
-                VectorOf(reinterpret_cast<uint8_t*>(buffer), name_chars),
-                AllocationType::kOld)
-            .ToHandleChecked();
-    Handle<String> module_name =
-        WasmModuleObject::ExtractUtf8StringFromModuleBytes(
-            isolate, wire_bytes, module->name, kNoInternalize);
-    name_str = isolate->factory()
-                   ->NewConsString(module_name, name_hash)
-                   .ToHandleChecked();
-  } else {
-    int name_chars = SNPrintF(ArrayVector(buffer), "%08x", hash);
-    DCHECK(name_chars >= 0 && name_chars < kBufferSize);
-    name_str = isolate->factory()
-                   ->NewStringFromOneByte(
-                       VectorOf(reinterpret_cast<uint8_t*>(buffer), name_chars),
-                       AllocationType::kOld)
-                   .ToHandleChecked();
-  }
-  script->set_name(*name_str);
-  MaybeHandle<String> url_str;
+  Handle<String> url_str;
   if (!source_url.empty()) {
-    url_str =
-        isolate->factory()->NewStringFromUtf8(source_url, AllocationType::kOld);
+    url_str = isolate->factory()
+                  ->NewStringFromUtf8(source_url, AllocationType::kOld)
+                  .ToHandleChecked();
   } else {
-    Handle<String> url_prefix =
-        isolate->factory()->InternalizeString(StaticCharVector("wasm://wasm/"));
-    url_str = isolate->factory()->NewConsString(url_prefix, name_str);
+    int hash = StringHasher::HashSequentialString(
+        reinterpret_cast<const char*>(wire_bytes.begin()), wire_bytes.length(),
+        kZeroHashSeed);
+
+    EmbeddedVector<char, 32> buffer;
+    if (module->name.is_empty()) {
+      // Build the URL in the form "wasm://wasm/<hash>".
+      int url_len = SNPrintF(buffer, "wasm://wasm/%08x", hash);
+      DCHECK(url_len >= 0 && url_len < buffer.length());
+      url_str = isolate->factory()
+                    ->NewStringFromUtf8(buffer.SubVector(0, url_len),
+                                        AllocationType::kOld)
+                    .ToHandleChecked();
+    } else {
+      // Build the URL in the form "wasm://wasm/<module name>-<hash>".
+      int hash_len = SNPrintF(buffer, "-%08x", hash);
+      DCHECK(hash_len >= 0 && hash_len < buffer.length());
+      Handle<String> prefix =
+          isolate->factory()->NewStringFromStaticChars("wasm://wasm/");
+      Handle<String> module_name =
+          WasmModuleObject::ExtractUtf8StringFromModuleBytes(
+              isolate, wire_bytes, module->name, kNoInternalize);
+      Handle<String> hash_str =
+          isolate->factory()
+              ->NewStringFromUtf8(buffer.SubVector(0, hash_len))
+              .ToHandleChecked();
+      // Concatenate the three parts.
+      url_str = isolate->factory()
+                    ->NewConsString(prefix, module_name)
+                    .ToHandleChecked();
+      url_str = isolate->factory()
+                    ->NewConsString(url_str, hash_str)
+                    .ToHandleChecked();
+    }
   }
-  script->set_source_url(*url_str.ToHandleChecked());
+  script->set_source_url(*url_str);
 
-  const WasmDebugSymbols& debug_symbols =
-      native_module->module()->debug_symbols;
+  const WasmDebugSymbols& debug_symbols = module->debug_symbols;
   if (debug_symbols.type == WasmDebugSymbols::Type::SourceMap &&
       !debug_symbols.external_url.is_empty()) {
     Vector<const char> external_url =
@@ -984,9 +993,8 @@ void WasmEngine::RemoveIsolate(Isolate* isolate) {
     if (RemoveIsolateFromCurrentGC(isolate)) PotentiallyFinishCurrentGC();
   }
   if (auto* task = info->log_codes_task) task->Cancel();
-  if (!info->code_to_log.empty()) {
-    WasmCode::DecrementRefCount(VectorOf(info->code_to_log));
-    info->code_to_log.clear();
+  for (auto& log_entry : info->code_to_log) {
+    WasmCode::DecrementRefCount(VectorOf(log_entry.second.code));
   }
 }
 
@@ -1008,12 +1016,21 @@ void WasmEngine::LogCode(Vector<WasmCode*> code_vec) {
     if (info->code_to_log.empty()) {
       isolate->stack_guard()->RequestLogWasmCode();
     }
-    info->code_to_log.insert(info->code_to_log.end(), code_vec.begin(),
-                             code_vec.end());
     for (WasmCode* code : code_vec) {
       DCHECK_EQ(native_module, code->native_module());
       code->IncRef();
     }
+
+    auto script_it = info->scripts.find(native_module);
+    // If the script does not yet exist, logging will happen later. If the weak
+    // handle is cleared already, we also don't need to log any more.
+    if (script_it == info->scripts.end()) continue;
+    auto& log_entry = info->code_to_log[script_it->second.script_id()];
+    if (!log_entry.source_url) {
+      log_entry.source_url = script_it->second.source_url();
+    }
+    log_entry.code.insert(log_entry.code.end(), code_vec.begin(),
+                          code_vec.end());
   }
 }
 
@@ -1025,23 +1042,27 @@ void WasmEngine::EnableCodeLogging(Isolate* isolate) {
 }
 
 void WasmEngine::LogOutstandingCodesForIsolate(Isolate* isolate) {
-  // If by now we should not log code any more, do not log it.
-  if (!WasmCode::ShouldBeLogged(isolate)) return;
-
   // Under the mutex, get the vector of wasm code to log. Then log and decrement
   // the ref count without holding the mutex.
-  std::vector<WasmCode*> code_to_log;
+  std::unordered_map<int, IsolateInfo::CodeToLogPerScript> code_to_log;
   {
     base::MutexGuard guard(&mutex_);
     DCHECK_EQ(1, isolates_.count(isolate));
     code_to_log.swap(isolates_[isolate]->code_to_log);
   }
-  TRACE_EVENT1("v8.wasm", "wasm.LogCode", "codeObjects", code_to_log.size());
-  if (code_to_log.empty()) return;
-  for (WasmCode* code : code_to_log) {
-    code->LogCode(isolate);
+
+  // Check again whether we still need to log code.
+  bool should_log = WasmCode::ShouldBeLogged(isolate);
+
+  TRACE_EVENT0("v8.wasm", "wasm.LogCode");
+  for (auto& pair : code_to_log) {
+    for (WasmCode* code : pair.second.code) {
+      if (should_log) {
+        code->LogCode(isolate, pair.second.source_url.get(), pair.first);
+      }
+    }
+    WasmCode::DecrementRefCount(VectorOf(pair.second.code));
   }
-  WasmCode::DecrementRefCount(VectorOf(code_to_log));
 }
 
 std::shared_ptr<NativeModule> WasmEngine::NewNativeModule(
@@ -1146,17 +1167,23 @@ void WasmEngine::FreeNativeModule(NativeModule* native_module) {
     // If there are {WasmCode} objects of the deleted {NativeModule}
     // outstanding to be logged in this isolate, remove them. Decrementing the
     // ref count is not needed, since the {NativeModule} dies anyway.
-    size_t remaining = info->code_to_log.size();
-    if (remaining > 0) {
-      for (size_t i = 0; i < remaining; ++i) {
-        while (i < remaining &&
-               info->code_to_log[i]->native_module() == native_module) {
-          // Move the last remaining item to this slot (this can be the same
-          // as {i}, which is OK).
-          info->code_to_log[i] = info->code_to_log[--remaining];
-        }
+    for (auto& log_entry : info->code_to_log) {
+      auto part_of_native_module = [native_module](WasmCode* code) {
+        return code->native_module() == native_module;
+      };
+      std::vector<WasmCode*>& code = log_entry.second.code;
+      auto new_end =
+          std::remove_if(code.begin(), code.end(), part_of_native_module);
+      code.erase(new_end, code.end());
+    }
+    // Now remove empty entries in {code_to_log}.
+    for (auto it = info->code_to_log.begin(), end = info->code_to_log.end();
+         it != end;) {
+      if (it->second.code.empty()) {
+        it = info->code_to_log.erase(it);
+      } else {
+        ++it;
       }
-      info->code_to_log.resize(remaining);
     }
   }
   // If there is a GC running which has references to code contained in the
@@ -1333,12 +1360,9 @@ Handle<Script> WasmEngine::GetOrCreateScript(
   }
 }
 
-void WasmEngine::ShepherdCompileJobHandle(
-    std::shared_ptr<JobHandle> job_handle) {
-  DCHECK_NOT_NULL(job_handle);
-  base::MutexGuard guard(&mutex_);
-  // TODO(clemensb): Add occasional cleanup of finished handles.
-  compile_job_handles_.emplace_back(std::move(job_handle));
+std::shared_ptr<OperationsBarrier>
+WasmEngine::GetBarrierForBackgroundCompile() {
+  return operations_barrier_;
 }
 
 void WasmEngine::TriggerGC(int8_t gc_sequence_index) {
diff --git a/deps/v8/src/wasm/wasm-engine.h b/deps/v8/src/wasm/wasm-engine.h
index a38308110b22dd..e3013013e96322 100644
--- a/deps/v8/src/wasm/wasm-engine.h
+++ b/deps/v8/src/wasm/wasm-engine.h
@@ -14,6 +14,7 @@
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/tasks/cancelable-task.h"
+#include "src/tasks/operations-barrier.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-tier.h"
 #include "src/zone/accounting-allocator.h"
@@ -332,11 +333,11 @@ class V8_EXPORT_PRIVATE WasmEngine {
 
   Handle<Script> GetOrCreateScript(Isolate*,
                                    const std::shared_ptr<NativeModule>&,
-                                   Vector<const char> source_url = {});
+                                   Vector<const char> source_url);
 
-  // Take shared ownership of a compile job handle, such that we can synchronize
-  // on that before the engine dies.
-  void ShepherdCompileJobHandle(std::shared_ptr<JobHandle>);
+  // Returns a barrier allowing background compile operations if valid and
+  // preventing this object from being destroyed.
+  std::shared_ptr<OperationsBarrier> GetBarrierForBackgroundCompile();
 
   // Call on process start and exit.
   static void InitializeOncePerProcess();
@@ -399,9 +400,8 @@ class V8_EXPORT_PRIVATE WasmEngine {
   std::unordered_map<NativeModule*, std::unique_ptr<NativeModuleInfo>>
       native_modules_;
 
-  // Background compile jobs that are still running. We need to join them before
-  // the engine gets deleted. Otherwise we don't care when exactly they finish.
-  std::vector<std::shared_ptr<JobHandle>> compile_job_handles_;
+  std::shared_ptr<OperationsBarrier> operations_barrier_{
+      std::make_shared<OperationsBarrier>()};
 
   // Size of code that became dead since the last GC. If this exceeds a certain
   // threshold, a new GC is triggered.
diff --git a/deps/v8/src/wasm/wasm-external-refs.cc b/deps/v8/src/wasm/wasm-external-refs.cc
index e8e8cf8d50c822..f3d900b79af487 100644
--- a/deps/v8/src/wasm/wasm-external-refs.cc
+++ b/deps/v8/src/wasm/wasm-external-refs.cc
@@ -416,7 +416,7 @@ void f32x4_nearest_int_wrapper(Address data) {
 }
 
 namespace {
-class ThreadNotInWasmScope {
+class V8_NODISCARD ThreadNotInWasmScope {
 // Asan on Windows triggers exceptions to allocate shadow memory lazily. When
 // this function is called from WebAssembly, these exceptions would be handled
 // by the trap handler before they get handled by Asan, and thereby confuse the
@@ -485,7 +485,7 @@ int32_t memory_init_wrapper(Address data) {
   constexpr int32_t kSuccess = 1;
   constexpr int32_t kOutOfBounds = 0;
   ThreadNotInWasmScope thread_not_in_wasm_scope;
-  DisallowHeapAllocation disallow_heap_allocation;
+  DisallowGarbageCollection no_gc;
   size_t offset = 0;
   Object raw_instance = ReadAndIncrementOffset<Object>(data, &offset);
   WasmInstanceObject instance = WasmInstanceObject::cast(raw_instance);
@@ -511,7 +511,7 @@ int32_t memory_copy_wrapper(Address data) {
   constexpr int32_t kSuccess = 1;
   constexpr int32_t kOutOfBounds = 0;
   ThreadNotInWasmScope thread_not_in_wasm_scope;
-  DisallowHeapAllocation disallow_heap_allocation;
+  DisallowGarbageCollection no_gc;
   size_t offset = 0;
   Object raw_instance = ReadAndIncrementOffset<Object>(data, &offset);
   WasmInstanceObject instance = WasmInstanceObject::cast(raw_instance);
@@ -534,7 +534,7 @@ int32_t memory_fill_wrapper(Address data) {
   constexpr int32_t kOutOfBounds = 0;
 
   ThreadNotInWasmScope thread_not_in_wasm_scope;
-  DisallowHeapAllocation disallow_heap_allocation;
+  DisallowGarbageCollection no_gc;
 
   size_t offset = 0;
   Object raw_instance = ReadAndIncrementOffset<Object>(data, &offset);
diff --git a/deps/v8/src/wasm/wasm-feature-flags.h b/deps/v8/src/wasm/wasm-feature-flags.h
index a536a8706da76a..a8b17bb554bf23 100644
--- a/deps/v8/src/wasm/wasm-feature-flags.h
+++ b/deps/v8/src/wasm/wasm-feature-flags.h
@@ -10,11 +10,6 @@
 
 // Experimental features (disabled by default).
 #define FOREACH_WASM_EXPERIMENTAL_FEATURE_FLAG(V) /*     (force 80 columns) */ \
-  /* Exception handling proposal. */                                           \
-  /* https://github.com/WebAssembly/exception-handling */                      \
-  /* V8 side owner: clemensb */                                                \
-  V(eh, "exception handling opcodes", false)                                   \
-                                                                               \
   /* No official proposal (yet?). */                                           \
   /* V8 side owner: clemensb */                                                \
   V(compilation_hints, "compilation hints section", false)                     \
@@ -27,7 +22,7 @@
                                                                                \
   /* Typed function references proposal. */                                    \
   /* Official proposal: https://github.com/WebAssembly/function-references */  \
-  /* V8 side owner: ahaas */                                                   \
+  /* V8 side owner: manoskouk */                                               \
   V(typed_funcref, "typed function references", false)                         \
                                                                                \
   /* Memory64 proposal. */                                                     \
@@ -44,6 +39,11 @@
 // be shipped with enough lead time to the next branch to allow for
 // stabilization.
 #define FOREACH_WASM_STAGING_FEATURE_FLAG(V) /*          (force 80 columns) */ \
+  /* Exception handling proposal. */                                           \
+  /* https://github.com/WebAssembly/exception-handling */                      \
+  /* V8 side owner: thibaudm */                                                \
+  V(eh, "exception handling opcodes", false)                                   \
+                                                                               \
   /* Reference Types, a.k.a. reftypes proposal. */                             \
   /* https://github.com/WebAssembly/reference-types */                         \
   /* V8 side owner: ahaas */                                                   \
@@ -80,14 +80,6 @@
 // Shipped features (enabled by default). Remove the feature flag once they hit
 // stable and are expected to stay enabled.
 #define FOREACH_WASM_SHIPPED_FEATURE_FLAG(V) /*          (force 80 columns) */ \
-  /* JS BigInt to wasm i64 integration. */                                     \
-  /* https://github.com/WebAssembly/JS-BigInt-integration */                   \
-  /* V8 side owner: ahaas, ssauleau@igalia.com */                              \
-  /* Shipped in v8.5. */                                                       \
-  /* ITS: https://groups.google.com/a/chromium.org/g/blink-dev/c/           */ \
-  /*              g4QKRUQV1-0/m/jdWjD1uZAAAJ                                */ \
-  V(bigint, "JS BigInt support", true)                                         \
-                                                                               \
   /* Bulk memory operations. */                                                \
   /* https://github.com/webassembly/bulk-memory-operations */                  \
   /* V8 side owner: binji */                                                   \
diff --git a/deps/v8/src/wasm/wasm-import-wrapper-cache.h b/deps/v8/src/wasm/wasm-import-wrapper-cache.h
index acd4a299da1ad5..9d159006421db7 100644
--- a/deps/v8/src/wasm/wasm-import-wrapper-cache.h
+++ b/deps/v8/src/wasm/wasm-import-wrapper-cache.h
@@ -51,7 +51,7 @@ class WasmImportWrapperCache {
   };
 
   // Helper class to modify the cache under a lock.
-  class ModificationScope {
+  class V8_NODISCARD ModificationScope {
    public:
     explicit ModificationScope(WasmImportWrapperCache* cache)
         : cache_(cache), guard_(&cache->mutex_) {}
diff --git a/deps/v8/src/wasm/wasm-js.cc b/deps/v8/src/wasm/wasm-js.cc
index 4edd23eecf8124..db9f34528ce4cb 100644
--- a/deps/v8/src/wasm/wasm-js.cc
+++ b/deps/v8/src/wasm/wasm-js.cc
@@ -12,6 +12,7 @@
 #include "src/ast/ast.h"
 #include "src/base/logging.h"
 #include "src/base/overflowing-math.h"
+#include "src/base/platform/wrappers.h"
 #include "src/common/assert-scope.h"
 #include "src/execution/execution.h"
 #include "src/execution/frames-inl.h"
@@ -19,7 +20,6 @@
 #include "src/handles/handles.h"
 #include "src/heap/factory.h"
 #include "src/init/v8.h"
-#include "src/objects/js-collection-inl.h"
 #include "src/objects/js-promise-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/templates.h"
@@ -637,7 +637,7 @@ void WebAssemblyValidate(const v8::FunctionCallbackInfo<v8::Value>& args) {
   if (is_shared) {
     // Make a copy of the wire bytes to avoid concurrent modification.
     std::unique_ptr<uint8_t[]> copy(new uint8_t[bytes.length()]);
-    memcpy(copy.get(), bytes.start(), bytes.length());
+    base::Memcpy(copy.get(), bytes.start(), bytes.length());
     i::wasm::ModuleWireBytes bytes_copy(copy.get(),
                                         copy.get() + bytes.length());
     validated = i_isolate->wasm_engine()->SyncValidate(
@@ -680,7 +680,7 @@ void WebAssemblyModule(const v8::FunctionCallbackInfo<v8::Value>& args) {
   if (is_shared) {
     // Make a copy of the wire bytes to avoid concurrent modification.
     std::unique_ptr<uint8_t[]> copy(new uint8_t[bytes.length()]);
-    memcpy(copy.get(), bytes.start(), bytes.length());
+    base::Memcpy(copy.get(), bytes.start(), bytes.length());
     i::wasm::ModuleWireBytes bytes_copy(copy.get(),
                                         copy.get() + bytes.length());
     module_obj = i_isolate->wasm_engine()->SyncCompile(
@@ -1312,11 +1312,6 @@ void WebAssemblyGlobal(const v8::FunctionCallbackInfo<v8::Value>& args) {
     case i::wasm::ValueType::kI64: {
       int64_t i64_value = 0;
       if (!value->IsUndefined()) {
-        if (!enabled_features.has_bigint()) {
-          thrower.TypeError("Can't set the value of i64 WebAssembly.Global");
-          return;
-        }
-
         v8::Local<v8::BigInt> bigint_value;
         if (!value->ToBigInt(context).ToLocal(&bigint_value)) return;
         i64_value = bigint_value->Int64Value();
@@ -1350,7 +1345,8 @@ void WebAssemblyGlobal(const v8::FunctionCallbackInfo<v8::Value>& args) {
     case i::wasm::ValueType::kOptRef: {
       switch (type.heap_representation()) {
         case i::wasm::HeapType::kExtern:
-        case i::wasm::HeapType::kExn: {
+        case i::wasm::HeapType::kExn:
+        case i::wasm::HeapType::kAny: {
           if (args.Length() < 2) {
             // When no initial value is provided, we have to use the WebAssembly
             // default value 'null', and not the JS default value 'undefined'.
@@ -1826,13 +1822,8 @@ void WebAssemblyGlobalGetValueCommon(
       return_value.Set(receiver->GetI32());
       break;
     case i::wasm::ValueType::kI64: {
-      auto enabled_features = i::wasm::WasmFeatures::FromIsolate(i_isolate);
-      if (enabled_features.has_bigint()) {
-        Local<BigInt> value = BigInt::New(isolate, receiver->GetI64());
-        return_value.Set(value);
-      } else {
-        thrower.TypeError("Can't get the value of i64 WebAssembly.Global");
-      }
+      Local<BigInt> value = BigInt::New(isolate, receiver->GetI64());
+      return_value.Set(value);
       break;
     }
     case i::wasm::ValueType::kF32:
@@ -1850,6 +1841,7 @@ void WebAssemblyGlobalGetValueCommon(
         case i::wasm::HeapType::kExtern:
         case i::wasm::HeapType::kFunc:
         case i::wasm::HeapType::kExn:
+        case i::wasm::HeapType::kAny:
           return_value.Set(Utils::ToLocal(receiver->GetRef()));
           break;
         case i::wasm::HeapType::kEq:
@@ -1908,14 +1900,9 @@ void WebAssemblyGlobalSetValue(
       break;
     }
     case i::wasm::ValueType::kI64: {
-      auto enabled_features = i::wasm::WasmFeatures::FromIsolate(i_isolate);
-      if (enabled_features.has_bigint()) {
-        v8::Local<v8::BigInt> bigint_value;
-        if (!args[0]->ToBigInt(context).ToLocal(&bigint_value)) return;
-        receiver->SetI64(bigint_value->Int64Value());
-      } else {
-        thrower.TypeError("Can't set the value of i64 WebAssembly.Global");
-      }
+      v8::Local<v8::BigInt> bigint_value;
+      if (!args[0]->ToBigInt(context).ToLocal(&bigint_value)) return;
+      receiver->SetI64(bigint_value->Int64Value());
       break;
     }
     case i::wasm::ValueType::kF32: {
@@ -1938,6 +1925,7 @@ void WebAssemblyGlobalSetValue(
       switch (receiver->type().heap_representation()) {
         case i::wasm::HeapType::kExtern:
         case i::wasm::HeapType::kExn:
+        case i::wasm::HeapType::kAny:
           receiver->SetExternRef(Utils::OpenHandle(*args[0]));
           break;
         case i::wasm::HeapType::kFunc: {
@@ -1988,10 +1976,14 @@ void WebAssemblyGlobalType(const v8::FunctionCallbackInfo<v8::Value>& args) {
 // TODO(titzer): we use the API to create the function template because the
 // internal guts are too ugly to replicate here.
 static i::Handle<i::FunctionTemplateInfo> NewFunctionTemplate(
-    i::Isolate* i_isolate, FunctionCallback func, bool has_prototype) {
+    i::Isolate* i_isolate, FunctionCallback func, bool has_prototype,
+    SideEffectType side_effect_type = SideEffectType::kHasSideEffect) {
   Isolate* isolate = reinterpret_cast<Isolate*>(i_isolate);
-  Local<FunctionTemplate> templ = FunctionTemplate::New(isolate, func);
-  has_prototype ? templ->ReadOnlyPrototype() : templ->RemovePrototype();
+  ConstructorBehavior behavior =
+      has_prototype ? ConstructorBehavior::kAllow : ConstructorBehavior::kThrow;
+  Local<FunctionTemplate> templ = FunctionTemplate::New(
+      isolate, func, {}, {}, 0, behavior, side_effect_type);
+  if (has_prototype) templ->ReadOnlyPrototype();
   return v8::Utils::OpenHandle(*templ);
 }
 
@@ -2004,22 +1996,26 @@ static i::Handle<i::ObjectTemplateInfo> NewObjectTemplate(
 
 namespace internal {
 
-Handle<JSFunction> CreateFunc(Isolate* isolate, Handle<String> name,
-                              FunctionCallback func, bool has_prototype) {
+Handle<JSFunction> CreateFunc(
+    Isolate* isolate, Handle<String> name, FunctionCallback func,
+    bool has_prototype,
+    SideEffectType side_effect_type = SideEffectType::kHasSideEffect) {
   Handle<FunctionTemplateInfo> temp =
-      NewFunctionTemplate(isolate, func, has_prototype);
+      NewFunctionTemplate(isolate, func, has_prototype, side_effect_type);
   Handle<JSFunction> function =
       ApiNatives::InstantiateFunction(temp, name).ToHandleChecked();
   DCHECK(function->shared().HasSharedName());
   return function;
 }
 
-Handle<JSFunction> InstallFunc(Isolate* isolate, Handle<JSObject> object,
-                               const char* str, FunctionCallback func,
-                               int length, bool has_prototype = false,
-                               PropertyAttributes attributes = NONE) {
+Handle<JSFunction> InstallFunc(
+    Isolate* isolate, Handle<JSObject> object, const char* str,
+    FunctionCallback func, int length, bool has_prototype = false,
+    PropertyAttributes attributes = NONE,
+    SideEffectType side_effect_type = SideEffectType::kHasSideEffect) {
   Handle<String> name = v8_str(isolate, str);
-  Handle<JSFunction> function = CreateFunc(isolate, name, func, has_prototype);
+  Handle<JSFunction> function =
+      CreateFunc(isolate, name, func, has_prototype, side_effect_type);
   function->shared().set_length(length);
   JSObject::AddProperty(isolate, object, name, function, attributes);
   return function;
@@ -2041,7 +2037,8 @@ void InstallGetter(Isolate* isolate, Handle<JSObject> object, const char* str,
                    FunctionCallback func) {
   Handle<String> name = v8_str(isolate, str);
   Handle<JSFunction> function =
-      CreateFunc(isolate, GetterName(isolate, name), func, false);
+      CreateFunc(isolate, GetterName(isolate, name), func, false,
+                 SideEffectType::kHasNoSideEffect);
 
   Utils::ToLocal(object)->SetAccessorProperty(Utils::ToLocal(name),
                                               Utils::ToLocal(function),
@@ -2094,9 +2091,13 @@ void WasmJs::Install(Isolate* isolate, bool exposed_on_global_object) {
 
   // Setup WebAssembly
   Handle<String> name = v8_str(isolate, "WebAssembly");
-  NewFunctionArgs args = NewFunctionArgs::ForFunctionWithoutCode(
-      name, isolate->strict_function_map(), LanguageMode::kStrict);
-  Handle<JSFunction> cons = factory->NewFunction(args);
+  // Not supposed to be called, hence using the kIllegal builtin as code.
+  Handle<SharedFunctionInfo> info =
+      factory->NewSharedFunctionInfoForBuiltin(name, Builtins::kIllegal);
+  info->set_language_mode(LanguageMode::kStrict);
+
+  Handle<JSFunction> cons =
+      Factory::JSFunctionBuilder{isolate, info, context}.Build();
   JSFunction::SetPrototype(cons, isolate->initial_object_prototype());
   Handle<JSObject> webassembly =
       factory->NewJSObject(cons, AllocationType::kOld);
@@ -2287,775 +2288,6 @@ void WasmJs::Install(Isolate* isolate, bool exposed_on_global_object) {
                         runtime_error, DONT_ENUM);
 }
 
-namespace {
-void SetMapValue(Isolate* isolate, Handle<JSMap> map, Handle<Object> key,
-                 Handle<Object> value) {
-  DCHECK(!map.is_null() && !key.is_null() && !value.is_null());
-  Handle<Object> argv[] = {key, value};
-  Execution::CallBuiltin(isolate, isolate->map_set(), map, arraysize(argv),
-                         argv)
-      .Check();
-}
-
-Handle<Object> GetMapValue(Isolate* isolate, Handle<JSMap> map,
-                           Handle<Object> key) {
-  DCHECK(!map.is_null() && !key.is_null());
-  Handle<Object> argv[] = {key};
-  return Execution::CallBuiltin(isolate, isolate->map_get(), map,
-                                arraysize(argv), argv)
-      .ToHandleChecked();
-}
-
-// Look up a name in a name table. Name tables are stored under the "names"
-// property of the handler and map names to index.
-base::Optional<int> ResolveValueSelector(Isolate* isolate,
-                                         Handle<Name> property,
-                                         Handle<JSObject> handler,
-                                         bool enable_index_lookup) {
-  size_t index = 0;
-  if (enable_index_lookup && property->AsIntegerIndex(&index) &&
-      index < kMaxInt) {
-    return static_cast<int>(index);
-  }
-
-  Handle<Object> name_table =
-      JSObject::GetProperty(isolate, handler, "names").ToHandleChecked();
-  DCHECK(name_table->IsJSMap());
-
-  Handle<Object> object =
-      GetMapValue(isolate, Handle<JSMap>::cast(name_table), property);
-  if (object->IsUndefined()) return {};
-  DCHECK(object->IsNumeric());
-  return NumberToInt32(*object);
-}
-
-// Helper for unpacking a maybe name that makes a default with an index if
-// the name is empty. If the name is not empty, it's prefixed with a $.
-Handle<String> GetNameOrDefault(Isolate* isolate,
-                                MaybeHandle<String> maybe_name,
-                                const char* default_name_prefix, int index) {
-  Handle<String> name;
-  if (maybe_name.ToHandle(&name)) {
-    return isolate->factory()
-        ->NewConsString(isolate->factory()->NewStringFromAsciiChecked("$"),
-                        name)
-        .ToHandleChecked();
-  }
-
-  // Maximum length of the default names: $memory-2147483648\0
-  static constexpr int kMaxStrLen = 19;
-  EmbeddedVector<char, kMaxStrLen> value;
-  DCHECK_LT(strlen(default_name_prefix) + /*strlen(kMinInt)*/ 11, kMaxStrLen);
-  int len = SNPrintF(value, "%s%d", default_name_prefix, index);
-  return isolate->factory()->InternalizeString(value.SubVector(0, len));
-}
-
-// Generate names for the locals. Names either come from the name table,
-// otherwise the default $varX is used.
-std::vector<Handle<String>> GetLocalNames(Handle<WasmInstanceObject> instance,
-                                          Address pc) {
-  wasm::NativeModule* native_module = instance->module_object().native_module();
-  wasm::DebugInfo* debug_info = native_module->GetDebugInfo();
-  int num_locals = debug_info->GetNumLocals(pc);
-  auto* isolate = instance->GetIsolate();
-
-  wasm::ModuleWireBytes module_wire_bytes(
-      instance->module_object().native_module()->wire_bytes());
-  const wasm::WasmFunction& function = debug_info->GetFunctionAtAddress(pc);
-
-  std::vector<Handle<String>> names;
-  for (int i = 0; i < num_locals; ++i) {
-    wasm::WireBytesRef local_name_ref =
-        debug_info->GetLocalName(function.func_index, i);
-    DCHECK(module_wire_bytes.BoundsCheck(local_name_ref));
-    Vector<const char> name_vec =
-        module_wire_bytes.GetNameOrNull(local_name_ref);
-    names.emplace_back(GetNameOrDefault(
-        isolate,
-        name_vec.empty() ? MaybeHandle<String>()
-                         : isolate->factory()->NewStringFromUtf8(name_vec),
-        "$var", i));
-  }
-
-  return names;
-}
-
-// Generate names for the globals. Names either come from the name table,
-// otherwise the default $globalX is used.
-std::vector<Handle<String>> GetGlobalNames(
-    Handle<WasmInstanceObject> instance) {
-  Isolate* isolate = instance->GetIsolate();
-  auto& globals = instance->module()->globals;
-  std::vector<Handle<String>> names;
-  for (uint32_t i = 0; i < globals.size(); ++i) {
-    names.emplace_back(GetNameOrDefault(
-        isolate, WasmInstanceObject::GetGlobalNameOrNull(isolate, instance, i),
-        "$global", i));
-  }
-  return names;
-}
-
-// Generate names for the functions.
-std::vector<Handle<String>> GetFunctionNames(
-    Handle<WasmInstanceObject> instance) {
-  Isolate* isolate = instance->GetIsolate();
-  auto* module = instance->module();
-
-  wasm::ModuleWireBytes wire_bytes(
-      instance->module_object().native_module()->wire_bytes());
-
-  std::vector<Handle<String>> names;
-  for (auto& function : module->functions) {
-    DCHECK_EQ(function.func_index, names.size());
-    wasm::WireBytesRef name_ref =
-        module->lazily_generated_names.LookupFunctionName(
-            wire_bytes, function.func_index, VectorOf(module->export_table));
-    DCHECK(wire_bytes.BoundsCheck(name_ref));
-    Vector<const char> name_vec = wire_bytes.GetNameOrNull(name_ref);
-    names.emplace_back(GetNameOrDefault(
-        isolate,
-        name_vec.empty() ? MaybeHandle<String>()
-                         : isolate->factory()->NewStringFromUtf8(name_vec),
-        "$func", function.func_index));
-  }
-
-  return names;
-}
-
-// Generate names for the imports.
-std::vector<Handle<String>> GetImportNames(
-    Handle<WasmInstanceObject> instance) {
-  Isolate* isolate = instance->GetIsolate();
-  const wasm::WasmModule* module = instance->module();
-  Handle<WasmModuleObject> module_object(instance->module_object(), isolate);
-  int num_imports = static_cast<int>(module->import_table.size());
-
-  std::vector<Handle<String>> names;
-  for (int index = 0; index < num_imports; ++index) {
-    const wasm::WasmImport& import = module->import_table[index];
-
-    names.emplace_back(WasmModuleObject::ExtractUtf8StringFromModuleBytes(
-        isolate, module_object, import.field_name, kInternalize));
-  }
-
-  return names;
-}
-
-// Generate names for the memories.
-std::vector<Handle<String>> GetMemoryNames(
-    Handle<WasmInstanceObject> instance) {
-  Isolate* isolate = instance->GetIsolate();
-
-  std::vector<Handle<String>> names;
-  uint32_t memory_count = instance->has_memory_object() ? 1 : 0;
-  for (uint32_t memory_index = 0; memory_index < memory_count; ++memory_index) {
-    names.emplace_back(GetNameOrDefault(isolate,
-                                        WasmInstanceObject::GetMemoryNameOrNull(
-                                            isolate, instance, memory_index),
-                                        "$memory", memory_index));
-  }
-
-  return names;
-}
-
-// Generate names for the tables.
-std::vector<Handle<String>> GetTableNames(Handle<WasmInstanceObject> instance) {
-  Isolate* isolate = instance->GetIsolate();
-  auto tables = handle(instance->tables(), isolate);
-
-  std::vector<Handle<String>> names;
-  for (int table_index = 0; table_index < tables->length(); ++table_index) {
-    auto func_table =
-        handle(WasmTableObject::cast(tables->get(table_index)), isolate);
-    if (!func_table->type().is_reference_to(wasm::HeapType::kFunc)) continue;
-
-    names.emplace_back(GetNameOrDefault(
-        isolate,
-        WasmInstanceObject::GetTableNameOrNull(isolate, instance, table_index),
-        "$table", table_index));
-  }
-  return names;
-}
-
-// Generate names for the exports
-std::vector<Handle<String>> GetExportNames(
-    Handle<WasmInstanceObject> instance) {
-  Isolate* isolate = instance->GetIsolate();
-  const wasm::WasmModule* module = instance->module();
-  Handle<WasmModuleObject> module_object(instance->module_object(), isolate);
-  int num_exports = static_cast<int>(module->export_table.size());
-
-  std::vector<Handle<String>> names;
-
-  for (int index = 0; index < num_exports; ++index) {
-    const wasm::WasmExport& exp = module->export_table[index];
-
-    names.emplace_back(WasmModuleObject::ExtractUtf8StringFromModuleBytes(
-        isolate, module_object, exp.name, kInternalize));
-  }
-  return names;
-}
-
-Handle<WasmInstanceObject> GetInstance(Isolate* isolate,
-                                       Handle<JSObject> handler) {
-  Handle<Object> instance =
-      JSObject::GetProperty(isolate, handler, "instance").ToHandleChecked();
-  DCHECK(instance->IsWasmInstanceObject());
-  return Handle<WasmInstanceObject>::cast(instance);
-}
-
-Address GetPC(Isolate* isolate, Handle<JSObject> handler) {
-  Handle<Object> pc =
-      JSObject::GetProperty(isolate, handler, "pc").ToHandleChecked();
-  DCHECK(pc->IsBigInt());
-  return Handle<BigInt>::cast(pc)->AsUint64();
-}
-
-Address GetFP(Isolate* isolate, Handle<JSObject> handler) {
-  Handle<Object> fp =
-      JSObject::GetProperty(isolate, handler, "fp").ToHandleChecked();
-  DCHECK(fp->IsBigInt());
-  return Handle<BigInt>::cast(fp)->AsUint64();
-}
-
-Address GetCalleeFP(Isolate* isolate, Handle<JSObject> handler) {
-  Handle<Object> callee_fp =
-      JSObject::GetProperty(isolate, handler, "callee_fp").ToHandleChecked();
-  DCHECK(callee_fp->IsBigInt());
-  return Handle<BigInt>::cast(callee_fp)->AsUint64();
-}
-
-// Convert a WasmValue to an appropriate JS representation.
-static Handle<Object> WasmValueToObject(Isolate* isolate,
-                                        wasm::WasmValue value) {
-  auto* factory = isolate->factory();
-  switch (value.type().kind()) {
-    case wasm::ValueType::kI32:
-      return factory->NewNumberFromInt(value.to_i32());
-    case wasm::ValueType::kI64:
-      return BigInt::FromInt64(isolate, value.to_i64());
-    case wasm::ValueType::kF32:
-      return factory->NewNumber(value.to_f32());
-    case wasm::ValueType::kF64:
-      return factory->NewNumber(value.to_f64());
-    case wasm::ValueType::kS128: {
-      wasm::Simd128 s128 = value.to_s128();
-      Handle<JSArrayBuffer> buffer;
-      if (!isolate->factory()
-               ->NewJSArrayBufferAndBackingStore(
-                   kSimd128Size, InitializedFlag::kUninitialized)
-               .ToHandle(&buffer)) {
-        isolate->FatalProcessOutOfHeapMemory(
-            "failed to allocate backing store");
-      }
-
-      memcpy(buffer->allocation_base(), s128.bytes(), buffer->byte_length());
-      return isolate->factory()->NewJSTypedArray(kExternalUint8Array, buffer, 0,
-                                                 buffer->byte_length());
-    }
-    case wasm::ValueType::kRef:
-      return value.to_externref();
-    default:
-      break;
-  }
-  return factory->undefined_value();
-}
-
-base::Optional<int> HasLocalImpl(Isolate* isolate, Handle<Name> property,
-                                 Handle<JSObject> handler,
-                                 bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-
-  base::Optional<int> index =
-      ResolveValueSelector(isolate, property, handler, enable_index_lookup);
-  if (!index) return index;
-  Address pc = GetPC(isolate, handler);
-
-  wasm::DebugInfo* debug_info =
-      instance->module_object().native_module()->GetDebugInfo();
-  int num_locals = debug_info->GetNumLocals(pc);
-  if (0 <= index && index < num_locals) return index;
-  return {};
-}
-
-Handle<Object> GetLocalImpl(Isolate* isolate, Handle<Name> property,
-                            Handle<JSObject> handler,
-                            bool enable_index_lookup) {
-  Factory* factory = isolate->factory();
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-
-  base::Optional<int> index =
-      HasLocalImpl(isolate, property, handler, enable_index_lookup);
-  if (!index) return factory->undefined_value();
-  Address pc = GetPC(isolate, handler);
-  Address fp = GetFP(isolate, handler);
-  Address callee_fp = GetCalleeFP(isolate, handler);
-
-  wasm::DebugInfo* debug_info =
-      instance->module_object().native_module()->GetDebugInfo();
-  wasm::WasmValue value = debug_info->GetLocalValue(*index, pc, fp, callee_fp);
-  return WasmValueToObject(isolate, value);
-}
-
-base::Optional<int> HasGlobalImpl(Isolate* isolate, Handle<Name> property,
-                                  Handle<JSObject> handler,
-                                  bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      ResolveValueSelector(isolate, property, handler, enable_index_lookup);
-  if (!index) return index;
-
-  const std::vector<wasm::WasmGlobal>& globals = instance->module()->globals;
-  if (globals.size() <= kMaxInt && 0 <= *index &&
-      *index < static_cast<int>(globals.size())) {
-    return index;
-  }
-  return {};
-}
-
-Handle<Object> GetGlobalImpl(Isolate* isolate, Handle<Name> property,
-                             Handle<JSObject> handler,
-                             bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      HasGlobalImpl(isolate, property, handler, enable_index_lookup);
-  if (!index) return isolate->factory()->undefined_value();
-
-  const std::vector<wasm::WasmGlobal>& globals = instance->module()->globals;
-  return WasmValueToObject(
-      isolate, WasmInstanceObject::GetGlobalValue(instance, globals[*index]));
-}
-
-base::Optional<int> HasMemoryImpl(Isolate* isolate, Handle<Name> property,
-                                  Handle<JSObject> handler,
-                                  bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      ResolveValueSelector(isolate, property, handler, enable_index_lookup);
-  if (index && *index == 0 && instance->has_memory_object()) return index;
-  return {};
-}
-
-Handle<Object> GetMemoryImpl(Isolate* isolate, Handle<Name> property,
-                             Handle<JSObject> handler,
-                             bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      HasMemoryImpl(isolate, property, handler, enable_index_lookup);
-  if (index) return handle(instance->memory_object(), isolate);
-  return isolate->factory()->undefined_value();
-}
-
-base::Optional<int> HasFunctionImpl(Isolate* isolate, Handle<Name> property,
-                                    Handle<JSObject> handler,
-                                    bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      ResolveValueSelector(isolate, property, handler, enable_index_lookup);
-  if (!index) return index;
-  const std::vector<wasm::WasmFunction>& functions =
-      instance->module()->functions;
-  if (functions.size() <= kMaxInt && 0 <= *index &&
-      *index < static_cast<int>(functions.size())) {
-    return index;
-  }
-  return {};
-}
-
-Handle<Object> GetFunctionImpl(Isolate* isolate, Handle<Name> property,
-                               Handle<JSObject> handler,
-                               bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      HasFunctionImpl(isolate, property, handler, enable_index_lookup);
-  if (!index) return isolate->factory()->undefined_value();
-
-  return WasmInstanceObject::GetOrCreateWasmExternalFunction(isolate, instance,
-                                                             *index);
-}
-
-base::Optional<int> HasTableImpl(Isolate* isolate, Handle<Name> property,
-                                 Handle<JSObject> handler,
-                                 bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      ResolveValueSelector(isolate, property, handler, enable_index_lookup);
-  if (!index) return index;
-  Handle<FixedArray> tables(instance->tables(), isolate);
-  int num_tables = tables->length();
-  if (*index < 0 || *index >= num_tables) return {};
-
-  Handle<WasmTableObject> func_table(WasmTableObject::cast(tables->get(*index)),
-                                     isolate);
-  if (func_table->type().is_reference_to(wasm::HeapType::kFunc)) return index;
-  return {};
-}
-
-Handle<Object> GetTableImpl(Isolate* isolate, Handle<Name> property,
-                            Handle<JSObject> handler,
-                            bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      HasTableImpl(isolate, property, handler, enable_index_lookup);
-  if (!index) return isolate->factory()->undefined_value();
-
-  Handle<WasmTableObject> func_table(
-      WasmTableObject::cast(instance->tables().get(*index)), isolate);
-  return func_table;
-}
-
-base::Optional<int> HasImportImpl(Isolate* isolate, Handle<Name> property,
-                                  Handle<JSObject> handler,
-                                  bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      ResolveValueSelector(isolate, property, handler, enable_index_lookup);
-  if (!index) return index;
-  const wasm::WasmModule* module = instance->module();
-  Handle<WasmModuleObject> module_object(instance->module_object(), isolate);
-  int num_imports = static_cast<int>(module->import_table.size());
-  if (0 <= *index && *index < num_imports) return index;
-  return {};
-}
-
-Handle<JSObject> GetExternalObject(Isolate* isolate,
-                                   wasm::ImportExportKindCode kind,
-                                   uint32_t index) {
-  Handle<JSObject> result = isolate->factory()->NewJSObjectWithNullProto();
-  Handle<Object> value = isolate->factory()->NewNumberFromUint(index);
-  switch (kind) {
-    case wasm::kExternalFunction:
-      JSObject::AddProperty(isolate, result, "func", value, NONE);
-      break;
-    case wasm::kExternalGlobal:
-      JSObject::AddProperty(isolate, result, "global", value, NONE);
-      break;
-    case wasm::kExternalTable:
-      JSObject::AddProperty(isolate, result, "table", value, NONE);
-      break;
-    case wasm::kExternalMemory:
-      JSObject::AddProperty(isolate, result, "mem", value, NONE);
-      break;
-    case wasm::kExternalException:
-      JSObject::AddProperty(isolate, result, "exn", value, NONE);
-      break;
-  }
-  return result;
-}
-
-Handle<Object> GetImportImpl(Isolate* isolate, Handle<Name> property,
-                             Handle<JSObject> handler,
-                             bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      HasImportImpl(isolate, property, handler, enable_index_lookup);
-  if (!index) return isolate->factory()->undefined_value();
-
-  const wasm::WasmImport& imp = instance->module()->import_table[*index];
-  return GetExternalObject(isolate, imp.kind, imp.index);
-}
-
-base::Optional<int> HasExportImpl(Isolate* isolate, Handle<Name> property,
-                                  Handle<JSObject> handler,
-                                  bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      ResolveValueSelector(isolate, property, handler, enable_index_lookup);
-  if (!index) return index;
-
-  const wasm::WasmModule* module = instance->module();
-  Handle<WasmModuleObject> module_object(instance->module_object(), isolate);
-  int num_exports = static_cast<int>(module->export_table.size());
-  if (0 <= *index && *index < num_exports) return index;
-  return {};
-}
-
-Handle<Object> GetExportImpl(Isolate* isolate, Handle<Name> property,
-                             Handle<JSObject> handler,
-                             bool enable_index_lookup) {
-  Handle<WasmInstanceObject> instance = GetInstance(isolate, handler);
-  base::Optional<int> index =
-      HasExportImpl(isolate, property, handler, enable_index_lookup);
-  if (!index) return isolate->factory()->undefined_value();
-
-  const wasm::WasmExport& exp = instance->module()->export_table[*index];
-  return GetExternalObject(isolate, exp.kind, exp.index);
-}
-
-// Generic has trap callback for the index space proxies.
-template <base::Optional<int> Impl(Isolate*, Handle<Name>, Handle<JSObject>,
-                                   bool)>
-void HasTrapCallback(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  DCHECK_GE(args.Length(), 2);
-  Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate());
-  DCHECK(args.This()->IsObject());
-  Handle<JSObject> handler =
-      Handle<JSObject>::cast(Utils::OpenHandle(*args.This()));
-
-  DCHECK(args[1]->IsName());
-  Handle<Name> property = Handle<Name>::cast(Utils::OpenHandle(*args[1]));
-  args.GetReturnValue().Set(Impl(isolate, property, handler, true).has_value());
-}
-
-// Generic get trap callback for the index space proxies.
-template <Handle<Object> Impl(Isolate*, Handle<Name>, Handle<JSObject>, bool)>
-void GetTrapCallback(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  DCHECK_GE(args.Length(), 2);
-  Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate());
-  DCHECK(args.This()->IsObject());
-  Handle<JSObject> handler =
-      Handle<JSObject>::cast(Utils::OpenHandle(*args.This()));
-
-  DCHECK(args[1]->IsName());
-  Handle<Name> property = Handle<Name>::cast(Utils::OpenHandle(*args[1]));
-  args.GetReturnValue().Set(
-      Utils::ToLocal(Impl(isolate, property, handler, true)));
-}
-
-template <typename ReturnT>
-ReturnT DelegateToplevelCall(Isolate* isolate, Handle<JSObject> target,
-                             Handle<Name> property, const char* index_space,
-                             ReturnT (*impl)(Isolate*, Handle<Name>,
-                                             Handle<JSObject>, bool)) {
-  Handle<Object> namespace_proxy =
-      JSObject::GetProperty(isolate, target, index_space).ToHandleChecked();
-  DCHECK(namespace_proxy->IsJSProxy());
-  Handle<JSObject> namespace_handler(
-      JSObject::cast(Handle<JSProxy>::cast(namespace_proxy)->handler()),
-      isolate);
-  return impl(isolate, property, namespace_handler, false);
-}
-
-template <typename ReturnT>
-using DelegateCallback = ReturnT (*)(Isolate*, Handle<Name>, Handle<JSObject>,
-                                     bool);
-
-// Has trap callback for the top-level proxy.
-void ToplevelHasTrapCallback(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  DCHECK_GE(args.Length(), 2);
-  Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate());
-  DCHECK(args[0]->IsObject());
-  Handle<JSObject> target = Handle<JSObject>::cast(Utils::OpenHandle(*args[0]));
-
-  DCHECK(args[1]->IsName());
-  Handle<Name> property = Handle<Name>::cast(Utils::OpenHandle(*args[1]));
-
-  // First check if the property exists on the target.
-  if (JSObject::HasProperty(target, property).FromMaybe(false)) {
-    args.GetReturnValue().Set(true);
-    return;
-  }
-
-  // Now check the index space proxies in order if they know the property.
-  constexpr std::pair<const char*, DelegateCallback<base::Optional<int>>>
-      kDelegates[] = {{"memories", HasMemoryImpl},
-                      {"locals", HasLocalImpl},
-                      {"tables", HasTableImpl},
-                      {"functions", HasFunctionImpl},
-                      {"globals", HasGlobalImpl}};
-  for (auto& delegate : kDelegates) {
-    if (DelegateToplevelCall(isolate, target, property, delegate.first,
-                             delegate.second)) {
-      args.GetReturnValue().Set(true);
-      return;
-    }
-    args.GetReturnValue().Set(false);
-  }
-}
-
-// Get trap callback for the top-level proxy.
-void ToplevelGetTrapCallback(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  DCHECK_GE(args.Length(), 2);
-  Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate());
-  DCHECK(args[0]->IsObject());
-  Handle<JSObject> target = Handle<JSObject>::cast(Utils::OpenHandle(*args[0]));
-
-  DCHECK(args[1]->IsName());
-  Handle<Name> property = Handle<Name>::cast(Utils::OpenHandle(*args[1]));
-
-  // First, check if the property is a proper property on the target. If so,
-  // return its value.
-  Handle<Object> value =
-      JSObject::GetProperty(isolate, target, property).ToHandleChecked();
-  if (!value->IsUndefined()) {
-    args.GetReturnValue().Set(Utils::ToLocal(value));
-    return;
-  }
-
-  // Try the index space proxies in the correct disambiguation order.
-  constexpr std::pair<const char*, DelegateCallback<Handle<Object>>>
-      kDelegates[] = {{"memories", GetMemoryImpl},
-                      {"locals", GetLocalImpl},
-                      {"tables", GetTableImpl},
-                      {"functions", GetFunctionImpl},
-                      {"globals", GetGlobalImpl}};
-  for (auto& delegate : kDelegates) {
-    value = DelegateToplevelCall(isolate, target, property, delegate.first,
-                                 delegate.second);
-    if (!value->IsUndefined()) {
-      args.GetReturnValue().Set(Utils::ToLocal(value));
-      return;
-    }
-  }
-}
-
-// Populate a JSMap with name->index mappings from an ordered list of names.
-Handle<JSMap> GetNameTable(Isolate* isolate,
-                           const std::vector<Handle<String>>& names) {
-  Factory* factory = isolate->factory();
-  Handle<JSMap> name_table = factory->NewJSMap();
-
-  for (size_t i = 0; i < names.size(); ++i) {
-    SetMapValue(isolate, name_table, names[i], factory->NewNumberFromInt64(i));
-  }
-  return name_table;
-}
-
-// Produce a JSProxy with a given name table and get and has trap handlers.
-Handle<JSProxy> GetJSProxy(
-    WasmFrame* frame, Handle<JSMap> name_table,
-    void (*get_callback)(const v8::FunctionCallbackInfo<v8::Value>&),
-    void (*has_callback)(const v8::FunctionCallbackInfo<v8::Value>&)) {
-  Isolate* isolate = frame->isolate();
-  Factory* factory = isolate->factory();
-  Handle<JSObject> target = factory->NewJSObjectWithNullProto();
-  Handle<JSObject> handler = factory->NewJSObjectWithNullProto();
-
-  // Besides the name table, the get and has traps need access to the instance
-  // and frame information.
-  JSObject::AddProperty(isolate, handler, "names", name_table, DONT_ENUM);
-  Handle<WasmInstanceObject> instance(frame->wasm_instance(), isolate);
-  JSObject::AddProperty(isolate, handler, "instance", instance, DONT_ENUM);
-  Handle<BigInt> pc = BigInt::FromInt64(isolate, frame->pc());
-  JSObject::AddProperty(isolate, handler, "pc", pc, DONT_ENUM);
-  Handle<BigInt> fp = BigInt::FromInt64(isolate, frame->fp());
-  JSObject::AddProperty(isolate, handler, "fp", fp, DONT_ENUM);
-  Handle<BigInt> callee_fp = BigInt::FromInt64(isolate, frame->callee_fp());
-  JSObject::AddProperty(isolate, handler, "callee_fp", callee_fp, DONT_ENUM);
-
-  InstallFunc(isolate, handler, "get", get_callback, 3, false, READ_ONLY);
-  InstallFunc(isolate, handler, "has", has_callback, 2, false, READ_ONLY);
-
-  return factory->NewJSProxy(target, handler);
-}
-
-Handle<JSObject> GetStackObject(WasmFrame* frame) {
-  Isolate* isolate = frame->isolate();
-  Handle<JSObject> object = isolate->factory()->NewJSObjectWithNullProto();
-  wasm::DebugInfo* debug_info =
-      frame->wasm_instance().module_object().native_module()->GetDebugInfo();
-  int num_values = debug_info->GetStackDepth(frame->pc());
-  for (int i = 0; i < num_values; ++i) {
-    wasm::WasmValue value = debug_info->GetStackValue(
-        i, frame->pc(), frame->fp(), frame->callee_fp());
-    JSObject::AddDataElement(object, i, WasmValueToObject(isolate, value),
-                             NONE);
-  }
-  return object;
-}
-}  // namespace
-
-// This function generates the JS debug proxy for a given Wasm frame. The debug
-// proxy is used when evaluating debug JS expressions on a wasm frame and let's
-// the developer inspect the engine state from JS. The proxy provides the
-// following interface:
-//
-// type WasmSimdValue = Uint8Array;
-// type WasmValue = number | bigint | object | WasmSimdValue;
-// type WasmFunction = (... args : WasmValue[]) = > WasmValue;
-// type WasmExport = {name : string} & ({func : number} | {table : number} |
-//                                      {mem : number} | {global : number});
-// type WasmImport = {name : string, module : string} &
-//                   ({func : number} | {table : number} | {mem : number} |
-//                    {global : number});
-// interface WasmInterface {
-//   $globalX: WasmValue;
-//   $varX: WasmValue;
-//   $funcX(a : WasmValue /*, ...*/) : WasmValue;
-//   readonly $memoryX : WebAssembly.Memory;
-//   readonly $tableX : WebAssembly.Table;
-//   readonly memories : {[nameOrIndex:string | number] : WebAssembly.Memory};
-//   readonly tables : {[nameOrIndex:string | number] : WebAssembly.Table};
-//   readonly stack : WasmValue[];
-//   readonly imports : {[nameOrIndex:string | number] : WasmImport};
-//   readonly exports : {[nameOrIndex:string | number] : WasmExport};
-//   readonly globals : {[nameOrIndex:string | number] : WasmValue};
-//   readonly locals : {[nameOrIndex:string | number] : WasmValue};
-//   readonly functions : {[nameOrIndex:string | number] : WasmFunction};
-// }
-//
-// The wasm index spaces memories, tables, imports, exports, globals, locals
-// functions are JSProxies that lazily produce values either by index or by
-// name. A top level JSProxy is wrapped around those for top-level lookup of
-// names in the disambiguation order  memory, local, table, function, global.
-// Import and export names are not globally resolved.
-
-Handle<JSProxy> WasmJs::GetJSDebugProxy(WasmFrame* frame) {
-  Isolate* isolate = frame->isolate();
-  Factory* factory = isolate->factory();
-  Handle<WasmInstanceObject> instance(frame->wasm_instance(), isolate);
-
-  // The top level proxy delegates lookups to the index space proxies.
-  Handle<JSObject> handler = factory->NewJSObjectWithNullProto();
-  InstallFunc(isolate, handler, "get", ToplevelGetTrapCallback, 3, false,
-              READ_ONLY);
-  InstallFunc(isolate, handler, "has", ToplevelHasTrapCallback, 2, false,
-              READ_ONLY);
-
-  Handle<JSObject> target = factory->NewJSObjectWithNullProto();
-
-  // Generate JSMaps per index space for name->index lookup. Every index space
-  // proxy is associated with its table for local name lookup.
-
-  auto local_name_table =
-      GetNameTable(isolate, GetLocalNames(instance, frame->pc()));
-  auto locals =
-      GetJSProxy(frame, local_name_table, GetTrapCallback<GetLocalImpl>,
-                 HasTrapCallback<HasLocalImpl>);
-  JSObject::AddProperty(isolate, target, "locals", locals, READ_ONLY);
-
-  auto global_name_table = GetNameTable(isolate, GetGlobalNames(instance));
-  auto globals =
-      GetJSProxy(frame, global_name_table, GetTrapCallback<GetGlobalImpl>,
-                 HasTrapCallback<HasGlobalImpl>);
-  JSObject::AddProperty(isolate, target, "globals", globals, READ_ONLY);
-
-  auto function_name_table = GetNameTable(isolate, GetFunctionNames(instance));
-  auto functions =
-      GetJSProxy(frame, function_name_table, GetTrapCallback<GetFunctionImpl>,
-                 HasTrapCallback<HasFunctionImpl>);
-  JSObject::AddProperty(isolate, target, "functions", functions, READ_ONLY);
-
-  auto memory_name_table = GetNameTable(isolate, GetMemoryNames(instance));
-  auto memories =
-      GetJSProxy(frame, memory_name_table, GetTrapCallback<GetMemoryImpl>,
-                 HasTrapCallback<HasMemoryImpl>);
-  JSObject::AddProperty(isolate, target, "memories", memories, READ_ONLY);
-
-  auto table_name_table = GetNameTable(isolate, GetTableNames(instance));
-  auto tables =
-      GetJSProxy(frame, table_name_table, GetTrapCallback<GetTableImpl>,
-                 HasTrapCallback<HasTableImpl>);
-  JSObject::AddProperty(isolate, target, "tables", tables, READ_ONLY);
-
-  auto import_name_table = GetNameTable(isolate, GetImportNames(instance));
-  auto imports =
-      GetJSProxy(frame, import_name_table, GetTrapCallback<GetImportImpl>,
-                 HasTrapCallback<HasImportImpl>);
-  JSObject::AddProperty(isolate, target, "imports", imports, READ_ONLY);
-
-  auto export_name_table = GetNameTable(isolate, GetExportNames(instance));
-  auto exports =
-      GetJSProxy(frame, export_name_table, GetTrapCallback<GetExportImpl>,
-                 HasTrapCallback<HasExportImpl>);
-  JSObject::AddProperty(isolate, target, "exports", exports, READ_ONLY);
-
-  auto stack = GetStackObject(frame);
-  JSObject::AddProperty(isolate, target, "stack", stack, READ_ONLY);
-
-  return factory->NewJSProxy(target, handler);
-}
-
 #undef ASSIGN
 #undef EXTRACT_THIS
 
diff --git a/deps/v8/src/wasm/wasm-js.h b/deps/v8/src/wasm/wasm-js.h
index 4c9ae9645b504b..e5948d12bb92fe 100644
--- a/deps/v8/src/wasm/wasm-js.h
+++ b/deps/v8/src/wasm/wasm-js.h
@@ -9,7 +9,6 @@
 
 namespace v8 {
 namespace internal {
-class JSProxy;
 class WasmFrame;
 
 namespace wasm {
@@ -21,8 +20,6 @@ class WasmJs {
  public:
   V8_EXPORT_PRIVATE static void Install(Isolate* isolate,
                                         bool exposed_on_global_object);
-
-  V8_EXPORT_PRIVATE static Handle<JSProxy> GetJSDebugProxy(WasmFrame* frame);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/wasm/wasm-limits.h b/deps/v8/src/wasm/wasm-limits.h
index e525c7f07d22c7..3e4fc6fe3b76b8 100644
--- a/deps/v8/src/wasm/wasm-limits.h
+++ b/deps/v8/src/wasm/wasm-limits.h
@@ -51,6 +51,9 @@ constexpr size_t kV8MaxWasmMemories = 1;
 // GC proposal. These limits are not standardized yet.
 constexpr size_t kV8MaxWasmStructFields = 999;
 constexpr uint32_t kV8MaxRttSubtypingDepth = 31;
+// Maximum supported by implementation: ((1<<27)-3).
+// Reason: total object size in bytes must fit into a Smi, for filler objects.
+constexpr size_t kV8MaxWasmArrayLength = 1u << 24;
 
 static_assert(kV8MaxWasmTableSize <= 4294967295,  // 2^32 - 1
               "v8 should not exceed WebAssembly's non-web embedding limits");
diff --git a/deps/v8/src/wasm/wasm-module-builder.cc b/deps/v8/src/wasm/wasm-module-builder.cc
index f2e7d63f52e500..f6a9bfb76b7003 100644
--- a/deps/v8/src/wasm/wasm-module-builder.cc
+++ b/deps/v8/src/wasm/wasm-module-builder.cc
@@ -500,13 +500,14 @@ void WriteGlobalInitializer(ZoneBuffer* buffer, const WasmInitExpr& init,
       buffer->write_i32v(HeapType(init.immediate().heap_type).code());
       break;
     case WasmInitExpr::kRttSub:
+      // The operand to rtt.sub must be emitted first.
+      WriteGlobalInitializer(buffer, *init.operand(), kWasmBottom);
       // TODO(7748): If immediates for rtts remain in the standard, adapt this
       // to emit them.
       STATIC_ASSERT((kExprRttSub >> 8) == kGCPrefix);
       buffer->write_u8(kGCPrefix);
       buffer->write_u8(static_cast<uint8_t>(kExprRttSub));
       buffer->write_i32v(HeapType(init.immediate().heap_type).code());
-      WriteGlobalInitializer(buffer, *init.operand(), kWasmBottom);
       break;
   }
 }
diff --git a/deps/v8/src/wasm/wasm-module-builder.h b/deps/v8/src/wasm/wasm-module-builder.h
index 7d6df375aa0ae3..76bf1894cd88d1 100644
--- a/deps/v8/src/wasm/wasm-module-builder.h
+++ b/deps/v8/src/wasm/wasm-module-builder.h
@@ -6,6 +6,7 @@
 #define V8_WASM_WASM_MODULE_BUILDER_H_
 
 #include "src/base/memory.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/signature.h"
 #include "src/utils/vector.h"
 #include "src/wasm/leb-helper.h"
@@ -88,7 +89,7 @@ class ZoneBuffer : public ZoneObject {
   void write(const byte* data, size_t size) {
     if (size == 0) return;
     EnsureSpace(size);
-    memcpy(pos_, data, size);
+    base::Memcpy(pos_, data, size);
     pos_ += size;
   }
 
@@ -134,7 +135,7 @@ class ZoneBuffer : public ZoneObject {
     if ((pos_ + size) > end_) {
       size_t new_size = size + (end_ - buffer_) * 2;
       byte* new_buffer = zone_->NewArray<byte, Buffer>(new_size);
-      memcpy(new_buffer, buffer_, (pos_ - buffer_));
+      base::Memcpy(new_buffer, buffer_, (pos_ - buffer_));
       pos_ = new_buffer + (pos_ - buffer_);
       buffer_ = new_buffer;
       end_ = new_buffer + new_size;
diff --git a/deps/v8/src/wasm/wasm-module.cc b/deps/v8/src/wasm/wasm-module.cc
index c2082d36b89226..b418fbcc1cc5b2 100644
--- a/deps/v8/src/wasm/wasm-module.cc
+++ b/deps/v8/src/wasm/wasm-module.cc
@@ -2,10 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/wasm/wasm-module.h"
+
 #include <functional>
 #include <memory>
 
 #include "src/api/api-inl.h"
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/debug/interface-types.h"
@@ -19,7 +22,6 @@
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-js.h"
-#include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-objects-inl.h"
 #include "src/wasm/wasm-result.h"
 
@@ -137,7 +139,7 @@ void LazilyGeneratedNames::AddForTesting(int function_index,
 
 AsmJsOffsetInformation::AsmJsOffsetInformation(
     Vector<const byte> encoded_offsets)
-    : encoded_offsets_(OwnedVector<uint8_t>::Of(encoded_offsets)) {}
+    : encoded_offsets_(OwnedVector<const uint8_t>::Of(encoded_offsets)) {}
 
 AsmJsOffsetInformation::~AsmJsOffsetInformation() = default;
 
@@ -568,9 +570,9 @@ Handle<JSArray> GetCustomSections(Isolate* isolate,
       thrower->RangeError("out of memory allocating custom section data");
       return Handle<JSArray>();
     }
-    memcpy(array_buffer->backing_store(),
-           wire_bytes.begin() + section.payload.offset(),
-           section.payload.length());
+    base::Memcpy(array_buffer->backing_store(),
+                 wire_bytes.begin() + section.payload.offset(),
+                 section.payload.length());
 
     matching_sections.push_back(array_buffer);
   }
diff --git a/deps/v8/src/wasm/wasm-module.h b/deps/v8/src/wasm/wasm-module.h
index 9c54f17b9c37cb..ac3fe401cbd9d3 100644
--- a/deps/v8/src/wasm/wasm-module.h
+++ b/deps/v8/src/wasm/wasm-module.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "src/base/optional.h"
+#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/handles/handles.h"
 #include "src/utils/vector.h"
@@ -282,6 +283,8 @@ struct V8_EXPORT_PRIVATE WasmModule {
   uint32_t num_declared_functions = 0;  // excluding imported
   uint32_t num_exported_functions = 0;
   uint32_t num_declared_data_segments = 0;  // From the DataCount section.
+  // Position and size of the code section (payload only, i.e. without section
+  // ID and length).
   WireBytesRef code = {0, 0};
   WireBytesRef name = {0, 0};
   std::vector<TypeDefinition> types;  // by type index
@@ -492,6 +495,14 @@ inline int declared_function_index(const WasmModule* module, int func_index) {
   return declared_idx;
 }
 
+inline bool is_data_ref_type(ValueType type, const WasmModule* module) {
+  // TODO(7748): When we implement dataref (=any struct or array), support
+  // that here.
+  if (!type.has_index()) return false;
+  uint32_t index = type.ref_index();
+  return module->has_struct(index) || module->has_array(index);
+}
+
 // TruncatedUserString makes it easy to output names up to a certain length, and
 // output a truncation followed by '...' if they exceed a limit.
 // Use like this:
@@ -512,7 +523,7 @@ class TruncatedUserString {
   TruncatedUserString(const char* start, size_t len)
       : start_(start), length_(std::min(kMaxLen, static_cast<int>(len))) {
     if (len > static_cast<size_t>(kMaxLen)) {
-      memcpy(buffer_, start, kMaxLen - 3);
+      base::Memcpy(buffer_, start, kMaxLen - 3);
       memset(buffer_ + kMaxLen - 3, '.', 3);
       start_ = buffer_;
     }
diff --git a/deps/v8/src/wasm/wasm-objects-inl.h b/deps/v8/src/wasm/wasm-objects-inl.h
index 744a16c855b2ca..4e6375ad1300e2 100644
--- a/deps/v8/src/wasm/wasm-objects-inl.h
+++ b/deps/v8/src/wasm/wasm-objects-inl.h
@@ -189,9 +189,9 @@ void WasmGlobalObject::SetF64(double value) {
 }
 
 void WasmGlobalObject::SetExternRef(Handle<Object> value) {
-  // We use this getter externref and exnref.
   DCHECK(type().is_reference_to(wasm::HeapType::kExtern) ||
-         type().is_reference_to(wasm::HeapType::kExn));
+         type().is_reference_to(wasm::HeapType::kExn) ||
+         type().is_reference_to(wasm::HeapType::kAny));
   tagged_buffer().set(offset(), *value);
 }
 
@@ -333,12 +333,16 @@ SMI_ACCESSORS(WasmExportedFunctionData, jump_table_offset,
               kJumpTableOffsetOffset)
 SMI_ACCESSORS(WasmExportedFunctionData, function_index, kFunctionIndexOffset)
 ACCESSORS(WasmExportedFunctionData, signature, Foreign, kSignatureOffset)
-SMI_ACCESSORS(WasmExportedFunctionData, call_count, kCallCountOffset)
+SMI_ACCESSORS(WasmExportedFunctionData, wrapper_budget, kWrapperBudgetOffset)
 ACCESSORS(WasmExportedFunctionData, c_wrapper_code, Object, kCWrapperCodeOffset)
 ACCESSORS(WasmExportedFunctionData, wasm_call_target, Object,
           kWasmCallTargetOffset)
 SMI_ACCESSORS(WasmExportedFunctionData, packed_args_size, kPackedArgsSizeOffset)
 
+wasm::FunctionSig* WasmExportedFunctionData::sig() const {
+  return reinterpret_cast<wasm::FunctionSig*>(signature().foreign_address());
+}
+
 // WasmJSFunction
 WasmJSFunction::WasmJSFunction(Address ptr) : JSFunction(ptr) {
   SLOW_DCHECK(IsWasmJSFunction(*this));
@@ -446,6 +450,11 @@ int WasmArray::SizeFor(Map map, int length) {
   return kHeaderSize + RoundUp(element_size * length, kTaggedSize);
 }
 
+int WasmArray::GcSafeSizeFor(Map map, int length) {
+  int element_size = GcSafeType(map)->element_type().element_size_bytes();
+  return kHeaderSize + RoundUp(element_size * length, kTaggedSize);
+}
+
 void WasmTypeInfo::clear_foreign_address(Isolate* isolate) {
 #ifdef V8_HEAP_SANDBOX
   // Due to the type-specific pointer tags for external pointers, we need to
diff --git a/deps/v8/src/wasm/wasm-objects.cc b/deps/v8/src/wasm/wasm-objects.cc
index d06caef4860f4a..3c9298cd091d6d 100644
--- a/deps/v8/src/wasm/wasm-objects.cc
+++ b/deps/v8/src/wasm/wasm-objects.cc
@@ -285,7 +285,7 @@ Handle<WasmTableObject> WasmTableObject::New(
       isolate->native_context()->wasm_table_constructor(), isolate);
   auto table_obj = Handle<WasmTableObject>::cast(
       isolate->factory()->NewJSObject(table_ctor));
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   if (!instance.is_null()) table_obj->set_instance(*instance);
   table_obj->set_entries(*backing_store);
@@ -446,6 +446,7 @@ void WasmTableObject::Set(Isolate* isolate, Handle<WasmTableObject> table,
   switch (table->type().heap_representation()) {
     case wasm::HeapType::kExtern:
     case wasm::HeapType::kExn:
+    case wasm::HeapType::kAny:
       entries->set(entry_index, *entry);
       return;
     case wasm::HeapType::kFunc:
@@ -500,6 +501,7 @@ Handle<Object> WasmTableObject::Get(Isolate* isolate,
       break;
     case wasm::HeapType::kEq:
     case wasm::HeapType::kI31:
+    case wasm::HeapType::kAny:
       // TODO(7748): Implement once we have a story for struct/arrays/i31ref in
       // JS.
       UNIMPLEMENTED();
@@ -1000,7 +1002,7 @@ MaybeHandle<WasmGlobalObject> WasmGlobalObject::New(
       isolate->factory()->NewJSObject(global_ctor));
   {
     // Disallow GC until all fields have acceptable types.
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     if (!instance.is_null()) global_obj->set_instance(*instance);
     global_obj->set_type(type);
     global_obj->set_offset(offset);
@@ -1851,8 +1853,8 @@ Handle<WasmCapiFunction> WasmCapiFunction::New(
   Handle<SharedFunctionInfo> shared =
       isolate->factory()->NewSharedFunctionInfoForWasmCapiFunction(fun_data);
   return Handle<WasmCapiFunction>::cast(
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          shared, isolate->native_context()));
+      Factory::JSFunctionBuilder{isolate, shared, isolate->native_context()}
+          .Build());
 }
 
 WasmInstanceObject WasmExportedFunction::instance() {
@@ -1879,18 +1881,19 @@ Handle<WasmExportedFunction> WasmExportedFunction::New(
     DCHECK_GE(kMaxInt, jump_table_diff);
     jump_table_offset = static_cast<int>(jump_table_diff);
   }
+  Factory* factory = isolate->factory();
   const wasm::FunctionSig* sig = instance->module()->functions[func_index].sig;
   Handle<Foreign> sig_foreign =
-      isolate->factory()->NewForeign(reinterpret_cast<Address>(sig));
+      factory->NewForeign(reinterpret_cast<Address>(sig));
   Handle<WasmExportedFunctionData> function_data =
-      Handle<WasmExportedFunctionData>::cast(isolate->factory()->NewStruct(
+      Handle<WasmExportedFunctionData>::cast(factory->NewStruct(
           WASM_EXPORTED_FUNCTION_DATA_TYPE, AllocationType::kOld));
   function_data->set_wrapper_code(*export_wrapper);
   function_data->set_instance(*instance);
   function_data->set_jump_table_offset(jump_table_offset);
   function_data->set_function_index(func_index);
   function_data->set_signature(*sig_foreign);
-  function_data->set_call_count(0);
+  function_data->set_wrapper_budget(wasm::kGenericWrapperBudget);
   function_data->set_c_wrapper_code(Smi::zero(), SKIP_WRITE_BARRIER);
   function_data->set_wasm_call_target(Smi::zero(), SKIP_WRITE_BARRIER);
   function_data->set_packed_args_size(0);
@@ -1907,7 +1910,7 @@ Handle<WasmExportedFunction> WasmExportedFunction::New(
   if (!maybe_name.ToHandle(&name)) {
     EmbeddedVector<char, 16> buffer;
     int length = SNPrintF(buffer, "%d", func_index);
-    name = isolate->factory()
+    name = factory
                ->NewStringFromOneByte(
                    Vector<uint8_t>::cast(buffer.SubVector(0, length)))
                .ToHandleChecked();
@@ -1934,15 +1937,22 @@ Handle<WasmExportedFunction> WasmExportedFunction::New(
       function_map = isolate->strict_function_map();
       break;
   }
-  NewFunctionArgs args =
-      NewFunctionArgs::ForWasm(name, function_data, function_map);
-  Handle<JSFunction> js_function = isolate->factory()->NewFunction(args);
+
+  Handle<NativeContext> context(isolate->native_context());
+  Handle<SharedFunctionInfo> shared =
+      factory->NewSharedFunctionInfoForWasmExportedFunction(name,
+                                                            function_data);
+  Handle<JSFunction> js_function =
+      Factory::JSFunctionBuilder{isolate, shared, context}
+          .set_map(function_map)
+          .Build();
+
   // According to the spec, exported functions should not have a [[Construct]]
   // method. This does not apply to functions exported from asm.js however.
   DCHECK_EQ(is_asm_js_module, js_function->IsConstructor());
-  js_function->shared().set_length(arity);
-  js_function->shared().set_internal_formal_parameter_count(arity);
-  js_function->shared().set_script(instance->module_object().script());
+  shared->set_length(arity);
+  shared->set_internal_formal_parameter_count(arity);
+  shared->set_script(instance->module_object().script());
   return Handle<WasmExportedFunction>::cast(js_function);
 }
 
@@ -1971,6 +1981,18 @@ bool WasmExportedFunction::MatchesSignature(
   return true;
 }
 
+// static
+std::unique_ptr<char[]> WasmExportedFunction::GetDebugName(
+    const wasm::FunctionSig* sig) {
+  constexpr const char kPrefix[] = "js-to-wasm:";
+  // prefix + parameters + delimiter + returns + zero byte
+  size_t len = strlen(kPrefix) + sig->all().size() + 2;
+  auto buffer = OwnedVector<char>::New(len);
+  memcpy(buffer.start(), kPrefix, strlen(kPrefix));
+  PrintSignature(buffer.as_vector() + strlen(kPrefix), sig);
+  return buffer.ReleaseData();
+}
+
 // static
 bool WasmJSFunction::IsWasmJSFunction(Object object) {
   if (!object.IsJSFunction()) return false;
@@ -1995,9 +2017,9 @@ Handle<WasmJSFunction> WasmJSFunction::New(Isolate* isolate,
   Handle<Code> wrapper_code =
       compiler::CompileJSToJSWrapper(isolate, sig, nullptr).ToHandleChecked();
 
-  Handle<WasmJSFunctionData> function_data =
-      Handle<WasmJSFunctionData>::cast(isolate->factory()->NewStruct(
-          WASM_JS_FUNCTION_DATA_TYPE, AllocationType::kOld));
+  Factory* factory = isolate->factory();
+  Handle<WasmJSFunctionData> function_data = Handle<WasmJSFunctionData>::cast(
+      factory->NewStruct(WASM_JS_FUNCTION_DATA_TYPE, AllocationType::kOld));
   function_data->set_serialized_return_count(return_count);
   function_data->set_serialized_parameter_count(parameter_count);
   function_data->set_serialized_signature(*serialized_sig);
@@ -2027,7 +2049,7 @@ Handle<WasmJSFunction> WasmJSFunction::New(Isolate* isolate,
     function_data->set_wasm_to_js_wrapper_code(*wasm_to_js_wrapper_code);
   }
 
-  Handle<String> name = isolate->factory()->Function_string();
+  Handle<String> name = factory->Function_string();
   if (callable->IsJSFunction()) {
     name = JSFunction::GetName(Handle<JSFunction>::cast(callable));
     name = String::Flatten(isolate, name);
@@ -2035,9 +2057,13 @@ Handle<WasmJSFunction> WasmJSFunction::New(Isolate* isolate,
   Handle<Map> function_map =
       Map::Copy(isolate, isolate->wasm_exported_function_map(),
                 "fresh function map for WasmJSFunction::New");
-  NewFunctionArgs args =
-      NewFunctionArgs::ForWasm(name, function_data, function_map);
-  Handle<JSFunction> js_function = isolate->factory()->NewFunction(args);
+  Handle<NativeContext> context(isolate->native_context());
+  Handle<SharedFunctionInfo> shared =
+      factory->NewSharedFunctionInfoForWasmJSFunction(name, function_data);
+  Handle<JSFunction> js_function =
+      Factory::JSFunctionBuilder{isolate, shared, context}
+          .set_map(function_map)
+          .Build();
   js_function->shared().set_internal_formal_parameter_count(parameter_count);
   return Handle<WasmJSFunction>::cast(js_function);
 }
@@ -2115,6 +2141,10 @@ Handle<AsmWasmData> AsmWasmData::New(
   return result;
 }
 
+static_assert(wasm::kV8MaxWasmArrayLength <=
+                  (Smi::kMaxValue - WasmArray::kHeaderSize) / kDoubleSize,
+              "max Wasm array size must fit into max object size");
+
 namespace wasm {
 
 bool TypecheckJSObject(Isolate* isolate, const WasmModule* module,
@@ -2139,6 +2169,7 @@ bool TypecheckJSObject(Isolate* isolate, const WasmModule* module,
         }
         case HeapType::kExtern:
         case HeapType::kExn:
+        case HeapType::kAny:
           return true;
         case HeapType::kEq: {
           // TODO(7748): Change this when we have a decision on the JS API for
diff --git a/deps/v8/src/wasm/wasm-objects.h b/deps/v8/src/wasm/wasm-objects.h
index dcef1aec8b0809..9d7bdd1c4cc70e 100644
--- a/deps/v8/src/wasm/wasm-objects.h
+++ b/deps/v8/src/wasm/wasm-objects.h
@@ -669,6 +669,10 @@ class WasmExportedFunction : public JSFunction {
   bool MatchesSignature(const wasm::WasmModule* other_module,
                         const wasm::FunctionSig* other_sig);
 
+  // Return a null-terminated string with the debug name in the form
+  // 'js-to-wasm:<sig>'.
+  static std::unique_ptr<char[]> GetDebugName(const wasm::FunctionSig* sig);
+
   DECL_CAST(WasmExportedFunction)
   OBJECT_CONSTRUCTORS(WasmExportedFunction, JSFunction);
 };
@@ -763,11 +767,13 @@ class WasmExportedFunctionData : public Struct {
   DECL_INT_ACCESSORS(jump_table_offset)
   DECL_INT_ACCESSORS(function_index)
   DECL_ACCESSORS(signature, Foreign)
-  DECL_INT_ACCESSORS(call_count)
+  DECL_INT_ACCESSORS(wrapper_budget)
   DECL_ACCESSORS(c_wrapper_code, Object)
   DECL_ACCESSORS(wasm_call_target, Object)
   DECL_INT_ACCESSORS(packed_args_size)
 
+  inline wasm::FunctionSig* sig() const;
+
   DECL_CAST(WasmExportedFunctionData)
 
   // Dispatched behavior.
@@ -932,6 +938,7 @@ class WasmArray : public TorqueGeneratedWasmArray<WasmArray, HeapObject> {
   static inline wasm::ArrayType* GcSafeType(Map map);
 
   static inline int SizeFor(Map map, int length);
+  static inline int GcSafeSizeFor(Map map, int length);
 
   DECL_CAST(WasmArray)
   DECL_PRINTER(WasmArray)
diff --git a/deps/v8/src/wasm/wasm-objects.tq b/deps/v8/src/wasm/wasm-objects.tq
index fc5cfd69851d3d..78214583863d1b 100644
--- a/deps/v8/src/wasm/wasm-objects.tq
+++ b/deps/v8/src/wasm/wasm-objects.tq
@@ -18,7 +18,7 @@ extern class WasmExportedFunctionData extends Struct {
   jump_table_offset: Smi;
   function_index: Smi;
   signature: Foreign;
-  call_count: Smi;
+  wrapper_budget: Smi;
   // The remaining fields are for fast calling from C++. The contract is
   // that they are lazily populated, and either all will be present or none.
   c_wrapper_code: Object;
@@ -107,6 +107,7 @@ extern class AsmWasmData extends Struct {
 @generateCppClass
 extern class WasmTypeInfo extends Foreign {
   parent: Map;
+  supertypes: FixedArray;
   subtypes: ArrayList;
 }
 
diff --git a/deps/v8/src/wasm/wasm-opcodes-inl.h b/deps/v8/src/wasm/wasm-opcodes-inl.h
index 5e0f172bd533c6..2d0ef375dc9735 100644
--- a/deps/v8/src/wasm/wasm-opcodes-inl.h
+++ b/deps/v8/src/wasm/wasm-opcodes-inl.h
@@ -182,9 +182,11 @@ constexpr const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
     // Exception handling opcodes.
     CASE_OP(Try, "try")
     CASE_OP(Catch, "catch")
+    CASE_OP(Delegate, "delegate")
     CASE_OP(Throw, "throw")
     CASE_OP(Rethrow, "rethrow")
-    CASE_OP(BrOnExn, "br_on_exn")
+    CASE_OP(CatchAll, "catch-all")
+    CASE_OP(Unwind, "unwind")
 
     // asm.js-only opcodes.
     CASE_F64_OP(Acos, "acos")
@@ -360,6 +362,9 @@ constexpr const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) {
     CASE_SIGN_OP(I32x4, ExtAddPairwiseI16x8, "extadd_pairwise_i16x8")
     CASE_SIGN_OP(I16x8, ExtAddPairwiseI8x16, "extadd_pairwise_i8x6")
 
+    CASE_OP(PrefetchT, "prefetch_t")
+    CASE_OP(PrefetchNT, "prefetch_nt")
+
     // Atomic operations.
     CASE_OP(AtomicNotify, "atomic.notify")
     CASE_INT_OP(AtomicWait, "atomic.wait")
@@ -476,6 +481,8 @@ constexpr bool WasmOpcodes::IsUnconditionalJump(WasmOpcode opcode) {
     case kExprReturn:
     case kExprReturnCall:
     case kExprReturnCallIndirect:
+    case kExprThrow:
+    case kExprRethrow:
       return true;
     default:
       return false;
diff --git a/deps/v8/src/wasm/wasm-opcodes.cc b/deps/v8/src/wasm/wasm-opcodes.cc
index cdd3c8d11c8119..7b97d6a8a02712 100644
--- a/deps/v8/src/wasm/wasm-opcodes.cc
+++ b/deps/v8/src/wasm/wasm-opcodes.cc
@@ -41,8 +41,7 @@ bool IsJSCompatibleSignature(const FunctionSig* sig, const WasmModule* module,
   for (auto type : sig->all()) {
     // TODO(7748): Allow structs, arrays, rtts and i31s when their
     //             JS-interaction is decided on.
-    if ((type == kWasmI64 && !enabled_features.has_bigint()) ||
-        type == kWasmS128 || type.is_reference_to(HeapType::kI31) ||
+    if (type == kWasmS128 || type.is_reference_to(HeapType::kI31) ||
         (type.has_index() && !module->has_signature(type.ref_index())) ||
         type.is_rtt()) {
       return false;
diff --git a/deps/v8/src/wasm/wasm-opcodes.h b/deps/v8/src/wasm/wasm-opcodes.h
index 76812446a9d714..4d69c939a91379 100644
--- a/deps/v8/src/wasm/wasm-opcodes.h
+++ b/deps/v8/src/wasm/wasm-opcodes.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "src/base/platform/wrappers.h"
 #include "src/common/globals.h"
 #include "src/common/message-template.h"
 #include "src/wasm/value-type.h"
@@ -26,51 +27,53 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
                                                const WasmFeatures&);
 
 // Control expressions and blocks.
-#define FOREACH_CONTROL_OPCODE(V)                         \
-  V(Unreachable, 0x00, _)                                 \
-  V(Nop, 0x01, _)                                         \
-  V(Block, 0x02, _)                                       \
-  V(Loop, 0x03, _)                                        \
-  V(If, 0x04, _)                                          \
-  V(Else, 0x05, _)                                        \
-  V(Try, 0x06, _ /* eh_prototype */)                      \
-  V(Catch, 0x07, _ /* eh_prototype */)                    \
-  V(Throw, 0x08, _ /* eh_prototype */)                    \
-  V(Rethrow, 0x09, _ /* eh_prototype */)                  \
-  V(BrOnExn, 0x0a, _ /* eh prototype */)                  \
-  V(End, 0x0b, _)                                         \
-  V(Br, 0x0c, _)                                          \
-  V(BrIf, 0x0d, _)                                        \
-  V(BrTable, 0x0e, _)                                     \
-  V(Return, 0x0f, _)                                      \
-  V(CallRef, 0x14, _ /* typed_funcref prototype */)       \
-  V(ReturnCallRef, 0x15, _ /* typed_funcref prototype */) \
-  V(Let, 0x17, _ /* typed_funcref prototype */)           \
+#define FOREACH_CONTROL_OPCODE(V)               \
+  V(Unreachable, 0x00, _)                       \
+  V(Nop, 0x01, _)                               \
+  V(Block, 0x02, _)                             \
+  V(Loop, 0x03, _)                              \
+  V(If, 0x04, _)                                \
+  V(Else, 0x05, _)                              \
+  V(Try, 0x06, _ /* eh_prototype */)            \
+  V(Catch, 0x07, _ /* eh_prototype */)          \
+  V(Throw, 0x08, _ /* eh_prototype */)          \
+  V(Rethrow, 0x09, _ /* eh_prototype */)        \
+  V(Unwind, 0x0a, _ /* eh_prototype */)         \
+  V(End, 0x0b, _)                               \
+  V(Br, 0x0c, _)                                \
+  V(BrIf, 0x0d, _)                              \
+  V(BrTable, 0x0e, _)                           \
+  V(Return, 0x0f, _)                            \
+  V(Let, 0x17, _ /* typed_funcref prototype */) \
+  V(Delegate, 0x18, _ /* eh_prototype */)       \
+  V(CatchAll, 0x19, _ /* eh_prototype */)       \
   V(BrOnNull, 0xd4, _ /* gc prototype */)
 
 // Constants, locals, globals, and calls.
-#define FOREACH_MISC_OPCODE(V)   \
-  V(CallFunction, 0x10, _)       \
-  V(CallIndirect, 0x11, _)       \
-  V(ReturnCall, 0x12, _)         \
-  V(ReturnCallIndirect, 0x13, _) \
-  V(Drop, 0x1a, _)               \
-  V(Select, 0x1b, _)             \
-  V(SelectWithType, 0x1c, _)     \
-  V(LocalGet, 0x20, _)           \
-  V(LocalSet, 0x21, _)           \
-  V(LocalTee, 0x22, _)           \
-  V(GlobalGet, 0x23, _)          \
-  V(GlobalSet, 0x24, _)          \
-  V(TableGet, 0x25, _)           \
-  V(TableSet, 0x26, _)           \
-  V(I32Const, 0x41, _)           \
-  V(I64Const, 0x42, _)           \
-  V(F32Const, 0x43, _)           \
-  V(F64Const, 0x44, _)           \
-  V(RefNull, 0xd0, _)            \
-  V(RefIsNull, 0xd1, _)          \
-  V(RefFunc, 0xd2, _)            \
+#define FOREACH_MISC_OPCODE(V)                            \
+  V(CallFunction, 0x10, _)                                \
+  V(CallIndirect, 0x11, _)                                \
+  V(ReturnCall, 0x12, _)                                  \
+  V(ReturnCallIndirect, 0x13, _)                          \
+  V(CallRef, 0x14, _ /* typed_funcref prototype */)       \
+  V(ReturnCallRef, 0x15, _ /* typed_funcref prototype */) \
+  V(Drop, 0x1a, _)                                        \
+  V(Select, 0x1b, _)                                      \
+  V(SelectWithType, 0x1c, _)                              \
+  V(LocalGet, 0x20, _)                                    \
+  V(LocalSet, 0x21, _)                                    \
+  V(LocalTee, 0x22, _)                                    \
+  V(GlobalGet, 0x23, _)                                   \
+  V(GlobalSet, 0x24, _)                                   \
+  V(TableGet, 0x25, _)                                    \
+  V(TableSet, 0x26, _)                                    \
+  V(I32Const, 0x41, _)                                    \
+  V(I64Const, 0x42, _)                                    \
+  V(F32Const, 0x43, _)                                    \
+  V(F64Const, 0x44, _)                                    \
+  V(RefNull, 0xd0, _)                                     \
+  V(RefIsNull, 0xd1, _)                                   \
+  V(RefFunc, 0xd2, _)                                     \
   V(RefAsNonNull, 0xd3, _ /* typed_funcref prototype */)
 
 // Load memory expressions.
@@ -399,6 +402,10 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
   V(I16x8MaxS, 0xfd98, s_ss)                 \
   V(I16x8MaxU, 0xfd99, s_ss)                 \
   V(I16x8RoundingAverageU, 0xfd9b, s_ss)     \
+  V(I16x8ExtMulLowI8x16S, 0xfd9a, s_ss)      \
+  V(I16x8ExtMulHighI8x16S, 0xfd9d, s_ss)     \
+  V(I16x8ExtMulLowI8x16U, 0xfd9e, s_ss)      \
+  V(I16x8ExtMulHighI8x16U, 0xfd9f, s_ss)     \
   V(I32x4Abs, 0xfda0, s_s)                   \
   V(I32x4Neg, 0xfda1, s_s)                   \
   V(V32x4AnyTrue, 0xfda2, i_s)               \
@@ -419,13 +426,22 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
   V(I32x4MaxS, 0xfdb8, s_ss)                 \
   V(I32x4MaxU, 0xfdb9, s_ss)                 \
   V(I32x4DotI16x8S, 0xfdba, s_ss)            \
+  V(I32x4ExtMulLowI16x8S, 0xfdbb, s_ss)      \
+  V(I32x4ExtMulHighI16x8S, 0xfdbd, s_ss)     \
+  V(I32x4ExtMulLowI16x8U, 0xfdbe, s_ss)      \
+  V(I32x4ExtMulHighI16x8U, 0xfdbf, s_ss)     \
   V(I64x2Neg, 0xfdc1, s_s)                   \
+  V(I64x2BitMask, 0xfdc4, i_s)               \
   V(I64x2Shl, 0xfdcb, s_si)                  \
   V(I64x2ShrS, 0xfdcc, s_si)                 \
   V(I64x2ShrU, 0xfdcd, s_si)                 \
   V(I64x2Add, 0xfdce, s_ss)                  \
   V(I64x2Sub, 0xfdd1, s_ss)                  \
   V(I64x2Mul, 0xfdd5, s_ss)                  \
+  V(I64x2ExtMulLowI32x4S, 0xfdd2, s_ss)      \
+  V(I64x2ExtMulHighI32x4S, 0xfdd3, s_ss)     \
+  V(I64x2ExtMulLowI32x4U, 0xfdd6, s_ss)      \
+  V(I64x2ExtMulHighI32x4U, 0xfdd7, s_ss)     \
   V(F32x4Abs, 0xfde0, s_s)                   \
   V(F32x4Neg, 0xfde1, s_s)                   \
   V(F32x4Sqrt, 0xfde3, s_s)                  \
@@ -469,7 +485,9 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
   V(S128Store8Lane, 0xfd5c, v_is)           \
   V(S128Store16Lane, 0xfd5d, v_is)          \
   V(S128Store32Lane, 0xfd5e, v_is)          \
-  V(S128Store64Lane, 0xfd5f, v_is)
+  V(S128Store64Lane, 0xfd5f, v_is)          \
+  V(PrefetchT, 0xfdc5, v_i)                 \
+  V(PrefetchNT, 0xfdc6, v_i)
 
 #define FOREACH_SIMD_POST_MVP_OPCODE(V)     \
   V(I8x16Mul, 0xfd75, s_ss)                 \
@@ -479,25 +497,12 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
   V(I32x4SignSelect, 0xfd7f, s_sss)         \
   V(I64x2SignSelect, 0xfd94, s_sss)         \
   V(I16x8Q15MulRSatS, 0xfd9c, s_ss)         \
-  V(I16x8ExtMulLowI8x16S, 0xfd9a, s_ss)     \
-  V(I16x8ExtMulHighI8x16S, 0xfd9d, s_ss)    \
-  V(I16x8ExtMulLowI8x16U, 0xfd9e, s_ss)     \
-  V(I16x8ExtMulHighI8x16U, 0xfd9f, s_ss)    \
-  V(I32x4ExtMulLowI16x8S, 0xfdbb, s_ss)     \
-  V(I32x4ExtMulHighI16x8S, 0xfdbd, s_ss)    \
-  V(I32x4ExtMulLowI16x8U, 0xfdbe, s_ss)     \
-  V(I32x4ExtMulHighI16x8U, 0xfdbf, s_ss)    \
-  V(I64x2ExtMulLowI32x4S, 0xfdd2, s_ss)     \
-  V(I64x2ExtMulHighI32x4S, 0xfdd3, s_ss)    \
-  V(I64x2ExtMulLowI32x4U, 0xfdd6, s_ss)     \
-  V(I64x2ExtMulHighI32x4U, 0xfdd7, s_ss)    \
   V(I32x4ExtAddPairwiseI16x8S, 0xfda5, s_s) \
   V(I32x4ExtAddPairwiseI16x8U, 0xfda6, s_s) \
   V(I16x8ExtAddPairwiseI8x16S, 0xfdc2, s_s) \
   V(I16x8ExtAddPairwiseI8x16U, 0xfdc3, s_s) \
   V(I64x2Eq, 0xfdc0, s_ss)                  \
   V(F32x4Qfma, 0xfdb4, s_sss)               \
-  V(I64x2BitMask, 0xfdc4, i_s)              \
   V(I64x2SConvertI32x4Low, 0xfdc7, s_s)     \
   V(I64x2SConvertI32x4High, 0xfdc8, s_s)    \
   V(I64x2UConvertI32x4Low, 0xfdc9, s_s)     \
@@ -537,6 +542,14 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
   FOREACH_SIMD_1_OPERAND_1_PARAM_OPCODE(V) \
   FOREACH_SIMD_1_OPERAND_2_PARAM_OPCODE(V)
 
+#define FOREACH_SIMD_OPCODE(V)        \
+  FOREACH_SIMD_0_OPERAND_OPCODE(V)    \
+  FOREACH_SIMD_1_OPERAND_OPCODE(V)    \
+  FOREACH_SIMD_MASK_OPERAND_OPCODE(V) \
+  FOREACH_SIMD_MEM_OPCODE(V)          \
+  FOREACH_SIMD_POST_MVP_MEM_OPCODE(V) \
+  FOREACH_SIMD_CONST_OPCODE(V)
+
 #define FOREACH_NUMERIC_OPCODE(V)                         \
   V(I32SConvertSatF32, 0xfc00, i_f)                       \
   V(I32UConvertSatF32, 0xfc01, i_f)                       \
@@ -657,24 +670,19 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
   V(AtomicFence, 0xfe03, v_v)
 
 // All opcodes.
-#define FOREACH_OPCODE(V)             \
-  FOREACH_CONTROL_OPCODE(V)           \
-  FOREACH_MISC_OPCODE(V)              \
-  FOREACH_SIMPLE_OPCODE(V)            \
-  FOREACH_SIMPLE_PROTOTYPE_OPCODE(V)  \
-  FOREACH_STORE_MEM_OPCODE(V)         \
-  FOREACH_LOAD_MEM_OPCODE(V)          \
-  FOREACH_MISC_MEM_OPCODE(V)          \
-  FOREACH_ASMJS_COMPAT_OPCODE(V)      \
-  FOREACH_SIMD_0_OPERAND_OPCODE(V)    \
-  FOREACH_SIMD_1_OPERAND_OPCODE(V)    \
-  FOREACH_SIMD_MASK_OPERAND_OPCODE(V) \
-  FOREACH_SIMD_MEM_OPCODE(V)          \
-  FOREACH_SIMD_POST_MVP_MEM_OPCODE(V) \
-  FOREACH_SIMD_CONST_OPCODE(V)        \
-  FOREACH_ATOMIC_OPCODE(V)            \
-  FOREACH_ATOMIC_0_OPERAND_OPCODE(V)  \
-  FOREACH_NUMERIC_OPCODE(V)           \
+#define FOREACH_OPCODE(V)            \
+  FOREACH_CONTROL_OPCODE(V)          \
+  FOREACH_MISC_OPCODE(V)             \
+  FOREACH_SIMPLE_OPCODE(V)           \
+  FOREACH_SIMPLE_PROTOTYPE_OPCODE(V) \
+  FOREACH_STORE_MEM_OPCODE(V)        \
+  FOREACH_LOAD_MEM_OPCODE(V)         \
+  FOREACH_MISC_MEM_OPCODE(V)         \
+  FOREACH_ASMJS_COMPAT_OPCODE(V)     \
+  FOREACH_SIMD_OPCODE(V)             \
+  FOREACH_ATOMIC_OPCODE(V)           \
+  FOREACH_ATOMIC_0_OPERAND_OPCODE(V) \
+  FOREACH_NUMERIC_OPCODE(V)          \
   FOREACH_GC_OPCODE(V)
 
 // All signatures.
@@ -705,6 +713,7 @@ bool V8_EXPORT_PRIVATE IsJSCompatibleSignature(const FunctionSig* sig,
   V(d_f, kWasmF64, kWasmF32)                        \
   V(d_i, kWasmF64, kWasmI32)                        \
   V(d_l, kWasmF64, kWasmI64)                        \
+  V(v_i, kWasmStmt, kWasmI32)                       \
   V(v_ii, kWasmStmt, kWasmI32, kWasmI32)            \
   V(v_id, kWasmStmt, kWasmI32, kWasmF64)            \
   V(d_id, kWasmF64, kWasmI32, kWasmF64)             \
@@ -818,7 +827,7 @@ class WasmInitExpr {
     immediate_.f64_const = v;
   }
   explicit WasmInitExpr(uint8_t v[kSimd128Size]) : kind_(kS128Const) {
-    memcpy(immediate_.s128_const.data(), v, kSimd128Size);
+    base::Memcpy(immediate_.s128_const.data(), v, kSimd128Size);
   }
 
   MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR(WasmInitExpr);
diff --git a/deps/v8/src/wasm/wasm-serialization.cc b/deps/v8/src/wasm/wasm-serialization.cc
index 1c73fc5c41ef2a..900851cfed6245 100644
--- a/deps/v8/src/wasm/wasm-serialization.cc
+++ b/deps/v8/src/wasm/wasm-serialization.cc
@@ -4,6 +4,7 @@
 
 #include "src/wasm/wasm-serialization.h"
 
+#include "src/base/platform/wrappers.h"
 #include "src/codegen/assembler-inl.h"
 #include "src/codegen/external-reference-table.h"
 #include "src/objects/objects-inl.h"
@@ -57,7 +58,7 @@ class Writer {
   void WriteVector(const Vector<const byte> v) {
     DCHECK_GE(current_size(), v.size());
     if (v.size() > 0) {
-      memcpy(current_location(), v.begin(), v.size());
+      base::Memcpy(current_location(), v.begin(), v.size());
       pos_ += v.size();
     }
     if (FLAG_trace_wasm_serialization) {
@@ -381,7 +382,7 @@ bool NativeModuleSerializer::WriteCode(const WasmCode* code, Writer* writer) {
     code_start = aligned_buffer.get();
   }
 #endif
-  memcpy(code_start, code->instructions().begin(), code_size);
+  base::Memcpy(code_start, code->instructions().begin(), code_size);
   // Relocate the code.
   int mask = RelocInfo::ModeMask(RelocInfo::WASM_CALL) |
              RelocInfo::ModeMask(RelocInfo::WASM_STUB_CALL) |
@@ -428,7 +429,7 @@ bool NativeModuleSerializer::WriteCode(const WasmCode* code, Writer* writer) {
   }
   // If we copied to an aligned buffer, copy code into serialized buffer.
   if (code_start != serialized_code_start) {
-    memcpy(serialized_code_start, code_start, code_size);
+    base::Memcpy(serialized_code_start, code_start, code_size);
   }
   return true;
 }
@@ -467,6 +468,42 @@ bool WasmSerializer::SerializeNativeModule(Vector<byte> buffer) const {
   return true;
 }
 
+struct DeserializationUnit {
+  Vector<const byte> src_code_buffer;
+  std::unique_ptr<WasmCode> code;
+};
+
+class DeserializationQueue {
+ public:
+  void Add(std::unique_ptr<std::vector<DeserializationUnit>> batch) {
+    base::MutexGuard guard(&mutex_);
+    queue_.push(std::move(batch));
+    cv_.NotifyOne();
+  }
+
+  std::unique_ptr<std::vector<DeserializationUnit>> Pop() {
+    base::MutexGuard guard(&mutex_);
+    while (queue_.empty()) {
+      cv_.Wait(&mutex_);
+    }
+    auto batch = std::move(queue_.front());
+    if (batch) queue_.pop();
+    return batch;
+  }
+
+  std::unique_ptr<std::vector<DeserializationUnit>> UnlockedPop() {
+    DCHECK(!queue_.empty());
+    auto batch = std::move(queue_.front());
+    queue_.pop();
+    return batch;
+  }
+
+ private:
+  base::Mutex mutex_;
+  base::ConditionVariable cv_;
+  std::queue<std::unique_ptr<std::vector<DeserializationUnit>>> queue_;
+};
+
 class V8_EXPORT_PRIVATE NativeModuleDeserializer {
  public:
   explicit NativeModuleDeserializer(NativeModule*);
@@ -476,11 +513,72 @@ class V8_EXPORT_PRIVATE NativeModuleDeserializer {
   bool Read(Reader* reader);
 
  private:
+  friend class CopyAndRelocTask;
+  friend class PublishTask;
+
   bool ReadHeader(Reader* reader);
-  void ReadCode(int fn_index, Reader* reader);
+  DeserializationUnit ReadCodeAndAlloc(int fn_index, Reader* reader);
+  void CopyAndRelocate(const DeserializationUnit& unit);
+  void Publish(std::unique_ptr<std::vector<DeserializationUnit>> batch);
 
   NativeModule* const native_module_;
   bool read_called_;
+#ifdef DEBUG
+  std::atomic<int> total_published_{0};
+#endif
+};
+
+class CopyAndRelocTask : public CancelableTask {
+ public:
+  CopyAndRelocTask(NativeModuleDeserializer* deserializer,
+                   DeserializationQueue& from_queue,
+                   DeserializationQueue& to_queue,
+                   CancelableTaskManager* task_manager)
+      : CancelableTask(task_manager),
+        deserializer_(deserializer),
+        from_queue_(from_queue),
+        to_queue_(to_queue) {}
+
+  void RunInternal() override {
+    CODE_SPACE_WRITE_SCOPE
+    for (;;) {
+      auto batch = from_queue_.Pop();
+      if (!batch) break;
+      for (auto& unit : *batch) {
+        deserializer_->CopyAndRelocate(unit);
+      }
+      to_queue_.Add(std::move(batch));
+    }
+    to_queue_.Add(nullptr);
+  }
+
+ private:
+  NativeModuleDeserializer* deserializer_;
+  DeserializationQueue& from_queue_;
+  DeserializationQueue& to_queue_;
+};
+
+class PublishTask : public CancelableTask {
+ public:
+  PublishTask(NativeModuleDeserializer* deserializer,
+              DeserializationQueue& from_queue,
+              CancelableTaskManager* task_manager)
+      : CancelableTask(task_manager),
+        deserializer_(deserializer),
+        from_queue_(from_queue) {}
+
+  void RunInternal() override {
+    WasmCodeRefScope code_scope;
+    for (;;) {
+      auto batch = from_queue_.Pop();
+      if (!batch) break;
+      deserializer_->Publish(std::move(batch));
+    }
+  }
+
+ private:
+  NativeModuleDeserializer* deserializer_;
+  DeserializationQueue& from_queue_;
 };
 
 NativeModuleDeserializer::NativeModuleDeserializer(NativeModule* native_module)
@@ -494,9 +592,75 @@ bool NativeModuleDeserializer::Read(Reader* reader) {
   uint32_t total_fns = native_module_->num_functions();
   uint32_t first_wasm_fn = native_module_->num_imported_functions();
   WasmCodeRefScope wasm_code_ref_scope;
+
+  DeserializationQueue reloc_queue;
+  DeserializationQueue publish_queue;
+
+  CancelableTaskManager cancelable_task_manager;
+
+  auto copy_task = std::make_unique<CopyAndRelocTask>(
+      this, reloc_queue, publish_queue, &cancelable_task_manager);
+  V8::GetCurrentPlatform()->CallOnWorkerThread(std::move(copy_task));
+
+  auto publish_task = std::make_unique<PublishTask>(this, publish_queue,
+                                                    &cancelable_task_manager);
+  V8::GetCurrentPlatform()->CallOnWorkerThread(std::move(publish_task));
+
+  auto batch = std::make_unique<std::vector<DeserializationUnit>>();
+  int num_batches = 0;
+  const byte* batch_start = reader->current_location();
   for (uint32_t i = first_wasm_fn; i < total_fns; ++i) {
-    ReadCode(i, reader);
+    DeserializationUnit unit = ReadCodeAndAlloc(i, reader);
+    if (unit.code) {
+      batch->push_back(std::move(unit));
+    }
+    uint64_t batch_size_in_bytes = reader->current_location() - batch_start;
+    constexpr int kMinBatchSizeInBytes = 100000;
+    if (batch_size_in_bytes >= kMinBatchSizeInBytes) {
+      reloc_queue.Add(std::move(batch));
+      num_batches++;
+      batch = std::make_unique<std::vector<DeserializationUnit>>();
+      batch_start = reader->current_location();
+    }
+  }
+
+  if (!batch->empty()) {
+    reloc_queue.Add(std::move(batch));
+    num_batches++;
+  }
+  reloc_queue.Add(nullptr);
+
+  // Participate to deserialization in the main thread to ensure progress even
+  // if background tasks are not scheduled.
+  int published = 0;
+  {
+    CODE_SPACE_WRITE_SCOPE
+    for (;;) {
+      auto batch = reloc_queue.Pop();
+      if (!batch) break;
+      for (auto& unit : *batch) {
+        CopyAndRelocate(unit);
+      }
+      Publish(std::move(batch));
+      ++published;
+    }
+  }
+
+  if (published == num_batches) {
+    // {CopyAndRelocTask} did not take any work from the reloc queue, probably
+    // because it was not scheduled yet. Ensure that the end marker gets added
+    // to the queue in this case.
+    publish_queue.Add(nullptr);
+  }
+  cancelable_task_manager.CancelAndWait();
+
+  // Process the publish queue now in case {PublishTask} was canceled.
+  for (;;) {
+    auto batch = publish_queue.UnlockedPop();
+    if (!batch) break;
+    Publish(std::move(batch));
   }
+  DCHECK_EQ(total_published_.load(), num_batches);
   return reader->current_size() == 0;
 }
 
@@ -507,13 +671,14 @@ bool NativeModuleDeserializer::ReadHeader(Reader* reader) {
          imports == native_module_->num_imported_functions();
 }
 
-void NativeModuleDeserializer::ReadCode(int fn_index, Reader* reader) {
+DeserializationUnit NativeModuleDeserializer::ReadCodeAndAlloc(int fn_index,
+                                                               Reader* reader) {
   bool has_code = reader->Read<bool>();
   if (!has_code) {
     DCHECK(FLAG_wasm_lazy_compilation ||
            native_module_->enabled_features().has_compilation_hints());
     native_module_->UseLazyStub(fn_index);
-    return;
+    return {{}, nullptr};
   }
   int constant_pool_offset = reader->Read<int>();
   int safepoint_table_offset = reader->Read<int>();
@@ -529,18 +694,24 @@ void NativeModuleDeserializer::ReadCode(int fn_index, Reader* reader) {
   WasmCode::Kind kind = reader->Read<WasmCode::Kind>();
   ExecutionTier tier = reader->Read<ExecutionTier>();
 
-  auto code_buffer = reader->ReadVector<byte>(code_size);
+  DeserializationUnit unit;
+  unit.src_code_buffer = reader->ReadVector<byte>(code_size);
   auto reloc_info = reader->ReadVector<byte>(reloc_size);
   auto source_pos = reader->ReadVector<byte>(source_position_size);
   auto protected_instructions =
       reader->ReadVector<byte>(protected_instructions_size);
-
-  CODE_SPACE_WRITE_SCOPE
-  WasmCode* code = native_module_->AddDeserializedCode(
-      fn_index, code_buffer, stack_slot_count, tagged_parameter_slots,
+  unit.code = native_module_->AllocateDeserializedCode(
+      fn_index, unit.src_code_buffer, stack_slot_count, tagged_parameter_slots,
       safepoint_table_offset, handler_table_offset, constant_pool_offset,
       code_comment_offset, unpadded_binary_size, protected_instructions,
-      std::move(reloc_info), std::move(source_pos), kind, tier);
+      reloc_info, source_pos, kind, tier);
+  return unit;
+}
+
+void NativeModuleDeserializer::CopyAndRelocate(
+    const DeserializationUnit& unit) {
+  base::Memcpy(unit.code->instructions().begin(), unit.src_code_buffer.begin(),
+               unit.src_code_buffer.size());
 
   // Relocate the code.
   int mask = RelocInfo::ModeMask(RelocInfo::WASM_CALL) |
@@ -549,9 +720,9 @@ void NativeModuleDeserializer::ReadCode(int fn_index, Reader* reader) {
              RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE) |
              RelocInfo::ModeMask(RelocInfo::INTERNAL_REFERENCE_ENCODED);
   auto jump_tables_ref = native_module_->FindJumpTablesForRegion(
-      base::AddressRegionOf(code->instructions()));
-  for (RelocIterator iter(code->instructions(), code->reloc_info(),
-                          code->constant_pool(), mask);
+      base::AddressRegionOf(unit.code->instructions()));
+  for (RelocIterator iter(unit.code->instructions(), unit.code->reloc_info(),
+                          unit.code->constant_pool(), mask);
        !iter.done(); iter.next()) {
     RelocInfo::Mode mode = iter.rinfo()->rmode();
     switch (mode) {
@@ -579,7 +750,7 @@ void NativeModuleDeserializer::ReadCode(int fn_index, Reader* reader) {
       case RelocInfo::INTERNAL_REFERENCE:
       case RelocInfo::INTERNAL_REFERENCE_ENCODED: {
         Address offset = iter.rinfo()->target_internal_reference();
-        Address target = code->instruction_start() + offset;
+        Address target = unit.code->instruction_start() + offset;
         Assembler::deserialization_set_target_internal_reference_at(
             iter.rinfo()->pc(), target, mode);
         break;
@@ -589,12 +760,26 @@ void NativeModuleDeserializer::ReadCode(int fn_index, Reader* reader) {
     }
   }
 
-  code->MaybePrint();
-  code->Validate();
-
   // Finally, flush the icache for that code.
-  FlushInstructionCache(code->instructions().begin(),
-                        code->instructions().size());
+  FlushInstructionCache(unit.code->instructions().begin(),
+                        unit.code->instructions().size());
+}
+
+void NativeModuleDeserializer::Publish(
+    std::unique_ptr<std::vector<DeserializationUnit>> batch) {
+  DCHECK_NOT_NULL(batch);
+  std::vector<std::unique_ptr<WasmCode>> codes;
+  for (auto& unit : *batch) {
+    codes.push_back(std::move(unit).code);
+  }
+  auto published_codes = native_module_->PublishCode(VectorOf(codes));
+  for (auto* wasm_code : published_codes) {
+    wasm_code->MaybePrint();
+    wasm_code->Validate();
+  }
+#ifdef DEBUG
+  total_published_.fetch_add(1);
+#endif
 }
 
 bool IsSupportedVersion(Vector<const byte> header) {
@@ -645,9 +830,6 @@ MaybeHandle<WasmModuleObject> DeserializeNativeModule(
     if (error) return {};
   }
 
-  // Log the code within the generated module for profiling.
-  shared_native_module->LogWasmCodes(isolate);
-
   Handle<FixedArray> export_wrappers;
   CompileJsToWasmWrappers(isolate, shared_native_module->module(),
                           &export_wrappers);
@@ -655,10 +837,14 @@ MaybeHandle<WasmModuleObject> DeserializeNativeModule(
   Handle<Script> script =
       wasm_engine->GetOrCreateScript(isolate, shared_native_module, source_url);
   Handle<WasmModuleObject> module_object = WasmModuleObject::New(
-      isolate, std::move(shared_native_module), script, export_wrappers);
+      isolate, shared_native_module, script, export_wrappers);
 
   // Finish the Wasm script now and make it public to the debugger.
   isolate->debug()->OnAfterCompile(script);
+
+  // Log the code within the generated module for profiling.
+  shared_native_module->LogWasmCodes(isolate, *script);
+
   return module_object;
 }
 
diff --git a/deps/v8/src/wasm/wasm-subtyping.cc b/deps/v8/src/wasm/wasm-subtyping.cc
index 630c1aa62816e9..861114b54ce82a 100644
--- a/deps/v8/src/wasm/wasm-subtyping.cc
+++ b/deps/v8/src/wasm/wasm-subtyping.cc
@@ -269,29 +269,26 @@ bool FunctionIsSubtypeOf(uint32_t subtype_index, uint32_t supertype_index,
 
 }  // namespace
 
-// TODO(7748): Extend this with any-heap subtyping.
 V8_NOINLINE V8_EXPORT_PRIVATE bool IsSubtypeOfImpl(
     ValueType subtype, ValueType supertype, const WasmModule* sub_module,
     const WasmModule* super_module) {
   DCHECK(subtype != supertype || sub_module != super_module);
 
-  // This function checks for subtyping based on the kind of subtype.
-
   if (!subtype.is_reference_type()) return subtype == supertype;
 
-  if (subtype.kind() == ValueType::kRtt) {
+  if (subtype.is_rtt()) {
     return subtype.heap_type().is_generic()
                ? subtype == supertype
-               : (supertype.kind() == ValueType::kRtt &&
-                  subtype.depth() == supertype.depth() &&
+               : (supertype.is_rtt() && subtype.depth() == supertype.depth() &&
+                  supertype.has_index() &&
                   EquivalentIndices(subtype.ref_index(), supertype.ref_index(),
                                     sub_module, super_module));
   }
 
   DCHECK(subtype.is_object_reference_type());
 
-  bool compatible_references = subtype.kind() == ValueType::kOptRef
-                                   ? supertype.kind() == ValueType::kOptRef
+  bool compatible_references = subtype.is_nullable()
+                                   ? supertype.is_nullable()
                                    : supertype.is_object_reference_type();
   if (!compatible_references) return false;
 
@@ -302,23 +299,43 @@ V8_NOINLINE V8_EXPORT_PRIVATE bool IsSubtypeOfImpl(
   HeapType sub_heap = subtype.heap_type();
   HeapType super_heap = supertype.heap_type();
 
-  if (sub_heap.representation() == HeapType::kI31 &&
-      super_heap.representation() == HeapType::kEq) {
-    return true;
+  switch (sub_heap.representation()) {
+    case HeapType::kFunc:
+    case HeapType::kExtern:
+    case HeapType::kEq:
+    case HeapType::kExn:
+      return sub_heap == super_heap || super_heap == HeapType::kAny;
+    case HeapType::kAny:
+      return super_heap == HeapType::kAny;
+    case HeapType::kI31:
+      return super_heap == HeapType::kI31 || super_heap == HeapType::kEq ||
+             super_heap == HeapType::kAny;
+    case HeapType::kBottom:
+      UNREACHABLE();
+    default:
+      break;
   }
-  if (sub_heap.is_generic()) return sub_heap == super_heap;
 
   DCHECK(sub_heap.is_index());
   uint32_t sub_index = sub_heap.ref_index();
   DCHECK(sub_module->has_type(sub_index));
 
-  if (super_heap.representation() == HeapType::kEq) {
-    return !sub_module->has_signature(sub_heap.ref_index());
-  }
-  if (super_heap.representation() == HeapType::kFunc) {
-    return sub_module->has_signature(sub_heap.ref_index());
+  switch (super_heap.representation()) {
+    case HeapType::kFunc:
+      return sub_module->has_signature(sub_index);
+    case HeapType::kEq:
+      return !sub_module->has_signature(sub_index);
+    case HeapType::kExtern:
+    case HeapType::kExn:
+    case HeapType::kI31:
+      return false;
+    case HeapType::kAny:
+      return true;
+    case HeapType::kBottom:
+      UNREACHABLE();
+    default:
+      break;
   }
-  if (super_heap.is_generic()) return false;
 
   DCHECK(super_heap.is_index());
   uint32_t super_index = super_heap.ref_index();
@@ -358,7 +375,7 @@ V8_NOINLINE bool EquivalentTypes(ValueType type1, ValueType type2,
   DCHECK(type1.has_index() && type2.has_index() &&
          (type1 != type2 || module1 != module2));
 
-  DCHECK_IMPLIES(type1.has_depth(), type2.has_depth());  // Due to 'if' above
+  DCHECK_IMPLIES(type1.has_depth(), type2.has_depth());  // Due to 'if' above.
   if (type1.has_depth() && type1.depth() != type2.depth()) return false;
 
   DCHECK(type1.has_index() && module1->has_type(type1.ref_index()) &&
diff --git a/deps/v8/src/wasm/wasm-subtyping.h b/deps/v8/src/wasm/wasm-subtyping.h
index bc3fe9e834c5df..3842d94b14dd7b 100644
--- a/deps/v8/src/wasm/wasm-subtyping.h
+++ b/deps/v8/src/wasm/wasm-subtyping.h
@@ -21,16 +21,16 @@ V8_NOINLINE V8_EXPORT_PRIVATE bool IsSubtypeOfImpl(
 // module2.
 // Type equivalence (~) is described by the following rules (structural
 // equivalence):
-// - Two numeric types are equivalent if they are equal.
+// - Two numeric types are equivalent iff they are equal.
 // - optref(ht1) ~ optref(ht2) iff ht1 ~ ht2.
 // - ref(ht1) ~ ref(ht2) iff ht1 ~ ht2.
 // - rtt(d1, ht1) ~ rtt(d2, ht2) iff (d1 = d2 and ht1 ~ ht2).
 // For heap types, the following rules hold:
 // - Two generic heap types are equivalent iff they are equal.
 // - Two structs are equivalent iff they contain the same number of fields and
-// these are pairwise equivalent.
+//   these are pairwise equivalent.
 // - Two functions are equivalent iff they contain the same number of parameters
-// and returns and these are pairwise equivalent.
+//   and returns and these are pairwise equivalent.
 // - Two arrays are equivalent iff their underlying types are equivalent.
 V8_NOINLINE bool EquivalentTypes(ValueType type1, ValueType type2,
                                  const WasmModule* module1,
@@ -46,6 +46,7 @@ V8_NOINLINE bool EquivalentTypes(ValueType type1, ValueType type2,
 // - rtt1 <: rtt2 iff rtt1 ~ rtt2.
 // For heap types, the following subtyping rules hold:
 // - Each generic heap type is a subtype of itself.
+// - All heap types are subtypes of any.
 // - All functions are subtypes of func.
 // - i31, structs and arrays are subtypes of eq.
 // - Struct subtyping: Subtype must have at least as many fields as supertype,
@@ -68,6 +69,14 @@ V8_INLINE bool IsSubtypeOf(ValueType subtype, ValueType supertype,
   return IsSubtypeOfImpl(subtype, supertype, module, module);
 }
 
+// We have this function call IsSubtypeOf instead of the opposite because type
+// checks are much more common than heap type checks.
+V8_INLINE bool IsHeapSubtypeOf(HeapType subtype, HeapType supertype,
+                               const WasmModule* module) {
+  return IsSubtypeOf(ValueType::Ref(subtype, kNonNullable),
+                     ValueType::Ref(supertype, kNonNullable), module);
+}
+
 // Returns the weakest type that is a subtype of both a and b
 // (which is currently always one of a, b, or kWasmBottom).
 // TODO(manoskouk): Update this once we have settled on a type system for
diff --git a/deps/v8/src/zone/accounting-allocator.cc b/deps/v8/src/zone/accounting-allocator.cc
index 69485eca6534ca..baa70162fd925a 100644
--- a/deps/v8/src/zone/accounting-allocator.cc
+++ b/deps/v8/src/zone/accounting-allocator.cc
@@ -9,6 +9,7 @@
 #include "src/base/bounded-page-allocator.h"
 #include "src/base/logging.h"
 #include "src/base/macros.h"
+#include "src/base/platform/wrappers.h"
 #include "src/utils/allocation.h"
 #include "src/zone/zone-compression.h"
 #include "src/zone/zone-segment.h"
@@ -109,7 +110,7 @@ void AccountingAllocator::ReturnSegment(Segment* segment,
   if (COMPRESS_ZONES_BOOL && supports_compression) {
     CHECK(FreePages(bounded_page_allocator_.get(), segment, segment_size));
   } else {
-    free(segment);
+    base::Free(segment);
   }
 }
 
diff --git a/deps/v8/src/zone/accounting-allocator.h b/deps/v8/src/zone/accounting-allocator.h
index 649cac1203b371..88a0c7559710a0 100644
--- a/deps/v8/src/zone/accounting-allocator.h
+++ b/deps/v8/src/zone/accounting-allocator.h
@@ -26,6 +26,8 @@ class Zone;
 class V8_EXPORT_PRIVATE AccountingAllocator {
  public:
   AccountingAllocator();
+  AccountingAllocator(const AccountingAllocator&) = delete;
+  AccountingAllocator& operator=(const AccountingAllocator&) = delete;
   virtual ~AccountingAllocator();
 
   // Allocates a new segment. Returns nullptr on failed allocation.
@@ -69,8 +71,6 @@ class V8_EXPORT_PRIVATE AccountingAllocator {
 
   std::unique_ptr<VirtualMemory> reserved_area_;
   std::unique_ptr<base::BoundedPageAllocator> bounded_page_allocator_;
-
-  DISALLOW_COPY_AND_ASSIGN(AccountingAllocator);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/zone/type-stats.cc b/deps/v8/src/zone/type-stats.cc
index cb2397e3537260..af4777a8efc452 100644
--- a/deps/v8/src/zone/type-stats.cc
+++ b/deps/v8/src/zone/type-stats.cc
@@ -10,6 +10,7 @@
 #include <cinttypes>
 #include <cstdio>
 
+#include "src/base/platform/wrappers.h"
 #include "src/utils/utils.h"
 #include "src/zone/type-stats.h"
 
@@ -26,7 +27,7 @@ class Demangler {
  public:
   Demangler() = default;
   ~Demangler() {
-    if (buffer_) free(buffer_);
+    if (buffer_) base::Free(buffer_);
     USE(buffer_len_);  // In case demangling is not supported.
   }
 
diff --git a/deps/v8/src/zone/zone-chunk-list.h b/deps/v8/src/zone/zone-chunk-list.h
index a8c6ab0e8c28dc..486e143d7aeb0c 100644
--- a/deps/v8/src/zone/zone-chunk-list.h
+++ b/deps/v8/src/zone/zone-chunk-list.h
@@ -60,6 +60,9 @@ class ZoneChunkList : public ZoneObject {
     }
   }
 
+  ZoneChunkList(const ZoneChunkList&) = delete;
+  ZoneChunkList& operator=(const ZoneChunkList&) = delete;
+
   size_t size() const { return size_; }
   bool is_empty() const { return size() == 0; }
 
@@ -139,8 +142,6 @@ class ZoneChunkList : public ZoneObject {
   size_t size_ = 0;
   Chunk* front_ = nullptr;
   Chunk* back_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(ZoneChunkList);
 };
 
 template <typename T, bool backwards, bool modifiable>
diff --git a/deps/v8/src/zone/zone-list-inl.h b/deps/v8/src/zone/zone-list-inl.h
index f31c767a35f6c9..b8e4d9276ae181 100644
--- a/deps/v8/src/zone/zone-list-inl.h
+++ b/deps/v8/src/zone/zone-list-inl.h
@@ -7,6 +7,7 @@
 
 #include "src/base/macros.h"
 #include "src/base/platform/platform.h"
+#include "src/base/platform/wrappers.h"
 #include "src/utils/memcopy.h"
 #include "src/zone/zone-list.h"
 
@@ -35,7 +36,7 @@ void ZoneList<T>::AddAll(const Vector<const T>& other, Zone* zone) {
   int result_length = length_ + length;
   if (capacity_ < result_length) Resize(result_length, zone);
   if (std::is_trivially_copyable<T>::value) {
-    memcpy(&data_[length_], other.begin(), sizeof(T) * length);
+    base::Memcpy(&data_[length_], other.begin(), sizeof(T) * length);
   } else {
     std::copy(other.begin(), other.end(), &data_[length_]);
   }
diff --git a/deps/v8/src/zone/zone-list.h b/deps/v8/src/zone/zone-list.h
index 86ae4b8f04aa04..f0e3e532deeea9 100644
--- a/deps/v8/src/zone/zone-list.h
+++ b/deps/v8/src/zone/zone-list.h
@@ -48,6 +48,9 @@ class ZoneList final : public ZoneObject {
 
   ZoneList(ZoneList<T>&& other) V8_NOEXCEPT { *this = std::move(other); }
 
+  ZoneList(const ZoneList&) = delete;
+  ZoneList& operator=(const ZoneList&) = delete;
+
   // The ZoneList objects are usually allocated as a fields in other
   // zone-allocated objects for which destructors are not called anyway, so
   // we are not going to clear the memory here as well.
@@ -177,8 +180,6 @@ class ZoneList final : public ZoneObject {
 
   // Resize the list.
   void Resize(int new_capacity, Zone* zone);
-
-  DISALLOW_COPY_AND_ASSIGN(ZoneList);
 };
 
 }  // namespace internal
diff --git a/deps/v8/src/zone/zone.cc b/deps/v8/src/zone/zone.cc
index 5da9b493623367..e40b92be68a604 100644
--- a/deps/v8/src/zone/zone.cc
+++ b/deps/v8/src/zone/zone.cc
@@ -135,7 +135,7 @@ Address Zone::NewExpand(size_t size) {
     // exponentially, thus putting pressure on contiguous virtual address space.
     // All the while making sure to allocate a segment large enough to hold the
     // requested size.
-    new_size = Max(min_new_size, kMaximumSegmentSize);
+    new_size = std::max({min_new_size, kMaximumSegmentSize});
   }
   if (new_size > INT_MAX) {
     V8::FatalProcessOutOfMemory(nullptr, "Zone");
diff --git a/deps/v8/test/benchmarks/benchmarks.status b/deps/v8/test/benchmarks/benchmarks.status
index 046e4ae9fb07e9..4b4d54b79f7aa3 100644
--- a/deps/v8/test/benchmarks/benchmarks.status
+++ b/deps/v8/test/benchmarks/benchmarks.status
@@ -36,6 +36,9 @@
   'kraken/imaging-gaussian-blur': [PASS, SLOW],
   'octane/typescript': [PASS, SLOW],
   'octane/box2d': [PASS, SLOW],
+
+  # https://crbug.com/v8/11222
+  'octane/raytrace': [PASS, SLOW],
 }],  # ALWAYS
 
 # Slow variants.
@@ -59,6 +62,7 @@
   'kraken/imaging-gaussian-blur' : [PASS, ['mode == debug', SKIP]],
   'octane/mandreel': [SKIP],
   'octane/typescript': [SKIP],
+  'octane/raytrace': [PASS, SLOW, ['tsan', SKIP]],
 
   # Too memory hungry on Odroid devices: https://crbug.com/v8/8963
   'kraken/stanford-crypto-ccm': [PASS, ['arch == arm and not simulator_run', SKIP]],
diff --git a/deps/v8/test/benchmarks/cpp/cppgc/BUILD.gn b/deps/v8/test/benchmarks/cpp/cppgc/BUILD.gn
index 903aab5b3b272a..c9ba5fa7b9e30f 100644
--- a/deps/v8/test/benchmarks/cpp/cppgc/BUILD.gn
+++ b/deps/v8/test/benchmarks/cpp/cppgc/BUILD.gn
@@ -28,10 +28,12 @@ if (v8_enable_google_benchmark) {
       "../../../../test/unittests/heap/cppgc/test-platform.h",
       "utils.h",
     ]
-    deps = [
-      "../../../..:cppgc_for_testing",
-      "//third_party/google_benchmark:benchmark_main",
-    ]
+    deps = [ "//third_party/google_benchmark:benchmark_main" ]
+    if (cppgc_is_standalone) {
+      deps += [ "../../../..:cppgc_for_testing" ]
+    } else {
+      deps += [ "../../../..:v8_for_testing" ]
+    }
   }
 
   v8_executable("cppgc_basic_benchmarks") {
@@ -48,8 +50,12 @@ if (v8_enable_google_benchmark) {
     ]
     deps = [
       ":cppgc_benchmark_support",
-      "../../../..:cppgc_for_testing",
       "//third_party/google_benchmark:benchmark_main",
     ]
+    if (cppgc_is_standalone) {
+      deps += [ "../../../..:cppgc_for_testing" ]
+    } else {
+      deps += [ "../../../..:v8_for_testing" ]
+    }
   }
 }
diff --git a/deps/v8/test/cctest/BUILD.gn b/deps/v8/test/cctest/BUILD.gn
index 30fa6c533a3413..f4da906fb7ff70 100644
--- a/deps/v8/test/cctest/BUILD.gn
+++ b/deps/v8/test/cctest/BUILD.gn
@@ -16,7 +16,10 @@ v8_executable("cctest") {
 
   sources = [ "cctest.cc" ]
 
-  deps = [ ":cctest_sources" ]
+  deps = [
+    ":cctest_sources",
+    "../..:v8_wrappers",
+  ]
 
   data_deps = [ "../../tools:v8_testrunner" ]
 
@@ -92,6 +95,7 @@ v8_source_set("cctest_sources") {
     "compiler/test-branch-combine.cc",
     "compiler/test-code-assembler.cc",
     "compiler/test-code-generator.cc",
+    "compiler/test-concurrent-shared-function-info.cc",
     "compiler/test-gap-resolver.cc",
     "compiler/test-graph-visualizer.cc",
     "compiler/test-instruction-scheduler.cc",
@@ -209,6 +213,7 @@ v8_source_set("cctest_sources") {
     "test-concurrent-feedback-vector.cc",
     "test-concurrent-prototype.cc",
     "test-concurrent-script-context-table.cc",
+    "test-concurrent-string.cc",
     "test-concurrent-transition-array.cc",
     "test-constantpool.cc",
     "test-conversions.cc",
@@ -302,6 +307,7 @@ v8_source_set("cctest_sources") {
     "wasm/test-run-wasm-exceptions.cc",
     "wasm/test-run-wasm-interpreter.cc",
     "wasm/test-run-wasm-js.cc",
+    "wasm/test-run-wasm-memory64.cc",
     "wasm/test-run-wasm-module.cc",
     "wasm/test-run-wasm-sign-extension.cc",
     "wasm/test-run-wasm-simd-liftoff.cc",
@@ -312,8 +318,6 @@ v8_source_set("cctest_sources") {
     "wasm/test-streaming-compilation.cc",
     "wasm/test-wasm-breakpoints.cc",
     "wasm/test-wasm-codegen.cc",
-    "wasm/test-wasm-debug-evaluate.cc",
-    "wasm/test-wasm-debug-evaluate.h",
     "wasm/test-wasm-import-wrapper-cache.cc",
     "wasm/test-wasm-metrics.cc",
     "wasm/test-wasm-serialization.cc",
@@ -423,6 +427,7 @@ v8_source_set("cctest_sources") {
     "../..:v8_for_testing",
     "../..:v8_libbase",
     "../..:v8_libplatform",
+    "../..:v8_wrappers",
     "../..:wasm_test_common",
     "../../tools/debug_helper:v8_debug_helper",
     "//build/win:default_exe_manifest",
@@ -493,6 +498,7 @@ v8_executable("generate-bytecode-expectations") {
     "../..:v8",
     "../..:v8_libbase",
     "../..:v8_libplatform",
+    "../..:v8_wrappers",
     "//build/win:default_exe_manifest",
   ]
 
diff --git a/deps/v8/test/cctest/assembler-helper-arm.cc b/deps/v8/test/cctest/assembler-helper-arm.cc
index d28ae3b6c6c8c5..e4a79f2f8887de 100644
--- a/deps/v8/test/cctest/assembler-helper-arm.cc
+++ b/deps/v8/test/cctest/assembler-helper-arm.cc
@@ -12,8 +12,8 @@
 namespace v8 {
 namespace internal {
 
-Handle<Code> AssembleCodeImpl(std::function<void(MacroAssembler&)> assemble) {
-  Isolate* isolate = CcTest::i_isolate();
+Handle<Code> AssembleCodeImpl(Isolate* isolate,
+                              std::function<void(MacroAssembler&)> assemble) {
   MacroAssembler assm(isolate, CodeObjectRequired::kYes);
 
   assemble(assm);
diff --git a/deps/v8/test/cctest/assembler-helper-arm.h b/deps/v8/test/cctest/assembler-helper-arm.h
index 0585d36526dad2..ec31d719e6ecce 100644
--- a/deps/v8/test/cctest/assembler-helper-arm.h
+++ b/deps/v8/test/cctest/assembler-helper-arm.h
@@ -21,12 +21,14 @@ using F_ppiii = void*(void* p0, void* p1, int p2, int p3, int p4);
 using F_pppii = void*(void* p0, void* p1, void* p2, int p3, int p4);
 using F_ippii = void*(int p0, void* p1, void* p2, int p3, int p4);
 
-Handle<Code> AssembleCodeImpl(std::function<void(MacroAssembler&)> assemble);
+Handle<Code> AssembleCodeImpl(Isolate* isolate,
+                              std::function<void(MacroAssembler&)> assemble);
 
 template <typename Signature>
 GeneratedCode<Signature> AssembleCode(
-    std::function<void(MacroAssembler&)> assemble) {
-  return GeneratedCode<Signature>::FromCode(*AssembleCodeImpl(assemble));
+    Isolate* isolate, std::function<void(MacroAssembler&)> assemble) {
+  return GeneratedCode<Signature>::FromCode(
+      *AssembleCodeImpl(isolate, assemble));
 }
 
 }  // namespace internal
diff --git a/deps/v8/test/cctest/cctest.cc b/deps/v8/test/cctest/cctest.cc
index 44a0763f6be946..0ac0432f130387 100644
--- a/deps/v8/test/cctest/cctest.cc
+++ b/deps/v8/test/cctest/cctest.cc
@@ -235,7 +235,7 @@ void LocalContext::Initialize(v8::Isolate* isolate,
 
 // This indirection is needed because HandleScopes cannot be heap-allocated, and
 // we don't want any unnecessary #includes in cctest.h.
-class InitializedHandleScopeImpl {
+class V8_NODISCARD InitializedHandleScopeImpl {
  public:
   explicit InitializedHandleScopeImpl(i::Isolate* isolate)
       : handle_scope_(isolate) {}
@@ -406,3 +406,11 @@ int main(int argc, char* argv[]) {
 
 RegisterThreadedTest* RegisterThreadedTest::first_ = nullptr;
 int RegisterThreadedTest::count_ = 0;
+
+bool IsValidUnwrapObject(v8::Object* object) {
+  i::Address addr = *reinterpret_cast<i::Address*>(object);
+  auto instance_type = i::Internals::GetInstanceType(addr);
+  return (instance_type == i::Internals::kJSObjectType ||
+          instance_type == i::Internals::kJSApiObjectType ||
+          instance_type == i::Internals::kJSSpecialApiObjectType);
+}
diff --git a/deps/v8/test/cctest/cctest.h b/deps/v8/test/cctest/cctest.h
index 50cccab689ffcc..6332cce9364650 100644
--- a/deps/v8/test/cctest/cctest.h
+++ b/deps/v8/test/cctest/cctest.h
@@ -408,9 +408,8 @@ static inline int32_t v8_run_int32value(v8::Local<v8::Script> script) {
 
 static inline v8::Local<v8::Script> CompileWithOrigin(
     v8::Local<v8::String> source, v8::Local<v8::String> origin_url,
-    v8::Local<v8::Boolean> is_shared_cross_origin) {
-  v8::ScriptOrigin origin(origin_url, v8::Local<v8::Integer>(),
-                          v8::Local<v8::Integer>(), is_shared_cross_origin);
+    bool is_shared_cross_origin) {
+  v8::ScriptOrigin origin(origin_url, 0, 0, is_shared_cross_origin);
   v8::ScriptCompiler::Source script_source(source, origin);
   return v8::ScriptCompiler::Compile(
              v8::Isolate::GetCurrent()->GetCurrentContext(), &script_source)
@@ -420,14 +419,13 @@ static inline v8::Local<v8::Script> CompileWithOrigin(
 static inline v8::Local<v8::Script> CompileWithOrigin(
     v8::Local<v8::String> source, const char* origin_url,
     bool is_shared_cross_origin) {
-  return CompileWithOrigin(source, v8_str(origin_url),
-                           v8_bool(is_shared_cross_origin));
+  return CompileWithOrigin(source, v8_str(origin_url), is_shared_cross_origin);
 }
 
 static inline v8::Local<v8::Script> CompileWithOrigin(
     const char* source, const char* origin_url, bool is_shared_cross_origin) {
   return CompileWithOrigin(v8_str(source), v8_str(origin_url),
-                           v8_bool(is_shared_cross_origin));
+                           is_shared_cross_origin);
 }
 
 // Helper functions that compile and run the source.
@@ -488,9 +486,7 @@ static inline v8::Local<v8::Value> CompileRunWithOrigin(const char* source,
                                                         int column_number) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
-  v8::ScriptOrigin origin(v8_str(origin_url),
-                          v8::Integer::New(isolate, line_number),
-                          v8::Integer::New(isolate, column_number));
+  v8::ScriptOrigin origin(v8_str(origin_url), line_number, column_number);
   v8::ScriptCompiler::Source script_source(v8_str(source), origin);
   return CompileRun(context, &script_source,
                     v8::ScriptCompiler::CompileOptions());
@@ -602,7 +598,7 @@ static inline void EmptyMessageQueues(v8::Isolate* isolate) {
 
 class InitializedHandleScopeImpl;
 
-class InitializedHandleScope {
+class V8_NODISCARD InitializedHandleScope {
  public:
   InitializedHandleScope();
   ~InitializedHandleScope();
@@ -615,7 +611,7 @@ class InitializedHandleScope {
   std::unique_ptr<InitializedHandleScopeImpl> initialized_handle_scope_impl_;
 };
 
-class HandleAndZoneScope : public InitializedHandleScope {
+class V8_NODISCARD HandleAndZoneScope : public InitializedHandleScope {
  public:
   explicit HandleAndZoneScope(bool support_zone_compression = false);
   ~HandleAndZoneScope();
@@ -642,7 +638,7 @@ class StaticOneByteResource : public v8::String::ExternalOneByteStringResource {
   const char* data_;
 };
 
-class ManualGCScope {
+class V8_NODISCARD ManualGCScope {
  public:
   ManualGCScope()
       : flag_concurrent_marking_(i::FLAG_concurrent_marking),
@@ -812,4 +808,26 @@ class SimulatorHelper {
 };
 #endif  // USE_SIMULATOR
 
+// The following should correspond to Chromium's kV8DOMWrapperTypeIndex and
+// kV8DOMWrapperObjectIndex.
+static const int kV8WrapperTypeIndex = 0;
+static const int kV8WrapperObjectIndex = 1;
+
+enum class ApiCheckerResult : uint8_t {
+  kNotCalled = 0,
+  kSlowCalled = 1 << 0,
+  kFastCalled = 1 << 1,
+};
+using ApiCheckerResultFlags = v8::base::Flags<ApiCheckerResult>;
+DEFINE_OPERATORS_FOR_FLAGS(ApiCheckerResultFlags)
+
+bool IsValidUnwrapObject(v8::Object* object);
+
+template <typename T, int offset>
+T* GetInternalField(v8::Object* wrapper) {
+  assert(offset < wrapper->InternalFieldCount());
+  return reinterpret_cast<T*>(
+      wrapper->GetAlignedPointerFromInternalField(offset));
+}
+
 #endif  // ifndef CCTEST_H_
diff --git a/deps/v8/test/cctest/cctest.status b/deps/v8/test/cctest/cctest.status
index b8c8cbde03da11..be4041d59b5b51 100644
--- a/deps/v8/test/cctest/cctest.status
+++ b/deps/v8/test/cctest/cctest.status
@@ -71,8 +71,6 @@
   'test-heap/OutOfMemory': [SKIP],
 
   # BUG(5193). The cpu profiler tests are notoriously flaky.
-  'test-profile-generator/RecordStackTraceAtStartProfiling': [SKIP],
-  'test-cpu-profiler/CollectDeoptEvents': [SKIP],
   'test-cpu-profiler/CollectCpuProfile': [SKIP],
   'test-cpu-profiler/JsNative1JsNative2JsSample': [SKIP],
   'test-cpu-profiler/JsNativeJsRuntimeJsSample': [SKIP],
@@ -117,7 +115,11 @@
   'test-code-stub-assembler/PopAndReturnFromJSBuiltinWithStackParameters' : [FAIL],
   'test-code-stub-assembler/PopAndReturnFromTFCBuiltinWithStackParameters' : [FAIL],
 
-  ############################################################################
+  # These tests are supposed to fail in a slow DCHECK, skip them otherwise.
+  'test-local-handles/DereferenceLocalHandleFailsWhenDisallowed': [SKIP, ['mode == debug', FAIL]],
+  'test-persistent-handles/DereferencePersistentHandleFailsWhenDisallowed': [SKIP, ['mode == debug', FAIL]],
+
+############################################################################
   # Slow tests.
   'test-debug/CallFunctionInDebugger': [PASS, ['mode == debug', SLOW]],
   'test-heap-profiler/ManyLocalsInSharedContext': [PASS, SLOW],
@@ -129,7 +131,6 @@
 
 ##############################################################################
 ['mode == debug', {
-  # These tests are supposed to fail in a DCHECK.
   'test-persistent-handles/NewPersistentHandleFailsWhenParked': [FAIL],
   'test-persistent-handles/NewPersistentHandleFailsWhenParkedExplicit': [FAIL],
 }],
@@ -251,7 +252,11 @@
 
   # BUG(10107): Failing flakily
   'test-cpu-profiler/Inlining2': ['arch == ia32 and mode == debug', SKIP],
+  'test-cpu-profiler/CrossScriptInliningCallerLineNumbers': ['arch == ia32 and mode == debug', SKIP],
   'test-cpu-profiler/CrossScriptInliningCallerLineNumbers2': ['arch == ia32 and mode == debug', SKIP],
+
+  # BUG(v8:10996): Flaky on Win32
+  'test-cpu-profiler/StartProfilingAfterOsr': ['arch == ia32', SKIP],
 }],  # 'system == windows'
 
 ##############################################################################
@@ -370,6 +375,9 @@
 ['system != android and arch in [arm, arm64] and not simulator_run', {
   # Consumes too much memory on ODROIDs in debug mode and optimize_for_size.
   'test-code-generator/FuzzAssemble*': [PASS, ['(mode == debug) and optimize_for_size', SKIP]],
+
+  # BUG(chromium:1163847): Seems to break on ODROIDs with recent Clang rolls.
+  'test-loop-analysis/LaEdgeMatrix2_0': [PASS, FAIL]
 }],  # 'system != android and arch in [arm, arm64] and not simulator_run'
 
 ##############################################################################
@@ -383,7 +391,9 @@
   # TODO(ppc): Implement load/store reverse byte instructions
   'test-run-wasm-simd/RunWasm_SimdLoadStoreLoad': [SKIP],
   'test-run-wasm-simd/RunWasm_SimdLoadStoreLoad_turbofan': [SKIP],
-
+  # slow in PASE emulator
+  'test-cpu-profiler/Inlining2': [PASS, SLOW],
+  'test-cpu-profiler/CollectCpuProfileCallerLineNumbers': [PASS, SLOW],
 }],  # 'system == aix or (arch == ppc64 and byteorder == big)'
 
 ##############################################################################
@@ -404,9 +414,9 @@
   # Liftoff is not currently supported on ppc and s390
   'test-liftoff-*': [SKIP],
   'test-wasm-breakpoints/*' : [SKIP],
-  'test-wasm-debug-evaluate/*': [SKIP],
   'test-run-wasm-module/Run_WasmModule_CompilationHintsNoTiering': [SKIP],
   'test-wasm-serialization/TierDownAfterDeserialization': [SKIP],
+  'test-gc/RunWasmLiftoff*': [SKIP],
 
   # SIMD not fully implemented yet
   'test-run-wasm-simd-liftoff/*': [SKIP],
@@ -481,25 +491,10 @@
   'test-gc/*': [SKIP],
   'test-grow-memory/*': [SKIP],
   'test-liftoff-inspection/*': [SKIP],
-  'test-run-wasm-64/*': [SKIP],
-  'test-run-wasm-asmjs/*': [SKIP],
-  'test-run-wasm-atomics64/*': [SKIP],
-  'test-run-wasm-atomics/*': [SKIP],
-  'test-run-wasm-bulk-memory/*': [SKIP],
-  'test-run-wasm/*': [SKIP],
-  'test-run-wasm-exceptions/*': [SKIP],
-  'test-run-wasm-interpreter/*': [SKIP],
-  'test-run-wasm-js/*': [SKIP],
-  'test-run-wasm-module/*': [SKIP],
-  'test-run-wasm-sign-extension/*': [SKIP],
-  'test-run-wasm-simd-liftoff/*': [SKIP],
-  'test-run-wasm-simd-scalar-lowering/*': [SKIP],
-  'test-run-wasm-simd/*': [SKIP],
-  'test-run-wasm-wrappers/*': [SKIP],
+  'test-run-wasm*': [SKIP],
   'test-streaming-compilation/*': [SKIP],
   'test-wasm-breakpoints/*': [SKIP],
   'test-wasm-codegen/*': [SKIP],
-  'test-wasm-debug-evaluate/*': [SKIP],
   'test-wasm-import-wrapper-cache/*': [SKIP],
   'test-wasm-metrics/*': [SKIP],
   'test-wasm-serialization/*': [SKIP],
diff --git a/deps/v8/test/cctest/compiler/test-basic-block-profiler.cc b/deps/v8/test/cctest/compiler/test-basic-block-profiler.cc
index b55ec840e35b66..795c1f1bd2de42 100644
--- a/deps/v8/test/cctest/compiler/test-basic-block-profiler.cc
+++ b/deps/v8/test/cctest/compiler/test-basic-block-profiler.cc
@@ -28,9 +28,9 @@ class BasicBlockProfilerTest : public RawMachineAssemblerTester<int32_t> {
     CHECK_NE(0, static_cast<int>(l->size()));
     const BasicBlockProfilerData* data = l->back().get();
     CHECK_EQ(static_cast<int>(size), static_cast<int>(data->n_blocks()));
-    const uint32_t* counts = data->counts();
+    const double* counts = data->counts();
     for (size_t i = 0; i < size; ++i) {
-      CHECK_EQ(static_cast<int>(expected[i]), static_cast<int>(counts[i]));
+      CHECK_EQ(static_cast<double>(expected[i]), counts[i]);
     }
   }
 };
diff --git a/deps/v8/test/cctest/compiler/test-code-assembler.cc b/deps/v8/test/cctest/compiler/test-code-assembler.cc
index 4de20ead40cf32..34fd24f865f7d7 100644
--- a/deps/v8/test/cctest/compiler/test-code-assembler.cc
+++ b/deps/v8/test/cctest/compiler/test-code-assembler.cc
@@ -22,9 +22,9 @@ namespace {
 template <class T>
 using TVariable = TypedCodeAssemblerVariable<T>;
 
-TNode<Smi> SmiTag(CodeAssembler* m, Node* value) {
+TNode<Smi> SmiTag(CodeAssembler* m, TNode<IntPtrT> value) {
   int32_t constant_value;
-  if (m->ToInt32Constant(value, &constant_value) &&
+  if (m->TryToInt32Constant(value, &constant_value) &&
       Smi::IsValid(constant_value)) {
     return m->SmiConstant(Smi::FromInt(constant_value));
   }
@@ -51,7 +51,7 @@ TEST(SimpleSmiReturn) {
   Isolate* isolate(CcTest::InitIsolateOnce());
   CodeAssemblerTester asm_tester(isolate);
   CodeAssembler m(asm_tester.state());
-  m.Return(SmiTag(&m, m.Int32Constant(37)));
+  m.Return(SmiTag(&m, m.IntPtrConstant(37)));
   FunctionTester ft(asm_tester.GenerateCode());
   CHECK_EQ(37, ft.CallChecked<Smi>()->value());
 }
@@ -83,7 +83,7 @@ TEST(SimpleCallRuntime1Arg) {
   CodeAssembler m(asm_tester.state());
   TNode<Context> context =
       m.HeapConstant(Handle<Context>(isolate->native_context()));
-  TNode<Smi> b = SmiTag(&m, m.Int32Constant(0));
+  TNode<Smi> b = SmiTag(&m, m.IntPtrConstant(0));
   m.Return(m.CallRuntime(Runtime::kIsSmi, context, b));
   FunctionTester ft(asm_tester.GenerateCode());
   CHECK(ft.CallChecked<Oddball>().is_identical_to(
@@ -96,7 +96,7 @@ TEST(SimpleTailCallRuntime1Arg) {
   CodeAssembler m(asm_tester.state());
   TNode<Context> context =
       m.HeapConstant(Handle<Context>(isolate->native_context()));
-  TNode<Smi> b = SmiTag(&m, m.Int32Constant(0));
+  TNode<Smi> b = SmiTag(&m, m.IntPtrConstant(0));
   m.TailCallRuntime(Runtime::kIsSmi, context, b);
   FunctionTester ft(asm_tester.GenerateCode());
   CHECK(ft.CallChecked<Oddball>().is_identical_to(
@@ -109,8 +109,8 @@ TEST(SimpleCallRuntime2Arg) {
   CodeAssembler m(asm_tester.state());
   TNode<Context> context =
       m.HeapConstant(Handle<Context>(isolate->native_context()));
-  TNode<Smi> a = SmiTag(&m, m.Int32Constant(2));
-  TNode<Smi> b = SmiTag(&m, m.Int32Constant(4));
+  TNode<Smi> a = SmiTag(&m, m.IntPtrConstant(2));
+  TNode<Smi> b = SmiTag(&m, m.IntPtrConstant(4));
   m.Return(m.CallRuntime(Runtime::kAdd, context, a, b));
   FunctionTester ft(asm_tester.GenerateCode());
   CHECK_EQ(6, ft.CallChecked<Smi>()->value());
@@ -122,8 +122,8 @@ TEST(SimpleTailCallRuntime2Arg) {
   CodeAssembler m(asm_tester.state());
   TNode<Context> context =
       m.HeapConstant(Handle<Context>(isolate->native_context()));
-  TNode<Smi> a = SmiTag(&m, m.Int32Constant(2));
-  TNode<Smi> b = SmiTag(&m, m.Int32Constant(4));
+  TNode<Smi> a = SmiTag(&m, m.IntPtrConstant(2));
+  TNode<Smi> b = SmiTag(&m, m.IntPtrConstant(4));
   m.TailCallRuntime(Runtime::kAdd, context, a, b);
   FunctionTester ft(asm_tester.GenerateCode());
   CHECK_EQ(6, ft.CallChecked<Smi>()->value());
@@ -155,7 +155,7 @@ TEST(SimpleCallJSFunction0Arg) {
     auto function = m.Parameter<JSFunction>(1);
     auto context = m.Parameter<Context>(kContextOffset);
 
-    auto receiver = SmiTag(&m, m.Int32Constant(42));
+    auto receiver = SmiTag(&m, m.IntPtrConstant(42));
 
     Callable callable = CodeFactory::Call(isolate);
     TNode<Object> result = m.CallJS(callable, context, function, receiver);
@@ -178,8 +178,8 @@ TEST(SimpleCallJSFunction1Arg) {
     auto function = m.Parameter<JSFunction>(1);
     auto context = m.Parameter<Context>(kContextOffset);
 
-    Node* receiver = SmiTag(&m, m.Int32Constant(42));
-    Node* a = SmiTag(&m, m.Int32Constant(13));
+    Node* receiver = SmiTag(&m, m.IntPtrConstant(42));
+    Node* a = SmiTag(&m, m.IntPtrConstant(13));
 
     Callable callable = CodeFactory::Call(isolate);
     TNode<Object> result = m.CallJS(callable, context, function, receiver, a);
@@ -202,9 +202,9 @@ TEST(SimpleCallJSFunction2Arg) {
     auto function = m.Parameter<JSFunction>(1);
     auto context = m.Parameter<Context>(kContextOffset);
 
-    Node* receiver = SmiTag(&m, m.Int32Constant(42));
-    Node* a = SmiTag(&m, m.Int32Constant(13));
-    Node* b = SmiTag(&m, m.Int32Constant(153));
+    Node* receiver = SmiTag(&m, m.IntPtrConstant(42));
+    Node* a = SmiTag(&m, m.IntPtrConstant(13));
+    Node* b = SmiTag(&m, m.IntPtrConstant(153));
 
     Callable callable = CodeFactory::Call(isolate);
     TNode<Object> result =
@@ -372,25 +372,25 @@ TEST(TestToConstant) {
   CodeAssembler m(asm_tester.state());
   int32_t value32;
   int64_t value64;
-  Node* a = m.Int32Constant(5);
-  CHECK(m.ToInt32Constant(a, &value32));
-  CHECK(m.ToInt64Constant(a, &value64));
+  TNode<Int32T> a = m.Int32Constant(5);
+  CHECK(m.TryToInt32Constant(a, &value32));
+  CHECK(m.TryToInt64Constant(a, &value64));
 
-  a = m.Int64Constant(static_cast<int64_t>(1) << 32);
-  CHECK(!m.ToInt32Constant(a, &value32));
-  CHECK(m.ToInt64Constant(a, &value64));
+  TNode<Int64T> b = m.Int64Constant(static_cast<int64_t>(1) << 32);
+  CHECK(!m.TryToInt32Constant(b, &value32));
+  CHECK(m.TryToInt64Constant(b, &value64));
 
-  a = m.Int64Constant(13);
-  CHECK(m.ToInt32Constant(a, &value32));
-  CHECK(m.ToInt64Constant(a, &value64));
+  b = m.Int64Constant(13);
+  CHECK(m.TryToInt32Constant(b, &value32));
+  CHECK(m.TryToInt64Constant(b, &value64));
 
-  a = UndefinedConstant(&m);
-  CHECK(!m.ToInt32Constant(a, &value32));
-  CHECK(!m.ToInt64Constant(a, &value64));
+  TNode<Int32T> c = m.Word32Shl(m.Int32Constant(13), m.Int32Constant(14));
+  CHECK(!m.TryToInt32Constant(c, &value32));
+  CHECK(!m.TryToInt64Constant(c, &value64));
 
-  a = UndefinedConstant(&m);
-  CHECK(!m.ToInt32Constant(a, &value32));
-  CHECK(!m.ToInt64Constant(a, &value64));
+  TNode<IntPtrT> d = m.ReinterpretCast<IntPtrT>(UndefinedConstant(&m));
+  CHECK(!m.TryToInt32Constant(d, &value32));
+  CHECK(!m.TryToInt64Constant(d, &value64));
 }
 
 TEST(DeferredCodePhiHints) {
diff --git a/deps/v8/test/cctest/compiler/test-concurrent-shared-function-info.cc b/deps/v8/test/cctest/compiler/test-concurrent-shared-function-info.cc
new file mode 100644
index 00000000000000..0d91d113225939
--- /dev/null
+++ b/deps/v8/test/cctest/compiler/test-concurrent-shared-function-info.cc
@@ -0,0 +1,199 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <limits>
+
+#include "src/api/api-inl.h"
+#include "src/codegen/compiler.h"
+#include "src/codegen/optimized-compilation-info.h"
+#include "src/compiler/pipeline.h"
+#include "src/handles/handles.h"
+#include "src/logging/counters.h"
+#include "src/objects/js-function.h"
+#include "src/objects/shared-function-info.h"
+#include "src/utils/utils-inl.h"
+#include "src/zone/zone.h"
+#include "test/cctest/cctest.h"
+#include "test/common/flag-utils.h"
+
+namespace v8 {
+namespace internal {
+namespace compiler {
+
+enum class SfiState {
+  Compiled,
+  DebugInfo,
+  PreparedForDebugExecution,
+};
+
+void ExpectSharedFunctionInfoState(SharedFunctionInfo sfi,
+                                   SfiState expectedState) {
+  Object function_data = sfi.function_data(kAcquireLoad);
+  HeapObject script_or_debug_info = sfi.script_or_debug_info(kAcquireLoad);
+  switch (expectedState) {
+    case SfiState::Compiled:
+      CHECK(function_data.IsBytecodeArray());
+      CHECK(script_or_debug_info.IsScript());
+      break;
+    case SfiState::DebugInfo:
+      CHECK(function_data.IsBytecodeArray());
+      CHECK(script_or_debug_info.IsDebugInfo());
+      {
+        DebugInfo debug_info = DebugInfo::cast(script_or_debug_info);
+        CHECK(!debug_info.HasInstrumentedBytecodeArray());
+      }
+      break;
+    case SfiState::PreparedForDebugExecution:
+      CHECK(function_data.IsBytecodeArray());
+      CHECK(script_or_debug_info.IsDebugInfo());
+      {
+        DebugInfo debug_info = DebugInfo::cast(script_or_debug_info);
+        CHECK(debug_info.HasInstrumentedBytecodeArray());
+      }
+      break;
+  }
+}
+
+class BackgroundCompilationThread final : public v8::base::Thread {
+ public:
+  BackgroundCompilationThread(Isolate* isolate,
+                              base::Semaphore* sema_execute_start,
+                              base::Semaphore* sema_execute_complete,
+                              OptimizedCompilationJob* job)
+      : base::Thread(base::Thread::Options("BackgroundCompilationThread")),
+        isolate_(isolate),
+        sema_execute_start_(sema_execute_start),
+        sema_execute_complete_(sema_execute_complete),
+        job_(job) {}
+
+  void Run() override {
+    RuntimeCallStats stats(RuntimeCallStats::kWorkerThread);
+    LocalIsolate local_isolate(isolate_, ThreadKind::kBackground);
+    sema_execute_start_->Wait();
+    const CompilationJob::Status status =
+        job_->ExecuteJob(&stats, &local_isolate);
+    CHECK_EQ(status, CompilationJob::SUCCEEDED);
+    sema_execute_complete_->Signal();
+  }
+
+ private:
+  Isolate* isolate_;
+  base::Semaphore* sema_execute_start_;
+  base::Semaphore* sema_execute_complete_;
+  OptimizedCompilationJob* job_;
+};
+
+TEST(TestConcurrentSharedFunctionInfo) {
+  FlagScope<bool> allow_natives_syntax(&i::FLAG_allow_natives_syntax, true);
+  FlagScope<bool> concurrent_inlining(&i::FLAG_concurrent_inlining, true);
+  FlagScope<bool> turbo_direct_heap_access(&i::FLAG_turbo_direct_heap_access,
+                                           true);
+
+  HandleAndZoneScope scope;
+  Isolate* isolate = scope.main_isolate();
+
+  Zone zone(isolate->allocator(), ZONE_NAME);
+  HandleScope handle_scope(isolate);
+
+  const char* source_code =
+      "function f(x, y) { return x + y; }\n"
+      "function test(x) { return f(f(1, x), f(x, 1)); }\n"
+      "%PrepareFunctionForOptimization(f);\n"
+      "%PrepareFunctionForOptimization(test);\n"
+      "test(3);\n"
+      "test(-9);\n";
+
+  CompileRun(source_code);
+
+  // Get function "test"
+  Local<Function> function_test = Local<Function>::Cast(
+      CcTest::global()
+          ->Get(CcTest::isolate()->GetCurrentContext(), v8_str("test"))
+          .ToLocalChecked());
+  Handle<JSFunction> test =
+      Handle<JSFunction>::cast(v8::Utils::OpenHandle(*function_test));
+  Handle<SharedFunctionInfo> test_sfi(test->shared(), isolate);
+  DCHECK(test_sfi->HasBytecodeArray());
+  IsCompiledScope compiled_scope_test(*test_sfi, isolate);
+  JSFunction::EnsureFeedbackVector(test, &compiled_scope_test);
+
+  // Get function "f"
+  Local<Function> function_f = Local<Function>::Cast(
+      CcTest::global()
+          ->Get(CcTest::isolate()->GetCurrentContext(), v8_str("f"))
+          .ToLocalChecked());
+  Handle<JSFunction> f =
+      Handle<JSFunction>::cast(v8::Utils::OpenHandle(*function_f));
+  Handle<SharedFunctionInfo> f_sfi(f->shared(), isolate);
+  DCHECK(f_sfi->HasBytecodeArray());
+  OptimizedCompilationInfo f_info(&zone, isolate, f_sfi, f, CodeKind::TURBOFAN);
+  Handle<Code> f_code =
+      Pipeline::GenerateCodeForTesting(&f_info, isolate).ToHandleChecked();
+  f->set_code(*f_code);
+  IsCompiledScope compiled_scope_f(*f_sfi, isolate);
+  JSFunction::EnsureFeedbackVector(f, &compiled_scope_f);
+
+  ExpectSharedFunctionInfoState(*test_sfi, SfiState::Compiled);
+
+  auto job =
+      Pipeline::NewCompilationJob(isolate, test, CodeKind::TURBOFAN, true);
+
+  // Prepare job.
+  {
+    CompilationHandleScope compilation(isolate, job->compilation_info());
+    CanonicalHandleScope canonical(isolate, job->compilation_info());
+    job->compilation_info()->ReopenHandlesInNewHandleScope(isolate);
+    const CompilationJob::Status status = job->PrepareJob(isolate);
+    CHECK_EQ(status, CompilationJob::SUCCEEDED);
+  }
+
+  // Start a background thread to execute the compilation job.
+  base::Semaphore sema_execute_start(0);
+  base::Semaphore sema_execute_complete(0);
+  BackgroundCompilationThread thread(isolate, &sema_execute_start,
+                                     &sema_execute_complete, job.get());
+  CHECK(thread.Start());
+
+  sema_execute_start.Signal();
+  // Background thread is running, now mess with test's SFI.
+  ExpectSharedFunctionInfoState(*test_sfi, SfiState::Compiled);
+
+  // Compiled ==> DebugInfo
+  {
+    isolate->debug()->GetOrCreateDebugInfo(test_sfi);
+    ExpectSharedFunctionInfoState(*test_sfi, SfiState::DebugInfo);
+  }
+
+  for (int i = 0; i < 100; ++i) {
+    // DebugInfo ==> PreparedForDebugExecution
+    {
+      int breakpoint_id;
+      CHECK(isolate->debug()->SetBreakpointForFunction(
+          test_sfi, isolate->factory()->empty_string(), &breakpoint_id));
+      ExpectSharedFunctionInfoState(*test_sfi,
+                                    SfiState::PreparedForDebugExecution);
+    }
+
+    // PreparedForDebugExecution ==> DebugInfo
+    {
+      DebugInfo debug_info = test_sfi->GetDebugInfo();
+      debug_info.ClearBreakInfo(isolate);
+      ExpectSharedFunctionInfoState(*test_sfi, SfiState::DebugInfo);
+    }
+  }
+
+  sema_execute_complete.Wait();
+  thread.Join();
+
+  // Finalize job.
+  {
+    const CompilationJob::Status status = job->FinalizeJob(isolate);
+    CHECK_EQ(status, CompilationJob::SUCCEEDED);
+    CHECK(job->compilation_info()->has_bytecode_array());
+  }
+}
+
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8
diff --git a/deps/v8/test/cctest/compiler/test-gap-resolver.cc b/deps/v8/test/cctest/compiler/test-gap-resolver.cc
index e010a106db5326..e032654183b90d 100644
--- a/deps/v8/test/cctest/compiler/test-gap-resolver.cc
+++ b/deps/v8/test/cctest/compiler/test-gap-resolver.cc
@@ -209,7 +209,6 @@ class MoveInterpreter : public GapResolver::Assembler {
   InterpreterState state_;
 };
 
-
 class ParallelMoveCreator : public HandleAndZoneScope {
  public:
   ParallelMoveCreator() : rng_(CcTest::random_number_generator()) {}
diff --git a/deps/v8/test/cctest/compiler/test-linkage.cc b/deps/v8/test/cctest/compiler/test-linkage.cc
index a4414ce276cb24..73aa806479050a 100644
--- a/deps/v8/test/cctest/compiler/test-linkage.cc
+++ b/deps/v8/test/cctest/compiler/test-linkage.cc
@@ -39,8 +39,8 @@ static Handle<JSFunction> Compile(const char* source) {
           v8::ScriptCompiler::kNoCompileOptions,
           ScriptCompiler::kNoCacheNoReason, NOT_NATIVES_CODE)
           .ToHandleChecked();
-  return isolate->factory()->NewFunctionFromSharedFunctionInfo(
-      shared, isolate->native_context());
+  return Factory::JSFunctionBuilder{isolate, shared, isolate->native_context()}
+      .Build();
 }
 
 
diff --git a/deps/v8/test/cctest/compiler/test-run-machops.cc b/deps/v8/test/cctest/compiler/test-run-machops.cc
index b3ec64e71265a4..7ef45f8574f9e1 100644
--- a/deps/v8/test/cctest/compiler/test-run-machops.cc
+++ b/deps/v8/test/cctest/compiler/test-run-machops.cc
@@ -4189,12 +4189,16 @@ TEST(RunTruncateFloat32ToInt32) {
       if (i < upper_bound && i >= lower_bound) {
         CHECK_FLOAT_EQ(static_cast<int32_t>(i), m.Call(i));
       } else if (i < lower_bound) {
+#if (V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_MIPS64) && !_MIPS_ARCH_MIPS32R6 && \
+    !_MIPS_ARCH_MIPS64R6
+        CHECK_FLOAT_EQ(std::numeric_limits<int32_t>::max(), m.Call(i));
+#else
         CHECK_FLOAT_EQ(std::numeric_limits<int32_t>::min(), m.Call(i));
+#endif
       } else if (i >= upper_bound) {
 #if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64
         CHECK_FLOAT_EQ(std::numeric_limits<int32_t>::min(), m.Call(i));
-#elif V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_S390X || \
-    V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64
+#else
         CHECK_FLOAT_EQ(std::numeric_limits<int32_t>::max(), m.Call(i));
 #endif
       } else {
diff --git a/deps/v8/test/cctest/heap/heap-utils.cc b/deps/v8/test/cctest/heap/heap-utils.cc
index f8c47a6a733ca9..171beb5f82c5ff 100644
--- a/deps/v8/test/cctest/heap/heap-utils.cc
+++ b/deps/v8/test/cctest/heap/heap-utils.cc
@@ -39,8 +39,8 @@ void SealCurrentObjects(Heap* heap) {
 }
 
 int FixedArrayLenFromSize(int size) {
-  return Min((size - FixedArray::kHeaderSize) / kTaggedSize,
-             FixedArray::kMaxRegularLength);
+  return std::min({(size - FixedArray::kHeaderSize) / kTaggedSize,
+                   FixedArray::kMaxRegularLength});
 }
 
 std::vector<Handle<FixedArray>> FillOldSpacePageWithFixedArrays(Heap* heap,
@@ -173,9 +173,6 @@ void SimulateIncrementalMarking(i::Heap* heap, bool force_completion) {
     SafepointScope scope(heap);
     collector->EnsureSweepingCompleted();
   }
-  if (marking->IsSweeping()) {
-    marking->FinalizeSweeping();
-  }
   CHECK(marking->IsMarking() || marking->IsStopped() || marking->IsComplete());
   if (marking->IsStopped()) {
     heap->StartIncrementalMarking(i::Heap::kNoGCFlags,
@@ -254,7 +251,9 @@ void EnsureFlagLocalHeapsEnabled() {
 
 void GrowNewSpace(Heap* heap) {
   SafepointScope scope(heap);
-  heap->new_space()->Grow();
+  if (!heap->new_space()->IsAtMaximumCapacity()) {
+    heap->new_space()->Grow();
+  }
 }
 
 void GrowNewSpaceToMaximumCapacity(Heap* heap) {
diff --git a/deps/v8/test/cctest/heap/heap-utils.h b/deps/v8/test/cctest/heap/heap-utils.h
index 6225b89eccab75..33974294df44be 100644
--- a/deps/v8/test/cctest/heap/heap-utils.h
+++ b/deps/v8/test/cctest/heap/heap-utils.h
@@ -12,7 +12,7 @@ namespace v8 {
 namespace internal {
 namespace heap {
 
-class TemporaryEmbedderHeapTracerScope {
+class V8_NODISCARD TemporaryEmbedderHeapTracerScope {
  public:
   TemporaryEmbedderHeapTracerScope(v8::Isolate* isolate,
                                    v8::EmbedderHeapTracer* tracer)
diff --git a/deps/v8/test/cctest/heap/test-alloc.cc b/deps/v8/test/cctest/heap/test-alloc.cc
index 001c8eb0c32a94..c8fffb987dc8a4 100644
--- a/deps/v8/test/cctest/heap/test-alloc.cc
+++ b/deps/v8/test/cctest/heap/test-alloc.cc
@@ -137,10 +137,12 @@ TEST(StressJS) {
   v8::Local<v8::Context> env = v8::Context::New(CcTest::isolate());
   env->Enter();
 
-  NewFunctionArgs args = NewFunctionArgs::ForBuiltin(
-      factory->function_string(), isolate->sloppy_function_map(),
-      Builtins::kEmptyFunction);
-  Handle<JSFunction> function = factory->NewFunction(args);
+  Handle<NativeContext> context(isolate->native_context());
+  Handle<SharedFunctionInfo> info = factory->NewSharedFunctionInfoForBuiltin(
+      factory->function_string(), Builtins::kEmptyFunction);
+  info->set_language_mode(LanguageMode::kStrict);
+  Handle<JSFunction> function =
+      Factory::JSFunctionBuilder{isolate, info, context}.Build();
   CHECK(!function->shared().construct_as_builtin());
 
   // Force the creation of an initial map.
diff --git a/deps/v8/test/cctest/heap/test-compaction.cc b/deps/v8/test/cctest/heap/test-compaction.cc
index 5746b98ee514c8..24ddbb4cfc5bbe 100644
--- a/deps/v8/test/cctest/heap/test-compaction.cc
+++ b/deps/v8/test/cctest/heap/test-compaction.cc
@@ -100,7 +100,7 @@ int GetObjectSize(int objects_per_page) {
   // Make sure that object_size is a multiple of kTaggedSize.
   int object_size =
       ((allocatable / kTaggedSize) / objects_per_page) * kTaggedSize;
-  return Min(kMaxRegularHeapObjectSize, object_size);
+  return std::min(kMaxRegularHeapObjectSize, object_size);
 }
 
 }  // namespace
diff --git a/deps/v8/test/cctest/heap/test-concurrent-allocation.cc b/deps/v8/test/cctest/heap/test-concurrent-allocation.cc
index 12c9f162e3b5f8..edc04065fbb178 100644
--- a/deps/v8/test/cctest/heap/test-concurrent-allocation.cc
+++ b/deps/v8/test/cctest/heap/test-concurrent-allocation.cc
@@ -20,6 +20,7 @@
 #include "src/heap/concurrent-allocator-inl.h"
 #include "src/heap/heap.h"
 #include "src/heap/local-heap-inl.h"
+#include "src/heap/parked-scope.h"
 #include "src/heap/safepoint.h"
 #include "src/objects/heap-number.h"
 #include "src/objects/heap-object.h"
@@ -126,11 +127,7 @@ UNINITIALIZED_TEST(ConcurrentAllocationInOldSpaceFromMainThread) {
   v8::Isolate* isolate = v8::Isolate::New(create_params);
   Isolate* i_isolate = reinterpret_cast<Isolate*>(isolate);
 
-  {
-    LocalHeap local_heap(i_isolate->heap(), ThreadKind::kMain);
-    UnparkedScope unparked_scope(&local_heap);
-    AllocateSomeObjects(&local_heap);
-  }
+  AllocateSomeObjects(i_isolate->main_thread_local_heap());
 
   isolate->Dispose();
 }
diff --git a/deps/v8/test/cctest/heap/test-heap.cc b/deps/v8/test/cctest/heap/test-heap.cc
index 35936dc0b172c8..6ee5e179458577 100644
--- a/deps/v8/test/cctest/heap/test-heap.cc
+++ b/deps/v8/test/cctest/heap/test-heap.cc
@@ -47,6 +47,7 @@
 #include "src/heap/mark-compact.h"
 #include "src/heap/memory-chunk.h"
 #include "src/heap/memory-reducer.h"
+#include "src/heap/parked-scope.h"
 #include "src/heap/remembered-set-inl.h"
 #include "src/heap/safepoint.h"
 #include "src/ic/ic.h"
@@ -375,7 +376,7 @@ TEST(GarbageCollection) {
   {
     HandleScope inner_scope(isolate);
     // Allocate a function and keep it in global object's property.
-    Handle<JSFunction> function = factory->NewFunctionForTest(name);
+    Handle<JSFunction> function = factory->NewFunctionForTesting(name);
     Object::SetProperty(isolate, global, name, function).Check();
     // Allocate an object.  Unrooted after leaving the scope.
     Handle<JSObject> obj = factory->NewJSObject(function);
@@ -746,7 +747,7 @@ TEST(FunctionAllocation) {
 
   v8::HandleScope sc(CcTest::isolate());
   Handle<String> name = factory->InternalizeUtf8String("theFunction");
-  Handle<JSFunction> function = factory->NewFunctionForTest(name);
+  Handle<JSFunction> function = factory->NewFunctionForTesting(name);
 
   Handle<Smi> twenty_three(Smi::FromInt(23), isolate);
   Handle<Smi> twenty_four(Smi::FromInt(24), isolate);
@@ -849,7 +850,7 @@ TEST(JSObjectMaps) {
 
   v8::HandleScope sc(CcTest::isolate());
   Handle<String> name = factory->InternalizeUtf8String("theFunction");
-  Handle<JSFunction> function = factory->NewFunctionForTest(name);
+  Handle<JSFunction> function = factory->NewFunctionForTesting(name);
 
   Handle<String> prop_name = factory->InternalizeUtf8String("theSlot");
   Handle<JSObject> obj = factory->NewJSObject(function);
@@ -1011,15 +1012,14 @@ TEST(StringAllocation) {
     Handle<String> one_byte_sym =
         factory->InternalizeString(OneByteVector(one_byte, length));
     CHECK_EQ(length, one_byte_sym->length());
+    CHECK(one_byte_sym->HasHashCode());
     Handle<String> non_one_byte_str =
         factory->NewStringFromUtf8(Vector<const char>(non_one_byte, 3 * length))
             .ToHandleChecked();
-    non_one_byte_str->Hash();
     CHECK_EQ(length, non_one_byte_str->length());
     Handle<String> one_byte_str =
         factory->NewStringFromUtf8(Vector<const char>(one_byte, length))
             .ToHandleChecked();
-    one_byte_str->Hash();
     CHECK_EQ(length, one_byte_str->length());
     DeleteArray(non_one_byte);
     DeleteArray(one_byte);
@@ -1182,16 +1182,16 @@ HEAP_TEST(Regress10560) {
     CHECK(function->shared().HasBytecodeArray());
     const int kAgingThreshold = 6;
     for (int i = 0; i < kAgingThreshold; i++) {
-      function->shared().GetBytecodeArray().MakeOlder();
-      if (function->shared().GetBytecodeArray().IsOld()) break;
+      function->shared().GetBytecodeArray(i_isolate).MakeOlder();
+      if (function->shared().GetBytecodeArray(i_isolate).IsOld()) break;
     }
 
-    CHECK(function->shared().GetBytecodeArray().IsOld());
+    CHECK(function->shared().GetBytecodeArray(i_isolate).IsOld());
 
     heap::SimulateFullSpace(heap->old_space());
 
     // Just check bytecode isn't flushed still
-    CHECK(function->shared().GetBytecodeArray().IsOld());
+    CHECK(function->shared().GetBytecodeArray(i_isolate).IsOld());
     CHECK(function->shared().is_compiled());
 
     heap->set_force_gc_on_next_allocation();
@@ -1252,7 +1252,8 @@ UNINITIALIZED_TEST(Regress10843) {
 TEST(Regress10774) {
   i::FLAG_allow_natives_syntax = true;
   i::FLAG_turboprop = true;
-  i::FLAG_turboprop_dynamic_map_checks = true;
+  i::FLAG_turbo_dynamic_map_checks = true;
+  i::FLAG_turbo_direct_heap_access = true;
 #ifdef VERIFY_HEAP
   i::FLAG_verify_heap = true;
 #endif
@@ -1368,7 +1369,7 @@ TEST(TestOptimizeAfterBytecodeFlushingCandidate) {
   // the loop breaks once the function is enqueued as a candidate.
   for (int i = 0; i < kAgingThreshold; i++) {
     heap::SimulateIncrementalMarking(CcTest::heap());
-    if (function->shared().GetBytecodeArray().IsOld()) break;
+    if (function->shared().GetBytecodeArray(CcTest::i_isolate()).IsOld()) break;
     CcTest::CollectAllGarbage();
   }
 
@@ -1487,7 +1488,7 @@ TEST(CompilationCacheCachingBehavior) {
     CHECK(shared->HasBytecodeArray());
     const int kAgingThreshold = 6;
     for (int i = 0; i < kAgingThreshold; i++) {
-      shared->GetBytecodeArray().MakeOlder();
+      shared->GetBytecodeArray(CcTest::i_isolate()).MakeOlder();
     }
   }
 
@@ -2915,7 +2916,7 @@ TEST(OptimizedAllocationArrayLiterals) {
 }
 
 static int CountMapTransitions(i::Isolate* isolate, Map map) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   return TransitionsAccessor(isolate, map, &no_gc).NumberOfTransitions();
 }
 
@@ -5914,7 +5915,7 @@ TEST(Regress631969) {
 
   {
     StaticOneByteResource external_string("12345678901234");
-    s3->MakeExternal(&external_string);
+    CHECK(s3->MakeExternal(&external_string));
     CcTest::CollectGarbage(OLD_SPACE);
     // This avoids the GC from trying to free stack allocated resources.
     i::Handle<i::ExternalOneByteString>::cast(s3)->SetResource(isolate,
@@ -7119,12 +7120,11 @@ TEST(GarbageCollectionWithLocalHeap) {
   ManualGCScope manual_gc_scope;
   CcTest::InitializeVM();
 
-  Heap* heap = CcTest::i_isolate()->heap();
+  LocalHeap* local_heap = CcTest::i_isolate()->main_thread_local_heap();
 
-  LocalHeap local_heap(heap, ThreadKind::kMain);
-  UnparkedScope unparked_scope(&local_heap);
   CcTest::CollectGarbage(OLD_SPACE);
-  { ParkedScope parked_scope(&local_heap); }
+
+  { ParkedScope parked_scope(local_heap); }
   CcTest::CollectGarbage(OLD_SPACE);
 }
 
@@ -7248,6 +7248,56 @@ UNINITIALIZED_HEAP_TEST(CodeLargeObjectSpace64k) {
   isolate->Dispose();
 }
 
+TEST(IsPendingAllocationNewSpace) {
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+  Heap* heap = isolate->heap();
+  Factory* factory = isolate->factory();
+  HandleScope handle_scope(isolate);
+  Handle<FixedArray> object = factory->NewFixedArray(5, AllocationType::kYoung);
+  CHECK(heap->IsPendingAllocation(*object));
+  heap->PublishPendingAllocations();
+  CHECK(!heap->IsPendingAllocation(*object));
+}
+
+TEST(IsPendingAllocationNewLOSpace) {
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+  Heap* heap = isolate->heap();
+  Factory* factory = isolate->factory();
+  HandleScope handle_scope(isolate);
+  Handle<FixedArray> object = factory->NewFixedArray(
+      FixedArray::kMaxRegularLength + 1, AllocationType::kYoung);
+  CHECK(heap->IsPendingAllocation(*object));
+  heap->PublishPendingAllocations();
+  CHECK(!heap->IsPendingAllocation(*object));
+}
+
+TEST(IsPendingAllocationOldSpace) {
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+  Heap* heap = isolate->heap();
+  Factory* factory = isolate->factory();
+  HandleScope handle_scope(isolate);
+  Handle<FixedArray> object = factory->NewFixedArray(5, AllocationType::kOld);
+  CHECK(heap->IsPendingAllocation(*object));
+  heap->PublishPendingAllocations();
+  CHECK(!heap->IsPendingAllocation(*object));
+}
+
+TEST(IsPendingAllocationLOSpace) {
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+  Heap* heap = isolate->heap();
+  Factory* factory = isolate->factory();
+  HandleScope handle_scope(isolate);
+  Handle<FixedArray> object = factory->NewFixedArray(
+      FixedArray::kMaxRegularLength + 1, AllocationType::kOld);
+  CHECK(heap->IsPendingAllocation(*object));
+  heap->PublishPendingAllocations();
+  CHECK(!heap->IsPendingAllocation(*object));
+}
+
 TEST(Regress10900) {
   FLAG_always_compact = true;
   CcTest::InitializeVM();
diff --git a/deps/v8/test/cctest/heap/test-incremental-marking.cc b/deps/v8/test/cctest/heap/test-incremental-marking.cc
index d65bc703b558ae..30da6c85858a6c 100644
--- a/deps/v8/test/cctest/heap/test-incremental-marking.cc
+++ b/deps/v8/test/cctest/heap/test-incremental-marking.cc
@@ -71,9 +71,18 @@ class MockPlatform : public TestPlatform {
       task_ = std::move(task);
     }
 
+    void PostNonNestableTask(std::unique_ptr<Task> task) override {
+      PostTask(std::move(task));
+    }
+
     void PostDelayedTask(std::unique_ptr<Task> task,
                          double delay_in_seconds) override {
-      task_ = std::move(task);
+      PostTask(std::move(task));
+    }
+
+    void PostNonNestableDelayedTask(std::unique_ptr<Task> task,
+                                    double delay_in_seconds) override {
+      PostTask(std::move(task));
     }
 
     void PostIdleTask(std::unique_ptr<IdleTask> task) override {
@@ -81,6 +90,8 @@ class MockPlatform : public TestPlatform {
     }
 
     bool IdleTasksEnabled() override { return false; }
+    bool NonNestableTasksEnabled() const override { return true; }
+    bool NonNestableDelayedTasksEnabled() const override { return true; }
 
     bool PendingTask() { return task_ != nullptr; }
 
@@ -98,24 +109,35 @@ class MockPlatform : public TestPlatform {
   v8::Platform* old_platform_;
 };
 
-TEST(IncrementalMarkingUsingTasks) {
+UNINITIALIZED_TEST(IncrementalMarkingUsingTasks) {
   if (!i::FLAG_incremental_marking) return;
   FLAG_stress_concurrent_allocation = false;  // For SimulateFullSpace.
   FLAG_stress_incremental_marking = false;
-  CcTest::InitializeVM();
   MockPlatform platform;
-  i::heap::SimulateFullSpace(CcTest::heap()->old_space());
-  i::IncrementalMarking* marking = CcTest::heap()->incremental_marking();
-  marking->Stop();
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
   {
-    SafepointScope scope(CcTest::heap());
-    marking->Start(i::GarbageCollectionReason::kTesting);
-  }
-  CHECK(platform.PendingTask());
-  while (platform.PendingTask()) {
-    platform.PerformTask();
+    v8::HandleScope handle_scope(isolate);
+    v8::Local<v8::Context> context = CcTest::NewContext(isolate);
+    v8::Context::Scope context_scope(context);
+    Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+    Heap* heap = i_isolate->heap();
+
+    i::heap::SimulateFullSpace(heap->old_space());
+    i::IncrementalMarking* marking = heap->incremental_marking();
+    marking->Stop();
+    {
+      SafepointScope scope(heap);
+      marking->Start(i::GarbageCollectionReason::kTesting);
+    }
+    CHECK(platform.PendingTask());
+    while (platform.PendingTask()) {
+      platform.PerformTask();
+    }
+    CHECK(marking->IsStopped());
   }
-  CHECK(marking->IsStopped());
+  isolate->Dispose();
 }
 
 }  // namespace heap
diff --git a/deps/v8/test/cctest/heap/test-invalidated-slots.cc b/deps/v8/test/cctest/heap/test-invalidated-slots.cc
index 9683331904f739..af4ddfddfdd7d2 100644
--- a/deps/v8/test/cctest/heap/test-invalidated-slots.cc
+++ b/deps/v8/test/cctest/heap/test-invalidated-slots.cc
@@ -323,7 +323,7 @@ HEAP_TEST(InvalidatedSlotsFastToSlow) {
   Handle<JSObject> obj;
   {
     AlwaysAllocateScopeForTesting always_allocate(heap);
-    Handle<JSFunction> function = factory->NewFunctionForTest(name);
+    Handle<JSFunction> function = factory->NewFunctionForTesting(name);
     function->shared().set_expected_nof_properties(3);
     obj = factory->NewJSObject(function, AllocationType::kOld);
   }
diff --git a/deps/v8/test/cctest/heap/test-mark-compact.cc b/deps/v8/test/cctest/heap/test-mark-compact.cc
index e705427f2746e3..dc1771ce7503ba 100644
--- a/deps/v8/test/cctest/heap/test-mark-compact.cc
+++ b/deps/v8/test/cctest/heap/test-mark-compact.cc
@@ -171,7 +171,7 @@ HEAP_TEST(MarkCompactCollector) {
   { HandleScope scope(isolate);
     // allocate a garbage
     Handle<String> func_name = factory->InternalizeUtf8String("theFunction");
-    Handle<JSFunction> function = factory->NewFunctionForTest(func_name);
+    Handle<JSFunction> function = factory->NewFunctionForTesting(func_name);
     Object::SetProperty(isolate, global, func_name, function).Check();
 
     factory->NewJSObject(function);
diff --git a/deps/v8/test/cctest/heap/test-memory-measurement.cc b/deps/v8/test/cctest/heap/test-memory-measurement.cc
index d72c70725b8174..d5b03bbfa2eaf7 100644
--- a/deps/v8/test/cctest/heap/test-memory-measurement.cc
+++ b/deps/v8/test/cctest/heap/test-memory-measurement.cc
@@ -233,8 +233,8 @@ TEST(PartiallyInitializedJSFunction) {
   Isolate* isolate = CcTest::i_isolate();
   Factory* factory = isolate->factory();
   HandleScope scope(isolate);
-  Handle<JSFunction> js_function =
-      factory->NewFunctionForTest(factory->NewStringFromAsciiChecked("test"));
+  Handle<JSFunction> js_function = factory->NewFunctionForTesting(
+      factory->NewStringFromAsciiChecked("test"));
   Handle<Context> context = handle(js_function->context(), isolate);
 
   // 1. Start simulating deserializaiton.
diff --git a/deps/v8/test/cctest/heap/test-spaces.cc b/deps/v8/test/cctest/heap/test-spaces.cc
index a02ebffd9ffffd..0850c13d6b90a2 100644
--- a/deps/v8/test/cctest/heap/test-spaces.cc
+++ b/deps/v8/test/cctest/heap/test-spaces.cc
@@ -50,7 +50,7 @@ namespace internal {
 namespace heap {
 
 // Temporarily sets a given allocator in an isolate.
-class TestMemoryAllocatorScope {
+class V8_NODISCARD TestMemoryAllocatorScope {
  public:
   TestMemoryAllocatorScope(Isolate* isolate, size_t max_capacity,
                            size_t code_range_size,
@@ -85,7 +85,7 @@ class TestMemoryAllocatorScope {
 };
 
 // Temporarily sets a given code page allocator in an isolate.
-class TestCodePageAllocatorScope {
+class V8_NODISCARD TestCodePageAllocatorScope {
  public:
   TestCodePageAllocatorScope(Isolate* isolate,
                              v8::PageAllocator* code_page_allocator)
@@ -799,7 +799,7 @@ namespace {
 // cannot take an argument. Since these tests create ReadOnlySpaces not attached
 // to the Heap directly, they need to be destroyed to ensure the
 // MemoryAllocator's stats are all 0 at exit.
-class ReadOnlySpaceScope {
+class V8_NODISCARD ReadOnlySpaceScope {
  public:
   explicit ReadOnlySpaceScope(Heap* heap) : ro_space_(heap) {}
   ~ReadOnlySpaceScope() {
diff --git a/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc b/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc
index 7be26694ad423f..3bf8dbbdbb34e4 100644
--- a/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc
+++ b/deps/v8/test/cctest/interpreter/bytecode-expectations-printer.cc
@@ -73,10 +73,8 @@ v8::Local<v8::Script> BytecodeExpectationsPrinter::CompileScript(
 
 v8::Local<v8::Module> BytecodeExpectationsPrinter::CompileModule(
     const char* program) const {
-  ScriptOrigin origin(
-      Local<v8::Value>(), Local<v8::Integer>(), Local<v8::Integer>(),
-      Local<v8::Boolean>(), Local<v8::Integer>(), Local<v8::Value>(),
-      Local<v8::Boolean>(), Local<v8::Boolean>(), True(isolate_));
+  ScriptOrigin origin(Local<v8::Value>(), 0, 0, false, -1, Local<v8::Value>(),
+                      false, false, true);
   v8::ScriptCompiler::Source source(V8StringFromUTF8(program), origin);
   return v8::ScriptCompiler::CompileModule(isolate_, &source).ToLocalChecked();
 }
@@ -96,8 +94,8 @@ BytecodeExpectationsPrinter::GetBytecodeArrayForGlobal(
   i::Handle<i::JSFunction> js_function =
       i::Handle<i::JSFunction>::cast(v8::Utils::OpenHandle(*function));
 
-  i::Handle<i::BytecodeArray> bytecodes =
-      i::handle(js_function->shared().GetBytecodeArray(), i_isolate());
+  i::Handle<i::BytecodeArray> bytecodes = i::handle(
+      js_function->shared().GetBytecodeArray(i_isolate()), i_isolate());
 
   return bytecodes;
 }
@@ -108,7 +106,7 @@ BytecodeExpectationsPrinter::GetBytecodeArrayForModule(
   i::Handle<i::Module> i_module = v8::Utils::OpenHandle(*module);
   return i::handle(SharedFunctionInfo::cast(
                        Handle<i::SourceTextModule>::cast(i_module)->code())
-                       .GetBytecodeArray(),
+                       .GetBytecodeArray(i_isolate()),
                    i_isolate());
 }
 
@@ -116,7 +114,8 @@ i::Handle<i::BytecodeArray>
 BytecodeExpectationsPrinter::GetBytecodeArrayForScript(
     v8::Local<v8::Script> script) const {
   i::Handle<i::JSFunction> js_function = v8::Utils::OpenHandle(*script);
-  return i::handle(js_function->shared().GetBytecodeArray(), i_isolate());
+  return i::handle(js_function->shared().GetBytecodeArray(i_isolate()),
+                   i_isolate());
 }
 
 i::Handle<i::BytecodeArray>
@@ -127,7 +126,8 @@ BytecodeExpectationsPrinter::GetBytecodeArrayOfCallee(
   i::Handle<i::JSFunction> js_function =
       i::Handle<i::JSFunction>::cast(i_object);
   CHECK(js_function->shared().HasBytecodeArray());
-  return i::handle(js_function->shared().GetBytecodeArray(), i_isolate());
+  return i::handle(js_function->shared().GetBytecodeArray(i_isolate()),
+                   i_isolate());
 }
 
 void BytecodeExpectationsPrinter::PrintEscapedString(
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/ArrayLiterals.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/ArrayLiterals.golden
index b79efa765e9fc4..ddf531a5dee299 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/ArrayLiterals.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/ArrayLiterals.golden
@@ -144,21 +144,21 @@ bytecodes: [
                 B(Star), R(0),
   /*   52 S> */ B(CreateArrayLiteral), U8(1), U8(1), U8(37),
                 B(Star), R(2),
-                B(LdaConstant), U8(2),
+                B(LdaSmi), I8(1),
   /*   67 S> */ B(Star), R(1),
   /*   67 E> */ B(GetIterator), R(0), U8(2), U8(4),
                 B(JumpIfJSReceiver), U8(7),
                 B(CallRuntime), U16(Runtime::kThrowSymbolIteratorInvalid), R(0), U8(0),
                 B(Star), R(4),
-                B(LdaNamedProperty), R(4), U8(3), U8(6),
+                B(LdaNamedProperty), R(4), U8(2), U8(6),
                 B(Star), R(3),
                 B(CallProperty0), R(3), R(4), U8(15),
                 B(Star), R(5),
                 B(JumpIfJSReceiver), U8(7),
                 B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(5), U8(1),
-                B(LdaNamedProperty), R(5), U8(4), U8(17),
+                B(LdaNamedProperty), R(5), U8(3), U8(17),
                 B(JumpIfToBooleanTrue), U8(19),
-                B(LdaNamedProperty), R(5), U8(5), U8(8),
+                B(LdaNamedProperty), R(5), U8(4), U8(8),
                 B(StaInArrayLiteral), R(2), R(1), U8(13),
                 B(Ldar), R(1),
                 B(Inc), U8(12),
@@ -170,7 +170,6 @@ bytecodes: [
 constant pool: [
   ARRAY_BOILERPLATE_DESCRIPTION_TYPE,
   ARRAY_BOILERPLATE_DESCRIPTION_TYPE,
-  Smi [1],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["value"],
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/CallAndSpread.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/CallAndSpread.golden
index f6fdf0b35df1a3..a4a5428d7da970 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/CallAndSpread.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/CallAndSpread.golden
@@ -73,24 +73,24 @@ bytecodes: [
                 B(Star), R(1),
                 B(CreateArrayLiteral), U8(2), U8(4), U8(37),
                 B(Star), R(4),
-                B(LdaConstant), U8(3),
+                B(LdaSmi), I8(1),
                 B(Star), R(3),
-  /*   49 S> */ B(CreateArrayLiteral), U8(4), U8(5), U8(37),
+  /*   49 S> */ B(CreateArrayLiteral), U8(3), U8(5), U8(37),
                 B(Star), R(7),
   /*   49 E> */ B(GetIterator), R(7), U8(6), U8(8),
                 B(Mov), R(0), R(2),
                 B(JumpIfJSReceiver), U8(7),
                 B(CallRuntime), U16(Runtime::kThrowSymbolIteratorInvalid), R(0), U8(0),
                 B(Star), R(6),
-                B(LdaNamedProperty), R(6), U8(5), U8(10),
+                B(LdaNamedProperty), R(6), U8(4), U8(10),
                 B(Star), R(5),
                 B(CallProperty0), R(5), R(6), U8(19),
                 B(Star), R(7),
                 B(JumpIfJSReceiver), U8(7),
                 B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(7), U8(1),
-                B(LdaNamedProperty), R(7), U8(6), U8(21),
+                B(LdaNamedProperty), R(7), U8(5), U8(21),
                 B(JumpIfToBooleanTrue), U8(19),
-                B(LdaNamedProperty), R(7), U8(7), U8(12),
+                B(LdaNamedProperty), R(7), U8(6), U8(12),
                 B(StaInArrayLiteral), R(4), R(3), U8(17),
                 B(Ldar), R(3),
                 B(Inc), U8(16),
@@ -107,7 +107,6 @@ constant pool: [
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["Math"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["max"],
   ARRAY_BOILERPLATE_DESCRIPTION_TYPE,
-  Smi [1],
   ARRAY_BOILERPLATE_DESCRIPTION_TYPE,
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/NewAndSpread.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/NewAndSpread.golden
index 115585c72790b7..23d9d695294ca8 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/NewAndSpread.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/NewAndSpread.golden
@@ -107,24 +107,24 @@ bytecodes: [
                 B(Mov), R(4), R(0),
   /*   89 S> */ B(CreateArrayLiteral), U8(3), U8(0), U8(37),
                 B(Star), R(3),
-                B(LdaConstant), U8(4),
+                B(LdaSmi), I8(1),
                 B(Star), R(2),
-  /*  101 S> */ B(CreateArrayLiteral), U8(5), U8(1), U8(37),
+  /*  101 S> */ B(CreateArrayLiteral), U8(4), U8(1), U8(37),
                 B(Star), R(6),
   /*  101 E> */ B(GetIterator), R(6), U8(2), U8(4),
                 B(Mov), R(4), R(1),
                 B(JumpIfJSReceiver), U8(7),
                 B(CallRuntime), U16(Runtime::kThrowSymbolIteratorInvalid), R(0), U8(0),
                 B(Star), R(5),
-                B(LdaNamedProperty), R(5), U8(6), U8(6),
+                B(LdaNamedProperty), R(5), U8(5), U8(6),
                 B(Star), R(4),
                 B(CallProperty0), R(4), R(5), U8(15),
                 B(Star), R(6),
                 B(JumpIfJSReceiver), U8(7),
                 B(CallRuntime), U16(Runtime::kThrowIteratorResultNotAnObject), R(6), U8(1),
-                B(LdaNamedProperty), R(6), U8(7), U8(17),
+                B(LdaNamedProperty), R(6), U8(6), U8(17),
                 B(JumpIfToBooleanTrue), U8(19),
-                B(LdaNamedProperty), R(6), U8(8), U8(8),
+                B(LdaNamedProperty), R(6), U8(7), U8(8),
                 B(StaInArrayLiteral), R(3), R(2), U8(13),
                 B(Ldar), R(2),
                 B(Inc), U8(12),
@@ -142,7 +142,6 @@ constant pool: [
   FIXED_ARRAY_TYPE,
   SHARED_FUNCTION_INFO_TYPE,
   ARRAY_BOILERPLATE_DESCRIPTION_TYPE,
-  Smi [1],
   ARRAY_BOILERPLATE_DESCRIPTION_TYPE,
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
   ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden
index b43a8e3d0ebbfd..579f8cf2e867ee 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden
@@ -5,7 +5,6 @@
 ---
 wrap: no
 test function name: test
-private methods: yes
 
 ---
 snippet: "
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorDeclaration.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorDeclaration.golden
index 085e38d7db2c68..059314f804c481 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorDeclaration.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorDeclaration.golden
@@ -4,7 +4,6 @@
 
 ---
 wrap: yes
-private methods: yes
 
 ---
 snippet: "
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateClassFieldAccess.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateClassFieldAccess.golden
index 0c3eefef905953..67adb5f0951035 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateClassFieldAccess.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateClassFieldAccess.golden
@@ -5,7 +5,6 @@
 ---
 wrap: no
 test function name: test
-private methods: yes
 
 ---
 snippet: "
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodAccess.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodAccess.golden
index d6604335607f67..c768ea4dbc49de 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodAccess.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodAccess.golden
@@ -5,7 +5,6 @@
 ---
 wrap: no
 test function name: test
-private methods: yes
 
 ---
 snippet: "
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodDeclaration.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodDeclaration.golden
index 9643de4f233927..73073757cb67ce 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodDeclaration.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodDeclaration.golden
@@ -4,7 +4,6 @@
 
 ---
 wrap: yes
-private methods: yes
 
 ---
 snippet: "
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden
index 1cabd9b5e3c1d5..78265444142018 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden
@@ -5,7 +5,6 @@
 ---
 wrap: no
 test function name: test
-private methods: yes
 
 ---
 snippet: "
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodDeclaration.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodDeclaration.golden
index 1af4690aa56570..d733264629ea68 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodDeclaration.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodDeclaration.golden
@@ -4,7 +4,6 @@
 
 ---
 wrap: yes
-private methods: yes
 
 ---
 snippet: "
diff --git a/deps/v8/test/cctest/interpreter/generate-bytecode-expectations.cc b/deps/v8/test/cctest/interpreter/generate-bytecode-expectations.cc
index b4ef8f39906d49..ba342d89603f61 100644
--- a/deps/v8/test/cctest/interpreter/generate-bytecode-expectations.cc
+++ b/deps/v8/test/cctest/interpreter/generate-bytecode-expectations.cc
@@ -46,7 +46,6 @@ class ProgramOptions final {
         print_callee_(false),
         oneshot_opt_(false),
         async_iteration_(false),
-        private_methods_(false),
         top_level_await_(false),
         verbose_(false) {}
 
@@ -70,7 +69,6 @@ class ProgramOptions final {
   bool print_callee() const { return print_callee_; }
   bool oneshot_opt() const { return oneshot_opt_; }
   bool async_iteration() const { return async_iteration_; }
-  bool private_methods() const { return private_methods_; }
   bool top_level_await() const { return top_level_await_; }
   bool verbose() const { return verbose_; }
   bool suppress_runtime_errors() const { return baseline() && !verbose_; }
@@ -91,7 +89,6 @@ class ProgramOptions final {
   bool print_callee_;
   bool oneshot_opt_;
   bool async_iteration_;
-  bool private_methods_;
   bool top_level_await_;
   bool verbose_;
   std::vector<std::string> input_filenames_;
@@ -99,7 +96,7 @@ class ProgramOptions final {
   std::string test_function_name_;
 };
 
-class V8InitializationScope final {
+class V8_NODISCARD V8InitializationScope final {
  public:
   explicit V8InitializationScope(const char* exec_path);
   ~V8InitializationScope();
@@ -197,8 +194,6 @@ ProgramOptions ProgramOptions::FromCommandLine(int argc, char** argv) {
       options.oneshot_opt_ = false;
     } else if (strcmp(argv[i], "--async-iteration") == 0) {
       options.async_iteration_ = true;
-    } else if (strcmp(argv[i], "--private-methods") == 0) {
-      options.private_methods_ = true;
     } else if (strcmp(argv[i], "--harmony-top-level-await") == 0) {
       options.top_level_await_ = true;
     } else if (strcmp(argv[i], "--verbose") == 0) {
@@ -321,8 +316,6 @@ void ProgramOptions::UpdateFromHeader(std::istream* stream) {
       oneshot_opt_ = ParseBoolean(line.c_str() + strlen(kOneshotOpt));
     } else if (line.compare(0, 17, "async iteration: ") == 0) {
       async_iteration_ = ParseBoolean(line.c_str() + 17);
-    } else if (line.compare(0, 17, "private methods: ") == 0) {
-      private_methods_ = ParseBoolean(line.c_str() + 17);
     } else if (line.compare(0, 17, "top level await: ") == 0) {
       top_level_await_ = ParseBoolean(line.c_str() + 17);
     } else if (line == "---") {
@@ -348,7 +341,6 @@ void ProgramOptions::PrintHeader(std::ostream* stream) const {
   if (print_callee_) *stream << "\nprint callee: yes";
   if (oneshot_opt_) *stream << "\noneshot opt: yes";
   if (async_iteration_) *stream << "\nasync iteration: yes";
-  if (private_methods_) *stream << "\nprivate methods: yes";
   if (top_level_await_) *stream << "\ntop level await: yes";
 
   *stream << "\n\n";
@@ -458,7 +450,6 @@ void GenerateExpectationsFile(std::ostream* stream,
     printer.set_test_function_name(options.test_function_name());
   }
 
-  if (options.private_methods()) i::FLAG_harmony_private_methods = true;
   if (options.top_level_await()) i::FLAG_harmony_top_level_await = true;
 
   *stream << "#\n# Autogenerated by generate-bytecode-expectations.\n#\n\n";
@@ -467,7 +458,6 @@ void GenerateExpectationsFile(std::ostream* stream,
     printer.PrintExpectation(stream, snippet);
   }
 
-  i::FLAG_harmony_private_methods = false;
   i::FLAG_harmony_top_level_await = false;
 }
 
@@ -528,7 +518,6 @@ void PrintUsage(const char* exec_path) {
          "  --test-function-name=foo  "
          "Specify the name of the test function.\n"
          "  --top-level   Process top level code, not the top-level function.\n"
-         "  --private-methods  Enable harmony_private_methods flag.\n"
          "  --top-level-await  Enable await at the module level.\n"
          "  --output=file.name\n"
          "      Specify the output file. If not specified, output goes to "
diff --git a/deps/v8/test/cctest/interpreter/test-bytecode-generator.cc b/deps/v8/test/cctest/interpreter/test-bytecode-generator.cc
index 6afccdfdfcadd6..46703ac7aa96ff 100644
--- a/deps/v8/test/cctest/interpreter/test-bytecode-generator.cc
+++ b/deps/v8/test/cctest/interpreter/test-bytecode-generator.cc
@@ -85,7 +85,8 @@ namespace interpreter {
 static const char* kGoldenFileDirectory =
     "test/cctest/interpreter/bytecode_expectations/";
 
-class InitializedIgnitionHandleScope : public InitializedHandleScope {
+class V8_NODISCARD InitializedIgnitionHandleScope
+    : public InitializedHandleScope {
  public:
   InitializedIgnitionHandleScope() {
     i::FLAG_always_opt = false;
@@ -2797,8 +2798,6 @@ TEST(PrivateClassFieldAccess) {
 }
 
 TEST(PrivateMethodDeclaration) {
-  bool old_methods_flag = i::FLAG_harmony_private_methods;
-  i::FLAG_harmony_private_methods = true;
   InitializedIgnitionHandleScope scope;
   BytecodeExpectationsPrinter printer(CcTest::isolate());
 
@@ -2827,12 +2826,9 @@ TEST(PrivateMethodDeclaration) {
 
   CHECK(CompareTexts(BuildActual(printer, snippets),
                      LoadGolden("PrivateMethodDeclaration.golden")));
-  i::FLAG_harmony_private_methods = old_methods_flag;
 }
 
 TEST(PrivateMethodAccess) {
-  bool old_methods_flag = i::FLAG_harmony_private_methods;
-  i::FLAG_harmony_private_methods = true;
   InitializedIgnitionHandleScope scope;
   BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
@@ -2873,12 +2869,9 @@ TEST(PrivateMethodAccess) {
 
   CHECK(CompareTexts(BuildActual(printer, snippets),
                      LoadGolden("PrivateMethodAccess.golden")));
-  i::FLAG_harmony_private_methods = old_methods_flag;
 }
 
 TEST(PrivateAccessorAccess) {
-  bool old_methods_flag = i::FLAG_harmony_private_methods;
-  i::FLAG_harmony_private_methods = true;
   InitializedIgnitionHandleScope scope;
   BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
@@ -2928,12 +2921,9 @@ TEST(PrivateAccessorAccess) {
 
   CHECK(CompareTexts(BuildActual(printer, snippets),
                      LoadGolden("PrivateAccessorAccess.golden")));
-  i::FLAG_harmony_private_methods = old_methods_flag;
 }
 
 TEST(StaticPrivateMethodDeclaration) {
-  bool old_methods_flag = i::FLAG_harmony_private_methods;
-  i::FLAG_harmony_private_methods = true;
   InitializedIgnitionHandleScope scope;
   BytecodeExpectationsPrinter printer(CcTest::isolate());
 
@@ -2972,12 +2962,9 @@ TEST(StaticPrivateMethodDeclaration) {
 
   CHECK(CompareTexts(BuildActual(printer, snippets),
                      LoadGolden("StaticPrivateMethodDeclaration.golden")));
-  i::FLAG_harmony_private_methods = old_methods_flag;
 }
 
 TEST(StaticPrivateMethodAccess) {
-  bool old_methods_flag = i::FLAG_harmony_private_methods;
-  i::FLAG_harmony_private_methods = true;
   InitializedIgnitionHandleScope scope;
   BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
@@ -3052,12 +3039,9 @@ TEST(StaticPrivateMethodAccess) {
 
   CHECK(CompareTexts(BuildActual(printer, snippets),
                      LoadGolden("StaticPrivateMethodAccess.golden")));
-  i::FLAG_harmony_private_methods = old_methods_flag;
 }
 
 TEST(PrivateAccessorDeclaration) {
-  bool old_methods_flag = i::FLAG_harmony_private_methods;
-  i::FLAG_harmony_private_methods = true;
   InitializedIgnitionHandleScope scope;
   BytecodeExpectationsPrinter printer(CcTest::isolate());
 
@@ -3111,7 +3095,6 @@ TEST(PrivateAccessorDeclaration) {
 
   CHECK(CompareTexts(BuildActual(printer, snippets),
                      LoadGolden("PrivateAccessorDeclaration.golden")));
-  i::FLAG_harmony_private_methods = old_methods_flag;
 }
 
 TEST(StaticClassFields) {
diff --git a/deps/v8/test/cctest/interpreter/test-interpreter.cc b/deps/v8/test/cctest/interpreter/test-interpreter.cc
index af899f08529e76..80d9d6e52e0e67 100644
--- a/deps/v8/test/cctest/interpreter/test-interpreter.cc
+++ b/deps/v8/test/cctest/interpreter/test-interpreter.cc
@@ -2269,7 +2269,7 @@ TEST(InterpreterInstanceOf) {
   Zone* zone = handles.main_zone();
   Factory* factory = isolate->factory();
   Handle<i::String> name = factory->NewStringFromAsciiChecked("cons");
-  Handle<i::JSFunction> func = factory->NewFunctionForTest(name);
+  Handle<i::JSFunction> func = factory->NewFunctionForTesting(name);
   Handle<i::JSObject> instance = factory->NewJSObject(func);
   Handle<i::Object> other = factory->NewNumber(3.3333);
   Handle<i::Object> cases[] = {Handle<i::Object>::cast(instance), other};
@@ -5120,7 +5120,7 @@ TEST(InterpreterCollectSourcePositions) {
 
   Handle<SharedFunctionInfo> sfi = handle(function->shared(), isolate);
   Handle<BytecodeArray> bytecode_array =
-      handle(sfi->GetBytecodeArray(), isolate);
+      handle(sfi->GetBytecodeArray(isolate), isolate);
   CHECK(!bytecode_array->HasSourcePositionTable());
 
   Compiler::CollectSourcePositions(isolate, sfi);
@@ -5146,7 +5146,7 @@ TEST(InterpreterCollectSourcePositions_StackOverflow) {
 
   Handle<SharedFunctionInfo> sfi = handle(function->shared(), isolate);
   Handle<BytecodeArray> bytecode_array =
-      handle(sfi->GetBytecodeArray(), isolate);
+      handle(sfi->GetBytecodeArray(isolate), isolate);
   CHECK(!bytecode_array->HasSourcePositionTable());
 
   // Make the stack limit the same as the current position so recompilation
@@ -5186,7 +5186,7 @@ TEST(InterpreterCollectSourcePositions_ThrowFrom1stFrame) {
   Handle<SharedFunctionInfo> sfi = handle(function->shared(), isolate);
   // This is the bytecode for the top-level iife.
   Handle<BytecodeArray> bytecode_array =
-      handle(sfi->GetBytecodeArray(), isolate);
+      handle(sfi->GetBytecodeArray(isolate), isolate);
   CHECK(!bytecode_array->HasSourcePositionTable());
 
   {
@@ -5224,7 +5224,7 @@ TEST(InterpreterCollectSourcePositions_ThrowFrom2ndFrame) {
   Handle<SharedFunctionInfo> sfi = handle(function->shared(), isolate);
   // This is the bytecode for the top-level iife.
   Handle<BytecodeArray> bytecode_array =
-      handle(sfi->GetBytecodeArray(), isolate);
+      handle(sfi->GetBytecodeArray(isolate), isolate);
   CHECK(!bytecode_array->HasSourcePositionTable());
 
   {
@@ -5282,7 +5282,7 @@ TEST(InterpreterCollectSourcePositions_GenerateStackTrace) {
 
   Handle<SharedFunctionInfo> sfi = handle(function->shared(), isolate);
   Handle<BytecodeArray> bytecode_array =
-      handle(sfi->GetBytecodeArray(), isolate);
+      handle(sfi->GetBytecodeArray(isolate), isolate);
   CHECK(!bytecode_array->HasSourcePositionTable());
 
   {
diff --git a/deps/v8/test/cctest/interpreter/test-source-positions.cc b/deps/v8/test/cctest/interpreter/test-source-positions.cc
index ee9d338f016367..a003ad6bf43679 100644
--- a/deps/v8/test/cctest/interpreter/test-source-positions.cc
+++ b/deps/v8/test/cctest/interpreter/test-source-positions.cc
@@ -166,13 +166,14 @@ Handle<BytecodeArray> OptimizedBytecodeSourcePositionTester::MakeBytecode(
   SetOptimizationFlags(optimization_bitmap);
   CompileRun(script.c_str());
 
-  Local<Function> api_function = Local<Function>::Cast(
+  Local<Function> api_function =
       CcTest::global()
           ->Get(CcTest::isolate()->GetCurrentContext(), v8_str("test_function"))
-          .ToLocalChecked());
+          .ToLocalChecked()
+          .As<Function>();
   Handle<JSFunction> function =
       Handle<JSFunction>::cast(v8::Utils::OpenHandle(*api_function));
-  return handle(function->shared().GetBytecodeArray(), isolate_);
+  return handle(function->shared().GetBytecodeArray(isolate_), isolate_);
 }
 
 void OptimizedBytecodeSourcePositionTester::SetOptimizationFlags(
diff --git a/deps/v8/test/cctest/libsampler/test-sampler.cc b/deps/v8/test/cctest/libsampler/test-sampler.cc
index fdb9bbda899498..0ed7454e5f0729 100644
--- a/deps/v8/test/cctest/libsampler/test-sampler.cc
+++ b/deps/v8/test/cctest/libsampler/test-sampler.cc
@@ -97,8 +97,10 @@ static const char* sampler_test_source = "function start(count) {\n"
 
 static v8::Local<v8::Function> GetFunction(v8::Local<v8::Context> env,
                                            const char* name) {
-  return v8::Local<v8::Function>::Cast(
-      env->Global()->Get(env, v8_str(name)).ToLocalChecked());
+  return env->Global()
+      ->Get(env, v8_str(name))
+      .ToLocalChecked()
+      .As<v8::Function>();
 }
 
 
diff --git a/deps/v8/test/cctest/parsing/test-scanner-streams.cc b/deps/v8/test/cctest/parsing/test-scanner-streams.cc
index 0758d495719a27..b7bb1f3b2a88fa 100644
--- a/deps/v8/test/cctest/parsing/test-scanner-streams.cc
+++ b/deps/v8/test/cctest/parsing/test-scanner-streams.cc
@@ -36,7 +36,7 @@ class ChunkSource : public v8::ScriptCompiler::ExternalSourceStream {
     // aligned to char-size though.
     size_t chunk_size = extra_chunky ? char_size : len;
     for (size_t i = 0; i < len; i += chunk_size, chunk_size += char_size) {
-      chunks_.push_back({data + i, i::Min(chunk_size, len - i)});
+      chunks_.push_back({data + i, std::min(chunk_size, len - i)});
     }
     chunks_.push_back({nullptr, 0});
   }
diff --git a/deps/v8/test/cctest/test-accessor-assembler.cc b/deps/v8/test/cctest/test-accessor-assembler.cc
index ba53304a40d879..0095f4576dc63e 100644
--- a/deps/v8/test/cctest/test-accessor-assembler.cc
+++ b/deps/v8/test/cctest/test-accessor-assembler.cc
@@ -208,7 +208,7 @@ TEST(TryProbeStubCache) {
 
   // Ensure that GC does happen because from now on we are going to fill our
   // own stub cache instance with raw values.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   // Populate {stub_cache}.
   const int N = StubCache::kPrimaryTableSize + StubCache::kSecondaryTableSize;
diff --git a/deps/v8/test/cctest/test-accessors.cc b/deps/v8/test/cctest/test-accessors.cc
index bd4b8b68bcb2d3..d30be379236013 100644
--- a/deps/v8/test/cctest/test-accessors.cc
+++ b/deps/v8/test/cctest/test-accessors.cc
@@ -27,8 +27,6 @@
 
 #include <stdlib.h>
 
-#include "src/init/v8.h"
-
 #include "src/api/api-inl.h"
 #include "src/execution/frames-inl.h"
 #include "src/strings/string-stream.h"
@@ -149,8 +147,7 @@ THREADED_TEST(PropertyHandler) {
 static void GetIntValue(Local<String> property,
                         const v8::PropertyCallbackInfo<v8::Value>& info) {
   ApiTestFuzzer::Fuzz();
-  int* value =
-      static_cast<int*>(v8::Local<v8::External>::Cast(info.Data())->Value());
+  int* value = static_cast<int*>(info.Data().As<v8::External>()->Value());
   info.GetReturnValue().Set(v8_num(*value));
 }
 
@@ -158,8 +155,7 @@ static void GetIntValue(Local<String> property,
 static void SetIntValue(Local<String> property,
                         Local<Value> value,
                         const v8::PropertyCallbackInfo<void>& info) {
-  int* field =
-      static_cast<int*>(v8::Local<v8::External>::Cast(info.Data())->Value());
+  int* field = static_cast<int*>(info.Data().As<v8::External>()->Value());
   *field = value->Int32Value(info.GetIsolate()->GetCurrentContext()).FromJust();
 }
 
diff --git a/deps/v8/test/cctest/test-api-array-buffer.cc b/deps/v8/test/cctest/test-api-array-buffer.cc
index 9fd4f9e550a30e..a55644a2e3e744 100644
--- a/deps/v8/test/cctest/test-api-array-buffer.cc
+++ b/deps/v8/test/cctest/test-api-array-buffer.cc
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "test/cctest/test-api.h"
-
 #include "src/api/api-inl.h"
+#include "test/cctest/test-api.h"
 
 using ::v8::Array;
 using ::v8::Context;
@@ -30,8 +29,7 @@ void CheckIsTypedArrayVarDetached(const char* name) {
               "%s.byteLength == 0 && %s.byteOffset == 0 && %s.length == 0",
               name, name, name);
   CHECK(CompileRun(source.begin())->IsTrue());
-  v8::Local<v8::TypedArray> ta =
-      v8::Local<v8::TypedArray>::Cast(CompileRun(name));
+  v8::Local<v8::TypedArray> ta = CompileRun(name).As<v8::TypedArray>();
   CheckIsDetached(ta);
 }
 
@@ -122,7 +120,7 @@ THREADED_TEST(ArrayBuffer_JSInternalToExternal) {
       "var u8_a = new Uint8Array(ab1);"
       "u8_a[0] = 0xAA;"
       "u8_a[1] = 0xFF; u8_a.buffer");
-  Local<v8::ArrayBuffer> ab1 = Local<v8::ArrayBuffer>::Cast(result);
+  Local<v8::ArrayBuffer> ab1 = result.As<v8::ArrayBuffer>();
   CheckInternalFieldsAreZero(ab1);
   CHECK_EQ(2, ab1->ByteLength());
   std::shared_ptr<v8::BackingStore> backing_store = Externalize(ab1);
@@ -272,10 +270,8 @@ THREADED_TEST(ArrayBuffer_DetachingScript) {
       "var f64a = new Float64Array(ab, 8, 127);"
       "var dv = new DataView(ab, 1, 1023);");
 
-  v8::Local<v8::ArrayBuffer> ab =
-      Local<v8::ArrayBuffer>::Cast(CompileRun("ab"));
-
-  v8::Local<v8::DataView> dv = v8::Local<v8::DataView>::Cast(CompileRun("dv"));
+  v8::Local<v8::ArrayBuffer> ab = CompileRun("ab").As<v8::ArrayBuffer>();
+  v8::Local<v8::DataView> dv = CompileRun("dv").As<v8::DataView>();
 
   Externalize(ab);
   ab->Detach();
@@ -424,7 +420,7 @@ THREADED_TEST(SharedArrayBuffer_JSInternalToExternal) {
       "var u8_a = new Uint8Array(ab1);"
       "u8_a[0] = 0xAA;"
       "u8_a[1] = 0xFF; u8_a.buffer");
-  Local<v8::SharedArrayBuffer> ab1 = Local<v8::SharedArrayBuffer>::Cast(result);
+  Local<v8::SharedArrayBuffer> ab1 = result.As<v8::SharedArrayBuffer>();
   CheckInternalFieldsAreZero(ab1);
   CHECK_EQ(2, ab1->ByteLength());
   CHECK(!ab1->IsExternal());
diff --git a/deps/v8/test/cctest/test-api-interceptors.cc b/deps/v8/test/cctest/test-api-interceptors.cc
index 812768b461a471..236053eb45c022 100644
--- a/deps/v8/test/cctest/test-api-interceptors.cc
+++ b/deps/v8/test/cctest/test-api-interceptors.cc
@@ -75,7 +75,7 @@ void EmptyInterceptorEnumerator(
 
 void SimpleAccessorGetter(Local<String> name,
                           const v8::PropertyCallbackInfo<v8::Value>& info) {
-  Local<Object> self = Local<Object>::Cast(info.This());
+  Local<Object> self = info.This().As<Object>();
   info.GetReturnValue().Set(
       self->Get(info.GetIsolate()->GetCurrentContext(),
                 String::Concat(info.GetIsolate(), v8_str("accessor_"), name))
@@ -84,7 +84,7 @@ void SimpleAccessorGetter(Local<String> name,
 
 void SimpleAccessorSetter(Local<String> name, Local<Value> value,
                           const v8::PropertyCallbackInfo<void>& info) {
-  Local<Object> self = Local<Object>::Cast(info.This());
+  Local<Object> self = info.This().As<Object>();
   self->Set(info.GetIsolate()->GetCurrentContext(),
             String::Concat(info.GetIsolate(), v8_str("accessor_"), name), value)
       .FromJust();
@@ -94,23 +94,23 @@ void SimpleAccessorSetter(Local<String> name, Local<Value> value,
 void SymbolAccessorGetter(Local<Name> name,
                           const v8::PropertyCallbackInfo<v8::Value>& info) {
   CHECK(name->IsSymbol());
-  Local<Symbol> sym = Local<Symbol>::Cast(name);
+  Local<Symbol> sym = name.As<Symbol>();
   if (sym->Description()->IsUndefined()) return;
-  SimpleAccessorGetter(Local<String>::Cast(sym->Description()), info);
+  SimpleAccessorGetter(sym->Description().As<String>(), info);
 }
 
 void SymbolAccessorSetter(Local<Name> name, Local<Value> value,
                           const v8::PropertyCallbackInfo<void>& info) {
   CHECK(name->IsSymbol());
-  Local<Symbol> sym = Local<Symbol>::Cast(name);
+  Local<Symbol> sym = name.As<Symbol>();
   if (sym->Description()->IsUndefined()) return;
-  SimpleAccessorSetter(Local<String>::Cast(sym->Description()), value, info);
+  SimpleAccessorSetter(sym->Description().As<String>(), value, info);
 }
 
 void InterceptorGetter(Local<Name> generic_name,
                        const v8::PropertyCallbackInfo<v8::Value>& info) {
   if (generic_name->IsSymbol()) return;
-  Local<String> name = Local<String>::Cast(generic_name);
+  Local<String> name = generic_name.As<String>();
   String::Utf8Value utf8(info.GetIsolate(), name);
   char* name_str = *utf8;
   char prefix[] = "interceptor_";
@@ -118,7 +118,7 @@ void InterceptorGetter(Local<Name> generic_name,
   for (i = 0; name_str[i] && prefix[i]; ++i) {
     if (name_str[i] != prefix[i]) return;
   }
-  Local<Object> self = Local<Object>::Cast(info.This());
+  Local<Object> self = info.This().As<Object>();
   info.GetReturnValue().Set(
       self->GetPrivate(
               info.GetIsolate()->GetCurrentContext(),
@@ -129,7 +129,7 @@ void InterceptorGetter(Local<Name> generic_name,
 void InterceptorSetter(Local<Name> generic_name, Local<Value> value,
                        const v8::PropertyCallbackInfo<v8::Value>& info) {
   if (generic_name->IsSymbol()) return;
-  Local<String> name = Local<String>::Cast(generic_name);
+  Local<String> name = generic_name.As<String>();
   // Intercept accesses that set certain integer values, for which the name does
   // not start with 'accessor_'.
   String::Utf8Value utf8(info.GetIsolate(), name);
@@ -143,7 +143,7 @@ void InterceptorSetter(Local<Name> generic_name, Local<Value> value,
 
   Local<Context> context = info.GetIsolate()->GetCurrentContext();
   if (value->IsInt32() && value->Int32Value(context).FromJust() < 10000) {
-    Local<Object> self = Local<Object>::Cast(info.This());
+    Local<Object> self = info.This().As<Object>();
     Local<v8::Private> symbol = v8::Private::ForApi(info.GetIsolate(), name);
     self->SetPrivate(context, symbol, value).FromJust();
     info.GetReturnValue().Set(value);
@@ -154,19 +154,18 @@ void GenericInterceptorGetter(Local<Name> generic_name,
                               const v8::PropertyCallbackInfo<v8::Value>& info) {
   Local<String> str;
   if (generic_name->IsSymbol()) {
-    Local<Value> name = Local<Symbol>::Cast(generic_name)->Description();
+    Local<Value> name = generic_name.As<Symbol>()->Description();
     if (name->IsUndefined()) return;
-    str = String::Concat(info.GetIsolate(), v8_str("_sym_"),
-                         Local<String>::Cast(name));
+    str = String::Concat(info.GetIsolate(), v8_str("_sym_"), name.As<String>());
   } else {
-    Local<String> name = Local<String>::Cast(generic_name);
+    Local<String> name = generic_name.As<String>();
     String::Utf8Value utf8(info.GetIsolate(), name);
     char* name_str = *utf8;
     if (*name_str == '_') return;
     str = String::Concat(info.GetIsolate(), v8_str("_str_"), name);
   }
 
-  Local<Object> self = Local<Object>::Cast(info.This());
+  Local<Object> self = info.This().As<Object>();
   info.GetReturnValue().Set(
       self->Get(info.GetIsolate()->GetCurrentContext(), str).ToLocalChecked());
 }
@@ -175,19 +174,18 @@ void GenericInterceptorSetter(Local<Name> generic_name, Local<Value> value,
                               const v8::PropertyCallbackInfo<v8::Value>& info) {
   Local<String> str;
   if (generic_name->IsSymbol()) {
-    Local<Value> name = Local<Symbol>::Cast(generic_name)->Description();
+    Local<Value> name = generic_name.As<Symbol>()->Description();
     if (name->IsUndefined()) return;
-    str = String::Concat(info.GetIsolate(), v8_str("_sym_"),
-                         Local<String>::Cast(name));
+    str = String::Concat(info.GetIsolate(), v8_str("_sym_"), name.As<String>());
   } else {
-    Local<String> name = Local<String>::Cast(generic_name);
+    Local<String> name = generic_name.As<String>();
     String::Utf8Value utf8(info.GetIsolate(), name);
     char* name_str = *utf8;
     if (*name_str == '_') return;
     str = String::Concat(info.GetIsolate(), v8_str("_str_"), name);
   }
 
-  Local<Object> self = Local<Object>::Cast(info.This());
+  Local<Object> self = info.This().As<Object>();
   self->Set(info.GetIsolate()->GetCurrentContext(), str, value).FromJust();
   info.GetReturnValue().Set(value);
 }
@@ -1101,7 +1099,8 @@ THREADED_TEST(InterceptorLoadICInvalidatedFieldViaGlobal) {
 
 static void SetOnThis(Local<String> name, Local<Value> value,
                       const v8::PropertyCallbackInfo<void>& info) {
-  Local<Object>::Cast(info.This())
+  info.This()
+      .As<Object>()
       ->CreateDataProperty(info.GetIsolate()->GetCurrentContext(), name, value)
       .FromJust();
 }
@@ -3017,7 +3016,7 @@ void UnboxedDoubleIndexedPropertyEnumerator(
   Local<Value> result =
       indexed_property_names_script->Run(info.GetIsolate()->GetCurrentContext())
           .ToLocalChecked();
-  info.GetReturnValue().Set(Local<v8::Array>::Cast(result));
+  info.GetReturnValue().Set(result.As<v8::Array>());
 }
 
 
@@ -3062,9 +3061,10 @@ void SloppyArgsIndexedPropertyEnumerator(
       "}"
       "keys = f(0, 1, 2, 3);"
       "keys;");
-  Local<Object> result = Local<Object>::Cast(
+  Local<Object> result =
       indexed_property_names_script->Run(info.GetIsolate()->GetCurrentContext())
-          .ToLocalChecked());
+          .ToLocalChecked()
+          .As<Object>();
   // Have to populate the handle manually, as it's not Cast-able.
   i::Handle<i::JSReceiver> o =
       v8::Utils::OpenHandle<Object, i::JSReceiver>(result);
@@ -3633,24 +3633,25 @@ THREADED_TEST(Enumerators) {
       ->Set(context.local(), v8_str("k"),
             obj->NewInstance(context.local()).ToLocalChecked())
       .FromJust();
-  v8::Local<v8::Array> result =
-      v8::Local<v8::Array>::Cast(CompileRun("k[10] = 0;"
-                                            "k.a = 0;"
-                                            "k[5] = 0;"
-                                            "k.b = 0;"
-                                            "k[4294967294] = 0;"
-                                            "k.c = 0;"
-                                            "k[4294967295] = 0;"
-                                            "k.d = 0;"
-                                            "k[140000] = 0;"
-                                            "k.e = 0;"
-                                            "k[30000000000] = 0;"
-                                            "k.f = 0;"
-                                            "var result = [];"
-                                            "for (var prop in k) {"
-                                            "  result.push(prop);"
-                                            "}"
-                                            "result"));
+  v8::Local<v8::Array> result = CompileRun(
+                                    "k[10] = 0;"
+                                    "k.a = 0;"
+                                    "k[5] = 0;"
+                                    "k.b = 0;"
+                                    "k[4294967294] = 0;"
+                                    "k.c = 0;"
+                                    "k[4294967295] = 0;"
+                                    "k.d = 0;"
+                                    "k[140000] = 0;"
+                                    "k.e = 0;"
+                                    "k[30000000000] = 0;"
+                                    "k.f = 0;"
+                                    "var result = [];"
+                                    "for (var prop in k) {"
+                                    "  result.push(prop);"
+                                    "}"
+                                    "result")
+                                    .As<v8::Array>();
   // Check that we get all the property names returned including the
   // ones from the enumerators in the right order: indexed properties
   // in numerical order, indexed interceptor properties, named
@@ -4731,7 +4732,7 @@ THREADED_TEST(GetOwnPropertyNamesWithInterceptor) {
   v8::Local<v8::Value> result =
       CompileRun("Object.getOwnPropertyNames(object)");
   CHECK(result->IsArray());
-  v8::Local<v8::Array> result_array = v8::Local<v8::Array>::Cast(result);
+  v8::Local<v8::Array> result_array = result.As<v8::Array>();
   CHECK_EQ(2u, result_array->Length());
   CHECK(result_array->Get(context.local(), 0).ToLocalChecked()->IsString());
   CHECK(result_array->Get(context.local(), 1).ToLocalChecked()->IsString());
@@ -4746,7 +4747,7 @@ THREADED_TEST(GetOwnPropertyNamesWithInterceptor) {
 
   result = CompileRun("var ret = []; for (var k in object) ret.push(k); ret");
   CHECK(result->IsArray());
-  result_array = v8::Local<v8::Array>::Cast(result);
+  result_array = result.As<v8::Array>();
   CHECK_EQ(2u, result_array->Length());
   CHECK(result_array->Get(context.local(), 0).ToLocalChecked()->IsString());
   CHECK(result_array->Get(context.local(), 1).ToLocalChecked()->IsString());
@@ -4761,7 +4762,7 @@ THREADED_TEST(GetOwnPropertyNamesWithInterceptor) {
 
   result = CompileRun("Object.getOwnPropertySymbols(object)");
   CHECK(result->IsArray());
-  result_array = v8::Local<v8::Array>::Cast(result);
+  result_array = result.As<v8::Array>();
   CHECK_EQ(1u, result_array->Length());
   CHECK(result_array->Get(context.local(), 0)
             .ToLocalChecked()
diff --git a/deps/v8/test/cctest/test-api-stack-traces.cc b/deps/v8/test/cctest/test-api-stack-traces.cc
index 0df2c225645aed..4d445fba1def3a 100644
--- a/deps/v8/test/cctest/test-api-stack-traces.cc
+++ b/deps/v8/test/cctest/test-api-stack-traces.cc
@@ -325,9 +325,7 @@ TEST(CaptureStackTrace) {
       "eval('new baz();');";
   v8::Local<v8::String> detailed_src = v8_str(detailed_source);
   // Make the script using a non-zero line and column offset.
-  v8::Local<v8::Integer> line_offset = v8::Integer::New(isolate, 3);
-  v8::Local<v8::Integer> column_offset = v8::Integer::New(isolate, 5);
-  v8::ScriptOrigin detailed_origin(origin, line_offset, column_offset);
+  v8::ScriptOrigin detailed_origin(origin, 3, 5);
   v8::ScriptCompiler::Source script_source2(detailed_src, detailed_origin);
   v8::Local<v8::UnboundScript> detailed_script(
       v8::ScriptCompiler::CompileUnboundScript(isolate, &script_source2)
diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc
index 8c9c81873e9106..96afaaad799588 100644
--- a/deps/v8/test/cctest/test-api.cc
+++ b/deps/v8/test/cctest/test-api.cc
@@ -66,6 +66,7 @@
 #include "src/objects/string-inl.h"
 #include "src/objects/synthetic-module-inl.h"
 #include "src/profiler/cpu-profiler.h"
+#include "src/profiler/symbolizer.h"
 #include "src/strings/unicode-inl.h"
 #include "src/utils/utils.h"
 #include "test/cctest/heap/heap-tester.h"
@@ -81,6 +82,7 @@ using ::v8::Boolean;
 using ::v8::BooleanObject;
 using ::v8::Context;
 using ::v8::Extension;
+using ::v8::FixedArray;
 using ::v8::Function;
 using ::v8::FunctionTemplate;
 using ::v8::HandleScope;
@@ -2275,12 +2277,11 @@ THREADED_TEST(TestDataTypeChecks) {
     CHECK(!x->IsObjectTemplate());
     CHECK(!x->IsFunctionTemplate());
     v8::Local<v8::Value>::Cast(x);
+    x.As<v8::Value>();
   }
 
-  v8::ScriptOrigin origin(
-      v8_str(""), Local<v8::Integer>(), Local<v8::Integer>(),
-      Local<v8::Boolean>(), Local<v8::Integer>(), Local<v8::Value>(),
-      Local<v8::Boolean>(), Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(v8_str(""), 0, 0, false, -1, Local<v8::Value>(),
+                          false, false, true);
   v8::ScriptCompiler::Source source(v8::String::NewFromUtf8Literal(isolate, ""),
                                     origin);
   v8::Local<v8::Data> module =
@@ -2291,6 +2292,7 @@ THREADED_TEST(TestDataTypeChecks) {
   CHECK(!module->IsObjectTemplate());
   CHECK(!module->IsFunctionTemplate());
   v8::Local<v8::Module>::Cast(module);
+  module.As<v8::Module>();
 
   v8::Local<v8::Data> p = v8::Private::New(isolate);
   CHECK(!p->IsModule());
@@ -2605,7 +2607,7 @@ THREADED_TEST(DescriptorInheritance2) {
 
 void SimpleAccessorGetter(Local<String> name,
                           const v8::PropertyCallbackInfo<v8::Value>& info) {
-  Local<Object> self = Local<Object>::Cast(info.This());
+  Local<Object> self = info.This().As<Object>();
   info.GetReturnValue().Set(
       self->Get(info.GetIsolate()->GetCurrentContext(),
                 String::Concat(info.GetIsolate(), v8_str("accessor_"), name))
@@ -2614,7 +2616,7 @@ void SimpleAccessorGetter(Local<String> name,
 
 void SimpleAccessorSetter(Local<String> name, Local<Value> value,
                           const v8::PropertyCallbackInfo<void>& info) {
-  Local<Object> self = Local<Object>::Cast(info.This());
+  Local<Object> self = info.This().As<Object>();
   CHECK(self->Set(info.GetIsolate()->GetCurrentContext(),
                   String::Concat(info.GetIsolate(), v8_str("accessor_"), name),
                   value)
@@ -2624,7 +2626,7 @@ void SimpleAccessorSetter(Local<String> name, Local<Value> value,
 void SymbolAccessorGetter(Local<Name> name,
                           const v8::PropertyCallbackInfo<v8::Value>& info) {
   CHECK(name->IsSymbol());
-  Local<Symbol> sym = Local<Symbol>::Cast(name);
+  Local<Symbol> sym = name.As<Symbol>();
   if (sym->Description()->IsUndefined()) return;
   SimpleAccessorGetter(Local<String>::Cast(sym->Description()), info);
 }
@@ -2632,7 +2634,7 @@ void SymbolAccessorGetter(Local<Name> name,
 void SymbolAccessorSetter(Local<Name> name, Local<Value> value,
                           const v8::PropertyCallbackInfo<void>& info) {
   CHECK(name->IsSymbol());
-  Local<Symbol> sym = Local<Symbol>::Cast(name);
+  Local<Symbol> sym = name.As<Symbol>();
   if (sym->Description()->IsUndefined()) return;
   SimpleAccessorSetter(Local<String>::Cast(sym->Description()), value, info);
 }
@@ -2640,7 +2642,7 @@ void SymbolAccessorSetter(Local<Name> name, Local<Value> value,
 void SymbolAccessorGetterReturnsDefault(
     Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
   CHECK(name->IsSymbol());
-  Local<Symbol> sym = Local<Symbol>::Cast(name);
+  Local<Symbol> sym = name.As<Symbol>();
   if (sym->Description()->IsUndefined()) return;
   info.GetReturnValue().Set(info.Data());
 }
@@ -4628,9 +4630,7 @@ TEST(MessageHandler3) {
   isolate->AddMessageListener(check_message_3);
   LocalContext context;
   v8::ScriptOrigin origin =
-      v8::ScriptOrigin(v8_str("6.75"), v8::Integer::New(isolate, 1),
-                       v8::Integer::New(isolate, 2), v8::True(isolate),
-                       Local<v8::Integer>(), v8_str("7.40"), v8::True(isolate));
+      v8::ScriptOrigin(v8_str("6.75"), 1, 2, true, -1, v8_str("7.40"), true);
   v8::Local<v8::Script> script =
       Script::Compile(context.local(), v8_str("throw 'error'"), &origin)
           .ToLocalChecked();
@@ -4659,9 +4659,7 @@ TEST(MessageHandler4) {
   CHECK(!message_received);
   isolate->AddMessageListener(check_message_4);
   LocalContext context;
-  v8::ScriptOrigin origin =
-      v8::ScriptOrigin(v8_str("6.75"), v8::Integer::New(isolate, 1),
-                       v8::Integer::New(isolate, 2), v8::False(isolate));
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("6.75"), 1, 2, false);
   v8::Local<v8::Script> script =
       Script::Compile(context.local(), v8_str("throw 'error'"), &origin)
           .ToLocalChecked();
@@ -4701,9 +4699,7 @@ TEST(MessageHandler5) {
   CHECK(!message_received);
   isolate->AddMessageListener(check_message_5a);
   LocalContext context;
-  v8::ScriptOrigin origin1 =
-      v8::ScriptOrigin(v8_str("6.75"), v8::Integer::New(isolate, 1),
-                       v8::Integer::New(isolate, 2), v8::True(isolate));
+  v8::ScriptOrigin origin1 = v8::ScriptOrigin(v8_str("6.75"), 1, 2, true);
   v8::Local<v8::Script> script =
       Script::Compile(context.local(), v8_str("throw 'error'"), &origin1)
           .ToLocalChecked();
@@ -4714,9 +4710,7 @@ TEST(MessageHandler5) {
 
   message_received = false;
   isolate->AddMessageListener(check_message_5b);
-  v8::ScriptOrigin origin2 =
-      v8::ScriptOrigin(v8_str("6.75"), v8::Integer::New(isolate, 1),
-                       v8::Integer::New(isolate, 2), v8::False(isolate));
+  v8::ScriptOrigin origin2 = v8::ScriptOrigin(v8_str("6.75"), 1, 2, false);
   script = Script::Compile(context.local(), v8_str("throw 'error'"), &origin2)
                .ToLocalChecked();
   CHECK(script->Run(context.local()).IsEmpty());
@@ -8837,7 +8831,7 @@ static void YGetter(Local<String> name,
 static void YSetter(Local<String> name,
                     Local<Value> value,
                     const v8::PropertyCallbackInfo<void>& info) {
-  Local<Object> this_obj = Local<Object>::Cast(info.This());
+  Local<Object> this_obj = info.This().As<Object>();
   v8::Local<v8::Context> context = info.GetIsolate()->GetCurrentContext();
   if (this_obj->Has(context, name).FromJust())
     this_obj->Delete(context, name).FromJust();
@@ -13395,7 +13389,7 @@ static int GetGlobalObjectsCount() {
     if (object.IsJSGlobalObject()) {
       i::JSGlobalObject g = i::JSGlobalObject::cast(object);
       // Skip dummy global object.
-      if (g.global_dictionary().NumberOfElements() != 0) {
+      if (g.global_dictionary(v8::kAcquireLoad).NumberOfElements() != 0) {
         count++;
       }
     }
@@ -13871,9 +13865,9 @@ UNINITIALIZED_TEST(SetJitCodeEventHandler) {
                                      .ToLocalChecked())));
 
       i::PagedSpace* foo_owning_space = reinterpret_cast<i::PagedSpace*>(
-          i::Page::FromHeapObject(foo->abstract_code())->owner());
+          i::Page::FromHeapObject(foo->abstract_code(i_isolate))->owner());
       i::PagedSpace* bar_owning_space = reinterpret_cast<i::PagedSpace*>(
-          i::Page::FromHeapObject(bar->abstract_code())->owner());
+          i::Page::FromHeapObject(bar->abstract_code(i_isolate))->owner());
       CHECK_EQ(foo_owning_space, bar_owning_space);
       i::heap::SimulateFullSpace(foo_owning_space);
 
@@ -14049,14 +14043,13 @@ THREADED_TEST(TryCatchSourceInfo) {
   CheckTryCatchSourceInfo(script, resource_name, 0);
 
   resource_name = "test1.js";
-  v8::ScriptOrigin origin1(v8_str(resource_name));
+  v8::ScriptOrigin origin1(v8_str(resource_name), 0, 0);
   script =
       v8::Script::Compile(context.local(), source, &origin1).ToLocalChecked();
   CheckTryCatchSourceInfo(script, resource_name, 0);
 
   resource_name = "test2.js";
-  v8::ScriptOrigin origin2(v8_str(resource_name),
-                           v8::Integer::New(context->GetIsolate(), 7));
+  v8::ScriptOrigin origin2(v8_str(resource_name), 7, 0);
   script =
       v8::Script::Compile(context.local(), source, &origin2).ToLocalChecked();
   CheckTryCatchSourceInfo(script, resource_name, 7);
@@ -16880,7 +16873,7 @@ TEST(VisitExternalStrings) {
   v8::Isolate* isolate = CcTest::isolate();
   LocalContext env;
   v8::HandleScope scope(isolate);
-  const char string[] = "Some string";
+  const char string[] = "Some string that's long";
   uint16_t* two_byte_string = AsciiToTwoByteString(string);
   TestResource* resource[4];
   resource[0] = new TestResource(two_byte_string);
@@ -16960,7 +16953,7 @@ TEST(ExternalInternalizedStringCollectedAtTearDown) {
     v8::Local<v8::String> ring =
         CompileRun("ring")->ToString(env.local()).ToLocalChecked();
     CHECK(v8::Utils::OpenHandle(*ring)->IsInternalizedString());
-    ring->MakeExternal(inscription);
+    CHECK(ring->MakeExternal(inscription));
     // Ring is still alive.  Orcs are roaming freely across our lands.
     CHECK_EQ(0, destroyed);
     USE(ring);
@@ -16982,7 +16975,7 @@ TEST(ExternalInternalizedStringCollectedAtGC) {
         new TestOneByteResource(i::StrDup(s), &destroyed);
     v8::Local<v8::String> ring = CompileRun("ring").As<v8::String>();
     CHECK(v8::Utils::OpenHandle(*ring)->IsInternalizedString());
-    ring->MakeExternal(inscription);
+    CHECK(ring->MakeExternal(inscription));
     // Ring is still alive.  Orcs are roaming freely across our lands.
     CHECK_EQ(0, destroyed);
     USE(ring);
@@ -17259,12 +17252,9 @@ THREADED_TEST(ScriptOrigin) {
   Local<v8::Symbol> symbol(v8::Symbol::New(isolate));
   array->Set(isolate, 0, symbol);
 
-  v8::ScriptOrigin origin = v8::ScriptOrigin(
-      v8_str("test"), v8::Integer::New(env->GetIsolate(), 1),
-      v8::Integer::New(env->GetIsolate(), 1), v8::True(env->GetIsolate()),
-      v8::Local<v8::Integer>(), v8_str("http://sourceMapUrl"),
-      v8::True(env->GetIsolate()), v8::False(env->GetIsolate()),
-      v8::False(env->GetIsolate()), array);
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"), 1, 1, true, -1,
+                                             v8_str("http://sourceMapUrl"),
+                                             true, false, false, array);
   v8::Local<v8::String> script = v8_str("function f() {}\n\nfunction g() {}");
   v8::Script::Compile(env.local(), script, &origin)
       .ToLocalChecked()
@@ -17279,9 +17269,7 @@ THREADED_TEST(ScriptOrigin) {
   CHECK_EQ(0, strcmp("test",
                      *v8::String::Utf8Value(env->GetIsolate(),
                                             script_origin_f.ResourceName())));
-  CHECK_EQ(
-      1,
-      script_origin_f.ResourceLineOffset()->Int32Value(env.local()).FromJust());
+  CHECK_EQ(1, script_origin_f.LineOffset());
   CHECK(script_origin_f.Options().IsSharedCrossOrigin());
   CHECK(script_origin_f.Options().IsOpaque());
   printf("is name = %d\n", script_origin_f.SourceMapUrl()->IsUndefined());
@@ -17295,9 +17283,7 @@ THREADED_TEST(ScriptOrigin) {
   CHECK_EQ(0, strcmp("test",
                      *v8::String::Utf8Value(env->GetIsolate(),
                                             script_origin_g.ResourceName())));
-  CHECK_EQ(
-      1,
-      script_origin_g.ResourceLineOffset()->Int32Value(env.local()).FromJust());
+  CHECK_EQ(1, script_origin_g.LineOffset());
   CHECK(script_origin_g.Options().IsSharedCrossOrigin());
   CHECK(script_origin_g.Options().IsOpaque());
   CHECK_EQ(0, strcmp("http://sourceMapUrl",
@@ -17310,7 +17296,7 @@ THREADED_TEST(ScriptOrigin) {
 THREADED_TEST(FunctionGetInferredName) {
   LocalContext env;
   v8::HandleScope scope(env->GetIsolate());
-  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"));
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"), 0, 0);
   v8::Local<v8::String> script =
       v8_str("var foo = { bar : { baz : function() {}}}; var f = foo.bar.baz;");
   v8::Script::Compile(env.local(), script, &origin)
@@ -17372,7 +17358,7 @@ THREADED_TEST(FunctionGetDebugName) {
       "Object.defineProperty(j, 'name', { value: 'function.name' });"
       "var foo = { bar : { baz : (0, function() {})}}; var k = foo.bar.baz;"
       "var foo = { bar : { baz : function() {} }}; var l = foo.bar.baz;";
-  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"));
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"), 0, 0);
   v8::Script::Compile(env.local(), v8_str(code), &origin)
       .ToLocalChecked()
       ->Run(env.local())
@@ -17441,7 +17427,7 @@ THREADED_TEST(FunctionGetDisplayName) {
                      "var g = function() {"
                      "  arguments.callee.displayName = 'set_in_runtime';"
                      "}; g();";
-  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"));
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"), 0, 0);
   v8::Script::Compile(env.local(), v8_str(code), &origin)
       .ToLocalChecked()
       ->Run(env.local())
@@ -17479,7 +17465,7 @@ THREADED_TEST(FunctionGetDisplayName) {
 THREADED_TEST(ScriptLineNumber) {
   LocalContext env;
   v8::HandleScope scope(env->GetIsolate());
-  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"));
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"), 0, 0);
   v8::Local<v8::String> script = v8_str("function f() {}\n\nfunction g() {}");
   v8::Script::Compile(env.local(), script, &origin)
       .ToLocalChecked()
@@ -17498,9 +17484,7 @@ THREADED_TEST(ScriptColumnNumber) {
   LocalContext env;
   v8::Isolate* isolate = env->GetIsolate();
   v8::HandleScope scope(isolate);
-  v8::ScriptOrigin origin =
-      v8::ScriptOrigin(v8_str("test"), v8::Integer::New(isolate, 3),
-                       v8::Integer::New(isolate, 2));
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"), 3, 2);
   v8::Local<v8::String> script =
       v8_str("function foo() {}\n\n     function bar() {}");
   v8::Script::Compile(env.local(), script, &origin)
@@ -17520,9 +17504,7 @@ THREADED_TEST(FunctionGetScriptId) {
   LocalContext env;
   v8::Isolate* isolate = env->GetIsolate();
   v8::HandleScope scope(isolate);
-  v8::ScriptOrigin origin =
-      v8::ScriptOrigin(v8_str("test"), v8::Integer::New(isolate, 3),
-                       v8::Integer::New(isolate, 2));
+  v8::ScriptOrigin origin = v8::ScriptOrigin(v8_str("test"), 3, 2);
   v8::Local<v8::String> scriptSource =
       v8_str("function foo() {}\n\n     function bar() {}");
   v8::Local<v8::Script> script(
@@ -17609,7 +17591,8 @@ static void SetterWhichSetsYOnThisTo23(
     const v8::PropertyCallbackInfo<void>& info) {
   CHECK(v8::Utils::OpenHandle(*info.This())->IsJSObject());
   CHECK(v8::Utils::OpenHandle(*info.Holder())->IsJSObject());
-  Local<Object>::Cast(info.This())
+  info.This()
+      .As<Object>()
       ->Set(info.GetIsolate()->GetCurrentContext(), v8_str("y"), v8_num(23))
       .FromJust();
 }
@@ -17635,7 +17618,8 @@ void FooSetInterceptor(Local<Name> name, Local<Value> value,
            .FromJust()) {
     return;
   }
-  Local<Object>::Cast(info.This())
+  info.This()
+      .As<Object>()
       ->Set(info.GetIsolate()->GetCurrentContext(), v8_str("y"), v8_num(23))
       .FromJust();
   info.GetReturnValue().Set(v8_num(23));
@@ -17699,7 +17683,8 @@ static void NamedPropertySetterWhichSetsYOnThisTo23(
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   if (name->Equals(info.GetIsolate()->GetCurrentContext(), v8_str("x"))
           .FromJust()) {
-    Local<Object>::Cast(info.This())
+    info.This()
+        .As<Object>()
         ->Set(info.GetIsolate()->GetCurrentContext(), v8_str("y"), v8_num(23))
         .FromJust();
   }
@@ -18099,7 +18084,7 @@ THREADED_TEST(TwoByteStringInOneByteCons) {
 
   TestResource resource(uc16_buffer);
 
-  flat_string->MakeExternal(&resource);
+  CHECK(flat_string->MakeExternal(&resource));
 
   CHECK(flat_string->IsTwoByteRepresentation());
 
@@ -21450,7 +21435,7 @@ class RegExpInterruptTest {
     v8::Local<v8::String> string =
         v8::Local<v8::String>::New(isolate, instance->string_handle_);
     CHECK(string->CanMakeExternal());
-    string->MakeExternal(&one_byte_string_resource);
+    CHECK(string->MakeExternal(&one_byte_string_resource));
   }
 
   static void MakeSubjectTwoByteExternal(v8::Isolate* isolate, void* data) {
@@ -21460,7 +21445,7 @@ class RegExpInterruptTest {
     v8::Local<v8::String> string =
         v8::Local<v8::String>::New(isolate, instance->string_handle_);
     CHECK(string->CanMakeExternal());
-    string->MakeExternal(&two_byte_string_resource);
+    CHECK(string->MakeExternal(&two_byte_string_resource));
   }
 
   static void ReenterIrregexp(v8::Isolate* isolate, void* data) {
@@ -22965,6 +22950,34 @@ TEST(PromiseThen2) {
                     .FromJust());
 }
 
+TEST(PromiseCatchCallsBuiltin) {
+  LocalContext context;
+  v8::Isolate* isolate = context->GetIsolate();
+  v8::HandleScope scope(isolate);
+  Local<Object> global = context->Global();
+
+  v8::Local<v8::Promise::Resolver> resolver =
+      v8::Promise::Resolver::New(context.local()).ToLocalChecked();
+  v8::Local<v8::Promise> promise = resolver->GetPromise();
+
+  resolver->Reject(context.local(), v8::Integer::New(isolate, 1)).FromJust();
+
+  CompileRun(
+      "var x1 = 0;\n"
+      "function f(x) { x1 = x; }\n"
+      "Promise.prototype.then = function () { throw 'unreachable'; };\n");
+  Local<Function> f = Local<Function>::Cast(
+      global->Get(context.local(), v8_str("f")).ToLocalChecked());
+
+  // Catch should not call monkey-patched Promise.prototype.then.
+  promise->Catch(context.local(), f).ToLocalChecked();
+  isolate->PerformMicrotaskCheckpoint();
+  CHECK_EQ(1, global->Get(context.local(), v8_str("x1"))
+                  .ToLocalChecked()
+                  ->Int32Value(context.local())
+                  .FromJust());
+}
+
 TEST(PromiseStateAndValue) {
   LocalContext context;
   v8::Isolate* isolate = context->GetIsolate();
@@ -23171,7 +23184,7 @@ TEST(ScriptNameAndLineNumber) {
   v8::Isolate* isolate = env->GetIsolate();
   v8::HandleScope scope(isolate);
   const char* url = "http://www.foo.com/foo.js";
-  v8::ScriptOrigin origin(v8_str(url), v8::Integer::New(isolate, 13));
+  v8::ScriptOrigin origin(v8_str(url), 13, 0);
   v8::ScriptCompiler::Source script_source(v8_str("var foo;"), origin);
 
   Local<Script> script =
@@ -23189,7 +23202,7 @@ TEST(ScriptPositionInfo) {
   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
   v8::HandleScope scope(isolate);
   const char* url = "http://www.foo.com/foo.js";
-  v8::ScriptOrigin origin(v8_str(url), v8::Integer::New(isolate, 13));
+  v8::ScriptOrigin origin(v8_str(url), 13, 0);
   v8::ScriptCompiler::Source script_source(v8_str("var foo;\n"
                                                   "var bar;\n"
                                                   "var fisk = foo + bar;\n"),
@@ -23365,16 +23378,6 @@ TEST(ScriptSourceURLAndSourceMappingURL) {
                   "//# sourceURL=bar15\t.js   \n"
                   "//# sourceMappingURL=bar16\t.js \n",
                   nullptr, nullptr);
-  SourceURLHelper(isolate,
-                  "function foo() {}\n"
-                  "//# sourceURL=bar17'.js   \n"
-                  "//# sourceMappingURL=bar18'.js \n",
-                  nullptr, nullptr);
-  SourceURLHelper(isolate,
-                  "function foo() {}\n"
-                  "//# sourceURL=bar19\".js   \n"
-                  "//# sourceMappingURL=bar20\".js \n",
-                  nullptr, nullptr);
 
   // Not too much whitespace.
   SourceURLHelper(isolate,
@@ -23382,6 +23385,25 @@ TEST(ScriptSourceURLAndSourceMappingURL) {
                   "//# sourceURL=  bar21.js   \n"
                   "//# sourceMappingURL=  bar22.js \n",
                   "bar21.js", "bar22.js");
+
+  // Comments in eval'd script should be ignored.
+  SourceURLHelper(isolate,
+                  "function foo() {}\n"
+                  "eval(\"\\\n//# sourceURL=bar23.js\");\n"
+                  "eval(\"\\\n//# sourceMappingURL=bar24.js\");\n",
+                  nullptr, nullptr);
+  SourceURLHelper(isolate,
+                  "function foo() {}\n"
+                  "eval('\\\n//# sourceURL=bar23.js');\n"
+                  "eval('\\\n//# sourceMappingURL=bar24.js');\n",
+                  nullptr, nullptr);
+
+  // Inline data: URLs are allowed.
+  SourceURLHelper(
+      isolate,
+      "function foo() {}\n"
+      "//# sourceMappingURL=  data:application/json,{\"version\":3}  \n",
+      nullptr, "data:application/json,{\"version\":3}");
 }
 
 
@@ -23541,9 +23563,14 @@ class TestSourceStream : public v8::ScriptCompiler::ExternalSourceStream {
   unsigned index_;
 };
 
+v8::MaybeLocal<Module> UnexpectedModuleResolveCallback(
+    Local<Context> context, Local<String> specifier,
+    Local<FixedArray> import_assertions, Local<Module> referrer) {
+  CHECK_WITH_MSG(false, "Unexpected call to resolve callback");
+}
 
 // Helper function for running streaming tests.
-void RunStreamingTest(const char** chunks,
+void RunStreamingTest(const char** chunks, v8::ScriptType type,
                       v8::ScriptCompiler::StreamedSource::Encoding encoding =
                           v8::ScriptCompiler::StreamedSource::ONE_BYTE,
                       bool expected_success = true,
@@ -23557,7 +23584,7 @@ void RunStreamingTest(const char** chunks,
   v8::ScriptCompiler::StreamedSource source(
       std::make_unique<TestSourceStream>(chunks), encoding);
   v8::ScriptCompiler::ScriptStreamingTask* task =
-      v8::ScriptCompiler::StartStreaming(isolate, &source);
+      v8::ScriptCompiler::StartStreaming(isolate, &source, type);
 
   // TestSourceStream::GetMoreData won't block, so it's OK to just run the
   // task here in the main thread.
@@ -23567,25 +23594,65 @@ void RunStreamingTest(const char** chunks,
   // Possible errors are only produced while compiling.
   CHECK(!try_catch.HasCaught());
 
-  v8::ScriptOrigin origin(v8_str("http://foo.com"));
+  v8::ScriptOrigin origin(v8_str("http://foo.com"), 0, 0, false, -1,
+                          v8::Local<v8::Value>(), false, false,
+                          type == v8::ScriptType::kModule);
+
   char* full_source = TestSourceStream::FullSourceString(chunks);
-  v8::MaybeLocal<Script> script = v8::ScriptCompiler::Compile(
-      env.local(), &source, v8_str(full_source), origin);
-  if (expected_success) {
-    CHECK(!script.IsEmpty());
-    v8::Local<Value> result(
-        script.ToLocalChecked()->Run(env.local()).ToLocalChecked());
-    // All scripts are supposed to return the fixed value 13 when ran.
-    CHECK_EQ(13, result->Int32Value(env.local()).FromJust());
-    CheckMagicComments(isolate, script.ToLocalChecked(), expected_source_url,
-                       expected_source_mapping_url);
+  if (type == v8::ScriptType::kClassic) {
+    v8::MaybeLocal<Script> script = v8::ScriptCompiler::Compile(
+        env.local(), &source, v8_str(full_source), origin);
+    if (expected_success) {
+      CHECK(!script.IsEmpty());
+      v8::Local<Value> result(
+          script.ToLocalChecked()->Run(env.local()).ToLocalChecked());
+      // All scripts are supposed to return the fixed value 13 when ran.
+      CHECK_EQ(13, result->Int32Value(env.local()).FromJust());
+      CheckMagicComments(isolate, script.ToLocalChecked(), expected_source_url,
+                         expected_source_mapping_url);
+    } else {
+      CHECK(script.IsEmpty());
+    }
   } else {
-    CHECK(script.IsEmpty());
-    CHECK(try_catch.HasCaught());
+    v8::MaybeLocal<Module> maybe_module = v8::ScriptCompiler::CompileModule(
+        env.local(), &source, v8_str(full_source), origin);
+    if (expected_success) {
+      v8::Local<v8::Module> module = maybe_module.ToLocalChecked();
+      CHECK(
+          module
+              ->InstantiateModule(env.local(), UnexpectedModuleResolveCallback)
+              .FromJust());
+      CHECK_EQ(Module::kInstantiated, module->GetStatus());
+      v8::Local<Value> result = module->Evaluate(env.local()).ToLocalChecked();
+      CHECK_EQ(Module::kEvaluated, module->GetStatus());
+      if (i::FLAG_harmony_top_level_await) {
+        v8::Local<v8::Promise> promise = result.As<v8::Promise>();
+        CHECK_EQ(promise->State(), v8::Promise::kFulfilled);
+        CHECK_EQ(13, promise->Result()->Int32Value(env.local()).FromJust());
+      } else {
+        CHECK(!result.IsEmpty());
+        CHECK_EQ(13, result->Int32Value(env.local()).FromJust());
+      }
+    } else {
+      CHECK(maybe_module.IsEmpty());
+    }
   }
+  if (!expected_success) CHECK(try_catch.HasCaught());
   delete[] full_source;
 }
 
+void RunStreamingTest(const char** chunks,
+                      v8::ScriptCompiler::StreamedSource::Encoding encoding =
+                          v8::ScriptCompiler::StreamedSource::ONE_BYTE,
+                      bool expected_success = true,
+                      const char* expected_source_url = nullptr,
+                      const char* expected_source_mapping_url = nullptr) {
+  RunStreamingTest(chunks, v8::ScriptType::kClassic, encoding, expected_success,
+                   expected_source_url, expected_source_mapping_url);
+  RunStreamingTest(chunks, v8::ScriptType::kModule, encoding, expected_success,
+                   expected_source_url, expected_source_mapping_url);
+}
+
 TEST(StreamingSimpleScript) {
   // This script is unrealistically small, since no one chunk is enough to fill
   // the backing buffer of Scanner, let alone overflow it.
@@ -23618,7 +23685,8 @@ TEST(StreamingScriptEvalShadowing) {
       "  })()\n"
       "})()\n";
   const char* chunks[] = {chunk1, nullptr};
-  RunStreamingTest(chunks);
+  // Only run the script version of this test.
+  RunStreamingTest(chunks, v8::ScriptType::kClassic);
 }
 
 TEST(StreamingBiggerScript) {
@@ -24014,12 +24082,6 @@ TEST(CodeCache) {
   isolate2->Dispose();
 }
 
-v8::MaybeLocal<Module> UnexpectedModuleResolveCallback(Local<Context> context,
-                                                       Local<String> specifier,
-                                                       Local<Module> referrer) {
-  CHECK_WITH_MSG(false, "Unexpected call to resolve callback");
-}
-
 v8::MaybeLocal<Value> UnexpectedSyntheticModuleEvaluationStepsCallback(
     Local<Context> context, Local<Module> module) {
   CHECK_WITH_MSG(false, "Unexpected call to synthetic module re callback");
@@ -24056,10 +24118,8 @@ Local<Module> CompileAndInstantiateModule(v8::Isolate* isolate,
                                           const char* resource_name,
                                           const char* source) {
   Local<String> source_string = v8_str(source);
-  v8::ScriptOrigin script_origin(
-      v8_str(resource_name), Local<v8::Integer>(), Local<v8::Integer>(),
-      Local<v8::Boolean>(), Local<v8::Integer>(), Local<v8::Value>(),
-      Local<v8::Boolean>(), Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin script_origin(v8_str(resource_name), 0, 0, false, -1,
+                                 Local<v8::Value>(), false, false, true);
   v8::ScriptCompiler::Source script_compiler_source(source_string,
                                                     script_origin);
   Local<Module> module =
@@ -24087,10 +24147,8 @@ Local<Module> CompileAndInstantiateModuleFromCache(
     v8::Isolate* isolate, Local<Context> context, const char* resource_name,
     const char* source, v8::ScriptCompiler::CachedData* cache) {
   Local<String> source_string = v8_str(source);
-  v8::ScriptOrigin script_origin(
-      v8_str(resource_name), Local<v8::Integer>(), Local<v8::Integer>(),
-      Local<v8::Boolean>(), Local<v8::Integer>(), Local<v8::Value>(),
-      Local<v8::Boolean>(), Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin script_origin(v8_str(resource_name), 0, 0, false, -1,
+                                 Local<v8::Value>(), false, false, true);
   v8::ScriptCompiler::Source script_compiler_source(source_string,
                                                     script_origin, cache);
 
@@ -24106,9 +24164,9 @@ Local<Module> CompileAndInstantiateModuleFromCache(
 
 }  // namespace
 
-v8::MaybeLocal<Module> SyntheticModuleResolveCallback(Local<Context> context,
-                                                      Local<String> specifier,
-                                                      Local<Module> referrer) {
+v8::MaybeLocal<Module> SyntheticModuleResolveCallback(
+    Local<Context> context, Local<String> specifier,
+    Local<FixedArray> import_assertions, Local<Module> referrer) {
   std::vector<v8::Local<v8::String>> export_names{v8_str("test_export")};
   Local<Module> module = CreateAndInstantiateSyntheticModule(
       context->GetIsolate(),
@@ -24118,7 +24176,8 @@ v8::MaybeLocal<Module> SyntheticModuleResolveCallback(Local<Context> context,
 }
 
 v8::MaybeLocal<Module> SyntheticModuleThatThrowsDuringEvaluateResolveCallback(
-    Local<Context> context, Local<String> specifier, Local<Module> referrer) {
+    Local<Context> context, Local<String> specifier,
+    Local<FixedArray> import_assertions, Local<Module> referrer) {
   std::vector<v8::Local<v8::String>> export_names{v8_str("test_export")};
   Local<Module> module = CreateAndInstantiateSyntheticModule(
       context->GetIsolate(),
@@ -24236,6 +24295,7 @@ TEST(CreateSyntheticModule) {
   CHECK_EQ(i_module->status(), i::Module::kInstantiated);
   CHECK(module->IsSyntheticModule());
   CHECK(!module->IsSourceTextModule());
+  CHECK_EQ(module->GetModuleRequests()->Length(), 0);
 }
 
 TEST(CreateSyntheticModuleGC) {
@@ -24452,10 +24512,8 @@ TEST(ImportFromSyntheticModule) {
   Local<String> source_text = v8_str(
       "import {test_export} from './synthetic.module';"
       "(function() { return test_export; })();");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -24484,10 +24542,8 @@ TEST(ImportFromSyntheticModuleThrow) {
   Local<String> source_text = v8_str(
       "import {test_export} from './synthetic.module';"
       "(function() { return test_export; })();");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -24624,10 +24680,8 @@ TEST(CodeCacheScriptModuleMismatch) {
       v8::Local<v8::Context> context = v8::Context::New(isolate);
       v8::Context::Scope cscope(context);
 
-      v8::ScriptOrigin script_origin(
-          v8_str(origin), Local<v8::Integer>(), Local<v8::Integer>(),
-          Local<v8::Boolean>(), Local<v8::Integer>(), Local<v8::Value>(),
-          Local<v8::Boolean>(), Local<v8::Boolean>(), True(isolate));
+      v8::ScriptOrigin script_origin(v8_str(origin), 0, 0, false, -1,
+                                     Local<v8::Value>(), false, false, true);
       v8::ScriptCompiler::Source script_compiler_source(v8_str(source),
                                                         script_origin, cache);
 
@@ -24669,10 +24723,8 @@ TEST(InvalidCodeCacheDataInCompileModule) {
       new v8::ScriptCompiler::CachedData(data, length);
   CHECK(!cached_data->rejected);
 
-  v8::ScriptOrigin script_origin(
-      origin, Local<v8::Integer>(), Local<v8::Integer>(), Local<v8::Boolean>(),
-      Local<v8::Integer>(), Local<v8::Value>(), Local<v8::Boolean>(),
-      Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin script_origin(origin, 0, 0, false, -1, Local<v8::Value>(),
+                                 false, false, true);
   v8::ScriptCompiler::Source source(v8_str("42"), script_origin, cached_data);
   v8::Local<v8::Context> context = CcTest::isolate()->GetCurrentContext();
 
@@ -26107,10 +26159,8 @@ TEST(ImportMeta) {
   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
   Local<String> url = v8_str("www.google.com");
   Local<String> source_text = v8_str("import.meta;");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -26157,10 +26207,8 @@ TEST(ImportMetaThrowUnhandled) {
   Local<String> url = v8_str("www.google.com");
   Local<String> source_text =
       v8_str("export default function() { return import.meta }");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -26204,10 +26252,8 @@ TEST(ImportMetaThrowHandled) {
         return false;
       }
       )javascript");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -26239,10 +26285,8 @@ TEST(GetModuleNamespace) {
 
   Local<String> url = v8_str("www.google.com");
   Local<String> source_text = v8_str("export default 5; export const a = 10;");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -26268,10 +26312,8 @@ TEST(ModuleGetUnboundModuleScript) {
 
   Local<String> url = v8_str("www.google.com");
   Local<String> source_text = v8_str("export default 5; export const a = 10;");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -26297,10 +26339,8 @@ TEST(ModuleScriptId) {
 
   Local<String> url = v8_str("www.google.com");
   Local<String> source_text = v8_str("export default 5; export const a = 10;");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -26320,10 +26360,8 @@ TEST(ModuleIsSourceTextModule) {
 
   Local<String> url = v8_str("www.google.com");
   Local<String> source_text = v8_str("export default 5; export const a = 10;");
-  v8::ScriptOrigin origin(url, Local<v8::Integer>(), Local<v8::Integer>(),
-                          Local<v8::Boolean>(), Local<v8::Integer>(),
-                          Local<v8::Value>(), Local<v8::Boolean>(),
-                          Local<v8::Boolean>(), True(isolate));
+  v8::ScriptOrigin origin(url, 0, 0, false, -1, Local<v8::Value>(), false,
+                          false, true);
   v8::ScriptCompiler::Source source(source_text, origin);
   Local<Module> module =
       v8::ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
@@ -26642,9 +26680,9 @@ TEST(WasmI32AtomicWaitCallback) {
   WasmRunner<int32_t, int32_t, int32_t, double> r(TestExecutionTier::kTurbofan);
   r.builder().AddMemory(kWasmPageSize, SharedFlag::kShared);
   r.builder().SetHasSharedMemory();
-  BUILD(r, WASM_ATOMICS_WAIT(kExprI32AtomicWait, WASM_GET_LOCAL(0),
-                             WASM_GET_LOCAL(1),
-                             WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(2)), 4));
+  BUILD(r, WASM_ATOMICS_WAIT(kExprI32AtomicWait, WASM_LOCAL_GET(0),
+                             WASM_LOCAL_GET(1),
+                             WASM_I64_SCONVERT_F64(WASM_LOCAL_GET(2)), 4));
   LocalContext env;
   v8::Isolate* isolate = env->GetIsolate();
   v8::HandleScope scope(isolate);
@@ -26678,9 +26716,9 @@ TEST(WasmI64AtomicWaitCallback) {
   WasmRunner<int32_t, int32_t, double, double> r(TestExecutionTier::kTurbofan);
   r.builder().AddMemory(kWasmPageSize, SharedFlag::kShared);
   r.builder().SetHasSharedMemory();
-  BUILD(r, WASM_ATOMICS_WAIT(kExprI64AtomicWait, WASM_GET_LOCAL(0),
-                             WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(1)),
-                             WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(2)), 8));
+  BUILD(r, WASM_ATOMICS_WAIT(kExprI64AtomicWait, WASM_LOCAL_GET(0),
+                             WASM_I64_SCONVERT_F64(WASM_LOCAL_GET(1)),
+                             WASM_I64_SCONVERT_F64(WASM_LOCAL_GET(2)), 8));
   LocalContext env;
   v8::Isolate* isolate = env->GetIsolate();
   v8::HandleScope scope(isolate);
@@ -27454,10 +27492,6 @@ UNINITIALIZED_TEST(NestedIsolates) {
 
 #ifndef V8_LITE_MODE
 namespace {
-// The following should correspond to Chromium's kV8DOMWrapperObjectIndex.
-static const int kV8WrapperTypeIndex = 0;
-static const int kV8WrapperObjectIndex = 1;
-
 template <typename T>
 struct ConvertJSValue {
   static Maybe<T> Get(v8::Local<v8::Value> value,
@@ -27578,14 +27612,6 @@ struct ConvertJSValue<bool> {
   }
 };
 
-enum class ApiCheckerResult : uint8_t {
-  kNotCalled = 0,
-  kSlowCalled = 1 << 0,
-  kFastCalled = 1 << 1,
-};
-using ApiCheckerResultFlags = v8::base::Flags<ApiCheckerResult>;
-DEFINE_OPERATORS_FOR_FLAGS(ApiCheckerResultFlags)
-
 template <typename Value, typename Impl>
 struct BasicApiChecker {
   static void FastCallback(v8::ApiObject receiver, Value argument,
@@ -27606,22 +27632,6 @@ struct BasicApiChecker {
   ApiCheckerResultFlags result_ = ApiCheckerResult::kNotCalled;
 };
 
-bool IsValidUnwrapObject(v8::Object* object) {
-  v8::internal::Address addr =
-      *reinterpret_cast<v8::internal::Address*>(object);
-  auto instance_type = v8::internal::Internals::GetInstanceType(addr);
-  return (instance_type == v8::internal::Internals::kJSObjectType ||
-          instance_type == v8::internal::Internals::kJSApiObjectType ||
-          instance_type == v8::internal::Internals::kJSSpecialApiObjectType);
-}
-
-template <typename T, int offset>
-T* GetInternalField(v8::Object* wrapper) {
-  assert(offset < wrapper->InternalFieldCount());
-  return reinterpret_cast<T*>(
-      wrapper->GetAlignedPointerFromInternalField(offset));
-}
-
 enum class Behavior {
   kNoException,
   kException,  // An exception should be thrown by the callback function.
@@ -28285,7 +28295,6 @@ TEST(FastApiCalls) {
   CallAndCheck<uint64_t>(0, Behavior::kNoException,
                          expected_path_for_64bit_test, v8_num(-0.0));
 
-#ifndef V8_TARGET_ARCH_ARM64
   // TODO(mslekova): We deopt for unsafe integers, but ultimately we want to
   // stay on the fast path.
   CallAndCheck<int64_t>(std::numeric_limits<int64_t>::min(),
@@ -28304,13 +28313,6 @@ TEST(FastApiCalls) {
   CallAndCheck<uint64_t>(1ull << 63, Behavior::kNoException,
                          ApiCheckerResult::kSlowCalled,
                          v8_num(static_cast<double>(1ull << 63)));
-#else
-  // TODO(v8:11121): Currently the tests above are executed for non-arm64
-  // because they fall down the fast path due to incorrect behaviour of
-  // CheckedFloat64ToInt64 on arm64 (see the linked issue for details).
-  // Eventually we want to remove the conditional compilation and ensure
-  // consistent behaviour on all platforms.
-#endif  // V8_TARGET_ARCH_ARM64
 
   // Corner cases - float and double
 #ifdef V8_ENABLE_FP_PARAMS_IN_C_LINKAGE
@@ -28805,6 +28807,38 @@ TEST(CodeLikeFunction) {
   ExpectInt32("new Function(new CodeLike())()", 7);
 }
 
+UNINITIALIZED_TEST(SingleThreadedDefaultPlatform) {
+  v8::V8::SetFlagsFromString("--single-threaded");
+  auto old_platform = i::V8::GetCurrentPlatform();
+  std::unique_ptr<v8::Platform> new_platform(
+      v8::platform::NewSingleThreadedDefaultPlatform());
+  i::V8::SetPlatformForTesting(new_platform.get());
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
+  isolate->Enter();
+  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+  {
+    i::HandleScope scope(i_isolate);
+    v8::Local<Context> env = Context::New(isolate);
+    env->Enter();
+
+    CompileRunChecked(isolate,
+                      "function f() {"
+                      "  for (let i = 0; i < 10; i++)"
+                      "    (new Array(10)).fill(0);"
+                      "  return 0;"
+                      "}"
+                      "f();");
+    env->Exit();
+  }
+  CcTest::CollectGarbage(i::NEW_SPACE, i_isolate);
+  CcTest::CollectAllAvailableGarbage(i_isolate);
+  isolate->Exit();
+  isolate->Dispose();
+  i::V8::SetPlatformForTesting(old_platform);
+}
+
 THREADED_TEST(MicrotaskQueueOfContext) {
   auto microtask_queue = v8::MicrotaskQueue::New(CcTest::isolate());
   v8::HandleScope scope(CcTest::isolate());
diff --git a/deps/v8/test/cctest/test-assembler-arm.cc b/deps/v8/test/cctest/test-assembler-arm.cc
index fa3ebdd86dc748..1dd4ecfbcbc496 100644
--- a/deps/v8/test/cctest/test-assembler-arm.cc
+++ b/deps/v8/test/cctest/test-assembler-arm.cc
@@ -1274,6 +1274,7 @@ TEST(15) {
     float vcvt_f32_s32[4], vcvt_f32_u32[4];
     uint32_t vdup8[4], vdup16[4], vdup32[4];
     float vabsf[4], vnegf[4];
+    uint32_t vclt0_s8[4], vclt0_s16[4], vclt0_s32[4];
     uint32_t vabs_s8[4], vabs_s16[4], vabs_s32[4];
     uint32_t vneg_s8[4], vneg_s16[4], vneg_s32[4];
     uint32_t veor[4], vand[4], vorr[4];
@@ -1282,6 +1283,8 @@ TEST(15) {
     uint32_t vmin_s8[4], vmin_u16[4], vmin_s32[4];
     uint32_t vmax_s8[4], vmax_u16[4], vmax_s32[4];
     uint32_t vpadd_i8[2], vpadd_i16[2], vpadd_i32[2];
+    uint32_t vpaddl_s8[4], vpaddl_s16[4], vpaddl_s32[4];
+    uint32_t vpaddl_u8[4], vpaddl_u16[4], vpaddl_u32[4];
     uint32_t vpmin_s8[2], vpmin_u16[2], vpmin_s32[2];
     uint32_t vpmax_s8[2], vpmax_u16[2], vpmax_s32[2];
     uint32_t vadd8[4], vadd16[4], vadd32[4];
@@ -1289,9 +1292,11 @@ TEST(15) {
     uint32_t vsub8[4], vsub16[4], vsub32[4];
     uint32_t vqsub_u8[4], vqsub_s16[4], vqsub_u32[4];
     uint32_t vmul8[4], vmul16[4], vmul32[4];
-    uint32_t vshl8[4], vshl16[4], vshl32[5];
-    uint32_t vshr_s8[4], vshr_u16[4], vshr_s32[5];
+    uint32_t vshl8[4], vshl16[4], vshl32[4];
+    uint32_t vshr_s8[4], vshr_u16[4], vshr_s32[4];
+    uint32_t vshr_s8_d[2], vshr_u16_d[2], vshr_s32_d[2];
     uint32_t vsli_64[2], vsri_64[2], vsli_32[2], vsri_32[2];
+    uint32_t vsra_64[2], vsra_32[2], vsra_16[2];
     uint32_t vceq[4], vceqf[4], vcgef[4], vcgtf[4];
     uint32_t vcge_s8[4], vcge_u16[4], vcge_s32[4];
     uint32_t vcgt_s8[4], vcgt_u16[4], vcgt_s32[4];
@@ -1643,6 +1648,35 @@ TEST(15) {
     __ vpadd(Neon32, d0, d0, d2);
     __ vstr(d0, r0, offsetof(T, vpadd_i32));
 
+    // vpaddl signed.
+    __ mov(r4, Operand(0x81));
+    __ vdup(Neon8, q0, r4);
+
+    __ vpaddl(NeonS8, q2, q0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vpaddl_s8))));
+    __ vst1(Neon8, NeonListOperand(q2), NeonMemOperand(r4));
+
+    __ vpaddl(NeonS16, q2, q0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vpaddl_s16))));
+    __ vst1(Neon8, NeonListOperand(q2), NeonMemOperand(r4));
+
+    __ vpaddl(NeonS32, q2, q0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vpaddl_s32))));
+    __ vst1(Neon8, NeonListOperand(q2), NeonMemOperand(r4));
+
+    // vpaddl unsigned.
+    __ vpaddl(NeonU8, q2, q0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vpaddl_u8))));
+    __ vst1(Neon8, NeonListOperand(q2), NeonMemOperand(r4));
+
+    __ vpaddl(NeonU16, q2, q0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vpaddl_u16))));
+    __ vst1(Neon8, NeonListOperand(q2), NeonMemOperand(r4));
+
+    __ vpaddl(NeonU32, q2, q0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vpaddl_u32))));
+    __ vst1(Neon8, NeonListOperand(q2), NeonMemOperand(r4));
+
     // vpmin/vpmax integer.
     __ mov(r4, Operand(0x03));
     __ vdup(Neon16, q0, r4);
@@ -1801,6 +1835,19 @@ TEST(15) {
     __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vshr_s32))));
     __ vst1(Neon8, NeonListOperand(q1), NeonMemOperand(r4));
 
+    // vshr.s, vshr.u with d registers.
+    __ mov(r4, Operand(0x80));
+    __ vdup(Neon8, q0, r4);
+    __ vshr(NeonS8, d1, d0, 1);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vshr_s8_d))));
+    __ vst1(Neon8, NeonListOperand(d1), NeonMemOperand(r4));
+    __ vshr(NeonU16, d2, d0, 9);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vshr_u16_d))));
+    __ vst1(Neon8, NeonListOperand(q1), NeonMemOperand(r4));
+    __ vshr(NeonS32, d2, d0, 17);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vshr_s32_d))));
+    __ vst1(Neon8, NeonListOperand(q1), NeonMemOperand(r4));
+
     // vsli, vsri.
     __ mov(r4, Operand(0xFFFFFFFF));
     __ mov(r5, Operand(0x1));
@@ -1821,6 +1868,20 @@ TEST(15) {
     __ vsri(Neon32, d1, d0, 16);
     __ vstr(d1, r0, offsetof(T, vsri_32));
 
+    // vsra.
+    __ vmov(d0, r4, r5);
+    // Check same dst and src registers.
+    __ vsra(NeonU64, d0, d0, 1);
+    __ vstr(d0, r0, offsetof(T, vsra_64));
+    __ vmov(d0, r4, r5);
+    __ vmov(d1, r5, r4);
+    __ vsra(NeonS32, d1, d0, 16);
+    __ vstr(d1, r0, offsetof(T, vsra_32));
+    __ vmov(d0, r4, r5);
+    __ vmov(d1, r5, r4);
+    __ vsra(NeonU16, d1, d0, 2);
+    __ vstr(d1, r0, offsetof(T, vsra_16));
+
     // vceq.
     __ mov(r4, Operand(0x03));
     __ vdup(Neon8, q0, r4);
@@ -1858,6 +1919,26 @@ TEST(15) {
     __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vcgt_s32))));
     __ vst1(Neon8, NeonListOperand(q2), NeonMemOperand(r4));
 
+    // vclt #0 (signed integer).
+    __ mov(r4, Operand(0x7F80807F));
+    __ mov(r5, Operand(0xFF01FF01));
+    __ vmov(d0, r4, r5);
+    __ mov(r4, Operand(0xFF0000FF));
+    __ mov(r5, Operand(0x00800080));
+    __ vmov(d1, r4, r5);
+
+    __ vclt(Neon8, q1, q0, 0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vclt0_s8))));
+    __ vst1(Neon8, NeonListOperand(q1), NeonMemOperand(r4));
+
+    __ vclt(Neon16, q1, q0, 0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vclt0_s16))));
+    __ vst1(Neon8, NeonListOperand(q1), NeonMemOperand(r4));
+
+    __ vclt(Neon32, q1, q0, 0);
+    __ add(r4, r0, Operand(static_cast<int32_t>(offsetof(T, vclt0_s32))));
+    __ vst1(Neon8, NeonListOperand(q1), NeonMemOperand(r4));
+
     // vtst.
     __ mov(r4, Operand(0x03));
     __ vdup(Neon8, q0, r4);
@@ -2128,6 +2209,11 @@ TEST(15) {
                   UINT32_TO_FLOAT(kMaxInt), UINT32_TO_FLOAT(kMaxUInt32),
                   UINT32_TO_FLOAT(kMinInt + 1));
 
+    CHECK_EQ_32X4(vclt0_s8, 0x00FFFF00u, 0xFF00FF00u, 0xFF0000FFu, 0x00FF00FFu);
+    CHECK_EQ_32X4(vclt0_s16, 0x0000FFFF, 0xFFFFFFFFu, 0xFFFF0000u, 0x00000000u);
+    CHECK_EQ_32X4(vclt0_s32, 0x00000000u, 0xFFFFFFFFu, 0xFFFFFFFFu,
+                  0x00000000u);
+
     CHECK_EQ_32X4(vabsf, 1.0, 0.0, 0.0, 1.0);
     CHECK_EQ_32X4(vnegf, 1.0, 0.0, -0.0, -1.0);
     // src: [0x7F7F7F7F, 0x01010101, 0xFFFFFFFF, 0x80808080]
@@ -2168,6 +2254,15 @@ TEST(15) {
     CHECK_EQ_32X2(vpadd_i8, 0x03030303u, 0x06060606u);
     CHECK_EQ_32X2(vpadd_i16, 0x0C0C0606u, 0x06060606u);
     CHECK_EQ_32X2(vpadd_i32, 0x12120C0Cu, 0x06060606u);
+
+    CHECK_EQ_32X4(vpaddl_s8, 0xFF02FF02, 0xFF02FF02, 0xFF02FF02, 0xFF02FF02);
+    CHECK_EQ_32X4(vpaddl_s16, 0xFFFF0302, 0xFFFF0302, 0xFFFF0302, 0xFFFF0302);
+    CHECK_EQ_32X4(vpaddl_s32, 0x03030302, 0xFFFFFFFF, 0x03030302, 0xFFFFFFFF);
+
+    CHECK_EQ_32X4(vpaddl_u8, 0x01020102, 0x01020102, 0x01020102, 0x01020102);
+    CHECK_EQ_32X4(vpaddl_u16, 0x00010302, 0x00010302, 0x00010302, 0x00010302);
+    CHECK_EQ_32X4(vpaddl_u32, 0x03030302, 0x00000001, 0x03030302, 0x00000001);
+
     CHECK_EQ_32X2(vpmin_s8, 0x00000000u, 0x03030303u);
     CHECK_EQ_32X2(vpmax_s8, 0x03030303u, 0x03030303u);
     // [0, ffff, 0, ffff] and [ffff, ffff]
@@ -2197,10 +2292,16 @@ TEST(15) {
     CHECK_EQ_SPLAT(vshr_s8, 0xC0C0C0C0u);
     CHECK_EQ_SPLAT(vshr_u16, 0x00400040u);
     CHECK_EQ_SPLAT(vshr_s32, 0xFFFFC040u);
+    CHECK_EQ_32X2(vshr_s8_d, 0xC0C0C0C0u, 0xC0C0C0C0u);
+    CHECK_EQ_32X2(vshr_u16_d, 0x00400040u, 0x00400040u);
+    CHECK_EQ_32X2(vshr_s32_d, 0xFFFFC040u, 0xFFFFC040u);
     CHECK_EQ_32X2(vsli_64, 0x01u, 0xFFFFFFFFu);
     CHECK_EQ_32X2(vsri_64, 0xFFFFFFFFu, 0x01u);
     CHECK_EQ_32X2(vsli_32, 0xFFFF0001u, 0x00010001u);
     CHECK_EQ_32X2(vsri_32, 0x00000000u, 0x0000FFFFu);
+    CHECK_EQ_32X2(vsra_64, 0xFFFFFFFEu, 0x2);
+    CHECK_EQ_32X2(vsra_32, 0x0, 0xFFFFFFFFu);
+    CHECK_EQ_32X2(vsra_16, 0x3FFF4000, 0xFFFFFFFFu);
     CHECK_EQ_SPLAT(vceq, 0x00FF00FFu);
     // [0, 3, 0, 3, ...] >= [3, 3, 3, 3, ...]
     CHECK_EQ_SPLAT(vcge_s8, 0x00FF00FFu);
@@ -4113,7 +4214,7 @@ TEST(vabs_32) {
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
 
-  auto f = AssembleCode<F_iiiii>([](Assembler& assm) {
+  auto f = AssembleCode<F_iiiii>(isolate, [](Assembler& assm) {
     __ vmov(s0, r0);
     __ vabs(s0, s0);
     __ vmov(r0, s0);
@@ -4131,7 +4232,7 @@ TEST(vabs_64) {
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
 
-  auto f = AssembleCode<F_iiiii>([](Assembler& assm) {
+  auto f = AssembleCode<F_iiiii>(isolate, [](Assembler& assm) {
     __ vmov(d0, r0, r1);
     __ vabs(d0, d0);
     __ vmov(r1, r0, d0);
@@ -4151,7 +4252,7 @@ TEST(vneg_32) {
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
 
-  auto f = AssembleCode<F_iiiii>([](Assembler& assm) {
+  auto f = AssembleCode<F_iiiii>(isolate, [](Assembler& assm) {
     __ vmov(s0, r0);
     __ vneg(s0, s0);
     __ vmov(r0, s0);
@@ -4169,7 +4270,7 @@ TEST(vneg_64) {
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
 
-  auto f = AssembleCode<F_iiiii>([](Assembler& assm) {
+  auto f = AssembleCode<F_iiiii>(isolate, [](Assembler& assm) {
     __ vmov(d0, r0, r1);
     __ vneg(d0, d0);
     __ vmov(r1, r0, d0);
@@ -4189,7 +4290,7 @@ TEST(move_pair) {
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
 
-  auto f = AssembleCode<F_piiii>([](MacroAssembler& assm) {
+  auto f = AssembleCode<F_piiii>(isolate, [](MacroAssembler& assm) {
     RegList used_callee_saved =
         r4.bit() | r5.bit() | r6.bit() | r7.bit() | r8.bit();
     __ stm(db_w, sp, used_callee_saved);
diff --git a/deps/v8/test/cctest/test-assembler-arm64.cc b/deps/v8/test/cctest/test-assembler-arm64.cc
index 7dbe07c9243f09..4deb43673f178d 100644
--- a/deps/v8/test/cctest/test-assembler-arm64.cc
+++ b/deps/v8/test/cctest/test-assembler-arm64.cc
@@ -6832,6 +6832,63 @@ TEST(ldr_literal_range_max_dist_no_emission_2) {
 
 #endif
 
+static const PrefetchOperation kPrfmOperations[] = {
+    PLDL1KEEP, PLDL1STRM, PLDL2KEEP, PLDL2STRM, PLDL3KEEP, PLDL3STRM,
+
+    PLIL1KEEP, PLIL1STRM, PLIL2KEEP, PLIL2STRM, PLIL3KEEP, PLIL3STRM,
+
+    PSTL1KEEP, PSTL1STRM, PSTL2KEEP, PSTL2STRM, PSTL3KEEP, PSTL3STRM};
+
+TEST(prfm_regoffset_assem) {
+  INIT_V8();
+  SETUP();
+
+  START();
+  // The address used in prfm doesn't have to be valid.
+  __ Mov(x0, 0x0123456789abcdef);
+
+  CPURegList inputs(CPURegister::kRegister, kXRegSizeInBits, 10, 18);
+  __ Mov(x10, 0);
+  __ Mov(x11, 1);
+  __ Mov(x12, 8);
+  __ Mov(x13, 255);
+  __ Mov(x14, -0);
+  __ Mov(x15, -1);
+  __ Mov(x16, -8);
+  __ Mov(x17, -255);
+  __ Mov(x18, 0xfedcba9876543210);
+
+  for (int op = 0; op < (1 << ImmPrefetchOperation_width); op++) {
+    // Unallocated prefetch operations are ignored, so test all of them.
+    // We have to use the Assembler directly for this.
+    CPURegList loop = inputs;
+    while (!loop.IsEmpty()) {
+      __ prfm(op, MemOperand(x0, Register::Create(loop.PopLowestIndex().code(),
+                                                  kXRegSizeInBits)));
+    }
+  }
+
+  for (PrefetchOperation op : kPrfmOperations) {
+    // Also test named operations.
+    CPURegList loop = inputs;
+    while (!loop.IsEmpty()) {
+      Register input =
+          Register::Create(loop.PopLowestIndex().code(), kXRegSizeInBits);
+      __ prfm(op, MemOperand(x0, input, UXTW));
+      __ prfm(op, MemOperand(x0, input, UXTW, 3));
+      __ prfm(op, MemOperand(x0, input, LSL));
+      __ prfm(op, MemOperand(x0, input, LSL, 3));
+      __ prfm(op, MemOperand(x0, input, SXTW));
+      __ prfm(op, MemOperand(x0, input, SXTW, 3));
+      __ prfm(op, MemOperand(x0, input, SXTX));
+      __ prfm(op, MemOperand(x0, input, SXTX, 3));
+    }
+  }
+
+  END();
+  RUN();
+}
+
 TEST(add_sub_imm) {
   INIT_V8();
   SETUP();
diff --git a/deps/v8/test/cctest/test-assembler-ia32.cc b/deps/v8/test/cctest/test-assembler-ia32.cc
index 9598930e2c20cc..3285be46ccc95c 100644
--- a/deps/v8/test/cctest/test-assembler-ia32.cc
+++ b/deps/v8/test/cctest/test-assembler-ia32.cc
@@ -1529,14 +1529,24 @@ TEST(DeoptExitSizeIsFixed) {
   STATIC_ASSERT(static_cast<int>(kFirstDeoptimizeKind) == 0);
   for (int i = 0; i < kDeoptimizeKindCount; i++) {
     DeoptimizeKind kind = static_cast<DeoptimizeKind>(i);
-    Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(isolate, kind);
     Label before_exit;
     masm.bind(&before_exit);
-    masm.CallForDeoptimization(target, 42, &before_exit, kind, nullptr);
-    CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
-             kind == DeoptimizeKind::kLazy
-                 ? Deoptimizer::kLazyDeoptExitSize
-                 : Deoptimizer::kNonLazyDeoptExitSize);
+    if (kind == DeoptimizeKind::kEagerWithResume) {
+      Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
+          DeoptimizeReason::kDynamicCheckMaps);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    } else {
+      Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(kind);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               kind == DeoptimizeKind::kLazy
+                   ? Deoptimizer::kLazyDeoptExitSize
+                   : Deoptimizer::kNonLazyDeoptExitSize);
+    }
   }
 }
 
diff --git a/deps/v8/test/cctest/test-assembler-mips.cc b/deps/v8/test/cctest/test-assembler-mips.cc
index e4ba08454f13f8..bb6590d0a55fb6 100644
--- a/deps/v8/test/cctest/test-assembler-mips.cc
+++ b/deps/v8/test/cctest/test-assembler-mips.cc
@@ -6751,82 +6751,82 @@ TEST(MSA_maxi_mini) {
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_b(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_h(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_w(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_d(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_b(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, std::min));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_h(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, std::min));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_w(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, std::min));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_d(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_b(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_h(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_w(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_d(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_b(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_h(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_w(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_d(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, std::min));
   }
 #undef MAXI_MINI_S_DF
 #undef MAXI_MINI_U_DF
@@ -9002,30 +9002,32 @@ TEST(MSA_3R_instructions) {
     wd[i] = res;                                                     \
   }
 
-#define MAX_DF(T, lanes, mask)                                              \
-  int size_in_bits = kMSARegSize / lanes;                                   \
-  for (int i = 0; i < 2; i++) {                                             \
-    uint64_t res = 0;                                                       \
-    for (int j = 0; j < lanes / 2; ++j) {                                   \
-      uint64_t shift = size_in_bits * j;                                    \
-      T ws_op = static_cast<T>((ws[i] >> shift) & mask);                    \
-      T wt_op = static_cast<T>((wt[i] >> shift) & mask);                    \
-      res |= (static_cast<uint64_t>(Max<T>(ws_op, wt_op)) & mask) << shift; \
-    }                                                                       \
-    wd[i] = res;                                                            \
+#define MAX_DF(T, lanes, mask)                                         \
+  int size_in_bits = kMSARegSize / lanes;                              \
+  for (int i = 0; i < 2; i++) {                                        \
+    uint64_t res = 0;                                                  \
+    for (int j = 0; j < lanes / 2; ++j) {                              \
+      uint64_t shift = size_in_bits * j;                               \
+      T ws_op = static_cast<T>((ws[i] >> shift) & mask);               \
+      T wt_op = static_cast<T>((wt[i] >> shift) & mask);               \
+      res |= (static_cast<uint64_t>(std::max<T>(ws_op, wt_op)) & mask) \
+             << shift;                                                 \
+    }                                                                  \
+    wd[i] = res;                                                       \
   }
 
-#define MIN_DF(T, lanes, mask)                                              \
-  int size_in_bits = kMSARegSize / lanes;                                   \
-  for (int i = 0; i < 2; i++) {                                             \
-    uint64_t res = 0;                                                       \
-    for (int j = 0; j < lanes / 2; ++j) {                                   \
-      uint64_t shift = size_in_bits * j;                                    \
-      T ws_op = static_cast<T>((ws[i] >> shift) & mask);                    \
-      T wt_op = static_cast<T>((wt[i] >> shift) & mask);                    \
-      res |= (static_cast<uint64_t>(Min<T>(ws_op, wt_op)) & mask) << shift; \
-    }                                                                       \
-    wd[i] = res;                                                            \
+#define MIN_DF(T, lanes, mask)                                         \
+  int size_in_bits = kMSARegSize / lanes;                              \
+  for (int i = 0; i < 2; i++) {                                        \
+    uint64_t res = 0;                                                  \
+    for (int j = 0; j < lanes / 2; ++j) {                              \
+      uint64_t shift = size_in_bits * j;                               \
+      T ws_op = static_cast<T>((ws[i] >> shift) & mask);               \
+      T wt_op = static_cast<T>((wt[i] >> shift) & mask);               \
+      res |= (static_cast<uint64_t>(std::min<T>(ws_op, wt_op)) & mask) \
+             << shift;                                                 \
+    }                                                                  \
+    wd[i] = res;                                                       \
   }
 
 #define MAXA_DF(T, lanes, mask)                                               \
diff --git a/deps/v8/test/cctest/test-assembler-mips64.cc b/deps/v8/test/cctest/test-assembler-mips64.cc
index 3835fa90283435..9cf7404e18972e 100644
--- a/deps/v8/test/cctest/test-assembler-mips64.cc
+++ b/deps/v8/test/cctest/test-assembler-mips64.cc
@@ -7665,82 +7665,82 @@ TEST(MSA_maxi_mini) {
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_b(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_h(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_w(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_s_d(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, Max));
+        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, std::max));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_b(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesByte, UINT8_MAX, std::min));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_h(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesHalf, UINT16_MAX, std::min));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_w(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesWord, UINT32_MAX, std::min));
 
     run_msa_i5(
         &tc[i], true,
         [](MacroAssembler& assm, int32_t i5) { __ mini_s_d(w2, w0, i5); },
-        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, Min));
+        MAXI_MINI_S_DF(kMSALanesDword, UINT64_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_b(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_h(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_w(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ maxi_u_d(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, Max));
+        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, std::max));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_b(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesByte, UINT8_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_h(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesHalf, UINT16_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_w(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesWord, UINT32_MAX, std::min));
 
     run_msa_i5(
         &tc[i], false,
         [](MacroAssembler& assm, int32_t i5) { __ mini_u_d(w2, w0, i5); },
-        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, Min));
+        MAXI_MINI_U_DF(kMSALanesDword, UINT64_MAX, std::min));
   }
 #undef MAXI_MINI_S_DF
 #undef MAXI_MINI_U_DF
@@ -9915,30 +9915,32 @@ TEST(MSA_3R_instructions) {
     wd[i] = res;                                                     \
   }
 
-#define MAX_DF(T, lanes, mask)                                              \
-  int size_in_bits = kMSARegSize / lanes;                                   \
-  for (int i = 0; i < 2; i++) {                                             \
-    uint64_t res = 0;                                                       \
-    for (int j = 0; j < lanes / 2; ++j) {                                   \
-      uint64_t shift = size_in_bits * j;                                    \
-      T ws_op = static_cast<T>((ws[i] >> shift) & mask);                    \
-      T wt_op = static_cast<T>((wt[i] >> shift) & mask);                    \
-      res |= (static_cast<uint64_t>(Max<T>(ws_op, wt_op)) & mask) << shift; \
-    }                                                                       \
-    wd[i] = res;                                                            \
+#define MAX_DF(T, lanes, mask)                                         \
+  int size_in_bits = kMSARegSize / lanes;                              \
+  for (int i = 0; i < 2; i++) {                                        \
+    uint64_t res = 0;                                                  \
+    for (int j = 0; j < lanes / 2; ++j) {                              \
+      uint64_t shift = size_in_bits * j;                               \
+      T ws_op = static_cast<T>((ws[i] >> shift) & mask);               \
+      T wt_op = static_cast<T>((wt[i] >> shift) & mask);               \
+      res |= (static_cast<uint64_t>(std::max<T>(ws_op, wt_op)) & mask) \
+             << shift;                                                 \
+    }                                                                  \
+    wd[i] = res;                                                       \
   }
 
-#define MIN_DF(T, lanes, mask)                                              \
-  int size_in_bits = kMSARegSize / lanes;                                   \
-  for (int i = 0; i < 2; i++) {                                             \
-    uint64_t res = 0;                                                       \
-    for (int j = 0; j < lanes / 2; ++j) {                                   \
-      uint64_t shift = size_in_bits * j;                                    \
-      T ws_op = static_cast<T>((ws[i] >> shift) & mask);                    \
-      T wt_op = static_cast<T>((wt[i] >> shift) & mask);                    \
-      res |= (static_cast<uint64_t>(Min<T>(ws_op, wt_op)) & mask) << shift; \
-    }                                                                       \
-    wd[i] = res;                                                            \
+#define MIN_DF(T, lanes, mask)                                         \
+  int size_in_bits = kMSARegSize / lanes;                              \
+  for (int i = 0; i < 2; i++) {                                        \
+    uint64_t res = 0;                                                  \
+    for (int j = 0; j < lanes / 2; ++j) {                              \
+      uint64_t shift = size_in_bits * j;                               \
+      T ws_op = static_cast<T>((ws[i] >> shift) & mask);               \
+      T wt_op = static_cast<T>((wt[i] >> shift) & mask);               \
+      res |= (static_cast<uint64_t>(std::min<T>(ws_op, wt_op)) & mask) \
+             << shift;                                                 \
+    }                                                                  \
+    wd[i] = res;                                                       \
   }
 
 #define MAXA_DF(T, lanes, mask)                                               \
diff --git a/deps/v8/test/cctest/test-code-pages.cc b/deps/v8/test/cctest/test-code-pages.cc
index 47609c5e1e84bb..d0ed8334a55487 100644
--- a/deps/v8/test/cctest/test-code-pages.cc
+++ b/deps/v8/test/cctest/test-code-pages.cc
@@ -141,7 +141,7 @@ TEST(OptimizedCodeWithCodeRange) {
   Handle<JSFunction> foo =
       Handle<JSFunction>::cast(v8::Utils::OpenHandle(*local_foo));
 
-  AbstractCode abstract_code = foo->abstract_code();
+  AbstractCode abstract_code = foo->abstract_code(i_isolate);
   // We don't produce optimized code when run with --no-opt.
   if (!abstract_code.IsCode() && FLAG_opt == false) return;
   CHECK(abstract_code.IsCode());
@@ -187,7 +187,7 @@ TEST(OptimizedCodeWithCodePages) {
       Handle<JSFunction> foo =
           Handle<JSFunction>::cast(v8::Utils::OpenHandle(*local_foo));
 
-      AbstractCode abstract_code = foo->abstract_code();
+      AbstractCode abstract_code = foo->abstract_code(i_isolate);
       // We don't produce optimized code when run with --no-opt.
       if (!abstract_code.IsCode() && FLAG_opt == false) return;
       CHECK(abstract_code.IsCode());
diff --git a/deps/v8/test/cctest/test-code-stub-assembler.cc b/deps/v8/test/cctest/test-code-stub-assembler.cc
index fe7aebe682800d..928d47b03d7508 100644
--- a/deps/v8/test/cctest/test-code-stub-assembler.cc
+++ b/deps/v8/test/cctest/test-code-stub-assembler.cc
@@ -1294,7 +1294,7 @@ TEST(TryHasOwnProperty) {
   {
     // Dictionary mode object.
     Handle<JSFunction> function =
-        factory->NewFunctionForTest(factory->empty_string());
+        factory->NewFunctionForTesting(factory->empty_string());
     Handle<JSObject> object = factory->NewJSObject(function);
     AddProperties(object, names, arraysize(names));
     JSObject::NormalizeProperties(isolate, object, CLEAR_INOBJECT_PROPERTIES, 0,
@@ -1313,7 +1313,7 @@ TEST(TryHasOwnProperty) {
   {
     // Global object.
     Handle<JSFunction> function =
-        factory->NewFunctionForTest(factory->empty_string());
+        factory->NewFunctionForTesting(factory->empty_string());
     JSFunction::EnsureHasInitialMap(function);
     function->initial_map().set_instance_type(JS_GLOBAL_OBJECT_TYPE);
     function->initial_map().set_is_prototype_map(true);
@@ -1364,7 +1364,7 @@ TEST(TryHasOwnProperty) {
 
   {
     Handle<JSFunction> function =
-        factory->NewFunctionForTest(factory->empty_string());
+        factory->NewFunctionForTesting(factory->empty_string());
     Handle<JSProxy> object = factory->NewJSProxy(function, objects[0]);
     CHECK_EQ(JS_PROXY_TYPE, object->map().instance_type());
     ft.CheckTrue(object, names[0], expect_bailout);
@@ -1437,11 +1437,11 @@ TEST(TryGetOwnProperty) {
       factory->NewPrivateSymbol(),
   };
   Handle<Object> values[] = {
-      factory->NewFunctionForTest(factory->empty_string()),
+      factory->NewFunctionForTesting(factory->empty_string()),
       factory->NewSymbol(),
       factory->InternalizeUtf8String("a"),
       CreateAccessorPair(&ft, "() => 188;", "() => 199;"),
-      factory->NewFunctionForTest(factory->InternalizeUtf8String("bb")),
+      factory->NewFunctionForTesting(factory->InternalizeUtf8String("bb")),
       factory->InternalizeUtf8String("ccc"),
       CreateAccessorPair(&ft, "() => 88;", nullptr),
       handle(Smi::FromInt(1), isolate),
@@ -1450,7 +1450,7 @@ TEST(TryGetOwnProperty) {
       factory->NewHeapNumber(4.2),
       handle(Smi::FromInt(153), isolate),
       factory->NewJSObject(
-          factory->NewFunctionForTest(factory->empty_string())),
+          factory->NewFunctionForTesting(factory->empty_string())),
       factory->NewPrivateSymbol(),
   };
   STATIC_ASSERT(arraysize(values) < arraysize(names));
@@ -1501,7 +1501,7 @@ TEST(TryGetOwnProperty) {
   {
     // Dictionary mode object.
     Handle<JSFunction> function =
-        factory->NewFunctionForTest(factory->empty_string());
+        factory->NewFunctionForTesting(factory->empty_string());
     Handle<JSObject> object = factory->NewJSObject(function);
     AddProperties(object, names, arraysize(names), values, arraysize(values),
                   rand_gen.NextInt());
@@ -1573,7 +1573,7 @@ TEST(TryGetOwnProperty) {
 
   {
     Handle<JSFunction> function =
-        factory->NewFunctionForTest(factory->empty_string());
+        factory->NewFunctionForTesting(factory->empty_string());
     Handle<JSProxy> object = factory->NewJSProxy(function, objects[0]);
     CHECK_EQ(JS_PROXY_TYPE, object->map().instance_type());
     Handle<Object> value = ft.Call(object, names[0]).ToHandleChecked();
@@ -1809,7 +1809,7 @@ TEST(TryLookupElement) {
   {
     Handle<JSArray> handler = factory->NewJSArray(0);
     Handle<JSFunction> function =
-        factory->NewFunctionForTest(factory->empty_string());
+        factory->NewFunctionForTesting(factory->empty_string());
     Handle<JSProxy> object = factory->NewJSProxy(function, handler);
     CHECK_EQ(JS_PROXY_TYPE, object->map().instance_type());
     ft.CheckTrue(object, smi0, expect_bailout);
@@ -1902,7 +1902,20 @@ TEST(AllocateJSObjectFromMap) {
   }
 }
 
-TEST(AllocateNameDictionary) {
+namespace {
+
+template <typename Dictionary>
+using CSAAllocator =
+    std::function<TNode<Dictionary>(CodeStubAssembler&, TNode<IntPtrT>)> const&;
+
+template <typename Dictionary>
+using Allocator = std::function<Handle<Dictionary>(Isolate*, int)> const&;
+
+// Tests that allocation code emitted by {csa_alloc} yields ordered hash tables
+// identical to those produced by {alloc}.
+template <typename Dictionary>
+void TestDictionaryAllocation(CSAAllocator<Dictionary> csa_alloc,
+                              Allocator<Dictionary> alloc, int max_capacity) {
   Isolate* isolate(CcTest::InitIsolateOnce());
 
   const int kNumParams = 1;
@@ -1911,18 +1924,17 @@ TEST(AllocateNameDictionary) {
 
   {
     auto capacity = m.Parameter<Smi>(1);
-    TNode<NameDictionary> result =
-        m.AllocateNameDictionary(m.SmiUntag(capacity));
+    TNode<Dictionary> result = csa_alloc(m, m.SmiUntag(capacity));
     m.Return(result);
   }
 
   FunctionTester ft(asm_tester.GenerateCode(), kNumParams);
 
   {
-    for (int i = 0; i < 256; i = i * 1.1 + 1) {
+    for (int i = 0; i < max_capacity; i = i * 1.1 + 1) {
       Handle<HeapObject> result = Handle<HeapObject>::cast(
           ft.Call(handle(Smi::FromInt(i), isolate)).ToHandleChecked());
-      Handle<NameDictionary> dict = NameDictionary::New(isolate, i);
+      Handle<Dictionary> dict = alloc(isolate, i);
       // Both dictionaries should be memory equal.
       int size = dict->Size();
       CHECK_EQ(0, memcmp(reinterpret_cast<void*>(dict->address()),
@@ -1931,6 +1943,52 @@ TEST(AllocateNameDictionary) {
   }
 }
 
+}  // namespace
+
+TEST(AllocateNameDictionary) {
+  auto csa_alloc = [](CodeStubAssembler& m, TNode<IntPtrT> cap) {
+    return m.AllocateNameDictionary(cap);
+  };
+  auto alloc = [](Isolate* isolate, int capacity) {
+    return NameDictionary::New(isolate, capacity);
+  };
+  TestDictionaryAllocation<NameDictionary>(csa_alloc, alloc, 256);
+}
+
+TEST(AllocateOrderedNameDictionary) {
+  auto csa_alloc = [](CodeStubAssembler& m, TNode<IntPtrT> cap) {
+    return m.AllocateOrderedNameDictionary(cap);
+  };
+  auto alloc = [](Isolate* isolate, int capacity) {
+    return OrderedNameDictionary::Allocate(isolate, capacity).ToHandleChecked();
+  };
+  TestDictionaryAllocation<OrderedNameDictionary>(csa_alloc, alloc, 256);
+}
+
+TEST(AllocateOrderedHashSet) {
+  // ignoring capacitites, as the API cannot take them
+  auto csa_alloc = [](CodeStubAssembler& m, TNode<IntPtrT> cap) {
+    return m.AllocateOrderedHashSet();
+  };
+  auto alloc = [](Isolate* isolate, int capacity) {
+    return OrderedHashSet::Allocate(isolate, OrderedHashSet::kInitialCapacity)
+        .ToHandleChecked();
+  };
+  TestDictionaryAllocation<OrderedHashSet>(csa_alloc, alloc, 1);
+}
+
+TEST(AllocateOrderedHashMap) {
+  // ignoring capacities, as the API cannot take them
+  auto csa_alloc = [](CodeStubAssembler& m, TNode<IntPtrT> cap) {
+    return m.AllocateOrderedHashMap();
+  };
+  auto alloc = [](Isolate* isolate, int capacity) {
+    return OrderedHashMap::Allocate(isolate, OrderedHashMap::kInitialCapacity)
+        .ToHandleChecked();
+  };
+  TestDictionaryAllocation<OrderedHashMap>(csa_alloc, alloc, 1);
+}
+
 TEST(PopAndReturnFromJSBuiltinWithStackParameters) {
   Isolate* isolate(CcTest::InitIsolateOnce());
 
@@ -2133,7 +2191,7 @@ TEST(OneToTwoByteStringCopy) {
                                .ToHandleChecked();
   FunctionTester ft(asm_tester.GenerateCode(), kNumParams);
   ft.Call(string1, string2);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CHECK_EQ(Handle<SeqOneByteString>::cast(string1)->GetChars(no_gc)[0],
            Handle<SeqTwoByteString>::cast(string2)->GetChars(no_gc)[0]);
   CHECK_EQ(Handle<SeqOneByteString>::cast(string1)->GetChars(no_gc)[1],
@@ -2166,7 +2224,7 @@ TEST(OneToOneByteStringCopy) {
                                .ToHandleChecked();
   FunctionTester ft(asm_tester.GenerateCode(), kNumParams);
   ft.Call(string1, string2);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CHECK_EQ(Handle<SeqOneByteString>::cast(string1)->GetChars(no_gc)[0],
            Handle<SeqOneByteString>::cast(string2)->GetChars(no_gc)[0]);
   CHECK_EQ(Handle<SeqOneByteString>::cast(string1)->GetChars(no_gc)[1],
@@ -2199,7 +2257,7 @@ TEST(OneToOneByteStringCopyNonZeroStart) {
                                .ToHandleChecked();
   FunctionTester ft(asm_tester.GenerateCode(), kNumParams);
   ft.Call(string1, string2);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CHECK_EQ(Handle<SeqOneByteString>::cast(string1)->GetChars(no_gc)[0],
            Handle<SeqOneByteString>::cast(string2)->GetChars(no_gc)[3]);
   CHECK_EQ(Handle<SeqOneByteString>::cast(string1)->GetChars(no_gc)[1],
@@ -2232,7 +2290,7 @@ TEST(TwoToTwoByteStringCopy) {
                                .ToHandleChecked();
   FunctionTester ft(asm_tester.GenerateCode(), kNumParams);
   ft.Call(string1, string2);
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   CHECK_EQ(Handle<SeqTwoByteString>::cast(string1)->GetChars(no_gc)[0],
            Handle<SeqTwoByteString>::cast(string2)->GetChars(no_gc)[0]);
   CHECK_EQ(Handle<SeqTwoByteString>::cast(string1)->GetChars(no_gc)[1],
@@ -3144,7 +3202,8 @@ TEST(IsWhiteSpaceOrLineTerminator) {
   {  // Returns true if whitespace, false otherwise.
     CodeStubAssembler m(asm_tester.state());
     Label if_true(&m), if_false(&m);
-    m.Branch(m.IsWhiteSpaceOrLineTerminator(m.SmiToInt32(m.Parameter<Smi>(1))),
+    m.Branch(m.IsWhiteSpaceOrLineTerminator(
+                 m.UncheckedCast<Uint16T>(m.SmiToInt32(m.Parameter<Smi>(1)))),
              &if_true, &if_false);
     m.BIND(&if_true);
     m.Return(m.TrueConstant());
diff --git a/deps/v8/test/cctest/test-compiler.cc b/deps/v8/test/cctest/test-compiler.cc
index 7ba7ce89785a6b..3b709aeeffec04 100644
--- a/deps/v8/test/cctest/test-compiler.cc
+++ b/deps/v8/test/cctest/test-compiler.cc
@@ -76,8 +76,8 @@ static Handle<JSFunction> Compile(const char* source) {
           v8::ScriptCompiler::kNoCompileOptions,
           ScriptCompiler::kNoCacheNoReason, NOT_NATIVES_CODE)
           .ToHandleChecked();
-  return isolate->factory()->NewFunctionFromSharedFunctionInfo(
-      shared, isolate->native_context());
+  return Factory::JSFunctionBuilder{isolate, shared, isolate->native_context()}
+      .Build();
 }
 
 
@@ -652,9 +652,7 @@ TEST(CompileFunctionInContextScriptOrigin) {
   CcTest::InitializeVM();
   v8::HandleScope scope(CcTest::isolate());
   LocalContext env;
-  v8::ScriptOrigin origin(v8_str("test"),
-                          v8::Integer::New(CcTest::isolate(), 22),
-                          v8::Integer::New(CcTest::isolate(), 41));
+  v8::ScriptOrigin origin(v8_str("test"), 22, 41);
   v8::ScriptCompiler::Source script_source(v8_str("throw new Error()"), origin);
   Local<ScriptOrModule> script;
   v8::Local<v8::Function> fun =
@@ -700,7 +698,7 @@ void TestCompileFunctionInContextToStringImpl() {
 
     // Regression test for v8:6190
     {
-      v8::ScriptOrigin origin(v8_str("test"), v8_int(22), v8_int(41));
+      v8::ScriptOrigin origin(v8_str("test"), 22, 41);
       v8::ScriptCompiler::Source script_source(v8_str("return event"), origin);
 
       v8::Local<v8::String> params[] = {v8_str("event")};
@@ -727,7 +725,7 @@ void TestCompileFunctionInContextToStringImpl() {
 
     // With no parameters:
     {
-      v8::ScriptOrigin origin(v8_str("test"), v8_int(17), v8_int(31));
+      v8::ScriptOrigin origin(v8_str("test"), 17, 31);
       v8::ScriptCompiler::Source script_source(v8_str("return 0"), origin);
 
       v8::TryCatch try_catch(CcTest::isolate());
@@ -752,7 +750,7 @@ void TestCompileFunctionInContextToStringImpl() {
 
     // With a name:
     {
-      v8::ScriptOrigin origin(v8_str("test"), v8_int(17), v8_int(31));
+      v8::ScriptOrigin origin(v8_str("test"), 17, 31);
       v8::ScriptCompiler::Source script_source(v8_str("return 0"), origin);
 
       v8::TryCatch try_catch(CcTest::isolate());
@@ -1103,7 +1101,8 @@ TEST(ProfilerEnabledDuringBackgroundCompile) {
           .ToLocalChecked();
 
   i::Handle<i::Object> obj = Utils::OpenHandle(*script);
-  CHECK(i::JSFunction::cast(*obj).shared().AreSourcePositionsAvailable());
+  CHECK(i::JSFunction::cast(*obj).shared().AreSourcePositionsAvailable(
+      CcTest::i_isolate()));
 
   cpu_profiler->StopProfiling(profile);
 }
diff --git a/deps/v8/test/cctest/test-concurrent-descriptor-array.cc b/deps/v8/test/cctest/test-concurrent-descriptor-array.cc
index 568cf3df276678..bc9eb53ff580c8 100644
--- a/deps/v8/test/cctest/test-concurrent-descriptor-array.cc
+++ b/deps/v8/test/cctest/test-concurrent-descriptor-array.cc
@@ -10,6 +10,7 @@
 #include "src/heap/heap.h"
 #include "src/heap/local-heap-inl.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-utils.h"
 
@@ -80,7 +81,7 @@ TEST(LinearSearchFlatObject) {
   HandleScope handle_scope(isolate);
 
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   Handle<JSObject> js_object = factory->NewJSObject(function);
   Handle<String> name = CcTest::MakeString("property");
   Handle<Object> value = CcTest::MakeString("dummy_value");
@@ -132,7 +133,7 @@ TEST(LinearSearchFlatObject_ManyElements) {
   HandleScope handle_scope(isolate);
 
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   Handle<JSObject> js_object = factory->NewJSObject(function);
   Handle<String> name = CcTest::MakeString("property");
   Handle<Object> value = CcTest::MakeString("dummy_value");
diff --git a/deps/v8/test/cctest/test-concurrent-feedback-vector.cc b/deps/v8/test/cctest/test-concurrent-feedback-vector.cc
index 4cb843c97dcdb2..7279e285675027 100644
--- a/deps/v8/test/cctest/test-concurrent-feedback-vector.cc
+++ b/deps/v8/test/cctest/test-concurrent-feedback-vector.cc
@@ -12,6 +12,7 @@
 #include "src/handles/persistent-handles.h"
 #include "src/heap/heap.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-utils.h"
 
@@ -155,8 +156,8 @@ static void CheckedWait(base::Semaphore& semaphore) {
 // Verify that a LoadIC can be cycled through different states and safely
 // read on a background thread.
 TEST(CheckLoadICStates) {
+  heap::EnsureFlagLocalHeapsEnabled();
   CcTest::InitializeVM();
-  FLAG_local_heaps = true;
   FLAG_lazy_feedback_allocation = false;
   Isolate* isolate = CcTest::i_isolate();
 
diff --git a/deps/v8/test/cctest/test-concurrent-prototype.cc b/deps/v8/test/cctest/test-concurrent-prototype.cc
index 7484d4d22e9429..e46f3a5ade5d66 100644
--- a/deps/v8/test/cctest/test-concurrent-prototype.cc
+++ b/deps/v8/test/cctest/test-concurrent-prototype.cc
@@ -10,6 +10,7 @@
 #include "src/heap/heap.h"
 #include "src/heap/local-heap-inl.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-utils.h"
 
@@ -78,7 +79,7 @@ TEST(ProtoWalkBackground) {
   HandleScope handle_scope(isolate);
 
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   Handle<JSObject> js_object = factory->NewJSObject(function);
   Handle<String> name = CcTest::MakeString("property");
   Handle<Object> value = CcTest::MakeString("dummy_value");
@@ -118,7 +119,7 @@ TEST(ProtoWalkBackground_DescriptorArrayWrite) {
   HandleScope handle_scope(isolate);
 
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   Handle<JSObject> js_object = factory->NewJSObject(function);
   Handle<String> name = CcTest::MakeString("property");
   Handle<Object> value = CcTest::MakeString("dummy_value");
@@ -165,7 +166,7 @@ TEST(ProtoWalkBackground_PrototypeChainWrite) {
   HandleScope handle_scope(isolate);
 
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   Handle<JSObject> js_object = factory->NewJSObject(function);
 
   for (int i = 0; i < kNumHandles; i++) {
diff --git a/deps/v8/test/cctest/test-concurrent-script-context-table.cc b/deps/v8/test/cctest/test-concurrent-script-context-table.cc
index 1ea90c7902995f..c5f015d39f1649 100644
--- a/deps/v8/test/cctest/test-concurrent-script-context-table.cc
+++ b/deps/v8/test/cctest/test-concurrent-script-context-table.cc
@@ -9,6 +9,7 @@
 #include "src/handles/persistent-handles.h"
 #include "src/heap/heap.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "src/objects/contexts.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-utils.h"
diff --git a/deps/v8/test/cctest/test-concurrent-string.cc b/deps/v8/test/cctest/test-concurrent-string.cc
new file mode 100644
index 00000000000000..66988a5f83d669
--- /dev/null
+++ b/deps/v8/test/cctest/test-concurrent-string.cc
@@ -0,0 +1,246 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "src/api/api.h"
+#include "src/base/platform/semaphore.h"
+#include "src/handles/handles-inl.h"
+#include "src/handles/local-handles-inl.h"
+#include "src/handles/persistent-handles.h"
+#include "src/heap/heap.h"
+#include "src/heap/local-heap-inl.h"
+#include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
+#include "test/cctest/cctest.h"
+#include "test/cctest/heap/heap-utils.h"
+
+namespace v8 {
+namespace internal {
+
+namespace {
+
+#define DOUBLE_VALUE 12345.123456789
+#define STRING_VALUE "12345.123456789"
+#define ARRAY_VALUE \
+  { '1', '2', '3', '4', '5', '.', '1', '2', '3', '4', '5', '6', '7', '8', '9' }
+
+// Adapted from cctest/test-api.cc, and
+// test/cctest/heap/test-external-string-tracker.cc.
+class TestOneByteResource : public v8::String::ExternalOneByteStringResource {
+ public:
+  explicit TestOneByteResource(const char* data)
+      : data_(data), length_(strlen(data)) {}
+
+  ~TestOneByteResource() override { i::DeleteArray(data_); }
+
+  const char* data() const override { return data_; }
+
+  size_t length() const override { return length_; }
+
+ private:
+  const char* data_;
+  size_t length_;
+};
+
+// Adapted from cctest/test-api.cc.
+class TestTwoByteResource : public v8::String::ExternalStringResource {
+ public:
+  explicit TestTwoByteResource(uint16_t* data) : data_(data), length_(0) {
+    while (data[length_]) ++length_;
+  }
+
+  ~TestTwoByteResource() override { i::DeleteArray(data_); }
+
+  const uint16_t* data() const override { return data_; }
+
+  size_t length() const override { return length_; }
+
+ private:
+  uint16_t* data_;
+  size_t length_;
+};
+
+class ConcurrentStringThread final : public v8::base::Thread {
+ public:
+  ConcurrentStringThread(Isolate* isolate, Handle<String> str,
+                         std::unique_ptr<PersistentHandles> ph,
+                         base::Semaphore* sema_started,
+                         std::vector<uint16_t> chars)
+      : v8::base::Thread(base::Thread::Options("ThreadWithLocalHeap")),
+        isolate_(isolate),
+        str_(str),
+        ph_(std::move(ph)),
+        sema_started_(sema_started),
+        length_(chars.size()),
+        chars_(chars) {}
+
+  void Run() override {
+    LocalIsolate local_isolate(isolate_, ThreadKind::kBackground);
+    local_isolate.heap()->AttachPersistentHandles(std::move(ph_));
+    UnparkedScope unparked_scope(local_isolate.heap());
+
+    sema_started_->Signal();
+    // Check the three operations we do from the StringRef concurrently: get the
+    // string, the nth character, and convert into a double.
+    CHECK_EQ(str_->synchronized_length(), length_);
+    for (unsigned int i = 0; i < length_; ++i) {
+      CHECK_EQ(str_->Get(i, &local_isolate), chars_[i]);
+    }
+    CHECK_EQ(TryStringToDouble(&local_isolate, str_).value(), DOUBLE_VALUE);
+  }
+
+ private:
+  Isolate* isolate_;
+  Handle<String> str_;
+  std::unique_ptr<PersistentHandles> ph_;
+  base::Semaphore* sema_started_;
+  uint64_t length_;
+  std::vector<uint16_t> chars_;
+};
+
+// Inspect a one byte string, while the main thread externalizes it.
+TEST(InspectOneByteExternalizing) {
+  heap::EnsureFlagLocalHeapsEnabled();
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+
+  std::unique_ptr<PersistentHandles> ph = isolate->NewPersistentHandles();
+
+  auto factory = isolate->factory();
+  HandleScope handle_scope(isolate);
+
+  // Crate an internalized one-byte string.
+  const char* raw_string = STRING_VALUE;
+  Handle<String> one_byte_string = factory->InternalizeString(
+      factory->NewStringFromAsciiChecked(raw_string));
+  CHECK(one_byte_string->IsOneByteRepresentation());
+  CHECK(!one_byte_string->IsExternalString());
+  CHECK(one_byte_string->IsInternalizedString());
+
+  Handle<String> persistent_string = ph->NewHandle(one_byte_string);
+
+  std::vector<uint16_t> chars;
+  for (int i = 0; i < one_byte_string->length(); ++i) {
+    chars.push_back(one_byte_string->Get(i));
+  }
+
+  base::Semaphore sema_started(0);
+
+  std::unique_ptr<ConcurrentStringThread> thread(new ConcurrentStringThread(
+      isolate, persistent_string, std::move(ph), &sema_started, chars));
+  CHECK(thread->Start());
+
+  sema_started.Wait();
+
+  // Externalize it to a one-byte external string.
+  // We need to use StrDup in this case since the TestOneByteResource will get
+  // ownership of raw_string otherwise.
+  CHECK(one_byte_string->MakeExternal(
+      new TestOneByteResource(i::StrDup(raw_string))));
+  CHECK(one_byte_string->IsExternalOneByteString());
+  CHECK(one_byte_string->IsInternalizedString());
+
+  thread->Join();
+}
+
+// Inspect a one byte string, while the main thread externalizes it into a two
+// bytes string.
+TEST(InspectOneIntoTwoByteExternalizing) {
+  heap::EnsureFlagLocalHeapsEnabled();
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+
+  std::unique_ptr<PersistentHandles> ph = isolate->NewPersistentHandles();
+
+  auto factory = isolate->factory();
+  HandleScope handle_scope(isolate);
+
+  // Crate an internalized one-byte string.
+  const char* raw_string = STRING_VALUE;
+  Handle<String> one_byte_string = factory->InternalizeString(
+      factory->NewStringFromAsciiChecked(raw_string));
+  CHECK(one_byte_string->IsOneByteRepresentation());
+  CHECK(!one_byte_string->IsExternalString());
+  CHECK(one_byte_string->IsInternalizedString());
+
+  Handle<String> persistent_string = ph->NewHandle(one_byte_string);
+  std::vector<uint16_t> chars;
+  for (int i = 0; i < one_byte_string->length(); ++i) {
+    chars.push_back(one_byte_string->Get(i));
+  }
+
+  base::Semaphore sema_started(0);
+
+  std::unique_ptr<ConcurrentStringThread> thread(new ConcurrentStringThread(
+      isolate, persistent_string, std::move(ph), &sema_started, chars));
+  CHECK(thread->Start());
+
+  sema_started.Wait();
+
+  // Externalize it to a two-bytes external string. AsciiToTwoByteString does
+  // the string duplication for us.
+  CHECK(one_byte_string->MakeExternal(
+      new TestTwoByteResource(AsciiToTwoByteString(raw_string))));
+  CHECK(one_byte_string->IsExternalTwoByteString());
+  CHECK(one_byte_string->IsInternalizedString());
+
+  thread->Join();
+}
+
+// Inspect a two byte string, while the main thread externalizes it.
+TEST(InspectTwoByteExternalizing) {
+  heap::EnsureFlagLocalHeapsEnabled();
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+
+  std::unique_ptr<PersistentHandles> ph = isolate->NewPersistentHandles();
+
+  auto factory = isolate->factory();
+  HandleScope handle_scope(isolate);
+
+  // Crate an internalized two-byte string.
+  // TODO(solanes): Can we have only one raw string?
+  const char* raw_string = STRING_VALUE;
+  // TODO(solanes): Is this the best way to create a two byte string from chars?
+  const int kLength = 15;
+  DCHECK_EQ(kLength, strlen(raw_string));
+  const uint16_t two_byte_array[kLength] = ARRAY_VALUE;
+  Handle<String> two_bytes_string;
+  {
+    Handle<SeqTwoByteString> raw =
+        factory->NewRawTwoByteString(kLength).ToHandleChecked();
+    DisallowGarbageCollection no_gc;
+    CopyChars(raw->GetChars(no_gc), two_byte_array, kLength);
+    two_bytes_string = raw;
+  }
+  two_bytes_string = factory->InternalizeString(two_bytes_string);
+  CHECK(two_bytes_string->IsTwoByteRepresentation());
+  CHECK(!two_bytes_string->IsExternalString());
+  CHECK(two_bytes_string->IsInternalizedString());
+
+  Handle<String> persistent_string = ph->NewHandle(two_bytes_string);
+  std::vector<uint16_t> chars;
+  for (int i = 0; i < two_bytes_string->length(); ++i) {
+    chars.push_back(two_bytes_string->Get(i));
+  }
+  base::Semaphore sema_started(0);
+
+  std::unique_ptr<ConcurrentStringThread> thread(new ConcurrentStringThread(
+      isolate, persistent_string, std::move(ph), &sema_started, chars));
+  CHECK(thread->Start());
+
+  sema_started.Wait();
+
+  // Externalize it to a two-bytes external string.
+  CHECK(two_bytes_string->MakeExternal(
+      new TestTwoByteResource(AsciiToTwoByteString(raw_string))));
+  CHECK(two_bytes_string->IsExternalTwoByteString());
+  CHECK(two_bytes_string->IsInternalizedString());
+
+  thread->Join();
+}
+
+}  // anonymous namespace
+
+}  // namespace internal
+}  // namespace v8
diff --git a/deps/v8/test/cctest/test-concurrent-transition-array.cc b/deps/v8/test/cctest/test-concurrent-transition-array.cc
index 3836104b57541a..ed198787514cc6 100644
--- a/deps/v8/test/cctest/test-concurrent-transition-array.cc
+++ b/deps/v8/test/cctest/test-concurrent-transition-array.cc
@@ -8,6 +8,7 @@
 #include "src/handles/persistent-handles.h"
 #include "src/heap/heap.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "src/objects/transitions-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-utils.h"
diff --git a/deps/v8/test/cctest/test-constantpool.cc b/deps/v8/test/cctest/test-constantpool.cc
index c9f5bcfc18723c..806366b1960b21 100644
--- a/deps/v8/test/cctest/test-constantpool.cc
+++ b/deps/v8/test/cctest/test-constantpool.cc
@@ -104,7 +104,7 @@ TEST(ConstantPoolMixedReach) {
   const int ptrReach = 1 << ptrReachBits;
   const int dblReachBits = kReachBits;
   const int dblReach = kReach;
-  const int dblRegularCount = Min(
+  const int dblRegularCount = std::min(
       dblReach / kDoubleSize, ptrReach / (kDoubleSize + kSystemPointerSize));
   const int ptrRegularCount =
       ((ptrReach - (dblRegularCount * (kDoubleSize + kSystemPointerSize))) /
diff --git a/deps/v8/test/cctest/test-cpu-profiler.cc b/deps/v8/test/cctest/test-cpu-profiler.cc
index 1db0a7b4264ff3..dc883e410573b4 100644
--- a/deps/v8/test/cctest/test-cpu-profiler.cc
+++ b/deps/v8/test/cctest/test-cpu-profiler.cc
@@ -31,6 +31,7 @@
 #include <memory>
 
 #include "include/libplatform/v8-tracing.h"
+#include "include/v8-fast-api-calls.h"
 #include "include/v8-profiler.h"
 #include "src/api/api-inl.h"
 #include "src/base/platform/platform.h"
@@ -52,6 +53,7 @@
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-utils.h"
 #include "test/cctest/profiler-extension.h"
+#include "test/common/flag-utils.h"
 
 #ifdef V8_USE_PERFETTO
 #include "protos/perfetto/trace/trace.pb.h"
@@ -132,7 +134,7 @@ class TestSetup {
 
 }  // namespace
 
-i::AbstractCode CreateCode(LocalContext* env) {
+i::AbstractCode CreateCode(i::Isolate* isolate, LocalContext* env) {
   static int counter = 0;
   i::EmbeddedVector<char, 256> script;
   i::EmbeddedVector<char, 32> name;
@@ -151,7 +153,7 @@ i::AbstractCode CreateCode(LocalContext* env) {
 
   i::Handle<i::JSFunction> fun = i::Handle<i::JSFunction>::cast(
       v8::Utils::OpenHandle(*GetFunction(env->local(), name_start)));
-  return fun->abstract_code();
+  return fun->abstract_code(isolate);
 }
 
 TEST(CodeEvents) {
@@ -163,10 +165,10 @@ TEST(CodeEvents) {
 
   i::HandleScope scope(isolate);
 
-  i::Handle<i::AbstractCode> aaa_code(CreateCode(&env), isolate);
-  i::Handle<i::AbstractCode> comment_code(CreateCode(&env), isolate);
-  i::Handle<i::AbstractCode> comment2_code(CreateCode(&env), isolate);
-  i::Handle<i::AbstractCode> moved_code(CreateCode(&env), isolate);
+  i::Handle<i::AbstractCode> aaa_code(CreateCode(isolate, &env), isolate);
+  i::Handle<i::AbstractCode> comment_code(CreateCode(isolate, &env), isolate);
+  i::Handle<i::AbstractCode> comment2_code(CreateCode(isolate, &env), isolate);
+  i::Handle<i::AbstractCode> moved_code(CreateCode(isolate, &env), isolate);
 
   CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate);
   ProfilerCodeObserver code_observer(isolate);
@@ -175,7 +177,8 @@ TEST(CodeEvents) {
       isolate, symbolizer, &code_observer, profiles,
       v8::base::TimeDelta::FromMicroseconds(100), true);
   CHECK(processor->Start());
-  ProfilerListener profiler_listener(isolate, processor);
+  ProfilerListener profiler_listener(isolate, processor,
+                                     *code_observer.strings());
   isolate->logger()->AddCodeEventListener(&profiler_listener);
 
   // Enqueue code creation events.
@@ -225,21 +228,22 @@ TEST(TickEvents) {
   i::Isolate* isolate = CcTest::i_isolate();
   i::HandleScope scope(isolate);
 
-  i::Handle<i::AbstractCode> frame1_code(CreateCode(&env), isolate);
-  i::Handle<i::AbstractCode> frame2_code(CreateCode(&env), isolate);
-  i::Handle<i::AbstractCode> frame3_code(CreateCode(&env), isolate);
+  i::Handle<i::AbstractCode> frame1_code(CreateCode(isolate, &env), isolate);
+  i::Handle<i::AbstractCode> frame2_code(CreateCode(isolate, &env), isolate);
+  i::Handle<i::AbstractCode> frame3_code(CreateCode(isolate, &env), isolate);
 
   CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate);
-  ProfilerCodeObserver code_observer(isolate);
-  Symbolizer* symbolizer = new Symbolizer(code_observer.code_map());
+  ProfilerCodeObserver* code_observer = new ProfilerCodeObserver(isolate);
+  Symbolizer* symbolizer = new Symbolizer(code_observer->code_map());
   ProfilerEventsProcessor* processor = new SamplingEventsProcessor(
-      CcTest::i_isolate(), symbolizer, &code_observer, profiles,
+      CcTest::i_isolate(), symbolizer, code_observer, profiles,
       v8::base::TimeDelta::FromMicroseconds(100), true);
   CpuProfiler profiler(isolate, kDebugNaming, kLazyLogging, profiles,
-                       symbolizer, processor);
+                       symbolizer, processor, code_observer);
   profiles->StartProfiling("");
   CHECK(processor->Start());
-  ProfilerListener profiler_listener(isolate, processor);
+  ProfilerListener profiler_listener(isolate, processor,
+                                     *code_observer->strings());
   isolate->logger()->AddCodeEventListener(&profiler_listener);
 
   profiler_listener.CodeCreateEvent(i::Logger::BUILTIN_TAG, frame1_code, "bbb");
@@ -286,7 +290,7 @@ TEST(CodeMapClearedBetweenProfilesWithLazyLogging) {
   i::HandleScope scope(isolate);
 
   // This gets logged when the profiler starts up and scans the heap.
-  i::Handle<i::AbstractCode> code1(CreateCode(&env), isolate);
+  i::Handle<i::AbstractCode> code1(CreateCode(isolate, &env), isolate);
 
   CpuProfiler profiler(isolate, kDebugNaming, kLazyLogging);
   profiler.StartProfiling("");
@@ -306,7 +310,7 @@ TEST(CodeMapClearedBetweenProfilesWithLazyLogging) {
   CHECK(!code_map->FindEntry(code1->InstructionStart()));
 
   // Create code between profiles. This should not be logged yet.
-  i::Handle<i::AbstractCode> code2(CreateCode(&env), isolate);
+  i::Handle<i::AbstractCode> code2(CreateCode(isolate, &env), isolate);
 
   CHECK(!code_map->FindEntry(code2->InstructionStart()));
 }
@@ -318,7 +322,7 @@ TEST(CodeMapNotClearedBetweenProfilesWithEagerLogging) {
   i::HandleScope scope(isolate);
 
   // This gets logged when the profiler starts up and scans the heap.
-  i::Handle<i::AbstractCode> code1(CreateCode(&env), isolate);
+  i::Handle<i::AbstractCode> code1(CreateCode(isolate, &env), isolate);
 
   CpuProfiler profiler(isolate, kDebugNaming, kEagerLogging);
   profiler.StartProfiling("");
@@ -340,7 +344,7 @@ TEST(CodeMapNotClearedBetweenProfilesWithEagerLogging) {
   CHECK_EQ(0, strcmp("function_1", code1_entry->name()));
 
   // Create code between profiles. This should be logged too.
-  i::Handle<i::AbstractCode> code2(CreateCode(&env), isolate);
+  i::Handle<i::AbstractCode> code2(CreateCode(isolate, &env), isolate);
   CHECK(code_map->FindEntry(code2->InstructionStart()));
 
   profiler.StartProfiling("");
@@ -387,19 +391,20 @@ TEST(Issue1398) {
   i::Isolate* isolate = CcTest::i_isolate();
   i::HandleScope scope(isolate);
 
-  i::Handle<i::AbstractCode> code(CreateCode(&env), isolate);
+  i::Handle<i::AbstractCode> code(CreateCode(isolate, &env), isolate);
 
   CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate);
-  ProfilerCodeObserver code_observer(isolate);
-  Symbolizer* symbolizer = new Symbolizer(code_observer.code_map());
+  ProfilerCodeObserver* code_observer = new ProfilerCodeObserver(isolate);
+  Symbolizer* symbolizer = new Symbolizer(code_observer->code_map());
   ProfilerEventsProcessor* processor = new SamplingEventsProcessor(
-      CcTest::i_isolate(), symbolizer, &code_observer, profiles,
+      CcTest::i_isolate(), symbolizer, code_observer, profiles,
       v8::base::TimeDelta::FromMicroseconds(100), true);
   CpuProfiler profiler(isolate, kDebugNaming, kLazyLogging, profiles,
-                       symbolizer, processor);
+                       symbolizer, processor, code_observer);
   profiles->StartProfiling("");
   CHECK(processor->Start());
-  ProfilerListener profiler_listener(isolate, processor);
+  ProfilerListener profiler_listener(isolate, processor,
+                                     *code_observer->strings());
 
   profiler_listener.CodeCreateEvent(i::Logger::BUILTIN_TAG, code, "bbb");
 
@@ -1234,22 +1239,22 @@ static void TickLines(bool optimize) {
   i::Handle<i::JSFunction> func = i::Handle<i::JSFunction>::cast(
       v8::Utils::OpenHandle(*GetFunction(env.local(), func_name)));
   CHECK(!func->shared().is_null());
-  CHECK(!func->shared().abstract_code().is_null());
+  CHECK(!func->shared().abstract_code(isolate).is_null());
   CHECK(!optimize || func->HasAttachedOptimizedCode() ||
         !CcTest::i_isolate()->use_optimizer());
-  i::Handle<i::AbstractCode> code(func->abstract_code(), isolate);
+  i::Handle<i::AbstractCode> code(func->abstract_code(isolate), isolate);
   CHECK(!code->is_null());
   i::Address code_address = code->raw_instruction_start();
   CHECK_NE(code_address, kNullAddress);
 
   CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate);
-  ProfilerCodeObserver code_observer(isolate);
-  Symbolizer* symbolizer = new Symbolizer(code_observer.code_map());
+  ProfilerCodeObserver* code_observer = new ProfilerCodeObserver(isolate);
+  Symbolizer* symbolizer = new Symbolizer(code_observer->code_map());
   ProfilerEventsProcessor* processor = new SamplingEventsProcessor(
-      CcTest::i_isolate(), symbolizer, &code_observer, profiles,
+      CcTest::i_isolate(), symbolizer, code_observer, profiles,
       v8::base::TimeDelta::FromMicroseconds(100), true);
   CpuProfiler profiler(isolate, kDebugNaming, kLazyLogging, profiles,
-                       symbolizer, processor);
+                       symbolizer, processor, code_observer);
   profiles->StartProfiling("");
   // TODO(delphick): Stop using the CpuProfiler internals here: This forces
   // LogCompiledFunctions so that source positions are collected everywhere.
@@ -1257,7 +1262,8 @@ static void TickLines(bool optimize) {
   // but doesn't because it's constructed with a symbolizer and a processor.
   isolate->logger()->LogCompiledFunctions();
   CHECK(processor->Start());
-  ProfilerListener profiler_listener(isolate, processor);
+  ProfilerListener profiler_listener(isolate, processor,
+                                     *code_observer->strings());
 
   // Enqueue code creation events.
   i::Handle<i::String> str = factory->NewStringFromAsciiChecked(func_name);
@@ -2416,7 +2422,10 @@ const char* GetBranchDeoptReason(v8::Local<v8::Context> context,
   v8::CpuProfile* profile = reinterpret_cast<v8::CpuProfile*>(iprofile);
   const ProfileNode* iopt_function = nullptr;
   iopt_function = GetSimpleBranch(context, profile, branch, length);
-  CHECK_EQ(1U, iopt_function->deopt_infos().size());
+  if (iopt_function->deopt_infos().size() == 0) {
+    iopt_function = iopt_function->parent();
+  }
+  CHECK_LE(1U, iopt_function->deopt_infos().size());
   return iopt_function->deopt_infos()[0].deopt_reason;
 }
 
@@ -2490,7 +2499,8 @@ TEST(CollectDeoptEvents) {
       .ToLocalChecked();
   i::CpuProfile* iprofile = iprofiler->GetProfile(0);
   iprofile->Print();
-  /* The expected profile
+  /* The expected profile. Note that the deopt reasons can hang off either of
+     the two nodes for each function, depending on the exact timing at runtime.
   [Top down]:
       0  (root) 0 #1
      23     32 #2
@@ -3167,7 +3177,7 @@ TEST(CrashReusedProfiler) {
   profiler->StopProfiling("1");
 
   profiler->StartProfiling("2");
-  CreateCode(&env);
+  CreateCode(isolate, &env);
   profiler->StopProfiling("2");
 }
 
@@ -3543,14 +3553,14 @@ TEST(ProflilerSubsampling) {
   i::HandleScope scope(isolate);
 
   CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate);
-  ProfilerCodeObserver code_observer(isolate);
-  Symbolizer* symbolizer = new Symbolizer(code_observer.code_map());
+  ProfilerCodeObserver* code_observer = new ProfilerCodeObserver(isolate);
+  Symbolizer* symbolizer = new Symbolizer(code_observer->code_map());
   ProfilerEventsProcessor* processor =
-      new SamplingEventsProcessor(isolate, symbolizer, &code_observer, profiles,
+      new SamplingEventsProcessor(isolate, symbolizer, code_observer, profiles,
                                   v8::base::TimeDelta::FromMicroseconds(1),
                                   /* use_precise_sampling */ true);
   CpuProfiler profiler(isolate, kDebugNaming, kLazyLogging, profiles,
-                       symbolizer, processor);
+                       symbolizer, processor, code_observer);
 
   // Create a new CpuProfile that wants samples at 8us.
   CpuProfile profile(&profiler, "",
@@ -3587,14 +3597,14 @@ TEST(DynamicResampling) {
   i::HandleScope scope(isolate);
 
   CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate);
-  ProfilerCodeObserver code_observer(isolate);
-  Symbolizer* symbolizer = new Symbolizer(code_observer.code_map());
+  ProfilerCodeObserver* code_observer = new ProfilerCodeObserver(isolate);
+  Symbolizer* symbolizer = new Symbolizer(code_observer->code_map());
   ProfilerEventsProcessor* processor =
-      new SamplingEventsProcessor(isolate, symbolizer, &code_observer, profiles,
+      new SamplingEventsProcessor(isolate, symbolizer, code_observer, profiles,
                                   v8::base::TimeDelta::FromMicroseconds(1),
                                   /* use_precise_sampling */ true);
   CpuProfiler profiler(isolate, kDebugNaming, kLazyLogging, profiles,
-                       symbolizer, processor);
+                       symbolizer, processor, code_observer);
 
   // Set a 1us base sampling rate, dividing all possible intervals.
   profiler.set_sampling_interval(base::TimeDelta::FromMicroseconds(1));
@@ -3648,14 +3658,14 @@ TEST(DynamicResamplingWithBaseInterval) {
   i::HandleScope scope(isolate);
 
   CpuProfilesCollection* profiles = new CpuProfilesCollection(isolate);
-  ProfilerCodeObserver code_observer(isolate);
-  Symbolizer* symbolizer = new Symbolizer(code_observer.code_map());
+  ProfilerCodeObserver* code_observer = new ProfilerCodeObserver(isolate);
+  Symbolizer* symbolizer = new Symbolizer(code_observer->code_map());
   ProfilerEventsProcessor* processor =
-      new SamplingEventsProcessor(isolate, symbolizer, &code_observer, profiles,
+      new SamplingEventsProcessor(isolate, symbolizer, code_observer, profiles,
                                   v8::base::TimeDelta::FromMicroseconds(1),
                                   /* use_precise_sampling */ true);
   CpuProfiler profiler(isolate, kDebugNaming, kLazyLogging, profiles,
-                       symbolizer, processor);
+                       symbolizer, processor, code_observer);
 
   profiler.set_sampling_interval(base::TimeDelta::FromMicroseconds(7));
 
@@ -3875,6 +3885,164 @@ UNINITIALIZED_TEST(DetailedSourcePositionAPI_Inlining) {
   isolate->Dispose();
 }
 
+namespace {
+
+struct FastApiReceiver {
+  static void FastCallback(v8::ApiObject receiver, int argument,
+                           int* fallback) {
+    v8::Object* receiver_obj = reinterpret_cast<v8::Object*>(&receiver);
+    if (!IsValidUnwrapObject(receiver_obj)) {
+      *fallback = 1;
+      return;
+    }
+    FastApiReceiver* receiver_ptr =
+        GetInternalField<FastApiReceiver, kV8WrapperObjectIndex>(receiver_obj);
+
+    receiver_ptr->result_ |= ApiCheckerResult::kFastCalled;
+
+    // Artificially slow down the callback with a predictable amount of time.
+    // This ensures the test has a relatively stable run time on various
+    // platforms and protects it from flakyness.
+    v8::base::OS::Sleep(v8::base::TimeDelta::FromMilliseconds(100));
+  }
+
+  static void SlowCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+    v8::Object* receiver_obj = v8::Object::Cast(*info.Holder());
+    if (!IsValidUnwrapObject(receiver_obj)) {
+      info.GetIsolate()->ThrowException(v8_str("Called with a non-object."));
+      return;
+    }
+    FastApiReceiver* receiver =
+        GetInternalField<FastApiReceiver, kV8WrapperObjectIndex>(receiver_obj);
+
+    receiver->result_ |= ApiCheckerResult::kSlowCalled;
+  }
+
+  bool DidCallFast() const { return (result_ & ApiCheckerResult::kFastCalled); }
+  bool DidCallSlow() const { return (result_ & ApiCheckerResult::kSlowCalled); }
+
+  ApiCheckerResultFlags result_ = ApiCheckerResult::kNotCalled;
+};
+
+}  // namespace
+
+v8::Local<v8::Function> CreateApiCode(LocalContext* env) {
+  const char* foo_name = "foo";
+  const char* script =
+      "function foo(arg) {"
+      "  for (let i = 0; i < arg; ++i) { receiver.api_func(i); }"
+      "}"
+      "%PrepareFunctionForOptimization(foo);"
+      "foo(42); foo(42);"
+      "%OptimizeFunctionOnNextCall(foo);";
+  CompileRun(script);
+
+  return GetFunction(env->local(), foo_name);
+}
+
+TEST(FastApiCPUProfiler) {
+#if !defined(V8_LITE_MODE) && !defined(USE_SIMULATOR)
+  // None of the following configurations include JSCallReducer.
+  if (i::FLAG_jitless) return;
+  if (i::FLAG_turboprop) return;
+  if (i::FLAG_turbo_nci_as_midtier) return;
+
+  FLAG_SCOPE_EXTERNAL(opt);
+  FLAG_SCOPE_EXTERNAL(turbo_fast_api_calls);
+  FLAG_SCOPE_EXTERNAL(allow_natives_syntax);
+  // Disable --always_opt, otherwise we haven't generated the necessary
+  // feedback to go down the "best optimization" path for the fast call.
+  UNFLAG_SCOPE_EXTERNAL(always_opt);
+  UNFLAG_SCOPE_EXTERNAL(prof_browser_mode);
+
+  CcTest::InitializeVM();
+  LocalContext env;
+  v8::Isolate* isolate = CcTest::isolate();
+  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+  i_isolate->set_embedder_wrapper_type_index(kV8WrapperTypeIndex);
+  i_isolate->set_embedder_wrapper_object_index(kV8WrapperObjectIndex);
+
+  i::HandleScope scope(i_isolate);
+
+  // Setup the fast call.
+  FastApiReceiver receiver;
+
+  v8::TryCatch try_catch(isolate);
+
+  v8::CFunction c_func =
+      v8::CFunction::MakeWithFallbackSupport(FastApiReceiver::FastCallback);
+
+  Local<v8::FunctionTemplate> receiver_templ = v8::FunctionTemplate::New(
+      isolate, FastApiReceiver::SlowCallback, v8::Local<v8::Value>(),
+      v8::Local<v8::Signature>(), 1, v8::ConstructorBehavior::kAllow,
+      v8::SideEffectType::kHasSideEffect, &c_func);
+
+  v8::Local<v8::ObjectTemplate> object_template =
+      v8::ObjectTemplate::New(isolate);
+  object_template->SetInternalFieldCount(kV8WrapperObjectIndex + 1);
+  const char* api_func_str = "api_func";
+  object_template->Set(isolate, api_func_str, receiver_templ);
+
+  v8::Local<v8::Object> object =
+      object_template->NewInstance(env.local()).ToLocalChecked();
+  object->SetAlignedPointerInInternalField(kV8WrapperObjectIndex,
+                                           reinterpret_cast<void*>(&receiver));
+
+  int num_runs_arg = 100;
+  env->Global()->Set(env.local(), v8_str("receiver"), object).Check();
+
+  // Prepare the code.
+  v8::Local<v8::Function> function = CreateApiCode(&env);
+
+  // Setup and start CPU profiler.
+  v8::Local<v8::Value> args[] = {
+      v8::Integer::New(env->GetIsolate(), num_runs_arg)};
+  ProfilerHelper helper(env.local());
+  // TODO(mslekova): We could tweak the following count to reduce test
+  // runtime, while still keeping the test stable.
+  unsigned external_samples = 1000;
+  v8::CpuProfile* profile =
+      helper.Run(function, args, arraysize(args), 0, external_samples);
+
+  // Check if the fast and slow callbacks got executed.
+  CHECK(receiver.DidCallFast());
+  CHECK(receiver.DidCallSlow());
+  CHECK(!try_catch.HasCaught());
+
+  // Check that generated profile has the expected structure.
+  const v8::CpuProfileNode* root = profile->GetTopDownRoot();
+  const v8::CpuProfileNode* foo_node = GetChild(env.local(), root, "foo");
+  const v8::CpuProfileNode* api_func_node =
+      GetChild(env.local(), foo_node, api_func_str);
+  CHECK_NOT_NULL(api_func_node);
+  CHECK_EQ(api_func_node->GetSourceType(), CpuProfileNode::kCallback);
+
+  // Check that the CodeEntry is the expected one, i.e. the fast callback.
+  CodeEntry* code_entry =
+      reinterpret_cast<const ProfileNode*>(api_func_node)->entry();
+  CodeMap* code_map = reinterpret_cast<CpuProfile*>(profile)
+                          ->cpu_profiler()
+                          ->code_map_for_test();
+  CodeEntry* expected_code_entry =
+      code_map->FindEntry(reinterpret_cast<Address>(c_func.GetAddress()));
+  CHECK_EQ(code_entry, expected_code_entry);
+
+  int foo_ticks = foo_node->GetHitCount();
+  int api_func_ticks = api_func_node->GetHitCount();
+  // Check that at least 80% of the samples in foo hit the fast callback.
+  CHECK_LE(foo_ticks, api_func_ticks * 0.2);
+  // The following constant in the CHECK is because above we expect at least
+  // 1000 samples with EXTERNAL type (see external_samples). Since the only
+  // thing that generates those kind of samples is the fast callback, then
+  // we're supposed to have close to 1000 ticks in its node. Since the CPU
+  // profiler is nondeterministic, we've allowed for some slack, otherwise
+  // this could be 1000 instead of 800.
+  CHECK_GE(api_func_ticks, 800);
+
+  profile->Delete();
+#endif
+}
+
 }  // namespace test_cpu_profiler
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/test/cctest/test-debug-helper.cc b/deps/v8/test/cctest/test-debug-helper.cc
index 043df87584bd80..a457546d4ac35f 100644
--- a/deps/v8/test/cctest/test-debug-helper.cc
+++ b/deps/v8/test/cctest/test-debug-helper.cc
@@ -214,7 +214,7 @@ TEST(GetObjectProperties) {
   CHECK(props->type == std::string("v8::internal::SeqOneByteString"));
   CHECK_EQ(props->num_properties, 4);
   CheckProp(*props->properties[0], "v8::internal::Map", "map");
-  CheckProp(*props->properties[1], "uint32_t", "hash_field");
+  CheckProp(*props->properties[1], "uint32_t", "raw_hash_field");
   CheckProp(*props->properties[2], "int32_t", "length", 2);
   CheckProp(*props->properties[3], "char", "chars",
             d::PropertyKind::kArrayOfKnownSize, 2);
@@ -261,7 +261,7 @@ TEST(GetObjectProperties) {
     }
     CheckProp(*props2->properties[0], "v8::internal::Map", "map",
               *reinterpret_cast<i::Tagged_t*>(props->properties[0]->address));
-    CheckProp(*props2->properties[1], "uint32_t", "hash_field",
+    CheckProp(*props2->properties[1], "uint32_t", "raw_hash_field",
               *reinterpret_cast<int32_t*>(props->properties[1]->address));
     CheckProp(*props2->properties[2], "int32_t", "length", 2);
   }
@@ -276,7 +276,7 @@ TEST(GetObjectProperties) {
   CHECK_EQ(props2->num_properties, 4);
   CheckProp(*props2->properties[0], "v8::internal::Map", "map",
             *reinterpret_cast<i::Tagged_t*>(props->properties[0]->address));
-  CheckProp(*props2->properties[1], "uint32_t", "hash_field",
+  CheckProp(*props2->properties[1], "uint32_t", "raw_hash_field",
             *reinterpret_cast<i::Tagged_t*>(props->properties[1]->address));
   CheckProp(*props2->properties[2], "int32_t", "length", 2);
 
diff --git a/deps/v8/test/cctest/test-debug.cc b/deps/v8/test/cctest/test-debug.cc
index 2c0329a8f59ad9..c0c9dfd50fac14 100644
--- a/deps/v8/test/cctest/test-debug.cc
+++ b/deps/v8/test/cctest/test-debug.cc
@@ -2848,8 +2848,7 @@ TEST(PauseInScript) {
   const char* src = "(function (evt) {})";
   const char* script_name = "StepInHandlerTest";
 
-  v8::ScriptOrigin origin(v8_str(env->GetIsolate(), script_name),
-                          v8::Integer::New(env->GetIsolate(), 0));
+  v8::ScriptOrigin origin(v8_str(env->GetIsolate(), script_name));
   v8::Local<v8::Script> script =
       v8::Script::Compile(context, v8_str(env->GetIsolate(), src), &origin)
           .ToLocalChecked();
@@ -4527,11 +4526,10 @@ UNINITIALIZED_TEST(LoadedAtStartupScripts) {
     LocalContext context(isolate);
 
     std::vector<i::Handle<i::Script>> scripts;
-    CompileWithOrigin(v8_str("function foo(){}"), v8_str("normal.js"),
-                      v8_bool(false));
+    CompileWithOrigin(v8_str("function foo(){}"), v8_str("normal.js"), false);
     std::unordered_map<int, int> count_by_type;
     {
-      i::DisallowHeapAllocation no_gc;
+      i::DisallowGarbageCollection no_gc;
       i::Script::Iterator iterator(i_isolate);
       for (i::Script script = iterator.Next(); !script.is_null();
            script = iterator.Next()) {
@@ -4859,7 +4857,6 @@ TEST(GetPrivateFields) {
 }
 
 TEST(GetPrivateMethodsAndAccessors) {
-  i::FLAG_harmony_private_methods = true;
   LocalContext env;
   v8::Isolate* v8_isolate = CcTest::isolate();
   v8::HandleScope scope(v8_isolate);
@@ -4996,7 +4993,6 @@ TEST(GetPrivateMethodsAndAccessors) {
 }
 
 TEST(GetPrivateStaticMethodsAndAccessors) {
-  i::FLAG_harmony_private_methods = true;
   LocalContext env;
   v8::Isolate* v8_isolate = CcTest::isolate();
   v8::HandleScope scope(v8_isolate);
@@ -5047,7 +5043,6 @@ TEST(GetPrivateStaticMethodsAndAccessors) {
 }
 
 TEST(GetPrivateStaticAndInstanceMethodsAndAccessors) {
-  i::FLAG_harmony_private_methods = true;
   LocalContext env;
   v8::Isolate* v8_isolate = CcTest::isolate();
   v8::HandleScope scope(v8_isolate);
diff --git a/deps/v8/test/cctest/test-descriptor-array.cc b/deps/v8/test/cctest/test-descriptor-array.cc
index edb63e8db02300..a8b9e9595265db 100644
--- a/deps/v8/test/cctest/test-descriptor-array.cc
+++ b/deps/v8/test/cctest/test-descriptor-array.cc
@@ -36,7 +36,7 @@ Handle<Name> NewNameWithHash(Isolate* isolate, const char* str, uint32_t hash,
   }
   Handle<Name> name = isolate->factory()->NewOneByteInternalizedString(
       OneByteVector(str), hash_field);
-  name->set_hash_field(hash_field);
+  name->set_raw_hash_field(hash_field);
   CHECK(name->IsUniqueName());
   return name;
 }
@@ -55,7 +55,7 @@ void CheckDescriptorArrayLookups(Isolate* isolate, Handle<Map> map,
                                  Handle<JSFunction> csa_lookup) {
   // Test C++ implementation.
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     DescriptorArray descriptors = map->instance_descriptors(kRelaxedLoad);
     DCHECK(descriptors.IsSortedNoDuplicates());
     int nof_descriptors = descriptors.number_of_descriptors();
@@ -86,7 +86,7 @@ void CheckTransitionArrayLookups(Isolate* isolate,
                                  Handle<JSFunction> csa_lookup) {
   // Test C++ implementation.
   {
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     DCHECK(transitions->IsSortedNoDuplicates());
 
     for (size_t i = 0; i < maps.size(); ++i) {
diff --git a/deps/v8/test/cctest/test-disasm-arm.cc b/deps/v8/test/cctest/test-disasm-arm.cc
index d20cd061d0d3c6..71cc19704ab8d8 100644
--- a/deps/v8/test/cctest/test-disasm-arm.cc
+++ b/deps/v8/test/cctest/test-disasm-arm.cc
@@ -994,6 +994,12 @@ TEST(Neon) {
 
   if (CpuFeatures::IsSupported(NEON)) {
     CpuFeatureScope scope(&assm, NEON);
+      COMPARE(vld1(Neon8, NeonListOperand(d4, 1), NeonMemOperand(r1)),
+              "f421470f       vld1.8 {d4}, [r1]");
+      COMPARE(vld1(Neon8, NeonListOperand(d4, 2), NeonMemOperand(r1)),
+              "f4214a0f       vld1.8 {d4, d5}, [r1]");
+      COMPARE(vld1(Neon8, NeonListOperand(d4, 3), NeonMemOperand(r1)),
+              "f421460f       vld1.8 {d4, d5, d6}, [r1]");
       COMPARE(vld1(Neon8, NeonListOperand(d4, 4), NeonMemOperand(r1)),
               "f421420f       vld1.8 {d4, d5, d6, d7}, [r1]");
       COMPARE(vld1s(Neon32, NeonListOperand(d4, 1), 0, NeonMemOperand(r1)),
@@ -1004,8 +1010,20 @@ TEST(Neon) {
               "f4a14c0f       vld1.8 {d4}, [r1]");
       COMPARE(vld1r(Neon16, NeonListOperand(d4, 2), NeonMemOperand(r1)),
               "f4a14c6f       vld1.16 {d4, d5}, [r1]");
+      COMPARE(vst1(Neon8, NeonListOperand(d4, 1), NeonMemOperand(r6)),
+              "f406470f       vst1.8 {d4}, [r6]")
+      COMPARE(vst1(Neon8, NeonListOperand(q4), NeonMemOperand(r6)),
+              "f4068a0f       vst1.8 {d8, d9}, [r6]")
+      COMPARE(vst1(Neon8, NeonListOperand(d4, 3), NeonMemOperand(r6)),
+              "f406460f       vst1.8 {d4, d5, d6}, [r6]")
       COMPARE(vst1(Neon16, NeonListOperand(d17, 4), NeonMemOperand(r9)),
               "f449124f       vst1.16 {d17, d18, d19, d20}, [r9]");
+      COMPARE(vst1s(Neon8, NeonListOperand(d4), 1, NeonMemOperand(r1)),
+              "f481402f       vst1.8 {d4[1]}, [r1]");
+      COMPARE(vst1s(Neon16, NeonListOperand(d4), 2, NeonMemOperand(r1)),
+              "f481448f       vst1.16 {d4[2]}, [r1]");
+      COMPARE(vst1s(Neon32, NeonListOperand(d4), 0, NeonMemOperand(r1)),
+              "f481480f       vst1.32 {d4[0]}, [r1]");
       COMPARE(vmovl(NeonU8, q3, d1), "f3886a11       vmovl.u8 q3, d1");
       COMPARE(vmovl(NeonU8, q4, d2), "f3888a12       vmovl.u8 q4, d2");
       COMPARE(vmovl(NeonS16, q4, d2), "f2908a12       vmovl.s16 q4, d2");
@@ -1099,6 +1117,12 @@ TEST(Neon) {
               "f3fbe742       vcvt.s32.f32 q15, q1");
       COMPARE(vcvt_u32_f32(q8, q9),
               "f3fb07e2       vcvt.u32.f32 q8, q9");
+      COMPARE(vclt(Neon8, q1, q3, 0),
+              "f3b12246       vclt.s8 q1, q3, #0");
+      COMPARE(vclt(Neon16, q1, q3, 0),
+              "f3b52246       vclt.s16 q1, q3, #0");
+      COMPARE(vclt(Neon32, q1, q3, 0),
+              "f3b92246       vclt.s32 q1, q3, #0");
       COMPARE(vabs(q0, q1),
               "f3b90742       vabs.f32 q0, q1");
       COMPARE(vabs(Neon8, q6, q7),
@@ -1147,6 +1171,18 @@ TEST(Neon) {
               "f2110b12       vpadd.i16 d0, d1, d2");
       COMPARE(vpadd(Neon32, d0, d1, d2),
               "f2210b12       vpadd.i32 d0, d1, d2");
+      COMPARE(vpaddl(NeonS8, q0, q1),
+              "f3b00242       vpaddl.s8 q0, q1");
+      COMPARE(vpaddl(NeonS16, q0, q1),
+              "f3b40242       vpaddl.s16 q0, q1");
+      COMPARE(vpaddl(NeonS32, q0, q1),
+              "f3b80242       vpaddl.s32 q0, q1");
+      COMPARE(vpaddl(NeonU8, q14, q15),
+              "f3f0c2ee       vpaddl.u8 q14, q15");
+      COMPARE(vpaddl(NeonU16, q14, q15),
+              "f3f4c2ee       vpaddl.u16 q14, q15");
+      COMPARE(vpaddl(NeonU32, q14, q15),
+              "f3f8c2ee       vpaddl.u32 q14, q15");
       COMPARE(vpmax(NeonS8, d0, d1, d2),
               "f2010a02       vpmax.s8 d0, d1, d2");
       COMPARE(vpmin(NeonU16, d1, d2, d8),
@@ -1190,6 +1226,15 @@ TEST(Neon) {
       COMPARE(vmul(Neon32, q15, q0, q8),
               "f260e970       vmul.i32 q15, q0, q8");
 
+      COMPARE(vqrdmulh(NeonS16, q0, q1, q8),
+              "f3120b60       vqrdmulh.s16 q0, q1, q8");
+      COMPARE(vqrdmulh(NeonS32, q15, q0, q8),
+              "f360eb60       vqrdmulh.s32 q15, q0, q8");
+
+      COMPARE(vmull(NeonU8, q15, d0, d8),
+              "f3c0ec08       vmull.u8 q15, d0, d8");
+      COMPARE(vmull(NeonS16, q15, d0, d8),
+              "f2d0ec08       vmull.s16 q15, d0, d8");
       COMPARE(vmull(NeonU32, q15, d0, d8),
               "f3e0ec08       vmull.u32 q15, d0, d8");
       COMPARE(vmlal(NeonU32, q15, d0, d8),
@@ -1311,6 +1356,8 @@ TEST(Neon) {
               "f3b1fa45       vtbx.8 d15, {d1, d2, d3}, d5");
       COMPARE(vtbx(d15, NeonListOperand(d1, 4), d5),
               "f3b1fb45       vtbx.8 d15, {d1, d2, d3, d4}, d5");
+      COMPARE(vcnt(q1, q2),
+              "f3b02544       vcnt.8 q1, q2");
   }
 
   VERIFY_RUN();
diff --git a/deps/v8/test/cctest/test-disasm-arm64.cc b/deps/v8/test/cctest/test-disasm-arm64.cc
index 551488ab2122d2..441ae53f32092e 100644
--- a/deps/v8/test/cctest/test-disasm-arm64.cc
+++ b/deps/v8/test/cctest/test-disasm-arm64.cc
@@ -1518,6 +1518,24 @@ TEST_(load_literal) {
   CLEANUP();
 }
 
+TEST(prfm_regoffset) {
+  SET_UP_ASM();
+
+  COMPARE(prfm(PLIL1KEEP, MemOperand(x1, x2)), "prfm plil1keep, [x1, x2]");
+  COMPARE(prfm(PLIL1STRM, MemOperand(x3, w4, SXTW)),
+          "prfm plil1strm, [x3, w4, sxtw]");
+  COMPARE(prfm(PLIL2KEEP, MemOperand(x5, x6, LSL, 3)),
+          "prfm plil2keep, [x5, x6, lsl #3]");
+
+  COMPARE(prfm(PLIL2STRM, MemOperand(sp, xzr)), "prfm plil2strm, [sp, xzr]");
+  COMPARE(prfm(PLIL3KEEP, MemOperand(sp, wzr, SXTW)),
+          "prfm plil3keep, [sp, wzr, sxtw]");
+  COMPARE(prfm(PLIL3STRM, MemOperand(sp, xzr, LSL, 3)),
+          "prfm plil3strm, [sp, xzr, lsl #3]");
+
+  CLEANUP();
+}
+
 TEST_(cond_select) {
   SET_UP_ASM();
 
diff --git a/deps/v8/test/cctest/test-disasm-ia32.cc b/deps/v8/test/cctest/test-disasm-ia32.cc
index 1bce800d373d3b..9ad1a0e225a54e 100644
--- a/deps/v8/test/cctest/test-disasm-ia32.cc
+++ b/deps/v8/test/cctest/test-disasm-ia32.cc
@@ -396,6 +396,12 @@ TEST(DisasmIa320) {
     __ cvtsd2ss(xmm0, Operand(ebx, ecx, times_4, 10000));
     __ movq(xmm0, Operand(edx, 4));
 
+    __ movhlps(xmm0, xmm1);
+    __ movlps(xmm0, Operand(ebx, ecx, times_4, 10000));
+    __ movlps(Operand(ebx, ecx, times_4, 10000), xmm0);
+    __ movhps(xmm0, Operand(ebx, ecx, times_4, 10000));
+    __ movhps(Operand(ebx, ecx, times_4, 10000), xmm0);
+
     // logic operation
     __ andps(xmm0, xmm1);
     __ andps(xmm0, Operand(ebx, ecx, times_4, 10000));
@@ -470,6 +476,7 @@ TEST(DisasmIa320) {
     __ movdqa(Operand(ebx, ecx, times_4, 10000), xmm0);
     __ movdqu(xmm0, Operand(ebx, ecx, times_4, 10000));
     __ movdqu(Operand(ebx, ecx, times_4, 10000), xmm0);
+    __ movdqu(xmm1, xmm0);
 
     __ movapd(xmm0, xmm1);
     __ movapd(xmm0, Operand(edx, 4));
@@ -547,6 +554,7 @@ TEST(DisasmIa320) {
     __ pinsrw(xmm5, edx, 5);
     __ pinsrw(xmm5, Operand(edx, 4), 5);
 
+    __ movmskpd(edx, xmm5);
     __ movmskps(edx, xmm5);
     __ pmovmskb(edx, xmm5);
 
@@ -585,6 +593,7 @@ TEST(DisasmIa320) {
       __ haddps(xmm1, Operand(ebx, ecx, times_4, 10000));
       __ movddup(xmm1, Operand(eax, 5));
       __ movddup(xmm1, xmm2);
+      __ movshdup(xmm1, xmm2);
     }
   }
 
@@ -621,6 +630,10 @@ TEST(DisasmIa320) {
       __ pinsrd(xmm1, Operand(edx, 4), 0);
       __ extractps(eax, xmm1, 0);
 
+      __ blendvps(xmm3, xmm1);
+      __ blendvpd(xmm3, xmm1);
+      __ pblendvb(xmm3, xmm1);
+
       SSE4_INSTRUCTION_LIST(EMIT_SSE34_INSTR)
       SSE4_RM_INSTRUCTION_LIST(EMIT_SSE34_INSTR)
     }
@@ -698,6 +711,12 @@ TEST(DisasmIa320) {
       __ vhaddps(xmm0, xmm1, xmm2);
       __ vhaddps(xmm0, xmm1, Operand(ebx, ecx, times_4, 10000));
 
+      __ vmovhlps(xmm0, xmm1, xmm2);
+      __ vmovlps(xmm0, xmm1, Operand(ebx, ecx, times_4, 10000));
+      __ vmovlps(Operand(ebx, ecx, times_4, 10000), xmm0);
+      __ vmovhps(xmm0, xmm1, Operand(ebx, ecx, times_4, 10000));
+      __ vmovhps(Operand(ebx, ecx, times_4, 10000), xmm0);
+
       __ vcmpeqps(xmm5, xmm4, xmm1);
       __ vcmpeqps(xmm5, xmm4, Operand(ebx, ecx, times_4, 10000));
       __ vcmpltps(xmm5, xmm4, xmm1);
@@ -775,6 +794,10 @@ TEST(DisasmIa320) {
       __ vpinsrd(xmm0, xmm1, eax, 0);
       __ vpinsrd(xmm0, xmm1, Operand(edx, 4), 0);
 
+      __ vblendvps(xmm3, xmm1, xmm4, xmm6);
+      __ vblendvpd(xmm3, xmm1, xmm4, xmm6);
+      __ vpblendvb(xmm3, xmm1, xmm4, xmm6);
+
       __ vcvtdq2ps(xmm1, xmm0);
       __ vcvtdq2ps(xmm1, Operand(ebx, ecx, times_4, 10000));
       __ vcvttps2dq(xmm1, xmm0);
@@ -782,6 +805,7 @@ TEST(DisasmIa320) {
 
       __ vmovddup(xmm1, xmm2);
       __ vmovddup(xmm1, Operand(ebx, ecx, times_4, 10000));
+      __ vmovshdup(xmm1, xmm2);
       __ vbroadcastss(xmm1, Operand(ebx, ecx, times_4, 10000));
       __ vmovdqu(xmm0, Operand(ebx, ecx, times_4, 10000));
       __ vmovdqu(Operand(ebx, ecx, times_4, 10000), xmm0);
@@ -790,6 +814,7 @@ TEST(DisasmIa320) {
       __ vmovd(eax, xmm1);
       __ vmovd(Operand(ebx, ecx, times_4, 10000), xmm1);
 
+      __ vmovmskpd(edx, xmm5);
       __ vmovmskps(edx, xmm5);
       __ vpmovmskb(ebx, xmm1);
 
diff --git a/deps/v8/test/cctest/test-disasm-x64.cc b/deps/v8/test/cctest/test-disasm-x64.cc
index 6c4df1a630e616..d447d386da003b 100644
--- a/deps/v8/test/cctest/test-disasm-x64.cc
+++ b/deps/v8/test/cctest/test-disasm-x64.cc
@@ -401,8 +401,10 @@ TEST(DisasmX64) {
     __ movdqu(xmm0, Operand(rsp, 12));
     __ movdqu(Operand(rsp, 12), xmm0);
     __ movdqu(xmm1, xmm0);
+    __ movhlps(xmm5, xmm1);
     __ movlps(xmm8, Operand(rbx, rcx, times_4, 10000));
     __ movlps(Operand(rbx, rcx, times_4, 10000), xmm9);
+    __ movlhps(xmm5, xmm1);
     __ movhps(xmm8, Operand(rbx, rcx, times_4, 10000));
     __ movhps(Operand(rbx, rcx, times_4, 10000), xmm9);
     __ shufps(xmm0, xmm9, 0x0);
@@ -448,6 +450,7 @@ TEST(DisasmX64) {
     __ movupd(Operand(rbx, rcx, times_4, 10000), xmm0);
     __ movdqa(xmm0, Operand(rbx, rcx, times_4, 10000));
     __ movdqa(Operand(rbx, rcx, times_4, 10000), xmm0);
+    __ movdqa(xmm0, xmm1);
 
     __ ucomisd(xmm0, xmm1);
     __ ucomisd(xmm8, Operand(rbx, rdx, times_4, 10000));
@@ -510,6 +513,7 @@ TEST(DisasmX64) {
       __ lddqu(xmm1, Operand(rdx, 4));
       __ movddup(xmm1, Operand(rax, 5));
       __ movddup(xmm1, xmm2);
+      __ movshdup(xmm1, xmm2);
     }
   }
 
@@ -577,7 +581,6 @@ TEST(DisasmX64) {
       __ movups(xmm5, xmm1);
       __ movups(xmm5, Operand(rdx, 4));
       __ movups(Operand(rdx, 4), xmm5);
-      __ movlhps(xmm5, xmm1);
       __ pmulld(xmm5, xmm1);
       __ pmulld(xmm5, Operand(rdx, 4));
       __ pmullw(xmm5, xmm1);
@@ -656,11 +659,16 @@ TEST(DisasmX64) {
       __ vmovsd(xmm9, Operand(rbx, rcx, times_4, 10000));
       __ vmovsd(Operand(rbx, rcx, times_4, 10000), xmm0);
 
+      __ vmovdqa(xmm4, xmm5);
+
       __ vmovdqu(xmm9, Operand(rbx, rcx, times_4, 10000));
       __ vmovdqu(Operand(rbx, rcx, times_4, 10000), xmm0);
+      __ vmovdqu(xmm4, xmm5);
 
+      __ vmovhlps(xmm1, xmm3, xmm5);
       __ vmovlps(xmm8, xmm9, Operand(rbx, rcx, times_4, 10000));
       __ vmovlps(Operand(rbx, rcx, times_4, 10000), xmm9);
+      __ vmovlhps(xmm1, xmm3, xmm5);
       __ vmovhps(xmm8, xmm9, Operand(rbx, rcx, times_4, 10000));
       __ vmovhps(Operand(rbx, rcx, times_4, 10000), xmm12);
 
@@ -693,7 +701,6 @@ TEST(DisasmX64) {
       __ vmovups(xmm5, xmm1);
       __ vmovups(xmm5, Operand(rdx, 4));
       __ vmovups(Operand(rdx, 4), xmm5);
-      __ vmovlhps(xmm1, xmm3, xmm5);
 
       __ vandps(xmm0, xmm9, xmm2);
       __ vandps(xmm9, xmm1, Operand(rbx, rcx, times_4, 10000));
@@ -839,10 +846,31 @@ TEST(DisasmX64) {
 
       __ vmovddup(xmm1, xmm2);
       __ vmovddup(xmm1, Operand(rbx, rcx, times_4, 10000));
+      __ vmovshdup(xmm1, xmm2);
       __ vbroadcastss(xmm1, Operand(rbx, rcx, times_4, 10000));
     }
   }
 
+  // AVX2 instruction
+  {
+    if (CpuFeatures::IsSupported(AVX2)) {
+      CpuFeatureScope scope(&assm, AVX2);
+      __ vbroadcastss(xmm1, xmm2);
+    }
+  }
+
+  // AVX2 instructions.
+  {
+    if (CpuFeatures::IsSupported(AVX2)) {
+      CpuFeatureScope scope(&assm, AVX2);
+#define EMIT_AVX2_BROADCAST(instruction, notUsed1, notUsed2, notUsed3, \
+                            notUsed4)                                  \
+  __ instruction(xmm0, xmm1);                                          \
+  __ instruction(xmm0, Operand(rbx, rcx, times_4, 10000));
+      AVX2_BROADCAST_LIST(EMIT_AVX2_BROADCAST)
+    }
+  }
+
   // FMA3 instruction
   {
     if (CpuFeatures::IsSupported(FMA3)) {
diff --git a/deps/v8/test/cctest/test-elements-kind.cc b/deps/v8/test/cctest/test-elements-kind.cc
index a9460a89f97f37..324128f105afe4 100644
--- a/deps/v8/test/cctest/test-elements-kind.cc
+++ b/deps/v8/test/cctest/test-elements-kind.cc
@@ -103,7 +103,7 @@ TEST(JSObjectAddingProperties) {
   Handle<FixedArray> empty_fixed_array(factory->empty_fixed_array());
   Handle<PropertyArray> empty_property_array(factory->empty_property_array());
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   Handle<Object> value(Smi::FromInt(42), isolate);
 
   Handle<JSObject> object = factory->NewJSObject(function);
@@ -133,7 +133,7 @@ TEST(JSObjectInObjectAddingProperties) {
   Handle<FixedArray> empty_fixed_array(factory->empty_fixed_array());
   Handle<PropertyArray> empty_property_array(factory->empty_property_array());
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   int nof_inobject_properties = 10;
   // force in object properties by changing the expected_nof_properties
   // (we always reserve 8 inobject properties slack on top).
@@ -182,7 +182,7 @@ TEST(JSObjectAddingElements) {
   Handle<FixedArray> empty_fixed_array(factory->empty_fixed_array());
   Handle<PropertyArray> empty_property_array(factory->empty_property_array());
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   Handle<Object> value(Smi::FromInt(42), isolate);
 
   Handle<JSObject> object = factory->NewJSObject(function);
diff --git a/deps/v8/test/cctest/test-field-type-tracking.cc b/deps/v8/test/cctest/test-field-type-tracking.cc
index 0666a7f380cd02..b39a41b8c1bb14 100644
--- a/deps/v8/test/cctest/test-field-type-tracking.cc
+++ b/deps/v8/test/cctest/test-field-type-tracking.cc
@@ -3,16 +3,15 @@
 // found in the LICENSE file.
 
 #include <stdlib.h>
-#include <utility>
-
-#include "test/cctest/test-api.h"
 
-#include "src/init/v8.h"
+#include <utility>
 
+#include "src/base/logging.h"
 #include "src/execution/execution.h"
 #include "src/handles/global-handles.h"
 #include "src/heap/factory-inl.h"
 #include "src/ic/stub-cache.h"
+#include "src/init/v8.h"
 #include "src/objects/field-type.h"
 #include "src/objects/heap-number-inl.h"
 #include "src/objects/objects-inl.h"
@@ -20,6 +19,7 @@
 #include "src/objects/struct-inl.h"
 #include "src/objects/transitions.h"
 #include "src/utils/ostreams.h"
+#include "test/cctest/test-api.h"
 
 namespace v8 {
 namespace internal {
@@ -38,6 +38,7 @@ const bool IS_ACCESSOR_FIELD_SUPPORTED = false;
 // Number of properties used in the tests.
 const int kPropCount = 7;
 
+enum ChangeAlertMechanism { kDeprecation, kFieldOwnerDependency, kNoAlert };
 
 //
 // Helper functions.
@@ -50,11 +51,11 @@ static Handle<AccessorPair> CreateAccessorPair(bool with_getter,
   Handle<AccessorPair> pair = factory->NewAccessorPair();
   Handle<String> empty_string = factory->empty_string();
   if (with_getter) {
-    Handle<JSFunction> func = factory->NewFunctionForTest(empty_string);
+    Handle<JSFunction> func = factory->NewFunctionForTesting(empty_string);
     pair->set_getter(*func);
   }
   if (with_setter) {
-    Handle<JSFunction> func = factory->NewFunctionForTest(empty_string);
+    Handle<JSFunction> func = factory->NewFunctionForTesting(empty_string);
     pair->set_setter(*func);
   }
   return pair;
@@ -633,8 +634,8 @@ static void CheckCodeObjectForDeopt(const CRFTData& from,
 //
 void TestGeneralizeField(int detach_property_at_index, int property_index,
                          const CRFTData& from, const CRFTData& to,
-                         const CRFTData& expected, bool expected_deprecation,
-                         bool expected_field_owner_dependency) {
+                         const CRFTData& expected,
+                         ChangeAlertMechanism expected_alert) {
   Isolate* isolate = CcTest::i_isolate();
   Handle<FieldType> any_type = FieldType::Any(isolate);
 
@@ -715,9 +716,9 @@ void TestGeneralizeField(int detach_property_at_index, int property_index,
     CHECK(!map->is_stable());
     CHECK(map->is_deprecated());
     CHECK_NE(*map, *new_map);
-    should_deopt =
-        expected_field_owner_dependency && !field_owner->is_deprecated();
-  } else if (expected_deprecation) {
+    should_deopt = (expected_alert == kFieldOwnerDependency) &&
+                   !field_owner->is_deprecated();
+  } else if (expected_alert == kDeprecation) {
     CHECK(!map->is_stable());
     CHECK(map->is_deprecated());
     CHECK(field_owner->is_deprecated());
@@ -726,7 +727,7 @@ void TestGeneralizeField(int detach_property_at_index, int property_index,
     CHECK(!field_owner->is_deprecated());
     CHECK(map->is_stable());  // Map did not change, must be left stable.
     CHECK_EQ(*map, *new_map);
-    should_deopt = expected_field_owner_dependency;
+    should_deopt = (expected_alert == kFieldOwnerDependency);
   }
 
   CheckCodeObjectForDeopt(from, expected, code_field_type, code_field_repr,
@@ -750,15 +751,14 @@ void TestGeneralizeField(int detach_property_at_index, int property_index,
 }
 
 void TestGeneralizeField(const CRFTData& from, const CRFTData& to,
-                         const CRFTData& expected, bool expected_deprecation,
-                         bool expected_field_owner_dependency) {
+                         const CRFTData& expected,
+                         ChangeAlertMechanism expected_alert) {
   // Check the cases when the map being reconfigured is a part of the
   // transition tree.
   STATIC_ASSERT(kPropCount > 4);
   int indices[] = {0, 2, kPropCount - 1};
   for (int i = 0; i < static_cast<int>(arraysize(indices)); i++) {
-    TestGeneralizeField(-1, indices[i], from, to, expected,
-                        expected_deprecation, expected_field_owner_dependency);
+    TestGeneralizeField(-1, indices[i], from, to, expected, expected_alert);
   }
 
   if (!from.representation.IsNone()) {
@@ -767,35 +767,15 @@ void TestGeneralizeField(const CRFTData& from, const CRFTData& to,
     // only for "attached" maps.
     int indices[] = {0, kPropCount - 1};
     for (int i = 0; i < static_cast<int>(arraysize(indices)); i++) {
-      TestGeneralizeField(indices[i], 2, from, to, expected,
-                          expected_deprecation,
-                          expected_field_owner_dependency);
+      TestGeneralizeField(indices[i], 2, from, to, expected, expected_alert);
     }
 
     // Check that reconfiguration to the very same field works correctly.
     CRFTData data = from;
-    TestGeneralizeField(-1, 2, data, data, data, false, false);
+    TestGeneralizeField(-1, 2, data, data, data, kNoAlert);
   }
 }
 
-void TestGeneralizeField(const CRFTData& from, const CRFTData& to,
-                         const CRFTData& expected) {
-  const bool expected_deprecation = true;
-  const bool expected_field_owner_dependency = false;
-
-  TestGeneralizeField(from, to, expected, expected_deprecation,
-                      expected_field_owner_dependency);
-}
-
-void TestGeneralizeFieldTrivial(const CRFTData& from, const CRFTData& to,
-                                const CRFTData& expected,
-                                bool expected_field_owner_dependency = true) {
-  const bool expected_deprecation = false;
-
-  TestGeneralizeField(from, to, expected, expected_deprecation,
-                      expected_field_owner_dependency);
-}
-
 }  // namespace
 
 TEST(GeneralizeSmiFieldToDouble) {
@@ -808,7 +788,8 @@ TEST(GeneralizeSmiFieldToDouble) {
   TestGeneralizeField(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type},
-      {PropertyConstness::kMutable, Representation::Double(), any_type});
+      {PropertyConstness::kMutable, Representation::Double(), any_type},
+      kDeprecation);
 }
 
 TEST(GeneralizeSmiFieldToTagged) {
@@ -824,8 +805,7 @@ TEST(GeneralizeSmiFieldToTagged) {
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace,
-      FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
 }
 
 TEST(GeneralizeDoubleFieldToTagged) {
@@ -841,8 +821,7 @@ TEST(GeneralizeDoubleFieldToTagged) {
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace,
-      !FLAG_unbox_double_fields && FLAG_modify_field_representation_inplace);
+      FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
 }
 
 TEST(GeneralizeHeapObjectFieldToTagged) {
@@ -858,8 +837,7 @@ TEST(GeneralizeHeapObjectFieldToTagged) {
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace,
-      FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
 }
 
 TEST(GeneralizeHeapObjectFieldToHeapObject) {
@@ -877,20 +855,21 @@ TEST(GeneralizeHeapObjectFieldToHeapObject) {
 
   Handle<FieldType> expected_type = any_type;
 
-  TestGeneralizeFieldTrivial(
+  TestGeneralizeField(
       {PropertyConstness::kMutable, Representation::HeapObject(), current_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(),
-       expected_type});
+       expected_type},
+      kFieldOwnerDependency);
   current_type = expected_type;
 
   new_type = FieldType::Class(Map::Create(isolate, 0), isolate);
 
-  TestGeneralizeFieldTrivial(
+  TestGeneralizeField(
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
-      false);
+      kNoAlert);
 }
 
 TEST(GeneralizeNoneFieldToSmi) {
@@ -902,10 +881,11 @@ TEST(GeneralizeNoneFieldToSmi) {
   Handle<FieldType> any_type = FieldType::Any(isolate);
 
   // None -> Smi representation change is trivial.
-  TestGeneralizeFieldTrivial(
+  TestGeneralizeField(
       {PropertyConstness::kMutable, Representation::None(), none_type},
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
-      {PropertyConstness::kMutable, Representation::Smi(), any_type});
+      {PropertyConstness::kMutable, Representation::Smi(), any_type},
+      kFieldOwnerDependency);
 }
 
 TEST(GeneralizeNoneFieldToDouble) {
@@ -920,7 +900,8 @@ TEST(GeneralizeNoneFieldToDouble) {
   TestGeneralizeField(
       {PropertyConstness::kMutable, Representation::None(), none_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type},
-      {PropertyConstness::kMutable, Representation::Double(), any_type});
+      {PropertyConstness::kMutable, Representation::Double(), any_type},
+      kDeprecation);
 }
 
 TEST(GeneralizeNoneFieldToHeapObject) {
@@ -933,10 +914,11 @@ TEST(GeneralizeNoneFieldToHeapObject) {
       FieldType::Class(Map::Create(isolate, 0), isolate);
 
   // None -> HeapObject representation change is trivial.
-  TestGeneralizeFieldTrivial(
+  TestGeneralizeField(
       {PropertyConstness::kMutable, Representation::None(), none_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
-      {PropertyConstness::kMutable, Representation::HeapObject(), value_type});
+      {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
+      kFieldOwnerDependency);
 }
 
 TEST(GeneralizeNoneFieldToTagged) {
@@ -948,10 +930,11 @@ TEST(GeneralizeNoneFieldToTagged) {
   Handle<FieldType> any_type = FieldType::Any(isolate);
 
   // None -> HeapObject representation change is trivial.
-  TestGeneralizeFieldTrivial(
+  TestGeneralizeField(
       {PropertyConstness::kMutable, Representation::None(), none_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      {PropertyConstness::kMutable, Representation::Tagged(), any_type});
+      {PropertyConstness::kMutable, Representation::Tagged(), any_type},
+      kFieldOwnerDependency);
 }
 
 
@@ -1041,7 +1024,7 @@ namespace {
 //
 void TestReconfigureDataFieldAttribute_GeneralizeField(
     const CRFTData& from, const CRFTData& to, const CRFTData& expected,
-    bool expected_deprecation) {
+    ChangeAlertMechanism expected_alert) {
   Isolate* isolate = CcTest::i_isolate();
 
   Expectations expectations(isolate);
@@ -1114,7 +1097,8 @@ void TestReconfigureDataFieldAttribute_GeneralizeField(
     expectations.SetDataField(i, expected.constness, expected.representation,
                               expected.type);
   }
-  if (expected_deprecation) {
+
+  if (expected_alert == kDeprecation) {
     // |map| should be deprecated and |new_map| should match new expectations.
     CHECK(map->is_deprecated());
     CHECK(!code_field_type->marked_for_deoptimization());
@@ -1130,110 +1114,24 @@ void TestReconfigureDataFieldAttribute_GeneralizeField(
     CHECK_EQ(*new_map, *updated_map);
     CheckMigrationTarget(isolate, *map, *updated_map);
   } else {
+    CHECK(expected_alert == kFieldOwnerDependency ||
+          expected_alert == kNoAlert);
+    // In case of in-place generalization |map| should be returned as a result
+    // of the property reconfiguration, respective field types should be
+    // generalized and respective code dependencies should be invalidated.
+    // |map| should be NOT deprecated and it should match new expectations.
     CHECK(!map->is_deprecated());
-    CHECK(expectations.Check(*map));
-  }
-}
-
-// This test ensures that trivial field generalization (from HeapObject to
-// HeapObject) is correctly propagated from one branch of transition tree
-// (|map2|) to another (|map|).
-//
-//             + - p2B - p3 - p4: |map2|
-//             |
-//  {} - p0 - p1 - p2A - p3 - p4: |map|
-//
-// where "p2A" and "p2B" differ only in the attributes.
-//
-void TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
-    const CRFTData& from, const CRFTData& to, const CRFTData& expected,
-    bool expected_field_owner_dependency = true) {
-  Isolate* isolate = CcTest::i_isolate();
-
-  Expectations expectations(isolate);
-
-  // Create a map, add required properties to it and initialize expectations.
-  Handle<Map> initial_map = Map::Create(isolate, 0);
-  Handle<Map> map = initial_map;
-  for (int i = 0; i < kPropCount; i++) {
-    map = expectations.AddDataField(map, NONE, from.constness,
-                                    from.representation, from.type);
-  }
-  CHECK(!map->is_deprecated());
-  CHECK(map->is_stable());
-  CHECK(expectations.Check(*map));
-
-  // Create another branch in transition tree (property at index |kSplitProp|
-  // has different attributes), initialize expectations.
-  const int kSplitProp = kPropCount / 2;
-  Expectations expectations2(isolate);
-
-  Handle<Map> map2 = initial_map;
-  for (int i = 0; i < kSplitProp; i++) {
-    map2 = expectations2.FollowDataTransition(map2, NONE, from.constness,
-                                              from.representation, from.type);
-  }
-  map2 = expectations2.AddDataField(map2, READ_ONLY, to.constness,
-                                    to.representation, to.type);
-
-  for (int i = kSplitProp + 1; i < kPropCount; i++) {
-    map2 = expectations2.AddDataField(map2, NONE, to.constness,
-                                      to.representation, to.type);
-  }
-  CHECK(!map2->is_deprecated());
-  CHECK(map2->is_stable());
-  CHECK(expectations2.Check(*map2));
-
-  // Create dummy optimized code object to test correct dependencies
-  // on the field owner.
-  Handle<Code> code_field_type = CreateDummyOptimizedCode(isolate);
-  Handle<Code> code_field_repr = CreateDummyOptimizedCode(isolate);
-  Handle<Code> code_field_const = CreateDummyOptimizedCode(isolate);
-  Handle<Map> field_owner(
-      map->FindFieldOwner(isolate, InternalIndex(kSplitProp)), isolate);
-  DependentCode::InstallDependency(isolate,
-                                   MaybeObjectHandle::Weak(code_field_type),
-                                   field_owner, DependentCode::kFieldTypeGroup);
-  DependentCode::InstallDependency(
-      isolate, MaybeObjectHandle::Weak(code_field_repr), field_owner,
-      DependentCode::kFieldRepresentationGroup);
-  DependentCode::InstallDependency(
-      isolate, MaybeObjectHandle::Weak(code_field_const), field_owner,
-      DependentCode::kFieldConstGroup);
-  CHECK(!code_field_type->marked_for_deoptimization());
-  CHECK(!code_field_repr->marked_for_deoptimization());
-  CHECK(!code_field_const->marked_for_deoptimization());
-
-  // Reconfigure attributes of property |kSplitProp| of |map2| to NONE, which
-  // should generalize representations in |map1|.
-  Handle<Map> new_map =
-      Map::ReconfigureExistingProperty(isolate, map2, InternalIndex(kSplitProp),
-                                       kData, NONE, PropertyConstness::kConst);
+    CHECK_EQ(*map, *new_map);
+    bool expect_deopt = expected_alert == kFieldOwnerDependency;
+    CheckCodeObjectForDeopt(from, expected, code_field_type, code_field_repr,
+                            code_field_const, expect_deopt);
 
-  // |map2| should be left unchanged but marked unstable.
-  CHECK(!map2->is_stable());
-  CHECK(!map2->is_deprecated());
-  CHECK_NE(*map2, *new_map);
-  CHECK(expectations2.Check(*map2));
+    CHECK(!new_map->is_deprecated());
+    CHECK(expectations.Check(*new_map));
 
-  // In trivial case |map| should be returned as a result of the property
-  // reconfiguration, respective field types should be generalized and
-  // respective code dependencies should be invalidated. |map| should be NOT
-  // deprecated and it should match new expectations.
-  for (int i = kSplitProp; i < kPropCount; i++) {
-    expectations.SetDataField(i, expected.constness, expected.representation,
-                              expected.type);
+    Handle<Map> updated_map = Map::Update(isolate, map);
+    CHECK_EQ(*new_map, *updated_map);
   }
-  CHECK(!map->is_deprecated());
-  CHECK_EQ(*map, *new_map);
-  CheckCodeObjectForDeopt(from, expected, code_field_type, code_field_repr,
-                          code_field_const, expected_field_owner_dependency);
-
-  CHECK(!new_map->is_deprecated());
-  CHECK(expectations.Check(*new_map));
-
-  Handle<Map> updated_map = Map::Update(isolate, map);
-  CHECK_EQ(*new_map, *updated_map);
 }
 
 }  // namespace
@@ -1248,22 +1146,26 @@ TEST(ReconfigureDataFieldAttribute_GeneralizeSmiFieldToDouble) {
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::Double(), any_type},
-      {PropertyConstness::kConst, Representation::Double(), any_type}, true);
+      {PropertyConstness::kConst, Representation::Double(), any_type},
+      kDeprecation);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type},
-      {PropertyConstness::kMutable, Representation::Double(), any_type}, true);
+      {PropertyConstness::kMutable, Representation::Double(), any_type},
+      kDeprecation);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::Double(), any_type},
-      {PropertyConstness::kMutable, Representation::Double(), any_type}, true);
+      {PropertyConstness::kMutable, Representation::Double(), any_type},
+      kDeprecation);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type},
-      {PropertyConstness::kMutable, Representation::Double(), any_type}, true);
+      {PropertyConstness::kMutable, Representation::Double(), any_type},
+      kDeprecation);
 }
 
 TEST(ReconfigureDataFieldAttribute_GeneralizeSmiFieldToTagged) {
@@ -1279,25 +1181,25 @@ TEST(ReconfigureDataFieldAttribute_GeneralizeSmiFieldToTagged) {
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kConst, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
 }
 
 TEST(ReconfigureDataFieldAttribute_GeneralizeDoubleFieldToTagged) {
@@ -1313,25 +1215,25 @@ TEST(ReconfigureDataFieldAttribute_GeneralizeDoubleFieldToTagged) {
       {PropertyConstness::kConst, Representation::Double(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kConst, Representation::Tagged(), any_type},
-      FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+      FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+      FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+      FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
 
   TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+      FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
 }
 
 TEST(ReconfigureDataFieldAttribute_GeneralizeHeapObjFieldToHeapObj) {
@@ -1350,59 +1252,64 @@ TEST(ReconfigureDataFieldAttribute_GeneralizeHeapObjFieldToHeapObj) {
   Handle<FieldType> expected_type = any_type;
 
   // Check generalizations that trigger deopts.
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::HeapObject(), current_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
-      {PropertyConstness::kConst, Representation::HeapObject(), expected_type});
+      {PropertyConstness::kConst, Representation::HeapObject(), expected_type},
+      kFieldOwnerDependency);
 
   // PropertyConstness::kConst to PropertyConstness::kMutable migration does
   // not create a new map, therefore trivial generalization.
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::HeapObject(), current_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(),
-       expected_type});
+       expected_type},
+      kFieldOwnerDependency);
 
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::HeapObject(), current_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(),
-       expected_type});
+       expected_type},
+      kFieldOwnerDependency);
 
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::HeapObject(), current_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(),
-       expected_type});
+       expected_type},
+      kFieldOwnerDependency);
   current_type = expected_type;
 
   // Check generalizations that do not trigger deopts.
   new_type = FieldType::Class(Map::Create(isolate, 0), isolate);
 
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::HeapObject(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
       {PropertyConstness::kConst, Representation::HeapObject(), any_type},
-      false);
+      kNoAlert);
 
   // PropertyConstness::kConst to PropertyConstness::kMutable migration does
   // not create a new map, therefore trivial generalization.
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kConst, Representation::HeapObject(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
-      {PropertyConstness::kMutable, Representation::HeapObject(), any_type});
+      {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
+      kFieldOwnerDependency);
 
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
-      false);
+      kNoAlert);
 
-  TestReconfigureDataFieldAttribute_GeneralizeFieldTrivial(
+  TestReconfigureDataFieldAttribute_GeneralizeField(
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
-      false);
+      kNoAlert);
 }
 
 TEST(ReconfigureDataFieldAttribute_GeneralizeHeapObjectFieldToTagged) {
@@ -1418,7 +1325,7 @@ TEST(ReconfigureDataFieldAttribute_GeneralizeHeapObjectFieldToTagged) {
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
 }
 
 // Checks that given |map| is deprecated and that it updates to given |new_map|
@@ -1585,7 +1492,7 @@ TEST(ReconfigureDataFieldAttribute_SameDataConstantAfterTargetMap) {
     TestConfig() {
       Isolate* isolate = CcTest::i_isolate();
       Factory* factory = isolate->factory();
-      js_func_ = factory->NewFunctionForTest(factory->empty_string());
+      js_func_ = factory->NewFunctionForTesting(factory->empty_string());
     }
 
     Handle<Map> AddPropertyAtBranch(int branch_id, Expectations* expectations,
@@ -1626,10 +1533,14 @@ TEST(ReconfigureDataFieldAttribute_DataConstantToDataFieldAfterTargetMap) {
       CHECK(sloppy_map->is_stable());
 
       js_func1_ =
-          factory->NewFunction(sloppy_map, info, isolate->native_context());
+          Factory::JSFunctionBuilder{isolate, info, isolate->native_context()}
+              .set_map(sloppy_map)
+              .Build();
 
       js_func2_ =
-          factory->NewFunction(sloppy_map, info, isolate->native_context());
+          Factory::JSFunctionBuilder{isolate, info, isolate->native_context()}
+              .set_map(sloppy_map)
+              .Build();
     }
 
     Handle<Map> AddPropertyAtBranch(int branch_id, Expectations* expectations,
@@ -1660,7 +1571,7 @@ TEST(ReconfigureDataFieldAttribute_DataConstantToAccConstantAfterTargetMap) {
     TestConfig() {
       Isolate* isolate = CcTest::i_isolate();
       Factory* factory = isolate->factory();
-      js_func_ = factory->NewFunctionForTest(factory->empty_string());
+      js_func_ = factory->NewFunctionForTesting(factory->empty_string());
       pair_ = CreateAccessorPair(true, true);
     }
 
@@ -1790,9 +1701,8 @@ TEST(ReconfigureDataFieldAttribute_AccConstantToDataFieldAfterTargetMap) {
 
 namespace {
 
-// This test ensures that trivial field generalization (from HeapObject to
-// HeapObject) is correctly propagated from one branch of transition tree
-// (|map2|) to another (|map|).
+// This test ensures that in-place field generalization is correctly propagated
+// from one branch of transition tree (|map2|) to another (|map|).
 //
 //   + - p0 - p1 - p2A - p3 - p4: |map|
 //   |
@@ -1802,7 +1712,7 @@ namespace {
 //
 // where "p2A" and "p2B" differ only in the representation/field type.
 //
-static void TestReconfigureElementsKind_GeneralizeFieldTrivial(
+static void TestReconfigureElementsKind_GeneralizeFieldInPlace(
     const CRFTData& from, const CRFTData& to, const CRFTData& expected) {
   Isolate* isolate = CcTest::i_isolate();
 
@@ -1873,10 +1783,10 @@ static void TestReconfigureElementsKind_GeneralizeFieldTrivial(
   CHECK_NE(*map2, *new_map);
   CHECK(expectations2.Check(*map2));
 
-  // In trivial case |map| should be returned as a result of the elements
-  // kind reconfiguration, respective field types should be generalized and
-  // respective code dependencies should be invalidated. |map| should be NOT
-  // deprecated and it should match new expectations.
+  // In case of in-place generalization |map| should be returned as a result of
+  // the elements kind reconfiguration, respective field types should be
+  // generalized and respective code dependencies should be invalidated.
+  // |map| should be NOT deprecated and it should match new expectations.
   expectations.SetDataField(kDiffProp, expected.constness,
                             expected.representation, expected.type);
   CHECK(!map->is_deprecated());
@@ -1912,22 +1822,22 @@ TEST(ReconfigureElementsKind_GeneralizeSmiFieldToDouble) {
 
   Handle<FieldType> any_type = FieldType::Any(isolate);
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::Double(), any_type},
       {PropertyConstness::kConst, Representation::Double(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::Double(), any_type});
@@ -1942,22 +1852,22 @@ TEST(ReconfigureElementsKind_GeneralizeSmiFieldToTagged) {
   Handle<FieldType> value_type =
       FieldType::Class(Map::Create(isolate, 0), isolate);
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kConst, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
@@ -1972,22 +1882,22 @@ TEST(ReconfigureElementsKind_GeneralizeDoubleFieldToTagged) {
   Handle<FieldType> value_type =
       FieldType::Class(Map::Create(isolate, 0), isolate);
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::Double(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kConst, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
@@ -2009,26 +1919,26 @@ TEST(ReconfigureElementsKind_GeneralizeHeapObjFieldToHeapObj) {
   Handle<FieldType> expected_type = any_type;
 
   // Check generalizations that trigger deopts.
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::HeapObject(), current_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
       {PropertyConstness::kConst, Representation::HeapObject(), expected_type});
 
   // PropertyConstness::kConst to PropertyConstness::kMutable migration does
   // not create a new map, therefore trivial generalization.
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::HeapObject(), current_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(),
        expected_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::HeapObject(), current_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(),
        expected_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::HeapObject(), current_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(),
@@ -2038,24 +1948,24 @@ TEST(ReconfigureElementsKind_GeneralizeHeapObjFieldToHeapObj) {
   // Check generalizations that do not trigger deopts.
   new_type = FieldType::Class(Map::Create(isolate, 0), isolate);
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::HeapObject(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
       {PropertyConstness::kConst, Representation::HeapObject(), any_type});
 
   // PropertyConstness::kConst to PropertyConstness::kMutable migration does
   // not create a new map, therefore trivial generalization.
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::HeapObject(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
       {PropertyConstness::kConst, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), new_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), any_type});
@@ -2070,22 +1980,22 @@ TEST(ReconfigureElementsKind_GeneralizeHeapObjectFieldToTagged) {
   Handle<FieldType> value_type =
       FieldType::Class(Map::Create(isolate, 0), isolate);
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kConst, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kConst, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kConst, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
 
-  TestReconfigureElementsKind_GeneralizeFieldTrivial(
+  TestReconfigureElementsKind_GeneralizeFieldInPlace(
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type});
@@ -2190,7 +2100,7 @@ TEST(ReconfigurePropertySplitMapTransitionsOverflow) {
 template <typename TestConfig>
 static void TestGeneralizeFieldWithSpecialTransition(
     TestConfig* config, const CRFTData& from, const CRFTData& to,
-    const CRFTData& expected, bool expected_deprecation) {
+    const CRFTData& expected, ChangeAlertMechanism expected_alert) {
   Isolate* isolate = CcTest::i_isolate();
 
   Expectations expectations(isolate);
@@ -2237,46 +2147,62 @@ static void TestGeneralizeFieldWithSpecialTransition(
     expectations.SetDataField(i, expected.constness, expected.representation,
                               expected.type);
 
-    if (expected_deprecation) {
-      CHECK(map->is_deprecated());
-      CHECK_NE(*map, *new_map);
-      CHECK(i == 0 || maps[i - 1]->is_deprecated());
-      CHECK(expectations.Check(*new_map));
-
-      Handle<Map> new_map2 = Map::Update(isolate, map2);
-      CHECK(!new_map2->is_deprecated());
-      CHECK(!new_map2->is_dictionary_map());
-
-      Handle<Map> tmp_map;
-      if (Map::TryUpdate(isolate, map2).ToHandle(&tmp_map)) {
-        // If Map::TryUpdate() manages to succeed the result must match the
-        // result of Map::Update().
-        CHECK_EQ(*new_map2, *tmp_map);
-      } else {
-        // Equivalent transitions should always find the updated map.
-        CHECK(config->is_non_equivalent_transition());
-      }
+    switch (expected_alert) {
+      case kDeprecation: {
+        CHECK(map->is_deprecated());
+        CHECK_NE(*map, *new_map);
+        CHECK(i == 0 || maps[i - 1]->is_deprecated());
+        CHECK(expectations.Check(*new_map));
+
+        Handle<Map> new_map2 = Map::Update(isolate, map2);
+        CHECK(!new_map2->is_deprecated());
+        CHECK(!new_map2->is_dictionary_map());
+
+        Handle<Map> tmp_map;
+        if (Map::TryUpdate(isolate, map2).ToHandle(&tmp_map)) {
+          // If Map::TryUpdate() manages to succeed the result must match the
+          // result of Map::Update().
+          CHECK_EQ(*new_map2, *tmp_map);
+        } else {
+          // Equivalent transitions should always find the updated map.
+          CHECK(config->is_non_equivalent_transition());
+        }
 
-      if (config->is_non_equivalent_transition()) {
-        // In case of non-equivalent transition currently we generalize all
-        // representations.
-        for (int i = 0; i < kPropCount; i++) {
-          expectations2.GeneralizeField(i);
+        if (config->is_non_equivalent_transition()) {
+          // In case of non-equivalent transition currently we generalize all
+          // representations.
+          for (int i = 0; i < kPropCount; i++) {
+            expectations2.GeneralizeField(i);
+          }
+          CHECK(new_map2->GetBackPointer().IsUndefined(isolate));
+          CHECK(expectations2.Check(*new_map2));
+        } else {
+          expectations2.SetDataField(i, expected.constness,
+                                     expected.representation, expected.type);
+
+          CHECK(!new_map2->GetBackPointer().IsUndefined(isolate));
+          CHECK(expectations2.Check(*new_map2));
         }
-        CHECK(new_map2->GetBackPointer().IsUndefined(isolate));
-        CHECK(expectations2.Check(*new_map2));
-      } else {
+        break;
+      }
+      case kFieldOwnerDependency: {
+        CHECK(!map->is_deprecated());
+        // TODO(ishell): Review expectations once IS_PROTO_TRANS_ISSUE_FIXED is
+        // removed.
+        CHECK(!IS_PROTO_TRANS_ISSUE_FIXED);
+        CHECK_EQ(*map, *new_map);
+        CHECK(expectations.Check(*new_map));
+
+        CHECK(!map2->is_deprecated());
+        CHECK_NE(*map2, *new_map);
         expectations2.SetDataField(i, expected.constness,
                                    expected.representation, expected.type);
-
-        CHECK(!new_map2->GetBackPointer().IsUndefined(isolate));
-        CHECK(expectations2.Check(*new_map2));
+        CHECK(expectations2.Check(*map2));
+        break;
       }
-    } else {
-      CHECK(!map->is_deprecated());
-      // TODO(ishell): Update test expectations properly.
-      // CHECK_EQ(*map2, *new_map);
-      // CHECK(expectations2.Check(*new_map));
+      case kNoAlert:
+        UNREACHABLE();
+        break;
     }
   }
 
@@ -2339,13 +2265,14 @@ TEST(ElementsKindTransitionFromMapOwningDescriptor) {
         {PropertyConstness::kMutable, Representation::Smi(), any_type},
         {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
         {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-        !FLAG_modify_field_representation_inplace);
+        kFieldOwnerDependency);
+
     TestGeneralizeFieldWithSpecialTransition(
         &configs[i],
         {PropertyConstness::kMutable, Representation::Double(), any_type},
         {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
         {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-        FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+        FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
   }
 }
 
@@ -2406,13 +2333,14 @@ TEST(ElementsKindTransitionFromMapNotOwningDescriptor) {
         {PropertyConstness::kMutable, Representation::Smi(), any_type},
         {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
         {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-        !FLAG_modify_field_representation_inplace);
+        kFieldOwnerDependency);
+
     TestGeneralizeFieldWithSpecialTransition(
         &configs[i],
         {PropertyConstness::kMutable, Representation::Double(), any_type},
         {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
         {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-        FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+        FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
   }
 }
 
@@ -2449,13 +2377,14 @@ TEST(PrototypeTransitionFromMapOwningDescriptor) {
       &config, {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
+
   TestGeneralizeFieldWithSpecialTransition(
       &config,
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+      FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
 }
 
 TEST(PrototypeTransitionFromMapNotOwningDescriptor) {
@@ -2502,13 +2431,14 @@ TEST(PrototypeTransitionFromMapNotOwningDescriptor) {
       &config, {PropertyConstness::kMutable, Representation::Smi(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      !FLAG_modify_field_representation_inplace);
+      kFieldOwnerDependency);
+
   TestGeneralizeFieldWithSpecialTransition(
       &config,
       {PropertyConstness::kMutable, Representation::Double(), any_type},
       {PropertyConstness::kMutable, Representation::HeapObject(), value_type},
       {PropertyConstness::kMutable, Representation::Tagged(), any_type},
-      FLAG_unbox_double_fields || !FLAG_modify_field_representation_inplace);
+      FLAG_unbox_double_fields ? kDeprecation : kFieldOwnerDependency);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -2741,7 +2671,7 @@ TEST(TransitionDataConstantToSameDataConstant) {
   Factory* factory = isolate->factory();
 
   Handle<JSFunction> js_func =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   TransitionToDataConstantOperator transition_op(js_func);
 
   SameMapChecker checker;
@@ -2763,11 +2693,15 @@ TEST(TransitionDataConstantToAnotherDataConstant) {
   CHECK(sloppy_map->is_stable());
 
   Handle<JSFunction> js_func1 =
-      factory->NewFunction(sloppy_map, info, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, info, isolate->native_context()}
+          .set_map(sloppy_map)
+          .Build();
   TransitionToDataConstantOperator transition_op1(js_func1);
 
   Handle<JSFunction> js_func2 =
-      factory->NewFunction(sloppy_map, info, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, info, isolate->native_context()}
+          .set_map(sloppy_map)
+          .Build();
   TransitionToDataConstantOperator transition_op2(js_func2);
 
   SameMapChecker checker;
@@ -2784,22 +2718,15 @@ TEST(TransitionDataConstantToDataField) {
   Handle<FieldType> any_type = FieldType::Any(isolate);
 
   Handle<JSFunction> js_func1 =
-      factory->NewFunctionForTest(factory->empty_string());
+      factory->NewFunctionForTesting(factory->empty_string());
   TransitionToDataConstantOperator transition_op1(js_func1);
 
   Handle<Object> value2 = isolate->factory()->NewHeapNumber(0);
   TransitionToDataFieldOperator transition_op2(
       PropertyConstness::kMutable, Representation::Tagged(), any_type, value2);
 
-  if (FLAG_modify_field_representation_inplace) {
-    SameMapChecker checker;
-    TestTransitionTo(&transition_op1, &transition_op2, &checker);
-  } else {
-    FieldGeneralizationChecker checker(kPropCount - 1,
-                                       PropertyConstness::kMutable,
-                                       Representation::Tagged(), any_type);
-    TestTransitionTo(&transition_op1, &transition_op2, &checker);
-  }
+  SameMapChecker checker;
+  TestTransitionTo(&transition_op1, &transition_op2, &checker);
 }
 
 
@@ -3057,6 +2984,30 @@ TEST(NormalizeToMigrationTarget) {
   CHECK(new_normalized_map->is_migration_target());
 }
 
+TEST(RepresentationPredicatesAreInSync) {
+  STATIC_ASSERT(Representation::kNumRepresentations == 5);
+  static Representation reps[] = {
+      Representation::None(), Representation::Smi(), Representation::Double(),
+      Representation::HeapObject(), Representation::Tagged()};
+
+  for (Representation from : reps) {
+    Representation most_generic_rep = from.MostGenericInPlaceChange();
+    CHECK(from.CanBeInPlaceChangedTo(most_generic_rep));
+
+    bool might_be_deprecated = false;
+
+    for (Representation to : reps) {
+      // Skip representation narrowing cases.
+      if (!from.fits_into(to)) continue;
+
+      if (!from.CanBeInPlaceChangedTo(to)) {
+        might_be_deprecated = true;
+      }
+    }
+    CHECK_EQ(from.MightCauseMapDeprecation(), might_be_deprecated);
+  }
+}
+
 }  // namespace test_field_type_tracking
 }  // namespace compiler
 }  // namespace internal
diff --git a/deps/v8/test/cctest/test-func-name-inference.cc b/deps/v8/test/cctest/test-func-name-inference.cc
index ab210ae162d1e2..7440ea8823062a 100644
--- a/deps/v8/test/cctest/test-func-name-inference.cc
+++ b/deps/v8/test/cctest/test-func-name-inference.cc
@@ -69,7 +69,7 @@ static void CheckFunctionName(v8::Local<v8::Script> script,
   // Find the position of a given func source substring in the source.
   int func_pos;
   {
-    i::DisallowHeapAllocation no_gc;
+    i::DisallowGarbageCollection no_gc;
     Vector<const uint8_t> func_pos_str = i::OneByteVector(func_pos_src);
     i::String::FlatContent script_content = script_src->GetFlatContent(no_gc);
     func_pos = SearchString(isolate, script_content.ToOneByteVector(),
diff --git a/deps/v8/test/cctest/test-hashcode.cc b/deps/v8/test/cctest/test-hashcode.cc
index e311646f73f470..cf9d477ff9681a 100644
--- a/deps/v8/test/cctest/test-hashcode.cc
+++ b/deps/v8/test/cctest/test-hashcode.cc
@@ -28,6 +28,30 @@ int AddToSetAndGetHash(Isolate* isolate, Handle<JSObject> obj,
   return Smi::ToInt(obj->GetHash());
 }
 
+int GetPropertyDictionaryHash(Handle<JSObject> obj) {
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    return obj->property_dictionary_ordered().Hash();
+  } else {
+    return obj->property_dictionary().Hash();
+  }
+}
+
+int GetPropertyDictionaryLength(Handle<JSObject> obj) {
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    return obj->property_dictionary_ordered().length();
+  } else {
+    return obj->property_dictionary().length();
+  }
+}
+
+void CheckIsDictionaryModeObject(Handle<JSObject> obj) {
+  if (V8_DICT_MODE_PROTOTYPES_BOOL) {
+    CHECK(obj->raw_properties_or_hash().IsOrderedNameDictionary());
+  } else {
+    CHECK(obj->raw_properties_or_hash().IsNameDictionary());
+  }
+}
+
 void CheckFastObject(Handle<JSObject> obj, int hash) {
   CHECK(obj->HasFastProperties());
   CHECK(obj->raw_properties_or_hash().IsPropertyArray());
@@ -37,9 +61,9 @@ void CheckFastObject(Handle<JSObject> obj, int hash) {
 
 void CheckDictionaryObject(Handle<JSObject> obj, int hash) {
   CHECK(!obj->HasFastProperties());
-  CHECK(obj->raw_properties_or_hash().IsNameDictionary());
+  CheckIsDictionaryModeObject(obj);
   CHECK_EQ(Smi::FromInt(hash), obj->GetHash());
-  CHECK_EQ(hash, obj->property_dictionary().Hash());
+  CHECK_EQ(hash, GetPropertyDictionaryHash(obj));
 }
 
 TEST(AddHashCodeToFastObjectWithoutProperties) {
@@ -98,7 +122,8 @@ TEST(AddHashCodeToSlowObject) {
   CHECK(obj->HasFastProperties());
   JSObject::NormalizeProperties(isolate, obj, CLEAR_INOBJECT_PROPERTIES, 0,
                                 "cctest/test-hashcode");
-  CHECK(obj->raw_properties_or_hash().IsNameDictionary());
+
+  CheckIsDictionaryModeObject(obj);
 
   int hash = AddToSetAndGetHash(isolate, obj, false);
   CheckDictionaryObject(obj, hash);
@@ -181,14 +206,14 @@ TEST(TransitionSlowToSlow) {
   Handle<JSObject> obj = GetGlobal<JSObject>("x");
   JSObject::NormalizeProperties(isolate, obj, CLEAR_INOBJECT_PROPERTIES, 0,
                                 "cctest/test-hashcode");
-  CHECK(obj->raw_properties_or_hash().IsNameDictionary());
+  CheckIsDictionaryModeObject(obj);
 
   int hash = AddToSetAndGetHash(isolate, obj, false);
-  CHECK_EQ(hash, obj->property_dictionary().Hash());
+  CHECK_EQ(hash, GetPropertyDictionaryHash(obj));
 
-  int length = obj->property_dictionary().length();
+  int length = GetPropertyDictionaryLength(obj);
   CompileRun("for(var i = 0; i < 10; i++) { x['f'+i] = i };");
-  CHECK(obj->property_dictionary().length() > length);
+  CHECK(GetPropertyDictionaryLength(obj) > length);
   CheckDictionaryObject(obj, hash);
 }
 
@@ -201,10 +226,10 @@ TEST(TransitionSlowToFastWithoutProperties) {
       isolate->factory()->NewJSObject(isolate->object_function());
   JSObject::NormalizeProperties(isolate, obj, CLEAR_INOBJECT_PROPERTIES, 0,
                                 "cctest/test-hashcode");
-  CHECK(obj->raw_properties_or_hash().IsNameDictionary());
+  CheckIsDictionaryModeObject(obj);
 
   int hash = AddToSetAndGetHash(isolate, obj, false);
-  CHECK_EQ(hash, obj->property_dictionary().Hash());
+  CHECK_EQ(hash, GetPropertyDictionaryHash(obj));
 
   JSObject::MigrateSlowToFast(obj, 0, "cctest/test-hashcode");
   CHECK_EQ(Smi::FromInt(hash), obj->GetHash());
@@ -221,10 +246,10 @@ TEST(TransitionSlowToFastWithPropertyArray) {
   CompileRun(source);
 
   Handle<JSObject> obj = GetGlobal<JSObject>("x");
-  CHECK(obj->raw_properties_or_hash().IsNameDictionary());
+  CheckIsDictionaryModeObject(obj);
 
   int hash = AddToSetAndGetHash(isolate, obj, false);
-  CHECK_EQ(hash, obj->property_dictionary().Hash());
+  CHECK_EQ(hash, GetPropertyDictionaryHash(obj));
 
   JSObject::MigrateSlowToFast(obj, 0, "cctest/test-hashcode");
   CheckFastObject(obj, hash);
diff --git a/deps/v8/test/cctest/test-local-handles.cc b/deps/v8/test/cctest/test-local-handles.cc
index bcc2ce7d5171be..90bee202c9bc98 100644
--- a/deps/v8/test/cctest/test-local-handles.cc
+++ b/deps/v8/test/cctest/test-local-handles.cc
@@ -8,12 +8,14 @@
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/semaphore.h"
+#include "src/common/assert-scope.h"
 #include "src/common/globals.h"
 #include "src/handles/handles-inl.h"
 #include "src/handles/local-handles-inl.h"
 #include "src/handles/local-handles.h"
 #include "src/heap/heap.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "src/heap/safepoint.h"
 #include "src/objects/heap-number.h"
 #include "test/cctest/cctest.h"
@@ -101,12 +103,9 @@ TEST(CreateLocalHandlesWithoutLocalHandleScope) {
   heap::EnsureFlagLocalHeapsEnabled();
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
+  HandleScope handle_scope(isolate);
 
-  {
-    LocalHeap local_heap(isolate->heap(), ThreadKind::kMain);
-    UnparkedScope scope(&local_heap);
-    handle(Smi::FromInt(17), &local_heap);
-  }
+  handle(Smi::FromInt(17), isolate->main_thread_local_heap());
 }
 
 TEST(DereferenceLocalHandle) {
@@ -124,11 +123,35 @@ TEST(DereferenceLocalHandle) {
     ph = phs->NewHandle(number);
   }
   {
-    LocalHeap local_heap(isolate->heap(), ThreadKind::kMain, std::move(phs));
+    LocalHeap local_heap(isolate->heap(), ThreadKind::kBackground,
+                         std::move(phs));
     UnparkedScope unparked_scope(&local_heap);
     LocalHandleScope scope(&local_heap);
     Handle<HeapNumber> local_number = handle(*ph, &local_heap);
     CHECK_EQ(42, local_number->value());
+  }
+}
+
+TEST(DereferenceLocalHandleFailsWhenDisallowed) {
+  heap::EnsureFlagLocalHeapsEnabled();
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+
+  // Create a PersistentHandle to create the LocalHandle, and thus not have a
+  // HandleScope present to override the LocalHandleScope.
+  std::unique_ptr<PersistentHandles> phs = isolate->NewPersistentHandles();
+  Handle<HeapNumber> ph;
+  {
+    HandleScope handle_scope(isolate);
+    Handle<HeapNumber> number = isolate->factory()->NewHeapNumber(42.0);
+    ph = phs->NewHandle(number);
+  }
+  {
+    LocalHeap local_heap(isolate->heap(), ThreadKind::kBackground,
+                         std::move(phs));
+    UnparkedScope unparked_scope(&local_heap);
+    LocalHandleScope scope(&local_heap);
+    Handle<HeapNumber> local_number = handle(*ph, &local_heap);
     DisallowHandleDereference disallow_scope;
     CHECK_EQ(42, local_number->value());
   }
diff --git a/deps/v8/test/cctest/test-lockers.cc b/deps/v8/test/cctest/test-lockers.cc
index c31dfd164ca76d..a2362651a54ae8 100644
--- a/deps/v8/test/cctest/test-lockers.cc
+++ b/deps/v8/test/cctest/test-lockers.cc
@@ -54,13 +54,15 @@ class DeoptimizeCodeThread : public v8::base::Thread {
   void Run() override {
     v8::Locker locker(isolate_);
     isolate_->Enter();
-    v8::HandleScope handle_scope(isolate_);
-    v8::Local<v8::Context> context =
-        v8::Local<v8::Context>::New(isolate_, context_);
-    v8::Context::Scope context_scope(context);
-    // This code triggers deoptimization of some function that will be
-    // used in a different thread.
-    CompileRun(source_);
+    {
+      v8::HandleScope handle_scope(isolate_);
+      v8::Local<v8::Context> context =
+          v8::Local<v8::Context>::New(isolate_, context_);
+      v8::Context::Scope context_scope(context);
+      // This code triggers deoptimization of some function that will be
+      // used in a different thread.
+      CompileRun(source_);
+    }
     isolate_->Exit();
   }
 
diff --git a/deps/v8/test/cctest/test-log-stack-tracer.cc b/deps/v8/test/cctest/test-log-stack-tracer.cc
index 854a31f66b9910..0f7b9a0fcc156b 100644
--- a/deps/v8/test/cctest/test-log-stack-tracer.cc
+++ b/deps/v8/test/cctest/test-log-stack-tracer.cc
@@ -44,21 +44,22 @@
 namespace v8 {
 namespace internal {
 
-static bool IsAddressWithinFuncCode(JSFunction function, void* addr) {
-  i::AbstractCode code = function.abstract_code();
+static bool IsAddressWithinFuncCode(JSFunction function, Isolate* isolate,
+                                    void* addr) {
+  i::AbstractCode code = function.abstract_code(isolate);
   return code.contains(reinterpret_cast<Address>(addr));
 }
 
 static bool IsAddressWithinFuncCode(v8::Local<v8::Context> context,
-                                    const char* func_name, void* addr) {
+                                    Isolate* isolate, const char* func_name,
+                                    void* addr) {
   v8::Local<v8::Value> func =
       context->Global()->Get(context, v8_str(func_name)).ToLocalChecked();
   CHECK(func->IsFunction());
   JSFunction js_func = JSFunction::cast(*v8::Utils::OpenHandle(*func));
-  return IsAddressWithinFuncCode(js_func, addr);
+  return IsAddressWithinFuncCode(js_func, isolate, addr);
 }
 
-
 // This C++ function is called as a constructor, to grab the frame pointer
 // from the calling function.  When this function runs, the stack contains
 // a C_Entry frame and a Construct frame above the calling function's frame.
@@ -177,9 +178,10 @@ TEST(CFromJSStackTrace) {
   unsigned base = 0;
   CHECK_GT(sample.frames_count, base + 1);
 
-  CHECK(IsAddressWithinFuncCode(
-      context, "JSFuncDoTrace", sample.stack[base + 0]));
-  CHECK(IsAddressWithinFuncCode(context, "JSTrace", sample.stack[base + 1]));
+  CHECK(IsAddressWithinFuncCode(context, CcTest::i_isolate(), "JSFuncDoTrace",
+                                sample.stack[base + 0]));
+  CHECK(IsAddressWithinFuncCode(context, CcTest::i_isolate(), "JSTrace",
+                                sample.stack[base + 1]));
 }
 
 
@@ -230,9 +232,10 @@ TEST(PureJSStackTrace) {
   // Stack sampling will start from the caller of JSFuncDoTrace, i.e. "JSTrace"
   unsigned base = 0;
   CHECK_GT(sample.frames_count, base + 1);
-  CHECK(IsAddressWithinFuncCode(context, "JSTrace", sample.stack[base + 0]));
-  CHECK(IsAddressWithinFuncCode(
-      context, "OuterJSTrace", sample.stack[base + 1]));
+  CHECK(IsAddressWithinFuncCode(context, CcTest::i_isolate(), "JSTrace",
+                                sample.stack[base + 0]));
+  CHECK(IsAddressWithinFuncCode(context, CcTest::i_isolate(), "OuterJSTrace",
+                                sample.stack[base + 1]));
 }
 
 static void CFuncDoTrace(byte dummy_param) {
diff --git a/deps/v8/test/cctest/test-log.cc b/deps/v8/test/cctest/test-log.cc
index 5909ffaf961a2a..247735ab398e7b 100644
--- a/deps/v8/test/cctest/test-log.cc
+++ b/deps/v8/test/cctest/test-log.cc
@@ -65,7 +65,7 @@ static std::vector<std::string> Split(const std::string& s, char delimiter) {
   return result;
 }
 
-class ScopedLoggerInitializer {
+class V8_NODISCARD ScopedLoggerInitializer {
  public:
   explicit ScopedLoggerInitializer(v8::Isolate* isolate)
       : temp_file_(nullptr),
@@ -299,8 +299,7 @@ TEST(Issue23768) {
   // Script needs to have a name in order to trigger InitLineEnds execution.
   v8::Local<v8::String> origin =
       v8::String::NewFromUtf8Literal(CcTest::isolate(), "issue-23768-test");
-  v8::Local<v8::Script> evil_script =
-      CompileWithOrigin(source, origin, v8_bool(false));
+  v8::Local<v8::Script> evil_script = CompileWithOrigin(source, origin, false);
   CHECK(!evil_script.IsEmpty());
   CHECK(!evil_script->Run(env).IsEmpty());
   i::Handle<i::ExternalTwoByteString> i_source(
@@ -856,7 +855,7 @@ void ValidateMapDetailsLogging(v8::Isolate* isolate,
   // Iterate over all maps on the heap.
   i::Heap* heap = reinterpret_cast<i::Isolate*>(isolate)->heap();
   i::HeapObjectIterator iterator(heap);
-  i::DisallowHeapAllocation no_gc;
+  i::DisallowGarbageCollection no_gc;
   size_t i = 0;
   for (i::HeapObject obj = iterator.Next(); !obj.is_null();
        obj = iterator.Next()) {
diff --git a/deps/v8/test/cctest/test-macro-assembler-arm.cc b/deps/v8/test/cctest/test-macro-assembler-arm.cc
index be7345d3e21a8d..2274bab01a560a 100644
--- a/deps/v8/test/cctest/test-macro-assembler-arm.cc
+++ b/deps/v8/test/cctest/test-macro-assembler-arm.cc
@@ -322,14 +322,24 @@ TEST(DeoptExitSizeIsFixed) {
   STATIC_ASSERT(static_cast<int>(kFirstDeoptimizeKind) == 0);
   for (int i = 0; i < kDeoptimizeKindCount; i++) {
     DeoptimizeKind kind = static_cast<DeoptimizeKind>(i);
-    Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(isolate, kind);
     Label before_exit;
     masm.bind(&before_exit);
-    masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit);
-    CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
-             kind == DeoptimizeKind::kLazy
-                 ? Deoptimizer::kLazyDeoptExitSize
-                 : Deoptimizer::kNonLazyDeoptExitSize);
+    if (kind == DeoptimizeKind::kEagerWithResume) {
+      Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
+          DeoptimizeReason::kDynamicCheckMaps);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    } else {
+      Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(kind);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               kind == DeoptimizeKind::kLazy
+                   ? Deoptimizer::kLazyDeoptExitSize
+                   : Deoptimizer::kNonLazyDeoptExitSize);
+    }
   }
 }
 
diff --git a/deps/v8/test/cctest/test-macro-assembler-arm64.cc b/deps/v8/test/cctest/test-macro-assembler-arm64.cc
index 0c231ae0a0e2f8..31fc1fae120a1d 100644
--- a/deps/v8/test/cctest/test-macro-assembler-arm64.cc
+++ b/deps/v8/test/cctest/test-macro-assembler-arm64.cc
@@ -103,20 +103,31 @@ TEST(DeoptExitSizeIsFixed) {
   STATIC_ASSERT(static_cast<int>(kFirstDeoptimizeKind) == 0);
   for (int i = 0; i < kDeoptimizeKindCount; i++) {
     DeoptimizeKind kind = static_cast<DeoptimizeKind>(i);
-    Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(isolate, kind);
     Label before_exit;
-    // Mirroring logic in code-generator.cc.
-    if (kind == DeoptimizeKind::kLazy) {
-      // CFI emits an extra instruction here.
-      masm.BindExceptionHandler(&before_exit);
-    } else {
+    if (kind == DeoptimizeKind::kEagerWithResume) {
       masm.bind(&before_exit);
+      Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
+          DeoptimizeReason::kDynamicCheckMaps);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 &before_exit);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    } else {
+      Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(kind);
+      // Mirroring logic in code-generator.cc.
+      if (kind == DeoptimizeKind::kLazy) {
+        // CFI emits an extra instruction here.
+        masm.BindExceptionHandler(&before_exit);
+      } else {
+        masm.bind(&before_exit);
+      }
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 &before_exit);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               kind == DeoptimizeKind::kLazy
+                   ? Deoptimizer::kLazyDeoptExitSize
+                   : Deoptimizer::kNonLazyDeoptExitSize);
     }
-    masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit);
-    CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
-             kind == DeoptimizeKind::kLazy
-                 ? Deoptimizer::kLazyDeoptExitSize
-                 : Deoptimizer::kNonLazyDeoptExitSize);
   }
 }
 
diff --git a/deps/v8/test/cctest/test-macro-assembler-mips.cc b/deps/v8/test/cctest/test-macro-assembler-mips.cc
index 2af03129784396..a149c0cca98b4a 100644
--- a/deps/v8/test/cctest/test-macro-assembler-mips.cc
+++ b/deps/v8/test/cctest/test-macro-assembler-mips.cc
@@ -30,7 +30,9 @@
 
 #include "src/api/api-inl.h"
 #include "src/base/utils/random-number-generator.h"
+#include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
+#include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/simulator.h"
 #include "src/init/v8.h"
 #include "src/objects/heap-number.h"
@@ -38,6 +40,7 @@
 #include "src/objects/objects-inl.h"
 #include "src/utils/ostreams.h"
 #include "test/cctest/cctest.h"
+#include "test/common/assembler-tester.h"
 
 namespace v8 {
 namespace internal {
@@ -1332,6 +1335,38 @@ TEST(macro_float_minmax_f64) {
 #undef CHECK_MINMAX
 }
 
+TEST(DeoptExitSizeIsFixed) {
+  CHECK(Deoptimizer::kSupportsFixedDeoptExitSizes);
+
+  Isolate* isolate = CcTest::i_isolate();
+  HandleScope handles(isolate);
+  auto buffer = AllocateAssemblerBuffer();
+  MacroAssembler masm(isolate, v8::internal::CodeObjectRequired::kYes,
+                      buffer->CreateView());
+  STATIC_ASSERT(static_cast<int>(kFirstDeoptimizeKind) == 0);
+  for (int i = 0; i < kDeoptimizeKindCount; i++) {
+    DeoptimizeKind kind = static_cast<DeoptimizeKind>(i);
+    Label before_exit;
+    masm.bind(&before_exit);
+    if (kind == DeoptimizeKind::kEagerWithResume) {
+      Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
+          DeoptimizeReason::kDynamicCheckMaps);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    } else {
+      Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(kind);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               kind == DeoptimizeKind::kLazy
+                   ? Deoptimizer::kLazyDeoptExitSize
+                   : Deoptimizer::kNonLazyDeoptExitSize);
+    }
+  }
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/test/cctest/test-macro-assembler-mips64.cc b/deps/v8/test/cctest/test-macro-assembler-mips64.cc
index b10952dd7a3c14..4b91b5b0e963dd 100644
--- a/deps/v8/test/cctest/test-macro-assembler-mips64.cc
+++ b/deps/v8/test/cctest/test-macro-assembler-mips64.cc
@@ -28,15 +28,15 @@
 #include <stdlib.h>
 #include <iostream>  // NOLINT(readability/streams)
 
-#include "src/init/v8.h"
-#include "test/cctest/cctest.h"
-
-#include "src/base/utils/random-number-generator.h"
+#include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
+#include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/simulator.h"
-#include "src/objects/heap-number.h"
-#include "src/utils/ostreams.h"
+#include "src/init/v8.h"
 #include "src/objects/objects-inl.h"
+#include "src/utils/ostreams.h"
+#include "test/cctest/cctest.h"
+#include "test/common/assembler-tester.h"
 
 namespace v8 {
 namespace internal {
@@ -1687,6 +1687,38 @@ TEST(macro_float_minmax_f64) {
 #undef CHECK_MINMAX
 }
 
+TEST(DeoptExitSizeIsFixed) {
+  CHECK(Deoptimizer::kSupportsFixedDeoptExitSizes);
+
+  Isolate* isolate = CcTest::i_isolate();
+  HandleScope handles(isolate);
+  auto buffer = AllocateAssemblerBuffer();
+  MacroAssembler masm(isolate, v8::internal::CodeObjectRequired::kYes,
+                      buffer->CreateView());
+  STATIC_ASSERT(static_cast<int>(kFirstDeoptimizeKind) == 0);
+  for (int i = 0; i < kDeoptimizeKindCount; i++) {
+    DeoptimizeKind kind = static_cast<DeoptimizeKind>(i);
+    Label before_exit;
+    masm.bind(&before_exit);
+    if (kind == DeoptimizeKind::kEagerWithResume) {
+      Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
+          DeoptimizeReason::kDynamicCheckMaps);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    } else {
+      Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(kind);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               kind == DeoptimizeKind::kLazy
+                   ? Deoptimizer::kLazyDeoptExitSize
+                   : Deoptimizer::kNonLazyDeoptExitSize);
+    }
+  }
+}
+
 #undef __
 
 }  // namespace internal
diff --git a/deps/v8/test/cctest/test-macro-assembler-x64.cc b/deps/v8/test/cctest/test-macro-assembler-x64.cc
index c5001f5b91423d..add41dbbb0c33c 100644
--- a/deps/v8/test/cctest/test-macro-assembler-x64.cc
+++ b/deps/v8/test/cctest/test-macro-assembler-x64.cc
@@ -1045,14 +1045,24 @@ TEST(DeoptExitSizeIsFixed) {
   STATIC_ASSERT(static_cast<int>(kFirstDeoptimizeKind) == 0);
   for (int i = 0; i < kDeoptimizeKindCount; i++) {
     DeoptimizeKind kind = static_cast<DeoptimizeKind>(i);
-    Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(isolate, kind);
     Label before_exit;
     masm.bind(&before_exit);
-    masm.CallForDeoptimization(target, 42, &before_exit, kind, nullptr);
-    CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
-             kind == DeoptimizeKind::kLazy
-                 ? Deoptimizer::kLazyDeoptExitSize
-                 : Deoptimizer::kNonLazyDeoptExitSize);
+    if (kind == DeoptimizeKind::kEagerWithResume) {
+      Builtins::Name target = Deoptimizer::GetDeoptWithResumeBuiltin(
+          DeoptimizeReason::kDynamicCheckMaps);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               Deoptimizer::kEagerWithResumeBeforeArgsSize);
+    } else {
+      Builtins::Name target = Deoptimizer::GetDeoptimizationEntry(kind);
+      masm.CallForDeoptimization(target, 42, &before_exit, kind, &before_exit,
+                                 nullptr);
+      CHECK_EQ(masm.SizeOfCodeGeneratedSince(&before_exit),
+               kind == DeoptimizeKind::kLazy
+                   ? Deoptimizer::kLazyDeoptExitSize
+                   : Deoptimizer::kNonLazyDeoptExitSize);
+    }
   }
 }
 
diff --git a/deps/v8/test/cctest/test-modules.cc b/deps/v8/test/cctest/test-modules.cc
index 65abf2ab4fb6e6..3f4b94962cf554 100644
--- a/deps/v8/test/cctest/test-modules.cc
+++ b/deps/v8/test/cctest/test-modules.cc
@@ -9,11 +9,16 @@
 namespace {
 
 using v8::Context;
+using v8::Data;
+using v8::FixedArray;
 using v8::HandleScope;
+using v8::Int32;
 using v8::Isolate;
 using v8::Local;
+using v8::Location;
 using v8::MaybeLocal;
 using v8::Module;
+using v8::ModuleRequest;
 using v8::Promise;
 using v8::ScriptCompiler;
 using v8::ScriptOrigin;
@@ -21,10 +26,8 @@ using v8::String;
 using v8::Value;
 
 ScriptOrigin ModuleOrigin(Local<v8::Value> resource_name, Isolate* isolate) {
-  ScriptOrigin origin(resource_name, Local<v8::Integer>(), Local<v8::Integer>(),
-                      Local<v8::Boolean>(), Local<v8::Integer>(),
-                      Local<v8::Value>(), Local<v8::Boolean>(),
-                      Local<v8::Boolean>(), True(isolate));
+  ScriptOrigin origin(resource_name, 0, 0, false, -1, Local<v8::Value>(), false,
+                      false, true);
   return origin;
 }
 
@@ -32,7 +35,9 @@ static Local<Module> dep1;
 static Local<Module> dep2;
 MaybeLocal<Module> ResolveCallback(Local<Context> context,
                                    Local<String> specifier,
+                                   Local<FixedArray> import_assertions,
                                    Local<Module> referrer) {
+  CHECK_EQ(0, import_assertions->Length());
   Isolate* isolate = CcTest::isolate();
   if (specifier->StrictEquals(v8_str("./dep1.js"))) {
     return dep1;
@@ -62,15 +67,27 @@ TEST(ModuleInstantiationFailures1) {
       ScriptCompiler::Source source(source_text, origin);
       module = ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
       CHECK_EQ(Module::kUninstantiated, module->GetStatus());
-      CHECK_EQ(2, module->GetModuleRequestsLength());
-      CHECK(v8_str("./foo.js")->StrictEquals(module->GetModuleRequest(0)));
-      v8::Location loc = module->GetModuleRequestLocation(0);
+      Local<FixedArray> module_requests = module->GetModuleRequests();
+      CHECK_EQ(2, module_requests->Length());
+      Local<ModuleRequest> module_request_0 =
+          module_requests->Get(env.local(), 0).As<ModuleRequest>();
+      CHECK(v8_str("./foo.js")->StrictEquals(module_request_0->GetSpecifier()));
+      int offset = module_request_0->GetSourceOffset();
+      CHECK_EQ(7, offset);
+      Location loc = module->SourceOffsetToLocation(offset);
       CHECK_EQ(0, loc.GetLineNumber());
       CHECK_EQ(7, loc.GetColumnNumber());
-      CHECK(v8_str("./bar.js")->StrictEquals(module->GetModuleRequest(1)));
-      loc = module->GetModuleRequestLocation(1);
+      CHECK_EQ(0, module_request_0->GetImportAssertions()->Length());
+
+      Local<ModuleRequest> module_request_1 =
+          module_requests->Get(env.local(), 1).As<ModuleRequest>();
+      CHECK(v8_str("./bar.js")->StrictEquals(module_request_1->GetSpecifier()));
+      offset = module_request_1->GetSourceOffset();
+      CHECK_EQ(34, offset);
+      loc = module->SourceOffsetToLocation(offset);
       CHECK_EQ(1, loc.GetLineNumber());
       CHECK_EQ(15, loc.GetColumnNumber());
+      CHECK_EQ(0, module_request_1->GetImportAssertions()->Length());
     }
 
     // Instantiation should fail.
@@ -116,6 +133,216 @@ TEST(ModuleInstantiationFailures1) {
   i::FLAG_harmony_top_level_await = prev_top_level_await;
 }
 
+static Local<Module> fooModule;
+static Local<Module> barModule;
+MaybeLocal<Module> ResolveCallbackWithImportAssertions(
+    Local<Context> context, Local<String> specifier,
+    Local<FixedArray> import_assertions, Local<Module> referrer) {
+  Isolate* isolate = CcTest::isolate();
+  LocalContext env;
+
+  if (specifier->StrictEquals(v8_str("./foo.js"))) {
+    CHECK_EQ(0, import_assertions->Length());
+
+    return fooModule;
+  } else if (specifier->StrictEquals(v8_str("./bar.js"))) {
+    CHECK_EQ(3, import_assertions->Length());
+    Local<String> assertion_key =
+        import_assertions->Get(context, 0).As<Value>().As<String>();
+    CHECK(v8_str("a")->StrictEquals(assertion_key));
+    Local<String> assertion_value =
+        import_assertions->Get(context, 1).As<Value>().As<String>();
+    CHECK(v8_str("b")->StrictEquals(assertion_value));
+    Local<Data> assertion_source_offset_object =
+        import_assertions->Get(context, 2);
+    Local<Int32> assertion_source_offset_int32 =
+        assertion_source_offset_object.As<Value>()
+            ->ToInt32(context)
+            .ToLocalChecked();
+    int32_t assertion_source_offset = assertion_source_offset_int32->Value();
+    CHECK_EQ(65, assertion_source_offset);
+    Location loc = referrer->SourceOffsetToLocation(assertion_source_offset);
+    CHECK_EQ(1, loc.GetLineNumber());
+    CHECK_EQ(35, loc.GetColumnNumber());
+
+    return barModule;
+  } else {
+    isolate->ThrowException(v8_str("boom"));
+    return MaybeLocal<Module>();
+  }
+}
+
+TEST(ModuleInstantiationWithImportAssertions) {
+  bool prev_top_level_await = i::FLAG_harmony_top_level_await;
+  bool prev_import_assertions = i::FLAG_harmony_import_assertions;
+  i::FLAG_harmony_import_assertions = true;
+
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  create_params.supported_import_assertions = {"extra0", "a", "extra1"};
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
+
+  for (auto top_level_await : {true, false}) {
+    i::FLAG_harmony_top_level_await = top_level_await;
+    v8::Isolate::Scope isolate_scope(isolate);
+    HandleScope scope(isolate);
+    Local<v8::Context> context = v8::Context::New(isolate);
+    v8::Context::Scope context_scope(context);
+    v8::TryCatch try_catch(isolate);
+
+    Local<Module> module;
+    {
+      Local<String> source_text = v8_str(
+          "import './foo.js' assert { };\n"
+          "export {} from './bar.js' assert { a: 'b', c: 'd' };");
+      ScriptOrigin origin = ModuleOrigin(v8_str("file.js"), CcTest::isolate());
+      ScriptCompiler::Source source(source_text, origin);
+      module = ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
+      CHECK_EQ(Module::kUninstantiated, module->GetStatus());
+      Local<FixedArray> module_requests = module->GetModuleRequests();
+      CHECK_EQ(2, module_requests->Length());
+      Local<ModuleRequest> module_request_0 =
+          module_requests->Get(context, 0).As<ModuleRequest>();
+      CHECK(v8_str("./foo.js")->StrictEquals(module_request_0->GetSpecifier()));
+      int offset = module_request_0->GetSourceOffset();
+      CHECK_EQ(7, offset);
+      Location loc = module->SourceOffsetToLocation(offset);
+      CHECK_EQ(0, loc.GetLineNumber());
+      CHECK_EQ(7, loc.GetColumnNumber());
+      CHECK_EQ(0, module_request_0->GetImportAssertions()->Length());
+
+      Local<ModuleRequest> module_request_1 =
+          module_requests->Get(context, 1).As<ModuleRequest>();
+      CHECK(v8_str("./bar.js")->StrictEquals(module_request_1->GetSpecifier()));
+      offset = module_request_1->GetSourceOffset();
+      CHECK_EQ(45, offset);
+      loc = module->SourceOffsetToLocation(offset);
+      CHECK_EQ(1, loc.GetLineNumber());
+      CHECK_EQ(15, loc.GetColumnNumber());
+
+      Local<FixedArray> import_assertions_1 =
+          module_request_1->GetImportAssertions();
+      CHECK_EQ(3, import_assertions_1->Length());
+      Local<String> assertion_key =
+          import_assertions_1->Get(context, 0).As<String>();
+      CHECK(v8_str("a")->StrictEquals(assertion_key));
+      Local<String> assertion_value =
+          import_assertions_1->Get(context, 1).As<String>();
+      CHECK(v8_str("b")->StrictEquals(assertion_value));
+      int32_t assertion_source_offset =
+          import_assertions_1->Get(context, 2).As<Int32>()->Value();
+      CHECK_EQ(65, assertion_source_offset);
+      loc = module->SourceOffsetToLocation(assertion_source_offset);
+      CHECK_EQ(1, loc.GetLineNumber());
+      CHECK_EQ(35, loc.GetColumnNumber());
+    }
+
+    // foo.js
+    {
+      Local<String> source_text = v8_str("Object.expando = 40");
+      ScriptOrigin origin = ModuleOrigin(v8_str("foo.js"), CcTest::isolate());
+      ScriptCompiler::Source source(source_text, origin);
+      fooModule =
+          ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
+    }
+
+    // bar.js
+    {
+      Local<String> source_text = v8_str("Object.expando += 2");
+      ScriptOrigin origin = ModuleOrigin(v8_str("bar.js"), CcTest::isolate());
+      ScriptCompiler::Source source(source_text, origin);
+      barModule =
+          ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
+    }
+
+    CHECK(
+        module->InstantiateModule(context, ResolveCallbackWithImportAssertions)
+            .FromJust());
+    CHECK_EQ(Module::kInstantiated, module->GetStatus());
+
+    MaybeLocal<Value> result = module->Evaluate(context);
+    CHECK_EQ(Module::kEvaluated, module->GetStatus());
+    if (i::FLAG_harmony_top_level_await) {
+      Local<Promise> promise = Local<Promise>::Cast(result.ToLocalChecked());
+      CHECK_EQ(promise->State(), v8::Promise::kFulfilled);
+      CHECK(promise->Result()->IsUndefined());
+    } else {
+      CHECK(!result.IsEmpty());
+      ExpectInt32("Object.expando", 42);
+    }
+    CHECK(!try_catch.HasCaught());
+  }
+
+  isolate->Dispose();
+  i::FLAG_harmony_top_level_await = prev_top_level_await;
+  i::FLAG_harmony_import_assertions = prev_import_assertions;
+}
+
+TEST(ModuleInstantiationWithImportAssertionsWithoutSupportedAssertions) {
+  bool prev_top_level_await = i::FLAG_harmony_top_level_await;
+  bool prev_import_assertions = i::FLAG_harmony_import_assertions;
+  i::FLAG_harmony_import_assertions = true;
+  for (auto top_level_await : {true, false}) {
+    i::FLAG_harmony_top_level_await = top_level_await;
+    Isolate* isolate = CcTest::isolate();
+    HandleScope scope(isolate);
+    LocalContext env;
+    v8::TryCatch try_catch(isolate);
+
+    Local<Module> module;
+    {
+      Local<String> source_text =
+          v8_str("import './foo.js' assert { a: 'b' };");
+      ScriptOrigin origin = ModuleOrigin(v8_str("file.js"), CcTest::isolate());
+      ScriptCompiler::Source source(source_text, origin);
+      module = ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
+      CHECK_EQ(Module::kUninstantiated, module->GetStatus());
+      Local<FixedArray> module_requests = module->GetModuleRequests();
+      CHECK_EQ(1, module_requests->Length());
+      Local<ModuleRequest> module_request_0 =
+          module_requests->Get(env.local(), 0).As<ModuleRequest>();
+      CHECK(v8_str("./foo.js")->StrictEquals(module_request_0->GetSpecifier()));
+      int offset = module_request_0->GetSourceOffset();
+      CHECK_EQ(7, offset);
+      Location loc = module->SourceOffsetToLocation(offset);
+      CHECK_EQ(0, loc.GetLineNumber());
+      CHECK_EQ(7, loc.GetColumnNumber());
+      // No supported assertions were provided in the Isolate's CreateParams, so
+      // no import assertions should be visible on the API surface.
+      CHECK_EQ(0, module_request_0->GetImportAssertions()->Length());
+    }
+
+    // foo.js
+    {
+      Local<String> source_text = v8_str("Object.expando = 40");
+      ScriptOrigin origin = ModuleOrigin(v8_str("foo.js"), CcTest::isolate());
+      ScriptCompiler::Source source(source_text, origin);
+      fooModule =
+          ScriptCompiler::CompileModule(isolate, &source).ToLocalChecked();
+    }
+
+    CHECK(module
+              ->InstantiateModule(env.local(),
+                                  ResolveCallbackWithImportAssertions)
+              .FromJust());
+    CHECK_EQ(Module::kInstantiated, module->GetStatus());
+
+    MaybeLocal<Value> result = module->Evaluate(env.local());
+    CHECK_EQ(Module::kEvaluated, module->GetStatus());
+    if (i::FLAG_harmony_top_level_await) {
+      Local<Promise> promise = Local<Promise>::Cast(result.ToLocalChecked());
+      CHECK_EQ(promise->State(), v8::Promise::kFulfilled);
+      CHECK(promise->Result()->IsUndefined());
+    } else {
+      CHECK(!result.IsEmpty());
+      ExpectInt32("Object.expando", 40);
+    }
+    CHECK(!try_catch.HasCaught());
+  }
+  i::FLAG_harmony_top_level_await = prev_top_level_await;
+  i::FLAG_harmony_import_assertions = prev_import_assertions;
+}
+
 TEST(ModuleInstantiationFailures2) {
   bool prev_top_level_await = i::FLAG_harmony_top_level_await;
   for (auto top_level_await : {true, false}) {
@@ -202,7 +429,9 @@ TEST(ModuleInstantiationFailures2) {
 }
 
 static MaybeLocal<Module> CompileSpecifierAsModuleResolveCallback(
-    Local<Context> context, Local<String> specifier, Local<Module> referrer) {
+    Local<Context> context, Local<String> specifier,
+    Local<FixedArray> import_assertions, Local<Module> referrer) {
+  CHECK_EQ(0, import_assertions->Length());
   ScriptOrigin origin = ModuleOrigin(v8_str("module.js"), CcTest::isolate());
   ScriptCompiler::Source source(specifier, origin);
   return ScriptCompiler::CompileModule(CcTest::isolate(), &source)
@@ -236,7 +465,7 @@ TEST(ModuleEvaluation) {
     MaybeLocal<Value> result = module->Evaluate(env.local());
     CHECK_EQ(Module::kEvaluated, module->GetStatus());
     if (i::FLAG_harmony_top_level_await) {
-      Local<Promise> promise = Local<Promise>::Cast(result.ToLocalChecked());
+      Local<Promise> promise = result.ToLocalChecked().As<Promise>();
       CHECK_EQ(promise->State(), v8::Promise::kFulfilled);
       CHECK(promise->Result()->IsUndefined());
     } else {
@@ -283,7 +512,7 @@ TEST(ModuleEvaluationError1) {
         // With top level await, we do not throw and errored evaluation returns
         // a rejected promise with the exception.
         CHECK(!inner_try_catch.HasCaught());
-        Local<Promise> promise = Local<Promise>::Cast(result.ToLocalChecked());
+        Local<Promise> promise = result.ToLocalChecked().As<Promise>();
         CHECK_EQ(promise->State(), v8::Promise::kRejected);
         CHECK_EQ(promise->Result(), module->GetException());
       } else {
@@ -305,7 +534,7 @@ TEST(ModuleEvaluationError1) {
         // With top level await, we do not throw and errored evaluation returns
         // a rejected promise with the exception.
         CHECK(!inner_try_catch.HasCaught());
-        Local<Promise> promise = Local<Promise>::Cast(result.ToLocalChecked());
+        Local<Promise> promise = result.ToLocalChecked().As<Promise>();
         CHECK_EQ(promise->State(), v8::Promise::kRejected);
         CHECK_EQ(promise->Result(), module->GetException());
       } else {
@@ -323,7 +552,9 @@ TEST(ModuleEvaluationError1) {
 static Local<Module> failure_module;
 static Local<Module> dependent_module;
 MaybeLocal<Module> ResolveCallbackForModuleEvaluationError2(
-    Local<Context> context, Local<String> specifier, Local<Module> referrer) {
+    Local<Context> context, Local<String> specifier,
+    Local<FixedArray> import_assertions, Local<Module> referrer) {
+  CHECK_EQ(0, import_assertions->Length());
   if (specifier->StrictEquals(v8_str("./failure.js"))) {
     return failure_module;
   } else {
@@ -366,7 +597,7 @@ TEST(ModuleEvaluationError2) {
         // With top level await, we do not throw and errored evaluation returns
         // a rejected promise with the exception.
         CHECK(!inner_try_catch.HasCaught());
-        Local<Promise> promise = Local<Promise>::Cast(result.ToLocalChecked());
+        Local<Promise> promise = result.ToLocalChecked().As<Promise>();
         CHECK_EQ(promise->State(), v8::Promise::kRejected);
         CHECK_EQ(promise->Result(), failure_module->GetException());
       } else {
@@ -402,7 +633,7 @@ TEST(ModuleEvaluationError2) {
         // With top level await, we do not throw and errored evaluation returns
         // a rejected promise with the exception.
         CHECK(!inner_try_catch.HasCaught());
-        Local<Promise> promise = Local<Promise>::Cast(result.ToLocalChecked());
+        Local<Promise> promise = result.ToLocalChecked().As<Promise>();
         CHECK_EQ(promise->State(), v8::Promise::kRejected);
         CHECK_EQ(promise->Result(), failure_module->GetException());
       } else {
@@ -467,12 +698,12 @@ TEST(ModuleEvaluationCompletion1) {
       CHECK_EQ(Module::kEvaluated, module->GetStatus());
 
       if (i::FLAG_harmony_top_level_await) {
-        Local<Promise> promise = Local<Promise>::Cast(result_1);
+        Local<Promise> promise = result_1.As<Promise>();
         CHECK_EQ(promise->State(), v8::Promise::kFulfilled);
         CHECK(promise->Result()->IsUndefined());
 
         // Second evaluation should return the same promise.
-        Local<Promise> promise_too = Local<Promise>::Cast(result_2);
+        Local<Promise> promise_too = result_2.As<Promise>();
         CHECK_EQ(promise, promise_too);
         CHECK_EQ(promise_too->State(), v8::Promise::kFulfilled);
         CHECK(promise_too->Result()->IsUndefined());
@@ -534,12 +765,12 @@ TEST(ModuleEvaluationCompletion2) {
       Local<Value> result_2 = module->Evaluate(env.local()).ToLocalChecked();
       CHECK_EQ(Module::kEvaluated, module->GetStatus());
       if (i::FLAG_harmony_top_level_await) {
-        Local<Promise> promise = Local<Promise>::Cast(result_1);
+        Local<Promise> promise = result_1.As<Promise>();
         CHECK_EQ(promise->State(), v8::Promise::kFulfilled);
         CHECK(promise->Result()->IsUndefined());
 
         // Second Evaluation should return the same promise.
-        Local<Promise> promise_too = Local<Promise>::Cast(result_2);
+        Local<Promise> promise_too = result_2.As<Promise>();
         CHECK_EQ(promise, promise_too);
         CHECK_EQ(promise_too->State(), v8::Promise::kFulfilled);
         CHECK(promise_too->Result()->IsUndefined());
@@ -993,7 +1224,9 @@ static Local<Module> cycle_self_module;
 static Local<Module> cycle_one_module;
 static Local<Module> cycle_two_module;
 MaybeLocal<Module> ResolveCallbackForIsGraphAsyncTopLevelAwait(
-    Local<Context> context, Local<String> specifier, Local<Module> referrer) {
+    Local<Context> context, Local<String> specifier,
+    Local<FixedArray> import_assertions, Local<Module> referrer) {
+  CHECK_EQ(0, import_assertions->Length());
   if (specifier->StrictEquals(v8_str("./async_leaf.js"))) {
     return async_leaf_module;
   } else if (specifier->StrictEquals(v8_str("./sync_leaf.js"))) {
diff --git a/deps/v8/test/cctest/test-parsing.cc b/deps/v8/test/cctest/test-parsing.cc
index 1076a672140d0d..e50c1198d30b9d 100644
--- a/deps/v8/test/cctest/test-parsing.cc
+++ b/deps/v8/test/cctest/test-parsing.cc
@@ -978,7 +978,7 @@ void TestScanRegExp(const char* re_source, const char* expected) {
       scanner.CurrentSymbol(&ast_value_factory);
   ast_value_factory.Internalize(CcTest::i_isolate());
   i::Handle<i::String> val = current_symbol->string();
-  i::DisallowHeapAllocation no_alloc;
+  i::DisallowGarbageCollection no_alloc;
   i::String::FlatContent content = val->GetFlatContent(no_alloc);
   CHECK(content.IsOneByte());
   i::Vector<const uint8_t> actual = content.ToOneByteVector();
@@ -1619,7 +1619,6 @@ const char* ReadString(unsigned* start) {
 enum ParserFlag {
   kAllowLazy,
   kAllowNatives,
-  kAllowHarmonyPrivateMethods,
   kAllowHarmonyLogicalAssignment,
 };
 
@@ -1631,7 +1630,6 @@ enum ParserSyncTestResult {
 
 void SetGlobalFlags(base::EnumSet<ParserFlag> flags) {
   i::FLAG_allow_natives_syntax = flags.contains(kAllowNatives);
-  i::FLAG_harmony_private_methods = flags.contains(kAllowHarmonyPrivateMethods);
   i::FLAG_harmony_logical_assignment =
       flags.contains(kAllowHarmonyLogicalAssignment);
 }
@@ -1639,8 +1637,6 @@ void SetGlobalFlags(base::EnumSet<ParserFlag> flags) {
 void SetParserFlags(i::UnoptimizedCompileFlags* compile_flags,
                     base::EnumSet<ParserFlag> flags) {
   compile_flags->set_allow_natives_syntax(flags.contains(kAllowNatives));
-  compile_flags->set_allow_harmony_private_methods(
-      flags.contains(kAllowHarmonyPrivateMethods));
   compile_flags->set_allow_harmony_logical_assignment(
       flags.contains(kAllowHarmonyLogicalAssignment));
 }
@@ -4858,6 +4854,35 @@ TEST(ImportExpressionSuccess) {
   RunModuleParserSyncTest(context_data, data, kSuccess);
 }
 
+TEST(ImportExpressionWithImportAssertionSuccess) {
+  i::FLAG_harmony_import_assertions = true;
+
+  // clang-format off
+  const char* context_data[][2] = {
+    {"", ""},
+    {nullptr, nullptr}
+  };
+
+  const char* data[] = {
+    "import(x,)",
+    "import(x,1)",
+    "import(x,y)",
+    "import(x,y,)",
+    "import(x, { 'a': 'b' })",
+    "import(x, { a: 'b', 'c': 'd' },)",
+    "import(x, { 'a': { b: 'c' }, 'd': 'e' },)",
+    "import(x,import(y))",
+    "import(x,y=z)",
+    "import(x,[y, z])",
+    "import(x,undefined)",
+    nullptr
+  };
+
+  // clang-format on
+  RunParserSyncTest(context_data, data, kSuccess);
+  RunModuleParserSyncTest(context_data, data, kSuccess);
+}
+
 TEST(ImportExpressionErrors) {
   {
     // clang-format off
@@ -4929,9 +4954,6 @@ TEST(ImportExpressionErrors) {
     // clang-format on
     RunParserSyncTest(context_data, data, kError);
     RunModuleParserSyncTest(context_data, data, kError);
-
-    RunParserSyncTest(context_data, data, kError);
-    RunModuleParserSyncTest(context_data, data, kError);
   }
 
   // Import statements as arrow function params and destructuring targets.
@@ -4959,7 +4981,81 @@ TEST(ImportExpressionErrors) {
     // clang-format on
     RunParserSyncTest(context_data, data, kError);
     RunModuleParserSyncTest(context_data, data, kError);
+  }
+}
+
+TEST(ImportExpressionWithImportAssertionErrors) {
+  {
+    i::FLAG_harmony_import_assertions = true;
+
+    // clang-format off
+    const char* context_data[][2] = {
+      {"", ""},
+      {"var ", ""},
+      {"let ", ""},
+      {"new ", ""},
+      {nullptr, nullptr}
+    };
+
+    const char* data[] = {
+      "import(x,,)",
+      "import(x))",
+      "import(x,))",
+      "import(x,())",
+      "import(x,y,,)",
+      "import(x,y,z)",
+      "import(x,y",
+      "import(x,y,",
+      "import(x,y(",
+      nullptr
+    };
+
+    // clang-format on
+    RunParserSyncTest(context_data, data, kError);
+    RunModuleParserSyncTest(context_data, data, kError);
+  }
+
+  {
+    // clang-format off
+    const char* context_data[][2] = {
+      {"var ", ""},
+      {"let ", ""},
+      {nullptr, nullptr}
+    };
+
+    const char* data[] = {
+      "import('x',y)",
+      nullptr
+    };
+
+    // clang-format on
+    RunParserSyncTest(context_data, data, kError);
+    RunModuleParserSyncTest(context_data, data, kError);
+  }
+
+  // Import statements as arrow function params and destructuring targets.
+  {
+    // clang-format off
+    const char* context_data[][2] = {
+      {"(", ") => {}"},
+      {"(a, ", ") => {}"},
+      {"(1, ", ") => {}"},
+      {"let f = ", " => {}"},
+      {"[", "] = [1];"},
+      {"{", "} = {'a': 1};"},
+      {nullptr, nullptr}
+    };
+
+    const char* data[] = {
+      "import(foo,y)",
+      "import(1,y)",
+      "import(y=x,z)",
+      "import(import(x),y)",
+      "import(x,y).then()",
+      nullptr
+    };
 
+    // clang-format on
     RunParserSyncTest(context_data, data, kError);
     RunModuleParserSyncTest(context_data, data, kError);
   }
@@ -5697,11 +5793,7 @@ TEST(PrivateMethodsNoErrors) {
   };
   // clang-format on
 
-  RunParserSyncTest(context_data, class_body_data, kError);
-
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kSuccess, nullptr, 0,
-                    private_methods, arraysize(private_methods));
+  RunParserSyncTest(context_data, class_body_data, kSuccess);
 }
 
 TEST(PrivateMethodsAndFieldsNoErrors) {
@@ -5755,13 +5847,7 @@ TEST(PrivateMethodsAndFieldsNoErrors) {
   };
   // clang-format on
 
-  RunParserSyncTest(context_data, class_body_data, kError);
-
-  static const ParserFlag private_methods_and_fields[] = {
-      kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kSuccess, nullptr, 0,
-                    private_methods_and_fields,
-                    arraysize(private_methods_and_fields));
+  RunParserSyncTest(context_data, class_body_data, kSuccess);
 }
 
 TEST(PrivateMethodsErrors) {
@@ -5830,10 +5916,6 @@ TEST(PrivateMethodsErrors) {
   // clang-format on
 
   RunParserSyncTest(context_data, class_body_data, kError);
-
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kError, nullptr, 0,
-                    private_methods, arraysize(private_methods));
 }
 
 // Test that private members parse in class bodies nested in object literals
@@ -5856,9 +5938,7 @@ TEST(PrivateMembersNestedInObjectLiteralsNoErrors) {
   };
   // clang-format on
 
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kSuccess, nullptr, 0,
-                    private_methods, arraysize(private_methods));
+  RunParserSyncTest(context_data, class_body_data, kSuccess);
 }
 
 // Test that private members parse in class bodies nested in classes
@@ -5883,9 +5963,7 @@ TEST(PrivateMembersInNestedClassNoErrors) {
   };
   // clang-format on
 
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kSuccess, nullptr, 0,
-                    private_methods, arraysize(private_methods));
+  RunParserSyncTest(context_data, class_body_data, kSuccess);
 }
 
 // Test that private members do not parse outside class bodies
@@ -5915,10 +5993,6 @@ TEST(PrivateMembersInNonClassErrors) {
   // clang-format on
 
   RunParserSyncTest(context_data, class_body_data, kError);
-
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kError, nullptr, 0,
-                    private_methods, arraysize(private_methods));
 }
 
 // Test that nested private members parse
@@ -5941,9 +6015,7 @@ TEST(PrivateMembersNestedNoErrors) {
   };
   // clang-format on
 
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kSuccess, nullptr, 0,
-                    private_methods, arraysize(private_methods));
+  RunParserSyncTest(context_data, class_body_data, kSuccess);
 }
 
 // Test that acessing undeclared private members result in early errors
@@ -5964,10 +6036,6 @@ TEST(PrivateMembersEarlyErrors) {
   // clang-format on
 
   RunParserSyncTest(context_data, class_body_data, kError);
-
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kError, nullptr, 0,
-                    private_methods, arraysize(private_methods));
 }
 
 // Test that acessing wrong kind private members do not error early.
@@ -6032,9 +6100,7 @@ TEST(PrivateMembersWrongAccessNoEarlyErrors) {
   };
   // clang-format on
 
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kSuccess, nullptr, 0,
-                    private_methods, arraysize(private_methods));
+  RunParserSyncTest(context_data, class_body_data, kSuccess);
 }
 
 TEST(PrivateStaticClassMethodsAndAccessorsNoErrors) {
@@ -6057,11 +6123,7 @@ TEST(PrivateStaticClassMethodsAndAccessorsNoErrors) {
   };
   // clang-format on
 
-  RunParserSyncTest(context_data, class_body_data, kError);
-
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kSuccess, nullptr, 0,
-                    private_methods, arraysize(private_methods));
+  RunParserSyncTest(context_data, class_body_data, kSuccess);
 }
 
 TEST(PrivateStaticClassMethodsAndAccessorsDuplicateErrors) {
@@ -6095,10 +6157,6 @@ TEST(PrivateStaticClassMethodsAndAccessorsDuplicateErrors) {
   // clang-format on
 
   RunParserSyncTest(context_data, class_body_data, kError);
-
-  static const ParserFlag private_methods[] = {kAllowHarmonyPrivateMethods};
-  RunParserSyncTest(context_data, class_body_data, kError, nullptr, 0,
-                    private_methods, arraysize(private_methods));
 }
 
 TEST(PrivateClassFieldsNoErrors) {
@@ -6279,15 +6337,9 @@ TEST(PrivateClassFieldsErrors) {
     "#constructor = function() {}",
 
     "# a = 0",
-    "#a() { }",
-    "get #a() { }",
     "#get a() { }",
-    "set #a() { }",
     "#set a() { }",
-    "*#a() { }",
     "#*a() { }",
-    "async #a() { }",
-    "async *#a() { }",
     "async #*a() { }",
 
     "#0 = 0;",
@@ -8082,21 +8134,21 @@ TEST(ModuleParsingInternals) {
 
   CHECK_EQ(5u, descriptor->module_requests().size());
   for (const auto& elem : descriptor->module_requests()) {
-    if (elem.first->specifier()->IsOneByteEqualTo("m.js")) {
-      CHECK_EQ(0, elem.second.index);
-      CHECK_EQ(51, elem.second.position);
-    } else if (elem.first->specifier()->IsOneByteEqualTo("n.js")) {
-      CHECK_EQ(1, elem.second.index);
-      CHECK_EQ(72, elem.second.position);
-    } else if (elem.first->specifier()->IsOneByteEqualTo("p.js")) {
-      CHECK_EQ(2, elem.second.index);
-      CHECK_EQ(123, elem.second.position);
-    } else if (elem.first->specifier()->IsOneByteEqualTo("q.js")) {
-      CHECK_EQ(3, elem.second.index);
-      CHECK_EQ(249, elem.second.position);
-    } else if (elem.first->specifier()->IsOneByteEqualTo("bar.js")) {
-      CHECK_EQ(4, elem.second.index);
-      CHECK_EQ(370, elem.second.position);
+    if (elem->specifier()->IsOneByteEqualTo("m.js")) {
+      CHECK_EQ(0, elem->index());
+      CHECK_EQ(51, elem->position());
+    } else if (elem->specifier()->IsOneByteEqualTo("n.js")) {
+      CHECK_EQ(1, elem->index());
+      CHECK_EQ(72, elem->position());
+    } else if (elem->specifier()->IsOneByteEqualTo("p.js")) {
+      CHECK_EQ(2, elem->index());
+      CHECK_EQ(123, elem->position());
+    } else if (elem->specifier()->IsOneByteEqualTo("q.js")) {
+      CHECK_EQ(3, elem->index());
+      CHECK_EQ(249, elem->position());
+    } else if (elem->specifier()->IsOneByteEqualTo("bar.js")) {
+      CHECK_EQ(4, elem->index());
+      CHECK_EQ(370, elem->position());
     } else {
       UNREACHABLE();
     }
@@ -8213,67 +8265,61 @@ TEST(ModuleParsingInternalsWithImportAssertions) {
       info.ast_value_factory()->GetOneByteString("foo2");
   CHECK_EQ(6u, descriptor->module_requests().size());
   for (const auto& elem : descriptor->module_requests()) {
-    if (elem.second.index == 0) {
-      CHECK(elem.first->specifier()->IsOneByteEqualTo("m.js"));
-      CHECK_EQ(0, elem.first->import_assertions()->size());
-      CHECK_EQ(23, elem.second.position);
-    } else if (elem.second.index == 1) {
-      CHECK(elem.first->specifier()->IsOneByteEqualTo("m.js"));
-      CHECK_EQ(1, elem.first->import_assertions()->size());
-      CHECK_EQ(54, elem.second.position);
-      CHECK(elem.first->import_assertions()
+    if (elem->index() == 0) {
+      CHECK(elem->specifier()->IsOneByteEqualTo("m.js"));
+      CHECK_EQ(0, elem->import_assertions()->size());
+      CHECK_EQ(23, elem->position());
+    } else if (elem->index() == 1) {
+      CHECK(elem->specifier()->IsOneByteEqualTo("m.js"));
+      CHECK_EQ(1, elem->import_assertions()->size());
+      CHECK_EQ(54, elem->position());
+      CHECK(elem->import_assertions()
                 ->at(foo_string)
                 .first->IsOneByteEqualTo("bar"));
-      CHECK_EQ(70,
-               elem.first->import_assertions()->at(foo_string).second.beg_pos);
-    } else if (elem.second.index == 2) {
-      CHECK(elem.first->specifier()->IsOneByteEqualTo("m.js"));
-      CHECK_EQ(1, elem.first->import_assertions()->size());
-      CHECK_EQ(106, elem.second.position);
-      CHECK(elem.first->import_assertions()
+      CHECK_EQ(70, elem->import_assertions()->at(foo_string).second.beg_pos);
+    } else if (elem->index() == 2) {
+      CHECK(elem->specifier()->IsOneByteEqualTo("m.js"));
+      CHECK_EQ(1, elem->import_assertions()->size());
+      CHECK_EQ(106, elem->position());
+      CHECK(elem->import_assertions()
                 ->at(foo2_string)
                 .first->IsOneByteEqualTo("bar"));
-      CHECK_EQ(122,
-               elem.first->import_assertions()->at(foo2_string).second.beg_pos);
-    } else if (elem.second.index == 3) {
-      CHECK(elem.first->specifier()->IsOneByteEqualTo("m.js"));
-      CHECK_EQ(1, elem.first->import_assertions()->size());
-      CHECK_EQ(159, elem.second.position);
-      CHECK(elem.first->import_assertions()
+      CHECK_EQ(122, elem->import_assertions()->at(foo2_string).second.beg_pos);
+    } else if (elem->index() == 3) {
+      CHECK(elem->specifier()->IsOneByteEqualTo("m.js"));
+      CHECK_EQ(1, elem->import_assertions()->size());
+      CHECK_EQ(159, elem->position());
+      CHECK(elem->import_assertions()
                 ->at(foo_string)
                 .first->IsOneByteEqualTo("bar2"));
-      CHECK_EQ(175,
-               elem.first->import_assertions()->at(foo_string).second.beg_pos);
-    } else if (elem.second.index == 4) {
-      CHECK(elem.first->specifier()->IsOneByteEqualTo("m.js"));
-      CHECK_EQ(2, elem.first->import_assertions()->size());
-      CHECK_EQ(212, elem.second.position);
-      CHECK(elem.first->import_assertions()
+      CHECK_EQ(175, elem->import_assertions()->at(foo_string).second.beg_pos);
+    } else if (elem->index() == 4) {
+      CHECK(elem->specifier()->IsOneByteEqualTo("m.js"));
+      CHECK_EQ(2, elem->import_assertions()->size());
+      CHECK_EQ(212, elem->position());
+      CHECK(elem->import_assertions()
                 ->at(foo_string)
                 .first->IsOneByteEqualTo("bar"));
-      CHECK_EQ(228,
-               elem.first->import_assertions()->at(foo_string).second.beg_pos);
-      CHECK(elem.first->import_assertions()
+      CHECK_EQ(228, elem->import_assertions()->at(foo_string).second.beg_pos);
+      CHECK(elem->import_assertions()
                 ->at(foo2_string)
                 .first->IsOneByteEqualTo("bar"));
-      CHECK_EQ(240,
-               elem.first->import_assertions()->at(foo2_string).second.beg_pos);
-    } else if (elem.second.index == 5) {
-      CHECK(elem.first->specifier()->IsOneByteEqualTo("n.js"));
-      CHECK_EQ(1, elem.first->import_assertions()->size());
-      CHECK_EQ(277, elem.second.position);
-      CHECK(elem.first->import_assertions()
+      CHECK_EQ(240, elem->import_assertions()->at(foo2_string).second.beg_pos);
+    } else if (elem->index() == 5) {
+      CHECK(elem->specifier()->IsOneByteEqualTo("n.js"));
+      CHECK_EQ(1, elem->import_assertions()->size());
+      CHECK_EQ(277, elem->position());
+      CHECK(elem->import_assertions()
                 ->at(foo_string)
                 .first->IsOneByteEqualTo("bar"));
-      CHECK_EQ(293,
-               elem.first->import_assertions()->at(foo_string).second.beg_pos);
+      CHECK_EQ(293, elem->import_assertions()->at(foo_string).second.beg_pos);
     } else {
       UNREACHABLE();
     }
   }
 }
 
-TEST(ModuleParsingImportAssertionOrdering) {
+TEST(ModuleParsingModuleRequestOrdering) {
   i::FLAG_harmony_import_assertions = true;
   i::Isolate* isolate = CcTest::i_isolate();
   i::Factory* factory = isolate->factory();
@@ -8342,182 +8388,300 @@ TEST(ModuleParsingImportAssertionOrdering) {
   CHECK_EQ(29u, descriptor->module_requests().size());
   auto request_iterator = descriptor->module_requests().cbegin();
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("a"));
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("a"));
+  ++request_iterator;
+
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("aa"));
+  ++request_iterator;
+
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("b"));
+  ++request_iterator;
+
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("baaaaaar"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("b"));
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("c"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("c"));
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("d"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("d"));
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("f"));
+  CHECK_EQ(0, (*request_iterator)->import_assertions()->size());
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("f"));
-  CHECK_EQ(0, request_iterator->first->import_assertions()->size());
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("f"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("f"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("foo"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("g"));
-  CHECK_EQ(0, request_iterator->first->import_assertions()->size());
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("g"));
+  CHECK_EQ(0, (*request_iterator)->import_assertions()->size());
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("g"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("g"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("h"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("h"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("d"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("h"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("h"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(b_string)
             .first->IsOneByteEqualTo("c"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("i"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("i"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("d"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("i"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("i"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(b_string)
             .first->IsOneByteEqualTo("c"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("j"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("j"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("b"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("j"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("j"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("c"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("k"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("k"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("b"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("k"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("k"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("c"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("l"));
-  CHECK_EQ(2, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("l"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("b"));
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(e_string)
             .first->IsOneByteEqualTo("f"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("l"));
-  CHECK_EQ(2, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("l"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("c"));
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(d_string)
             .first->IsOneByteEqualTo("g"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("m"));
-  CHECK_EQ(2, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("m"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("b"));
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(e_string)
             .first->IsOneByteEqualTo("f"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("m"));
-  CHECK_EQ(2, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("m"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("c"));
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(d_string)
             .first->IsOneByteEqualTo("g"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("n"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("n"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("b"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("n"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("n"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(d_string)
             .first->IsOneByteEqualTo(""));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("o"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("o"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("b"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("o"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("o"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(d_string)
             .first->IsOneByteEqualTo(""));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("p"));
-  CHECK_EQ(1, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
-            ->at(z_string)
-            .first->IsOneByteEqualTo("c"));
-  ++request_iterator;
-
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("p"));
-  CHECK_EQ(2, request_iterator->first->import_assertions()->size());
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("p"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(a_string)
             .first->IsOneByteEqualTo("c"));
-  CHECK(request_iterator->first->import_assertions()
+  CHECK((*request_iterator)
+            ->import_assertions()
             ->at(b_string)
             .first->IsOneByteEqualTo("c"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("aa"));
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("p"));
+  CHECK_EQ(1, (*request_iterator)->import_assertions()->size());
+  CHECK((*request_iterator)
+            ->import_assertions()
+            ->at(z_string)
+            .first->IsOneByteEqualTo("c"));
+}
+
+TEST(ModuleParsingImportAssertionKeySorting) {
+  i::FLAG_harmony_import_assertions = true;
+  i::Isolate* isolate = CcTest::i_isolate();
+  i::Factory* factory = isolate->factory();
+  v8::HandleScope handles(CcTest::isolate());
+  v8::Local<v8::Context> context = v8::Context::New(CcTest::isolate());
+  v8::Context::Scope context_scope(context);
+  isolate->stack_guard()->SetStackLimit(base::Stack::GetCurrentStackPosition() -
+                                        128 * 1024);
+
+  static const char kSource[] =
+      "import 'a' assert { 'b':'z', 'a': 'c' };"
+      "import 'b' assert { 'aaaaaa': 'c', 'b': 'z' };"
+      "import 'c' assert { '': 'c', 'b': 'z' };"
+      "import 'd' assert { 'aabbbb': 'c', 'aaabbb': 'z' };"
+      // zzzz\u0005 is a one-byte string, yyyy\u0100 is a two-byte string.
+      "import 'e' assert { 'zzzz\\u0005': 'second', 'yyyy\\u0100': 'first' };"
+      // Both keys are two-byte strings.
+      "import 'f' assert { 'xxxx\\u0005\\u0101': 'first', "
+      "'xxxx\\u0100\\u0101': 'second' };";
+  i::Handle<i::String> source = factory->NewStringFromAsciiChecked(kSource);
+  i::Handle<i::Script> script = factory->NewScript(source);
+  i::UnoptimizedCompileState compile_state(isolate);
+  i::UnoptimizedCompileFlags flags =
+      i::UnoptimizedCompileFlags::ForScriptCompile(isolate, *script);
+  flags.set_is_module(true);
+  i::ParseInfo info(isolate, flags, &compile_state);
+  CHECK_PARSE_PROGRAM(&info, script, isolate);
+
+  i::FunctionLiteral* func = info.literal();
+  i::ModuleScope* module_scope = func->scope()->AsModuleScope();
+  CHECK(module_scope->is_module_scope());
+
+  i::SourceTextModuleDescriptor* descriptor = module_scope->module();
+  CHECK_NOT_NULL(descriptor);
+
+  CHECK_EQ(6u, descriptor->module_requests().size());
+  auto request_iterator = descriptor->module_requests().cbegin();
+
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("a"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  auto assertion_iterator = (*request_iterator)->import_assertions()->cbegin();
+  CHECK(assertion_iterator->first->IsOneByteEqualTo("a"));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("c"));
+  ++assertion_iterator;
+  CHECK(assertion_iterator->first->IsOneByteEqualTo("b"));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("z"));
+  ++request_iterator;
+
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("b"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  assertion_iterator = (*request_iterator)->import_assertions()->cbegin();
+  CHECK(assertion_iterator->first->IsOneByteEqualTo("aaaaaa"));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("c"));
+  ++assertion_iterator;
+  CHECK(assertion_iterator->first->IsOneByteEqualTo("b"));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("z"));
+  ++request_iterator;
+
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("c"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  assertion_iterator = (*request_iterator)->import_assertions()->cbegin();
+  CHECK(assertion_iterator->first->IsOneByteEqualTo(""));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("c"));
+  ++assertion_iterator;
+  CHECK(assertion_iterator->first->IsOneByteEqualTo("b"));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("z"));
+  ++request_iterator;
+
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("d"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  assertion_iterator = (*request_iterator)->import_assertions()->cbegin();
+  CHECK(assertion_iterator->first->IsOneByteEqualTo("aaabbb"));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("z"));
+  ++assertion_iterator;
+  CHECK(assertion_iterator->first->IsOneByteEqualTo("aabbbb"));
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("c"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("foo"));
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("e"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  assertion_iterator = (*request_iterator)->import_assertions()->cbegin();
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("first"));
+  ++assertion_iterator;
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("second"));
   ++request_iterator;
 
-  CHECK(request_iterator->first->specifier()->IsOneByteEqualTo("baaaaaar"));
+  CHECK((*request_iterator)->specifier()->IsOneByteEqualTo("f"));
+  CHECK_EQ(2, (*request_iterator)->import_assertions()->size());
+  assertion_iterator = (*request_iterator)->import_assertions()->cbegin();
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("first"));
+  ++assertion_iterator;
+  CHECK(assertion_iterator->second.first->IsOneByteEqualTo("second"));
 }
 
 TEST(DuplicateProtoError) {
diff --git a/deps/v8/test/cctest/test-persistent-handles.cc b/deps/v8/test/cctest/test-persistent-handles.cc
index 3c440bff67bc0e..5b18b1cb350507 100644
--- a/deps/v8/test/cctest/test-persistent-handles.cc
+++ b/deps/v8/test/cctest/test-persistent-handles.cc
@@ -8,12 +8,14 @@
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/semaphore.h"
+#include "src/common/assert-scope.h"
 #include "src/handles/handles-inl.h"
 #include "src/handles/local-handles-inl.h"
 #include "src/handles/persistent-handles.h"
 #include "src/heap/heap.h"
 #include "src/heap/local-heap-inl.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "src/heap/safepoint.h"
 #include "src/objects/heap-number.h"
 #include "test/cctest/cctest.h"
@@ -129,9 +131,29 @@ TEST(DereferencePersistentHandle) {
     ph = phs->NewHandle(number);
   }
   {
-    LocalHeap local_heap(isolate->heap(), ThreadKind::kMain, std::move(phs));
+    LocalHeap local_heap(isolate->heap(), ThreadKind::kBackground,
+                         std::move(phs));
     UnparkedScope scope(&local_heap);
     CHECK_EQ(42, ph->value());
+  }
+}
+
+TEST(DereferencePersistentHandleFailsWhenDisallowed) {
+  heap::EnsureFlagLocalHeapsEnabled();
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+
+  std::unique_ptr<PersistentHandles> phs = isolate->NewPersistentHandles();
+  Handle<HeapNumber> ph;
+  {
+    HandleScope handle_scope(isolate);
+    Handle<HeapNumber> number = isolate->factory()->NewHeapNumber(42.0);
+    ph = phs->NewHandle(number);
+  }
+  {
+    LocalHeap local_heap(isolate->heap(), ThreadKind::kBackground,
+                         std::move(phs));
+    UnparkedScope scope(&local_heap);
     DisallowHandleDereference disallow_scope;
     CHECK_EQ(42, ph->value());
   }
@@ -141,7 +163,7 @@ TEST(NewPersistentHandleFailsWhenParked) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
 
-  LocalHeap local_heap(isolate->heap(), ThreadKind::kMain);
+  LocalHeap local_heap(isolate->heap(), ThreadKind::kBackground);
   // Fail here in debug mode: Persistent handles can't be created if local heap
   // is parked
   local_heap.NewPersistentHandle(Smi::FromInt(1));
@@ -151,7 +173,7 @@ TEST(NewPersistentHandleFailsWhenParkedExplicit) {
   CcTest::InitializeVM();
   Isolate* isolate = CcTest::i_isolate();
 
-  LocalHeap local_heap(isolate->heap(), ThreadKind::kMain,
+  LocalHeap local_heap(isolate->heap(), ThreadKind::kBackground,
                        isolate->NewPersistentHandles());
   // Fail here in debug mode: Persistent handles can't be created if local heap
   // is parked
diff --git a/deps/v8/test/cctest/test-profile-generator.cc b/deps/v8/test/cctest/test-profile-generator.cc
index 02e65e76edf68b..7535cdfeb2859e 100644
--- a/deps/v8/test/cctest/test-profile-generator.cc
+++ b/deps/v8/test/cctest/test-profile-generator.cc
@@ -311,7 +311,8 @@ static inline i::Address ToAddress(int n) { return static_cast<i::Address>(n); }
 static inline void* ToPointer(int n) { return reinterpret_cast<void*>(n); }
 
 TEST(CodeMapAddCode) {
-  CodeMap code_map;
+  StringsStorage strings;
+  CodeMap code_map(strings);
   CodeEntry* entry1 = new CodeEntry(i::CodeEventListener::FUNCTION_TAG, "aaa");
   CodeEntry* entry2 = new CodeEntry(i::CodeEventListener::FUNCTION_TAG, "bbb");
   CodeEntry* entry3 = new CodeEntry(i::CodeEventListener::FUNCTION_TAG, "ccc");
@@ -340,7 +341,8 @@ TEST(CodeMapAddCode) {
 }
 
 TEST(CodeMapMoveAndDeleteCode) {
-  CodeMap code_map;
+  StringsStorage strings;
+  CodeMap code_map(strings);
   CodeEntry* entry1 = new CodeEntry(i::CodeEventListener::FUNCTION_TAG, "aaa");
   CodeEntry* entry2 = new CodeEntry(i::CodeEventListener::FUNCTION_TAG, "bbb");
   code_map.AddCode(ToAddress(0x1500), entry1, 0x200);
@@ -357,7 +359,8 @@ TEST(CodeMapMoveAndDeleteCode) {
 }
 
 TEST(CodeMapClear) {
-  CodeMap code_map;
+  StringsStorage strings;
+  CodeMap code_map(strings);
   CodeEntry* entry1 = new CodeEntry(i::CodeEventListener::FUNCTION_TAG, "aaa");
   CodeEntry* entry2 = new CodeEntry(i::CodeEventListener::FUNCTION_TAG, "bbb");
   code_map.AddCode(ToAddress(0x1500), entry1, 0x200);
@@ -392,7 +395,8 @@ class TestSetup {
 
 TEST(SymbolizeTickSample) {
   TestSetup test_setup;
-  CodeMap code_map;
+  StringsStorage strings;
+  CodeMap code_map(strings);
   Symbolizer symbolizer(&code_map);
   CodeEntry* entry1 = new CodeEntry(i::Logger::FUNCTION_TAG, "aaa");
   CodeEntry* entry2 = new CodeEntry(i::Logger::FUNCTION_TAG, "bbb");
@@ -460,7 +464,8 @@ TEST(SampleIds) {
   CpuProfiler profiler(isolate);
   profiles.set_cpu_profiler(&profiler);
   profiles.StartProfiling("", {CpuProfilingMode::kLeafNodeLineNumbers});
-  CodeMap code_map;
+  StringsStorage strings;
+  CodeMap code_map(strings);
   Symbolizer symbolizer(&code_map);
   CodeEntry* entry1 = new CodeEntry(i::Logger::FUNCTION_TAG, "aaa");
   CodeEntry* entry2 = new CodeEntry(i::Logger::FUNCTION_TAG, "bbb");
@@ -525,7 +530,8 @@ TEST(NoSamples) {
   CpuProfiler profiler(isolate);
   profiles.set_cpu_profiler(&profiler);
   profiles.StartProfiling("");
-  CodeMap code_map;
+  StringsStorage strings;
+  CodeMap code_map(strings);
   Symbolizer symbolizer(&code_map);
   CodeEntry* entry1 = new CodeEntry(i::Logger::FUNCTION_TAG, "aaa");
   symbolizer.code_map()->AddCode(ToAddress(0x1500), entry1, 0x200);
@@ -697,13 +703,13 @@ static const char* line_number_test_source_profile_time_functions =
 "function lazy_func_at_6th_line() {}";
 
 int GetFunctionLineNumber(CpuProfiler* profiler, LocalContext* env,
-                          const char* name) {
+                          i::Isolate* isolate, const char* name) {
   CodeMap* code_map = profiler->symbolizer()->code_map();
   i::Handle<i::JSFunction> func = i::Handle<i::JSFunction>::cast(
       v8::Utils::OpenHandle(*v8::Local<v8::Function>::Cast(
           (*env)->Global()->Get(env->local(), v8_str(name)).ToLocalChecked())));
   CodeEntry* func_entry =
-      code_map->FindEntry(func->abstract_code().InstructionStart());
+      code_map->FindEntry(func->abstract_code(isolate).InstructionStart());
   if (!func_entry) FATAL("%s", name);
   return func_entry->line_number();
 }
@@ -726,12 +732,14 @@ TEST(LineNumber) {
   profiler.processor()->StopSynchronously();
 
   bool is_lazy = i::FLAG_lazy;
-  CHECK_EQ(1, GetFunctionLineNumber(&profiler, &env, "foo_at_the_first_line"));
-  CHECK_EQ(is_lazy ? 0 : 4,
-           GetFunctionLineNumber(&profiler, &env, "lazy_func_at_forth_line"));
-  CHECK_EQ(2, GetFunctionLineNumber(&profiler, &env, "bar_at_the_second_line"));
-  CHECK_EQ(is_lazy ? 0 : 6,
-           GetFunctionLineNumber(&profiler, &env, "lazy_func_at_6th_line"));
+  CHECK_EQ(1, GetFunctionLineNumber(&profiler, &env, isolate,
+                                    "foo_at_the_first_line"));
+  CHECK_EQ(is_lazy ? 0 : 4, GetFunctionLineNumber(&profiler, &env, isolate,
+                                                  "lazy_func_at_forth_line"));
+  CHECK_EQ(2, GetFunctionLineNumber(&profiler, &env, isolate,
+                                    "bar_at_the_second_line"));
+  CHECK_EQ(is_lazy ? 0 : 6, GetFunctionLineNumber(&profiler, &env, isolate,
+                                                  "lazy_func_at_6th_line"));
 
   profiler.StopProfiling("LineNumber");
 }
diff --git a/deps/v8/test/cctest/test-serialize.cc b/deps/v8/test/cctest/test-serialize.cc
index 6ec2ea649efa9c..05eae84b6dfc82 100644
--- a/deps/v8/test/cctest/test-serialize.cc
+++ b/deps/v8/test/cctest/test-serialize.cc
@@ -1557,7 +1557,7 @@ TEST(TestThatAlwaysFails) {
 int CountBuiltins() {
   // Check that we have not deserialized any additional builtin.
   HeapObjectIterator iterator(CcTest::heap());
-  DisallowGarbageCollection no_allocation;
+  DisallowGarbageCollection no_gc;
   int counter = 0;
   for (HeapObject obj = iterator.Next(); !obj.is_null();
        obj = iterator.Next()) {
@@ -1622,7 +1622,7 @@ TEST(CodeSerializerWithProfiler) {
       isolate, orig_source, Handle<String>(), &cache,
       v8::ScriptCompiler::kNoCompileOptions);
 
-  CHECK(!orig->GetBytecodeArray().HasSourcePositionTable());
+  CHECK(!orig->GetBytecodeArray(isolate).HasSourcePositionTable());
 
   isolate->set_is_profiling(true);
 
@@ -1634,7 +1634,7 @@ TEST(CodeSerializerWithProfiler) {
 
   // Since the profiler is now enabled, source positions should be collected
   // after deserialization.
-  CHECK(copy->GetBytecodeArray().HasSourcePositionTable());
+  CHECK(copy->GetBytecodeArray(isolate).HasSourcePositionTable());
 
   delete cache;
 }
@@ -1677,8 +1677,8 @@ void TestCodeSerializerOnePlusOneImpl(bool verify_builtins_count = true) {
   CHECK(Script::cast(copy->script()).source() == *copy_source);
 
   Handle<JSFunction> copy_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
   Handle<JSObject> global(isolate->context().global_object(), isolate);
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -1764,8 +1764,8 @@ TEST(CodeSerializerInternalizedString) {
       isolate, orig_source, Handle<String>(), &script_data,
       v8::ScriptCompiler::kNoCompileOptions);
   Handle<JSFunction> orig_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          orig, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, orig, isolate->native_context()}
+          .Build();
   Handle<Object> orig_result =
       Execution::Call(isolate, orig_fun, global, 0, nullptr).ToHandleChecked();
   CHECK(orig_result->IsInternalizedString());
@@ -1782,8 +1782,8 @@ TEST(CodeSerializerInternalizedString) {
   CHECK(Script::cast(copy->script()).source() == *copy_source);
 
   Handle<JSFunction> copy_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
   CHECK_NE(*orig_fun, *copy_fun);
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -1824,7 +1824,7 @@ TEST(CodeSerializerLargeCodeObject) {
       isolate, source_str, Handle<String>(), &cache,
       v8::ScriptCompiler::kNoCompileOptions);
 
-  CHECK(isolate->heap()->InSpace(orig->abstract_code(), LO_SPACE));
+  CHECK(isolate->heap()->InSpace(orig->abstract_code(isolate), LO_SPACE));
 
   Handle<SharedFunctionInfo> copy;
   {
@@ -1835,8 +1835,8 @@ TEST(CodeSerializerLargeCodeObject) {
   CHECK_NE(*orig, *copy);
 
   Handle<JSFunction> copy_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
 
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -1890,7 +1890,7 @@ TEST(CodeSerializerLargeCodeObjectWithIncrementalMarking) {
       isolate, source_str, Handle<String>(), &cache,
       v8::ScriptCompiler::kNoCompileOptions);
 
-  CHECK(heap->InSpace(orig->abstract_code(), LO_SPACE));
+  CHECK(heap->InSpace(orig->abstract_code(isolate), LO_SPACE));
 
   // Pretend that incremental marking is on when deserialization begins.
   heap::ForceEvacuationCandidate(ec_page);
@@ -1914,8 +1914,8 @@ TEST(CodeSerializerLargeCodeObjectWithIncrementalMarking) {
   CcTest::CollectAllGarbage();
 
   Handle<JSFunction> copy_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
 
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -1964,8 +1964,8 @@ TEST(CodeSerializerLargeStrings) {
   CHECK_NE(*orig, *copy);
 
   Handle<JSFunction> copy_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
 
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -2038,8 +2038,8 @@ TEST(CodeSerializerThreeBigStrings) {
   CHECK_NE(*orig, *copy);
 
   Handle<JSFunction> copy_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
 
   USE(Execution::Call(isolate, copy_fun, global, 0, nullptr));
 
@@ -2114,28 +2114,28 @@ TEST(CodeSerializerExternalString) {
   v8::HandleScope scope(CcTest::isolate());
 
   // Obtain external internalized one-byte string.
-  SerializerOneByteResource one_byte_resource("one_byte", 8);
+  SerializerOneByteResource one_byte_resource("one_byte_but_long", 17);
   Handle<String> one_byte_string =
-      isolate->factory()->NewStringFromAsciiChecked("one_byte");
+      isolate->factory()->NewStringFromAsciiChecked("one_byte_but_long");
   one_byte_string = isolate->factory()->InternalizeString(one_byte_string);
   one_byte_string->MakeExternal(&one_byte_resource);
   CHECK(one_byte_string->IsExternalOneByteString());
   CHECK(one_byte_string->IsInternalizedString());
 
   // Obtain external internalized two-byte string.
-  SerializerTwoByteResource two_byte_resource("two_byte", 8);
+  SerializerTwoByteResource two_byte_resource("two_byte_but_long", 17);
   Handle<String> two_byte_string =
-      isolate->factory()->NewStringFromAsciiChecked("two_byte");
+      isolate->factory()->NewStringFromAsciiChecked("two_byte_but_long");
   two_byte_string = isolate->factory()->InternalizeString(two_byte_string);
   two_byte_string->MakeExternal(&two_byte_resource);
   CHECK(two_byte_string->IsExternalTwoByteString());
   CHECK(two_byte_string->IsInternalizedString());
 
   const char* source =
-      "var o = {}               \n"
-      "o.one_byte = 7;          \n"
-      "o.two_byte = 8;          \n"
-      "o.one_byte + o.two_byte; \n";
+      "var o = {}                                 \n"
+      "o.one_byte_but_long = 7;                   \n"
+      "o.two_byte_but_long = 8;                   \n"
+      "o.one_byte_but_long + o.two_byte_but_long; \n";
   Handle<String> source_string = isolate->factory()
                                      ->NewStringFromUtf8(CStrVector(source))
                                      .ToHandleChecked();
@@ -2156,8 +2156,8 @@ TEST(CodeSerializerExternalString) {
   CHECK_NE(*orig, *copy);
 
   Handle<JSFunction> copy_fun =
-      isolate->factory()->NewFunctionFromSharedFunctionInfo(
-          copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
 
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -2220,7 +2220,8 @@ TEST(CodeSerializerLargeExternalString) {
   CHECK_NE(*orig, *copy);
 
   Handle<JSFunction> copy_fun =
-      f->NewFunctionFromSharedFunctionInfo(copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
 
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -2273,7 +2274,8 @@ TEST(CodeSerializerExternalScriptName) {
   CHECK_NE(*orig, *copy);
 
   Handle<JSFunction> copy_fun =
-      f->NewFunctionFromSharedFunctionInfo(copy, isolate->native_context());
+      Factory::JSFunctionBuilder{isolate, copy, isolate->native_context()}
+          .Build();
 
   Handle<Object> copy_result =
       Execution::Call(isolate, copy_fun, global, 0, nullptr).ToHandleChecked();
@@ -2445,6 +2447,7 @@ TEST(CodeSerializerAfterExecute) {
   v8::Isolate::CreateParams create_params;
   create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
   v8::Isolate* isolate2 = v8::Isolate::New(create_params);
+  Isolate* i_isolate2 = reinterpret_cast<Isolate*>(isolate2);
 
   {
     v8::Isolate::Scope iscope(isolate2);
@@ -2457,8 +2460,7 @@ TEST(CodeSerializerAfterExecute) {
     v8::ScriptCompiler::Source source(source_str, origin, cache);
     v8::Local<v8::UnboundScript> script;
     {
-      DisallowCompilation no_compile_expected(
-          reinterpret_cast<Isolate*>(isolate2));
+      DisallowCompilation no_compile_expected(i_isolate2);
       script = v8::ScriptCompiler::CompileUnboundScript(
                    isolate2, &source, v8::ScriptCompiler::kConsumeCodeCache)
                    .ToLocalChecked();
@@ -2467,12 +2469,11 @@ TEST(CodeSerializerAfterExecute) {
 
     Handle<SharedFunctionInfo> sfi = v8::Utils::OpenHandle(*script);
     CHECK(sfi->HasBytecodeArray());
-    BytecodeArray bytecode = sfi->GetBytecodeArray();
+    BytecodeArray bytecode = sfi->GetBytecodeArray(i_isolate2);
     CHECK_EQ(bytecode.osr_loop_nesting_level(), 0);
 
     {
-      DisallowCompilation no_compile_expected(
-          reinterpret_cast<Isolate*>(isolate2));
+      DisallowCompilation no_compile_expected(i_isolate2);
       v8::Local<v8::Value> result = script->BindToCurrentContext()
                                         ->Run(isolate2->GetCurrentContext())
                                         .ToLocalChecked();
@@ -4060,7 +4061,7 @@ UNINITIALIZED_TEST(SnapshotCreatorAnonClassWithKeep) {
   delete[] blob.data;
 }
 
-class DisableLazySourcePositionScope {
+class V8_NODISCARD DisableLazySourcePositionScope {
  public:
   DisableLazySourcePositionScope()
       : backup_value_(FLAG_enable_lazy_source_positions) {
diff --git a/deps/v8/test/cctest/test-strings.cc b/deps/v8/test/cctest/test-strings.cc
index 837b4c169a942f..dc792f4b037959 100644
--- a/deps/v8/test/cctest/test-strings.cc
+++ b/deps/v8/test/cctest/test-strings.cc
@@ -39,6 +39,7 @@
 #include "src/heap/heap-inl.h"
 #include "src/init/v8.h"
 #include "src/objects/objects-inl.h"
+#include "src/objects/string.h"
 #include "src/strings/unicode-decoder.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-utils.h"
@@ -332,7 +333,7 @@ void AccumulateStats(ConsString cons_string, ConsStringStats* stats) {
 }
 
 void AccumulateStats(Handle<String> cons_string, ConsStringStats* stats) {
-  DisallowHeapAllocation no_allocation;
+  DisallowGarbageCollection no_gc;
   if (cons_string->IsConsString()) {
     return AccumulateStats(ConsString::cast(*cons_string), stats);
   }
@@ -601,7 +602,7 @@ TEST(ConsStringWithEmptyFirstFlatten) {
   CHECK_EQ(initial_length, cons->length());
 
   // Make sure Flatten doesn't alloc a new string.
-  DisallowHeapAllocation no_alloc;
+  DisallowGarbageCollection no_alloc;
   i::Handle<i::String> flat = i::String::Flatten(isolate, cons);
   CHECK(flat->IsFlat());
   CHECK_EQ(initial_length, flat->length());
@@ -665,7 +666,7 @@ void TestStringCharacterStream(BuildString build, int test_cases) {
     Handle<String> cons_string = build(i, &data);
     ConsStringStats cons_string_stats;
     AccumulateStats(cons_string, &cons_string_stats);
-    DisallowHeapAllocation no_allocation;
+    DisallowGarbageCollection no_gc;
     PrintStats(data);
     // Full verify of cons string.
     cons_string_stats.VerifyEqual(flat_string_stats);
@@ -1613,7 +1614,7 @@ TEST(Latin1IgnoreCase) {
       CheckCanonicalEquivalence(c, test);
       continue;
     }
-    CHECK_EQ(Min(upper, lower), test);
+    CHECK_EQ(std::min(upper, lower), test);
   }
 }
 #endif
@@ -1829,14 +1830,14 @@ void TestString(i::Isolate* isolate, const IndexData& data) {
     size_t index;
     CHECK(s->AsIntegerIndex(&index));
     CHECK_EQ(data.integer_index, index);
-    s->Hash();
-    CHECK_EQ(0, s->hash_field() & String::kIsNotIntegerIndexMask);
+    s->EnsureHash();
+    CHECK_EQ(0, s->raw_hash_field() & String::kIsNotIntegerIndexMask);
     CHECK(s->HasHashCode());
   }
-  if (!s->HasHashCode()) s->Hash();
+  if (!s->HasHashCode()) s->EnsureHash();
   CHECK(s->HasHashCode());
   if (!data.is_integer_index) {
-    CHECK_NE(0, s->hash_field() & String::kIsNotIntegerIndexMask);
+    CHECK_NE(0, s->raw_hash_field() & String::kIsNotIntegerIndexMask);
   }
 }
 
@@ -1850,11 +1851,11 @@ TEST(HashArrayIndexStrings) {
 
   CHECK_EQ(StringHasher::MakeArrayIndexHash(0 /* value */, 1 /* length */) >>
                Name::kHashShift,
-           isolate->factory()->zero_string()->Hash());
+           isolate->factory()->zero_string()->hash());
 
   CHECK_EQ(StringHasher::MakeArrayIndexHash(1 /* value */, 1 /* length */) >>
                Name::kHashShift,
-           isolate->factory()->one_string()->Hash());
+           isolate->factory()->one_string()->hash());
 
   IndexData tests[] = {
     {"", false, 0, false, 0},
@@ -1901,20 +1902,6 @@ TEST(StringEquals) {
   CHECK(!bar_str->StringEquals(foo_str2));
 }
 
-class OneByteStringResource : public v8::String::ExternalOneByteStringResource {
- public:
-  // Takes ownership of |data|.
-  OneByteStringResource(char* data, size_t length)
-      : data_(data), length_(length) {}
-  ~OneByteStringResource() override { delete[] data_; }
-  const char* data() const override { return data_; }
-  size_t length() const override { return length_; }
-
- private:
-  char* data_;
-  size_t length_;
-};
-
 TEST(Regress876759) {
   // Thin strings are used in conjunction with young gen
   if (FLAG_single_generation) return;
@@ -1937,7 +1924,7 @@ TEST(Regress876759) {
   {
     Handle<SeqTwoByteString> raw =
         factory->NewRawTwoByteString(kLength).ToHandleChecked();
-    DisallowHeapAllocation no_gc;
+    DisallowGarbageCollection no_gc;
     CopyChars(raw->GetChars(no_gc), two_byte_buf, kLength);
     parent = raw;
   }
@@ -1949,9 +1936,9 @@ TEST(Regress876759) {
   Handle<String> grandparent =
       handle(ThinString::cast(*parent).actual(), isolate);
   CHECK_EQ(*parent, SlicedString::cast(*sliced).parent());
-  OneByteStringResource* resource =
-      new OneByteStringResource(external_one_byte_buf, kLength);
-  grandparent->MakeExternal(resource);
+  OneByteResource* resource =
+      new OneByteResource(external_one_byte_buf, kLength);
+  CHECK(grandparent->MakeExternal(resource));
   // The grandparent string becomes one-byte, but the child strings are still
   // two-byte.
   CHECK(grandparent->IsOneByteRepresentation());
@@ -1961,6 +1948,205 @@ TEST(Regress876759) {
   CHECK(String::IsOneByteRepresentationUnderneath(*sliced));
 }
 
+// Show that small internal strings are not externalizable since it would make
+// them external and uncached through MakeExternal. One byte version.
+TEST(MakeExternalCreationFailureOneByte) {
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+  Factory* factory = isolate->factory();
+// Due to different size restrictions the string needs to be small but not too
+// small. One of these restrictions is whether pointer compression is enabled.
+#ifdef V8_COMPRESS_POINTERS
+  const char* raw_small = "small string";
+#elif V8_TARGET_ARCH_32_BIT
+  const char* raw_small = "smol";
+#else
+  const char* raw_small = "smalls";
+#endif  // V8_COMPRESS_POINTERS
+
+  HandleScope handle_scope(isolate);
+  Handle<String> one_byte_string =
+      factory->InternalizeString(factory->NewStringFromAsciiChecked(raw_small));
+  CHECK(one_byte_string->IsOneByteRepresentation());
+  CHECK(!one_byte_string->IsExternalString());
+  CHECK(!one_byte_string->SupportsExternalization());
+}
+
+// Show that small internal strings are not externalizable since it would make
+// them external and uncached through MakeExternal. Two byte version.
+TEST(MakeExternalCreationFailureTwoByte) {
+  CcTest::InitializeVM();
+  Isolate* isolate = CcTest::i_isolate();
+  Factory* factory = isolate->factory();
+  // Due to different size restrictions the string needs to be small but not too
+  // small.
+  const char* raw_small = "smalls";
+  const int kLength = 6;
+  DCHECK_EQ(kLength, strlen(raw_small));
+  const uint16_t two_byte_array[kLength] = {'s', 'm', 'a', 'l', 'l', 's'};
+
+  HandleScope handle_scope(isolate);
+  Handle<String> two_bytes_string;
+  {
+    Handle<SeqTwoByteString> raw =
+        factory->NewRawTwoByteString(kLength).ToHandleChecked();
+    DisallowGarbageCollection no_gc;
+    CopyChars(raw->GetChars(no_gc), two_byte_array, kLength);
+    two_bytes_string = raw;
+  }
+  two_bytes_string = factory->InternalizeString(two_bytes_string);
+  CHECK(two_bytes_string->IsTwoByteRepresentation());
+  CHECK(!two_bytes_string->IsExternalString());
+  if (COMPRESS_POINTERS_BOOL) {
+    CHECK(!two_bytes_string->SupportsExternalization());
+  } else {
+    // Without pointer compression, there is no string size that can cause a
+    // failure for a two byte string. It needs to be bigger than 5 chars to
+    // support externalization, but at that point is bigger than the limit and
+    // it is not uncached anymore.
+    // As a note, since pointer compression is only enabled for 64 bits, all
+    // target 32 bit archs fall in this case.
+    CHECK(two_bytes_string->MakeExternal(
+        new Resource(AsciiToTwoByteString(raw_small), strlen(raw_small))));
+    auto external = Handle<ExternalString>::cast(two_bytes_string);
+    CHECK(!external->is_uncached());
+  }
+}
+
+// Show that it is possible to internalize an external string without a copy, as
+// long as it is not uncached.
+TEST(InternalizeExternalString) {
+  CcTest::InitializeVM();
+  Factory* factory = CcTest::i_isolate()->factory();
+  v8::HandleScope scope(CcTest::isolate());
+
+  // Create the string.
+  const char* raw_string = "external";
+  OneByteResource* resource =
+      new OneByteResource(i::StrDup(raw_string), strlen(raw_string));
+  Handle<String> string =
+      factory->NewExternalStringFromOneByte(resource).ToHandleChecked();
+  CHECK(string->IsExternalString());
+
+  // Check it is not uncached.
+  Handle<ExternalString> external = Handle<ExternalString>::cast(string);
+  CHECK(!external->is_uncached());
+
+  // Internalize succesfully, without a copy.
+  Handle<String> internal = factory->InternalizeString(external);
+  CHECK(string->IsInternalizedString());
+  CHECK(string.equals(internal));
+}
+
+// Show that it is possible to internalize an external string without a copy, as
+// long as it is not uncached. Two byte version.
+TEST(InternalizeExternalStringTwoByte) {
+  CcTest::InitializeVM();
+  Factory* factory = CcTest::i_isolate()->factory();
+  v8::HandleScope scope(CcTest::isolate());
+
+  // Create the string.
+  const char* raw_string = "external";
+  Resource* resource =
+      new Resource(AsciiToTwoByteString(raw_string), strlen(raw_string));
+  Handle<String> string =
+      factory->NewExternalStringFromTwoByte(resource).ToHandleChecked();
+  CHECK(string->IsExternalString());
+
+  // Check it is not uncached.
+  Handle<ExternalString> external = Handle<ExternalString>::cast(string);
+  CHECK(!external->is_uncached());
+
+  // Internalize succesfully, without a copy.
+  Handle<String> internal = factory->InternalizeString(external);
+  CHECK(string->IsInternalizedString());
+  CHECK(string.equals(internal));
+}
+
+class UncachedExternalOneByteResource
+    : public v8::String::ExternalOneByteStringResource {
+ public:
+  explicit UncachedExternalOneByteResource(const char* data)
+      : data_(data), length_(strlen(data)) {}
+
+  ~UncachedExternalOneByteResource() override { i::DeleteArray(data_); }
+
+  const char* data() const override { return data_; }
+  size_t length() const override { return length_; }
+  bool IsCacheable() const override { return false; }
+
+ private:
+  const char* data_;
+  size_t length_;
+};
+
+// Show that we can internalize an external uncached string, by creating a copy.
+TEST(InternalizeExternalStringUncachedWithCopy) {
+  CcTest::InitializeVM();
+  Factory* factory = CcTest::i_isolate()->factory();
+  v8::HandleScope scope(CcTest::isolate());
+
+  // Create the string.
+  const char* raw_string = "external";
+  UncachedExternalOneByteResource* resource =
+      new UncachedExternalOneByteResource(i::StrDup(raw_string));
+  Handle<String> string =
+      factory->NewExternalStringFromOneByte(resource).ToHandleChecked();
+  CHECK(string->IsExternalString());
+
+  // Check it is uncached.
+  Handle<ExternalString> external = Handle<ExternalString>::cast(string);
+  CHECK(external->is_uncached());
+
+  // Internalize succesfully, with a copy.
+  Handle<String> internal = factory->InternalizeString(external);
+  CHECK(!external->IsInternalizedString());
+  CHECK(internal->IsInternalizedString());
+}
+
+class UncachedExternalResource : public v8::String::ExternalStringResource {
+ public:
+  explicit UncachedExternalResource(const uint16_t* data)
+      : data_(data), length_(0) {
+    while (data[length_]) ++length_;
+  }
+
+  ~UncachedExternalResource() override { i::DeleteArray(data_); }
+
+  const uint16_t* data() const override { return data_; }
+  size_t length() const override { return length_; }
+  bool IsCacheable() const override { return false; }
+
+ private:
+  const uint16_t* data_;
+  size_t length_;
+};
+
+// Show that we can internalize an external uncached string, by creating a copy.
+// Two byte version.
+TEST(InternalizeExternalStringUncachedWithCopyTwoByte) {
+  CcTest::InitializeVM();
+  Factory* factory = CcTest::i_isolate()->factory();
+  v8::HandleScope scope(CcTest::isolate());
+
+  // Create the string.
+  const char* raw_string = "external";
+  UncachedExternalResource* resource =
+      new UncachedExternalResource(AsciiToTwoByteString(raw_string));
+  Handle<String> string =
+      factory->NewExternalStringFromTwoByte(resource).ToHandleChecked();
+  CHECK(string->IsExternalString());
+
+  // Check it is uncached.
+  Handle<ExternalString> external = Handle<ExternalString>::cast(string);
+  CHECK(external->is_uncached());
+
+  // Internalize succesfully, with a copy.
+  Handle<String> internal = factory->InternalizeString(external);
+  CHECK(!external->IsInternalizedString());
+  CHECK(internal->IsInternalizedString());
+}
+
 }  // namespace test_strings
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/test/cctest/test-symbols.cc b/deps/v8/test/cctest/test-symbols.cc
index 006bca9f1fab95..d466f7fe07683e 100644
--- a/deps/v8/test/cctest/test-symbols.cc
+++ b/deps/v8/test/cctest/test-symbols.cc
@@ -54,7 +54,8 @@ TEST(Create) {
     CHECK(symbols[i]->IsName());
     CHECK(symbols[i]->IsSymbol());
     CHECK(symbols[i]->HasHashCode());
-    CHECK_GT(symbols[i]->Hash(), 0u);
+    CHECK(symbols[i]->IsUniqueName());
+    CHECK_GT(symbols[i]->hash(), 0u);
     os << Brief(*symbols[i]) << "\n";
 #if OBJECT_PRINT
     symbols[i]->Print(os);
diff --git a/deps/v8/test/cctest/test-sync-primitives-arm.cc b/deps/v8/test/cctest/test-sync-primitives-arm.cc
index 6afa9e5192e476..2660c693f51da4 100644
--- a/deps/v8/test/cctest/test-sync-primitives-arm.cc
+++ b/deps/v8/test/cctest/test-sync-primitives-arm.cc
@@ -198,11 +198,12 @@ void TestInvalidateExclusiveAccess(TestData initial_data, MemoryAccess access1,
   Isolate* isolate = CcTest::i_isolate();
   HandleScope scope(isolate);
 
-  auto f = AssembleCode<int(TestData*, int, int, int)>([&](Assembler& assm) {
-    AssembleLoadExcl(&assm, access1, r1, r1);
-    AssembleMemoryAccess(&assm, access2, r3, r2, r1);
-    AssembleStoreExcl(&assm, access3, r0, r3, r1);
-  });
+  auto f = AssembleCode<int(TestData*, int, int, int)>(
+      isolate, [&](Assembler& assm) {
+        AssembleLoadExcl(&assm, access1, r1, r1);
+        AssembleMemoryAccess(&assm, access2, r3, r2, r1);
+        AssembleStoreExcl(&assm, access3, r0, r3, r1);
+      });
 
   TestData t = initial_data;
 
@@ -266,9 +267,10 @@ namespace {
 int ExecuteMemoryAccess(Isolate* isolate, TestData* test_data,
                         MemoryAccess access) {
   HandleScope scope(isolate);
-  auto f = AssembleCode<int(TestData*, int, int)>([&](Assembler& assm) {
-    AssembleMemoryAccess(&assm, access, r0, r2, r1);
-  });
+  auto f =
+      AssembleCode<int(TestData*, int, int)>(isolate, [&](Assembler& assm) {
+        AssembleMemoryAccess(&assm, access, r0, r2, r1);
+      });
 
   return f.Call(test_data, 0, 0);
 }
diff --git a/deps/v8/test/cctest/test-transitions.h b/deps/v8/test/cctest/test-transitions.h
index 6db1c641e4669b..e1177aba85117e 100644
--- a/deps/v8/test/cctest/test-transitions.h
+++ b/deps/v8/test/cctest/test-transitions.h
@@ -13,7 +13,7 @@ namespace internal {
 class TestTransitionsAccessor : public TransitionsAccessor {
  public:
   TestTransitionsAccessor(Isolate* isolate, Map map,
-                          DisallowHeapAllocation* no_gc)
+                          DisallowGarbageCollection* no_gc)
       : TransitionsAccessor(isolate, map, no_gc) {}
   TestTransitionsAccessor(Isolate* isolate, Handle<Map> map)
       : TransitionsAccessor(isolate, map) {}
diff --git a/deps/v8/test/cctest/test-unboxed-doubles.cc b/deps/v8/test/cctest/test-unboxed-doubles.cc
index d42df09c53d594..11db542e30b49b 100644
--- a/deps/v8/test/cctest/test-unboxed-doubles.cc
+++ b/deps/v8/test/cctest/test-unboxed-doubles.cc
@@ -297,7 +297,7 @@ static void TestLayoutDescriptorQueries(int layout_descriptor_length,
                                           : (layout_desc.capacity() - i);
       }
       expected_sequence_length =
-          Min(expected_sequence_length, max_sequence_length);
+          std::min(expected_sequence_length, max_sequence_length);
       int sequence_length;
       CHECK_EQ(tagged,
                layout_desc.IsTagged(i, max_sequence_length, &sequence_length));
@@ -1254,7 +1254,7 @@ static void TestLayoutDescriptorHelper(Isolate* isolate,
     bool expected_tagged = !index.is_double();
     if (!expected_tagged) {
       first_non_tagged_field_offset =
-          Min(first_non_tagged_field_offset, index.offset());
+          std::min(first_non_tagged_field_offset, index.offset());
     }
 
     int end_of_region_offset;
diff --git a/deps/v8/test/cctest/test-unwinder-code-pages.cc b/deps/v8/test/cctest/test-unwinder-code-pages.cc
index 18c8658b3ed560..d5d1dfbdecf7a2 100644
--- a/deps/v8/test/cctest/test-unwinder-code-pages.cc
+++ b/deps/v8/test/cctest/test-unwinder-code-pages.cc
@@ -296,7 +296,7 @@ TEST(Unwind_CodeObjectPCInMiddle_Success_CodePagesAPI) {
       Handle<JSFunction>::cast(v8::Utils::OpenHandle(*local_foo));
 
   // Put the current PC inside of the created code object.
-  AbstractCode abstract_code = foo->abstract_code();
+  AbstractCode abstract_code = foo->abstract_code(i_isolate);
   // We don't produce optimized code when run with --no-opt.
   if (!abstract_code.IsCode() && FLAG_opt == false) return;
   CHECK(abstract_code.IsCode());
diff --git a/deps/v8/test/cctest/test-verifiers.cc b/deps/v8/test/cctest/test-verifiers.cc
index 7a980b2ef9e70b..80e2517cd2b740 100644
--- a/deps/v8/test/cctest/test-verifiers.cc
+++ b/deps/v8/test/cctest/test-verifiers.cc
@@ -49,7 +49,7 @@ TEST_PAIR(TestWrongTypeInNormalField) {
 
   // There must be no GC (and therefore no verifiers running) until we can
   // restore the modified data.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   // Elements must be FixedArrayBase according to the Torque definition, so a
   // JSObject should cause a failure.
@@ -80,7 +80,7 @@ TEST_PAIR(TestWrongStrongTypeInIndexedStructField) {
 
   // There must be no GC (and therefore no verifiers running) until we can
   // restore the modified data.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   // Key must be Name|Undefined according to the Torque definition, so a
   // JSObject should cause a failure.
@@ -111,7 +111,7 @@ TEST_PAIR(TestWrongWeakTypeInIndexedStructField) {
 
   // There must be no GC (and therefore no verifiers running) until we can
   // restore the modified data.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   // Value can be JSAny, which includes JSObject, and it can be Weak<Map>, but
   // it can't be Weak<JSObject>.
@@ -140,7 +140,7 @@ TEST_PAIR(TestWrongOddball) {
 
   // There must be no GC (and therefore no verifiers running) until we can
   // restore the modified data.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   // Hour is Undefined|Smi|NaN. Other oddballs like null should cause a failure.
   TaggedField<Object>::store(*date, JSDate::kHourOffset,
@@ -167,7 +167,7 @@ TEST_PAIR(TestWrongNumber) {
 
   // There must be no GC (and therefore no verifiers running) until we can
   // restore the modified data.
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
 
   // Hour is Undefined|Smi|NaN. Other doubles like 1.1 should cause a failure.
   TaggedField<Object>::store(*date, JSDate::kHourOffset, *float_val);
diff --git a/deps/v8/test/cctest/test-weakmaps.cc b/deps/v8/test/cctest/test-weakmaps.cc
index 1288c4f49d8576..fe7a2d0c0fd97e 100644
--- a/deps/v8/test/cctest/test-weakmaps.cc
+++ b/deps/v8/test/cctest/test-weakmaps.cc
@@ -238,7 +238,7 @@ TEST(Regress2060a) {
   Heap* heap = isolate->heap();
   HandleScope scope(isolate);
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->function_string());
+      factory->NewFunctionForTesting(factory->function_string());
   Handle<JSObject> key = factory->NewJSObject(function);
   Handle<JSWeakMap> weakmap = isolate->factory()->NewJSWeakMap();
 
@@ -281,7 +281,7 @@ TEST(Regress2060b) {
   Heap* heap = isolate->heap();
   HandleScope scope(isolate);
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->function_string());
+      factory->NewFunctionForTesting(factory->function_string());
 
   // Start second old-space page so that keys land on evacuation candidate.
   Page* first_page = heap->old_space()->first_page();
diff --git a/deps/v8/test/cctest/test-weaksets.cc b/deps/v8/test/cctest/test-weaksets.cc
index 60dab5246c91e3..f9a3a0614db218 100644
--- a/deps/v8/test/cctest/test-weaksets.cc
+++ b/deps/v8/test/cctest/test-weaksets.cc
@@ -172,7 +172,7 @@ TEST(WeakSet_Regress2060a) {
   Heap* heap = isolate->heap();
   HandleScope scope(isolate);
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->function_string());
+      factory->NewFunctionForTesting(factory->function_string());
   Handle<JSObject> key = factory->NewJSObject(function);
   Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate);
 
@@ -215,7 +215,7 @@ TEST(WeakSet_Regress2060b) {
   Heap* heap = isolate->heap();
   HandleScope scope(isolate);
   Handle<JSFunction> function =
-      factory->NewFunctionForTest(factory->function_string());
+      factory->NewFunctionForTesting(factory->function_string());
 
   // Start second old-space page so that keys land on evacuation candidate.
   Page* first_page = heap->old_space()->first_page();
diff --git a/deps/v8/test/cctest/torque/test-torque.cc b/deps/v8/test/cctest/torque/test-torque.cc
index 22ee780ae22173..02509a1c7bcd98 100644
--- a/deps/v8/test/cctest/torque/test-torque.cc
+++ b/deps/v8/test/cctest/torque/test-torque.cc
@@ -865,6 +865,22 @@ TEST(TestWord8Phi) {
   ft.Call();
 }
 
+TEST(TestOffHeapSlice) {
+  CcTest::InitializeVM();
+  Isolate* isolate(CcTest::i_isolate());
+  i::HandleScope scope(isolate);
+  CodeAssemblerTester asm_tester(isolate, 1);
+  TestTorqueAssembler m(asm_tester.state());
+  std::string data = "Hello World!";
+  {
+    m.TestOffHeapSlice(m.PointerConstant(const_cast<char*>(data.data())),
+                       m.IntPtrConstant(data.size()));
+    m.Return(m.UndefinedConstant());
+  }
+  FunctionTester ft(asm_tester.GenerateCode(), 0);
+  ft.Call();
+}
+
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/test/cctest/wasm/test-c-wasm-entry.cc b/deps/v8/test/cctest/wasm/test-c-wasm-entry.cc
index 9ce5dec4fb51c6..0c59f9e7791818 100644
--- a/deps/v8/test/cctest/wasm/test-c-wasm-entry.cc
+++ b/deps/v8/test/cctest/wasm/test-c-wasm-entry.cc
@@ -91,7 +91,7 @@ class CWasmEntryArgTester {
 TEST(TestCWasmEntryArgPassing_int32) {
   CWasmEntryArgTester<int32_t, int32_t> tester(
       {// Return 2*<0> + 1.
-       WASM_I32_ADD(WASM_I32_MUL(WASM_I32V_1(2), WASM_GET_LOCAL(0)), WASM_ONE)},
+       WASM_I32_ADD(WASM_I32_MUL(WASM_I32V_1(2), WASM_LOCAL_GET(0)), WASM_ONE)},
       [](int32_t a) {
         return base::AddWithWraparound(base::MulWithWraparound(2, a), 1);
       });
@@ -103,7 +103,7 @@ TEST(TestCWasmEntryArgPassing_int32) {
 TEST(TestCWasmEntryArgPassing_double_int64) {
   CWasmEntryArgTester<double, int64_t> tester(
       {// Return (double)<0>.
-       WASM_F64_SCONVERT_I64(WASM_GET_LOCAL(0))},
+       WASM_F64_SCONVERT_I64(WASM_LOCAL_GET(0))},
       [](int64_t a) { return static_cast<double>(a); });
 
   FOR_INT64_INPUTS(v) { tester.CheckCall(v); }
@@ -113,7 +113,7 @@ TEST(TestCWasmEntryArgPassing_double_int64) {
 TEST(TestCWasmEntryArgPassing_int64_double) {
   CWasmEntryArgTester<int64_t, double> tester(
       {// Return (int64_t)<0>.
-       WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(0))},
+       WASM_I64_SCONVERT_F64(WASM_LOCAL_GET(0))},
       [](double d) { return static_cast<int64_t>(d); });
 
   FOR_FLOAT64_INPUTS(d) {
@@ -128,7 +128,7 @@ TEST(TestCWasmEntryArgPassing_float_double) {
   CWasmEntryArgTester<double, float> tester(
       {// Return 2*(double)<0> + 1.
        WASM_F64_ADD(
-           WASM_F64_MUL(WASM_F64(2), WASM_F64_CONVERT_F32(WASM_GET_LOCAL(0))),
+           WASM_F64_MUL(WASM_F64(2), WASM_F64_CONVERT_F32(WASM_LOCAL_GET(0))),
            WASM_F64(1))},
       [](float f) { return 2. * static_cast<double>(f) + 1.; });
 
@@ -139,7 +139,7 @@ TEST(TestCWasmEntryArgPassing_float_double) {
 TEST(TestCWasmEntryArgPassing_double_double) {
   CWasmEntryArgTester<double, double, double> tester(
       {// Return <0> + <1>.
-       WASM_F64_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))},
+       WASM_F64_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))},
       [](double a, double b) { return a + b; });
 
   FOR_FLOAT64_INPUTS(d1) {
@@ -156,11 +156,11 @@ TEST(TestCWasmEntryArgPassing_AllTypes) {
               WASM_F64_ADD(      // <0+1> + <2>
                   WASM_F64_ADD(  // <0> + <1>
                       WASM_F64_SCONVERT_I32(
-                          WASM_GET_LOCAL(0)),  // <0> to double
+                          WASM_LOCAL_GET(0)),  // <0> to double
                       WASM_F64_SCONVERT_I64(
-                          WASM_GET_LOCAL(1))),               // <1> to double
-                  WASM_F64_CONVERT_F32(WASM_GET_LOCAL(2))),  // <2> to double
-              WASM_GET_LOCAL(3))                             // <3>
+                          WASM_LOCAL_GET(1))),               // <1> to double
+                  WASM_F64_CONVERT_F32(WASM_LOCAL_GET(2))),  // <2> to double
+              WASM_LOCAL_GET(3))                             // <3>
       },
       [](int32_t a, int64_t b, float c, double d) {
         return 0. + a + b + c + d;
diff --git a/deps/v8/test/cctest/wasm/test-gc.cc b/deps/v8/test/cctest/wasm/test-gc.cc
index 3366fe04f28133..44d3b03076414d 100644
--- a/deps/v8/test/cctest/wasm/test-gc.cc
+++ b/deps/v8/test/cctest/wasm/test-gc.cc
@@ -30,11 +30,19 @@ using F = std::pair<ValueType, bool>;
 
 class WasmGCTester {
  public:
-  WasmGCTester()
+  explicit WasmGCTester(
+      TestExecutionTier execution_tier = TestExecutionTier::kTurbofan)
       : flag_gc(&v8::internal::FLAG_experimental_wasm_gc, true),
         flag_reftypes(&v8::internal::FLAG_experimental_wasm_reftypes, true),
         flag_typedfuns(&v8::internal::FLAG_experimental_wasm_typed_funcref,
                        true),
+        flag_liftoff(
+            &v8::internal::FLAG_liftoff,
+            execution_tier == TestExecutionTier::kTurbofan ? false : true),
+        flag_liftoff_only(
+            &v8::internal::FLAG_liftoff_only,
+            execution_tier == TestExecutionTier::kLiftoff ? true : false),
+        flag_tierup(&v8::internal::FLAG_wasm_tier_up, false),
         zone(&allocator, ZONE_NAME),
         builder_(&zone),
         isolate_(CcTest::InitIsolateOnce()),
@@ -120,6 +128,7 @@ class WasmGCTester {
     DCHECK(*sig == *instance_->module()->functions[function_index].sig);
     CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
     CallFunctionImpl(function_index, sig, &packer);
+    CHECK(!isolate_->has_pending_exception());
     packer.Reset();
     CHECK_EQ(expected, packer.Pop<int32_t>());
   }
@@ -130,6 +139,7 @@ class WasmGCTester {
     CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
     packer.Push(arg);
     CallFunctionImpl(function_index, sig, &packer);
+    CHECK(!isolate_->has_pending_exception());
     packer.Reset();
     CHECK_EQ(expected, packer.Pop<int32_t>());
   }
@@ -138,10 +148,19 @@ class WasmGCTester {
     const FunctionSig* sig = instance_->module()->functions[function_index].sig;
     CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
     CallFunctionImpl(function_index, sig, &packer);
+    CHECK(!isolate_->has_pending_exception());
     packer.Reset();
     return Handle<Object>(Object(packer.Pop<Address>()), isolate_);
   }
 
+  void CheckHasThrown(uint32_t function_index) {
+    const FunctionSig* sig = instance_->module()->functions[function_index].sig;
+    CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
+    CallFunctionImpl(function_index, sig, &packer);
+    CHECK(isolate_->has_pending_exception());
+    isolate_->clear_pending_exception();
+  }
+
   void CheckHasThrown(uint32_t function_index, int32_t arg) {
     FunctionSig* sig = sigs.i_i();
     DCHECK(*sig == *instance_->module()->functions[function_index].sig);
@@ -162,6 +181,9 @@ class WasmGCTester {
   const FlagScope<bool> flag_gc;
   const FlagScope<bool> flag_reftypes;
   const FlagScope<bool> flag_typedfuns;
+  const FlagScope<bool> flag_liftoff;
+  const FlagScope<bool> flag_liftoff_only;
+  const FlagScope<bool> flag_tierup;
 
   v8::internal::AccountingAllocator allocator;
   Zone zone;
@@ -180,9 +202,10 @@ ValueType optref(uint32_t type_index) {
   return ValueType::Ref(type_index, kNullable);
 }
 
-// TODO(7748): Use WASM_EXEC_TEST once interpreter and liftoff are supported.
-TEST(WasmBasicStruct) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmBasicStruct) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
+
   const byte type_index =
       tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
   const byte empty_struct_index = tester.DefineStruct({});
@@ -229,14 +252,14 @@ TEST(WasmBasicStruct) {
   const byte j_field_index = 0;
   const byte kSet = tester.DefineFunction(
       tester.sigs.i_v(), {kOptRefType},
-      {WASM_SET_LOCAL(
+      {WASM_LOCAL_SET(
            j_local_index,
            WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(64),
                                     WASM_RTT_CANON(type_index))),
-       WASM_STRUCT_SET(type_index, j_field_index, WASM_GET_LOCAL(j_local_index),
+       WASM_STRUCT_SET(type_index, j_field_index, WASM_LOCAL_GET(j_local_index),
                        WASM_I32V(-99)),
        WASM_STRUCT_GET(type_index, j_field_index,
-                       WASM_GET_LOCAL(j_local_index)),
+                       WASM_LOCAL_GET(j_local_index)),
        kExprEnd});
 
   tester.CompileModule();
@@ -252,8 +275,9 @@ TEST(WasmBasicStruct) {
 
 // Test struct.set, ref.as_non_null,
 // struct refs types in globals and if-results.
-TEST(WasmRefAsNonNull) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmRefAsNonNull) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte type_index =
       tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
   ValueType kRefTypes[] = {ref(type_index)};
@@ -267,14 +291,14 @@ TEST(WasmRefAsNonNull) {
   const byte field_index = 0;
   const byte kFunc = tester.DefineFunction(
       tester.sigs.i_v(), {},
-      {WASM_SET_GLOBAL(
+      {WASM_GLOBAL_SET(
            global_index,
            WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(55), WASM_I32V(66),
                                     WASM_RTT_CANON(type_index))),
        WASM_STRUCT_GET(
            type_index, field_index,
            WASM_REF_AS_NON_NULL(WASM_IF_ELSE_R(kOptRefType, WASM_I32V(1),
-                                               WASM_GET_GLOBAL(global_index),
+                                               WASM_GLOBAL_GET(global_index),
                                                WASM_REF_NULL(type_index)))),
        kExprEnd});
 
@@ -282,8 +306,9 @@ TEST(WasmRefAsNonNull) {
   tester.CheckResult(kFunc, 55);
 }
 
-TEST(WasmBrOnNull) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmBrOnNull) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte type_index =
       tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
   ValueType kRefTypes[] = {ref(type_index)};
@@ -295,7 +320,7 @@ TEST(WasmBrOnNull) {
       {WASM_BLOCK_I(WASM_I32V(42),
                     // Branch will be taken.
                     // 42 left on stack outside the block (not 52).
-                    WASM_BR_ON_NULL(0, WASM_GET_LOCAL(l_local_index)),
+                    WASM_BR_ON_NULL(0, WASM_LOCAL_GET(l_local_index)),
                     WASM_I32V(52), WASM_BR(0)),
        kExprEnd});
 
@@ -319,8 +344,9 @@ TEST(WasmBrOnNull) {
   tester.CheckResult(kNotTaken, 52);
 }
 
-TEST(BrOnCast) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(BrOnCast) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte type_index = tester.DefineStruct({F(kWasmI32, true)});
   const byte rtt_index =
       tester.AddGlobal(ValueType::Rtt(type_index, 1), false,
@@ -328,54 +354,54 @@ TEST(BrOnCast) {
                            static_cast<HeapType::Representation>(type_index)));
   const byte kTestStruct = tester.DefineFunction(
       tester.sigs.i_v(), {kWasmI32, kWasmEqRef},
-      {WASM_BLOCK(WASM_SET_LOCAL(0, WASM_I32V(111)),
+      {WASM_BLOCK(WASM_LOCAL_SET(0, WASM_I32V(111)),
                   // Pipe a struct through a local so it's statically typed
                   // as eqref.
-                  WASM_SET_LOCAL(
+                  WASM_LOCAL_SET(
                       1, WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(1),
-                                                  WASM_GET_GLOBAL(rtt_index))),
-                  WASM_GET_LOCAL(1),
+                                                  WASM_GLOBAL_GET(rtt_index))),
+                  WASM_LOCAL_GET(1),
                   // The struct is not an i31, so this branch isn't taken.
                   WASM_BR_ON_CAST(0, WASM_RTT_CANON(kI31RefCode)),
-                  WASM_SET_LOCAL(0, WASM_I32V(222)),  // Final result.
+                  WASM_LOCAL_SET(0, WASM_I32V(222)),  // Final result.
                   // This branch is taken.
-                  WASM_BR_ON_CAST(0, WASM_GET_GLOBAL(rtt_index)),
+                  WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)),
                   // Not executed due to the branch.
-                  WASM_DROP, WASM_SET_LOCAL(0, WASM_I32V(333))),
-       WASM_GET_LOCAL(0), kExprEnd});
+                  WASM_DROP, WASM_LOCAL_SET(0, WASM_I32V(333))),
+       WASM_LOCAL_GET(0), kExprEnd});
 
   const byte kTestI31 = tester.DefineFunction(
       tester.sigs.i_v(), {kWasmI32, kWasmEqRef},
-      {WASM_BLOCK(WASM_SET_LOCAL(0, WASM_I32V(111)),
+      {WASM_BLOCK(WASM_LOCAL_SET(0, WASM_I32V(111)),
                   // Pipe an i31ref through a local so it's statically typed
                   // as eqref.
-                  WASM_SET_LOCAL(1, WASM_I31_NEW(WASM_I32V(42))),
-                  WASM_GET_LOCAL(1),
+                  WASM_LOCAL_SET(1, WASM_I31_NEW(WASM_I32V(42))),
+                  WASM_LOCAL_GET(1),
                   // The i31 is not a struct, so this branch isn't taken.
-                  WASM_BR_ON_CAST(0, WASM_GET_GLOBAL(rtt_index)),
-                  WASM_SET_LOCAL(0, WASM_I32V(222)),  // Final result.
+                  WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)),
+                  WASM_LOCAL_SET(0, WASM_I32V(222)),  // Final result.
                   // This branch is taken.
                   WASM_BR_ON_CAST(0, WASM_RTT_CANON(kI31RefCode)),
                   // Not executed due to the branch.
-                  WASM_DROP, WASM_SET_LOCAL(0, WASM_I32V(333))),
-       WASM_GET_LOCAL(0), kExprEnd});
+                  WASM_DROP, WASM_LOCAL_SET(0, WASM_I32V(333))),
+       WASM_LOCAL_GET(0), kExprEnd});
 
   const byte kTestNull = tester.DefineFunction(
       tester.sigs.i_v(), {kWasmI32, kWasmEqRef},
-      {WASM_BLOCK(WASM_SET_LOCAL(0, WASM_I32V(111)),
-                  WASM_GET_LOCAL(1),  // Put a nullref onto the value stack.
+      {WASM_BLOCK(WASM_LOCAL_SET(0, WASM_I32V(111)),
+                  WASM_LOCAL_GET(1),  // Put a nullref onto the value stack.
                   // Neither of these branches is taken for nullref.
                   WASM_BR_ON_CAST(0, WASM_RTT_CANON(kI31RefCode)),
-                  WASM_SET_LOCAL(0, WASM_I32V(222)),
-                  WASM_BR_ON_CAST(0, WASM_GET_GLOBAL(rtt_index)), WASM_DROP,
-                  WASM_SET_LOCAL(0, WASM_I32V(333))),  // Final result.
-       WASM_GET_LOCAL(0), kExprEnd});
+                  WASM_LOCAL_SET(0, WASM_I32V(222)),
+                  WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)), WASM_DROP,
+                  WASM_LOCAL_SET(0, WASM_I32V(333))),  // Final result.
+       WASM_LOCAL_GET(0), kExprEnd});
 
   const byte kTypedAfterBranch = tester.DefineFunction(
       tester.sigs.i_v(), {kWasmI32, kWasmEqRef},
-      {WASM_SET_LOCAL(1, WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
-                                                  WASM_GET_GLOBAL(rtt_index))),
-       WASM_BLOCK(WASM_SET_LOCAL(
+      {WASM_LOCAL_SET(1, WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
+                                                  WASM_GLOBAL_GET(rtt_index))),
+       WASM_BLOCK(WASM_LOCAL_SET(
            // The outer block catches the struct left behind by the inner block
            // and reads its field.
            0,
@@ -384,11 +410,11 @@ TEST(BrOnCast) {
                // The inner block should take the early branch with a struct
                // on the stack.
                WASM_BLOCK_R(ValueType::Ref(type_index, kNonNullable),
-                            WASM_GET_LOCAL(1),
-                            WASM_BR_ON_CAST(0, WASM_GET_GLOBAL(rtt_index)),
+                            WASM_LOCAL_GET(1),
+                            WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)),
                             // Returning 123 is the unreachable failure case.
-                            WASM_SET_LOCAL(0, WASM_I32V(123)), WASM_BR(1))))),
-       WASM_GET_LOCAL(0), kExprEnd});
+                            WASM_LOCAL_SET(0, WASM_I32V(123)), WASM_BR(1))))),
+       WASM_LOCAL_GET(0), kExprEnd});
 
   tester.CompileModule();
   tester.CheckResult(kTestStruct, 222);
@@ -397,8 +423,9 @@ TEST(BrOnCast) {
   tester.CheckResult(kTypedAfterBranch, 42);
 }
 
-TEST(WasmRefEq) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmRefEq) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   byte type_index = tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
   ValueType kRefTypes[] = {ref(type_index)};
   ValueType kOptRefType = optref(type_index);
@@ -407,23 +434,23 @@ TEST(WasmRefEq) {
   byte local_index = 0;
   const byte kFunc = tester.DefineFunction(
       tester.sigs.i_v(), {kOptRefType},
-      {WASM_SET_LOCAL(local_index, WASM_STRUCT_NEW_WITH_RTT(
+      {WASM_LOCAL_SET(local_index, WASM_STRUCT_NEW_WITH_RTT(
                                        type_index, WASM_I32V(55), WASM_I32V(66),
                                        WASM_RTT_CANON(type_index))),
        WASM_I32_ADD(
            WASM_I32_SHL(
                WASM_REF_EQ(  // true
-                   WASM_GET_LOCAL(local_index), WASM_GET_LOCAL(local_index)),
+                   WASM_LOCAL_GET(local_index), WASM_LOCAL_GET(local_index)),
                WASM_I32V(0)),
            WASM_I32_ADD(
                WASM_I32_SHL(WASM_REF_EQ(  // false
-                                WASM_GET_LOCAL(local_index),
+                                WASM_LOCAL_GET(local_index),
                                 WASM_STRUCT_NEW_WITH_RTT(
                                     type_index, WASM_I32V(55), WASM_I32V(66),
                                     WASM_RTT_CANON(type_index))),
                             WASM_I32V(1)),
                WASM_I32_ADD(WASM_I32_SHL(  // false
-                                WASM_REF_EQ(WASM_GET_LOCAL(local_index),
+                                WASM_REF_EQ(WASM_LOCAL_GET(local_index),
                                             WASM_REF_NULL(type_index)),
                                 WASM_I32V(2)),
                             WASM_I32_SHL(WASM_REF_EQ(  // true
@@ -436,8 +463,9 @@ TEST(WasmRefEq) {
   tester.CheckResult(kFunc, 0b1001);
 }
 
-TEST(WasmPackedStructU) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmPackedStructU) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
 
   const byte type_index = tester.DefineStruct(
       {F(kWasmI8, true), F(kWasmI16, true), F(kWasmI32, true)});
@@ -450,22 +478,22 @@ TEST(WasmPackedStructU) {
 
   const byte kF0 = tester.DefineFunction(
       tester.sigs.i_v(), {struct_type},
-      {WASM_SET_LOCAL(local_index,
+      {WASM_LOCAL_SET(local_index,
                       WASM_STRUCT_NEW_WITH_RTT(
                           type_index, WASM_I32V(expected_output_0),
                           WASM_I32V(expected_output_1), WASM_I32V(0x12345678),
                           WASM_RTT_CANON(type_index))),
-       WASM_STRUCT_GET_U(type_index, 0, WASM_GET_LOCAL(local_index)),
+       WASM_STRUCT_GET_U(type_index, 0, WASM_LOCAL_GET(local_index)),
        kExprEnd});
 
   const byte kF1 = tester.DefineFunction(
       tester.sigs.i_v(), {struct_type},
-      {WASM_SET_LOCAL(local_index,
+      {WASM_LOCAL_SET(local_index,
                       WASM_STRUCT_NEW_WITH_RTT(
                           type_index, WASM_I32V(expected_output_0),
                           WASM_I32V(expected_output_1), WASM_I32V(0x12345678),
                           WASM_RTT_CANON(type_index))),
-       WASM_STRUCT_GET_U(type_index, 1, WASM_GET_LOCAL(local_index)),
+       WASM_STRUCT_GET_U(type_index, 1, WASM_LOCAL_GET(local_index)),
        kExprEnd});
   tester.CompileModule();
 
@@ -473,8 +501,9 @@ TEST(WasmPackedStructU) {
   tester.CheckResult(kF1, static_cast<uint16_t>(expected_output_1));
 }
 
-TEST(WasmPackedStructS) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmPackedStructS) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
 
   const byte type_index = tester.DefineStruct(
       {F(kWasmI8, true), F(kWasmI16, true), F(kWasmI32, true)});
@@ -487,22 +516,22 @@ TEST(WasmPackedStructS) {
 
   const byte kF0 = tester.DefineFunction(
       tester.sigs.i_v(), {struct_type},
-      {WASM_SET_LOCAL(
+      {WASM_LOCAL_SET(
            local_index,
            WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(expected_output_0),
                                     WASM_I32V(expected_output_1), WASM_I32V(0),
                                     WASM_RTT_CANON(type_index))),
-       WASM_STRUCT_GET_S(type_index, 0, WASM_GET_LOCAL(local_index)),
+       WASM_STRUCT_GET_S(type_index, 0, WASM_LOCAL_GET(local_index)),
        kExprEnd});
 
   const byte kF1 = tester.DefineFunction(
       tester.sigs.i_v(), {struct_type},
-      {WASM_SET_LOCAL(
+      {WASM_LOCAL_SET(
            local_index,
            WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(0x80),
                                     WASM_I32V(expected_output_1), WASM_I32V(0),
                                     WASM_RTT_CANON(type_index))),
-       WASM_STRUCT_GET_S(type_index, 1, WASM_GET_LOCAL(local_index)),
+       WASM_STRUCT_GET_S(type_index, 1, WASM_LOCAL_GET(local_index)),
        kExprEnd});
 
   tester.CompileModule();
@@ -525,7 +554,7 @@ TEST(WasmLetInstruction) {
            WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(52),
                                     WASM_RTT_CANON(type_index)),
            WASM_STRUCT_GET(type_index, let_field_index,
-                           WASM_GET_LOCAL(let_local_index))),
+                           WASM_LOCAL_GET(let_local_index))),
        kExprEnd});
 
   const byte let_2_field_index = 0;
@@ -537,41 +566,63 @@ TEST(WasmLetInstruction) {
            WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(52),
                                     WASM_RTT_CANON(type_index)),
            WASM_I32_MUL(WASM_STRUCT_GET(type_index, let_2_field_index,
-                                        WASM_GET_LOCAL(1)),
-                        WASM_GET_LOCAL(0))),
+                                        WASM_LOCAL_GET(1)),
+                        WASM_LOCAL_GET(0))),
        kExprEnd});
 
   const byte kLetTestLocals = tester.DefineFunction(
       tester.sigs.i_i(), {kWasmI32},
-      {WASM_SET_LOCAL(1, WASM_I32V(100)),
+      {WASM_LOCAL_SET(1, WASM_I32V(100)),
        WASM_LET_2_I(
            kI32Code, WASM_I32V(1), kI32Code, WASM_I32V(10),
-           WASM_I32_SUB(WASM_I32_ADD(WASM_GET_LOCAL(0),     // 1st let-local
-                                     WASM_GET_LOCAL(2)),    // Parameter
-                        WASM_I32_ADD(WASM_GET_LOCAL(1),     // 2nd let-local
-                                     WASM_GET_LOCAL(3)))),  // Function local
+           WASM_I32_SUB(WASM_I32_ADD(WASM_LOCAL_GET(0),     // 1st let-local
+                                     WASM_LOCAL_GET(2)),    // Parameter
+                        WASM_I32_ADD(WASM_LOCAL_GET(1),     // 2nd let-local
+                                     WASM_LOCAL_GET(3)))),  // Function local
        kExprEnd});
   // Result: (1 + 1000) - (10 + 100) = 891
 
   const byte let_erase_local_index = 0;
   const byte kLetTestErase = tester.DefineFunction(
       tester.sigs.i_v(), {kWasmI32},
-      {WASM_SET_LOCAL(let_erase_local_index, WASM_I32V(0)),
+      {WASM_LOCAL_SET(let_erase_local_index, WASM_I32V(0)),
        WASM_LET_1_V(kI32Code, WASM_I32V(1), WASM_NOP),
-       WASM_GET_LOCAL(let_erase_local_index), kExprEnd});
+       WASM_LOCAL_GET(let_erase_local_index), kExprEnd});
   // The result should be 0 and not 1, as local_get(0) refers to the original
   // local.
 
+  const byte kLetInLoop = tester.DefineFunction(
+      tester.sigs.i_i(), {},
+      {WASM_LOOP(WASM_LET_1_V(
+           kI32Code, WASM_I32V(10),  // --
+           WASM_LOCAL_SET(1, WASM_I32_SUB(WASM_LOCAL_GET(1), WASM_I32V(10))),
+           WASM_BR_IF(1, WASM_I32_GES(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))))),
+       WASM_LOCAL_GET(0), WASM_END});
+
+  const byte kLetInBlock = tester.DefineFunction(
+      tester.sigs.i_i(), {},
+      {WASM_BLOCK(WASM_LET_1_V(
+           kI32Code, WASM_I32V(10),  // --
+           WASM_BR_IF(1, WASM_I32_GES(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))),
+           WASM_LOCAL_SET(1, WASM_I32V(30)))),
+       WASM_LOCAL_GET(0), WASM_END});
+
   tester.CompileModule();
 
   tester.CheckResult(kLetTest1, 42);
   tester.CheckResult(kLetTest2, 420);
   tester.CheckResult(kLetTestLocals, 891, 1000);
   tester.CheckResult(kLetTestErase, 0);
+  tester.CheckResult(kLetInLoop, 2, 52);
+  tester.CheckResult(kLetInLoop, -11, -1);
+  tester.CheckResult(kLetInBlock, 15, 15);
+  tester.CheckResult(kLetInBlock, 30, 5);
 }
 
-TEST(WasmBasicArray) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmBasicArray) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
+
   const byte type_index = tester.DefineArray(wasm::kWasmI32, true);
   ValueType kRefTypes[] = {ref(type_index)};
   FunctionSig sig_q_v(1, 0, kRefTypes);
@@ -581,13 +632,13 @@ TEST(WasmBasicArray) {
   const byte local_index = 1;
   const byte kGetElem = tester.DefineFunction(
       tester.sigs.i_i(), {kOptRefType},
-      {WASM_SET_LOCAL(local_index, WASM_ARRAY_NEW_WITH_RTT(
+      {WASM_LOCAL_SET(local_index, WASM_ARRAY_NEW_WITH_RTT(
                                        type_index, WASM_I32V(12), WASM_I32V(3),
                                        WASM_RTT_CANON(type_index))),
-       WASM_ARRAY_SET(type_index, WASM_GET_LOCAL(local_index), WASM_I32V(1),
+       WASM_ARRAY_SET(type_index, WASM_LOCAL_GET(local_index), WASM_I32V(1),
                       WASM_I32V(42)),
-       WASM_ARRAY_GET(type_index, WASM_GET_LOCAL(local_index),
-                      WASM_GET_LOCAL(0)),
+       WASM_ARRAY_GET(type_index, WASM_LOCAL_GET(local_index),
+                      WASM_LOCAL_GET(0)),
        kExprEnd});
 
   // Reads and returns an array's length.
@@ -605,6 +656,20 @@ TEST(WasmBasicArray) {
                                WASM_RTT_CANON(type_index)),
        kExprEnd});
 
+  const uint32_t kLongLength = 1u << 16;
+  const byte kAllocateLarge = tester.DefineFunction(
+      &sig_q_v, {},
+      {WASM_ARRAY_NEW_DEFAULT(type_index, WASM_I32V(kLongLength),
+                              WASM_RTT_CANON(type_index)),
+       kExprEnd});
+
+  const uint32_t kTooLong = kV8MaxWasmArrayLength + 1;
+  const byte kAllocateTooLarge = tester.DefineFunction(
+      &sig_q_v, {},
+      {WASM_ARRAY_NEW_DEFAULT(type_index, WASM_I32V(kTooLong),
+                              WASM_RTT_CANON(type_index)),
+       kExprEnd});
+
   tester.CompileModule();
 
   tester.CheckResult(kGetElem, 12, 0);
@@ -619,10 +684,20 @@ TEST(WasmBasicArray) {
 #if OBJECT_PRINT
   h_result.ToHandleChecked()->Print();
 #endif
+
+  MaybeHandle<Object> maybe_large_result =
+      tester.GetResultObject(kAllocateLarge);
+  Handle<Object> large_result = maybe_large_result.ToHandleChecked();
+  CHECK(large_result->IsWasmArray());
+  CHECK(Handle<WasmArray>::cast(large_result)->Size() >
+        kMaxRegularHeapObjectSize);
+
+  tester.CheckHasThrown(kAllocateTooLarge);
 }
 
-TEST(WasmPackedArrayU) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmPackedArrayU) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte array_index = tester.DefineArray(kWasmI8, true);
   ValueType array_type = optref(array_index);
 
@@ -633,19 +708,19 @@ TEST(WasmPackedArrayU) {
 
   const byte kF = tester.DefineFunction(
       tester.sigs.i_i(), {array_type},
-      {WASM_SET_LOCAL(local_index, WASM_ARRAY_NEW_WITH_RTT(
+      {WASM_LOCAL_SET(local_index, WASM_ARRAY_NEW_WITH_RTT(
                                        array_index, WASM_I32V(0), WASM_I32V(4),
                                        WASM_RTT_CANON(array_index))),
-       WASM_ARRAY_SET(array_index, WASM_GET_LOCAL(local_index), WASM_I32V(0),
+       WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(0),
                       WASM_I32V(1)),
-       WASM_ARRAY_SET(array_index, WASM_GET_LOCAL(local_index), WASM_I32V(1),
+       WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(1),
                       WASM_I32V(10)),
-       WASM_ARRAY_SET(array_index, WASM_GET_LOCAL(local_index), WASM_I32V(2),
+       WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(2),
                       WASM_I32V(200)),
-       WASM_ARRAY_SET(array_index, WASM_GET_LOCAL(local_index), WASM_I32V(3),
+       WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(3),
                       WASM_I32V(expected_output_3)),
-       WASM_ARRAY_GET_U(array_index, WASM_GET_LOCAL(local_index),
-                        WASM_GET_LOCAL(param_index)),
+       WASM_ARRAY_GET_U(array_index, WASM_LOCAL_GET(local_index),
+                        WASM_LOCAL_GET(param_index)),
        kExprEnd});
 
   tester.CompileModule();
@@ -656,8 +731,9 @@ TEST(WasmPackedArrayU) {
   tester.CheckResult(kF, static_cast<uint8_t>(expected_output_3), 3);
 }
 
-TEST(WasmPackedArrayS) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(WasmPackedArrayS) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte array_index = tester.DefineArray(kWasmI16, true);
   ValueType array_type = optref(array_index);
 
@@ -667,18 +743,18 @@ TEST(WasmPackedArrayS) {
   const byte local_index = 1;
   const byte kF = tester.DefineFunction(
       tester.sigs.i_i(), {array_type},
-      {WASM_SET_LOCAL(
+      {WASM_LOCAL_SET(
            local_index,
            WASM_ARRAY_NEW_WITH_RTT(array_index, WASM_I32V(0x12345678),
                                    WASM_I32V(4), WASM_RTT_CANON(array_index))),
-       WASM_ARRAY_SET(array_index, WASM_GET_LOCAL(local_index), WASM_I32V(1),
+       WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(1),
                       WASM_I32V(10)),
-       WASM_ARRAY_SET(array_index, WASM_GET_LOCAL(local_index), WASM_I32V(2),
+       WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(2),
                       WASM_I32V(0xFEDC)),
-       WASM_ARRAY_SET(array_index, WASM_GET_LOCAL(local_index), WASM_I32V(3),
+       WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(3),
                       WASM_I32V(0xFF1234)),
-       WASM_ARRAY_GET_S(array_index, WASM_GET_LOCAL(local_index),
-                        WASM_GET_LOCAL(param_index)),
+       WASM_ARRAY_GET_S(array_index, WASM_LOCAL_GET(local_index),
+                        WASM_LOCAL_GET(param_index)),
        kExprEnd});
 
   tester.CompileModule();
@@ -691,31 +767,32 @@ TEST(WasmPackedArrayS) {
   tester.CheckResult(kF, static_cast<int16_t>(expected_outputs[3]), 3);
 }
 
-TEST(NewDefault) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(NewDefault) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte struct_type = tester.DefineStruct(
       {F(wasm::kWasmI32, true), F(wasm::kWasmF64, true), F(optref(0), true)});
   const byte array_type = tester.DefineArray(wasm::kWasmI32, true);
   // Returns: struct[0] + f64_to_i32(struct[1]) + (struct[2].is_null ^ 1) == 0.
   const byte allocate_struct = tester.DefineFunction(
       tester.sigs.i_v(), {optref(struct_type)},
-      {WASM_SET_LOCAL(0, WASM_STRUCT_NEW_DEFAULT(struct_type,
+      {WASM_LOCAL_SET(0, WASM_STRUCT_NEW_DEFAULT(struct_type,
                                                  WASM_RTT_CANON(struct_type))),
        WASM_I32_ADD(
-           WASM_I32_ADD(WASM_STRUCT_GET(struct_type, 0, WASM_GET_LOCAL(0)),
+           WASM_I32_ADD(WASM_STRUCT_GET(struct_type, 0, WASM_LOCAL_GET(0)),
                         WASM_I32_SCONVERT_F64(WASM_STRUCT_GET(
-                            struct_type, 1, WASM_GET_LOCAL(0)))),
+                            struct_type, 1, WASM_LOCAL_GET(0)))),
            WASM_I32_XOR(WASM_REF_IS_NULL(
-                            WASM_STRUCT_GET(struct_type, 2, WASM_GET_LOCAL(0))),
+                            WASM_STRUCT_GET(struct_type, 2, WASM_LOCAL_GET(0))),
                         WASM_I32V(1))),
        kExprEnd});
   const byte allocate_array = tester.DefineFunction(
       tester.sigs.i_v(), {optref(array_type)},
-      {WASM_SET_LOCAL(0, WASM_ARRAY_NEW_DEFAULT(array_type, WASM_I32V(2),
+      {WASM_LOCAL_SET(0, WASM_ARRAY_NEW_DEFAULT(array_type, WASM_I32V(2),
                                                 WASM_RTT_CANON(array_type))),
        WASM_I32_ADD(
-           WASM_ARRAY_GET(array_type, WASM_GET_LOCAL(0), WASM_I32V(0)),
-           WASM_ARRAY_GET(array_type, WASM_GET_LOCAL(0), WASM_I32V(1))),
+           WASM_ARRAY_GET(array_type, WASM_LOCAL_GET(0), WASM_I32V(0)),
+           WASM_ARRAY_GET(array_type, WASM_LOCAL_GET(0), WASM_I32V(1))),
        kExprEnd});
 
   tester.CompileModule();
@@ -768,18 +845,18 @@ TEST(BasicRTT) {
       {WASM_LET_1_I(
           WASM_RTT(2, subtype_index),
           WASM_RTT_SUB(subtype_index, WASM_RTT_CANON(type_index)),
-          WASM_SET_LOCAL(kStructIndexCode,
+          WASM_LOCAL_SET(kStructIndexCode,
                          WASM_STRUCT_NEW_WITH_RTT(
                              subtype_index, WASM_I32V(11), WASM_I32V(42),
-                             WASM_GET_LOCAL(kRttIndexCode))),
+                             WASM_LOCAL_GET(kRttIndexCode))),
           WASM_I32_ADD(
               WASM_REF_TEST(type_index, subtype_index,
-                            WASM_GET_LOCAL(kStructIndexCode),
-                            WASM_GET_LOCAL(kRttIndexCode)),
+                            WASM_LOCAL_GET(kStructIndexCode),
+                            WASM_LOCAL_GET(kRttIndexCode)),
               WASM_STRUCT_GET(subtype_index, kFieldIndex,
                               WASM_REF_CAST(type_index, subtype_index,
-                                            WASM_GET_LOCAL(kStructIndexCode),
-                                            WASM_GET_LOCAL(kRttIndexCode)))),
+                                            WASM_LOCAL_GET(kStructIndexCode),
+                                            WASM_LOCAL_GET(kRttIndexCode)))),
           kExprEnd)});
 
   tester.CompileModule();
@@ -819,8 +896,85 @@ TEST(BasicRTT) {
   tester.CheckResult(kRefCast, 43);
 }
 
-TEST(ArrayNewMap) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(AnyRefRtt) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
+
+  ValueType any_rtt_0_type = ValueType::Rtt(HeapType::kAny, 0);
+  FunctionSig sig_any_canon(1, 0, &any_rtt_0_type);
+  byte kAnyRttCanon = tester.DefineFunction(
+      &sig_any_canon, {}, {WASM_RTT_CANON(kAnyRefCode), kExprEnd});
+
+  ValueType any_rtt_1_type = ValueType::Rtt(HeapType::kAny, 1);
+  FunctionSig sig_any_sub(1, 0, &any_rtt_1_type);
+  byte kAnyRttSub = tester.DefineFunction(
+      &sig_any_sub, {},
+      {WASM_RTT_SUB(kAnyRefCode, WASM_RTT_CANON(kAnyRefCode)), kExprEnd});
+
+  ValueType func_rtt_1_type = ValueType::Rtt(HeapType::kFunc, 1);
+  FunctionSig sig_func_sub(1, 0, &func_rtt_1_type);
+  byte kFuncRttSub = tester.DefineFunction(
+      &sig_func_sub, {},
+      {WASM_RTT_SUB(kFuncRefCode, WASM_RTT_CANON(kAnyRefCode)), kExprEnd});
+
+  ValueType eq_rtt_1_type = ValueType::Rtt(HeapType::kEq, 1);
+  FunctionSig sig_eq_sub(1, 0, &eq_rtt_1_type);
+  byte kEqRttSub = tester.DefineFunction(
+      &sig_eq_sub, {},
+      {WASM_RTT_SUB(kEqRefCode, WASM_RTT_CANON(kAnyRefCode)), kExprEnd});
+
+  const byte type_index = tester.DefineArray(kWasmI32, true);
+  ValueType array_rtt_type = ValueType::Rtt(type_index, 1);
+  FunctionSig sig_array_canon(1, 0, &array_rtt_type);
+  byte kArrayRttCanon = tester.DefineFunction(
+      &sig_array_canon, {}, {WASM_RTT_CANON(type_index), kExprEnd});
+
+  byte kCheckArrayAgainstAny = tester.DefineFunction(
+      tester.sigs.i_v(), {kWasmAnyRef},
+      {WASM_LOCAL_SET(0, WASM_ARRAY_NEW_DEFAULT(type_index, WASM_I32V(5),
+                                                WASM_RTT_CANON(type_index))),
+       WASM_REF_TEST(kAnyRefCode, type_index, WASM_LOCAL_GET(0),
+                     WASM_RTT_CANON(type_index)),
+       kExprEnd});
+
+  byte kCheckAnyAgainstAny = tester.DefineFunction(
+      tester.sigs.i_v(), {kWasmAnyRef},
+      {WASM_LOCAL_SET(0, WASM_ARRAY_NEW_DEFAULT(type_index, WASM_I32V(5),
+                                                WASM_RTT_CANON(type_index))),
+       WASM_REF_TEST(kAnyRefCode, kAnyRefCode, WASM_LOCAL_GET(0),
+                     WASM_RTT_CANON(kAnyRefCode)),
+       kExprEnd});
+
+  tester.CompileModule();
+
+  // Check (rtt.canon any).
+  Handle<Object> result_any_canon =
+      tester.GetResultObject(kAnyRttCanon).ToHandleChecked();
+  CHECK(result_any_canon->IsMap());
+  Handle<Map> any_map = Handle<Map>::cast(result_any_canon);
+  CHECK_EQ(any_map->wasm_type_info().parent(),
+           tester.isolate()->root(RootIndex::kNullMap));
+  CHECK_EQ(any_map->wasm_type_info().supertypes().length(), 0);
+
+  for (byte func_index : {kArrayRttCanon, kAnyRttSub, kFuncRttSub, kEqRttSub}) {
+    Handle<Object> result =
+        tester.GetResultObject(func_index).ToHandleChecked();
+    CHECK(result->IsMap());
+    Handle<Map> map = Handle<Map>::cast(result);
+    // Its parent should be (rtt.canon any).
+    CHECK_EQ(map->wasm_type_info().parent(), *any_map);
+    CHECK_EQ(map->wasm_type_info().supertypes().get(0), *any_map);
+    CHECK_EQ(map->wasm_type_info().supertypes().length(), 1);
+  }
+
+  tester.CheckResult(kCheckArrayAgainstAny, 1);
+  tester.CheckResult(kCheckAnyAgainstAny, 1);
+}
+
+WASM_COMPILED_EXEC_TEST(ArrayNewMap) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
+
   const byte type_index = tester.DefineArray(kWasmI32, true);
 
   ValueType array_type = ValueType::Ref(type_index, kNonNullable);
@@ -874,8 +1028,8 @@ TEST(FunctionRefs) {
 
   const byte cast = tester.DefineFunction(
       &sig_func, {kWasmFuncRef},
-      {WASM_SET_LOCAL(0, WASM_REF_FUNC(func_index)),
-       WASM_REF_CAST(kFuncRefCode, sig_index, WASM_GET_LOCAL(0),
+      {WASM_LOCAL_SET(0, WASM_REF_FUNC(func_index)),
+       WASM_REF_CAST(kFuncRefCode, sig_index, WASM_LOCAL_GET(0),
                      WASM_RTT_CANON(sig_index)),
        kExprEnd});
 
@@ -884,8 +1038,8 @@ TEST(FunctionRefs) {
 
   const byte test = tester.DefineFunction(
       tester.sigs.i_v(), {kWasmFuncRef},
-      {WASM_SET_LOCAL(0, WASM_REF_FUNC(func_index)),
-       WASM_REF_TEST(kFuncRefCode, other_sig_index, WASM_GET_LOCAL(0),
+      {WASM_LOCAL_SET(0, WASM_REF_FUNC(func_index)),
+       WASM_REF_TEST(kFuncRefCode, other_sig_index, WASM_LOCAL_GET(0),
                      WASM_RTT_CANON(other_sig_index)),
        kExprEnd});
 
@@ -922,10 +1076,10 @@ TEST(CallRef) {
   WasmGCTester tester;
   byte callee = tester.DefineFunction(
       tester.sigs.i_ii(), {},
-      {WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), kExprEnd});
+      {WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), kExprEnd});
   byte caller = tester.DefineFunction(
       tester.sigs.i_i(), {},
-      {WASM_CALL_REF(WASM_REF_FUNC(callee), WASM_I32V(42), WASM_GET_LOCAL(0)),
+      {WASM_CALL_REF(WASM_REF_FUNC(callee), WASM_I32V(42), WASM_LOCAL_GET(0)),
        kExprEnd});
 
   // This is just so func_index counts as "declared".
@@ -937,8 +1091,9 @@ TEST(CallRef) {
   tester.CheckResult(caller, 47, 5);
 }
 
-TEST(RefTestCastNull) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(RefTestCastNull) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   byte type_index = tester.DefineStruct({F(wasm::kWasmI32, true)});
 
   const byte kRefTestNull = tester.DefineFunction(
@@ -958,16 +1113,15 @@ TEST(RefTestCastNull) {
   tester.CheckHasThrown(kRefCastNull, 0);
 }
 
-TEST(BasicI31) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(BasicI31) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte kSigned = tester.DefineFunction(
       tester.sigs.i_i(), {},
-      {WASM_I31_GET_S(WASM_I31_NEW(WASM_GET_LOCAL(0))), kExprEnd});
+      {WASM_I31_GET_S(WASM_I31_NEW(WASM_LOCAL_GET(0))), kExprEnd});
   const byte kUnsigned = tester.DefineFunction(
       tester.sigs.i_i(), {},
-      {WASM_I31_GET_U(WASM_I31_NEW(WASM_GET_LOCAL(0))), kExprEnd});
-  // TODO(7748): Support (rtt.canon i31), and add a test like:
-  // (ref.test (i31.new ...) (rtt.canon i31)).
+      {WASM_I31_GET_U(WASM_I31_NEW(WASM_LOCAL_GET(0))), kExprEnd});
   tester.CompileModule();
   tester.CheckResult(kSigned, 123, 123);
   tester.CheckResult(kUnsigned, 123, 123);
@@ -979,8 +1133,9 @@ TEST(BasicI31) {
   tester.CheckResult(kUnsigned, 0x7FFFFFFF, 0x7FFFFFFF);
 }
 
-TEST(I31Casts) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(I31Casts) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte struct_type = tester.DefineStruct({F(wasm::kWasmI32, true)});
   const byte i31_rtt =
       tester.AddGlobal(ValueType::Rtt(HeapType::kI31, 1), false,
@@ -993,12 +1148,12 @@ TEST(I31Casts) {
   // should return 1 + 42 = 43.
   const byte kTestAndCastSuccess = tester.DefineFunction(
       tester.sigs.i_v(), {kWasmEqRef},
-      {WASM_SET_LOCAL(0, WASM_I31_NEW(WASM_I32V(42))),
-       WASM_I32_ADD(WASM_REF_TEST(kEqRefCode, kI31RefCode, WASM_GET_LOCAL(0),
-                                  WASM_GET_GLOBAL(i31_rtt)),
+      {WASM_LOCAL_SET(0, WASM_I31_NEW(WASM_I32V(42))),
+       WASM_I32_ADD(WASM_REF_TEST(kEqRefCode, kI31RefCode, WASM_LOCAL_GET(0),
+                                  WASM_GLOBAL_GET(i31_rtt)),
                     WASM_I31_GET_S(WASM_REF_CAST(kEqRefCode, kI31RefCode,
-                                                 WASM_GET_LOCAL(0),
-                                                 WASM_GET_GLOBAL(i31_rtt)))),
+                                                 WASM_LOCAL_GET(0),
+                                                 WASM_GLOBAL_GET(i31_rtt)))),
        kExprEnd});
   // Adds the results of two unsuccessful type checks (an i31ref is not a
   // struct, nor the other way round).
@@ -1007,10 +1162,10 @@ TEST(I31Casts) {
       {WASM_I32_ADD(
            WASM_REF_TEST(kEqRefCode, kI31RefCode,
                          WASM_STRUCT_NEW_WITH_RTT(struct_type, WASM_I32V(42),
-                                                  WASM_GET_GLOBAL(struct_rtt)),
-                         WASM_GET_GLOBAL(i31_rtt)),
+                                                  WASM_GLOBAL_GET(struct_rtt)),
+                         WASM_GLOBAL_GET(i31_rtt)),
            WASM_REF_TEST(kEqRefCode, struct_type, WASM_I31_NEW(WASM_I32V(23)),
-                         WASM_GET_GLOBAL(struct_rtt))),
+                         WASM_GLOBAL_GET(struct_rtt))),
        kExprEnd});
   // Tries to cast an i31ref to a struct, which should trap.
   const byte kCastI31ToStruct = tester.DefineFunction(
@@ -1019,7 +1174,7 @@ TEST(I31Casts) {
       {WASM_STRUCT_GET(
            struct_type, 0,
            WASM_REF_CAST(kEqRefCode, struct_type, WASM_I31_NEW(WASM_I32V(42)),
-                         WASM_GET_GLOBAL(struct_rtt))),
+                         WASM_GLOBAL_GET(struct_rtt))),
        kExprEnd});
   // Tries to cast a struct to i31ref, which should trap.
   const byte kCastStructToI31 = tester.DefineFunction(
@@ -1028,8 +1183,8 @@ TEST(I31Casts) {
       {WASM_I31_GET_S(
            WASM_REF_CAST(kEqRefCode, kI31RefCode,
                          WASM_STRUCT_NEW_WITH_RTT(struct_type, WASM_I32V(42),
-                                                  WASM_GET_GLOBAL(struct_rtt)),
-                         WASM_GET_GLOBAL(i31_rtt))),
+                                                  WASM_GLOBAL_GET(struct_rtt)),
+                         WASM_GLOBAL_GET(i31_rtt))),
        kExprEnd});
   tester.CompileModule();
   tester.CheckResult(kTestAndCastSuccess, 43);
@@ -1038,28 +1193,131 @@ TEST(I31Casts) {
   tester.CheckHasThrown(kCastStructToI31, 0);
 }
 
-TEST(GlobalInitReferencingGlobal) {
-  WasmGCTester tester;
+// This flushed out a few bugs, so it serves as a regression test. It can also
+// be modified (made to run longer) to measure performance of casts.
+WASM_COMPILED_EXEC_TEST(CastsBenchmark) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
+  const byte SuperType = tester.DefineStruct({F(wasm::kWasmI32, true)});
+  const byte SubType =
+      tester.DefineStruct({F(wasm::kWasmI32, true), F(wasm::kWasmI32, true)});
+  const byte ListType = tester.DefineArray(wasm::kWasmEqRef, true);
+
+  const byte List =
+      tester.AddGlobal(ValueType::Ref(ListType, kNullable), true,
+                       WasmInitExpr::RefNullConst(
+                           static_cast<HeapType::Representation>(ListType)));
+  const byte RttSuper = tester.AddGlobal(
+      ValueType::Rtt(SuperType, 1), false,
+      WasmInitExpr::RttCanon(static_cast<HeapType::Representation>(SuperType)));
+  const byte RttSub = tester.AddGlobal(
+      ValueType::Rtt(SubType, 2), false,
+      WasmInitExpr::RttSub(static_cast<HeapType::Representation>(SubType),
+                           WasmInitExpr::GlobalGet(RttSuper)));
+  const byte RttList = tester.AddGlobal(
+      ValueType::Rtt(ListType, 1), false,
+      WasmInitExpr::RttCanon(static_cast<HeapType::Representation>(ListType)));
+
+  const uint32_t kListLength = 1024;
+  const uint32_t i = 0;
+  const byte Prepare = tester.DefineFunction(
+      tester.sigs.i_v(), {wasm::kWasmI32},
+      {// List = new eqref[kListLength];
+       WASM_GLOBAL_SET(List,
+                       WASM_ARRAY_NEW_DEFAULT(ListType, WASM_I32V(kListLength),
+                                              WASM_GLOBAL_GET(RttList))),
+       // for (int i = 0; i < kListLength; ) {
+       //   List[i] = new Super(i);
+       //   i++;
+       //   List[i] = new Sub(i, 0);
+       //   i++;
+       // }
+       WASM_LOCAL_SET(i, WASM_I32V_1(0)),
+       WASM_LOOP(
+           WASM_ARRAY_SET(ListType, WASM_GLOBAL_GET(List), WASM_LOCAL_GET(i),
+                          WASM_STRUCT_NEW_WITH_RTT(SuperType, WASM_LOCAL_GET(i),
+                                                   WASM_GLOBAL_GET(RttSuper))),
+           WASM_LOCAL_SET(i, WASM_I32_ADD(WASM_LOCAL_GET(i), WASM_I32V_1(1))),
+           WASM_ARRAY_SET(ListType, WASM_GLOBAL_GET(List), WASM_LOCAL_GET(i),
+                          WASM_STRUCT_NEW_WITH_RTT(SubType, WASM_LOCAL_GET(i),
+                                                   WASM_I32V_1(0),
+                                                   WASM_GLOBAL_GET(RttSub))),
+           WASM_LOCAL_SET(i, WASM_I32_ADD(WASM_LOCAL_GET(i), WASM_I32V_1(1))),
+           WASM_BR_IF(0,
+                      WASM_I32_NE(WASM_LOCAL_GET(i), WASM_I32V(kListLength)))),
+       // return 42;  // Dummy value, due to test framework.
+       WASM_I32V_1(42), kExprEnd});
+
+  const uint32_t sum = 1;  // Index of the local.
+  const uint32_t list = 2;
+  const uint32_t kLoops = 2;
+  const uint32_t kIterations = kLoops * kListLength;
+  const byte Main = tester.DefineFunction(
+      tester.sigs.i_v(),
+      {
+          wasm::kWasmI32,
+          wasm::kWasmI32,
+          ValueType::Ref(ListType, kNullable),
+      },
+      {WASM_LOCAL_SET(list, WASM_GLOBAL_GET(List)),
+       // sum = 0;
+       WASM_LOCAL_SET(sum, WASM_I32V_1(0)),
+       // for (int i = 0; i < kIterations; i++) {
+       //   sum += ref.cast<super>(List[i & kListLength]).x
+       // }
+       WASM_LOCAL_SET(i, WASM_I32V_1(0)),
+       WASM_LOOP(
+           WASM_LOCAL_SET(
+               sum, WASM_I32_ADD(
+                        WASM_LOCAL_GET(sum),
+                        WASM_STRUCT_GET(
+                            SuperType, 0,
+                            WASM_REF_CAST(
+                                kEqRefCode, SuperType,
+                                WASM_ARRAY_GET(
+                                    ListType, WASM_LOCAL_GET(list),
+                                    WASM_I32_AND(WASM_LOCAL_GET(i),
+                                                 WASM_I32V(kListLength - 1))),
+                                WASM_GLOBAL_GET(RttSuper))))),
+           WASM_LOCAL_SET(i, WASM_I32_ADD(WASM_LOCAL_GET(i), WASM_I32V_1(1))),
+           WASM_BR_IF(0,
+                      WASM_I32_LTS(WASM_LOCAL_GET(i), WASM_I32V(kIterations)))),
+       // return sum;
+       WASM_LOCAL_GET(sum), kExprEnd});
+
+  tester.CompileModule();
+  tester.CheckResult(Prepare, 42);
+
+  // Time this section to get a benchmark for subtyping checks.
+  // Note: if you bump kIterations or kListLength, you may have to take i32
+  // overflow into account.
+  tester.CheckResult(Main, (kListLength * (kListLength - 1) / 2) * kLoops);
+}
+
+WASM_COMPILED_EXEC_TEST(GlobalInitReferencingGlobal) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   const byte from = tester.AddGlobal(kWasmI32, false, WasmInitExpr(42));
   const byte to =
       tester.AddGlobal(kWasmI32, false, WasmInitExpr::GlobalGet(from));
 
   const byte func = tester.DefineFunction(tester.sigs.i_v(), {},
-                                          {WASM_GET_GLOBAL(to), kExprEnd});
+                                          {WASM_GLOBAL_GET(to), kExprEnd});
 
   tester.CompileModule();
 
   tester.CheckResult(func, 42);
 }
 
-TEST(IndirectNullSetManually) {
-  WasmGCTester tester;
+WASM_COMPILED_EXEC_TEST(IndirectNullSetManually) {
+  WasmGCTester tester(execution_tier);
+  FLAG_experimental_liftoff_extern_ref = true;
   byte sig_index = tester.DefineSignature(tester.sigs.i_i());
   tester.DefineTable(ValueType::Ref(sig_index, kNullable), 1, 1);
   byte func_index = tester.DefineFunction(
       tester.sigs.i_i(), {},
       {WASM_TABLE_SET(0, WASM_I32V(0), WASM_REF_NULL(sig_index)),
-       WASM_CALL_INDIRECT(sig_index, WASM_I32V(0), WASM_GET_LOCAL(0)),
+       WASM_CALL_INDIRECT(sig_index, WASM_I32V(0), WASM_LOCAL_GET(0)),
        kExprEnd});
 
   tester.CompileModule();
@@ -1068,71 +1326,73 @@ TEST(IndirectNullSetManually) {
 }
 
 TEST(JsAccess) {
-  WasmGCTester tester;
-  const byte type_index = tester.DefineStruct({F(wasm::kWasmI32, true)});
-  ValueType kRefTypes[] = {ref(type_index)};
-  ValueType kEqRefTypes[] = {kWasmEqRef};
-  ValueType kEqToI[] = {kWasmI32, kWasmEqRef};
-  FunctionSig sig_t_v(1, 0, kRefTypes);
-  FunctionSig sig_q_v(1, 0, kEqRefTypes);
-  FunctionSig sig_i_q(1, 1, kEqToI);
-
-  tester.DefineExportedFunction(
-      "disallowed", &sig_t_v,
-      {WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
-                                WASM_RTT_CANON(type_index)),
-       kExprEnd});
-  // Same code, different signature.
-  tester.DefineExportedFunction(
-      "producer", &sig_q_v,
-      {WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
-                                WASM_RTT_CANON(type_index)),
-       kExprEnd});
-  tester.DefineExportedFunction(
-      "consumer", &sig_i_q,
-      {WASM_STRUCT_GET(type_index, 0,
-                       WASM_REF_CAST(kEqRefCode, type_index, WASM_GET_LOCAL(0),
-                                     WASM_RTT_CANON(type_index))),
-       kExprEnd});
-
-  tester.CompileModule();
-  Isolate* isolate = tester.isolate();
-  TryCatch try_catch(reinterpret_cast<v8::Isolate*>(isolate));
-  MaybeHandle<Object> maybe_result =
-      tester.CallExportedFunction("disallowed", 0, nullptr);
-  CHECK(maybe_result.is_null());
-  CHECK(try_catch.HasCaught());
-  try_catch.Reset();
-  isolate->clear_pending_exception();
-
-  maybe_result = tester.CallExportedFunction("producer", 0, nullptr);
-  if (maybe_result.is_null()) {
-    FATAL("Calling 'producer' failed: %s",
-          *v8::String::Utf8Value(reinterpret_cast<v8::Isolate*>(isolate),
-                                 try_catch.Message()->Get()));
-  }
-  {
-    Handle<Object> args[] = {maybe_result.ToHandleChecked()};
-    maybe_result = tester.CallExportedFunction("consumer", 1, args);
-  }
-  if (maybe_result.is_null()) {
-    FATAL("Calling 'consumer' failed: %s",
-          *v8::String::Utf8Value(reinterpret_cast<v8::Isolate*>(isolate),
-                                 try_catch.Message()->Get()));
-  }
-  Handle<Object> result = maybe_result.ToHandleChecked();
-  CHECK(result->IsSmi());
-  CHECK_EQ(42, Smi::cast(*result).value());
-  // Calling {consumer} with any other object (e.g. the Smi we just got as
-  // {result}) should trap.
-  {
-    Handle<Object> args[] = {result};
-    maybe_result = tester.CallExportedFunction("consumer", 1, args);
+  for (ValueType supertype : {kWasmEqRef, kWasmAnyRef}) {
+    WasmGCTester tester;
+    const byte type_index = tester.DefineStruct({F(wasm::kWasmI32, true)});
+    ValueType kRefType = ref(type_index);
+    ValueType kSupertypeToI[] = {kWasmI32, supertype};
+    FunctionSig sig_t_v(1, 0, &kRefType);
+    FunctionSig sig_super_v(1, 0, &supertype);
+    FunctionSig sig_i_super(1, 1, kSupertypeToI);
+
+    tester.DefineExportedFunction(
+        "disallowed", &sig_t_v,
+        {WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
+                                  WASM_RTT_CANON(type_index)),
+         kExprEnd});
+    // Same code, different signature.
+    tester.DefineExportedFunction(
+        "producer", &sig_super_v,
+        {WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
+                                  WASM_RTT_CANON(type_index)),
+         kExprEnd});
+    tester.DefineExportedFunction(
+        "consumer", &sig_i_super,
+        {WASM_STRUCT_GET(
+             type_index, 0,
+             WASM_REF_CAST(supertype.value_type_code(), type_index,
+                           WASM_LOCAL_GET(0), WASM_RTT_CANON(type_index))),
+         kExprEnd});
+
+    tester.CompileModule();
+    Isolate* isolate = tester.isolate();
+    TryCatch try_catch(reinterpret_cast<v8::Isolate*>(isolate));
+    MaybeHandle<Object> maybe_result =
+        tester.CallExportedFunction("disallowed", 0, nullptr);
+    CHECK(maybe_result.is_null());
+    CHECK(try_catch.HasCaught());
+    try_catch.Reset();
+    isolate->clear_pending_exception();
+
+    maybe_result = tester.CallExportedFunction("producer", 0, nullptr);
+    if (maybe_result.is_null()) {
+      FATAL("Calling 'producer' failed: %s",
+            *v8::String::Utf8Value(reinterpret_cast<v8::Isolate*>(isolate),
+                                   try_catch.Message()->Get()));
+    }
+    {
+      Handle<Object> args[] = {maybe_result.ToHandleChecked()};
+      maybe_result = tester.CallExportedFunction("consumer", 1, args);
+    }
+    if (maybe_result.is_null()) {
+      FATAL("Calling 'consumer' failed: %s",
+            *v8::String::Utf8Value(reinterpret_cast<v8::Isolate*>(isolate),
+                                   try_catch.Message()->Get()));
+    }
+    Handle<Object> result = maybe_result.ToHandleChecked();
+    CHECK(result->IsSmi());
+    CHECK_EQ(42, Smi::cast(*result).value());
+    // Calling {consumer} with any other object (e.g. the Smi we just got as
+    // {result}) should trap.
+    {
+      Handle<Object> args[] = {result};
+      maybe_result = tester.CallExportedFunction("consumer", 1, args);
+    }
+    CHECK(maybe_result.is_null());
+    CHECK(try_catch.HasCaught());
+    try_catch.Reset();
+    isolate->clear_pending_exception();
   }
-  CHECK(maybe_result.is_null());
-  CHECK(try_catch.HasCaught());
-  try_catch.Reset();
-  isolate->clear_pending_exception();
 }
 
 }  // namespace test_gc
diff --git a/deps/v8/test/cctest/wasm/test-liftoff-inspection.cc b/deps/v8/test/cctest/wasm/test-liftoff-inspection.cc
index 73855e91fcf2fa..c3444b9ae659e2 100644
--- a/deps/v8/test/cctest/wasm/test-liftoff-inspection.cc
+++ b/deps/v8/test/cctest/wasm/test-liftoff-inspection.cc
@@ -267,44 +267,44 @@ TEST(Liftoff_deterministic_simple) {
   LiftoffCompileEnvironment env;
   env.CheckDeterministicCompilation(
       {kWasmI32}, {kWasmI32, kWasmI32},
-      {WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))});
+      {WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))});
 }
 
 TEST(Liftoff_deterministic_call) {
   LiftoffCompileEnvironment env;
   env.CheckDeterministicCompilation(
       {kWasmI32}, {kWasmI32},
-      {WASM_I32_ADD(WASM_CALL_FUNCTION(0, WASM_GET_LOCAL(0)),
-                    WASM_GET_LOCAL(0))});
+      {WASM_I32_ADD(WASM_CALL_FUNCTION(0, WASM_LOCAL_GET(0)),
+                    WASM_LOCAL_GET(0))});
 }
 
 TEST(Liftoff_deterministic_indirect_call) {
   LiftoffCompileEnvironment env;
   env.CheckDeterministicCompilation(
       {kWasmI32}, {kWasmI32},
-      {WASM_I32_ADD(WASM_CALL_INDIRECT(0, WASM_GET_LOCAL(0), WASM_I32V_1(47)),
-                    WASM_GET_LOCAL(0))});
+      {WASM_I32_ADD(WASM_CALL_INDIRECT(0, WASM_LOCAL_GET(0), WASM_I32V_1(47)),
+                    WASM_LOCAL_GET(0))});
 }
 
 TEST(Liftoff_deterministic_loop) {
   LiftoffCompileEnvironment env;
   env.CheckDeterministicCompilation(
       {kWasmI32}, {kWasmI32},
-      {WASM_LOOP(WASM_BR_IF(0, WASM_GET_LOCAL(0))), WASM_GET_LOCAL(0)});
+      {WASM_LOOP(WASM_BR_IF(0, WASM_LOCAL_GET(0))), WASM_LOCAL_GET(0)});
 }
 
 TEST(Liftoff_deterministic_trap) {
   LiftoffCompileEnvironment env;
   env.CheckDeterministicCompilation(
       {kWasmI32}, {kWasmI32, kWasmI32},
-      {WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))});
+      {WASM_I32_DIVS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))});
 }
 
 TEST(Liftoff_debug_side_table_simple) {
   LiftoffCompileEnvironment env;
   auto debug_side_table = env.GenerateDebugSideTable(
       {kWasmI32}, {kWasmI32, kWasmI32},
-      {WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))});
+      {WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))});
   CheckDebugSideTable(
       {
           // function entry, locals in registers.
@@ -319,8 +319,8 @@ TEST(Liftoff_debug_side_table_call) {
   LiftoffCompileEnvironment env;
   auto debug_side_table = env.GenerateDebugSideTable(
       {kWasmI32}, {kWasmI32},
-      {WASM_I32_ADD(WASM_CALL_FUNCTION(0, WASM_GET_LOCAL(0)),
-                    WASM_GET_LOCAL(0))});
+      {WASM_I32_ADD(WASM_CALL_FUNCTION(0, WASM_LOCAL_GET(0)),
+                    WASM_LOCAL_GET(0))});
   CheckDebugSideTable(
       {
           // function entry, local in register.
@@ -338,9 +338,9 @@ TEST(Liftoff_debug_side_table_call_const) {
   constexpr int kConst = 13;
   auto debug_side_table = env.GenerateDebugSideTable(
       {kWasmI32}, {kWasmI32},
-      {WASM_SET_LOCAL(0, WASM_I32V_1(kConst)),
-       WASM_I32_ADD(WASM_CALL_FUNCTION(0, WASM_GET_LOCAL(0)),
-                    WASM_GET_LOCAL(0))});
+      {WASM_LOCAL_SET(0, WASM_I32V_1(kConst)),
+       WASM_I32_ADD(WASM_CALL_FUNCTION(0, WASM_LOCAL_GET(0)),
+                    WASM_LOCAL_GET(0))});
   CheckDebugSideTable(
       {
           // function entry, local in register.
@@ -358,8 +358,8 @@ TEST(Liftoff_debug_side_table_indirect_call) {
   constexpr int kConst = 47;
   auto debug_side_table = env.GenerateDebugSideTable(
       {kWasmI32}, {kWasmI32},
-      {WASM_I32_ADD(WASM_CALL_INDIRECT(0, WASM_I32V_1(47), WASM_GET_LOCAL(0)),
-                    WASM_GET_LOCAL(0))});
+      {WASM_I32_ADD(WASM_CALL_INDIRECT(0, WASM_I32V_1(47), WASM_LOCAL_GET(0)),
+                    WASM_LOCAL_GET(0))});
   CheckDebugSideTable(
       {
           // function entry, local in register.
@@ -381,7 +381,7 @@ TEST(Liftoff_debug_side_table_loop) {
   constexpr int kConst = 42;
   auto debug_side_table = env.GenerateDebugSideTable(
       {kWasmI32}, {kWasmI32},
-      {WASM_I32V_1(kConst), WASM_LOOP(WASM_BR_IF(0, WASM_GET_LOCAL(0)))});
+      {WASM_I32V_1(kConst), WASM_LOOP(WASM_BR_IF(0, WASM_LOCAL_GET(0)))});
   CheckDebugSideTable(
       {
           // function entry, local in register.
@@ -398,7 +398,7 @@ TEST(Liftoff_debug_side_table_trap) {
   LiftoffCompileEnvironment env;
   auto debug_side_table = env.GenerateDebugSideTable(
       {kWasmI32}, {kWasmI32, kWasmI32},
-      {WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))});
+      {WASM_I32_DIVS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))});
   CheckDebugSideTable(
       {
           // function entry, locals in registers.
@@ -418,7 +418,7 @@ TEST(Liftoff_breakpoint_simple) {
   // Set two breakpoints. At both locations, values are live in registers.
   auto debug_side_table = env.GenerateDebugSideTable(
       {kWasmI32}, {kWasmI32, kWasmI32},
-      {WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))},
+      {WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))},
       {
           1,  // break at beginning of function (first local.get)
           5   // break at i32.add
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-64.cc b/deps/v8/test/cctest/wasm/test-run-wasm-64.cc
index 5a0d0918a3aa83..37163c0a8c74be 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-64.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-64.cc
@@ -45,14 +45,14 @@ WASM_EXEC_TEST(I64Const_many) {
 WASM_EXEC_TEST(Return_I64) {
   WasmRunner<int64_t, int64_t> r(execution_tier);
 
-  BUILD(r, WASM_RETURN1(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_RETURN1(WASM_LOCAL_GET(0)));
 
   FOR_INT64_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(I64Add) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       CHECK_EQ(base::AddWithWraparound(i, j), r.Call(i, j));
@@ -76,7 +76,7 @@ WASM_EXEC_TEST(Regress5800_Add) {
 
 WASM_EXEC_TEST(I64Sub) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       CHECK_EQ(base::SubWithWraparound(i, j), r.Call(i, j));
@@ -96,7 +96,7 @@ WASM_EXEC_TEST(Regress5800_Sub) {
 WASM_EXEC_TEST(I64AddUseOnlyLowWord) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
   BUILD(r, WASM_I32_CONVERT_I64(
-               WASM_I64_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+               WASM_I64_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       CHECK_EQ(static_cast<int32_t>(base::AddWithWraparound(i, j)),
@@ -108,7 +108,7 @@ WASM_EXEC_TEST(I64AddUseOnlyLowWord) {
 WASM_EXEC_TEST(I64SubUseOnlyLowWord) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
   BUILD(r, WASM_I32_CONVERT_I64(
-               WASM_I64_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+               WASM_I64_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       CHECK_EQ(static_cast<int32_t>(base::SubWithWraparound(i, j)),
@@ -120,7 +120,7 @@ WASM_EXEC_TEST(I64SubUseOnlyLowWord) {
 WASM_EXEC_TEST(I64MulUseOnlyLowWord) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
   BUILD(r, WASM_I32_CONVERT_I64(
-               WASM_I64_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+               WASM_I64_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       CHECK_EQ(static_cast<int32_t>(base::MulWithWraparound(i, j)),
@@ -132,7 +132,7 @@ WASM_EXEC_TEST(I64MulUseOnlyLowWord) {
 WASM_EXEC_TEST(I64ShlUseOnlyLowWord) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
   BUILD(r, WASM_I32_CONVERT_I64(
-               WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+               WASM_I64_SHL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       int32_t expected = static_cast<int32_t>(base::ShlWithWraparound(i, j));
@@ -144,7 +144,7 @@ WASM_EXEC_TEST(I64ShlUseOnlyLowWord) {
 WASM_EXEC_TEST(I64ShrUseOnlyLowWord) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
   BUILD(r, WASM_I32_CONVERT_I64(
-               WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+               WASM_I64_SHR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) {
       int32_t expected = static_cast<int32_t>((i) >> (j & 0x3F));
@@ -156,7 +156,7 @@ WASM_EXEC_TEST(I64ShrUseOnlyLowWord) {
 WASM_EXEC_TEST(I64SarUseOnlyLowWord) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
   BUILD(r, WASM_I32_CONVERT_I64(
-               WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+               WASM_I64_SAR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       int32_t expected = static_cast<int32_t>((i) >> (j & 0x3F));
@@ -167,7 +167,7 @@ WASM_EXEC_TEST(I64SarUseOnlyLowWord) {
 
 WASM_EXEC_TEST(I64DivS) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_DIVS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       if (j == 0) {
@@ -183,7 +183,7 @@ WASM_EXEC_TEST(I64DivS) {
 
 WASM_EXEC_TEST(I64DivS_Trap) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_DIVS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   CHECK_EQ(0, r.Call(int64_t{0}, int64_t{100}));
   CHECK_TRAP64(r.Call(int64_t{100}, int64_t{0}));
   CHECK_TRAP64(r.Call(int64_t{-1001}, int64_t{0}));
@@ -194,7 +194,7 @@ WASM_EXEC_TEST(I64DivS_Trap) {
 WASM_EXEC_TEST(I64DivS_Byzero_Const) {
   for (int8_t denom = -2; denom < 8; denom++) {
     WasmRunner<int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_I64V_1(denom)));
+    BUILD(r, WASM_I64_DIVS(WASM_LOCAL_GET(0), WASM_I64V_1(denom)));
     for (int64_t val = -7; val < 8; val++) {
       if (denom == 0) {
         CHECK_TRAP64(r.Call(val));
@@ -207,7 +207,7 @@ WASM_EXEC_TEST(I64DivS_Byzero_Const) {
 
 WASM_EXEC_TEST(I64DivU) {
   WasmRunner<uint64_t, uint64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_DIVU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) {
       if (j == 0) {
@@ -221,7 +221,7 @@ WASM_EXEC_TEST(I64DivU) {
 
 WASM_EXEC_TEST(I64DivU_Trap) {
   WasmRunner<uint64_t, uint64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_DIVU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   CHECK_EQ(0, r.Call(uint64_t{0}, uint64_t{100}));
   CHECK_TRAP64(r.Call(uint64_t{100}, uint64_t{0}));
   CHECK_TRAP64(r.Call(uint64_t{1001}, uint64_t{0}));
@@ -231,7 +231,7 @@ WASM_EXEC_TEST(I64DivU_Trap) {
 WASM_EXEC_TEST(I64DivU_Byzero_Const) {
   for (uint64_t denom = 0xFFFFFFFFFFFFFFFE; denom < 8; denom++) {
     WasmRunner<uint64_t, uint64_t> r(execution_tier);
-    BUILD(r, WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_I64V_1(denom)));
+    BUILD(r, WASM_I64_DIVU(WASM_LOCAL_GET(0), WASM_I64V_1(denom)));
 
     for (uint64_t val = 0xFFFFFFFFFFFFFFF0; val < 8; val++) {
       if (denom == 0) {
@@ -245,7 +245,7 @@ WASM_EXEC_TEST(I64DivU_Byzero_Const) {
 
 WASM_EXEC_TEST(I64RemS) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_REMS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
       if (j == 0) {
@@ -261,7 +261,7 @@ WASM_EXEC_TEST(I64RemS) {
 
 WASM_EXEC_TEST(I64RemS_Trap) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_REMS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   CHECK_EQ(33, r.Call(int64_t{133}, int64_t{100}));
   CHECK_EQ(0, r.Call(std::numeric_limits<int64_t>::min(), int64_t{-1}));
   CHECK_TRAP64(r.Call(int64_t{100}, int64_t{0}));
@@ -271,7 +271,7 @@ WASM_EXEC_TEST(I64RemS_Trap) {
 
 WASM_EXEC_TEST(I64RemU) {
   WasmRunner<uint64_t, uint64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_REMU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) {
       if (j == 0) {
@@ -285,7 +285,7 @@ WASM_EXEC_TEST(I64RemU) {
 
 WASM_EXEC_TEST(I64RemU_Trap) {
   WasmRunner<uint64_t, uint64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_REMU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   CHECK_EQ(17, r.Call(uint64_t{217}, uint64_t{100}));
   CHECK_TRAP64(r.Call(uint64_t{100}, uint64_t{0}));
   CHECK_TRAP64(r.Call(uint64_t{1001}, uint64_t{0}));
@@ -294,7 +294,7 @@ WASM_EXEC_TEST(I64RemU_Trap) {
 
 WASM_EXEC_TEST(I64And) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_AND(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_AND(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ((i) & (j), r.Call(i, j)); }
   }
@@ -302,7 +302,7 @@ WASM_EXEC_TEST(I64And) {
 
 WASM_EXEC_TEST(I64Ior) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_IOR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_IOR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ((i) | (j), r.Call(i, j)); }
   }
@@ -310,7 +310,7 @@ WASM_EXEC_TEST(I64Ior) {
 
 WASM_EXEC_TEST(I64Xor) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_XOR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ((i) ^ (j), r.Call(i, j)); }
   }
@@ -319,7 +319,7 @@ WASM_EXEC_TEST(I64Xor) {
 WASM_EXEC_TEST(I64Shl) {
   {
     WasmRunner<uint64_t, uint64_t, uint64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_I64_SHL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
     FOR_UINT64_INPUTS(i) {
       FOR_UINT64_INPUTS(j) {
@@ -330,22 +330,22 @@ WASM_EXEC_TEST(I64Shl) {
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(0)));
+    BUILD(r, WASM_I64_SHL(WASM_LOCAL_GET(0), WASM_I64V_1(0)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i << 0, r.Call(i)); }
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(32)));
+    BUILD(r, WASM_I64_SHL(WASM_LOCAL_GET(0), WASM_I64V_1(32)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i << 32, r.Call(i)); }
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(20)));
+    BUILD(r, WASM_I64_SHL(WASM_LOCAL_GET(0), WASM_I64V_1(20)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i << 20, r.Call(i)); }
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(40)));
+    BUILD(r, WASM_I64_SHL(WASM_LOCAL_GET(0), WASM_I64V_1(40)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i << 40, r.Call(i)); }
   }
 }
@@ -353,7 +353,7 @@ WASM_EXEC_TEST(I64Shl) {
 WASM_EXEC_TEST(I64ShrU) {
   {
     WasmRunner<uint64_t, uint64_t, uint64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_I64_SHR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
     FOR_UINT64_INPUTS(i) {
       FOR_UINT64_INPUTS(j) {
@@ -364,22 +364,22 @@ WASM_EXEC_TEST(I64ShrU) {
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(0)));
+    BUILD(r, WASM_I64_SHR(WASM_LOCAL_GET(0), WASM_I64V_1(0)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i >> 0, r.Call(i)); }
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(32)));
+    BUILD(r, WASM_I64_SHR(WASM_LOCAL_GET(0), WASM_I64V_1(32)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i >> 32, r.Call(i)); }
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(20)));
+    BUILD(r, WASM_I64_SHR(WASM_LOCAL_GET(0), WASM_I64V_1(20)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i >> 20, r.Call(i)); }
   }
   {
     WasmRunner<uint64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(40)));
+    BUILD(r, WASM_I64_SHR(WASM_LOCAL_GET(0), WASM_I64V_1(40)));
     FOR_UINT64_INPUTS(i) { CHECK_EQ(i >> 40, r.Call(i)); }
   }
 }
@@ -387,7 +387,7 @@ WASM_EXEC_TEST(I64ShrU) {
 WASM_EXEC_TEST(I64ShrS) {
   {
     WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_I64_SAR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
@@ -398,29 +398,29 @@ WASM_EXEC_TEST(I64ShrS) {
   }
   {
     WasmRunner<int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(0)));
+    BUILD(r, WASM_I64_SAR(WASM_LOCAL_GET(0), WASM_I64V_1(0)));
     FOR_INT64_INPUTS(i) { CHECK_EQ(i >> 0, r.Call(i)); }
   }
   {
     WasmRunner<int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(32)));
+    BUILD(r, WASM_I64_SAR(WASM_LOCAL_GET(0), WASM_I64V_1(32)));
     FOR_INT64_INPUTS(i) { CHECK_EQ(i >> 32, r.Call(i)); }
   }
   {
     WasmRunner<int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(20)));
+    BUILD(r, WASM_I64_SAR(WASM_LOCAL_GET(0), WASM_I64V_1(20)));
     FOR_INT64_INPUTS(i) { CHECK_EQ(i >> 20, r.Call(i)); }
   }
   {
     WasmRunner<int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(40)));
+    BUILD(r, WASM_I64_SAR(WASM_LOCAL_GET(0), WASM_I64V_1(40)));
     FOR_INT64_INPUTS(i) { CHECK_EQ(i >> 40, r.Call(i)); }
   }
 }
 
 WASM_EXEC_TEST(I64Eq) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_EQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_EQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ(i == j ? 1 : 0, r.Call(i, j)); }
   }
@@ -428,7 +428,7 @@ WASM_EXEC_TEST(I64Eq) {
 
 WASM_EXEC_TEST(I64Ne) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_NE(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_NE(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ(i != j ? 1 : 0, r.Call(i, j)); }
   }
@@ -436,7 +436,7 @@ WASM_EXEC_TEST(I64Ne) {
 
 WASM_EXEC_TEST(I64LtS) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_LTS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_LTS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ(i < j ? 1 : 0, r.Call(i, j)); }
   }
@@ -444,7 +444,7 @@ WASM_EXEC_TEST(I64LtS) {
 
 WASM_EXEC_TEST(I64LeS) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_LES(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_LES(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ(i <= j ? 1 : 0, r.Call(i, j)); }
   }
@@ -452,7 +452,7 @@ WASM_EXEC_TEST(I64LeS) {
 
 WASM_EXEC_TEST(I64LtU) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_LTU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_LTU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) { CHECK_EQ(i < j ? 1 : 0, r.Call(i, j)); }
   }
@@ -460,7 +460,7 @@ WASM_EXEC_TEST(I64LtU) {
 
 WASM_EXEC_TEST(I64LeU) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_LEU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_LEU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) { CHECK_EQ(i <= j ? 1 : 0, r.Call(i, j)); }
   }
@@ -468,7 +468,7 @@ WASM_EXEC_TEST(I64LeU) {
 
 WASM_EXEC_TEST(I64GtS) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_GTS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_GTS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ(i > j ? 1 : 0, r.Call(i, j)); }
   }
@@ -476,7 +476,7 @@ WASM_EXEC_TEST(I64GtS) {
 
 WASM_EXEC_TEST(I64GeS) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_GES(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_GES(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) { CHECK_EQ(i >= j ? 1 : 0, r.Call(i, j)); }
   }
@@ -484,7 +484,7 @@ WASM_EXEC_TEST(I64GeS) {
 
 WASM_EXEC_TEST(I64GtU) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_GTU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_GTU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) { CHECK_EQ(i > j ? 1 : 0, r.Call(i, j)); }
   }
@@ -492,7 +492,7 @@ WASM_EXEC_TEST(I64GtU) {
 
 WASM_EXEC_TEST(I64GeU) {
   WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_GEU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_GEU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) { CHECK_EQ(i >= j ? 1 : 0, r.Call(i, j)); }
   }
@@ -508,13 +508,13 @@ WASM_EXEC_TEST(I32ConvertI64) {
 
 WASM_EXEC_TEST(I64SConvertI32) {
   WasmRunner<int64_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I64_SCONVERT_I32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SCONVERT_I32(WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) { CHECK_EQ(static_cast<int64_t>(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(I64UConvertI32) {
   WasmRunner<int64_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_I64_UCONVERT_I32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_UCONVERT_I32(WASM_LOCAL_GET(0)));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(static_cast<int64_t>(i), r.Call(i)); }
 }
 
@@ -529,7 +529,7 @@ WASM_EXEC_TEST(I64Popcnt) {
                 {38, 0xFFEDCBA09EDCBA09}};
 
   WasmRunner<int64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_POPCNT(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_POPCNT(WASM_LOCAL_GET(0)));
   for (size_t i = 0; i < arraysize(values); i++) {
     CHECK_EQ(values[i].expected, r.Call(values[i].input));
   }
@@ -537,7 +537,7 @@ WASM_EXEC_TEST(I64Popcnt) {
 
 WASM_EXEC_TEST(F32SConvertI64) {
   WasmRunner<float, int64_t> r(execution_tier);
-  BUILD(r, WASM_F32_SCONVERT_I64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_SCONVERT_I64(WASM_LOCAL_GET(0)));
   FOR_INT64_INPUTS(i) { CHECK_FLOAT_EQ(static_cast<float>(i), r.Call(i)); }
 }
 
@@ -624,7 +624,7 @@ WASM_EXEC_TEST(F32UConvertI64) {
                 {0x20000020000001, 0x5a000001},
                 {0xFFFFFe8000000001, 0x5f7FFFFF}};
   WasmRunner<float, uint64_t> r(execution_tier);
-  BUILD(r, WASM_F32_UCONVERT_I64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_UCONVERT_I64(WASM_LOCAL_GET(0)));
   for (size_t i = 0; i < arraysize(values); i++) {
     CHECK_EQ(bit_cast<float>(values[i].expected), r.Call(values[i].input));
   }
@@ -632,7 +632,7 @@ WASM_EXEC_TEST(F32UConvertI64) {
 
 WASM_EXEC_TEST(F64SConvertI64) {
   WasmRunner<double, int64_t> r(execution_tier);
-  BUILD(r, WASM_F64_SCONVERT_I64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_SCONVERT_I64(WASM_LOCAL_GET(0)));
   FOR_INT64_INPUTS(i) { CHECK_DOUBLE_EQ(static_cast<double>(i), r.Call(i)); }
 }
 
@@ -716,7 +716,7 @@ WASM_EXEC_TEST(F64UConvertI64) {
                 {0x8000000000000400, 0x43E0000000000000},
                 {0x8000000000000401, 0x43E0000000000001}};
   WasmRunner<double, uint64_t> r(execution_tier);
-  BUILD(r, WASM_F64_UCONVERT_I64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_UCONVERT_I64(WASM_LOCAL_GET(0)));
   for (size_t i = 0; i < arraysize(values); i++) {
     CHECK_EQ(bit_cast<double>(values[i].expected), r.Call(values[i].input));
   }
@@ -724,7 +724,7 @@ WASM_EXEC_TEST(F64UConvertI64) {
 
 WASM_EXEC_TEST(I64SConvertF32) {
   WasmRunner<int64_t, float> r(execution_tier);
-  BUILD(r, WASM_I64_SCONVERT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SCONVERT_F32(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     if (base::IsValueInRangeForNumericType<int64_t>(i)) {
@@ -737,7 +737,7 @@ WASM_EXEC_TEST(I64SConvertF32) {
 
 WASM_EXEC_TEST(I64SConvertSatF32) {
   WasmRunner<int64_t, float> r(execution_tier);
-  BUILD(r, WASM_I64_SCONVERT_SAT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SCONVERT_SAT_F32(WASM_LOCAL_GET(0)));
   FOR_FLOAT32_INPUTS(i) {
     int64_t expected;
     if (base::IsValueInRangeForNumericType<int64_t>(i)) {
@@ -756,7 +756,7 @@ WASM_EXEC_TEST(I64SConvertSatF32) {
 
 WASM_EXEC_TEST(I64SConvertF64) {
   WasmRunner<int64_t, double> r(execution_tier);
-  BUILD(r, WASM_I64_SCONVERT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SCONVERT_F64(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) {
     if (base::IsValueInRangeForNumericType<int64_t>(i)) {
@@ -769,7 +769,7 @@ WASM_EXEC_TEST(I64SConvertF64) {
 
 WASM_EXEC_TEST(I64SConvertSatF64) {
   WasmRunner<int64_t, double> r(execution_tier);
-  BUILD(r, WASM_I64_SCONVERT_SAT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SCONVERT_SAT_F64(WASM_LOCAL_GET(0)));
   FOR_FLOAT64_INPUTS(i) {
     int64_t expected;
     if (base::IsValueInRangeForNumericType<int64_t>(i)) {
@@ -788,7 +788,7 @@ WASM_EXEC_TEST(I64SConvertSatF64) {
 
 WASM_EXEC_TEST(I64UConvertF32) {
   WasmRunner<uint64_t, float> r(execution_tier);
-  BUILD(r, WASM_I64_UCONVERT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_UCONVERT_F32(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     if (i < static_cast<float>(std::numeric_limits<uint64_t>::max()) &&
@@ -802,7 +802,7 @@ WASM_EXEC_TEST(I64UConvertF32) {
 
 WASM_EXEC_TEST(I64UConvertSatF32) {
   WasmRunner<int64_t, float> r(execution_tier);
-  BUILD(r, WASM_I64_UCONVERT_SAT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_UCONVERT_SAT_F32(WASM_LOCAL_GET(0)));
   FOR_FLOAT32_INPUTS(i) {
     uint64_t expected;
     if (i < static_cast<float>(std::numeric_limits<uint64_t>::max()) &&
@@ -822,7 +822,7 @@ WASM_EXEC_TEST(I64UConvertSatF32) {
 
 WASM_EXEC_TEST(I64UConvertF64) {
   WasmRunner<uint64_t, double> r(execution_tier);
-  BUILD(r, WASM_I64_UCONVERT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_UCONVERT_F64(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) {
     if (i < static_cast<float>(std::numeric_limits<uint64_t>::max()) &&
@@ -836,7 +836,7 @@ WASM_EXEC_TEST(I64UConvertF64) {
 
 WASM_EXEC_TEST(I64UConvertSatF64) {
   WasmRunner<int64_t, double> r(execution_tier);
-  BUILD(r, WASM_I64_UCONVERT_SAT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_UCONVERT_SAT_F64(WASM_LOCAL_GET(0)));
   FOR_FLOAT64_INPUTS(i) {
     int64_t expected;
     if (i < static_cast<float>(std::numeric_limits<uint64_t>::max()) &&
@@ -865,7 +865,7 @@ WASM_EXEC_TEST(CallI64Parameter) {
     WasmRunner<int32_t> r(execution_tier);
     // Build the target function.
     WasmFunctionCompiler& t = r.NewFunction(&sig);
-    BUILD(t, WASM_GET_LOCAL(i));
+    BUILD(t, WASM_LOCAL_GET(i));
 
     // Build the calling function.
     BUILD(
@@ -896,7 +896,7 @@ WASM_EXEC_TEST(CallI64Return) {
   WasmRunner<int64_t> r(execution_tier);
   // Build the target function.
   WasmFunctionCompiler& t = r.NewFunction(&sig);
-  BUILD(t, WASM_GET_LOCAL(0), WASM_I32V(7));
+  BUILD(t, WASM_LOCAL_GET(0), WASM_I32V(7));
 
   // Build the first calling function.
   BUILD(r, WASM_CALL_FUNCTION(t.function_index(), WASM_I64V(0xBCD12340000000B)),
@@ -916,7 +916,7 @@ void TestI64Binop(TestExecutionTier execution_tier, WasmOpcode opcode,
   {
     WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
     // return a op b
-    BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
     CHECK_EQ(expected, r.Call(a, b));
   }
 }
@@ -932,7 +932,7 @@ void TestI64Cmp(TestExecutionTier execution_tier, WasmOpcode opcode,
   {
     WasmRunner<int32_t, int64_t, int64_t> r(execution_tier);
     // return a op b
-    BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
     CHECK_EQ(expected, r.Call(a, b));
   }
 }
@@ -1040,7 +1040,7 @@ WASM_EXEC_TEST(I64Clz) {
                 {64, 0x0000000000000000}};
 
   WasmRunner<int64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_CLZ(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_CLZ(WASM_LOCAL_GET(0)));
   for (size_t i = 0; i < arraysize(values); i++) {
     CHECK_EQ(values[i].expected, r.Call(values[i].input));
   }
@@ -1085,7 +1085,7 @@ WASM_EXEC_TEST(I64Ctz) {
                 {0, 0x000000009AFDBC81}};
 
   WasmRunner<int64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_CTZ(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_CTZ(WASM_LOCAL_GET(0)));
   for (size_t i = 0; i < arraysize(values); i++) {
     CHECK_EQ(values[i].expected, r.Call(values[i].input));
   }
@@ -1102,7 +1102,7 @@ WASM_EXEC_TEST(I64Popcnt2) {
                 {38, 0xFFEDCBA09EDCBA09}};
 
   WasmRunner<int64_t, uint64_t> r(execution_tier);
-  BUILD(r, WASM_I64_POPCNT(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_POPCNT(WASM_LOCAL_GET(0)));
   for (size_t i = 0; i < arraysize(values); i++) {
     CHECK_EQ(values[i].expected, r.Call(values[i].input));
   }
@@ -1118,20 +1118,20 @@ WASM_EXEC_TEST(I64WasmRunner) {
   }
   {
     WasmRunner<int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_GET_LOCAL(0));
+    BUILD(r, WASM_LOCAL_GET(0));
     FOR_INT64_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
   }
   {
     WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_I64_XOR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) { CHECK_EQ(i ^ j, r.Call(i, j)); }
     }
   }
   {
     WasmRunner<int64_t, int64_t, int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0),
-                          WASM_I64_XOR(WASM_GET_LOCAL(1), WASM_GET_LOCAL(2))));
+    BUILD(r, WASM_I64_XOR(WASM_LOCAL_GET(0),
+                          WASM_I64_XOR(WASM_LOCAL_GET(1), WASM_LOCAL_GET(2))));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         CHECK_EQ(i ^ j ^ j, r.Call(i, j, j));
@@ -1142,10 +1142,10 @@ WASM_EXEC_TEST(I64WasmRunner) {
   }
   {
     WasmRunner<int64_t, int64_t, int64_t, int64_t, int64_t> r(execution_tier);
-    BUILD(r, WASM_I64_XOR(WASM_GET_LOCAL(0),
-                          WASM_I64_XOR(WASM_GET_LOCAL(1),
-                                       WASM_I64_XOR(WASM_GET_LOCAL(2),
-                                                    WASM_GET_LOCAL(3)))));
+    BUILD(r, WASM_I64_XOR(WASM_LOCAL_GET(0),
+                          WASM_I64_XOR(WASM_LOCAL_GET(1),
+                                       WASM_I64_XOR(WASM_LOCAL_GET(2),
+                                                    WASM_LOCAL_GET(3)))));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         CHECK_EQ(i ^ j ^ j ^ j, r.Call(i, j, j, j));
@@ -1162,11 +1162,11 @@ WASM_EXEC_TEST(Call_Int64Sub) {
   // Build the target function.
   TestSignatures sigs;
   WasmFunctionCompiler& t = r.NewFunction(sigs.l_ll());
-  BUILD(t, WASM_I64_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t, WASM_I64_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   // Build the caller function.
-  BUILD(r, WASM_CALL_FUNCTION(t.function_index(), WASM_GET_LOCAL(0),
-                              WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_CALL_FUNCTION(t.function_index(), WASM_LOCAL_GET(0),
+                              WASM_LOCAL_GET(1)));
 
   FOR_INT64_INPUTS(i) {
     FOR_INT64_INPUTS(j) {
@@ -1249,9 +1249,10 @@ WASM_EXEC_TEST(F64ReinterpretI64) {
   int64_t* memory =
       r.builder().AddMemoryElems<int64_t>(kWasmPageSize / sizeof(int64_t));
 
-  BUILD(r, WASM_STORE_MEM(MachineType::Float64(), WASM_ZERO,
-                          WASM_F64_REINTERPRET_I64(WASM_GET_LOCAL(0))),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        WASM_STORE_MEM(MachineType::Float64(), WASM_ZERO,
+                       WASM_F64_REINTERPRET_I64(WASM_LOCAL_GET(0))),
+        WASM_LOCAL_GET(0));
 
   FOR_INT32_INPUTS(i) {
     int64_t expected =
@@ -1307,16 +1308,17 @@ WASM_EXEC_TEST(MemI64_Sum) {
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
   const byte kSum = r.AllocateLocal(kWasmI64);
 
-  BUILD(r, WASM_WHILE(
-               WASM_GET_LOCAL(0),
-               WASM_BLOCK(
-                   WASM_SET_LOCAL(
-                       kSum, WASM_I64_ADD(WASM_GET_LOCAL(kSum),
-                                          WASM_LOAD_MEM(MachineType::Int64(),
-                                                        WASM_GET_LOCAL(0)))),
-                   WASM_SET_LOCAL(
-                       0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V_1(8))))),
-        WASM_GET_LOCAL(1));
+  BUILD(
+      r,
+      WASM_WHILE(
+          WASM_LOCAL_GET(0),
+          WASM_BLOCK(WASM_LOCAL_SET(
+                         kSum, WASM_I64_ADD(WASM_LOCAL_GET(kSum),
+                                            WASM_LOAD_MEM(MachineType::Int64(),
+                                                          WASM_LOCAL_GET(0)))),
+                     WASM_LOCAL_SET(
+                         0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(8))))),
+      WASM_LOCAL_GET(1));
 
   // Run 4 trials.
   for (int i = 0; i < 3; i++) {
@@ -1337,9 +1339,10 @@ WASM_EXEC_TEST(StoreMemI64_alignment) {
     WasmRunner<int64_t, int64_t> r(execution_tier);
     int64_t* memory =
         r.builder().AddMemoryElems<int64_t>(kWasmPageSize / sizeof(int64_t));
-    BUILD(r, WASM_STORE_MEM_ALIGNMENT(MachineType::Int64(), WASM_ZERO, i,
-                                      WASM_GET_LOCAL(0)),
-          WASM_GET_LOCAL(0));
+    BUILD(r,
+          WASM_STORE_MEM_ALIGNMENT(MachineType::Int64(), WASM_ZERO, i,
+                                   WASM_LOCAL_GET(0)),
+          WASM_LOCAL_GET(0));
     r.builder().RandomizeMemory(1111);
     r.builder().WriteMemory<int64_t>(&memory[0], 0);
 
@@ -1352,9 +1355,10 @@ WASM_EXEC_TEST(I64Global) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   int64_t* global = r.builder().AddGlobal<int64_t>();
   // global = global + p0
-  BUILD(r, WASM_SET_GLOBAL(
-               0, WASM_I64_AND(WASM_GET_GLOBAL(0),
-                               WASM_I64_SCONVERT_I32(WASM_GET_LOCAL(0)))),
+  BUILD(r,
+        WASM_GLOBAL_SET(0,
+                        WASM_I64_AND(WASM_GLOBAL_GET(0),
+                                     WASM_I64_SCONVERT_I32(WASM_LOCAL_GET(0)))),
         WASM_ZERO);
 
   r.builder().WriteMemory<int64_t>(global, 0xFFFFFFFFFFFFFFFFLL);
@@ -1367,7 +1371,7 @@ WASM_EXEC_TEST(I64Global) {
 
 WASM_EXEC_TEST(I64Eqz) {
   WasmRunner<int32_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_EQZ(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_EQZ(WASM_LOCAL_GET(0)));
 
   FOR_INT64_INPUTS(i) {
     int32_t result = i == 0 ? 1 : 0;
@@ -1377,7 +1381,7 @@ WASM_EXEC_TEST(I64Eqz) {
 
 WASM_EXEC_TEST(I64Ror) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_ROR(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_ROR(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) {
@@ -1389,7 +1393,7 @@ WASM_EXEC_TEST(I64Ror) {
 
 WASM_EXEC_TEST(I64Rol) {
   WasmRunner<int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_ROL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_ROL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_UINT64_INPUTS(i) {
     FOR_UINT64_INPUTS(j) {
@@ -1413,8 +1417,9 @@ WASM_EXEC_TEST(StoreMem_offset_oob_i64) {
     byte* memory = r.builder().AddMemoryElems<byte>(num_bytes);
     r.builder().RandomizeMemory(1119 + static_cast<int>(m));
 
-    BUILD(r, WASM_STORE_MEM_OFFSET(machineTypes[m], 8, WASM_GET_LOCAL(0),
-                                   WASM_LOAD_MEM(machineTypes[m], WASM_ZERO)),
+    BUILD(r,
+          WASM_STORE_MEM_OFFSET(machineTypes[m], 8, WASM_LOCAL_GET(0),
+                                WASM_LOAD_MEM(machineTypes[m], WASM_ZERO)),
           WASM_ZERO);
 
     byte memsize = machineTypes[m].MemSize();
@@ -1440,8 +1445,8 @@ WASM_EXEC_TEST(Store_i64_narrowed) {
     uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(kWasmPageSize);
     constexpr uint64_t kPattern = 0x0123456789abcdef;
 
-    BUILD(r, WASM_GET_LOCAL(0),                 // index
-          WASM_GET_LOCAL(1),                    // value
+    BUILD(r, WASM_LOCAL_GET(0),                 // index
+          WASM_LOCAL_GET(1),                    // value
           opcode, ZERO_ALIGNMENT, ZERO_OFFSET,  // store
           WASM_ZERO);                           // return value
 
@@ -1539,7 +1544,7 @@ static void Run_WasmMixedCall_N(TestExecutionTier execution_tier, int start) {
       b.AddParam(ValueType::For(memtypes[i]));
     }
     WasmFunctionCompiler& t = r.NewFunction(b.Build());
-    BUILD(t, WASM_GET_LOCAL(which));
+    BUILD(t, WASM_LOCAL_GET(which));
 
     // =========================================================================
     // Build the calling function.
@@ -1561,7 +1566,7 @@ static void Run_WasmMixedCall_N(TestExecutionTier execution_tier, int start) {
 
     // Store the result in memory.
     ADD_CODE(code,
-             WASM_STORE_MEM(result, WASM_ZERO, WASM_GET_LOCAL(local_index)));
+             WASM_STORE_MEM(result, WASM_ZERO, WASM_LOCAL_GET(local_index)));
 
     // Return the expected value.
     ADD_CODE(code, WASM_I32V_2(kExpected));
@@ -1605,7 +1610,7 @@ WASM_EXEC_TEST(Regress5874) {
 WASM_EXEC_TEST(Regression_6858) {
   // WasmRunner with 5 params and returns, which is the maximum.
   WasmRunner<int64_t, int64_t, int64_t, int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I64_DIVS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   int64_t dividend = 15;
   int64_t divisor = 0;
   int64_t filler = 34;
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-asmjs.cc b/deps/v8/test/cctest/wasm/test-run-wasm-asmjs.cc
index f644a20082363a..5f5d20d12983e9 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-asmjs.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-asmjs.cc
@@ -34,7 +34,7 @@ namespace wasm {
 ASMJS_EXEC_TEST(Int32AsmjsDivS) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_BINOP(kExprI32AsmjsDivS, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_BINOP(kExprI32AsmjsDivS, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(0, r.Call(0, 100));
   CHECK_EQ(0, r.Call(100, 0));
@@ -46,7 +46,7 @@ ASMJS_EXEC_TEST(Int32AsmjsDivS) {
 ASMJS_EXEC_TEST(Int32AsmjsRemS) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_BINOP(kExprI32AsmjsRemS, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_BINOP(kExprI32AsmjsRemS, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(33, r.Call(133, 100));
   CHECK_EQ(0, r.Call(kMin, -1));
@@ -58,7 +58,7 @@ ASMJS_EXEC_TEST(Int32AsmjsRemS) {
 ASMJS_EXEC_TEST(Int32AsmjsDivU) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_BINOP(kExprI32AsmjsDivU, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_BINOP(kExprI32AsmjsDivU, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(0, r.Call(0, 100));
   CHECK_EQ(0, r.Call(kMin, -1));
@@ -70,7 +70,7 @@ ASMJS_EXEC_TEST(Int32AsmjsDivU) {
 ASMJS_EXEC_TEST(Int32AsmjsRemU) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_BINOP(kExprI32AsmjsRemU, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_BINOP(kExprI32AsmjsRemU, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(17, r.Call(217, 100));
   CHECK_EQ(0, r.Call(100, 0));
@@ -82,7 +82,7 @@ ASMJS_EXEC_TEST(Int32AsmjsRemU) {
 ASMJS_EXEC_TEST(I32AsmjsSConvertF32) {
   WasmRunner<int32_t, float> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_UNOP(kExprI32AsmjsSConvertF32, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_UNOP(kExprI32AsmjsSConvertF32, WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     int32_t expected = DoubleToInt32(i);
@@ -93,7 +93,7 @@ ASMJS_EXEC_TEST(I32AsmjsSConvertF32) {
 ASMJS_EXEC_TEST(I32AsmjsSConvertF64) {
   WasmRunner<int32_t, double> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_UNOP(kExprI32AsmjsSConvertF64, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_UNOP(kExprI32AsmjsSConvertF64, WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) {
     int32_t expected = DoubleToInt32(i);
@@ -104,7 +104,7 @@ ASMJS_EXEC_TEST(I32AsmjsSConvertF64) {
 ASMJS_EXEC_TEST(I32AsmjsUConvertF32) {
   WasmRunner<uint32_t, float> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_UNOP(kExprI32AsmjsUConvertF32, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_UNOP(kExprI32AsmjsUConvertF32, WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     uint32_t expected = DoubleToUint32(i);
@@ -115,7 +115,7 @@ ASMJS_EXEC_TEST(I32AsmjsUConvertF32) {
 ASMJS_EXEC_TEST(I32AsmjsUConvertF64) {
   WasmRunner<uint32_t, double> r(execution_tier);
   r.builder().ChangeOriginToAsmjs();
-  BUILD(r, WASM_UNOP(kExprI32AsmjsUConvertF64, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_UNOP(kExprI32AsmjsUConvertF64, WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) {
     uint32_t expected = DoubleToUint32(i);
@@ -129,7 +129,7 @@ ASMJS_EXEC_TEST(LoadMemI32_oob_asm) {
   int32_t* memory = r.builder().AddMemoryElems<int32_t>(8);
   r.builder().RandomizeMemory(1112);
 
-  BUILD(r, WASM_UNOP(kExprI32AsmjsLoadMem, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_UNOP(kExprI32AsmjsLoadMem, WASM_LOCAL_GET(0)));
 
   memory[0] = 999999;
   CHECK_EQ(999999, r.Call(0u));
@@ -149,7 +149,7 @@ ASMJS_EXEC_TEST(LoadMemF32_oob_asm) {
   float* memory = r.builder().AddMemoryElems<float>(8);
   r.builder().RandomizeMemory(1112);
 
-  BUILD(r, WASM_UNOP(kExprF32AsmjsLoadMem, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_UNOP(kExprF32AsmjsLoadMem, WASM_LOCAL_GET(0)));
 
   memory[0] = 9999.5f;
   CHECK_EQ(9999.5f, r.Call(0u));
@@ -169,7 +169,7 @@ ASMJS_EXEC_TEST(LoadMemF64_oob_asm) {
   double* memory = r.builder().AddMemoryElems<double>(8);
   r.builder().RandomizeMemory(1112);
 
-  BUILD(r, WASM_UNOP(kExprF64AsmjsLoadMem, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_UNOP(kExprF64AsmjsLoadMem, WASM_LOCAL_GET(0)));
 
   memory[0] = 9799.5;
   CHECK_EQ(9799.5, r.Call(0u));
@@ -191,8 +191,8 @@ ASMJS_EXEC_TEST(StoreMemI32_oob_asm) {
   int32_t* memory = r.builder().AddMemoryElems<int32_t>(8);
   r.builder().RandomizeMemory(1112);
 
-  BUILD(r, WASM_BINOP(kExprI32AsmjsStoreMem, WASM_GET_LOCAL(0),
-                      WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_BINOP(kExprI32AsmjsStoreMem, WASM_LOCAL_GET(0),
+                      WASM_LOCAL_GET(1)));
 
   memory[0] = 7777;
   CHECK_EQ(999999, r.Call(0u, 999999));
@@ -211,7 +211,7 @@ ASMJS_EXEC_TEST(Int32AsmjsDivS_byzero_const) {
   for (int8_t denom = -2; denom < 8; ++denom) {
     WasmRunner<int32_t, int32_t> r(execution_tier);
     r.builder().ChangeOriginToAsmjs();
-    BUILD(r, WASM_I32_ASMJS_DIVS(WASM_GET_LOCAL(0), WASM_I32V_1(denom)));
+    BUILD(r, WASM_I32_ASMJS_DIVS(WASM_LOCAL_GET(0), WASM_I32V_1(denom)));
     FOR_INT32_INPUTS(i) {
       if (denom == 0) {
         CHECK_EQ(0, r.Call(i));
@@ -228,7 +228,7 @@ ASMJS_EXEC_TEST(Int32AsmjsRemS_byzero_const) {
   for (int8_t denom = -2; denom < 8; ++denom) {
     WasmRunner<int32_t, int32_t> r(execution_tier);
     r.builder().ChangeOriginToAsmjs();
-    BUILD(r, WASM_I32_ASMJS_REMS(WASM_GET_LOCAL(0), WASM_I32V_1(denom)));
+    BUILD(r, WASM_I32_ASMJS_REMS(WASM_LOCAL_GET(0), WASM_I32V_1(denom)));
     FOR_INT32_INPUTS(i) {
       if (denom == 0) {
         CHECK_EQ(0, r.Call(i));
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-atomics.cc b/deps/v8/test/cctest/wasm/test-run-wasm-atomics.cc
index e146e85d2eb48d..40949b7ab5ce0c 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-atomics.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-atomics.cc
@@ -18,7 +18,7 @@ void RunU32BinOp(TestExecutionTier execution_tier, WasmOpcode wasm_op,
       r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(uint32_t));
   r.builder().SetHasSharedMemory();
 
-  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord32));
 
   FOR_UINT32_INPUTS(i) {
@@ -47,7 +47,7 @@ void RunU16BinOp(TestExecutionTier tier, WasmOpcode wasm_op,
   uint16_t* memory =
       r.builder().AddMemoryElems<uint16_t>(kWasmPageSize / sizeof(uint16_t));
 
-  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord16));
 
   FOR_UINT16_INPUTS(i) {
@@ -75,7 +75,7 @@ void RunU8BinOp(TestExecutionTier execution_tier, WasmOpcode wasm_op,
   r.builder().SetHasSharedMemory();
   uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(kWasmPageSize);
 
-  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord8));
 
   FOR_UINT8_INPUTS(i) {
@@ -103,8 +103,8 @@ WASM_EXEC_TEST(I32AtomicCompareExchange) {
   uint32_t* memory =
       r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(uint32_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(
-               kExprI32AtomicCompareExchange, WASM_I32V_1(0), WASM_GET_LOCAL(0),
-               WASM_GET_LOCAL(1), MachineRepresentation::kWord32));
+               kExprI32AtomicCompareExchange, WASM_I32V_1(0), WASM_LOCAL_GET(0),
+               WASM_LOCAL_GET(1), MachineRepresentation::kWord32));
 
   FOR_UINT32_INPUTS(i) {
     uint32_t initial = i;
@@ -124,8 +124,8 @@ WASM_EXEC_TEST(I32AtomicCompareExchange16U) {
   uint16_t* memory =
       r.builder().AddMemoryElems<uint16_t>(kWasmPageSize / sizeof(uint16_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(kExprI32AtomicCompareExchange16U,
-                                   WASM_I32V_1(0), WASM_GET_LOCAL(0),
-                                   WASM_GET_LOCAL(1),
+                                   WASM_I32V_1(0), WASM_LOCAL_GET(0),
+                                   WASM_LOCAL_GET(1),
                                    MachineRepresentation::kWord16));
 
   FOR_UINT16_INPUTS(i) {
@@ -146,7 +146,7 @@ WASM_EXEC_TEST(I32AtomicCompareExchange8U) {
   uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(kWasmPageSize);
   BUILD(r,
         WASM_ATOMICS_TERNARY_OP(kExprI32AtomicCompareExchange8U, WASM_I32V_1(0),
-                                WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+                                WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                                 MachineRepresentation::kWord8));
 
   FOR_UINT8_INPUTS(i) {
@@ -167,8 +167,8 @@ WASM_EXEC_TEST(I32AtomicCompareExchange_fail) {
   uint32_t* memory =
       r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(uint32_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(
-               kExprI32AtomicCompareExchange, WASM_I32V_1(0), WASM_GET_LOCAL(0),
-               WASM_GET_LOCAL(1), MachineRepresentation::kWord32));
+               kExprI32AtomicCompareExchange, WASM_I32V_1(0), WASM_LOCAL_GET(0),
+               WASM_LOCAL_GET(1), MachineRepresentation::kWord32));
 
   // The original value at the memory location.
   uint32_t old_val = 4;
@@ -237,7 +237,7 @@ WASM_EXEC_TEST(I32AtomicStoreLoad) {
       r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(uint32_t));
 
   BUILD(r,
-        WASM_ATOMICS_STORE_OP(kExprI32AtomicStore, WASM_ZERO, WASM_GET_LOCAL(0),
+        WASM_ATOMICS_STORE_OP(kExprI32AtomicStore, WASM_ZERO, WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord32),
         WASM_ATOMICS_LOAD_OP(kExprI32AtomicLoad, WASM_ZERO,
                              MachineRepresentation::kWord32));
@@ -259,7 +259,7 @@ WASM_EXEC_TEST(I32AtomicStoreLoad16U) {
   BUILD(
       r,
       WASM_ATOMICS_STORE_OP(kExprI32AtomicStore16U, WASM_ZERO,
-                            WASM_GET_LOCAL(0), MachineRepresentation::kWord16),
+                            WASM_LOCAL_GET(0), MachineRepresentation::kWord16),
       WASM_ATOMICS_LOAD_OP(kExprI32AtomicLoad16U, WASM_ZERO,
                            MachineRepresentation::kWord16));
 
@@ -278,7 +278,7 @@ WASM_EXEC_TEST(I32AtomicStoreLoad8U) {
 
   BUILD(r,
         WASM_ATOMICS_STORE_OP(kExprI32AtomicStore8U, WASM_ZERO,
-                              WASM_GET_LOCAL(0), MachineRepresentation::kWord8),
+                              WASM_LOCAL_GET(0), MachineRepresentation::kWord8),
         WASM_ATOMICS_LOAD_OP(kExprI32AtomicLoad8U, WASM_ZERO,
                              MachineRepresentation::kWord8));
 
@@ -297,9 +297,9 @@ WASM_EXEC_TEST(I32AtomicStoreParameter) {
   r.builder().SetHasSharedMemory();
 
   BUILD(r,
-        WASM_ATOMICS_STORE_OP(kExprI32AtomicStore, WASM_ZERO, WASM_GET_LOCAL(0),
+        WASM_ATOMICS_STORE_OP(kExprI32AtomicStore, WASM_ZERO, WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord8),
-        WASM_ATOMICS_BINOP(kExprI32AtomicAdd, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+        WASM_ATOMICS_BINOP(kExprI32AtomicAdd, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                            MachineRepresentation::kWord32));
   CHECK_EQ(10, r.Call(10));
   CHECK_EQ(20, r.builder().ReadMemory(&memory[0]));
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-atomics64.cc b/deps/v8/test/cctest/wasm/test-run-wasm-atomics64.cc
index ed1ff1b0e57879..28de7c477ac2df 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-atomics64.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-atomics64.cc
@@ -18,7 +18,7 @@ void RunU64BinOp(TestExecutionTier execution_tier, WasmOpcode wasm_op,
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
   r.builder().SetHasSharedMemory();
 
-  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord64));
 
   FOR_UINT64_INPUTS(i) {
@@ -47,7 +47,7 @@ void RunU32BinOp(TestExecutionTier execution_tier, WasmOpcode wasm_op,
       r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(uint32_t));
   r.builder().SetHasSharedMemory();
 
-  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord32));
 
   FOR_UINT32_INPUTS(i) {
@@ -76,7 +76,7 @@ void RunU16BinOp(TestExecutionTier tier, WasmOpcode wasm_op,
   uint16_t* memory =
       r.builder().AddMemoryElems<uint16_t>(kWasmPageSize / sizeof(uint16_t));
 
-  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord16));
 
   FOR_UINT16_INPUTS(i) {
@@ -104,7 +104,7 @@ void RunU8BinOp(TestExecutionTier execution_tier, WasmOpcode wasm_op,
   r.builder().SetHasSharedMemory();
   uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(kWasmPageSize);
 
-  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord8));
 
   FOR_UINT8_INPUTS(i) {
@@ -132,8 +132,8 @@ WASM_EXEC_TEST(I64AtomicCompareExchange) {
   uint64_t* memory =
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(
-               kExprI64AtomicCompareExchange, WASM_I32V_1(0), WASM_GET_LOCAL(0),
-               WASM_GET_LOCAL(1), MachineRepresentation::kWord64));
+               kExprI64AtomicCompareExchange, WASM_I32V_1(0), WASM_LOCAL_GET(0),
+               WASM_LOCAL_GET(1), MachineRepresentation::kWord64));
 
   FOR_UINT64_INPUTS(i) {
     uint64_t initial = i;
@@ -153,8 +153,8 @@ WASM_EXEC_TEST(I64AtomicCompareExchange32U) {
   uint32_t* memory =
       r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(uint32_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(kExprI64AtomicCompareExchange32U,
-                                   WASM_I32V_1(0), WASM_GET_LOCAL(0),
-                                   WASM_GET_LOCAL(1),
+                                   WASM_I32V_1(0), WASM_LOCAL_GET(0),
+                                   WASM_LOCAL_GET(1),
                                    MachineRepresentation::kWord32));
 
   FOR_UINT32_INPUTS(i) {
@@ -175,8 +175,8 @@ WASM_EXEC_TEST(I64AtomicCompareExchange16U) {
   uint16_t* memory =
       r.builder().AddMemoryElems<uint16_t>(kWasmPageSize / sizeof(uint16_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(kExprI64AtomicCompareExchange16U,
-                                   WASM_I32V_1(0), WASM_GET_LOCAL(0),
-                                   WASM_GET_LOCAL(1),
+                                   WASM_I32V_1(0), WASM_LOCAL_GET(0),
+                                   WASM_LOCAL_GET(1),
                                    MachineRepresentation::kWord16));
 
   FOR_UINT16_INPUTS(i) {
@@ -197,7 +197,7 @@ WASM_EXEC_TEST(I32AtomicCompareExchange8U) {
   uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(kWasmPageSize);
   BUILD(r,
         WASM_ATOMICS_TERNARY_OP(kExprI64AtomicCompareExchange8U, WASM_I32V_1(0),
-                                WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+                                WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                                 MachineRepresentation::kWord8));
   FOR_UINT8_INPUTS(i) {
     uint8_t initial = i;
@@ -281,7 +281,7 @@ WASM_EXEC_TEST(I64AtomicStoreLoad) {
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
 
   BUILD(r,
-        WASM_ATOMICS_STORE_OP(kExprI64AtomicStore, WASM_ZERO, WASM_GET_LOCAL(0),
+        WASM_ATOMICS_STORE_OP(kExprI64AtomicStore, WASM_ZERO, WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord64),
         WASM_ATOMICS_LOAD_OP(kExprI64AtomicLoad, WASM_ZERO,
                              MachineRepresentation::kWord64));
@@ -303,7 +303,7 @@ WASM_EXEC_TEST(I64AtomicStoreLoad32U) {
   BUILD(
       r,
       WASM_ATOMICS_STORE_OP(kExprI64AtomicStore32U, WASM_ZERO,
-                            WASM_GET_LOCAL(0), MachineRepresentation::kWord32),
+                            WASM_LOCAL_GET(0), MachineRepresentation::kWord32),
       WASM_ATOMICS_LOAD_OP(kExprI64AtomicLoad32U, WASM_ZERO,
                            MachineRepresentation::kWord32));
 
@@ -324,7 +324,7 @@ WASM_EXEC_TEST(I64AtomicStoreLoad16U) {
   BUILD(
       r,
       WASM_ATOMICS_STORE_OP(kExprI64AtomicStore16U, WASM_ZERO,
-                            WASM_GET_LOCAL(0), MachineRepresentation::kWord16),
+                            WASM_LOCAL_GET(0), MachineRepresentation::kWord16),
       WASM_ATOMICS_LOAD_OP(kExprI64AtomicLoad16U, WASM_ZERO,
                            MachineRepresentation::kWord16));
 
@@ -343,7 +343,7 @@ WASM_EXEC_TEST(I64AtomicStoreLoad8U) {
 
   BUILD(r,
         WASM_ATOMICS_STORE_OP(kExprI64AtomicStore8U, WASM_ZERO,
-                              WASM_GET_LOCAL(0), MachineRepresentation::kWord8),
+                              WASM_LOCAL_GET(0), MachineRepresentation::kWord8),
         WASM_ATOMICS_LOAD_OP(kExprI64AtomicLoad8U, WASM_ZERO,
                              MachineRepresentation::kWord8));
 
@@ -365,9 +365,9 @@ void RunDropTest(TestExecutionTier execution_tier, WasmOpcode wasm_op,
   r.builder().SetHasSharedMemory();
 
   BUILD(r,
-        WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+        WASM_ATOMICS_BINOP(wasm_op, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                            MachineRepresentation::kWord64),
-        WASM_DROP, WASM_GET_LOCAL(0));
+        WASM_DROP, WASM_LOCAL_GET(0));
 
   uint64_t initial = 0x1111222233334444, local = 0x1111111111111111;
   r.builder().WriteMemory(&memory[0], initial);
@@ -392,8 +392,8 @@ WASM_EXEC_TEST(I64AtomicSub16UDrop) {
 
   BUILD(r,
         WASM_ATOMICS_BINOP(kExprI64AtomicSub16U, WASM_I32V_1(0),
-                           WASM_GET_LOCAL(0), MachineRepresentation::kWord16),
-        WASM_DROP, WASM_GET_LOCAL(0));
+                           WASM_LOCAL_GET(0), MachineRepresentation::kWord16),
+        WASM_DROP, WASM_LOCAL_GET(0));
 
   uint16_t initial = 0x7, local = 0xffe0;
   r.builder().WriteMemory(&memory[0], initial);
@@ -410,9 +410,9 @@ WASM_EXEC_TEST(I64AtomicCompareExchangeDrop) {
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
   BUILD(r,
         WASM_ATOMICS_TERNARY_OP(kExprI64AtomicCompareExchange, WASM_I32V_1(0),
-                                WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+                                WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                                 MachineRepresentation::kWord64),
-        WASM_DROP, WASM_GET_LOCAL(1));
+        WASM_DROP, WASM_LOCAL_GET(1));
 
   uint64_t initial = 0x1111222233334444, local = 0x1111111111111111;
   r.builder().WriteMemory(&memory[0], initial);
@@ -429,11 +429,11 @@ WASM_EXEC_TEST(I64AtomicStoreLoadDrop) {
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
 
   BUILD(r,
-        WASM_ATOMICS_STORE_OP(kExprI64AtomicStore, WASM_ZERO, WASM_GET_LOCAL(0),
+        WASM_ATOMICS_STORE_OP(kExprI64AtomicStore, WASM_ZERO, WASM_LOCAL_GET(0),
                               MachineRepresentation::kWord64),
         WASM_ATOMICS_LOAD_OP(kExprI64AtomicLoad, WASM_ZERO,
                              MachineRepresentation::kWord64),
-        WASM_DROP, WASM_GET_LOCAL(1));
+        WASM_DROP, WASM_LOCAL_GET(1));
 
   uint64_t store_value = 0x1111111111111111, expected = 0xC0DE;
   CHECK_EQ(expected, r.Call(store_value, expected));
@@ -448,9 +448,9 @@ WASM_EXEC_TEST(I64AtomicAddConvertDrop) {
   r.builder().SetHasSharedMemory();
 
   BUILD(r,
-        WASM_ATOMICS_BINOP(kExprI64AtomicAdd, WASM_I32V_1(0), WASM_GET_LOCAL(0),
+        WASM_ATOMICS_BINOP(kExprI64AtomicAdd, WASM_I32V_1(0), WASM_LOCAL_GET(0),
                            MachineRepresentation::kWord64),
-        kExprI32ConvertI64, WASM_DROP, WASM_GET_LOCAL(0));
+        kExprI32ConvertI64, WASM_DROP, WASM_LOCAL_GET(0));
 
   uint64_t initial = 0x1111222233334444, local = 0x1111111111111111;
   r.builder().WriteMemory(&memory[0], initial);
@@ -485,7 +485,7 @@ void RunConvertTest(TestExecutionTier execution_tier, WasmOpcode wasm_op,
   r.builder().SetHasSharedMemory();
 
   BUILD(r, WASM_I32_CONVERT_I64(
-               WASM_ATOMICS_BINOP(wasm_op, WASM_ZERO, WASM_GET_LOCAL(0),
+               WASM_ATOMICS_BINOP(wasm_op, WASM_ZERO, WASM_LOCAL_GET(0),
                                   MachineRepresentation::kWord64)));
 
   uint64_t initial = 0x1111222233334444, local = 0x1111111111111111;
@@ -510,8 +510,8 @@ WASM_EXEC_TEST(I64AtomicConvertCompareExchange) {
   r.builder().SetHasSharedMemory();
 
   BUILD(r, WASM_I32_CONVERT_I64(WASM_ATOMICS_TERNARY_OP(
-               kExprI64AtomicCompareExchange, WASM_I32V_1(0), WASM_GET_LOCAL(0),
-               WASM_GET_LOCAL(1), MachineRepresentation::kWord64)));
+               kExprI64AtomicCompareExchange, WASM_I32V_1(0), WASM_LOCAL_GET(0),
+               WASM_LOCAL_GET(1), MachineRepresentation::kWord64)));
 
   uint64_t initial = 0x1111222233334444, local = 0x1111111111111111;
   r.builder().WriteMemory(&memory[0], initial);
@@ -532,7 +532,7 @@ void RunNonConstIndexTest(TestExecutionTier execution_tier, WasmOpcode wasm_op,
 
   BUILD(r, WASM_I32_CONVERT_I64(WASM_ATOMICS_BINOP(
                wasm_op, WASM_I64_EQ(WASM_I64V(1), WASM_I64V(0)),
-               WASM_GET_LOCAL(0), MachineRepresentation::kWord32)));
+               WASM_LOCAL_GET(0), MachineRepresentation::kWord32)));
 
   uint64_t initial = 0x1111222233334444, local = 0x5555666677778888;
   r.builder().WriteMemory(&memory[0], initial);
@@ -566,8 +566,8 @@ WASM_EXEC_TEST(I64AtomicNonConstIndexCompareExchangeNarrow) {
 
   BUILD(r, WASM_I32_CONVERT_I64(WASM_ATOMICS_TERNARY_OP(
                kExprI64AtomicCompareExchange16U,
-               WASM_I64_EQ(WASM_I64V(1), WASM_I64V(0)), WASM_GET_LOCAL(0),
-               WASM_GET_LOCAL(1), MachineRepresentation::kWord16)));
+               WASM_I64_EQ(WASM_I64V(1), WASM_I64V(0)), WASM_LOCAL_GET(0),
+               WASM_LOCAL_GET(1), MachineRepresentation::kWord16)));
 
   uint64_t initial = 0x4444333322221111, local = 0x9999888877776666;
   r.builder().WriteMemory(&memory[0], initial);
@@ -585,8 +585,8 @@ WASM_EXEC_TEST(I64AtomicNonConstIndexCompareExchange) {
 
   BUILD(r, WASM_I32_CONVERT_I64(WASM_ATOMICS_TERNARY_OP(
                kExprI64AtomicCompareExchange,
-               WASM_I64_EQ(WASM_I64V(1), WASM_I64V(0)), WASM_GET_LOCAL(0),
-               WASM_GET_LOCAL(1), MachineRepresentation::kWord16)));
+               WASM_I64_EQ(WASM_I64V(1), WASM_I64V(0)), WASM_LOCAL_GET(0),
+               WASM_LOCAL_GET(1), MachineRepresentation::kWord16)));
 
   uint64_t initial = 4444333322221111, local = 0x9999888877776666;
   r.builder().WriteMemory(&memory[0], initial);
@@ -617,8 +617,8 @@ WASM_EXEC_TEST(I64AtomicCompareExchangeFail) {
   uint64_t* memory =
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(
-               kExprI64AtomicCompareExchange, WASM_I32V_1(0), WASM_GET_LOCAL(0),
-               WASM_GET_LOCAL(1), MachineRepresentation::kWord64));
+               kExprI64AtomicCompareExchange, WASM_I32V_1(0), WASM_LOCAL_GET(0),
+               WASM_LOCAL_GET(1), MachineRepresentation::kWord64));
 
   uint64_t initial = 0x1111222233334444, local = 0x1111111111111111,
            test = 0x2222222222222222;
@@ -635,8 +635,8 @@ WASM_EXEC_TEST(I64AtomicCompareExchange32UFail) {
   uint64_t* memory =
       r.builder().AddMemoryElems<uint64_t>(kWasmPageSize / sizeof(uint64_t));
   BUILD(r, WASM_ATOMICS_TERNARY_OP(kExprI64AtomicCompareExchange32U,
-                                   WASM_I32V_1(0), WASM_GET_LOCAL(0),
-                                   WASM_GET_LOCAL(1),
+                                   WASM_I32V_1(0), WASM_LOCAL_GET(0),
+                                   WASM_LOCAL_GET(1),
                                    MachineRepresentation::kWord32));
 
   uint64_t initial = 0x1111222233334444, test = 0xffffffff, local = 0xeeeeeeee;
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-bulk-memory.cc b/deps/v8/test/cctest/wasm/test-run-wasm-bulk-memory.cc
index f38584dcfc7b78..9b391dd0d03dda 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-bulk-memory.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-bulk-memory.cc
@@ -52,8 +52,8 @@ WASM_EXEC_TEST(MemoryInit) {
   const byte data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   r.builder().AddPassiveDataSegment(ArrayVector(data));
   BUILD(r,
-        WASM_MEMORY_INIT(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                         WASM_GET_LOCAL(2)),
+        WASM_MEMORY_INIT(0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                         WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   // All zeroes.
@@ -89,8 +89,8 @@ WASM_EXEC_TEST(MemoryInitOutOfBoundsData) {
   const byte data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   r.builder().AddPassiveDataSegment(ArrayVector(data));
   BUILD(r,
-        WASM_MEMORY_INIT(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                         WASM_GET_LOCAL(2)),
+        WASM_MEMORY_INIT(0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                         WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   const uint32_t last_5_bytes = kWasmPageSize - 5;
@@ -111,8 +111,8 @@ WASM_EXEC_TEST(MemoryInitOutOfBounds) {
   const byte data[kWasmPageSize] = {};
   r.builder().AddPassiveDataSegment(ArrayVector(data));
   BUILD(r,
-        WASM_MEMORY_INIT(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                         WASM_GET_LOCAL(2)),
+        WASM_MEMORY_INIT(0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                         WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   // OK, copy the full data segment to memory.
@@ -142,7 +142,7 @@ WASM_EXEC_TEST(MemoryCopy) {
   byte* mem = r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_COPY(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_COPY(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
 
   const byte initial[] = {0, 11, 22, 33, 44, 55, 66, 77};
@@ -171,7 +171,7 @@ WASM_EXEC_TEST(MemoryCopyOverlapping) {
   byte* mem = r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_COPY(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_COPY(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
 
   const byte initial[] = {10, 20, 30};
@@ -194,7 +194,7 @@ WASM_EXEC_TEST(MemoryCopyOutOfBoundsData) {
   byte* mem = r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_COPY(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_COPY(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
 
   const byte data[] = {11, 22, 33, 44, 55, 66, 77, 88};
@@ -223,7 +223,7 @@ WASM_EXEC_TEST(MemoryCopyOutOfBounds) {
   r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_COPY(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_COPY(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
 
   // Copy full range is OK.
@@ -253,7 +253,7 @@ WASM_EXEC_TEST(MemoryFill) {
   r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_FILL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_FILL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
   CHECK_EQ(0, r.Call(1, 33, 5));
   CheckMemoryEqualsFollowedByZeroes(&r.builder(), {0, 33, 33, 33, 33, 33});
@@ -277,7 +277,7 @@ WASM_EXEC_TEST(MemoryFillValueWrapsToByte) {
   r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_FILL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_FILL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
   CHECK_EQ(0, r.Call(0, 1000, 3));
   const byte expected = 1000 & 255;
@@ -291,7 +291,7 @@ WASM_EXEC_TEST(MemoryFillOutOfBoundsData) {
   r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_FILL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_FILL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
   const byte v = 123;
   CHECK_EQ(0xDEADBEEF, r.Call(kWasmPageSize - 5, v, 999));
@@ -304,7 +304,7 @@ WASM_EXEC_TEST(MemoryFillOutOfBounds) {
   r.builder().AddMemory(kWasmPageSize);
   BUILD(
       r,
-      WASM_MEMORY_FILL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+      WASM_MEMORY_FILL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
       kExprI32Const, 0);
 
   const byte v = 123;
@@ -356,8 +356,8 @@ void TestTableCopyInbounds(TestExecutionTier execution_tier, int table_dst,
     r.builder().AddIndirectFunctionTable(nullptr, kTableSize);
   }
   BUILD(r,
-        WASM_TABLE_COPY(table_dst, table_src, WASM_GET_LOCAL(0),
-                        WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+        WASM_TABLE_COPY(table_dst, table_src, WASM_LOCAL_GET(0),
+                        WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   for (uint32_t i = 0; i <= kTableSize; ++i) {
@@ -438,12 +438,12 @@ void TestTableInitElems(TestExecutionTier execution_tier, int table_index) {
 
   WasmFunctionCompiler& call = r.NewFunction(sigs.i_i(), "call");
   BUILD(call,
-        WASM_CALL_INDIRECT_TABLE(table_index, sig_index, WASM_GET_LOCAL(0)));
+        WASM_CALL_INDIRECT_TABLE(table_index, sig_index, WASM_LOCAL_GET(0)));
   const uint32_t call_index = call.function_index();
 
   BUILD(r,
-        WASM_TABLE_INIT(table_index, 0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                        WASM_GET_LOCAL(2)),
+        WASM_TABLE_INIT(table_index, 0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                        WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   auto table =
@@ -512,12 +512,12 @@ void TestTableInitOob(TestExecutionTier execution_tier, int table_index) {
 
   WasmFunctionCompiler& call = r.NewFunction(sigs.i_i(), "call");
   BUILD(call,
-        WASM_CALL_INDIRECT_TABLE(table_index, sig_index, WASM_GET_LOCAL(0)));
+        WASM_CALL_INDIRECT_TABLE(table_index, sig_index, WASM_LOCAL_GET(0)));
   const uint32_t call_index = call.function_index();
 
   BUILD(r,
-        WASM_TABLE_INIT(table_index, 0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                        WASM_GET_LOCAL(2)),
+        WASM_TABLE_INIT(table_index, 0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                        WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   auto table =
@@ -590,8 +590,8 @@ void TestTableCopyElems(TestExecutionTier execution_tier, int table_dst,
   }
 
   BUILD(r,
-        WASM_TABLE_COPY(table_dst, table_src, WASM_GET_LOCAL(0),
-                        WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+        WASM_TABLE_COPY(table_dst, table_src, WASM_LOCAL_GET(0),
+                        WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   r.builder().FreezeSignatureMapAndInitializeWrapperCache();
@@ -673,12 +673,12 @@ void TestTableCopyCalls(TestExecutionTier execution_tier, int table_dst,
 
   WasmFunctionCompiler& call = r.NewFunction(sigs.i_i(), "call");
   BUILD(call,
-        WASM_CALL_INDIRECT_TABLE(table_dst, sig_index, WASM_GET_LOCAL(0)));
+        WASM_CALL_INDIRECT_TABLE(table_dst, sig_index, WASM_LOCAL_GET(0)));
   const uint32_t call_index = call.function_index();
 
   BUILD(r,
-        WASM_TABLE_COPY(table_dst, table_src, WASM_GET_LOCAL(0),
-                        WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+        WASM_TABLE_COPY(table_dst, table_src, WASM_LOCAL_GET(0),
+                        WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   auto table =
@@ -747,8 +747,8 @@ void TestTableCopyOobWrites(TestExecutionTier execution_tier, int table_dst,
   }
 
   BUILD(r,
-        WASM_TABLE_COPY(table_dst, table_src, WASM_GET_LOCAL(0),
-                        WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+        WASM_TABLE_COPY(table_dst, table_src, WASM_LOCAL_GET(0),
+                        WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   r.builder().FreezeSignatureMapAndInitializeWrapperCache();
@@ -811,8 +811,8 @@ void TestTableCopyOob1(TestExecutionTier execution_tier, int table_dst,
   }
 
   BUILD(r,
-        WASM_TABLE_COPY(table_dst, table_src, WASM_GET_LOCAL(0),
-                        WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
+        WASM_TABLE_COPY(table_dst, table_src, WASM_LOCAL_GET(0),
+                        WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
         kExprI32Const, 0);
 
   r.CheckCallViaJS(0, 0, 0, 1);           // nop
@@ -877,7 +877,7 @@ WASM_COMPILED_EXEC_TEST(ElemDropThenTableInit) {
   r.builder().AddPassiveElementSegment({});
   BUILD(
       r, WASM_ELEM_DROP(0),
-      WASM_TABLE_INIT(0, 0, WASM_I32V_1(0), WASM_I32V_1(0), WASM_GET_LOCAL(0)),
+      WASM_TABLE_INIT(0, 0, WASM_I32V_1(0), WASM_I32V_1(0), WASM_LOCAL_GET(0)),
       kExprI32Const, 0);
 
   r.CheckCallViaJS(0, 0);
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-exceptions.cc b/deps/v8/test/cctest/wasm/test-run-wasm-exceptions.cc
index f77c220f8ea4b3..83b446cc49c19d 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-exceptions.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-exceptions.cc
@@ -23,9 +23,9 @@ WASM_COMPILED_EXEC_TEST(TryCatchThrow) {
   // Build the main test function.
   BUILD(r, WASM_TRY_CATCH_T(kWasmI32,
                             WASM_STMTS(WASM_I32V(kResult1),
-                                       WASM_IF(WASM_I32_EQZ(WASM_GET_LOCAL(0)),
+                                       WASM_IF(WASM_I32_EQZ(WASM_LOCAL_GET(0)),
                                                WASM_THROW(except))),
-                            WASM_STMTS(WASM_DROP, WASM_I32V(kResult0))));
+                            WASM_STMTS(WASM_I32V(kResult0)), except));
 
   // Need to call through JS to allow for creation of stack traces.
   r.CheckCallViaJS(kResult0, 0);
@@ -48,12 +48,12 @@ WASM_COMPILED_EXEC_TEST(TryCatchCallDirect) {
   BUILD(r, WASM_TRY_CATCH_T(
                kWasmI32,
                WASM_STMTS(WASM_I32V(kResult1),
-                          WASM_IF(WASM_I32_EQZ(WASM_GET_LOCAL(0)),
+                          WASM_IF(WASM_I32_EQZ(WASM_LOCAL_GET(0)),
                                   WASM_STMTS(WASM_CALL_FUNCTION(
                                                  throw_func.function_index(),
                                                  WASM_I32V(7), WASM_I32V(9)),
                                              WASM_DROP))),
-               WASM_STMTS(WASM_DROP, WASM_I32V(kResult0))));
+               WASM_STMTS(WASM_I32V(kResult0)), except));
 
   // Need to call through JS to allow for creation of stack traces.
   r.CheckCallViaJS(kResult0, 0);
@@ -85,12 +85,12 @@ WASM_COMPILED_EXEC_TEST(TryCatchCallIndirect) {
         WASM_TRY_CATCH_T(
             kWasmI32,
             WASM_STMTS(WASM_I32V(kResult1),
-                       WASM_IF(WASM_I32_EQZ(WASM_GET_LOCAL(0)),
+                       WASM_IF(WASM_I32_EQZ(WASM_LOCAL_GET(0)),
                                WASM_STMTS(WASM_CALL_INDIRECT(
                                               sig_index, WASM_I32V(7),
-                                              WASM_I32V(9), WASM_GET_LOCAL(0)),
+                                              WASM_I32V(9), WASM_LOCAL_GET(0)),
                                           WASM_DROP))),
-            WASM_STMTS(WASM_DROP, WASM_I32V(kResult0))));
+            WASM_STMTS(WASM_I32V(kResult0)), except));
 
   // Need to call through JS to allow for creation of stack traces.
   r.CheckCallViaJS(kResult0, 0);
@@ -112,15 +112,15 @@ WASM_COMPILED_EXEC_TEST(TryCatchCallExternal) {
   constexpr uint32_t kJSFunc = 0;
 
   // Build the main test function.
-  BUILD(r, WASM_TRY_CATCH_T(
+  BUILD(r, WASM_TRY_CATCH_ALL_T(
                kWasmI32,
                WASM_STMTS(
                    WASM_I32V(kResult1),
-                   WASM_IF(WASM_I32_EQZ(WASM_GET_LOCAL(0)),
+                   WASM_IF(WASM_I32_EQZ(WASM_LOCAL_GET(0)),
                            WASM_STMTS(WASM_CALL_FUNCTION(kJSFunc, WASM_I32V(7),
                                                          WASM_I32V(9)),
                                       WASM_DROP))),
-               WASM_STMTS(WASM_DROP, WASM_I32V(kResult0))));
+               WASM_STMTS(WASM_I32V(kResult0))));
 
   // Need to call through JS to allow for creation of stack traces.
   r.CheckCallViaJS(kResult0, 0);
@@ -144,13 +144,13 @@ void TestTrapNotCaught(byte* code, size_t code_size,
   trap_func.Build(code, code + code_size);
 
   // Build the main test function.
-  BUILD(r, WASM_TRY_CATCH_T(
+  BUILD(r, WASM_TRY_CATCH_ALL_T(
                kWasmI32,
                WASM_STMTS(WASM_I32V(kResultSuccess),
                           WASM_CALL_FUNCTION(trap_func.function_index(),
                                              WASM_I32V(7), WASM_I32V(9)),
                           WASM_DROP),
-               WASM_STMTS(WASM_DROP, WASM_I32V(kResultCaught))));
+               WASM_STMTS(WASM_I32V(kResultCaught))));
 
   // Need to call through JS to allow for creation of stack traces.
   r.CheckCallViaJSTraps();
@@ -169,12 +169,12 @@ WASM_COMPILED_EXEC_TEST(TryCatchTrapMemOutOfBounds) {
 }
 
 WASM_COMPILED_EXEC_TEST(TryCatchTrapDivByZero) {
-  byte code[] = {WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_I32V_1(0))};
+  byte code[] = {WASM_I32_DIVS(WASM_LOCAL_GET(0), WASM_I32V_1(0))};
   TestTrapNotCaught(code, arraysize(code), execution_tier);
 }
 
 WASM_COMPILED_EXEC_TEST(TryCatchTrapRemByZero) {
-  byte code[] = {WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_I32V_1(0))};
+  byte code[] = {WASM_I32_REMS(WASM_LOCAL_GET(0), WASM_I32V_1(0))};
   TestTrapNotCaught(code, arraysize(code), execution_tier);
 }
 
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-interpreter.cc b/deps/v8/test/cctest/wasm/test-run-wasm-interpreter.cc
index 640aac53ae5ab3..7199d34e7d197e 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-interpreter.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-interpreter.cc
@@ -31,14 +31,14 @@ TEST(Run_WasmInt8Const_i) {
 
 TEST(Run_WasmIfElse) {
   WasmRunner<int32_t, int32_t> r(TestExecutionTier::kInterpreter);
-  BUILD(r, WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_I32V_1(9), WASM_I32V_1(10)));
+  BUILD(r, WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_I32V_1(9), WASM_I32V_1(10)));
   CHECK_EQ(10, r.Call(0));
   CHECK_EQ(9, r.Call(1));
 }
 
 TEST(Run_WasmIfReturn) {
   WasmRunner<int32_t, int32_t> r(TestExecutionTier::kInterpreter);
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_RETURN1(WASM_I32V_2(77))),
+  BUILD(r, WASM_IF(WASM_LOCAL_GET(0), WASM_RETURN1(WASM_I32V_2(77))),
         WASM_I32V_2(65));
   CHECK_EQ(65, r.Call(0));
   CHECK_EQ(77, r.Call(1));
@@ -133,9 +133,9 @@ TEST(Run_Wasm_nested_ifs_i) {
   BUILD(
       r,
       WASM_IF_ELSE_I(
-          WASM_GET_LOCAL(0),
-          WASM_IF_ELSE_I(WASM_GET_LOCAL(1), WASM_I32V_1(11), WASM_I32V_1(12)),
-          WASM_IF_ELSE_I(WASM_GET_LOCAL(1), WASM_I32V_1(13), WASM_I32V_1(14))));
+          WASM_LOCAL_GET(0),
+          WASM_IF_ELSE_I(WASM_LOCAL_GET(1), WASM_I32V_1(11), WASM_I32V_1(12)),
+          WASM_IF_ELSE_I(WASM_LOCAL_GET(1), WASM_I32V_1(13), WASM_I32V_1(14))));
 
   CHECK_EQ(11, r.Call(1, 1));
   CHECK_EQ(12, r.Call(1, 0));
@@ -165,15 +165,15 @@ TEST(Run_Wasm_returnCallFactorial) {
       r.NewFunction<int32_t, int32_t, int32_t>("fact_aux");
 
   BUILD(r, WASM_RETURN_CALL_FUNCTION(fact_aux_fn.function_index(),
-                                     WASM_GET_LOCAL(0), WASM_I32V(1)));
+                                     WASM_LOCAL_GET(0), WASM_I32V(1)));
 
   BUILD(fact_aux_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_EQ(WASM_I32V(1), WASM_GET_LOCAL(0)), WASM_GET_LOCAL(1),
+            WASM_I32_EQ(WASM_I32V(1), WASM_LOCAL_GET(0)), WASM_LOCAL_GET(1),
             WASM_RETURN_CALL_FUNCTION(
                 fact_aux_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)))));
 
   // Runs out of stack space without using return call.
   uint32_t test_values[] = {1, 2, 5, 10, 20, 20000};
@@ -194,16 +194,16 @@ TEST(Run_Wasm_returnCallFactorial64) {
       r.NewFunction<int64_t, int32_t, int64_t>("fact_aux");
 
   BUILD(r, WASM_RETURN_CALL_FUNCTION(fact_aux_fn.function_index(),
-                                     WASM_GET_LOCAL(0), WASM_I64V(1)));
+                                     WASM_LOCAL_GET(0), WASM_I64V(1)));
 
   BUILD(fact_aux_fn,
         WASM_IF_ELSE_L(
-            WASM_I32_EQ(WASM_I32V(1), WASM_GET_LOCAL(0)), WASM_GET_LOCAL(1),
+            WASM_I32_EQ(WASM_I32V(1), WASM_LOCAL_GET(0)), WASM_LOCAL_GET(1),
             WASM_RETURN_CALL_FUNCTION(
                 fact_aux_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_I64_MUL(WASM_I64_SCONVERT_I32(WASM_GET_LOCAL(0)),
-                             WASM_GET_LOCAL(1)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_I64_MUL(WASM_I64_SCONVERT_I32(WASM_LOCAL_GET(0)),
+                             WASM_LOCAL_GET(1)))));
 
   for (int32_t v : test_values) {
     CHECK_EQ(factorial<int64_t>(v), r.Call(v));
@@ -229,16 +229,16 @@ TEST(Run_Wasm_returnCallIndirectFactorial) {
   r.builder().AddIndirectFunctionTable(indirect_function_table,
                                        arraysize(indirect_function_table));
 
-  BUILD(r, WASM_RETURN_CALL_INDIRECT(sig_index, WASM_GET_LOCAL(0), WASM_I32V(1),
+  BUILD(r, WASM_RETURN_CALL_INDIRECT(sig_index, WASM_LOCAL_GET(0), WASM_I32V(1),
                                      WASM_ZERO));
 
   BUILD(
       fact_aux_fn,
       WASM_IF_ELSE_I(
-          WASM_I32_EQ(WASM_I32V(1), WASM_GET_LOCAL(0)), WASM_GET_LOCAL(1),
+          WASM_I32_EQ(WASM_I32V(1), WASM_LOCAL_GET(0)), WASM_LOCAL_GET(1),
           WASM_RETURN_CALL_INDIRECT(
-              sig_index, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-              WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), WASM_ZERO)));
+              sig_index, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+              WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), WASM_ZERO)));
 
   uint32_t test_values[] = {1, 2, 5, 10, 20};
 
@@ -275,7 +275,7 @@ std::unique_ptr<int[]> Find(byte* code, size_t code_size, int n, ...) {
 
 TEST(Step_I32Mul) {
   static const int kTraceLength = 4;
-  byte code[] = {WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
+  byte code[] = {WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))};
 
   WasmRunner<int32_t, uint32_t, uint32_t> r(TestExecutionTier::kInterpreter);
 
@@ -312,14 +312,14 @@ TEST(MemoryGrow) {
     WasmRunner<int32_t, uint32_t> r(TestExecutionTier::kInterpreter);
     r.builder().AddMemory(kWasmPageSize);
     r.builder().SetMaxMemPages(10);
-    BUILD(r, WASM_GROW_MEMORY(WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_GROW_MEMORY(WASM_LOCAL_GET(0)));
     CHECK_EQ(1, r.Call(1));
   }
   {
     WasmRunner<int32_t, uint32_t> r(TestExecutionTier::kInterpreter);
     r.builder().AddMemory(kWasmPageSize);
     r.builder().SetMaxMemPages(10);
-    BUILD(r, WASM_GROW_MEMORY(WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_GROW_MEMORY(WASM_LOCAL_GET(0)));
     CHECK_EQ(-1, r.Call(11));
   }
 }
@@ -329,10 +329,11 @@ TEST(MemoryGrowPreservesData) {
   int32_t value = 2335;
   WasmRunner<int32_t, uint32_t> r(TestExecutionTier::kInterpreter);
   r.builder().AddMemory(kWasmPageSize);
-  BUILD(r, WASM_STORE_MEM(MachineType::Int32(), WASM_I32V(index),
-                          WASM_I32V(value)),
-        WASM_GROW_MEMORY(WASM_GET_LOCAL(0)), WASM_DROP,
-        WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V(index)));
+  BUILD(
+      r,
+      WASM_STORE_MEM(MachineType::Int32(), WASM_I32V(index), WASM_I32V(value)),
+      WASM_GROW_MEMORY(WASM_LOCAL_GET(0)), WASM_DROP,
+      WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V(index)));
   CHECK_EQ(value, r.Call(1));
 }
 
@@ -340,7 +341,7 @@ TEST(MemoryGrowInvalidSize) {
   // Grow memory by an invalid amount without initial memory.
   WasmRunner<int32_t, uint32_t> r(TestExecutionTier::kInterpreter);
   r.builder().AddMemory(kWasmPageSize);
-  BUILD(r, WASM_GROW_MEMORY(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_GROW_MEMORY(WASM_LOCAL_GET(0)));
   CHECK_EQ(-1, r.Call(1048575));
 }
 
@@ -353,14 +354,14 @@ TEST(ReferenceTypeLocals) {
   {
     WasmRunner<int32_t> r(TestExecutionTier::kInterpreter);
     r.AllocateLocal(kWasmExternRef);
-    BUILD(r, WASM_REF_IS_NULL(WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_REF_IS_NULL(WASM_LOCAL_GET(0)));
     CHECK_EQ(1, r.Call());
   }
   {
     WasmRunner<int32_t> r(TestExecutionTier::kInterpreter);
     r.AllocateLocal(kWasmExternRef);
     BUILD(r,
-          WASM_REF_IS_NULL(WASM_TEE_LOCAL(0, WASM_REF_NULL(kExternRefCode))));
+          WASM_REF_IS_NULL(WASM_LOCAL_TEE(0, WASM_REF_NULL(kExternRefCode))));
     CHECK_EQ(1, r.Call());
   }
 }
@@ -368,7 +369,7 @@ TEST(ReferenceTypeLocals) {
 TEST(TestPossibleNondeterminism) {
   {
     WasmRunner<int32_t, float> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_I32_REINTERPRET_F32(WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_I32_REINTERPRET_F32(WASM_LOCAL_GET(0)));
     r.Call(1048575.5f);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<float>::quiet_NaN());
@@ -376,7 +377,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<int64_t, double> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_I64_REINTERPRET_F64(WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_I64_REINTERPRET_F64(WASM_LOCAL_GET(0)));
     r.Call(16.0);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<double>::quiet_NaN());
@@ -384,7 +385,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<float, float> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F32_COPYSIGN(WASM_F32(42.0f), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F32_COPYSIGN(WASM_F32(42.0f), WASM_LOCAL_GET(0)));
     r.Call(16.0f);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<double>::quiet_NaN());
@@ -392,7 +393,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<double, double> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F64_COPYSIGN(WASM_F64(42.0), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F64_COPYSIGN(WASM_F64(42.0), WASM_LOCAL_GET(0)));
     r.Call(16.0);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<double>::quiet_NaN());
@@ -402,8 +403,9 @@ TEST(TestPossibleNondeterminism) {
     int32_t index = 16;
     WasmRunner<int32_t, float> r(TestExecutionTier::kInterpreter);
     r.builder().AddMemory(kWasmPageSize);
-    BUILD(r, WASM_STORE_MEM(MachineType::Float32(), WASM_I32V(index),
-                            WASM_GET_LOCAL(0)),
+    BUILD(r,
+          WASM_STORE_MEM(MachineType::Float32(), WASM_I32V(index),
+                         WASM_LOCAL_GET(0)),
           WASM_I32V(index));
     r.Call(1345.3456f);
     CHECK(!r.possible_nondeterminism());
@@ -414,8 +416,9 @@ TEST(TestPossibleNondeterminism) {
     int32_t index = 16;
     WasmRunner<int32_t, double> r(TestExecutionTier::kInterpreter);
     r.builder().AddMemory(kWasmPageSize);
-    BUILD(r, WASM_STORE_MEM(MachineType::Float64(), WASM_I32V(index),
-                            WASM_GET_LOCAL(0)),
+    BUILD(r,
+          WASM_STORE_MEM(MachineType::Float64(), WASM_I32V(index),
+                         WASM_LOCAL_GET(0)),
           WASM_I32V(index));
     r.Call(1345.3456);
     CHECK(!r.possible_nondeterminism());
@@ -424,7 +427,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<float, float> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
     r.Call(1048575.5f);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<float>::quiet_NaN());
@@ -432,7 +435,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<double, double> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F64_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F64_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
     r.Call(16.0);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<double>::quiet_NaN());
@@ -440,7 +443,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<int32_t, float> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F32_EQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F32_EQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
     r.Call(16.0);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<float>::quiet_NaN());
@@ -448,7 +451,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<int32_t, double> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F64_EQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F64_EQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
     r.Call(16.0);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<double>::quiet_NaN());
@@ -456,7 +459,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<float, float> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F32_MIN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F32_MIN(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
     r.Call(1048575.5f);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<float>::quiet_NaN());
@@ -464,7 +467,7 @@ TEST(TestPossibleNondeterminism) {
   }
   {
     WasmRunner<double, double> r(TestExecutionTier::kInterpreter);
-    BUILD(r, WASM_F64_MAX(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_F64_MAX(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
     r.Call(16.0);
     CHECK(!r.possible_nondeterminism());
     r.Call(std::numeric_limits<double>::quiet_NaN());
@@ -475,7 +478,7 @@ TEST(TestPossibleNondeterminism) {
 TEST(InterpreterLoadWithoutMemory) {
   WasmRunner<int32_t, int32_t> r(TestExecutionTier::kInterpreter);
   r.builder().AddMemory(0);
-  BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_LOCAL_GET(0)));
   CHECK_TRAP32(r.Call(0));
 }
 
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-js.cc b/deps/v8/test/cctest/wasm/test-run-wasm-js.cc
index 856c6543ed4c21..c2b628d5262b00 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-js.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-js.cc
@@ -73,7 +73,7 @@ ManuallyImportedJSFunction CreateJSSelector(FunctionSig* sig, int which) {
 
 WASM_COMPILED_EXEC_TEST(Run_Int32Sub_jswrapped) {
   WasmRunner<int, int, int> r(execution_tier);
-  BUILD(r, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   r.CheckCallViaJS(33, 44, 11);
   r.CheckCallViaJS(-8723487, -8000000, 723487);
@@ -81,7 +81,7 @@ WASM_COMPILED_EXEC_TEST(Run_Int32Sub_jswrapped) {
 
 WASM_COMPILED_EXEC_TEST(Run_Float32Div_jswrapped) {
   WasmRunner<float, float, float> r(execution_tier);
-  BUILD(r, WASM_F32_DIV(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F32_DIV(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   r.CheckCallViaJS(92, 46, 0.5);
   r.CheckCallViaJS(64, -16, -0.25);
@@ -89,7 +89,7 @@ WASM_COMPILED_EXEC_TEST(Run_Float32Div_jswrapped) {
 
 WASM_COMPILED_EXEC_TEST(Run_Float64Add_jswrapped) {
   WasmRunner<double, double, double> r(execution_tier);
-  BUILD(r, WASM_F64_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F64_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   r.CheckCallViaJS(3, 2, 1);
   r.CheckCallViaJS(-5.5, -5.25, -0.25);
@@ -97,7 +97,7 @@ WASM_COMPILED_EXEC_TEST(Run_Float64Add_jswrapped) {
 
 WASM_COMPILED_EXEC_TEST(Run_I32Popcount_jswrapped) {
   WasmRunner<int, int> r(execution_tier);
-  BUILD(r, WASM_I32_POPCNT(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_POPCNT(WASM_LOCAL_GET(0)));
 
   r.CheckCallViaJS(2, 9);
   r.CheckCallViaJS(3, 11);
@@ -114,7 +114,7 @@ WASM_COMPILED_EXEC_TEST(Run_CallJS_Add_jswrapped) {
   ManuallyImportedJSFunction import = {sigs.i_i(), js_function};
   WasmRunner<int, int> r(execution_tier, &import);
   uint32_t js_index = 0;
-  BUILD(r, WASM_CALL_FUNCTION(js_index, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_CALL_FUNCTION(js_index, WASM_LOCAL_GET(0)));
 
   r.CheckCallViaJS(101, 2);
   r.CheckCallViaJS(199, 100);
@@ -148,7 +148,7 @@ WASM_COMPILED_EXEC_TEST(Run_IndirectCallJSFunction) {
                                        arraysize(indirect_function_table));
 
   BUILD(rc_fn, WASM_CALL_INDIRECT(sig_index, WASM_I32V(left), WASM_I32V(right),
-                                  WASM_GET_LOCAL(0), WASM_I32V(js_index)));
+                                  WASM_LOCAL_GET(0), WASM_I32V(js_index)));
 
   Handle<Object> args_left[] = {isolate->factory()->NewNumber(1)};
   r.CheckCallApplyViaJS(left, rc_fn.function_index(), args_left, 1);
@@ -244,7 +244,7 @@ void RunWASMSelectTest(TestExecutionTier tier, int which) {
 
     WasmRunner<void> r(tier);
     WasmFunctionCompiler& t = r.NewFunction(&sig);
-    BUILD(t, WASM_GET_LOCAL(which));
+    BUILD(t, WASM_LOCAL_GET(which));
 
     Handle<Object> args[] = {
         isolate->factory()->NewNumber(inputs.arg_d(0)),
@@ -316,7 +316,7 @@ void RunWASMSelectAlignTest(TestExecutionTier tier, int num_args,
   for (int which = 0; which < num_params; which++) {
     WasmRunner<void> r(tier);
     WasmFunctionCompiler& t = r.NewFunction(&sig);
-    BUILD(t, WASM_GET_LOCAL(which));
+    BUILD(t, WASM_LOCAL_GET(which));
 
     Handle<Object> args[] = {isolate->factory()->NewNumber(inputs.arg_d(0)),
                              isolate->factory()->NewNumber(inputs.arg_d(1)),
@@ -415,7 +415,7 @@ void RunJSSelectAlignTest(TestExecutionTier tier, int num_args,
   std::vector<byte> code;
 
   for (int i = 0; i < num_params; i++) {
-    ADD_CODE(code, WASM_GET_LOCAL(i));
+    ADD_CODE(code, WASM_LOCAL_GET(i));
   }
 
   uint8_t imported_js_index = 0;
@@ -547,12 +547,12 @@ void RunPickerTest(TestExecutionTier tier, bool indirect) {
                                          arraysize(indirect_function_table));
 
     BUILD(rc_fn, WASM_RETURN_CALL_INDIRECT(sig_index, WASM_I32V(left),
-                                           WASM_I32V(right), WASM_GET_LOCAL(0),
+                                           WASM_I32V(right), WASM_LOCAL_GET(0),
                                            WASM_I32V(js_index)));
   } else {
     BUILD(rc_fn,
           WASM_RETURN_CALL_FUNCTION(js_index, WASM_I32V(left), WASM_I32V(right),
-                                    WASM_GET_LOCAL(0)));
+                                    WASM_LOCAL_GET(0)));
   }
 
   Handle<Object> args_left[] = {isolate->factory()->NewNumber(1)};
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-memory64.cc b/deps/v8/test/cctest/wasm/test-run-wasm-memory64.cc
new file mode 100644
index 00000000000000..1dcccca67fa45d
--- /dev/null
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-memory64.cc
@@ -0,0 +1,59 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "src/wasm/wasm-opcodes-inl.h"
+#include "test/cctest/cctest.h"
+#include "test/cctest/wasm/wasm-run-utils.h"
+#include "test/common/wasm/test-signatures.h"
+#include "test/common/wasm/wasm-macro-gen.h"
+
+namespace v8 {
+namespace internal {
+namespace wasm {
+
+template <typename ReturnType, typename... ParamTypes>
+class Memory64Runner : public WasmRunner<ReturnType, ParamTypes...> {
+ public:
+  explicit Memory64Runner(TestExecutionTier execution_tier)
+      : WasmRunner<ReturnType, ParamTypes...>(execution_tier) {
+    this->builder().EnableFeature(kFeature_memory64);
+    this->builder().SetMemory64();
+  }
+};
+
+WASM_EXEC_TEST(Load) {
+  // TODO(clemensb): Implement memory64 in the interpreter.
+  if (execution_tier == TestExecutionTier::kInterpreter) return;
+
+  Memory64Runner<uint32_t, uint64_t> r(execution_tier);
+  uint32_t* memory =
+      r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(int32_t));
+
+  BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_LOCAL_GET(0)));
+
+  CHECK_EQ(0, r.Call(0));
+
+#if V8_TARGET_BIG_ENDIAN
+  memory[0] = 0x78563412;
+#else
+  memory[0] = 0x12345678;
+#endif
+  CHECK_EQ(0x12345678, r.Call(0));
+  CHECK_EQ(0x123456, r.Call(1));
+  CHECK_EQ(0x1234, r.Call(2));
+  CHECK_EQ(0x12, r.Call(3));
+  CHECK_EQ(0x0, r.Call(4));
+
+  CHECK_TRAP(r.Call(-1));
+  CHECK_TRAP(r.Call(kWasmPageSize));
+  CHECK_TRAP(r.Call(kWasmPageSize - 3));
+  CHECK_EQ(0x0, r.Call(kWasmPageSize - 4));
+  CHECK_TRAP(r.Call(uint64_t{1} << 32));
+}
+
+// TODO(clemensb): Test atomic instructions.
+
+}  // namespace wasm
+}  // namespace internal
+}  // namespace v8
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-module.cc b/deps/v8/test/cctest/wasm/test-run-wasm-module.cc
index 24d0164b41468d..9a6e85f431ad74 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-module.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-module.cc
@@ -332,7 +332,7 @@ TEST(Run_WasmModule_CallAdd) {
     uint16_t param1 = 0;
     uint16_t param2 = 1;
     byte code1[] = {
-        WASM_I32_ADD(WASM_GET_LOCAL(param1), WASM_GET_LOCAL(param2))};
+        WASM_I32_ADD(WASM_LOCAL_GET(param1), WASM_LOCAL_GET(param2))};
     EMIT_CODE_WITH_END(f1, code1);
 
     WasmFunctionBuilder* f2 = builder->AddFunction(sigs.i_v());
@@ -381,9 +381,9 @@ TEST(Run_WasmModule_CheckMemoryIsZero) {
     ExportAsMain(f);
     byte code[] = {WASM_BLOCK_I(
         WASM_WHILE(
-            WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32V_3(kCheckSize)),
+            WASM_I32_LTS(WASM_LOCAL_GET(localIndex), WASM_I32V_3(kCheckSize)),
             WASM_IF_ELSE(
-                WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(localIndex)),
+                WASM_LOAD_MEM(MachineType::Int32(), WASM_LOCAL_GET(localIndex)),
                 WASM_BRV(3, WASM_I32V_1(-1)),
                 WASM_INC_LOCAL_BY(localIndex, 4))),
         WASM_I32V_1(11))};
@@ -405,9 +405,9 @@ TEST(Run_WasmModule_CallMain_recursive) {
     uint16_t localIndex = f->AddLocal(kWasmI32);
     ExportAsMain(f);
     byte code[] = {
-        WASM_SET_LOCAL(localIndex,
+        WASM_LOCAL_SET(localIndex,
                        WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)),
-        WASM_IF_ELSE_I(WASM_I32_LTS(WASM_GET_LOCAL(localIndex), WASM_I32V_1(5)),
+        WASM_IF_ELSE_I(WASM_I32_LTS(WASM_LOCAL_GET(localIndex), WASM_I32V_1(5)),
                        WASM_SEQ(WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO,
                                                WASM_INC_LOCAL(localIndex)),
                                 WASM_CALL_FUNCTION0(0)),
@@ -429,12 +429,12 @@ TEST(Run_WasmModule_Global) {
     uint32_t global2 = builder->AddGlobal(kWasmI32);
     WasmFunctionBuilder* f1 = builder->AddFunction(sigs.i_v());
     byte code1[] = {
-        WASM_I32_ADD(WASM_GET_GLOBAL(global1), WASM_GET_GLOBAL(global2))};
+        WASM_I32_ADD(WASM_GLOBAL_GET(global1), WASM_GLOBAL_GET(global2))};
     EMIT_CODE_WITH_END(f1, code1);
     WasmFunctionBuilder* f2 = builder->AddFunction(sigs.i_v());
     ExportAsMain(f2);
-    byte code2[] = {WASM_SET_GLOBAL(global1, WASM_I32V_1(56)),
-                    WASM_SET_GLOBAL(global2, WASM_I32V_1(41)),
+    byte code2[] = {WASM_GLOBAL_SET(global1, WASM_I32V_1(56)),
+                    WASM_GLOBAL_SET(global2, WASM_I32V_1(41)),
                     WASM_RETURN1(WASM_CALL_FUNCTION0(f1->func_index()))};
     EMIT_CODE_WITH_END(f2, code2);
     TestModule(&zone, builder, 97);
@@ -640,7 +640,7 @@ TEST(Run_WasmModule_GrowMemOobFixedIndex) {
     WasmModuleBuilder* builder = zone.New<WasmModuleBuilder>(&zone);
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
     ExportAsMain(f);
-    byte code[] = {WASM_GROW_MEMORY(WASM_GET_LOCAL(0)), WASM_DROP,
+    byte code[] = {WASM_GROW_MEMORY(WASM_LOCAL_GET(0)), WASM_DROP,
                    WASM_STORE_MEM(MachineType::Int32(), WASM_I32V(index),
                                   WASM_I32V(value)),
                    WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V(index))};
@@ -688,9 +688,9 @@ TEST(Run_WasmModule_GrowMemOobVariableIndex) {
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
     ExportAsMain(f);
     byte code[] = {WASM_GROW_MEMORY(WASM_I32V_1(1)), WASM_DROP,
-                   WASM_STORE_MEM(MachineType::Int32(), WASM_GET_LOCAL(0),
+                   WASM_STORE_MEM(MachineType::Int32(), WASM_LOCAL_GET(0),
                                   WASM_I32V(value)),
-                   WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(0))};
+                   WASM_LOAD_MEM(MachineType::Int32(), WASM_LOCAL_GET(0))};
     EMIT_CODE_WITH_END(f, code);
 
     HandleScope scope(isolate);
@@ -746,7 +746,7 @@ TEST(Run_WasmModule_Global_init) {
         builder->AddGlobal(kWasmI32, false, WasmInitExpr(222222));
     WasmFunctionBuilder* f1 = builder->AddFunction(sigs.i_v());
     byte code[] = {
-        WASM_I32_ADD(WASM_GET_GLOBAL(global1), WASM_GET_GLOBAL(global2))};
+        WASM_I32_ADD(WASM_GLOBAL_GET(global1), WASM_GLOBAL_GET(global2))};
     EMIT_CODE_WITH_END(f1, code);
     ExportAsMain(f1);
     TestModule(&zone, builder, 999999);
@@ -777,7 +777,7 @@ static void RunWasmModuleGlobalInitTest(ValueType type, CType expected) {
       }
 
       WasmFunctionBuilder* f1 = builder->AddFunction(&sig);
-      byte code[] = {WASM_GET_GLOBAL(global)};
+      byte code[] = {WASM_GLOBAL_GET(global)};
       EMIT_CODE_WITH_END(f1, code);
       ExportAsMain(f1);
       TestModule(&zone, builder, expected);
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-sign-extension.cc b/deps/v8/test/cctest/wasm/test-run-wasm-sign-extension.cc
index d6a6478f451eaf..d886279070d923 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-sign-extension.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-sign-extension.cc
@@ -12,7 +12,7 @@ namespace wasm {
 
 WASM_EXEC_TEST(I32SExtendI8) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I32_SIGN_EXT_I8(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_SIGN_EXT_I8(WASM_LOCAL_GET(0)));
   CHECK_EQ(0, r.Call(0));
   CHECK_EQ(1, r.Call(1));
   CHECK_EQ(-1, r.Call(-1));
@@ -22,7 +22,7 @@ WASM_EXEC_TEST(I32SExtendI8) {
 
 WASM_EXEC_TEST(I32SExtendI16) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I32_SIGN_EXT_I16(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_SIGN_EXT_I16(WASM_LOCAL_GET(0)));
   CHECK_EQ(0, r.Call(0));
   CHECK_EQ(1, r.Call(1));
   CHECK_EQ(-1, r.Call(-1));
@@ -32,7 +32,7 @@ WASM_EXEC_TEST(I32SExtendI16) {
 
 WASM_EXEC_TEST(I64SExtendI8) {
   WasmRunner<int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_SIGN_EXT_I8(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SIGN_EXT_I8(WASM_LOCAL_GET(0)));
   CHECK_EQ(0, r.Call(0));
   CHECK_EQ(1, r.Call(1));
   CHECK_EQ(-1, r.Call(-1));
@@ -42,7 +42,7 @@ WASM_EXEC_TEST(I64SExtendI8) {
 
 WASM_EXEC_TEST(I64SExtendI16) {
   WasmRunner<int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_SIGN_EXT_I16(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SIGN_EXT_I16(WASM_LOCAL_GET(0)));
   CHECK_EQ(0, r.Call(0));
   CHECK_EQ(1, r.Call(1));
   CHECK_EQ(-1, r.Call(-1));
@@ -52,7 +52,7 @@ WASM_EXEC_TEST(I64SExtendI16) {
 
 WASM_EXEC_TEST(I64SExtendI32) {
   WasmRunner<int64_t, int64_t> r(execution_tier);
-  BUILD(r, WASM_I64_SIGN_EXT_I32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I64_SIGN_EXT_I32(WASM_LOCAL_GET(0)));
   CHECK_EQ(0, r.Call(0));
   CHECK_EQ(1, r.Call(1));
   CHECK_EQ(-1, r.Call(-1));
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-simd-liftoff.cc b/deps/v8/test/cctest/wasm/test-run-wasm-simd-liftoff.cc
index 7192ff24052a3b..90fd3ac1bc2ff4 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-simd-liftoff.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-simd-liftoff.cc
@@ -32,7 +32,7 @@ namespace test_run_wasm_simd_liftoff {
 WASM_SIMD_LIFTOFF_TEST(S128Local) {
   WasmRunner<int32_t> r(TestExecutionTier::kLiftoff, kNoLowerSimd);
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_GET_LOCAL(temp1)), WASM_ONE);
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_LOCAL_GET(temp1)), WASM_ONE);
   CHECK_EQ(1, r.Call());
 }
 
@@ -41,7 +41,7 @@ WASM_SIMD_LIFTOFF_TEST(S128Global) {
 
   int32_t* g0 = r.builder().AddGlobal<int32_t>(kWasmS128);
   int32_t* g1 = r.builder().AddGlobal<int32_t>(kWasmS128);
-  BUILD(r, WASM_SET_GLOBAL(1, WASM_GET_GLOBAL(0)), WASM_ONE);
+  BUILD(r, WASM_GLOBAL_SET(1, WASM_GLOBAL_GET(0)), WASM_ONE);
 
   int32_t expected = 0x1234;
   for (int i = 0; i < 4; i++) {
@@ -67,7 +67,7 @@ WASM_SIMD_LIFTOFF_TEST(S128Param) {
   BUILD(simd_func, WASM_ONE);
 
   BUILD(r,
-        WASM_CALL_FUNCTION(simd_func.function_index(), WASM_GET_LOCAL(temp1)));
+        WASM_CALL_FUNCTION(simd_func.function_index(), WASM_LOCAL_GET(temp1)));
 
   CHECK_EQ(1, r.Call());
 }
@@ -78,7 +78,7 @@ WASM_SIMD_LIFTOFF_TEST(S128Return) {
   TestSignatures sigs;
   WasmFunctionCompiler& simd_func = r.NewFunction(sigs.s_i());
   byte temp1 = simd_func.AllocateLocal(kWasmS128);
-  BUILD(simd_func, WASM_GET_LOCAL(temp1));
+  BUILD(simd_func, WASM_LOCAL_GET(temp1));
 
   BUILD(r, WASM_CALL_FUNCTION(simd_func.function_index(), WASM_ONE), kExprDrop,
         WASM_ONE);
@@ -97,7 +97,7 @@ WASM_SIMD_LIFTOFF_TEST(REGRESS_1088273) {
   TestSignatures sigs;
   WasmFunctionCompiler& simd_func = r.NewFunction(sigs.s_i());
   byte temp1 = simd_func.AllocateLocal(kWasmS128);
-  BUILD(simd_func, WASM_GET_LOCAL(temp1));
+  BUILD(simd_func, WASM_LOCAL_GET(temp1));
 
   BUILD(r, WASM_SIMD_SPLAT(I8x16, WASM_I32V(0x80)),
         WASM_SIMD_SPLAT(I8x16, WASM_I32V(0x92)),
@@ -133,11 +133,11 @@ WASM_SIMD_LIFTOFF_TEST(I8x16Shuffle) {
       {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 31}};
 
   // Set up locals so shuffle is called with non-adjacent registers v2 and v0.
-  BUILD(r, WASM_SET_LOCAL(local0, WASM_GET_GLOBAL(1)),  // local0 is in v0
-        WASM_SET_LOCAL(local1, WASM_GET_GLOBAL(0)),     // local1 is in v1
-        WASM_GET_GLOBAL(0),                             // global0 is in v2
-        WASM_GET_LOCAL(local0),                         // local0 is in v0
-        WASM_SET_GLOBAL(2, WASM_SIMD_I8x16_SHUFFLE_OP(
+  BUILD(r, WASM_LOCAL_SET(local0, WASM_GLOBAL_GET(1)),  // local0 is in v0
+        WASM_LOCAL_SET(local1, WASM_GLOBAL_GET(0)),     // local1 is in v1
+        WASM_GLOBAL_GET(0),                             // global0 is in v2
+        WASM_LOCAL_GET(local0),                         // local0 is in v0
+        WASM_GLOBAL_SET(2, WASM_SIMD_I8x16_SHUFFLE_OP(
                                kExprI8x16Shuffle, pattern, WASM_NOP, WASM_NOP)),
         WASM_ONE);
 
@@ -171,9 +171,9 @@ WASM_SIMD_LIFTOFF_TEST(I8x16Shuffle_SingleOperand) {
       {31, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}};
 
   // Set up locals so shuffle is called with non-adjacent registers v2 and v0.
-  BUILD(r, WASM_SET_LOCAL(local0, WASM_GET_GLOBAL(0)), WASM_GET_LOCAL(local0),
-        WASM_GET_LOCAL(local0),
-        WASM_SET_GLOBAL(1, WASM_SIMD_I8x16_SHUFFLE_OP(
+  BUILD(r, WASM_LOCAL_SET(local0, WASM_GLOBAL_GET(0)), WASM_LOCAL_GET(local0),
+        WASM_LOCAL_GET(local0),
+        WASM_GLOBAL_SET(1, WASM_SIMD_I8x16_SHUFFLE_OP(
                                kExprI8x16Shuffle, pattern, WASM_NOP, WASM_NOP)),
         WASM_ONE);
 
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-simd-scalar-lowering.cc b/deps/v8/test/cctest/wasm/test-run-wasm-simd-scalar-lowering.cc
index e1d16b02eb1937..11db27f72c436d 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-simd-scalar-lowering.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-simd-scalar-lowering.cc
@@ -30,9 +30,9 @@ WASM_SIMD_TEST(I8x16ToF32x4) {
   float* g = r.builder().AddGlobal<float>(kWasmS128);
   byte param1 = 0;
   BUILD(r,
-        WASM_SET_GLOBAL(
+        WASM_GLOBAL_SET(
             0, WASM_SIMD_UNOP(kExprF32x4Sqrt,
-                              WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(param1)))),
+                              WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(param1)))),
         WASM_ONE);
 
   // Arbitrary pattern that doesn't end up creating a NaN.
@@ -52,7 +52,7 @@ WASM_SIMD_TEST(F64x2_Call_Return) {
 
   WasmFunctionCompiler& fn = r.NewFunction(sigs.s_ss());
   BUILD(fn,
-        WASM_SIMD_BINOP(kExprF64x2Min, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+        WASM_SIMD_BINOP(kExprF64x2Min, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   byte c1[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -76,7 +76,7 @@ WASM_SIMD_TEST(F32x4_Call_Return) {
 
   // A simple function that just calls f32x4.neg on the param.
   WasmFunctionCompiler& fn = r.NewFunction(sigs.s_s());
-  BUILD(fn, WASM_SIMD_UNOP(kExprF32x4Neg, WASM_GET_LOCAL(0)));
+  BUILD(fn, WASM_SIMD_UNOP(kExprF32x4Neg, WASM_LOCAL_GET(0)));
 
   // TODO(v8:10507)
   // Use i32x4 splat since scalar lowering has a problem with f32x4 as a param
@@ -84,7 +84,7 @@ WASM_SIMD_TEST(F32x4_Call_Return) {
   BUILD(r,
         WASM_SIMD_F32x4_EXTRACT_LANE(
             0, WASM_CALL_FUNCTION(fn.function_index(),
-                                  WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(0)))));
+                                  WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(0)))));
   CHECK_EQ(-1.0, r.Call(1));
 }
 
@@ -97,13 +97,13 @@ WASM_SIMD_TEST(I8x16_Call_Return) {
 
   WasmFunctionCompiler& fn = r.NewFunction(sigs.s_ss());
   BUILD(fn,
-        WASM_SIMD_BINOP(kExprI8x16Add, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+        WASM_SIMD_BINOP(kExprI8x16Add, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   BUILD(r,
         WASM_SIMD_I8x16_EXTRACT_LANE(
             0, WASM_CALL_FUNCTION(fn.function_index(),
-                                  WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(0)),
-                                  WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(0)))));
+                                  WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(0)),
+                                  WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(0)))));
   CHECK_EQ(2, r.Call(1));
 }
 
@@ -116,13 +116,13 @@ WASM_SIMD_TEST(I16x8_Call_Return) {
 
   WasmFunctionCompiler& fn = r.NewFunction(sigs.s_ss());
   BUILD(fn,
-        WASM_SIMD_BINOP(kExprI16x8Add, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+        WASM_SIMD_BINOP(kExprI16x8Add, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   BUILD(r,
         WASM_SIMD_I16x8_EXTRACT_LANE(
             0, WASM_CALL_FUNCTION(fn.function_index(),
-                                  WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(0)),
-                                  WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(0)))));
+                                  WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(0)),
+                                  WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(0)))));
   CHECK_EQ(2, r.Call(1));
 }
 
@@ -135,13 +135,13 @@ WASM_SIMD_TEST(I64x2_Call_Return) {
 
   WasmFunctionCompiler& fn = r.NewFunction(sigs.s_ss());
   BUILD(fn,
-        WASM_SIMD_BINOP(kExprI64x2Add, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+        WASM_SIMD_BINOP(kExprI64x2Add, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   BUILD(r,
         WASM_SIMD_I64x2_EXTRACT_LANE(
             0, WASM_CALL_FUNCTION(fn.function_index(),
-                                  WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(0)),
-                                  WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(0)))));
+                                  WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(0)),
+                                  WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(0)))));
   CHECK_EQ(2, r.Call(1));
 }
 
@@ -192,7 +192,7 @@ WASM_SIMD_TEST(AllTrue_DifferentShapes) {
   {
     WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
 
-    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(0)),
           WASM_SIMD_OP(kExprV8x16AllTrue));
 
     CHECK_EQ(0, r.Call(0x00FF00FF));
@@ -201,7 +201,7 @@ WASM_SIMD_TEST(AllTrue_DifferentShapes) {
   {
     WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
 
-    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(0)),
           WASM_SIMD_OP(kExprV16x8AllTrue));
 
     CHECK_EQ(0, r.Call(0x000000FF));
@@ -211,7 +211,7 @@ WASM_SIMD_TEST(AllTrue_DifferentShapes) {
   {
     WasmRunner<int32_t, float> r(execution_tier, lower_simd);
 
-    BUILD(r, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(0)),
           WASM_SIMD_OP(kExprV16x8AllTrue));
 
     CHECK_EQ(1, r.Call(0x000F000F));
@@ -223,7 +223,7 @@ WASM_SIMD_TEST(AnyTrue_DifferentShapes) {
   {
     WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
 
-    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(0)),
           WASM_SIMD_OP(kExprV8x16AnyTrue));
 
     CHECK_EQ(0, r.Call(0x00000000));
@@ -232,7 +232,7 @@ WASM_SIMD_TEST(AnyTrue_DifferentShapes) {
   {
     WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
 
-    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(0)),
           WASM_SIMD_OP(kExprV16x8AnyTrue));
 
     CHECK_EQ(1, r.Call(0x000000FF));
@@ -242,7 +242,7 @@ WASM_SIMD_TEST(AnyTrue_DifferentShapes) {
   {
     WasmRunner<int32_t, float> r(execution_tier, lower_simd);
 
-    BUILD(r, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(0)),
           WASM_SIMD_OP(kExprV8x16AnyTrue));
 
     CHECK_EQ(0, r.Call(0x00000000));
@@ -265,10 +265,10 @@ WASM_SIMD_TEST(V128_I64_PARAMS) {
 
   // Build a function that has both V128 and I64 arguments.
   BUILD(fn,
-        WASM_SIMD_I64x2_REPLACE_LANE(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+        WASM_SIMD_I64x2_REPLACE_LANE(0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   BUILD(r, WASM_SIMD_I64x2_EXTRACT_LANE(
-               0, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(0))));
+               0, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(0))));
 
   CHECK_EQ(0, r.Call(0));
 }
@@ -278,8 +278,8 @@ WASM_SIMD_TEST(I8x16WidenS_I16x8NarrowU) {
   {
     WasmRunner<int32_t, int16_t> r(execution_tier, lower_simd);
 
-    BUILD(r, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(0)),
-          WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(0)),
+          WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(0)),
           WASM_SIMD_OP(kExprI8x16UConvertI16x8),
           WASM_SIMD_OP(kExprI16x8SConvertI8x16Low),
           WASM_SIMD_OP(kExprI32x4ExtractLane), TO_BYTE(0));
@@ -290,8 +290,8 @@ WASM_SIMD_TEST(I8x16WidenS_I16x8NarrowU) {
 
 WASM_SIMD_TEST(S128SelectWithF32x4) {
   WasmRunner<float, int32_t, float, int32_t> r(execution_tier, lower_simd);
-  BUILD(r, WASM_GET_LOCAL(0), WASM_SIMD_OP(kExprI32x4Splat), WASM_GET_LOCAL(1),
-        WASM_SIMD_OP(kExprF32x4Splat), WASM_GET_LOCAL(2),
+  BUILD(r, WASM_LOCAL_GET(0), WASM_SIMD_OP(kExprI32x4Splat), WASM_LOCAL_GET(1),
+        WASM_SIMD_OP(kExprF32x4Splat), WASM_LOCAL_GET(2),
         WASM_SIMD_OP(kExprI32x4Splat), WASM_SIMD_OP(kExprS128Select),
         WASM_SIMD_OP(kExprF32x4ExtractLane), 0);
   // Selection mask is all 0, so always select 2.0.
@@ -300,7 +300,7 @@ WASM_SIMD_TEST(S128SelectWithF32x4) {
 
 WASM_SIMD_TEST(S128AndNotWithF32x4) {
   WasmRunner<float, int32_t, float> r(execution_tier, lower_simd);
-  BUILD(r, WASM_GET_LOCAL(0), WASM_SIMD_OP(kExprI32x4Splat), WASM_GET_LOCAL(1),
+  BUILD(r, WASM_LOCAL_GET(0), WASM_SIMD_OP(kExprI32x4Splat), WASM_LOCAL_GET(1),
         WASM_SIMD_OP(kExprF32x4Splat), WASM_SIMD_OP(kExprS128AndNot),
         WASM_SIMD_OP(kExprF32x4ExtractLane), 0);
   // 0x00700000 & !0x40800000 = 0x00700000
@@ -316,11 +316,11 @@ WASM_SIMD_TEST(FunctionCallWithExtractLaneOutputAsArgument) {
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   WasmFunctionCompiler& fn = r.NewFunction(sigs.f_f());
 
-  BUILD(fn, WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), kExprF32Add);
+  BUILD(fn, WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), kExprF32Add);
 
-  BUILD(r, WASM_GET_LOCAL(0), WASM_SIMD_OP(kExprI32x4Splat),
+  BUILD(r, WASM_LOCAL_GET(0), WASM_SIMD_OP(kExprI32x4Splat),
         WASM_SIMD_OP(kExprF32x4ExtractLane), 0, kExprCallFunction,
-        fn.function_index(), WASM_SIMD_OP(kExprF32x4Splat), WASM_GET_LOCAL(0),
+        fn.function_index(), WASM_SIMD_OP(kExprF32x4Splat), WASM_LOCAL_GET(0),
         WASM_SIMD_OP(kExprI32x4Splat), WASM_SIMD_OP(kExprI32x4Add),
         WASM_SIMD_OP(kExprI32x4ExtractLane), 0);
   CHECK_EQ(15, r.Call(5));
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-simd.cc b/deps/v8/test/cctest/wasm/test-run-wasm-simd.cc
index 8f2131d32c992d..c6be9489544e08 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-simd.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-simd.cc
@@ -332,16 +332,16 @@ bool ExpectFused(TestExecutionTier tier) {
 }  // namespace
 
 #define WASM_SIMD_CHECK_LANE_S(TYPE, value, LANE_TYPE, lane_value, lane_index) \
-  WASM_IF(WASM_##LANE_TYPE##_NE(WASM_GET_LOCAL(lane_value),                    \
+  WASM_IF(WASM_##LANE_TYPE##_NE(WASM_LOCAL_GET(lane_value),                    \
                                 WASM_SIMD_##TYPE##_EXTRACT_LANE(               \
-                                    lane_index, WASM_GET_LOCAL(value))),       \
+                                    lane_index, WASM_LOCAL_GET(value))),       \
           WASM_RETURN1(WASM_ZERO))
 
 // Unsigned Extracts are only available for I8x16, I16x8 types
 #define WASM_SIMD_CHECK_LANE_U(TYPE, value, LANE_TYPE, lane_value, lane_index) \
-  WASM_IF(WASM_##LANE_TYPE##_NE(WASM_GET_LOCAL(lane_value),                    \
+  WASM_IF(WASM_##LANE_TYPE##_NE(WASM_LOCAL_GET(lane_value),                    \
                                 WASM_SIMD_##TYPE##_EXTRACT_LANE_U(             \
-                                    lane_index, WASM_GET_LOCAL(value))),       \
+                                    lane_index, WASM_LOCAL_GET(value))),       \
           WASM_RETURN1(WASM_ZERO))
 
 // The macro below disables tests lowering for certain nodes where the simd
@@ -400,7 +400,7 @@ WASM_SIMD_TEST(S128Globals) {
   // Set up a global to hold input and output vectors.
   int32_t* g0 = r.builder().AddGlobal<int32_t>(kWasmS128);
   int32_t* g1 = r.builder().AddGlobal<int32_t>(kWasmS128);
-  BUILD(r, WASM_SET_GLOBAL(1, WASM_GET_GLOBAL(0)), WASM_ONE);
+  BUILD(r, WASM_GLOBAL_SET(1, WASM_GLOBAL_GET(0)), WASM_ONE);
 
   FOR_INT32_INPUTS(x) {
     for (int i = 0; i < 4; i++) {
@@ -420,7 +420,7 @@ WASM_SIMD_TEST(F32x4Splat) {
   // Set up a global to hold output vector.
   float* g = r.builder().AddGlobal<float>(kWasmS128);
   byte param1 = 0;
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(param1))),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(param1))),
         WASM_ONE);
 
   FOR_FLOAT32_INPUTS(x) {
@@ -443,15 +443,15 @@ WASM_SIMD_TEST(F32x4ReplaceLane) {
   float* g = r.builder().AddGlobal<float>(kWasmS128);
   // Build function to replace each lane with its (FP) index.
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_SPLAT(WASM_F32(3.14159f))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_REPLACE_LANE(
-                                  0, WASM_GET_LOCAL(temp1), WASM_F32(0.0f))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_REPLACE_LANE(
-                                  1, WASM_GET_LOCAL(temp1), WASM_F32(1.0f))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_REPLACE_LANE(
-                                  2, WASM_GET_LOCAL(temp1), WASM_F32(2.0f))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_REPLACE_LANE(
-                               3, WASM_GET_LOCAL(temp1), WASM_F32(3.0f))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_SPLAT(WASM_F32(3.14159f))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_REPLACE_LANE(
+                                  0, WASM_LOCAL_GET(temp1), WASM_F32(0.0f))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_REPLACE_LANE(
+                                  1, WASM_LOCAL_GET(temp1), WASM_F32(1.0f))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_REPLACE_LANE(
+                                  2, WASM_LOCAL_GET(temp1), WASM_F32(2.0f))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_REPLACE_LANE(
+                               3, WASM_LOCAL_GET(temp1), WASM_F32(3.0f))),
         WASM_ONE);
 
   r.Call();
@@ -469,11 +469,11 @@ WASM_SIMD_TEST(F32x4ConvertI32x4) {
   // Build fn to splat test value, perform conversions, and write the results.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(
-            0, WASM_SIMD_UNOP(kExprF32x4SConvertI32x4, WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(
-            1, WASM_SIMD_UNOP(kExprF32x4UConvertI32x4, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(
+            0, WASM_SIMD_UNOP(kExprF32x4SConvertI32x4, WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(
+            1, WASM_SIMD_UNOP(kExprF32x4UConvertI32x4, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT32_INPUTS(x) {
@@ -558,8 +558,8 @@ void RunF32x4UnOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   // Build fn to splat test value, perform unop, and write the result.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(opcode, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(opcode, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_FLOAT32_INPUTS(x) {
@@ -644,10 +644,10 @@ void RunF32x4BinOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   FOR_FLOAT32_INPUTS(x) {
@@ -720,10 +720,10 @@ void RunF32x4CompareOpTest(TestExecutionTier execution_tier,
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   FOR_FLOAT32_INPUTS(x) {
@@ -765,7 +765,8 @@ WASM_SIMD_TEST(F32x4Le) {
   RunF32x4CompareOpTest(execution_tier, lower_simd, kExprF32x4Le, LessEqual);
 }
 
-#if V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM64 || \
+    V8_TARGET_ARCH_ARM
 // TODO(v8:10983) Prototyping sign select.
 template <typename T>
 void RunSignSelect(TestExecutionTier execution_tier, LowerSimd lower_simd,
@@ -776,7 +777,7 @@ void RunSignSelect(TestExecutionTier execution_tier, LowerSimd lower_simd,
   T* output = r.builder().template AddGlobal<T>(kWasmS128);
 
   // Splat 2 constant values, then use a mask that selects alternate lanes.
-  BUILD(r, WASM_GET_LOCAL(0), WASM_SIMD_OP(splat), WASM_GET_LOCAL(1),
+  BUILD(r, WASM_LOCAL_GET(0), WASM_SIMD_OP(splat), WASM_LOCAL_GET(1),
         WASM_SIMD_OP(splat), WASM_SIMD_CONSTANT(mask), WASM_SIMD_OP(signselect),
         kExprGlobalSet, 0, WASM_ONE);
 
@@ -822,7 +823,8 @@ WASM_SIMD_TEST_NO_LOWERING(I64x2SignSelect) {
   RunSignSelect<int64_t>(execution_tier, lower_simd, kExprI64x2SignSelect,
                          kExprI64x2Splat, mask);
 }
-#endif  // V8_TARGET_ARCH_X64
+#endif  // V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM64 ||
+        // V8_TARGET_ARCH_ARM
 
 #if V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_S390X
 WASM_SIMD_TEST_NO_LOWERING(F32x4Qfma) {
@@ -833,10 +835,10 @@ WASM_SIMD_TEST_NO_LOWERING(F32x4Qfma) {
   // Build fn to splat test values, perform compare op, and write the result.
   byte value1 = 0, value2 = 1, value3 = 2;
   BUILD(r,
-        WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_QFMA(
-                               WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value1)),
-                               WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value2)),
-                               WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value3)))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_QFMA(
+                               WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value1)),
+                               WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value2)),
+                               WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value3)))),
         WASM_ONE);
 
   for (FMOperation<float> x : qfma_vector<float>()) {
@@ -858,10 +860,10 @@ WASM_SIMD_TEST_NO_LOWERING(F32x4Qfms) {
   // Build fn to splat test values, perform compare op, and write the result.
   byte value1 = 0, value2 = 1, value3 = 2;
   BUILD(r,
-        WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_QFMS(
-                               WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value1)),
-                               WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value2)),
-                               WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value3)))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_QFMS(
+                               WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value1)),
+                               WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value2)),
+                               WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value3)))),
         WASM_ONE);
 
   for (FMOperation<float> x : qfms_vector<float>()) {
@@ -881,7 +883,7 @@ WASM_SIMD_TEST(I64x2Splat) {
   // Set up a global to hold output vector.
   int64_t* g = r.builder().AddGlobal<int64_t>(kWasmS128);
   byte param1 = 0;
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(param1))),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(param1))),
         WASM_ONE);
 
   FOR_INT64_INPUTS(x) {
@@ -900,10 +902,10 @@ WASM_SIMD_TEST(I64x2ExtractLane) {
   r.AllocateLocal(kWasmS128);
   BUILD(
       r,
-      WASM_SET_LOCAL(0, WASM_SIMD_I64x2_EXTRACT_LANE(
+      WASM_LOCAL_SET(0, WASM_SIMD_I64x2_EXTRACT_LANE(
                             0, WASM_SIMD_I64x2_SPLAT(WASM_I64V(0xFFFFFFFFFF)))),
-      WASM_SET_LOCAL(1, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(0))),
-      WASM_SIMD_I64x2_EXTRACT_LANE(1, WASM_GET_LOCAL(1)));
+      WASM_LOCAL_SET(1, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(0))),
+      WASM_SIMD_I64x2_EXTRACT_LANE(1, WASM_LOCAL_GET(1)));
   CHECK_EQ(0xFFFFFFFFFF, r.Call());
 }
 
@@ -913,11 +915,11 @@ WASM_SIMD_TEST(I64x2ReplaceLane) {
   int64_t* g = r.builder().AddGlobal<int64_t>(kWasmS128);
   // Build function to replace each lane with its index.
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I64x2_SPLAT(WASM_I64V(-1))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I64x2_REPLACE_LANE(
-                                  0, WASM_GET_LOCAL(temp1), WASM_I64V(0))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_I64x2_REPLACE_LANE(
-                               1, WASM_GET_LOCAL(temp1), WASM_I64V(1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I64x2_SPLAT(WASM_I64V(-1))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I64x2_REPLACE_LANE(
+                                  0, WASM_LOCAL_GET(temp1), WASM_I64V(0))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_I64x2_REPLACE_LANE(
+                               1, WASM_LOCAL_GET(temp1), WASM_I64V(1))),
         WASM_ONE);
 
   r.Call();
@@ -934,8 +936,8 @@ void RunI64x2UnOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   // Build fn to splat test value, perform unop, and write the result.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(opcode, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(opcode, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT64_INPUTS(x) {
@@ -964,11 +966,11 @@ void RunI64x2ShiftOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     byte simd = r.AllocateLocal(kWasmS128);
     // Shift using an immediate, and shift using a value loaded from memory.
     BUILD(
-        r, WASM_SET_LOCAL(simd, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_SHIFT_OP(opcode, WASM_GET_LOCAL(simd),
+        r, WASM_LOCAL_SET(simd, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_SHIFT_OP(opcode, WASM_LOCAL_GET(simd),
                                               WASM_I32V(shift))),
-        WASM_SET_GLOBAL(1, WASM_SIMD_SHIFT_OP(
-                               opcode, WASM_GET_LOCAL(simd),
+        WASM_GLOBAL_SET(1, WASM_SIMD_SHIFT_OP(
+                               opcode, WASM_LOCAL_GET(simd),
                                WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO))),
         WASM_ONE);
 
@@ -1009,10 +1011,10 @@ void RunI64x2BinOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   FOR_INT64_INPUTS(x) {
@@ -1036,18 +1038,22 @@ WASM_SIMD_TEST(I64x2Sub) {
                     base::SubWithWraparound);
 }
 
-#if V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_S390X
+#if V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_S390X || \
+    V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS64 || \
+    V8_TARGET_ARCH_MIPS
 WASM_SIMD_TEST_NO_LOWERING(I64x2Eq) {
   RunI64x2BinOpTest(execution_tier, lower_simd, kExprI64x2Eq, Equal);
 }
-#endif  // V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_S390X
+#endif  // V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_S390X ||
+        // V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS64 ||
+        // V8_TARGET_ARCH_MIPS
 
 WASM_SIMD_TEST(F64x2Splat) {
   WasmRunner<int32_t, double> r(execution_tier, lower_simd);
   // Set up a global to hold output vector.
   double* g = r.builder().AddGlobal<double>(kWasmS128);
   byte param1 = 0;
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(param1))),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(param1))),
         WASM_ONE);
 
   FOR_FLOAT64_INPUTS(x) {
@@ -1070,11 +1076,11 @@ WASM_SIMD_TEST(F64x2ExtractLane) {
   byte temp1 = r.AllocateLocal(kWasmF64);
   byte temp2 = r.AllocateLocal(kWasmS128);
   BUILD(r,
-        WASM_SET_LOCAL(temp1,
+        WASM_LOCAL_SET(temp1,
                        WASM_SIMD_F64x2_EXTRACT_LANE(
-                           0, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(param1)))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(temp1))),
-        WASM_SIMD_F64x2_EXTRACT_LANE(1, WASM_GET_LOCAL(temp2)));
+                           0, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(param1)))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(temp1))),
+        WASM_SIMD_F64x2_EXTRACT_LANE(1, WASM_LOCAL_GET(temp2)));
   FOR_FLOAT64_INPUTS(x) {
     double actual = r.Call(x);
     double expected = x;
@@ -1093,13 +1099,13 @@ WASM_SIMD_TEST(F64x2ReplaceLane) {
   double* g1 = r.builder().AddGlobal<double>(kWasmS128);
   // Build function to replace each lane with its (FP) index.
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F64x2_SPLAT(WASM_F64(1e100))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F64x2_SPLAT(WASM_F64(1e100))),
         // Replace lane 0.
-        WASM_SET_GLOBAL(0, WASM_SIMD_F64x2_REPLACE_LANE(
-                               0, WASM_GET_LOCAL(temp1), WASM_F64(0.0f))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F64x2_REPLACE_LANE(
+                               0, WASM_LOCAL_GET(temp1), WASM_F64(0.0f))),
         // Replace lane 1.
-        WASM_SET_GLOBAL(1, WASM_SIMD_F64x2_REPLACE_LANE(
-                               1, WASM_GET_LOCAL(temp1), WASM_F64(1.0f))),
+        WASM_GLOBAL_SET(1, WASM_SIMD_F64x2_REPLACE_LANE(
+                               1, WASM_LOCAL_GET(temp1), WASM_F64(1.0f))),
         WASM_ONE);
 
   r.Call();
@@ -1211,8 +1217,8 @@ void RunF64x2UnOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   // Build fn to splat test value, perform unop, and write the result.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(opcode, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(opcode, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_FLOAT64_INPUTS(x) {
@@ -1285,10 +1291,10 @@ void RunF64x2BinOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   FOR_FLOAT64_INPUTS(x) {
@@ -1359,13 +1365,13 @@ void RunF64x2CompareOpTest(TestExecutionTier execution_tier,
   byte temp2 = r.AllocateLocal(kWasmS128);
   // Make the lanes of each temp compare differently:
   // temp1 = y, x and temp2 = y, y.
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp1,
-                       WASM_SIMD_F64x2_REPLACE_LANE(1, WASM_GET_LOCAL(temp1),
-                                                    WASM_GET_LOCAL(value2))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp1,
+                       WASM_SIMD_F64x2_REPLACE_LANE(1, WASM_LOCAL_GET(temp1),
+                                                    WASM_LOCAL_GET(value2))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   FOR_FLOAT64_INPUTS(x) {
@@ -1429,10 +1435,10 @@ WASM_SIMD_TEST_NO_LOWERING(F64x2Qfma) {
   // Build fn to splat test values, perform compare op, and write the result.
   byte value1 = 0, value2 = 1, value3 = 2;
   BUILD(r,
-        WASM_SET_GLOBAL(0, WASM_SIMD_F64x2_QFMA(
-                               WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value1)),
-                               WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value2)),
-                               WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value3)))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F64x2_QFMA(
+                               WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value1)),
+                               WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value2)),
+                               WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value3)))),
         WASM_ONE);
 
   for (FMOperation<double> x : qfma_vector<double>()) {
@@ -1454,10 +1460,10 @@ WASM_SIMD_TEST_NO_LOWERING(F64x2Qfms) {
   // Build fn to splat test values, perform compare op, and write the result.
   byte value1 = 0, value2 = 1, value3 = 2;
   BUILD(r,
-        WASM_SET_GLOBAL(0, WASM_SIMD_F64x2_QFMS(
-                               WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value1)),
-                               WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value2)),
-                               WASM_SIMD_F64x2_SPLAT(WASM_GET_LOCAL(value3)))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F64x2_QFMS(
+                               WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value1)),
+                               WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value2)),
+                               WASM_SIMD_F64x2_SPLAT(WASM_LOCAL_GET(value3)))),
         WASM_ONE);
 
   for (FMOperation<double> x : qfms_vector<double>()) {
@@ -1477,7 +1483,7 @@ WASM_SIMD_TEST(I32x4Splat) {
   // Set up a global to hold output vector.
   int32_t* g = r.builder().AddGlobal<int32_t>(kWasmS128);
   byte param1 = 0;
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(param1))),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(param1))),
         WASM_ONE);
 
   FOR_INT32_INPUTS(x) {
@@ -1496,15 +1502,15 @@ WASM_SIMD_TEST(I32x4ReplaceLane) {
   int32_t* g = r.builder().AddGlobal<int32_t>(kWasmS128);
   // Build function to replace each lane with its index.
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_SPLAT(WASM_I32V(-1))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_REPLACE_LANE(
-                                  0, WASM_GET_LOCAL(temp1), WASM_I32V(0))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_REPLACE_LANE(
-                                  1, WASM_GET_LOCAL(temp1), WASM_I32V(1))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_REPLACE_LANE(
-                                  2, WASM_GET_LOCAL(temp1), WASM_I32V(2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_I32x4_REPLACE_LANE(
-                               3, WASM_GET_LOCAL(temp1), WASM_I32V(3))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_SPLAT(WASM_I32V(-1))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_REPLACE_LANE(
+                                  0, WASM_LOCAL_GET(temp1), WASM_I32V(0))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_REPLACE_LANE(
+                                  1, WASM_LOCAL_GET(temp1), WASM_I32V(1))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_REPLACE_LANE(
+                                  2, WASM_LOCAL_GET(temp1), WASM_I32V(2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_I32x4_REPLACE_LANE(
+                               3, WASM_LOCAL_GET(temp1), WASM_I32V(3))),
         WASM_ONE);
 
   r.Call();
@@ -1518,7 +1524,7 @@ WASM_SIMD_TEST(I16x8Splat) {
   // Set up a global to hold output vector.
   int16_t* g = r.builder().AddGlobal<int16_t>(kWasmS128);
   byte param1 = 0;
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(param1))),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(param1))),
         WASM_ONE);
 
   FOR_INT16_INPUTS(x) {
@@ -1547,23 +1553,23 @@ WASM_SIMD_TEST(I16x8ReplaceLane) {
   int16_t* g = r.builder().AddGlobal<int16_t>(kWasmS128);
   // Build function to replace each lane with its index.
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_SPLAT(WASM_I32V(-1))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                  0, WASM_GET_LOCAL(temp1), WASM_I32V(0))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                  1, WASM_GET_LOCAL(temp1), WASM_I32V(1))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                  2, WASM_GET_LOCAL(temp1), WASM_I32V(2))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                  3, WASM_GET_LOCAL(temp1), WASM_I32V(3))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                  4, WASM_GET_LOCAL(temp1), WASM_I32V(4))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                  5, WASM_GET_LOCAL(temp1), WASM_I32V(5))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                  6, WASM_GET_LOCAL(temp1), WASM_I32V(6))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_I16x8_REPLACE_LANE(
-                               7, WASM_GET_LOCAL(temp1), WASM_I32V(7))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_SPLAT(WASM_I32V(-1))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                  0, WASM_LOCAL_GET(temp1), WASM_I32V(0))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                  1, WASM_LOCAL_GET(temp1), WASM_I32V(1))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                  2, WASM_LOCAL_GET(temp1), WASM_I32V(2))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                  3, WASM_LOCAL_GET(temp1), WASM_I32V(3))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                  4, WASM_LOCAL_GET(temp1), WASM_I32V(4))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                  5, WASM_LOCAL_GET(temp1), WASM_I32V(5))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                  6, WASM_LOCAL_GET(temp1), WASM_I32V(6))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_I16x8_REPLACE_LANE(
+                               7, WASM_LOCAL_GET(temp1), WASM_I32V(7))),
         WASM_ONE);
 
   r.Call();
@@ -1576,12 +1582,12 @@ WASM_SIMD_TEST(I8x16BitMask) {
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   byte value1 = r.AllocateLocal(kWasmS128);
 
-  BUILD(r, WASM_SET_LOCAL(value1, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SET_LOCAL(value1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                   0, WASM_GET_LOCAL(value1), WASM_I32V(0))),
-        WASM_SET_LOCAL(value1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                   1, WASM_GET_LOCAL(value1), WASM_I32V(-1))),
-        WASM_SIMD_UNOP(kExprI8x16BitMask, WASM_GET_LOCAL(value1)));
+  BUILD(r, WASM_LOCAL_SET(value1, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_LOCAL_SET(value1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                   0, WASM_LOCAL_GET(value1), WASM_I32V(0))),
+        WASM_LOCAL_SET(value1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                   1, WASM_LOCAL_GET(value1), WASM_I32V(-1))),
+        WASM_SIMD_UNOP(kExprI8x16BitMask, WASM_LOCAL_GET(value1)));
 
   FOR_INT8_INPUTS(x) {
     int32_t actual = r.Call(x);
@@ -1595,12 +1601,12 @@ WASM_SIMD_TEST(I16x8BitMask) {
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   byte value1 = r.AllocateLocal(kWasmS128);
 
-  BUILD(r, WASM_SET_LOCAL(value1, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SET_LOCAL(value1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                   0, WASM_GET_LOCAL(value1), WASM_I32V(0))),
-        WASM_SET_LOCAL(value1, WASM_SIMD_I16x8_REPLACE_LANE(
-                                   1, WASM_GET_LOCAL(value1), WASM_I32V(-1))),
-        WASM_SIMD_UNOP(kExprI16x8BitMask, WASM_GET_LOCAL(value1)));
+  BUILD(r, WASM_LOCAL_SET(value1, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_LOCAL_SET(value1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                   0, WASM_LOCAL_GET(value1), WASM_I32V(0))),
+        WASM_LOCAL_SET(value1, WASM_SIMD_I16x8_REPLACE_LANE(
+                                   1, WASM_LOCAL_GET(value1), WASM_I32V(-1))),
+        WASM_SIMD_UNOP(kExprI16x8BitMask, WASM_LOCAL_GET(value1)));
 
   FOR_INT16_INPUTS(x) {
     int32_t actual = r.Call(x);
@@ -1614,12 +1620,12 @@ WASM_SIMD_TEST(I32x4BitMask) {
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   byte value1 = r.AllocateLocal(kWasmS128);
 
-  BUILD(r, WASM_SET_LOCAL(value1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SET_LOCAL(value1, WASM_SIMD_I32x4_REPLACE_LANE(
-                                   0, WASM_GET_LOCAL(value1), WASM_I32V(0))),
-        WASM_SET_LOCAL(value1, WASM_SIMD_I32x4_REPLACE_LANE(
-                                   1, WASM_GET_LOCAL(value1), WASM_I32V(-1))),
-        WASM_SIMD_UNOP(kExprI32x4BitMask, WASM_GET_LOCAL(value1)));
+  BUILD(r, WASM_LOCAL_SET(value1, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_LOCAL_SET(value1, WASM_SIMD_I32x4_REPLACE_LANE(
+                                   0, WASM_LOCAL_GET(value1), WASM_I32V(0))),
+        WASM_LOCAL_SET(value1, WASM_SIMD_I32x4_REPLACE_LANE(
+                                   1, WASM_LOCAL_GET(value1), WASM_I32V(-1))),
+        WASM_SIMD_UNOP(kExprI32x4BitMask, WASM_LOCAL_GET(value1)));
 
   FOR_INT32_INPUTS(x) {
     int32_t actual = r.Call(x);
@@ -1629,17 +1635,14 @@ WASM_SIMD_TEST(I32x4BitMask) {
   }
 }
 
-// TODO(v8:10997) Prototyping i64x2.bitmask.
-#if V8_TARGET_ARCH_X64
 WASM_SIMD_TEST_NO_LOWERING(I64x2BitMask) {
-  FLAG_SCOPE(wasm_simd_post_mvp);
   WasmRunner<int32_t, int64_t> r(execution_tier, lower_simd);
   byte value1 = r.AllocateLocal(kWasmS128);
 
-  BUILD(r, WASM_SET_LOCAL(value1, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SET_LOCAL(value1, WASM_SIMD_I64x2_REPLACE_LANE(
-                                   0, WASM_GET_LOCAL(value1), WASM_I64V_1(0))),
-        WASM_SIMD_UNOP(kExprI64x2BitMask, WASM_GET_LOCAL(value1)));
+  BUILD(r, WASM_LOCAL_SET(value1, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_LOCAL_SET(value1, WASM_SIMD_I64x2_REPLACE_LANE(
+                                   0, WASM_LOCAL_GET(value1), WASM_I64V_1(0))),
+        WASM_SIMD_UNOP(kExprI64x2BitMask, WASM_LOCAL_GET(value1)));
 
   for (int64_t x : compiler::ValueHelper::GetVector<int64_t>()) {
     int32_t actual = r.Call(x);
@@ -1648,14 +1651,13 @@ WASM_SIMD_TEST_NO_LOWERING(I64x2BitMask) {
     CHECK_EQ(actual, expected);
   }
 }
-#endif  // V8_TARGET_ARCH_X64
 
 WASM_SIMD_TEST(I8x16Splat) {
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   // Set up a global to hold output vector.
   int8_t* g = r.builder().AddGlobal<int8_t>(kWasmS128);
   byte param1 = 0;
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(param1))),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(param1))),
         WASM_ONE);
 
   FOR_INT8_INPUTS(x) {
@@ -1684,39 +1686,39 @@ WASM_SIMD_TEST(I8x16ReplaceLane) {
   int8_t* g = r.builder().AddGlobal<int8_t>(kWasmS128);
   // Build function to replace each lane with its index.
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_SPLAT(WASM_I32V(-1))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  0, WASM_GET_LOCAL(temp1), WASM_I32V(0))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  1, WASM_GET_LOCAL(temp1), WASM_I32V(1))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  2, WASM_GET_LOCAL(temp1), WASM_I32V(2))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  3, WASM_GET_LOCAL(temp1), WASM_I32V(3))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  4, WASM_GET_LOCAL(temp1), WASM_I32V(4))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  5, WASM_GET_LOCAL(temp1), WASM_I32V(5))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  6, WASM_GET_LOCAL(temp1), WASM_I32V(6))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  7, WASM_GET_LOCAL(temp1), WASM_I32V(7))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  8, WASM_GET_LOCAL(temp1), WASM_I32V(8))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  9, WASM_GET_LOCAL(temp1), WASM_I32V(9))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  10, WASM_GET_LOCAL(temp1), WASM_I32V(10))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  11, WASM_GET_LOCAL(temp1), WASM_I32V(11))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  12, WASM_GET_LOCAL(temp1), WASM_I32V(12))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  13, WASM_GET_LOCAL(temp1), WASM_I32V(13))),
-        WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
-                                  14, WASM_GET_LOCAL(temp1), WASM_I32V(14))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_I8x16_REPLACE_LANE(
-                               15, WASM_GET_LOCAL(temp1), WASM_I32V(15))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_SPLAT(WASM_I32V(-1))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  0, WASM_LOCAL_GET(temp1), WASM_I32V(0))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  1, WASM_LOCAL_GET(temp1), WASM_I32V(1))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  2, WASM_LOCAL_GET(temp1), WASM_I32V(2))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  3, WASM_LOCAL_GET(temp1), WASM_I32V(3))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  4, WASM_LOCAL_GET(temp1), WASM_I32V(4))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  5, WASM_LOCAL_GET(temp1), WASM_I32V(5))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  6, WASM_LOCAL_GET(temp1), WASM_I32V(6))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  7, WASM_LOCAL_GET(temp1), WASM_I32V(7))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  8, WASM_LOCAL_GET(temp1), WASM_I32V(8))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  9, WASM_LOCAL_GET(temp1), WASM_I32V(9))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  10, WASM_LOCAL_GET(temp1), WASM_I32V(10))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  11, WASM_LOCAL_GET(temp1), WASM_I32V(11))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  12, WASM_LOCAL_GET(temp1), WASM_I32V(12))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  13, WASM_LOCAL_GET(temp1), WASM_I32V(13))),
+        WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_REPLACE_LANE(
+                                  14, WASM_LOCAL_GET(temp1), WASM_I32V(14))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_I8x16_REPLACE_LANE(
+                               15, WASM_LOCAL_GET(temp1), WASM_I32V(15))),
         WASM_ONE);
 
   r.Call();
@@ -1748,11 +1750,11 @@ WASM_SIMD_TEST(I32x4ConvertF32x4) {
   // Build fn to splat test value, perform conversions, and write the results.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(
-            0, WASM_SIMD_UNOP(kExprI32x4SConvertF32x4, WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(
-            1, WASM_SIMD_UNOP(kExprI32x4UConvertF32x4, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(
+            0, WASM_SIMD_UNOP(kExprI32x4SConvertF32x4, WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(
+            1, WASM_SIMD_UNOP(kExprI32x4UConvertF32x4, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_FLOAT32_INPUTS(x) {
@@ -1778,15 +1780,15 @@ WASM_SIMD_TEST(I32x4ConvertI16x8) {
   // Build fn to splat test value, perform conversions, and write the results.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(kExprI32x4SConvertI16x8High,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(1, WASM_SIMD_UNOP(kExprI32x4SConvertI16x8Low,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(2, WASM_SIMD_UNOP(kExprI32x4UConvertI16x8High,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(3, WASM_SIMD_UNOP(kExprI32x4UConvertI16x8Low,
-                                          WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(kExprI32x4SConvertI16x8High,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(1, WASM_SIMD_UNOP(kExprI32x4SConvertI16x8Low,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(2, WASM_SIMD_UNOP(kExprI32x4UConvertI16x8High,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(3, WASM_SIMD_UNOP(kExprI32x4UConvertI16x8Low,
+                                          WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT16_INPUTS(x) {
@@ -1804,7 +1806,8 @@ WASM_SIMD_TEST(I32x4ConvertI16x8) {
 
 // TODO(v8:10972) Prototyping i64x2 convert from i32x4.
 // Tests both signed and unsigned conversion from I32x4 (unpacking).
-#if V8_TARGET_ARCH_ARM64
+#if V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_IA32 || \
+    V8_TARGET_ARCH_ARM
 WASM_SIMD_TEST_NO_LOWERING(I64x2ConvertI32x4) {
   FLAG_SCOPE(wasm_simd_post_mvp);
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
@@ -1816,15 +1819,15 @@ WASM_SIMD_TEST_NO_LOWERING(I64x2ConvertI32x4) {
   // Build fn to splat test value, perform conversions, and write the results.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(kExprI64x2SConvertI32x4High,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(1, WASM_SIMD_UNOP(kExprI64x2SConvertI32x4Low,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(2, WASM_SIMD_UNOP(kExprI64x2UConvertI32x4High,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(3, WASM_SIMD_UNOP(kExprI64x2UConvertI32x4Low,
-                                          WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(kExprI64x2SConvertI32x4High,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(1, WASM_SIMD_UNOP(kExprI64x2SConvertI32x4Low,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(2, WASM_SIMD_UNOP(kExprI64x2UConvertI32x4High,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(3, WASM_SIMD_UNOP(kExprI64x2UConvertI32x4Low,
+                                          WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT32_INPUTS(x) {
@@ -1839,7 +1842,8 @@ WASM_SIMD_TEST_NO_LOWERING(I64x2ConvertI32x4) {
     }
   }
 }
-#endif  // V8_TARGET_ARCH_ARM64
+#endif  // V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_IA32 ||
+        // V8_TARGET_ARCH_ARM
 
 void RunI32x4UnOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
                       WasmOpcode opcode, Int32UnOp expected_op) {
@@ -1849,8 +1853,8 @@ void RunI32x4UnOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   // Build fn to splat test value, perform unop, and write the result.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(opcode, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(opcode, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT32_INPUTS(x) {
@@ -1876,7 +1880,8 @@ WASM_SIMD_TEST(S128Not) {
                    [](int32_t x) { return ~x; });
 }
 
-#if V8_TARGET_ARCH_ARM64
+#if V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 || \
+    V8_TARGET_ARCH_IA32
 // TODO(v8:11086) Prototype i32x4.extadd_pairwise_i16x8_{s,u}
 template <typename Narrow, typename Wide>
 void RunExtAddPairwiseTest(TestExecutionTier execution_tier,
@@ -1890,7 +1895,7 @@ void RunExtAddPairwiseTest(TestExecutionTier execution_tier,
   // TODO(v8:11086) We splat the same value, so pairwise adding ends up adding
   // the same value to itself, consider a more complicated test, like having 2
   // vectors, and shuffling them.
-  BUILD(r, WASM_GET_LOCAL(0), WASM_SIMD_OP(splat),
+  BUILD(r, WASM_LOCAL_GET(0), WASM_SIMD_OP(splat),
         WASM_SIMD_OP(ext_add_pairwise), kExprGlobalSet, 0, WASM_ONE);
 
   for (Narrow x : compiler::ValueHelper::GetVector<Narrow>()) {
@@ -1925,7 +1930,8 @@ WASM_SIMD_TEST_NO_LOWERING(I16x8ExtAddPairwiseI8x16U) {
                                            kExprI16x8ExtAddPairwiseI8x16U,
                                            kExprI8x16Splat);
 }
-#endif  // V8_TARGET_ARCH_ARM64
+#endif  // V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_X64 ||
+        // V8_TARGET_ARCH_IA32
 
 void RunI32x4BinOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
                        WasmOpcode opcode, Int32BinOp expected_op) {
@@ -1936,10 +1942,10 @@ void RunI32x4BinOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   FOR_INT32_INPUTS(x) {
@@ -2061,11 +2067,11 @@ void RunI32x4ShiftOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     byte simd = r.AllocateLocal(kWasmS128);
     // Shift using an immediate, and shift using a value loaded from memory.
     BUILD(
-        r, WASM_SET_LOCAL(simd, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_SHIFT_OP(opcode, WASM_GET_LOCAL(simd),
+        r, WASM_LOCAL_SET(simd, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_SHIFT_OP(opcode, WASM_LOCAL_GET(simd),
                                               WASM_I32V(shift))),
-        WASM_SET_GLOBAL(1, WASM_SIMD_SHIFT_OP(
-                               opcode, WASM_GET_LOCAL(simd),
+        WASM_GLOBAL_SET(1, WASM_SIMD_SHIFT_OP(
+                               opcode, WASM_LOCAL_GET(simd),
                                WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO))),
         WASM_ONE);
 
@@ -2107,15 +2113,15 @@ WASM_SIMD_TEST(I16x8ConvertI8x16) {
   // Build fn to splat test value, perform conversions, and write the results.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(kExprI16x8SConvertI8x16High,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(1, WASM_SIMD_UNOP(kExprI16x8SConvertI8x16Low,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(2, WASM_SIMD_UNOP(kExprI16x8UConvertI8x16High,
-                                          WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(3, WASM_SIMD_UNOP(kExprI16x8UConvertI8x16Low,
-                                          WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(kExprI16x8SConvertI8x16High,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(1, WASM_SIMD_UNOP(kExprI16x8SConvertI8x16Low,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(2, WASM_SIMD_UNOP(kExprI16x8UConvertI8x16High,
+                                          WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(3, WASM_SIMD_UNOP(kExprI16x8UConvertI8x16Low,
+                                          WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT8_INPUTS(x) {
@@ -2140,13 +2146,13 @@ WASM_SIMD_TEST(I16x8ConvertI32x4) {
   // Build fn to splat test value, perform conversions, and write the results.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(
-            0, WASM_SIMD_BINOP(kExprI16x8SConvertI32x4, WASM_GET_LOCAL(temp1),
-                               WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(
-            1, WASM_SIMD_BINOP(kExprI16x8UConvertI32x4, WASM_GET_LOCAL(temp1),
-                               WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(
+            0, WASM_SIMD_BINOP(kExprI16x8SConvertI32x4, WASM_LOCAL_GET(temp1),
+                               WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(
+            1, WASM_SIMD_BINOP(kExprI16x8UConvertI32x4, WASM_LOCAL_GET(temp1),
+                               WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT32_INPUTS(x) {
@@ -2168,8 +2174,8 @@ void RunI16x8UnOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   // Build fn to splat test value, perform unop, and write the result.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(opcode, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(opcode, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT16_INPUTS(x) {
@@ -2200,10 +2206,10 @@ void RunI16x8BinOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   for (T x : compiler::ValueHelper::GetVector<T>()) {
@@ -2318,15 +2324,12 @@ WASM_SIMD_TEST(I16x8RoundingAverageU) {
                               base::RoundingAverageUnsigned);
 }
 
-#if V8_TARGET_ARCH_ARM64
-// TODO(v8:10971) Prototype i16x8.q15mulr_sat_s
 WASM_SIMD_TEST_NO_LOWERING(I16x8Q15MulRSatS) {
   FLAG_SCOPE(wasm_simd_post_mvp);
   RunI16x8BinOpTest<int16_t>(execution_tier, lower_simd, kExprI16x8Q15MulRSatS,
                              SaturateRoundingQMul<int16_t>);
 }
 
-// TODO(v8:11008) Prototype extended multiplication.
 namespace {
 enum class MulHalf { kLow, kHigh };
 
@@ -2338,19 +2341,18 @@ template <typename S, typename T, typename OpType = T (*)(S, S)>
 void RunExtMulTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
                    WasmOpcode opcode, OpType expected_op, WasmOpcode splat,
                    MulHalf half) {
-  FLAG_SCOPE(wasm_simd_post_mvp);
   WasmRunner<int32_t, S, S> r(execution_tier, lower_simd);
   int lane_to_zero = half == MulHalf::kLow ? 1 : 0;
   T* g = r.builder().template AddGlobal<T>(kWasmS128);
 
   BUILD(r,
-        WASM_SET_GLOBAL(
+        WASM_GLOBAL_SET(
             0, WASM_SIMD_BINOP(
                    opcode,
                    WASM_SIMD_I64x2_REPLACE_LANE(
-                       lane_to_zero, WASM_SIMD_UNOP(splat, WASM_GET_LOCAL(0)),
+                       lane_to_zero, WASM_SIMD_UNOP(splat, WASM_LOCAL_GET(0)),
                        WASM_I64V_1(0)),
-                   WASM_SIMD_UNOP(splat, WASM_GET_LOCAL(1)))),
+                   WASM_SIMD_UNOP(splat, WASM_LOCAL_GET(1)))),
         WASM_ONE);
 
   constexpr int lanes = kSimd128Size / sizeof(T);
@@ -2366,78 +2368,77 @@ void RunExtMulTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
 }
 }  // namespace
 
-WASM_SIMD_TEST_NO_LOWERING(I16x8ExtMulLowI8x16S) {
+WASM_SIMD_TEST(I16x8ExtMulLowI8x16S) {
   RunExtMulTest<int8_t, int16_t>(execution_tier, lower_simd,
                                  kExprI16x8ExtMulLowI8x16S, MultiplyLong,
                                  kExprI8x16Splat, MulHalf::kLow);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I16x8ExtMulHighI8x16S) {
+WASM_SIMD_TEST(I16x8ExtMulHighI8x16S) {
   RunExtMulTest<int8_t, int16_t>(execution_tier, lower_simd,
                                  kExprI16x8ExtMulHighI8x16S, MultiplyLong,
                                  kExprI8x16Splat, MulHalf::kHigh);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I16x8ExtMulLowI8x16U) {
+WASM_SIMD_TEST(I16x8ExtMulLowI8x16U) {
   RunExtMulTest<uint8_t, uint16_t>(execution_tier, lower_simd,
                                    kExprI16x8ExtMulLowI8x16U, MultiplyLong,
                                    kExprI8x16Splat, MulHalf::kLow);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I16x8ExtMulHighI8x16U) {
+WASM_SIMD_TEST(I16x8ExtMulHighI8x16U) {
   RunExtMulTest<uint8_t, uint16_t>(execution_tier, lower_simd,
                                    kExprI16x8ExtMulHighI8x16U, MultiplyLong,
                                    kExprI8x16Splat, MulHalf::kHigh);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I32x4ExtMulLowI16x8S) {
+WASM_SIMD_TEST(I32x4ExtMulLowI16x8S) {
   RunExtMulTest<int16_t, int32_t>(execution_tier, lower_simd,
                                   kExprI32x4ExtMulLowI16x8S, MultiplyLong,
                                   kExprI16x8Splat, MulHalf::kLow);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I32x4ExtMulHighI16x8S) {
+WASM_SIMD_TEST(I32x4ExtMulHighI16x8S) {
   RunExtMulTest<int16_t, int32_t>(execution_tier, lower_simd,
                                   kExprI32x4ExtMulHighI16x8S, MultiplyLong,
                                   kExprI16x8Splat, MulHalf::kHigh);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I32x4ExtMulLowI16x8U) {
+WASM_SIMD_TEST(I32x4ExtMulLowI16x8U) {
   RunExtMulTest<uint16_t, uint32_t>(execution_tier, lower_simd,
                                     kExprI32x4ExtMulLowI16x8U, MultiplyLong,
                                     kExprI16x8Splat, MulHalf::kLow);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I32x4ExtMulHighI16x8U) {
+WASM_SIMD_TEST(I32x4ExtMulHighI16x8U) {
   RunExtMulTest<uint16_t, uint32_t>(execution_tier, lower_simd,
                                     kExprI32x4ExtMulHighI16x8U, MultiplyLong,
                                     kExprI16x8Splat, MulHalf::kHigh);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I64x2ExtMulLowI32x4S) {
+WASM_SIMD_TEST(I64x2ExtMulLowI32x4S) {
   RunExtMulTest<int32_t, int64_t>(execution_tier, lower_simd,
                                   kExprI64x2ExtMulLowI32x4S, MultiplyLong,
                                   kExprI32x4Splat, MulHalf::kLow);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I64x2ExtMulHighI32x4S) {
+WASM_SIMD_TEST(I64x2ExtMulHighI32x4S) {
   RunExtMulTest<int32_t, int64_t>(execution_tier, lower_simd,
                                   kExprI64x2ExtMulHighI32x4S, MultiplyLong,
                                   kExprI32x4Splat, MulHalf::kHigh);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I64x2ExtMulLowI32x4U) {
+WASM_SIMD_TEST(I64x2ExtMulLowI32x4U) {
   RunExtMulTest<uint32_t, uint64_t>(execution_tier, lower_simd,
                                     kExprI64x2ExtMulLowI32x4U, MultiplyLong,
                                     kExprI32x4Splat, MulHalf::kLow);
 }
 
-WASM_SIMD_TEST_NO_LOWERING(I64x2ExtMulHighI32x4U) {
+WASM_SIMD_TEST(I64x2ExtMulHighI32x4U) {
   RunExtMulTest<uint32_t, uint64_t>(execution_tier, lower_simd,
                                     kExprI64x2ExtMulHighI32x4U, MultiplyLong,
                                     kExprI32x4Splat, MulHalf::kHigh);
 }
-#endif  // V8_TARGET_ARCH_ARM64
 
 WASM_SIMD_TEST(I32x4DotI16x8S) {
   WasmRunner<int32_t, int16_t, int16_t> r(execution_tier, lower_simd);
@@ -2445,11 +2446,11 @@ WASM_SIMD_TEST(I32x4DotI16x8S) {
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(
-            0, WASM_SIMD_BINOP(kExprI32x4DotI16x8S, WASM_GET_LOCAL(temp1),
-                               WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(
+            0, WASM_SIMD_BINOP(kExprI32x4DotI16x8S, WASM_LOCAL_GET(temp1),
+                               WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   for (int16_t x : compiler::ValueHelper::GetVector<int16_t>()) {
@@ -2476,11 +2477,11 @@ void RunI16x8ShiftOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     byte simd = r.AllocateLocal(kWasmS128);
     // Shift using an immediate, and shift using a value loaded from memory.
     BUILD(
-        r, WASM_SET_LOCAL(simd, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_SHIFT_OP(opcode, WASM_GET_LOCAL(simd),
+        r, WASM_LOCAL_SET(simd, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_SHIFT_OP(opcode, WASM_LOCAL_GET(simd),
                                               WASM_I32V(shift))),
-        WASM_SET_GLOBAL(1, WASM_SIMD_SHIFT_OP(
-                               opcode, WASM_GET_LOCAL(simd),
+        WASM_GLOBAL_SET(1, WASM_SIMD_SHIFT_OP(
+                               opcode, WASM_LOCAL_GET(simd),
                                WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO))),
         WASM_ONE);
 
@@ -2519,8 +2520,8 @@ void RunI8x16UnOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   // Build fn to splat test value, perform unop, and write the result.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_UNOP(opcode, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_UNOP(opcode, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT8_INPUTS(x) {
@@ -2541,7 +2542,7 @@ WASM_SIMD_TEST(I8x16Abs) {
   RunI8x16UnOpTest(execution_tier, lower_simd, kExprI8x16Abs, Abs);
 }
 
-#if V8_TARGET_ARCH_ARM64
+#if V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_ARM
 // TODO(v8:11002) Prototype i8x16.popcnt.
 WASM_SIMD_TEST_NO_LOWERING(I8x16Popcnt) {
   FLAG_SCOPE(wasm_simd_post_mvp);
@@ -2551,9 +2552,9 @@ WASM_SIMD_TEST_NO_LOWERING(I8x16Popcnt) {
   // Build fn to splat test value, perform unop, and write the result.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(
-            0, WASM_SIMD_UNOP(kExprI8x16Popcnt, WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(
+            0, WASM_SIMD_UNOP(kExprI8x16Popcnt, WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_UINT8_INPUTS(x) {
@@ -2564,7 +2565,7 @@ WASM_SIMD_TEST_NO_LOWERING(I8x16Popcnt) {
     }
   }
 }
-#endif  // V8_TARGET_ARCH_ARM64
+#endif  // V8_TARGET_ARCH_ARM64 || V8_TARGET_ARCH_ARM
 
 // Tests both signed and unsigned conversion from I16x8 (packing).
 WASM_SIMD_TEST(I8x16ConvertI16x8) {
@@ -2575,13 +2576,13 @@ WASM_SIMD_TEST(I8x16ConvertI16x8) {
   // Build fn to splat test value, perform conversions, and write the results.
   byte value = 0;
   byte temp1 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(
-            0, WASM_SIMD_BINOP(kExprI8x16SConvertI16x8, WASM_GET_LOCAL(temp1),
-                               WASM_GET_LOCAL(temp1))),
-        WASM_SET_GLOBAL(
-            1, WASM_SIMD_BINOP(kExprI8x16UConvertI16x8, WASM_GET_LOCAL(temp1),
-                               WASM_GET_LOCAL(temp1))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(
+            0, WASM_SIMD_BINOP(kExprI8x16SConvertI16x8, WASM_LOCAL_GET(temp1),
+                               WASM_LOCAL_GET(temp1))),
+        WASM_GLOBAL_SET(
+            1, WASM_SIMD_BINOP(kExprI8x16UConvertI16x8, WASM_LOCAL_GET(temp1),
+                               WASM_LOCAL_GET(temp1))),
         WASM_ONE);
 
   FOR_INT16_INPUTS(x) {
@@ -2605,10 +2606,10 @@ void RunI8x16BinOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   byte value1 = 0, value2 = 1;
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                           WASM_GET_LOCAL(temp2))),
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                           WASM_LOCAL_GET(temp2))),
         WASM_ONE);
 
   for (T x : compiler::ValueHelper::GetVector<T>()) {
@@ -2736,11 +2737,11 @@ void RunI8x16ShiftOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     byte simd = r.AllocateLocal(kWasmS128);
     // Shift using an immediate, and shift using a value loaded from memory.
     BUILD(
-        r, WASM_SET_LOCAL(simd, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(value))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_SHIFT_OP(opcode, WASM_GET_LOCAL(simd),
+        r, WASM_LOCAL_SET(simd, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(value))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_SHIFT_OP(opcode, WASM_LOCAL_GET(simd),
                                               WASM_I32V(shift))),
-        WASM_SET_GLOBAL(1, WASM_SIMD_SHIFT_OP(
-                               opcode, WASM_GET_LOCAL(simd),
+        WASM_GLOBAL_SET(1, WASM_SIMD_SHIFT_OP(
+                               opcode, WASM_LOCAL_GET(simd),
                                WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO))),
         WASM_ONE);
 
@@ -2784,21 +2785,21 @@ WASM_SIMD_TEST(I8x16ShrU) {
     byte zero = r.AllocateLocal(kWasmS128);                                  \
     byte mask = r.AllocateLocal(kWasmS128);                                  \
     BUILD(r,                                                                 \
-          WASM_SET_LOCAL(src1,                                               \
-                         WASM_SIMD_I##format##_SPLAT(WASM_GET_LOCAL(val1))), \
-          WASM_SET_LOCAL(src2,                                               \
-                         WASM_SIMD_I##format##_SPLAT(WASM_GET_LOCAL(val2))), \
-          WASM_SET_LOCAL(zero, WASM_SIMD_I##format##_SPLAT(WASM_ZERO)),      \
-          WASM_SET_LOCAL(mask, WASM_SIMD_I##format##_REPLACE_LANE(           \
-                                   1, WASM_GET_LOCAL(zero), WASM_I32V(-1))), \
-          WASM_SET_LOCAL(mask, WASM_SIMD_I##format##_REPLACE_LANE(           \
-                                   2, WASM_GET_LOCAL(mask), WASM_I32V(-1))), \
-          WASM_SET_LOCAL(                                                    \
+          WASM_LOCAL_SET(src1,                                               \
+                         WASM_SIMD_I##format##_SPLAT(WASM_LOCAL_GET(val1))), \
+          WASM_LOCAL_SET(src2,                                               \
+                         WASM_SIMD_I##format##_SPLAT(WASM_LOCAL_GET(val2))), \
+          WASM_LOCAL_SET(zero, WASM_SIMD_I##format##_SPLAT(WASM_ZERO)),      \
+          WASM_LOCAL_SET(mask, WASM_SIMD_I##format##_REPLACE_LANE(           \
+                                   1, WASM_LOCAL_GET(zero), WASM_I32V(-1))), \
+          WASM_LOCAL_SET(mask, WASM_SIMD_I##format##_REPLACE_LANE(           \
+                                   2, WASM_LOCAL_GET(mask), WASM_I32V(-1))), \
+          WASM_LOCAL_SET(                                                    \
               mask,                                                          \
               WASM_SIMD_SELECT(                                              \
-                  format, WASM_GET_LOCAL(src1), WASM_GET_LOCAL(src2),        \
-                  WASM_SIMD_BINOP(kExprI##format##Ne, WASM_GET_LOCAL(mask),  \
-                                  WASM_GET_LOCAL(zero)))),                   \
+                  format, WASM_LOCAL_GET(src1), WASM_LOCAL_GET(src2),        \
+                  WASM_SIMD_BINOP(kExprI##format##Ne, WASM_LOCAL_GET(mask),  \
+                                  WASM_LOCAL_GET(zero)))),                   \
           WASM_SIMD_CHECK_LANE_S(I##format, mask, I32, val2, 0),             \
           WASM_SIMD_CHECK_LANE_S(I##format, mask, I32, val1, 1),             \
           WASM_SIMD_CHECK_LANE_S(I##format, mask, I32, val1, 2),             \
@@ -2814,7 +2815,7 @@ WASM_SIMD_SELECT_TEST(8x16)
 // Test Select by making a mask where the 0th and 3rd lanes are non-zero and the
 // rest 0. The mask is not the result of a comparison op.
 #define WASM_SIMD_NON_CANONICAL_SELECT_TEST(format)                           \
-  WASM_SIMD_TEST_NO_LOWERING(S##format##NonCanonicalSelect) {                 \
+  WASM_SIMD_TEST(S##format##NonCanonicalSelect) {                             \
     WasmRunner<int32_t, int32_t, int32_t, int32_t> r(execution_tier,          \
                                                      lower_simd);             \
     byte val1 = 0;                                                            \
@@ -2825,18 +2826,18 @@ WASM_SIMD_SELECT_TEST(8x16)
     byte zero = r.AllocateLocal(kWasmS128);                                   \
     byte mask = r.AllocateLocal(kWasmS128);                                   \
     BUILD(r,                                                                  \
-          WASM_SET_LOCAL(src1,                                                \
-                         WASM_SIMD_I##format##_SPLAT(WASM_GET_LOCAL(val1))),  \
-          WASM_SET_LOCAL(src2,                                                \
-                         WASM_SIMD_I##format##_SPLAT(WASM_GET_LOCAL(val2))),  \
-          WASM_SET_LOCAL(zero, WASM_SIMD_I##format##_SPLAT(WASM_ZERO)),       \
-          WASM_SET_LOCAL(mask, WASM_SIMD_I##format##_REPLACE_LANE(            \
-                                   1, WASM_GET_LOCAL(zero), WASM_I32V(0xF))), \
-          WASM_SET_LOCAL(mask, WASM_SIMD_I##format##_REPLACE_LANE(            \
-                                   2, WASM_GET_LOCAL(mask), WASM_I32V(0xF))), \
-          WASM_SET_LOCAL(mask, WASM_SIMD_SELECT(format, WASM_GET_LOCAL(src1), \
-                                                WASM_GET_LOCAL(src2),         \
-                                                WASM_GET_LOCAL(mask))),       \
+          WASM_LOCAL_SET(src1,                                                \
+                         WASM_SIMD_I##format##_SPLAT(WASM_LOCAL_GET(val1))),  \
+          WASM_LOCAL_SET(src2,                                                \
+                         WASM_SIMD_I##format##_SPLAT(WASM_LOCAL_GET(val2))),  \
+          WASM_LOCAL_SET(zero, WASM_SIMD_I##format##_SPLAT(WASM_ZERO)),       \
+          WASM_LOCAL_SET(mask, WASM_SIMD_I##format##_REPLACE_LANE(            \
+                                   1, WASM_LOCAL_GET(zero), WASM_I32V(0xF))), \
+          WASM_LOCAL_SET(mask, WASM_SIMD_I##format##_REPLACE_LANE(            \
+                                   2, WASM_LOCAL_GET(mask), WASM_I32V(0xF))), \
+          WASM_LOCAL_SET(mask, WASM_SIMD_SELECT(format, WASM_LOCAL_GET(src1), \
+                                                WASM_LOCAL_GET(src2),         \
+                                                WASM_LOCAL_GET(mask))),       \
           WASM_SIMD_CHECK_LANE_S(I##format, mask, I32, val2, 0),              \
           WASM_SIMD_CHECK_LANE_S(I##format, mask, I32, combined, 1),          \
           WASM_SIMD_CHECK_LANE_S(I##format, mask, I32, combined, 2),          \
@@ -2865,14 +2866,14 @@ void RunBinaryLaneOpTest(
   }
   if (simd_op == kExprI8x16Shuffle) {
     BUILD(r,
-          WASM_SET_GLOBAL(0, WASM_SIMD_I8x16_SHUFFLE_OP(simd_op, expected,
-                                                        WASM_GET_GLOBAL(0),
-                                                        WASM_GET_GLOBAL(1))),
+          WASM_GLOBAL_SET(0, WASM_SIMD_I8x16_SHUFFLE_OP(simd_op, expected,
+                                                        WASM_GLOBAL_GET(0),
+                                                        WASM_GLOBAL_GET(1))),
           WASM_ONE);
   } else {
     BUILD(r,
-          WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(simd_op, WASM_GET_GLOBAL(0),
-                                             WASM_GET_GLOBAL(1))),
+          WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(simd_op, WASM_GLOBAL_GET(0),
+                                             WASM_GLOBAL_GET(1))),
           WASM_ONE);
   }
 
@@ -2939,6 +2940,7 @@ void RunShuffleOpTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   V(S32x4TransposeRight) \
   V(S32x2Reverse)        \
   V(S32x4Irregular)      \
+  V(S32x4Rotate)         \
   V(S16x8Dup)            \
   V(S16x8ZipLeft)        \
   V(S16x8ZipRight)       \
@@ -2991,6 +2993,7 @@ ShuffleMap test_shuffles = {
      {{4, 5, 6, 7, 0, 1, 2, 3, 12, 13, 14, 15, 8, 9, 10, 11}}},
     {kS32x4Irregular,
      {{0, 1, 2, 3, 16, 17, 18, 19, 16, 17, 18, 19, 20, 21, 22, 23}}},
+    {kS32x4Rotate, {{4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3}}},
     {kS16x8Dup,
      {{18, 19, 18, 19, 18, 19, 18, 19, 18, 19, 18, 19, 18, 19, 18, 19}}},
     {kS16x8ZipLeft, {{0, 1, 16, 17, 2, 3, 18, 19, 4, 5, 20, 21, 6, 7, 22, 23}}},
@@ -3072,6 +3075,28 @@ WASM_SIMD_TEST(S8x16Concat) {
   }
 }
 
+WASM_SIMD_TEST(ShuffleShufps) {
+  // We reverse engineer the shufps immediates into 8x16 shuffles.
+  std::array<int8_t, kSimd128Size> expected;
+  for (int mask = 0; mask < 256; mask++) {
+    // Each iteration of this loop sets byte[i] of the 32x4 lanes.
+    // Low 2 lanes (2-bits each) select from first input.
+    uint8_t index0 = (mask & 3) * 4;
+    uint8_t index1 = ((mask >> 2) & 3) * 4;
+    // Next 2 bits select from src2, so add 16 to the index.
+    uint8_t index2 = ((mask >> 4) & 3) * 4 + 16;
+    uint8_t index3 = ((mask >> 6) & 3) * 4 + 16;
+
+    for (int i = 0; i < 4; i++) {
+      expected[0 + i] = index0 + i;
+      expected[4 + i] = index1 + i;
+      expected[8 + i] = index2 + i;
+      expected[12 + i] = index3 + i;
+    }
+    RunShuffleOpTest(execution_tier, lower_simd, kExprI8x16Shuffle, expected);
+  }
+}
+
 struct SwizzleTestArgs {
   const Shuffle input;
   const Shuffle indices;
@@ -3108,8 +3133,8 @@ WASM_SIMD_TEST(I8x16Swizzle) {
   uint8_t* src1 = r.builder().AddGlobal<uint8_t>(kWasmS128);
   BUILD(
       r,
-      WASM_SET_GLOBAL(0, WASM_SIMD_BINOP(kExprI8x16Swizzle, WASM_GET_GLOBAL(1),
-                                         WASM_GET_GLOBAL(2))),
+      WASM_GLOBAL_SET(0, WASM_SIMD_BINOP(kExprI8x16Swizzle, WASM_GLOBAL_GET(1),
+                                         WASM_GLOBAL_GET(2))),
       WASM_ONE);
 
   for (SwizzleTestArgs si : swizzle_test_vector) {
@@ -3164,7 +3189,7 @@ void BuildShuffle(const std::vector<Shuffle>& shuffles,
   // Perform the leaf shuffles on globals 0 and 1.
   size_t row_index = (shuffles.size() - 1) / 2;
   for (size_t i = row_index; i < shuffles.size(); ++i) {
-    byte operands[] = {WASM_GET_GLOBAL(0), WASM_GET_GLOBAL(1)};
+    byte operands[] = {WASM_GLOBAL_GET(0), WASM_GLOBAL_GET(1)};
     for (size_t j = 0; j < arraysize(operands); ++j)
       buffer->push_back(operands[j]);
     AppendShuffle(shuffles[i], buffer);
@@ -3244,65 +3269,65 @@ WASM_SIMD_TEST(S8x16MultiShuffleFuzz) {
     byte zero = r.AllocateLocal(kWasmS128);                                    \
     byte one_one = r.AllocateLocal(kWasmS128);                                 \
     byte reduced = r.AllocateLocal(kWasmI32);                                  \
-    BUILD(r, WASM_SET_LOCAL(zero, WASM_SIMD_I##format##_SPLAT(int_type(0))),   \
-          WASM_SET_LOCAL(                                                      \
+    BUILD(r, WASM_LOCAL_SET(zero, WASM_SIMD_I##format##_SPLAT(int_type(0))),   \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AnyTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Eq,      \
-                                                      WASM_GET_LOCAL(zero),    \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(zero),    \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
-          WASM_SET_LOCAL(                                                      \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AnyTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Ne,      \
-                                                      WASM_GET_LOCAL(zero),    \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(zero),    \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_NE(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
-          WASM_SET_LOCAL(                                                      \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AllTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Eq,      \
-                                                      WASM_GET_LOCAL(zero),    \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(zero),    \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
-          WASM_SET_LOCAL(                                                      \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AllTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Ne,      \
-                                                      WASM_GET_LOCAL(zero),    \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(zero),    \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_NE(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
-          WASM_SET_LOCAL(one_one,                                              \
+          WASM_LOCAL_SET(one_one,                                              \
                          WASM_SIMD_I##format##_REPLACE_LANE(                   \
-                             lanes - 1, WASM_GET_LOCAL(zero), int_type(1))),   \
-          WASM_SET_LOCAL(                                                      \
+                             lanes - 1, WASM_LOCAL_GET(zero), int_type(1))),   \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AnyTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Eq,      \
-                                                      WASM_GET_LOCAL(one_one), \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(one_one), \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
-          WASM_SET_LOCAL(                                                      \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AnyTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Ne,      \
-                                                      WASM_GET_LOCAL(one_one), \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(one_one), \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
-          WASM_SET_LOCAL(                                                      \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AllTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Eq,      \
-                                                      WASM_GET_LOCAL(one_one), \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(one_one), \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_NE(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
-          WASM_SET_LOCAL(                                                      \
+          WASM_LOCAL_SET(                                                      \
               reduced, WASM_SIMD_UNOP(kExprV##format##AllTrue,                 \
                                       WASM_SIMD_BINOP(kExprI##format##Ne,      \
-                                                      WASM_GET_LOCAL(one_one), \
-                                                      WASM_GET_LOCAL(zero)))), \
-          WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(reduced), WASM_ZERO),             \
+                                                      WASM_LOCAL_GET(one_one), \
+                                                      WASM_LOCAL_GET(zero)))), \
+          WASM_IF(WASM_I32_NE(WASM_LOCAL_GET(reduced), WASM_ZERO),             \
                   WASM_RETURN1(WASM_ZERO)),                                    \
           WASM_ONE);                                                           \
     CHECK_EQ(1, r.Call());                                                     \
@@ -3337,10 +3362,10 @@ WASM_SIMD_TEST(SimdF32x4ExtractLane) {
   r.AllocateLocal(kWasmF32);
   r.AllocateLocal(kWasmS128);
   BUILD(r,
-        WASM_SET_LOCAL(0, WASM_SIMD_F32x4_EXTRACT_LANE(
+        WASM_LOCAL_SET(0, WASM_SIMD_F32x4_EXTRACT_LANE(
                               0, WASM_SIMD_F32x4_SPLAT(WASM_F32(30.5)))),
-        WASM_SET_LOCAL(1, WASM_SIMD_F32x4_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SIMD_F32x4_EXTRACT_LANE(1, WASM_GET_LOCAL(1)));
+        WASM_LOCAL_SET(1, WASM_SIMD_F32x4_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_SIMD_F32x4_EXTRACT_LANE(1, WASM_LOCAL_GET(1)));
   CHECK_EQ(30.5, r.Call());
 }
 
@@ -3381,9 +3406,9 @@ WASM_SIMD_TEST(SimdI32x4AddWithF32x4) {
 WASM_SIMD_TEST(SimdI32x4Local) {
   WasmRunner<int32_t> r(execution_tier, lower_simd);
   r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(0, WASM_SIMD_I32x4_SPLAT(WASM_I32V(31))),
+  BUILD(r, WASM_LOCAL_SET(0, WASM_SIMD_I32x4_SPLAT(WASM_I32V(31))),
 
-        WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_GET_LOCAL(0)));
+        WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_LOCAL_GET(0)));
   CHECK_EQ(31, r.Call());
 }
 
@@ -3392,10 +3417,10 @@ WASM_SIMD_TEST(SimdI32x4SplatFromExtract) {
   r.AllocateLocal(kWasmI32);
   r.AllocateLocal(kWasmS128);
   BUILD(r,
-        WASM_SET_LOCAL(0, WASM_SIMD_I32x4_EXTRACT_LANE(
+        WASM_LOCAL_SET(0, WASM_SIMD_I32x4_EXTRACT_LANE(
                               0, WASM_SIMD_I32x4_SPLAT(WASM_I32V(76)))),
-        WASM_SET_LOCAL(1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SIMD_I32x4_EXTRACT_LANE(1, WASM_GET_LOCAL(1)));
+        WASM_LOCAL_SET(1, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_SIMD_I32x4_EXTRACT_LANE(1, WASM_LOCAL_GET(1)));
   CHECK_EQ(76, r.Call());
 }
 
@@ -3405,31 +3430,31 @@ WASM_SIMD_TEST(SimdI32x4For) {
   r.AllocateLocal(kWasmS128);
   BUILD(r,
 
-        WASM_SET_LOCAL(1, WASM_SIMD_I32x4_SPLAT(WASM_I32V(31))),
-        WASM_SET_LOCAL(1, WASM_SIMD_I32x4_REPLACE_LANE(1, WASM_GET_LOCAL(1),
+        WASM_LOCAL_SET(1, WASM_SIMD_I32x4_SPLAT(WASM_I32V(31))),
+        WASM_LOCAL_SET(1, WASM_SIMD_I32x4_REPLACE_LANE(1, WASM_LOCAL_GET(1),
                                                        WASM_I32V(53))),
-        WASM_SET_LOCAL(1, WASM_SIMD_I32x4_REPLACE_LANE(2, WASM_GET_LOCAL(1),
+        WASM_LOCAL_SET(1, WASM_SIMD_I32x4_REPLACE_LANE(2, WASM_LOCAL_GET(1),
                                                        WASM_I32V(23))),
-        WASM_SET_LOCAL(0, WASM_I32V(0)),
+        WASM_LOCAL_SET(0, WASM_I32V(0)),
         WASM_LOOP(
-            WASM_SET_LOCAL(
-                1, WASM_SIMD_BINOP(kExprI32x4Add, WASM_GET_LOCAL(1),
+            WASM_LOCAL_SET(
+                1, WASM_SIMD_BINOP(kExprI32x4Add, WASM_LOCAL_GET(1),
                                    WASM_SIMD_I32x4_SPLAT(WASM_I32V(1)))),
             WASM_IF(WASM_I32_NE(WASM_INC_LOCAL(0), WASM_I32V(5)), WASM_BR(1))),
-        WASM_SET_LOCAL(0, WASM_I32V(1)),
-        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_GET_LOCAL(1)),
+        WASM_LOCAL_SET(0, WASM_I32V(1)),
+        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_LOCAL_GET(1)),
                             WASM_I32V(36)),
-                WASM_SET_LOCAL(0, WASM_I32V(0))),
-        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(1, WASM_GET_LOCAL(1)),
+                WASM_LOCAL_SET(0, WASM_I32V(0))),
+        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(1, WASM_LOCAL_GET(1)),
                             WASM_I32V(58)),
-                WASM_SET_LOCAL(0, WASM_I32V(0))),
-        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(2, WASM_GET_LOCAL(1)),
+                WASM_LOCAL_SET(0, WASM_I32V(0))),
+        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(2, WASM_LOCAL_GET(1)),
                             WASM_I32V(28)),
-                WASM_SET_LOCAL(0, WASM_I32V(0))),
-        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(3, WASM_GET_LOCAL(1)),
+                WASM_LOCAL_SET(0, WASM_I32V(0))),
+        WASM_IF(WASM_I32_NE(WASM_SIMD_I32x4_EXTRACT_LANE(3, WASM_LOCAL_GET(1)),
                             WASM_I32V(36)),
-                WASM_SET_LOCAL(0, WASM_I32V(0))),
-        WASM_GET_LOCAL(0));
+                WASM_LOCAL_SET(0, WASM_I32V(0))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(1, r.Call());
 }
 
@@ -3437,23 +3462,23 @@ WASM_SIMD_TEST(SimdF32x4For) {
   WasmRunner<int32_t> r(execution_tier, lower_simd);
   r.AllocateLocal(kWasmI32);
   r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(1, WASM_SIMD_F32x4_SPLAT(WASM_F32(21.25))),
-        WASM_SET_LOCAL(1, WASM_SIMD_F32x4_REPLACE_LANE(3, WASM_GET_LOCAL(1),
+  BUILD(r, WASM_LOCAL_SET(1, WASM_SIMD_F32x4_SPLAT(WASM_F32(21.25))),
+        WASM_LOCAL_SET(1, WASM_SIMD_F32x4_REPLACE_LANE(3, WASM_LOCAL_GET(1),
                                                        WASM_F32(19.5))),
-        WASM_SET_LOCAL(0, WASM_I32V(0)),
+        WASM_LOCAL_SET(0, WASM_I32V(0)),
         WASM_LOOP(
-            WASM_SET_LOCAL(
-                1, WASM_SIMD_BINOP(kExprF32x4Add, WASM_GET_LOCAL(1),
+            WASM_LOCAL_SET(
+                1, WASM_SIMD_BINOP(kExprF32x4Add, WASM_LOCAL_GET(1),
                                    WASM_SIMD_F32x4_SPLAT(WASM_F32(2.0)))),
             WASM_IF(WASM_I32_NE(WASM_INC_LOCAL(0), WASM_I32V(3)), WASM_BR(1))),
-        WASM_SET_LOCAL(0, WASM_I32V(1)),
-        WASM_IF(WASM_F32_NE(WASM_SIMD_F32x4_EXTRACT_LANE(0, WASM_GET_LOCAL(1)),
+        WASM_LOCAL_SET(0, WASM_I32V(1)),
+        WASM_IF(WASM_F32_NE(WASM_SIMD_F32x4_EXTRACT_LANE(0, WASM_LOCAL_GET(1)),
                             WASM_F32(27.25)),
-                WASM_SET_LOCAL(0, WASM_I32V(0))),
-        WASM_IF(WASM_F32_NE(WASM_SIMD_F32x4_EXTRACT_LANE(3, WASM_GET_LOCAL(1)),
+                WASM_LOCAL_SET(0, WASM_I32V(0))),
+        WASM_IF(WASM_F32_NE(WASM_SIMD_F32x4_EXTRACT_LANE(3, WASM_LOCAL_GET(1)),
                             WASM_F32(25.5)),
-                WASM_SET_LOCAL(0, WASM_I32V(0))),
-        WASM_GET_LOCAL(0));
+                WASM_LOCAL_SET(0, WASM_I32V(0))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(1, r.Call());
 }
 
@@ -3484,20 +3509,20 @@ WASM_SIMD_TEST(SimdI32x4GetGlobal) {
   SetVectorByLanes(global, {{0, 1, 2, 3}});
   r.AllocateLocal(kWasmI32);
   BUILD(
-      r, WASM_SET_LOCAL(1, WASM_I32V(1)),
+      r, WASM_LOCAL_SET(1, WASM_I32V(1)),
       WASM_IF(WASM_I32_NE(WASM_I32V(0),
-                          WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_GET_GLOBAL(4))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
+                          WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_GLOBAL_GET(4))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
       WASM_IF(WASM_I32_NE(WASM_I32V(1),
-                          WASM_SIMD_I32x4_EXTRACT_LANE(1, WASM_GET_GLOBAL(4))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
+                          WASM_SIMD_I32x4_EXTRACT_LANE(1, WASM_GLOBAL_GET(4))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
       WASM_IF(WASM_I32_NE(WASM_I32V(2),
-                          WASM_SIMD_I32x4_EXTRACT_LANE(2, WASM_GET_GLOBAL(4))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
+                          WASM_SIMD_I32x4_EXTRACT_LANE(2, WASM_GLOBAL_GET(4))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
       WASM_IF(WASM_I32_NE(WASM_I32V(3),
-                          WASM_SIMD_I32x4_EXTRACT_LANE(3, WASM_GET_GLOBAL(4))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
-      WASM_GET_LOCAL(1));
+                          WASM_SIMD_I32x4_EXTRACT_LANE(3, WASM_GLOBAL_GET(4))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
+      WASM_LOCAL_GET(1));
   CHECK_EQ(1, r.Call(0));
 }
 
@@ -3509,12 +3534,12 @@ WASM_SIMD_TEST(SimdI32x4SetGlobal) {
   r.builder().AddGlobal<int32_t>(kWasmI32);  // purposefully unused
   r.builder().AddGlobal<int32_t>(kWasmI32);  // purposefully unused
   int32_t* global = r.builder().AddGlobal<int32_t>(kWasmS128);
-  BUILD(r, WASM_SET_GLOBAL(4, WASM_SIMD_I32x4_SPLAT(WASM_I32V(23))),
-        WASM_SET_GLOBAL(4, WASM_SIMD_I32x4_REPLACE_LANE(1, WASM_GET_GLOBAL(4),
+  BUILD(r, WASM_GLOBAL_SET(4, WASM_SIMD_I32x4_SPLAT(WASM_I32V(23))),
+        WASM_GLOBAL_SET(4, WASM_SIMD_I32x4_REPLACE_LANE(1, WASM_GLOBAL_GET(4),
                                                         WASM_I32V(34))),
-        WASM_SET_GLOBAL(4, WASM_SIMD_I32x4_REPLACE_LANE(2, WASM_GET_GLOBAL(4),
+        WASM_GLOBAL_SET(4, WASM_SIMD_I32x4_REPLACE_LANE(2, WASM_GLOBAL_GET(4),
                                                         WASM_I32V(45))),
-        WASM_SET_GLOBAL(4, WASM_SIMD_I32x4_REPLACE_LANE(3, WASM_GET_GLOBAL(4),
+        WASM_GLOBAL_SET(4, WASM_SIMD_I32x4_REPLACE_LANE(3, WASM_GLOBAL_GET(4),
                                                         WASM_I32V(56))),
         WASM_I32V(1));
   CHECK_EQ(1, r.Call(0));
@@ -3530,32 +3555,32 @@ WASM_SIMD_TEST(SimdF32x4GetGlobal) {
   SetVectorByLanes<float>(global, {{0.0, 1.5, 2.25, 3.5}});
   r.AllocateLocal(kWasmI32);
   BUILD(
-      r, WASM_SET_LOCAL(1, WASM_I32V(1)),
+      r, WASM_LOCAL_SET(1, WASM_I32V(1)),
       WASM_IF(WASM_F32_NE(WASM_F32(0.0),
-                          WASM_SIMD_F32x4_EXTRACT_LANE(0, WASM_GET_GLOBAL(0))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
+                          WASM_SIMD_F32x4_EXTRACT_LANE(0, WASM_GLOBAL_GET(0))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
       WASM_IF(WASM_F32_NE(WASM_F32(1.5),
-                          WASM_SIMD_F32x4_EXTRACT_LANE(1, WASM_GET_GLOBAL(0))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
+                          WASM_SIMD_F32x4_EXTRACT_LANE(1, WASM_GLOBAL_GET(0))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
       WASM_IF(WASM_F32_NE(WASM_F32(2.25),
-                          WASM_SIMD_F32x4_EXTRACT_LANE(2, WASM_GET_GLOBAL(0))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
+                          WASM_SIMD_F32x4_EXTRACT_LANE(2, WASM_GLOBAL_GET(0))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
       WASM_IF(WASM_F32_NE(WASM_F32(3.5),
-                          WASM_SIMD_F32x4_EXTRACT_LANE(3, WASM_GET_GLOBAL(0))),
-              WASM_SET_LOCAL(1, WASM_I32V(0))),
-      WASM_GET_LOCAL(1));
+                          WASM_SIMD_F32x4_EXTRACT_LANE(3, WASM_GLOBAL_GET(0))),
+              WASM_LOCAL_SET(1, WASM_I32V(0))),
+      WASM_LOCAL_GET(1));
   CHECK_EQ(1, r.Call(0));
 }
 
 WASM_SIMD_TEST(SimdF32x4SetGlobal) {
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   float* global = r.builder().AddGlobal<float>(kWasmS128);
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_SPLAT(WASM_F32(13.5))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_REPLACE_LANE(1, WASM_GET_GLOBAL(0),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_SPLAT(WASM_F32(13.5))),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_REPLACE_LANE(1, WASM_GLOBAL_GET(0),
                                                         WASM_F32(45.5))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_REPLACE_LANE(2, WASM_GET_GLOBAL(0),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_REPLACE_LANE(2, WASM_GLOBAL_GET(0),
                                                         WASM_F32(32.25))),
-        WASM_SET_GLOBAL(0, WASM_SIMD_F32x4_REPLACE_LANE(3, WASM_GET_GLOBAL(0),
+        WASM_GLOBAL_SET(0, WASM_SIMD_F32x4_REPLACE_LANE(3, WASM_GLOBAL_GET(0),
                                                         WASM_F32(65.0))),
         WASM_I32V(1));
   CHECK_EQ(1, r.Call(0));
@@ -3565,6 +3590,60 @@ WASM_SIMD_TEST(SimdF32x4SetGlobal) {
   CHECK_EQ(GetScalar(global, 3), 65.0f);
 }
 
+#if V8_TARGET_ARCH_ARM64
+// TODO(v8:11168): Prototyping prefetch.
+WASM_SIMD_TEST(SimdPrefetch) {
+  FLAG_SCOPE(wasm_simd_post_mvp);
+
+  {
+    // Test PrefetchT.
+    WasmRunner<int32_t> r(execution_tier, lower_simd);
+    int32_t* memory =
+        r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
+    BUILD(r, WASM_ZERO, WASM_SIMD_OP(kExprPrefetchT), ZERO_ALIGNMENT,
+          ZERO_OFFSET,
+          WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_SIMD_LOAD_MEM(WASM_ZERO)));
+
+    FOR_INT32_INPUTS(i) {
+      r.builder().WriteMemory(&memory[0], i);
+      CHECK_EQ(i, r.Call());
+    }
+  }
+
+  {
+    // Test PrefetchNT.
+    WasmRunner<int32_t> r(execution_tier, lower_simd);
+    int32_t* memory =
+        r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
+    BUILD(r, WASM_ZERO, WASM_SIMD_OP(kExprPrefetchNT), ZERO_ALIGNMENT,
+          ZERO_OFFSET,
+          WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_SIMD_LOAD_MEM(WASM_ZERO)));
+
+    FOR_INT32_INPUTS(i) {
+      r.builder().WriteMemory(&memory[0], i);
+      CHECK_EQ(i, r.Call());
+    }
+  }
+
+  {
+    // Test OOB.
+    WasmRunner<int32_t> r(execution_tier, lower_simd);
+    int32_t* memory =
+        r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
+
+    // Prefetch kWasmPageSize+1 but still load from 0.
+    BUILD(r, WASM_I32V(kWasmPageSize + 1), WASM_SIMD_OP(kExprPrefetchNT),
+          ZERO_ALIGNMENT, ZERO_OFFSET,
+          WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_SIMD_LOAD_MEM(WASM_ZERO)));
+
+    FOR_INT32_INPUTS(i) {
+      r.builder().WriteMemory(&memory[0], i);
+      CHECK_EQ(i, r.Call());
+    }
+  }
+}
+#endif  // V8_TARGET_ARCH_ARM64
+
 WASM_SIMD_TEST(SimdLoadStoreLoad) {
   WasmRunner<int32_t> r(execution_tier, lower_simd);
   int32_t* memory =
@@ -3579,6 +3658,33 @@ WASM_SIMD_TEST(SimdLoadStoreLoad) {
     r.builder().WriteMemory(&memory[1], expected);
     CHECK_EQ(expected, r.Call());
   }
+
+  {
+    // OOB tests for loads.
+    WasmRunner<int32_t, uint32_t> r(execution_tier, lower_simd);
+    r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
+    BUILD(r, WASM_SIMD_I32x4_EXTRACT_LANE(
+                 0, WASM_SIMD_LOAD_MEM(WASM_LOCAL_GET(0))));
+
+    for (uint32_t offset = kWasmPageSize - (kSimd128Size - 1);
+         offset < kWasmPageSize; ++offset) {
+      CHECK_TRAP(r.Call(offset));
+    }
+  }
+
+  {
+    // OOB tests for stores.
+    WasmRunner<int32_t, uint32_t> r(execution_tier, lower_simd);
+    r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
+    BUILD(r,
+          WASM_SIMD_STORE_MEM(WASM_LOCAL_GET(0), WASM_SIMD_LOAD_MEM(WASM_ZERO)),
+          WASM_ONE);
+
+    for (uint32_t offset = kWasmPageSize - (kSimd128Size - 1);
+         offset < kWasmPageSize; ++offset) {
+      CHECK_TRAP(r.Call(offset));
+    }
+  }
 }
 
 WASM_SIMD_TEST(SimdLoadStoreLoadMemargOffset) {
@@ -3602,6 +3708,32 @@ WASM_SIMD_TEST(SimdLoadStoreLoadMemargOffset) {
     r.builder().WriteMemory(&memory[1], expected);
     CHECK_EQ(expected, r.Call());
   }
+
+  {
+    // OOB tests for loads with offsets.
+    for (uint32_t offset = kWasmPageSize - (kSimd128Size - 1);
+         offset < kWasmPageSize; ++offset) {
+      WasmRunner<int32_t> r(execution_tier, lower_simd);
+      r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
+      BUILD(r, WASM_SIMD_I32x4_EXTRACT_LANE(
+                   0, WASM_SIMD_LOAD_MEM_OFFSET(U32V_3(offset), WASM_ZERO)));
+      CHECK_TRAP(r.Call());
+    }
+  }
+
+  {
+    // OOB tests for stores with offsets
+    for (uint32_t offset = kWasmPageSize - (kSimd128Size - 1);
+         offset < kWasmPageSize; ++offset) {
+      WasmRunner<int32_t, uint32_t> r(execution_tier, lower_simd);
+      r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
+      BUILD(r,
+            WASM_SIMD_STORE_MEM_OFFSET(U32V_3(offset), WASM_ZERO,
+                                       WASM_SIMD_LOAD_MEM(WASM_ZERO)),
+            WASM_ONE);
+      CHECK_TRAP(r.Call(offset));
+    }
+  }
 }
 
 // Test a multi-byte opcode with offset values that encode into valid opcodes.
@@ -3613,7 +3745,7 @@ WASM_SIMD_TEST(S128Load8SplatOffset) {
   int8_t* memory = r.builder().AddMemoryElems<int8_t>(kWasmPageSize);
   int8_t* global = r.builder().AddGlobal<int8_t>(kWasmS128);
   BUILD(r,
-        WASM_SET_GLOBAL(
+        WASM_GLOBAL_SET(
             0, WASM_SIMD_LOAD_OP_OFFSET(kExprS128Load8Splat, WASM_I32V(0),
                                         U32V_2(offset))),
         WASM_ONE);
@@ -3635,7 +3767,7 @@ void RunLoadSplatTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   WasmRunner<int32_t> r(execution_tier, lower_simd);
   T* memory = r.builder().AddMemoryElems<T>(kWasmPageSize / sizeof(T));
   T* global = r.builder().AddGlobal<T>(kWasmS128);
-  BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP(op, WASM_I32V(mem_index))),
+  BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP(op, WASM_I32V(mem_index))),
         WASM_ONE);
 
   for (T x : compiler::ValueHelper::GetVector<T>()) {
@@ -3653,7 +3785,7 @@ void RunLoadSplatTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     r.builder().AddMemoryElems<T>(kWasmPageSize / sizeof(T));
     r.builder().AddGlobal<T>(kWasmS128);
 
-    BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP(op, WASM_GET_LOCAL(0))),
+    BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP(op, WASM_LOCAL_GET(0))),
           WASM_ONE);
 
     // Load splats load sizeof(T) bytes.
@@ -3694,7 +3826,7 @@ void RunLoadExtendTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     S* memory = r.builder().AddMemoryElems<S>(kWasmPageSize / sizeof(S));
     T* global = r.builder().AddGlobal<T>(kWasmS128);
     BUILD(r,
-          WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP_ALIGNMENT(
+          WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP_ALIGNMENT(
                                  op, WASM_I32V(mem_index), alignment)),
           WASM_ONE);
 
@@ -3717,7 +3849,7 @@ void RunLoadExtendTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     T* global = r.builder().AddGlobal<T>(kWasmS128);
     constexpr byte offset = sizeof(S);
     BUILD(r,
-          WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP_OFFSET(op, WASM_ZERO, offset)),
+          WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP_OFFSET(op, WASM_ZERO, offset)),
           WASM_ONE);
 
     // Let max_s be the max_s value for type S, we set up the memory as such:
@@ -3744,7 +3876,7 @@ void RunLoadExtendTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     r.builder().AddMemoryElems<S>(kWasmPageSize / sizeof(S));
     r.builder().AddGlobal<T>(kWasmS128);
 
-    BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP(op, WASM_GET_LOCAL(0))),
+    BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP(op, WASM_LOCAL_GET(0))),
           WASM_ONE);
 
     // Load extends load 8 bytes, so should trap from -7.
@@ -3807,7 +3939,7 @@ void RunLoadZeroTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     WasmRunner<int32_t> r(execution_tier, lower_simd);
     std::tie(memory, global) = initialize_builder(&r);
 
-    BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP(op, WASM_I32V(mem_index))),
+    BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP(op, WASM_I32V(mem_index))),
           WASM_ONE);
     r.Call();
 
@@ -3826,7 +3958,7 @@ void RunLoadZeroTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
 
     BUILD(
         r,
-        WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP_OFFSET(op, WASM_ZERO, mem_index)),
+        WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP_OFFSET(op, WASM_ZERO, mem_index)),
         WASM_ONE);
     r.Call();
 
@@ -3844,7 +3976,7 @@ void RunLoadZeroTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     r.builder().AddMemoryElems<S>(kWasmPageSize / sizeof(S));
     r.builder().AddGlobal<S>(kWasmS128);
 
-    BUILD(r, WASM_SET_GLOBAL(0, WASM_SIMD_LOAD_OP(op, WASM_GET_LOCAL(0))),
+    BUILD(r, WASM_GLOBAL_SET(0, WASM_SIMD_LOAD_OP(op, WASM_LOCAL_GET(0))),
           WASM_ONE);
 
     // Load extends load sizeof(S) bytes.
@@ -3863,17 +3995,13 @@ WASM_SIMD_TEST(S128Load64Zero) {
   RunLoadZeroTest<int64_t>(execution_tier, lower_simd, kExprS128Load64Zero);
 }
 
-#if V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM64 || \
+    V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_S390X || V8_TARGET_ARCH_MIPS64
 // TODO(v8:10975): Prototyping load lane and store lane.
 template <typename T>
 void RunLoadLaneTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
                      WasmOpcode load_op, WasmOpcode splat_op) {
   FLAG_SCOPE(wasm_simd_post_mvp);
-  if (execution_tier == TestExecutionTier::kLiftoff) {
-    // Not yet implemented.
-    return;
-  }
-
   WasmOpcode const_op =
       splat_op == kExprI64x2Splat ? kExprI64Const : kExprI32Const;
 
@@ -3937,7 +4065,7 @@ void RunLoadLaneTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     r.builder().AddMemoryElems<T>(kWasmPageSize / sizeof(T));
     r.builder().AddGlobal<T>(kWasmS128);
 
-    BUILD(r, WASM_GET_LOCAL(0), const_op, splat_value, WASM_SIMD_OP(splat_op),
+    BUILD(r, WASM_LOCAL_GET(0), const_op, splat_value, WASM_SIMD_OP(splat_op),
           WASM_SIMD_OP(load_op), ZERO_ALIGNMENT, ZERO_OFFSET, 0, kExprGlobalSet,
           0, WASM_ONE);
 
@@ -3979,23 +4107,24 @@ void RunStoreLaneTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   }
 
   constexpr int lanes = kSimd128Size / sizeof(T);
-  constexpr int mem_index = 16;  // Store from mem index 16 (bytes).
+  constexpr int mem_index = 16;  // Store to mem index 16 (bytes).
   constexpr int splat_value = 33;
   WasmOpcode const_op =
       splat_op == kExprI64x2Splat ? kExprI64Const : kExprI32Const;
 
-  for (int lane_index = 0; lane_index < lanes; lane_index++) {
-    WasmRunner<int32_t> r(execution_tier, lower_simd);
-    T* memory = r.builder().AddMemoryElems<T>(kWasmPageSize / sizeof(T));
+  T* memory;  // Will be set by build_fn.
 
-    // Splat splat_value, then only Store and replace a single lane with the
+  auto build_fn = [=, &memory](WasmRunner<int32_t>& r, int mem_index,
+                               int lane_index, int alignment, int offset) {
+    memory = r.builder().AddMemoryElems<T>(kWasmPageSize / sizeof(T));
+    // Splat splat_value, then only Store and replace a single lane.
     BUILD(r, WASM_I32V(mem_index), const_op, splat_value,
-          WASM_SIMD_OP(splat_op), WASM_SIMD_OP(store_op), ZERO_ALIGNMENT,
-          ZERO_OFFSET, lane_index, WASM_ONE);
-
+          WASM_SIMD_OP(splat_op), WASM_SIMD_OP(store_op), alignment, offset,
+          lane_index, WASM_ONE);
     r.builder().BlankMemory();
-    r.Call();
+  };
 
+  auto check_results = [=](WasmRunner<int32_t>& r, T* memory) {
     for (int i = 0; i < lanes; i++) {
       CHECK_EQ(0, r.builder().ReadMemory(&memory[i]));
     }
@@ -4005,6 +4134,30 @@ void RunStoreLaneTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     for (int i = lanes + 1; i < lanes * 2; i++) {
       CHECK_EQ(0, r.builder().ReadMemory(&memory[i]));
     }
+  };
+
+  for (int lane_index = 0; lane_index < lanes; lane_index++) {
+    WasmRunner<int32_t> r(execution_tier, lower_simd);
+    build_fn(r, mem_index, lane_index, ZERO_ALIGNMENT, ZERO_OFFSET);
+    r.Call();
+    check_results(r, memory);
+  }
+
+  // Check all possible alignments.
+  constexpr int max_alignment = base::bits::CountTrailingZeros(sizeof(T));
+  for (byte alignment = 0; alignment <= max_alignment; ++alignment) {
+    WasmRunner<int32_t> r(execution_tier, lower_simd);
+    build_fn(r, mem_index, /*lane_index=*/0, alignment, ZERO_OFFSET);
+    r.Call();
+    check_results(r, memory);
+  }
+
+  {
+    // Use memarg for offset.
+    WasmRunner<int32_t> r(execution_tier, lower_simd);
+    build_fn(r, /*mem_index=*/0, /*lane_index=*/0, ZERO_ALIGNMENT, mem_index);
+    r.Call();
+    check_results(r, memory);
   }
 
   // OOB stores
@@ -4012,7 +4165,7 @@ void RunStoreLaneTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
     WasmRunner<int32_t, uint32_t> r(execution_tier, lower_simd);
     r.builder().AddMemoryElems<T>(kWasmPageSize / sizeof(T));
 
-    BUILD(r, WASM_GET_LOCAL(0), const_op, splat_value, WASM_SIMD_OP(splat_op),
+    BUILD(r, WASM_LOCAL_GET(0), const_op, splat_value, WASM_SIMD_OP(splat_op),
           WASM_SIMD_OP(store_op), ZERO_ALIGNMENT, ZERO_OFFSET, 0, WASM_ONE);
 
     // StoreLane stores sizeof(T) bytes.
@@ -4043,7 +4196,8 @@ WASM_SIMD_TEST_NO_LOWERING(S128Store64Lane) {
                             kExprI64x2Splat);
 }
 
-#endif  // V8_TARGET_ARCH_X64
+#endif  // V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM64 ||
+        // V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_S390X || V8_TARGET_ARCH_MIPS64
 
 #define WASM_SIMD_ANYTRUE_TEST(format, lanes, max, param_type)                \
   WASM_SIMD_TEST(S##format##AnyTrue) {                                        \
@@ -4053,8 +4207,8 @@ WASM_SIMD_TEST_NO_LOWERING(S128Store64Lane) {
     byte simd = r.AllocateLocal(kWasmS128);                                   \
     BUILD(                                                                    \
         r,                                                                    \
-        WASM_SET_LOCAL(simd, WASM_SIMD_I##format##_SPLAT(WASM_GET_LOCAL(0))), \
-        WASM_SIMD_UNOP(kExprV##format##AnyTrue, WASM_GET_LOCAL(simd)));       \
+        WASM_LOCAL_SET(simd, WASM_SIMD_I##format##_SPLAT(WASM_LOCAL_GET(0))), \
+        WASM_SIMD_UNOP(kExprV##format##AnyTrue, WASM_LOCAL_GET(simd)));       \
     CHECK_EQ(1, r.Call(max));                                                 \
     CHECK_EQ(1, r.Call(5));                                                   \
     CHECK_EQ(0, r.Call(0));                                                   \
@@ -4069,8 +4223,8 @@ WASM_SIMD_ANYTRUE_TEST(8x16, 16, 0xff, int32_t)
 WASM_SIMD_TEST(V32x4AnytrueWithNegativeZero) {
   WasmRunner<int32_t, int64_t> r(execution_tier, lower_simd);
   byte simd = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(simd, WASM_SIMD_I64x2_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SIMD_UNOP(kExprV32x4AnyTrue, WASM_GET_LOCAL(simd)));
+  BUILD(r, WASM_LOCAL_SET(simd, WASM_SIMD_I64x2_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_SIMD_UNOP(kExprV32x4AnyTrue, WASM_LOCAL_GET(simd)));
   CHECK_EQ(1, r.Call(0x8000000000000000));
   CHECK_EQ(0, r.Call(0x0000000000000000));
 }
@@ -4083,8 +4237,8 @@ WASM_SIMD_TEST(V32x4AnytrueWithNegativeZero) {
     byte simd = r.AllocateLocal(kWasmS128);                                   \
     BUILD(                                                                    \
         r,                                                                    \
-        WASM_SET_LOCAL(simd, WASM_SIMD_I##format##_SPLAT(WASM_GET_LOCAL(0))), \
-        WASM_SIMD_UNOP(kExprV##format##AllTrue, WASM_GET_LOCAL(simd)));       \
+        WASM_LOCAL_SET(simd, WASM_SIMD_I##format##_SPLAT(WASM_LOCAL_GET(0))), \
+        WASM_SIMD_UNOP(kExprV##format##AllTrue, WASM_LOCAL_GET(simd)));       \
     CHECK_EQ(1, r.Call(max));                                                 \
     CHECK_EQ(1, r.Call(0x1));                                                 \
     CHECK_EQ(0, r.Call(0));                                                   \
@@ -4097,12 +4251,12 @@ WASM_SIMD_TEST(BitSelect) {
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   byte simd = r.AllocateLocal(kWasmS128);
   BUILD(r,
-        WASM_SET_LOCAL(
+        WASM_LOCAL_SET(
             simd,
             WASM_SIMD_SELECT(32x4, WASM_SIMD_I32x4_SPLAT(WASM_I32V(0x01020304)),
                              WASM_SIMD_I32x4_SPLAT(WASM_I32V(0)),
-                             WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0)))),
-        WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_GET_LOCAL(simd)));
+                             WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(0)))),
+        WASM_SIMD_I32x4_EXTRACT_LANE(0, WASM_LOCAL_GET(simd)));
   CHECK_EQ(0x01020304, r.Call(0xFFFFFFFF));
 }
 
@@ -4111,7 +4265,7 @@ void RunSimdConstTest(TestExecutionTier execution_tier, LowerSimd lower_simd,
   WasmRunner<uint32_t> r(execution_tier, lower_simd);
   byte temp1 = r.AllocateLocal(kWasmS128);
   uint8_t* src0 = r.builder().AddGlobal<uint8_t>(kWasmS128);
-  BUILD(r, WASM_SET_GLOBAL(temp1, WASM_SIMD_CONSTANT(expected)), WASM_ONE);
+  BUILD(r, WASM_GLOBAL_SET(temp1, WASM_SIMD_CONSTANT(expected)), WASM_ONE);
   CHECK_EQ(1, r.Call());
   for (size_t i = 0; i < expected.size(); i++) {
     CHECK_EQ(ReadLittleEndianValue<uint8_t>(&src0[i]), expected[i]);
@@ -4164,11 +4318,11 @@ void RunI8x16MixedRelationalOpTest(TestExecutionTier execution_tier,
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
   byte temp3 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_LOCAL(temp3, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                              WASM_GET_LOCAL(temp2))),
-        WASM_SIMD_I8x16_EXTRACT_LANE(0, WASM_GET_LOCAL(temp3)));
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_LOCAL_SET(temp3, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                              WASM_LOCAL_GET(temp2))),
+        WASM_SIMD_I8x16_EXTRACT_LANE(0, WASM_LOCAL_GET(temp3)));
 
   CHECK_EQ(expected_op(0xff, static_cast<uint8_t>(0x7fff)),
            r.Call(0xff, 0x7fff));
@@ -4203,11 +4357,11 @@ void RunI16x8MixedRelationalOpTest(TestExecutionTier execution_tier,
   byte temp1 = r.AllocateLocal(kWasmS128);
   byte temp2 = r.AllocateLocal(kWasmS128);
   byte temp3 = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(temp1, WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(value1))),
-        WASM_SET_LOCAL(temp2, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(value2))),
-        WASM_SET_LOCAL(temp3, WASM_SIMD_BINOP(opcode, WASM_GET_LOCAL(temp1),
-                                              WASM_GET_LOCAL(temp2))),
-        WASM_SIMD_I16x8_EXTRACT_LANE(0, WASM_GET_LOCAL(temp3)));
+  BUILD(r, WASM_LOCAL_SET(temp1, WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(value1))),
+        WASM_LOCAL_SET(temp2, WASM_SIMD_I32x4_SPLAT(WASM_LOCAL_GET(value2))),
+        WASM_LOCAL_SET(temp3, WASM_SIMD_BINOP(opcode, WASM_LOCAL_GET(temp1),
+                                              WASM_LOCAL_GET(temp2))),
+        WASM_SIMD_I16x8_EXTRACT_LANE(0, WASM_LOCAL_GET(temp3)));
 
   CHECK_EQ(expected_op(0xffff, static_cast<uint16_t>(0x7fffffff)),
            r.Call(0xffff, 0x7fffffff));
@@ -4238,8 +4392,8 @@ WASM_SIMD_TEST(I16x8ExtractLaneU_I8x16Splat) {
   // Test that we are correctly signed/unsigned extending when extracting.
   WasmRunner<int32_t, int32_t> r(execution_tier, lower_simd);
   byte simd_val = r.AllocateLocal(kWasmS128);
-  BUILD(r, WASM_SET_LOCAL(simd_val, WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(0))),
-        WASM_SIMD_I16x8_EXTRACT_LANE_U(0, WASM_GET_LOCAL(simd_val)));
+  BUILD(r, WASM_LOCAL_SET(simd_val, WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(0))),
+        WASM_SIMD_I16x8_EXTRACT_LANE_U(0, WASM_LOCAL_GET(simd_val)));
   CHECK_EQ(0xfafa, r.Call(0xfa));
 }
 
@@ -4249,8 +4403,8 @@ WASM_SIMD_TEST(I16x8ExtractLaneU_I8x16Splat) {
     byte int_val = r.AllocateLocal(kWasmI32);                                  \
     byte simd_val = r.AllocateLocal(kWasmS128);                                \
     BUILD(r,                                                                   \
-          WASM_SET_LOCAL(simd_val,                                             \
-                         WASM_SIMD_I16x8_SPLAT(WASM_GET_LOCAL(int_val))),      \
+          WASM_LOCAL_SET(simd_val,                                             \
+                         WASM_SIMD_I16x8_SPLAT(WASM_LOCAL_GET(int_val))),      \
           WASM_SIMD_CHECK_LANE_U(I16x8, simd_val, I32, int_val, 0),            \
           WASM_SIMD_CHECK_LANE_U(I16x8, simd_val, I32, int_val, 2),            \
           WASM_SIMD_CHECK_LANE_U(I16x8, simd_val, I32, int_val, 4),            \
@@ -4266,8 +4420,8 @@ WASM_EXTRACT_I16x8_TEST(S, UINT16) WASM_EXTRACT_I16x8_TEST(I, INT16)
     byte int_val = r.AllocateLocal(kWasmI32);                             \
     byte simd_val = r.AllocateLocal(kWasmS128);                           \
     BUILD(r,                                                              \
-          WASM_SET_LOCAL(simd_val,                                        \
-                         WASM_SIMD_I8x16_SPLAT(WASM_GET_LOCAL(int_val))), \
+          WASM_LOCAL_SET(simd_val,                                        \
+                         WASM_SIMD_I8x16_SPLAT(WASM_LOCAL_GET(int_val))), \
           WASM_SIMD_CHECK_LANE_U(I8x16, simd_val, I32, int_val, 1),       \
           WASM_SIMD_CHECK_LANE_U(I8x16, simd_val, I32, int_val, 3),       \
           WASM_SIMD_CHECK_LANE_U(I8x16, simd_val, I32, int_val, 5),       \
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm-wrappers.cc b/deps/v8/test/cctest/wasm/test-run-wasm-wrappers.cc
index 6026d63bfcd5ce..5ab6db402703c7 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm-wrappers.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm-wrappers.cc
@@ -19,6 +19,40 @@ using testing::CompileAndInstantiateForTesting;
 
 #ifdef V8_TARGET_ARCH_X64
 namespace {
+Handle<WasmInstanceObject> CompileModule(Zone* zone, Isolate* isolate,
+                                         WasmModuleBuilder* builder) {
+  ZoneBuffer buffer(zone);
+  builder->WriteTo(&buffer);
+  testing::SetupIsolateForWasmModule(isolate);
+  ErrorThrower thrower(isolate, "CompileAndRunWasmModule");
+  MaybeHandle<WasmInstanceObject> maybe_instance =
+      CompileAndInstantiateForTesting(
+          isolate, &thrower, ModuleWireBytes(buffer.begin(), buffer.end()));
+  return maybe_instance.ToHandleChecked();
+}
+
+bool IsGeneric(Code wrapper) {
+  return wrapper.is_builtin() &&
+         wrapper.builtin_index() == Builtins::kGenericJSToWasmWrapper;
+}
+
+bool IsSpecific(Code wrapper) {
+  return wrapper.kind() == CodeKind::JS_TO_WASM_FUNCTION;
+}
+
+Handle<Object> SmiHandle(Isolate* isolate, int value) {
+  return Handle<Object>(Smi::FromInt(value), isolate);
+}
+
+void SmiCall(Isolate* isolate, Handle<WasmExportedFunction> exported_function,
+             int argc, Handle<Object>* argv, int expected_result) {
+  Handle<Object> receiver = isolate->factory()->undefined_value();
+  Handle<Object> result =
+      Execution::Call(isolate, exported_function, receiver, argc, argv)
+          .ToHandleChecked();
+  CHECK(result->IsSmi() && Smi::ToInt(*result) == expected_result);
+}
+
 void Cleanup() {
   // By sending a low memory notifications, we will try hard to collect all
   // garbage and will therefore also invoke all weak callbacks of actually
@@ -29,56 +63,48 @@ void Cleanup() {
 
 }  // namespace
 
-TEST(CallCounter) {
+TEST(WrapperBudget) {
   {
     // This test assumes use of the generic wrapper.
     FlagScope<bool> use_wasm_generic_wrapper(&FLAG_wasm_generic_wrapper, true);
 
-    TestSignatures sigs;
+    // Initialize the environment and create a module builder.
     AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
+    Isolate* isolate = CcTest::InitIsolateOnce();
+    HandleScope scope(isolate);
+    WasmModuleBuilder* builder = zone.New<WasmModuleBuilder>(&zone);
 
     // Define the Wasm function.
-    WasmModuleBuilder* builder = zone.New<WasmModuleBuilder>(&zone);
+    TestSignatures sigs;
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_ii());
     f->builder()->AddExport(CStrVector("main"), f);
-    byte code[] = {WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
+    byte code[] = {WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
                    WASM_END};
     f->EmitCode(code, sizeof(code));
 
-    // Compile module.
-    ZoneBuffer buffer(&zone);
-    builder->WriteTo(&buffer);
-    Isolate* isolate = CcTest::InitIsolateOnce();
-    HandleScope scope(isolate);
-    testing::SetupIsolateForWasmModule(isolate);
-    ErrorThrower thrower(isolate, "CompileAndRunWasmModule");
-    MaybeHandle<WasmInstanceObject> instance = CompileAndInstantiateForTesting(
-        isolate, &thrower, ModuleWireBytes(buffer.begin(), buffer.end()));
-
-    MaybeHandle<WasmExportedFunction> maybe_export =
-        testing::GetExportedFunction(isolate, instance.ToHandleChecked(),
-                                     "main");
-    Handle<WasmExportedFunction> main_export = maybe_export.ToHandleChecked();
-
-    // Check that the counter has initially a value of 0.
-    CHECK_EQ(main_export->shared().wasm_exported_function_data().call_count(),
-             0);
-
-    // Call the exported Wasm function and get the result.
-    Handle<Object> params[2] = {Handle<Object>(Smi::FromInt(6), isolate),
-                                Handle<Object>(Smi::FromInt(7), isolate)};
-    static const int32_t kExpectedValue = 42;
-    Handle<Object> receiver = isolate->factory()->undefined_value();
-    MaybeHandle<Object> maybe_result =
-        Execution::Call(isolate, main_export, receiver, 2, params);
-    Handle<Object> result = maybe_result.ToHandleChecked();
-
-    // Check that the counter has now a value of 1.
-    CHECK_EQ(main_export->shared().wasm_exported_function_data().call_count(),
-             1);
-
-    CHECK(result->IsSmi() && Smi::ToInt(*result) == kExpectedValue);
+    // Compile the module.
+    Handle<WasmInstanceObject> instance =
+        CompileModule(&zone, isolate, builder);
+
+    // Get the exported function and the function data.
+    Handle<WasmExportedFunction> main_export =
+        testing::GetExportedFunction(isolate, instance, "main")
+            .ToHandleChecked();
+    Handle<WasmExportedFunctionData> main_function_data =
+        handle(main_export->shared().wasm_exported_function_data(), isolate);
+
+    // Check that the generic-wrapper budget has initially a value of
+    // kGenericWrapperBudget.
+    CHECK_EQ(main_function_data->wrapper_budget(), kGenericWrapperBudget);
+    CHECK_GT(kGenericWrapperBudget, 0);
+
+    // Call the exported Wasm function.
+    Handle<Object> params[2] = {SmiHandle(isolate, 6), SmiHandle(isolate, 7)};
+    SmiCall(isolate, main_export, 2, params, 42);
+
+    // Check that the budget has now a value of (kGenericWrapperBudget - 1).
+    CHECK_EQ(main_function_data->wrapper_budget(), kGenericWrapperBudget - 1);
   }
   Cleanup();
 }
@@ -88,91 +114,233 @@ TEST(WrapperReplacement) {
     // This test assumes use of the generic wrapper.
     FlagScope<bool> use_wasm_generic_wrapper(&FLAG_wasm_generic_wrapper, true);
 
-    TestSignatures sigs;
+    // Initialize the environment and create a module builder.
     AccountingAllocator allocator;
     Zone zone(&allocator, ZONE_NAME);
+    Isolate* isolate = CcTest::InitIsolateOnce();
+    HandleScope scope(isolate);
+    WasmModuleBuilder* builder = zone.New<WasmModuleBuilder>(&zone);
 
     // Define the Wasm function.
-    WasmModuleBuilder* builder = zone.New<WasmModuleBuilder>(&zone);
+    TestSignatures sigs;
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
     f->builder()->AddExport(CStrVector("main"), f);
-    byte code[] = {WASM_RETURN1(WASM_GET_LOCAL(0)), WASM_END};
+    byte code[] = {WASM_LOCAL_GET(0), WASM_END};
     f->EmitCode(code, sizeof(code));
 
-    // Compile module.
-    ZoneBuffer buffer(&zone);
-    builder->WriteTo(&buffer);
+    // Compile the module.
+    Handle<WasmInstanceObject> instance =
+        CompileModule(&zone, isolate, builder);
+
+    // Get the exported function and the function data.
+    Handle<WasmExportedFunction> main_export =
+        testing::GetExportedFunction(isolate, instance, "main")
+            .ToHandleChecked();
+    Handle<WasmExportedFunctionData> main_function_data =
+        handle(main_export->shared().wasm_exported_function_data(), isolate);
+
+    // Check that the generic-wrapper budget has initially a value of
+    // kGenericWrapperBudget.
+    CHECK_EQ(main_function_data->wrapper_budget(), kGenericWrapperBudget);
+    CHECK_GT(kGenericWrapperBudget, 0);
+
+    // Set the generic-wrapper budget to a value that allows for a few
+    // more calls through the generic wrapper.
+    const int remaining_budget =
+        std::min(static_cast<int>(kGenericWrapperBudget), 2);
+    main_function_data->set_wrapper_budget(remaining_budget);
+
+    // Call the exported Wasm function as many times as required to almost
+    // exhaust the remaining budget for using the generic wrapper.
+    Handle<Code> wrapper_before_call;
+    for (int i = remaining_budget; i > 0; --i) {
+      // Verify that the wrapper to be used is the generic one.
+      wrapper_before_call =
+          Handle<Code>(main_function_data->wrapper_code(), isolate);
+      CHECK(IsGeneric(*wrapper_before_call));
+      // Call the function.
+      Handle<Object> params[1] = {SmiHandle(isolate, i)};
+      SmiCall(isolate, main_export, 1, params, i);
+      // Verify that the budget has now a value of (i - 1).
+      CHECK_EQ(main_function_data->wrapper_budget(), i - 1);
+    }
+
+    // Get the wrapper-code object after the wrapper replacement.
+    Code wrapper_after_call = main_function_data->wrapper_code();
+
+    // Verify that the budget has been exhausted.
+    CHECK_EQ(main_function_data->wrapper_budget(), 0);
+    // Verify that the wrapper-code object has changed and the wrapper is now a
+    // specific one.
+    CHECK_NE(wrapper_after_call, *wrapper_before_call);
+    CHECK(IsSpecific(wrapper_after_call));
+  }
+  Cleanup();
+}
+
+TEST(EagerWrapperReplacement) {
+  {
+    // This test assumes use of the generic wrapper.
+    FlagScope<bool> use_wasm_generic_wrapper(&FLAG_wasm_generic_wrapper, true);
+
+    // Initialize the environment and create a module builder.
+    AccountingAllocator allocator;
+    Zone zone(&allocator, ZONE_NAME);
     Isolate* isolate = CcTest::InitIsolateOnce();
     HandleScope scope(isolate);
-    testing::SetupIsolateForWasmModule(isolate);
-    ErrorThrower thrower(isolate, "CompileAndRunWasmModule");
-    MaybeHandle<WasmInstanceObject> instance = CompileAndInstantiateForTesting(
-        isolate, &thrower, ModuleWireBytes(buffer.begin(), buffer.end()));
-
-    // Get the exported function.
-    MaybeHandle<WasmExportedFunction> maybe_export =
-        testing::GetExportedFunction(isolate, instance.ToHandleChecked(),
-                                     "main");
-    Handle<WasmExportedFunction> main_export = maybe_export.ToHandleChecked();
-
-    // Check that the counter has initially a value of 0.
-    CHECK_EQ(main_export->shared().wasm_exported_function_data().call_count(),
-             0);
-    CHECK_GT(kGenericWrapperThreshold, 0);
-
-    // Call the exported Wasm function as many times as required to reach the
-    // threshold for compiling the specific wrapper.
-    const int threshold = static_cast<int>(kGenericWrapperThreshold);
-    for (int i = 1; i < threshold; ++i) {
-      // Verify that the wrapper to be used is still the generic one.
-      Code wrapper =
-          main_export->shared().wasm_exported_function_data().wrapper_code();
-      CHECK(wrapper.is_builtin() &&
-            wrapper.builtin_index() == Builtins::kGenericJSToWasmWrapper);
-      // Call the function.
-      int32_t expected_value = i;
-      Handle<Object> params[1] = {
-          Handle<Object>(Smi::FromInt(expected_value), isolate)};
-      Handle<Object> receiver = isolate->factory()->undefined_value();
-      MaybeHandle<Object> maybe_result =
-          Execution::Call(isolate, main_export, receiver, 1, params);
-      Handle<Object> result = maybe_result.ToHandleChecked();
-      // Verify that the counter has now a value of i and the return value is
-      // correct.
-      CHECK_EQ(main_export->shared().wasm_exported_function_data().call_count(),
-               i);
-      CHECK(result->IsSmi() && Smi::ToInt(*result) == expected_value);
+    WasmModuleBuilder* builder = zone.New<WasmModuleBuilder>(&zone);
+
+    // Define three Wasm functions.
+    // Two of these functions (add and mult) will share the same signature,
+    // while the other one (id) won't.
+    TestSignatures sigs;
+    WasmFunctionBuilder* add = builder->AddFunction(sigs.i_ii());
+    add->builder()->AddExport(CStrVector("add"), add);
+    byte add_code[] = {WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                       WASM_END};
+    add->EmitCode(add_code, sizeof(add_code));
+    WasmFunctionBuilder* mult = builder->AddFunction(sigs.i_ii());
+    mult->builder()->AddExport(CStrVector("mult"), mult);
+    byte mult_code[] = {WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                        WASM_END};
+    mult->EmitCode(mult_code, sizeof(mult_code));
+    WasmFunctionBuilder* id = builder->AddFunction(sigs.i_i());
+    id->builder()->AddExport(CStrVector("id"), id);
+    byte id_code[] = {WASM_LOCAL_GET(0), WASM_END};
+    id->EmitCode(id_code, sizeof(id_code));
+
+    // Compile the module.
+    Handle<WasmInstanceObject> instance =
+        CompileModule(&zone, isolate, builder);
+
+    // Get the exported functions.
+    Handle<WasmExportedFunction> add_export =
+        testing::GetExportedFunction(isolate, instance, "add")
+            .ToHandleChecked();
+    Handle<WasmExportedFunction> mult_export =
+        testing::GetExportedFunction(isolate, instance, "mult")
+            .ToHandleChecked();
+    Handle<WasmExportedFunction> id_export =
+        testing::GetExportedFunction(isolate, instance, "id").ToHandleChecked();
+
+    // Get the function data for all exported functions.
+    Handle<WasmExportedFunctionData> add_function_data =
+        handle(add_export->shared().wasm_exported_function_data(), isolate);
+    Handle<WasmExportedFunctionData> mult_function_data =
+        handle(mult_export->shared().wasm_exported_function_data(), isolate);
+    Handle<WasmExportedFunctionData> id_function_data =
+        handle(id_export->shared().wasm_exported_function_data(), isolate);
+
+    // Set the remaining generic-wrapper budget for add to 1,
+    // so that the next call to it will cause the function to tier up.
+    add_function_data->set_wrapper_budget(1);
+
+    // Verify that the generic-wrapper budgets for all functions are correct.
+    CHECK_EQ(add_function_data->wrapper_budget(), 1);
+    CHECK_EQ(mult_function_data->wrapper_budget(), kGenericWrapperBudget);
+    CHECK_EQ(id_function_data->wrapper_budget(), kGenericWrapperBudget);
+
+    // Verify that all functions are set to use the generic wrapper.
+    CHECK(IsGeneric(add_function_data->wrapper_code()));
+    CHECK(IsGeneric(mult_function_data->wrapper_code()));
+    CHECK(IsGeneric(id_function_data->wrapper_code()));
+
+    // Call the add function to trigger the tier up.
+    {
+      Handle<Object> params[2] = {SmiHandle(isolate, 10),
+                                  SmiHandle(isolate, 11)};
+      SmiCall(isolate, add_export, 2, params, 21);
+      // Verify that the generic-wrapper budgets for all functions are correct.
+      CHECK_EQ(add_function_data->wrapper_budget(), 0);
+      CHECK_EQ(mult_function_data->wrapper_budget(), kGenericWrapperBudget);
+      CHECK_EQ(id_function_data->wrapper_budget(), kGenericWrapperBudget);
+      // Verify that the tier-up of the add function replaced the wrapper
+      // for both the add and the mult functions, but not the id function.
+      CHECK(IsSpecific(add_function_data->wrapper_code()));
+      CHECK(IsSpecific(mult_function_data->wrapper_code()));
+      CHECK(IsGeneric(id_function_data->wrapper_code()));
+    }
+
+    // Call the mult function to verify that the compiled wrapper is used.
+    {
+      Handle<Object> params[2] = {SmiHandle(isolate, 6), SmiHandle(isolate, 7)};
+      SmiCall(isolate, mult_export, 2, params, 42);
+      // Verify that mult's budget is still intact, which means that the call
+      // didn't go through the generic wrapper.
+      CHECK_EQ(mult_function_data->wrapper_budget(), kGenericWrapperBudget);
+    }
+
+    // Call the id function to verify that the generic wrapper is used.
+    {
+      Handle<Object> params[1] = {SmiHandle(isolate, 6)};
+      SmiCall(isolate, id_export, 1, params, 6);
+      // Verify that id's budget decreased by 1, which means that the call
+      // used the generic wrapper.
+      CHECK_EQ(id_function_data->wrapper_budget(), kGenericWrapperBudget - 1);
     }
+  }
+  Cleanup();
+}
+
+TEST(WrapperReplacement_IndirectExport) {
+  {
+    // This test assumes use of the generic wrapper.
+    FlagScope<bool> use_wasm_generic_wrapper(&FLAG_wasm_generic_wrapper, true);
+
+    // Initialize the environment and create a module builder.
+    AccountingAllocator allocator;
+    Zone zone(&allocator, ZONE_NAME);
+    Isolate* isolate = CcTest::InitIsolateOnce();
+    HandleScope scope(isolate);
+    WasmModuleBuilder* builder = zone.New<WasmModuleBuilder>(&zone);
+
+    // Define a Wasm function, but do not add it to the exports.
+    TestSignatures sigs;
+    WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
+    byte code[] = {WASM_LOCAL_GET(0), WASM_END};
+    f->EmitCode(code, sizeof(code));
+    uint32_t function_index = f->func_index();
+
+    // Export a table of indirect functions.
+    uint32_t table_index = builder->AllocateIndirectFunctions(2);
+    builder->AddExport(CStrVector("exported_table"), kExternalTable, 0);
+    // Point from the exported table to the Wasm function.
+    builder->SetIndirectFunction(0, function_index);
+
+    // Compile the module.
+    Handle<WasmInstanceObject> instance =
+        CompileModule(&zone, isolate, builder);
+
+    // Get the exported table.
+    Handle<WasmTableObject> table = handle(
+        WasmTableObject::cast(instance->tables().get(table_index)), isolate);
+    // Get the Wasm function through the exported table.
+    Handle<Object> function =
+        WasmTableObject::Get(isolate, table, function_index);
+    Handle<WasmExportedFunction> indirect_function =
+        handle(WasmExportedFunction::cast(*function), isolate);
+    // Get the function data.
+    Handle<WasmExportedFunctionData> indirect_function_data = handle(
+        indirect_function->shared().wasm_exported_function_data(), isolate);
+
+    // Verify that the generic-wrapper budget has initially a value of
+    // kGenericWrapperBudget and the wrapper to be used for calls to the
+    // indirect function is the generic one.
+    CHECK(IsGeneric(indirect_function_data->wrapper_code()));
+    CHECK(indirect_function_data->wrapper_budget() == kGenericWrapperBudget);
+
+    // Set the remaining generic-wrapper budget for the indirect function to 1,
+    // so that the next call to it will cause the function to tier up.
+    indirect_function_data->set_wrapper_budget(1);
+
+    // Call the Wasm function.
+    Handle<Object> params[1] = {SmiHandle(isolate, 6)};
+    SmiCall(isolate, indirect_function, 1, params, 6);
 
-    // Get the wrapper-code object before making the call that will kick off the
-    // wrapper replacement.
-    Code wrapper_before_call =
-        main_export->shared().wasm_exported_function_data().wrapper_code();
-    // Verify that the wrapper before the call is the generic wrapper.
-    CHECK(wrapper_before_call.is_builtin() &&
-          wrapper_before_call.builtin_index() ==
-              Builtins::kGenericJSToWasmWrapper);
-
-    // Call the exported Wasm function one more time to kick off the wrapper
-    // replacement.
-    int32_t expected_value = 42;
-    Handle<Object> params[1] = {
-        Handle<Object>(Smi::FromInt(expected_value), isolate)};
-    Handle<Object> receiver = isolate->factory()->undefined_value();
-    MaybeHandle<Object> maybe_result =
-        Execution::Call(isolate, main_export, receiver, 1, params);
-    Handle<Object> result = maybe_result.ToHandleChecked();
-    // Check that the counter has the threshold value and the result is correct.
-    CHECK_EQ(main_export->shared().wasm_exported_function_data().call_count(),
-             kGenericWrapperThreshold);
-    CHECK(result->IsSmi() && Smi::ToInt(*result) == expected_value);
-
-    // Verify that the wrapper-code object has changed.
-    Code wrapper_after_call =
-        main_export->shared().wasm_exported_function_data().wrapper_code();
-    CHECK_NE(wrapper_after_call, wrapper_before_call);
-    // Verify that the wrapper is now a specific one.
-    CHECK(wrapper_after_call.kind() == CodeKind::JS_TO_WASM_FUNCTION);
+    // Verify that the budget is now exhausted and the generic wrapper has been
+    // replaced by a specific one.
+    CHECK_EQ(indirect_function_data->wrapper_budget(), 0);
+    CHECK(IsSpecific(indirect_function_data->wrapper_code()));
   }
   Cleanup();
 }
diff --git a/deps/v8/test/cctest/wasm/test-run-wasm.cc b/deps/v8/test/cctest/wasm/test-run-wasm.cc
index 8a18447ceb317a..49995028324a28 100644
--- a/deps/v8/test/cctest/wasm/test-run-wasm.cc
+++ b/deps/v8/test/cctest/wasm/test-run-wasm.cc
@@ -58,21 +58,21 @@ WASM_EXEC_TEST(GraphTrimming) {
 WASM_EXEC_TEST(Int32Param0) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // return(local[0])
-  BUILD(r, WASM_GET_LOCAL(0));
+  BUILD(r, WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Int32Param0_fallthru) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // local[0]
-  BUILD(r, WASM_GET_LOCAL(0));
+  BUILD(r, WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Int32Param1) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
   // local[1]
-  BUILD(r, WASM_GET_LOCAL(1));
+  BUILD(r, WASM_LOCAL_GET(1));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(-111, i)); }
 }
 
@@ -86,14 +86,14 @@ WASM_EXEC_TEST(Int32Add) {
 WASM_EXEC_TEST(Int32Add_P) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // p0 + 13
-  BUILD(r, WASM_I32_ADD(WASM_I32V_1(13), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_ADD(WASM_I32V_1(13), WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) { CHECK_EQ(base::AddWithWraparound(i, 13), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Int32Add_P_fallthru) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // p0 + 13
-  BUILD(r, WASM_I32_ADD(WASM_I32V_1(13), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_ADD(WASM_I32V_1(13), WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) { CHECK_EQ(base::AddWithWraparound(i, 13), r.Call(i)); }
 }
 
@@ -116,21 +116,21 @@ static void RunInt32AddTest(TestExecutionTier execution_tier, const byte* code,
 WASM_EXEC_TEST(Int32Add_P2) {
   EXPERIMENTAL_FLAG_SCOPE(mv);
   static const byte code[] = {
-      WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
+      WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))};
   RunInt32AddTest(execution_tier, code, sizeof(code));
 }
 
 WASM_EXEC_TEST(Int32Add_block1) {
   EXPERIMENTAL_FLAG_SCOPE(mv);
   static const byte code[] = {
-      WASM_BLOCK_X(1, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), kExprI32Add};
+      WASM_BLOCK_X(1, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), kExprI32Add};
   RunInt32AddTest(execution_tier, code, sizeof(code));
 }
 
 WASM_EXEC_TEST(Int32Add_block2) {
   EXPERIMENTAL_FLAG_SCOPE(mv);
   static const byte code[] = {
-      WASM_BLOCK_X(1, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), kExprBr, DEPTH_0),
+      WASM_BLOCK_X(1, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), kExprBr, DEPTH_0),
       kExprI32Add};
   RunInt32AddTest(execution_tier, code, sizeof(code));
 }
@@ -138,9 +138,9 @@ WASM_EXEC_TEST(Int32Add_block2) {
 WASM_EXEC_TEST(Int32Add_multi_if) {
   EXPERIMENTAL_FLAG_SCOPE(mv);
   static const byte code[] = {
-      WASM_IF_ELSE_X(1, WASM_GET_LOCAL(0),
-                     WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
-                     WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))),
+      WASM_IF_ELSE_X(1, WASM_LOCAL_GET(0),
+                     WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                     WASM_SEQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))),
       kExprI32Add};
   RunInt32AddTest(execution_tier, code, sizeof(code));
 }
@@ -176,7 +176,7 @@ static void TestInt32Binop(TestExecutionTier execution_tier, WasmOpcode opcode,
   {
     WasmRunner<ctype, ctype, ctype> r(execution_tier);
     // Apply {opcode} on two parameters.
-    BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
     FOR_INT32_INPUTS(i) {
       FOR_INT32_INPUTS(j) {
         CHECK_EQ(expected(i, j), r.Call(i, j));
@@ -234,7 +234,7 @@ void TestInt32Unop(TestExecutionTier execution_tier, WasmOpcode opcode,
   {
     WasmRunner<int32_t, int32_t> r(execution_tier);
     // return op a
-    BUILD(r, WASM_UNOP(opcode, WASM_GET_LOCAL(0)));
+    BUILD(r, WASM_UNOP(opcode, WASM_LOCAL_GET(0)));
     CHECK_EQ(expected, r.Call(a));
   }
 }
@@ -330,7 +330,7 @@ WASM_EXEC_TEST(I32Eqz) {
 
 WASM_EXEC_TEST(Int32DivS_trap) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I32_DIVS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(0, r.Call(0, 100));
   CHECK_TRAP(r.Call(100, 0));
@@ -341,7 +341,7 @@ WASM_EXEC_TEST(Int32DivS_trap) {
 
 WASM_EXEC_TEST(Int32RemS_trap) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I32_REMS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(33, r.Call(133, 100));
   CHECK_EQ(0, r.Call(kMin, -1));
@@ -352,7 +352,7 @@ WASM_EXEC_TEST(Int32RemS_trap) {
 
 WASM_EXEC_TEST(Int32DivU_trap) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I32_DIVU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I32_DIVU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(0, r.Call(0, 100));
   CHECK_EQ(0, r.Call(kMin, -1));
@@ -363,7 +363,7 @@ WASM_EXEC_TEST(Int32DivU_trap) {
 
 WASM_EXEC_TEST(Int32RemU_trap) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I32_REMU(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_I32_REMU(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   CHECK_EQ(17, r.Call(217, 100));
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_TRAP(r.Call(100, 0));
@@ -375,7 +375,7 @@ WASM_EXEC_TEST(Int32RemU_trap) {
 WASM_EXEC_TEST(Int32DivS_byzero_const) {
   for (int8_t denom = -2; denom < 8; ++denom) {
     WasmRunner<int32_t, int32_t> r(execution_tier);
-    BUILD(r, WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_I32V_1(denom)));
+    BUILD(r, WASM_I32_DIVS(WASM_LOCAL_GET(0), WASM_I32V_1(denom)));
     for (int32_t val = -7; val < 8; ++val) {
       if (denom == 0) {
         CHECK_TRAP(r.Call(val));
@@ -389,7 +389,7 @@ WASM_EXEC_TEST(Int32DivS_byzero_const) {
 WASM_EXEC_TEST(Int32DivU_byzero_const) {
   for (uint32_t denom = 0xFFFFFFFE; denom < 8; ++denom) {
     WasmRunner<uint32_t, uint32_t> r(execution_tier);
-    BUILD(r, WASM_I32_DIVU(WASM_GET_LOCAL(0), WASM_I32V_1(denom)));
+    BUILD(r, WASM_I32_DIVU(WASM_LOCAL_GET(0), WASM_I32V_1(denom)));
 
     for (uint32_t val = 0xFFFFFFF0; val < 8; ++val) {
       if (denom == 0) {
@@ -406,17 +406,17 @@ WASM_EXEC_TEST(Int32DivS_trap_effect) {
   r.builder().AddMemory(kWasmPageSize);
 
   BUILD(r, WASM_IF_ELSE_I(
-               WASM_GET_LOCAL(0),
+               WASM_LOCAL_GET(0),
                WASM_I32_DIVS(
                    WASM_BLOCK_I(WASM_STORE_MEM(MachineType::Int8(), WASM_ZERO,
-                                               WASM_GET_LOCAL(0)),
-                                WASM_GET_LOCAL(0)),
-                   WASM_GET_LOCAL(1)),
+                                               WASM_LOCAL_GET(0)),
+                                WASM_LOCAL_GET(0)),
+                   WASM_LOCAL_GET(1)),
                WASM_I32_DIVS(
                    WASM_BLOCK_I(WASM_STORE_MEM(MachineType::Int8(), WASM_ZERO,
-                                               WASM_GET_LOCAL(0)),
-                                WASM_GET_LOCAL(0)),
-                   WASM_GET_LOCAL(1))));
+                                               WASM_LOCAL_GET(0)),
+                                WASM_LOCAL_GET(0)),
+                   WASM_LOCAL_GET(1))));
   CHECK_EQ(0, r.Call(0, 100));
   CHECK_TRAP(r.Call(8, 0));
   CHECK_TRAP(r.Call(4, 0));
@@ -434,7 +434,7 @@ void TestFloat32Binop(TestExecutionTier execution_tier, WasmOpcode opcode,
   {
     WasmRunner<int32_t, float, float> r(execution_tier);
     // return a op b
-    BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
     CHECK_EQ(expected, r.Call(a, b));
   }
 }
@@ -453,7 +453,7 @@ void TestFloat32BinopWithConvert(TestExecutionTier execution_tier,
     WasmRunner<int32_t, float, float> r(execution_tier);
     // return int(a op b)
     BUILD(r, WASM_I32_SCONVERT_F32(
-                 WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+                 WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
     CHECK_EQ(expected, r.Call(a, b));
   }
 }
@@ -469,7 +469,7 @@ void TestFloat32UnopWithConvert(TestExecutionTier execution_tier,
   {
     WasmRunner<int32_t, float> r(execution_tier);
     // return int(op(a))
-    BUILD(r, WASM_I32_SCONVERT_F32(WASM_UNOP(opcode, WASM_GET_LOCAL(0))));
+    BUILD(r, WASM_I32_SCONVERT_F32(WASM_UNOP(opcode, WASM_LOCAL_GET(0))));
     CHECK_EQ(expected, r.Call(a));
   }
 }
@@ -485,7 +485,7 @@ void TestFloat64Binop(TestExecutionTier execution_tier, WasmOpcode opcode,
   {
     WasmRunner<int32_t, double, double> r(execution_tier);
     // return a op b
-    BUILD(r, WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+    BUILD(r, WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
     CHECK_EQ(expected, r.Call(a, b));
   }
 }
@@ -503,7 +503,7 @@ void TestFloat64BinopWithConvert(TestExecutionTier execution_tier,
   {
     WasmRunner<int32_t, double, double> r(execution_tier);
     BUILD(r, WASM_I32_SCONVERT_F64(
-                 WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+                 WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
     CHECK_EQ(expected, r.Call(a, b));
   }
 }
@@ -519,7 +519,7 @@ void TestFloat64UnopWithConvert(TestExecutionTier execution_tier,
   {
     WasmRunner<int32_t, double> r(execution_tier);
     // return int(op(a))
-    BUILD(r, WASM_I32_SCONVERT_F64(WASM_UNOP(opcode, WASM_GET_LOCAL(0))));
+    BUILD(r, WASM_I32_SCONVERT_F64(WASM_UNOP(opcode, WASM_LOCAL_GET(0))));
     CHECK_EQ(expected, r.Call(a));
   }
 }
@@ -569,7 +569,7 @@ WASM_EXEC_TEST(Float64Unops) {
 
 WASM_EXEC_TEST(Float32Neg) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_F32_NEG(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_NEG(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     CHECK_EQ(0x80000000, bit_cast<uint32_t>(i) ^ bit_cast<uint32_t>(r.Call(i)));
@@ -578,7 +578,7 @@ WASM_EXEC_TEST(Float32Neg) {
 
 WASM_EXEC_TEST(Float64Neg) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_F64_NEG(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_NEG(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) {
     CHECK_EQ(0x8000000000000000,
@@ -589,7 +589,7 @@ WASM_EXEC_TEST(Float64Neg) {
 WASM_EXEC_TEST(IfElse_P) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // if (p0) return 11; else return 22;
-  BUILD(r, WASM_IF_ELSE_I(WASM_GET_LOCAL(0),  // --
+  BUILD(r, WASM_IF_ELSE_I(WASM_LOCAL_GET(0),  // --
                           WASM_I32V_1(11),    // --
                           WASM_I32V_1(22)));  // --
   FOR_INT32_INPUTS(i) {
@@ -600,45 +600,45 @@ WASM_EXEC_TEST(IfElse_P) {
 
 WASM_EXEC_TEST(If_empty1) {
   WasmRunner<uint32_t, uint32_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_GET_LOCAL(0), kExprIf, kVoidCode, kExprEnd, WASM_GET_LOCAL(1));
+  BUILD(r, WASM_LOCAL_GET(0), kExprIf, kVoidCode, kExprEnd, WASM_LOCAL_GET(1));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(i, r.Call(i - 9, i)); }
 }
 
 WASM_EXEC_TEST(IfElse_empty1) {
   WasmRunner<uint32_t, uint32_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_GET_LOCAL(0), kExprIf, kVoidCode, kExprElse, kExprEnd,
-        WASM_GET_LOCAL(1));
+  BUILD(r, WASM_LOCAL_GET(0), kExprIf, kVoidCode, kExprElse, kExprEnd,
+        WASM_LOCAL_GET(1));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(i, r.Call(i - 8, i)); }
 }
 
 WASM_EXEC_TEST(IfElse_empty2) {
   WasmRunner<uint32_t, uint32_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_GET_LOCAL(0), kExprIf, kVoidCode, WASM_NOP, kExprElse, kExprEnd,
-        WASM_GET_LOCAL(1));
+  BUILD(r, WASM_LOCAL_GET(0), kExprIf, kVoidCode, WASM_NOP, kExprElse, kExprEnd,
+        WASM_LOCAL_GET(1));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(i, r.Call(i - 7, i)); }
 }
 
 WASM_EXEC_TEST(IfElse_empty3) {
   WasmRunner<uint32_t, uint32_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_GET_LOCAL(0), kExprIf, kVoidCode, kExprElse, WASM_NOP, kExprEnd,
-        WASM_GET_LOCAL(1));
+  BUILD(r, WASM_LOCAL_GET(0), kExprIf, kVoidCode, kExprElse, WASM_NOP, kExprEnd,
+        WASM_LOCAL_GET(1));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(i, r.Call(i - 6, i)); }
 }
 
 WASM_EXEC_TEST(If_chain1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // if (p0) 13; if (p0) 14; 15
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_NOP),
-        WASM_IF(WASM_GET_LOCAL(0), WASM_NOP), WASM_I32V_1(15));
+  BUILD(r, WASM_IF(WASM_LOCAL_GET(0), WASM_NOP),
+        WASM_IF(WASM_LOCAL_GET(0), WASM_NOP), WASM_I32V_1(15));
   FOR_INT32_INPUTS(i) { CHECK_EQ(15, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(If_chain_set) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
   // if (p0) p1 = 73; if (p0) p1 = 74; p1
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SET_LOCAL(1, WASM_I32V_2(73))),
-        WASM_IF(WASM_GET_LOCAL(0), WASM_SET_LOCAL(1, WASM_I32V_2(74))),
-        WASM_GET_LOCAL(1));
+  BUILD(r, WASM_IF(WASM_LOCAL_GET(0), WASM_LOCAL_SET(1, WASM_I32V_2(73))),
+        WASM_IF(WASM_LOCAL_GET(0), WASM_LOCAL_SET(1, WASM_I32V_2(74))),
+        WASM_LOCAL_GET(1));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 74 : i;
     CHECK_EQ(expected, r.Call(i, i));
@@ -680,7 +680,7 @@ WASM_EXEC_TEST(Return17) {
 WASM_EXEC_TEST(Return_I32) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
 
-  BUILD(r, RET(WASM_GET_LOCAL(0)));
+  BUILD(r, RET(WASM_LOCAL_GET(0)));
 
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
@@ -688,7 +688,7 @@ WASM_EXEC_TEST(Return_I32) {
 WASM_EXEC_TEST(Return_F32) {
   WasmRunner<float, float> r(execution_tier);
 
-  BUILD(r, RET(WASM_GET_LOCAL(0)));
+  BUILD(r, RET(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     float expect = i;
@@ -704,7 +704,7 @@ WASM_EXEC_TEST(Return_F32) {
 WASM_EXEC_TEST(Return_F64) {
   WasmRunner<double, double> r(execution_tier);
 
-  BUILD(r, RET(WASM_GET_LOCAL(0)));
+  BUILD(r, RET(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) {
     double expect = i;
@@ -720,7 +720,7 @@ WASM_EXEC_TEST(Return_F64) {
 WASM_EXEC_TEST(Select_float_parameters) {
   WasmRunner<float, float, float, int32_t> r(execution_tier);
   BUILD(r,
-        WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)));
+        WASM_SELECT(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)));
   CHECK_FLOAT_EQ(2.0f, r.Call(2.0f, 1.0f, 1));
 }
 
@@ -735,8 +735,8 @@ WASM_EXEC_TEST(Select_s128_parameters) {
     WriteLittleEndianValue<int32_t>(&g1[i], i + 4);
   }
   BUILD(r,
-        WASM_SET_GLOBAL(2, WASM_SELECT(WASM_GET_GLOBAL(0), WASM_GET_GLOBAL(1),
-                                       WASM_GET_LOCAL(0))),
+        WASM_GLOBAL_SET(2, WASM_SELECT(WASM_GLOBAL_GET(0), WASM_GLOBAL_GET(1),
+                                       WASM_LOCAL_GET(0))),
         WASM_ONE);
   r.Call(1);
   for (int i = 0; i < 4; i++) {
@@ -748,14 +748,14 @@ WASM_EXEC_TEST(SelectWithType_float_parameters) {
   EXPERIMENTAL_FLAG_SCOPE(reftypes);
   WasmRunner<float, float, float, int32_t> r(execution_tier);
   BUILD(r,
-        WASM_SELECT_F(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)));
+        WASM_SELECT_F(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)));
   CHECK_FLOAT_EQ(2.0f, r.Call(2.0f, 1.0f, 1));
 }
 
 WASM_EXEC_TEST(Select) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // return select(11, 22, a);
-  BUILD(r, WASM_SELECT(WASM_I32V_1(11), WASM_I32V_1(22), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_SELECT(WASM_I32V_1(11), WASM_I32V_1(22), WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 11 : 22;
     CHECK_EQ(expected, r.Call(i));
@@ -766,7 +766,7 @@ WASM_EXEC_TEST(SelectWithType) {
   EXPERIMENTAL_FLAG_SCOPE(reftypes);
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // return select(11, 22, a);
-  BUILD(r, WASM_SELECT_I(WASM_I32V_1(11), WASM_I32V_1(22), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_SELECT_I(WASM_I32V_1(11), WASM_I32V_1(22), WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 11 : 22;
     CHECK_EQ(expected, r.Call(i));
@@ -776,10 +776,11 @@ WASM_EXEC_TEST(SelectWithType) {
 WASM_EXEC_TEST(Select_strict1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // select(a=0, a=1, a=2); return a
-  BUILD(r, WASM_SELECT(WASM_TEE_LOCAL(0, WASM_ZERO),
-                       WASM_TEE_LOCAL(0, WASM_I32V_1(1)),
-                       WASM_TEE_LOCAL(0, WASM_I32V_1(2))),
-        WASM_DROP, WASM_GET_LOCAL(0));
+  BUILD(r,
+        WASM_SELECT(WASM_LOCAL_TEE(0, WASM_ZERO),
+                    WASM_LOCAL_TEE(0, WASM_I32V_1(1)),
+                    WASM_LOCAL_TEE(0, WASM_I32V_1(2))),
+        WASM_DROP, WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(2, r.Call(i)); }
 }
 
@@ -788,10 +789,10 @@ WASM_EXEC_TEST(SelectWithType_strict1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // select(a=0, a=1, a=2); return a
   BUILD(r,
-        WASM_SELECT_I(WASM_TEE_LOCAL(0, WASM_ZERO),
-                      WASM_TEE_LOCAL(0, WASM_I32V_1(1)),
-                      WASM_TEE_LOCAL(0, WASM_I32V_1(2))),
-        WASM_DROP, WASM_GET_LOCAL(0));
+        WASM_SELECT_I(WASM_LOCAL_TEE(0, WASM_ZERO),
+                      WASM_LOCAL_TEE(0, WASM_I32V_1(1)),
+                      WASM_LOCAL_TEE(0, WASM_I32V_1(2))),
+        WASM_DROP, WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(2, r.Call(i)); }
 }
 
@@ -800,8 +801,8 @@ WASM_EXEC_TEST(Select_strict2) {
   r.AllocateLocal(kWasmI32);
   r.AllocateLocal(kWasmI32);
   // select(b=5, c=6, a)
-  BUILD(r, WASM_SELECT(WASM_TEE_LOCAL(1, WASM_I32V_1(5)),
-                       WASM_TEE_LOCAL(2, WASM_I32V_1(6)), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_SELECT(WASM_LOCAL_TEE(1, WASM_I32V_1(5)),
+                       WASM_LOCAL_TEE(2, WASM_I32V_1(6)), WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 5 : 6;
     CHECK_EQ(expected, r.Call(i));
@@ -814,8 +815,8 @@ WASM_EXEC_TEST(SelectWithType_strict2) {
   r.AllocateLocal(kWasmI32);
   r.AllocateLocal(kWasmI32);
   // select(b=5, c=6, a)
-  BUILD(r, WASM_SELECT_I(WASM_TEE_LOCAL(1, WASM_I32V_1(5)),
-                         WASM_TEE_LOCAL(2, WASM_I32V_1(6)), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_SELECT_I(WASM_LOCAL_TEE(1, WASM_I32V_1(5)),
+                         WASM_LOCAL_TEE(2, WASM_I32V_1(6)), WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 5 : 6;
     CHECK_EQ(expected, r.Call(i));
@@ -827,9 +828,9 @@ WASM_EXEC_TEST(Select_strict3) {
   r.AllocateLocal(kWasmI32);
   r.AllocateLocal(kWasmI32);
   // select(b=5, c=6, a=b)
-  BUILD(r, WASM_SELECT(WASM_TEE_LOCAL(1, WASM_I32V_1(5)),
-                       WASM_TEE_LOCAL(2, WASM_I32V_1(6)),
-                       WASM_TEE_LOCAL(0, WASM_GET_LOCAL(1))));
+  BUILD(r, WASM_SELECT(WASM_LOCAL_TEE(1, WASM_I32V_1(5)),
+                       WASM_LOCAL_TEE(2, WASM_I32V_1(6)),
+                       WASM_LOCAL_TEE(0, WASM_LOCAL_GET(1))));
   FOR_INT32_INPUTS(i) {
     int32_t expected = 5;
     CHECK_EQ(expected, r.Call(i));
@@ -842,9 +843,9 @@ WASM_EXEC_TEST(SelectWithType_strict3) {
   r.AllocateLocal(kWasmI32);
   r.AllocateLocal(kWasmI32);
   // select(b=5, c=6, a=b)
-  BUILD(r, WASM_SELECT_I(WASM_TEE_LOCAL(1, WASM_I32V_1(5)),
-                         WASM_TEE_LOCAL(2, WASM_I32V_1(6)),
-                         WASM_TEE_LOCAL(0, WASM_GET_LOCAL(1))));
+  BUILD(r, WASM_SELECT_I(WASM_LOCAL_TEE(1, WASM_I32V_1(5)),
+                         WASM_LOCAL_TEE(2, WASM_I32V_1(6)),
+                         WASM_LOCAL_TEE(0, WASM_LOCAL_GET(1))));
   FOR_INT32_INPUTS(i) {
     int32_t expected = 5;
     CHECK_EQ(expected, r.Call(i));
@@ -853,8 +854,8 @@ WASM_EXEC_TEST(SelectWithType_strict3) {
 
 WASM_EXEC_TEST(BrIf_strict) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV_IF(0, WASM_GET_LOCAL(0),
-                                    WASM_TEE_LOCAL(0, WASM_I32V_2(99)))));
+  BUILD(r, WASM_BLOCK_I(WASM_BRV_IF(0, WASM_LOCAL_GET(0),
+                                    WASM_LOCAL_TEE(0, WASM_I32V_2(99)))));
 
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
@@ -862,7 +863,7 @@ WASM_EXEC_TEST(BrIf_strict) {
 WASM_EXEC_TEST(Br_height) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(r, WASM_BLOCK_I(
-               WASM_BLOCK(WASM_BRV_IFD(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)),
+               WASM_BLOCK(WASM_BRV_IFD(0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)),
                           WASM_RETURN1(WASM_I32V_1(9))),
                WASM_BRV(0, WASM_I32V_1(8))));
 
@@ -882,7 +883,7 @@ WASM_EXEC_TEST(Regression_660262) {
 
 WASM_EXEC_TEST(BrTable0a) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, B1(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 0, BR_TARGET(0)))),
+  BUILD(r, B1(B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 0, BR_TARGET(0)))),
         WASM_I32V_2(91));
   FOR_INT32_INPUTS(i) { CHECK_EQ(91, r.Call(i)); }
 }
@@ -890,7 +891,7 @@ WASM_EXEC_TEST(BrTable0a) {
 WASM_EXEC_TEST(BrTable0b) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(r,
-        B1(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 1, BR_TARGET(0), BR_TARGET(0)))),
+        B1(B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 1, BR_TARGET(0), BR_TARGET(0)))),
         WASM_I32V_2(92));
   FOR_INT32_INPUTS(i) { CHECK_EQ(92, r.Call(i)); }
 }
@@ -899,7 +900,7 @@ WASM_EXEC_TEST(BrTable0c) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(
       r,
-      B1(B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 1, BR_TARGET(0), BR_TARGET(1))),
+      B1(B2(B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 1, BR_TARGET(0), BR_TARGET(1))),
             RET_I8(76))),
       WASM_I32V_2(77));
   FOR_INT32_INPUTS(i) {
@@ -910,7 +911,7 @@ WASM_EXEC_TEST(BrTable0c) {
 
 WASM_EXEC_TEST(BrTable1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 0, BR_TARGET(0))), RET_I8(93));
+  BUILD(r, B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 0, BR_TARGET(0))), RET_I8(93));
   FOR_INT32_INPUTS(i) { CHECK_EQ(93, r.Call(i)); }
 }
 
@@ -931,7 +932,7 @@ WASM_EXEC_TEST(BrTable_loop) {
 WASM_EXEC_TEST(BrTable_br) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(r,
-        B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 1, BR_TARGET(1), BR_TARGET(0))),
+        B2(B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 1, BR_TARGET(1), BR_TARGET(0))),
            RET_I8(91)),
         WASM_I32V_2(99));
   CHECK_EQ(99, r.Call(0));
@@ -943,11 +944,12 @@ WASM_EXEC_TEST(BrTable_br) {
 WASM_EXEC_TEST(BrTable_br2) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
 
-  BUILD(r, B2(B2(B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 3, BR_TARGET(1),
-                                     BR_TARGET(2), BR_TARGET(3), BR_TARGET(0))),
-                    RET_I8(85)),
-                 RET_I8(86)),
-              RET_I8(87)),
+  BUILD(r,
+        B2(B2(B2(B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 3, BR_TARGET(1),
+                                  BR_TARGET(2), BR_TARGET(3), BR_TARGET(0))),
+                 RET_I8(85)),
+              RET_I8(86)),
+           RET_I8(87)),
         WASM_I32V_2(88));
   CHECK_EQ(86, r.Call(0));
   CHECK_EQ(87, r.Call(1));
@@ -963,7 +965,7 @@ WASM_EXEC_TEST(BrTable4) {
       uint32_t cases[] = {0, 1, 2, 3};
       cases[i] = t;
       byte code[] = {B2(B2(B2(B2(B1(WASM_BR_TABLE(
-                                     WASM_GET_LOCAL(0), 3, BR_TARGET(cases[0]),
+                                     WASM_LOCAL_GET(0), 3, BR_TARGET(cases[0]),
                                      BR_TARGET(cases[1]), BR_TARGET(cases[2]),
                                      BR_TARGET(cases[3]))),
                                  RET_I8(70)),
@@ -993,7 +995,7 @@ WASM_EXEC_TEST(BrTable4x4) {
             uint32_t cases[] = {a, b, c, d};
             byte code[] = {
                 B2(B2(B2(B2(B1(WASM_BR_TABLE(
-                                WASM_GET_LOCAL(0), 3, BR_TARGET(cases[0]),
+                                WASM_LOCAL_GET(0), 3, BR_TARGET(cases[0]),
                                 BR_TARGET(cases[1]), BR_TARGET(cases[2]),
                                 BR_TARGET(cases[3]))),
                             RET_I8(50)),
@@ -1019,13 +1021,13 @@ WASM_EXEC_TEST(BrTable4x4) {
 
 WASM_EXEC_TEST(BrTable4_fallthru) {
   byte code[] = {
-      B2(B2(B2(B2(B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 3, BR_TARGET(0),
+      B2(B2(B2(B2(B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 3, BR_TARGET(0),
                                    BR_TARGET(1), BR_TARGET(2), BR_TARGET(3))),
                   WASM_INC_LOCAL_BY(1, 1)),
                WASM_INC_LOCAL_BY(1, 2)),
             WASM_INC_LOCAL_BY(1, 4)),
          WASM_INC_LOCAL_BY(1, 8)),
-      WASM_GET_LOCAL(1)};
+      WASM_LOCAL_GET(1)};
 
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
   r.Build(code, code + arraysize(code));
@@ -1045,11 +1047,9 @@ WASM_EXEC_TEST(BrTable4_fallthru) {
 
 WASM_EXEC_TEST(BrTable_loop_target) {
   byte code[] = {
-      WASM_LOOP_I(
-          WASM_BLOCK(
-              WASM_BR_TABLE(WASM_GET_LOCAL(0), 2,
-                  BR_TARGET(0), BR_TARGET(1), BR_TARGET(1))),
-          WASM_ONE)};
+      WASM_LOOP_I(WASM_BLOCK(WASM_BR_TABLE(WASM_LOCAL_GET(0), 2, BR_TARGET(0),
+                                           BR_TARGET(1), BR_TARGET(1))),
+                  WASM_ONE)};
 
   WasmRunner<int32_t, int32_t> r(execution_tier);
   r.Build(code, code + arraysize(code));
@@ -1077,8 +1077,9 @@ WASM_EXEC_TEST(I32ReinterpretF32) {
   int32_t* memory =
       r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
 
-  BUILD(r, WASM_STORE_MEM(MachineType::Float32(), WASM_ZERO,
-                          WASM_F32_REINTERPRET_I32(WASM_GET_LOCAL(0))),
+  BUILD(r,
+        WASM_STORE_MEM(MachineType::Float32(), WASM_ZERO,
+                       WASM_F32_REINTERPRET_I32(WASM_LOCAL_GET(0))),
         WASM_I32V_2(107));
 
   FOR_INT32_INPUTS(i) {
@@ -1214,61 +1215,61 @@ WASM_EXEC_TEST(VoidReturn2) {
 
 WASM_EXEC_TEST(BrEmpty) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BRV(0, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_BRV(0, WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(BrIfEmpty) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BRV_IF(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_BRV_IF(0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Block_empty) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, kExprBlock, kVoidCode, kExprEnd, WASM_GET_LOCAL(0));
+  BUILD(r, kExprBlock, kVoidCode, kExprEnd, WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Block_empty_br1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, B1(WASM_BR(0)), WASM_GET_LOCAL(0));
+  BUILD(r, B1(WASM_BR(0)), WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Block_empty_brif1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK(WASM_BR_IF(0, WASM_ZERO)), WASM_GET_LOCAL(0));
+  BUILD(r, WASM_BLOCK(WASM_BR_IF(0, WASM_ZERO)), WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Block_empty_brif2) {
   WasmRunner<uint32_t, uint32_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK(WASM_BR_IF(0, WASM_GET_LOCAL(1))), WASM_GET_LOCAL(0));
+  BUILD(r, WASM_BLOCK(WASM_BR_IF(0, WASM_LOCAL_GET(1))), WASM_LOCAL_GET(0));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(i, r.Call(i, i + 1)); }
 }
 
 WASM_EXEC_TEST(Block_i) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_BLOCK_I(WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Block_f) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_BLOCK_F(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_BLOCK_F(WASM_LOCAL_GET(0)));
   FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Block_d) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_BLOCK_D(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_BLOCK_D(WASM_LOCAL_GET(0)));
   FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Block_br2) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_GET_LOCAL(0))));
+  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_LOCAL_GET(0))));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(i, static_cast<uint32_t>(r.Call(i))); }
 }
 
@@ -1276,7 +1277,7 @@ WASM_EXEC_TEST(Block_If_P) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // block { if (p0) break 51; 52; }
   BUILD(r, WASM_BLOCK_I(                               // --
-               WASM_IF(WASM_GET_LOCAL(0),              // --
+               WASM_IF(WASM_LOCAL_GET(0),              // --
                        WASM_BRV(1, WASM_I32V_1(51))),  // --
                WASM_I32V_1(52)));                      // --
   FOR_INT32_INPUTS(i) {
@@ -1287,50 +1288,50 @@ WASM_EXEC_TEST(Block_If_P) {
 
 WASM_EXEC_TEST(Loop_empty) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, kExprLoop, kVoidCode, kExprEnd, WASM_GET_LOCAL(0));
+  BUILD(r, kExprLoop, kVoidCode, kExprEnd, WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Loop_i) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_LOOP_I(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOOP_I(WASM_LOCAL_GET(0)));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Loop_f) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_LOOP_F(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOOP_F(WASM_LOCAL_GET(0)));
   FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Loop_d) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_LOOP_D(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOOP_D(WASM_LOCAL_GET(0)));
   FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Loop_empty_br1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, B1(WASM_LOOP(WASM_BR(1))), WASM_GET_LOCAL(0));
+  BUILD(r, B1(WASM_LOOP(WASM_BR(1))), WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Loop_empty_brif1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, B1(WASM_LOOP(WASM_BR_IF(1, WASM_ZERO))), WASM_GET_LOCAL(0));
+  BUILD(r, B1(WASM_LOOP(WASM_BR_IF(1, WASM_ZERO))), WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) { CHECK_EQ(i, r.Call(i)); }
 }
 
 WASM_EXEC_TEST(Loop_empty_brif2) {
   WasmRunner<uint32_t, uint32_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_LOOP_I(WASM_BRV_IF(1, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))));
+  BUILD(r, WASM_LOOP_I(WASM_BRV_IF(1, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))));
   FOR_UINT32_INPUTS(i) { CHECK_EQ(i, r.Call(i, i + 1)); }
 }
 
 WASM_EXEC_TEST(Loop_empty_brif3) {
   WasmRunner<uint32_t, uint32_t, uint32_t, uint32_t> r(execution_tier);
-  BUILD(r, WASM_LOOP(WASM_BRV_IFD(1, WASM_GET_LOCAL(2), WASM_GET_LOCAL(0))),
-        WASM_GET_LOCAL(1));
+  BUILD(r, WASM_LOOP(WASM_BRV_IFD(1, WASM_LOCAL_GET(2), WASM_LOCAL_GET(0))),
+        WASM_LOCAL_GET(1));
   FOR_UINT32_INPUTS(i) {
     FOR_UINT32_INPUTS(j) {
       CHECK_EQ(i, r.Call(0, i, j));
@@ -1341,7 +1342,7 @@ WASM_EXEC_TEST(Loop_empty_brif3) {
 
 WASM_EXEC_TEST(Block_BrIf_P) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_I32V_1(51), WASM_GET_LOCAL(0)),
+  BUILD(r, WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_I32V_1(51), WASM_LOCAL_GET(0)),
                         WASM_I32V_1(52)));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 51 : 52;
@@ -1353,10 +1354,10 @@ WASM_EXEC_TEST(Block_IfElse_P_assign) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // { if (p0) p0 = 71; else p0 = 72; return p0; }
   BUILD(r,                                                 // --
-        WASM_IF_ELSE(WASM_GET_LOCAL(0),                    // --
-                     WASM_SET_LOCAL(0, WASM_I32V_2(71)),   // --
-                     WASM_SET_LOCAL(0, WASM_I32V_2(72))),  // --
-        WASM_GET_LOCAL(0));
+        WASM_IF_ELSE(WASM_LOCAL_GET(0),                    // --
+                     WASM_LOCAL_SET(0, WASM_I32V_2(71)),   // --
+                     WASM_LOCAL_SET(0, WASM_I32V_2(72))),  // --
+        WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 71 : 72;
     CHECK_EQ(expected, r.Call(i));
@@ -1367,7 +1368,7 @@ WASM_EXEC_TEST(Block_IfElse_P_return) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // if (p0) return 81; else return 82;
   BUILD(r,                               // --
-        WASM_IF_ELSE(WASM_GET_LOCAL(0),  // --
+        WASM_IF_ELSE(WASM_LOCAL_GET(0),  // --
                      RET_I8(81),         // --
                      RET_I8(82)),        // --
         WASM_ZERO);                      // --
@@ -1380,8 +1381,8 @@ WASM_EXEC_TEST(Block_IfElse_P_return) {
 WASM_EXEC_TEST(Block_If_P_assign) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // { if (p0) p0 = 61; p0; }
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SET_LOCAL(0, WASM_I32V_1(61))),
-        WASM_GET_LOCAL(0));
+  BUILD(r, WASM_IF(WASM_LOCAL_GET(0), WASM_LOCAL_SET(0, WASM_I32V_1(61))),
+        WASM_LOCAL_GET(0));
   FOR_INT32_INPUTS(i) {
     int32_t expected = i ? 61 : i;
     CHECK_EQ(expected, r.Call(i));
@@ -1391,14 +1392,14 @@ WASM_EXEC_TEST(Block_If_P_assign) {
 WASM_EXEC_TEST(DanglingAssign) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // { return 0; p0 = 0; }
-  BUILD(r, WASM_BLOCK_I(RET_I8(99), WASM_TEE_LOCAL(0, WASM_ZERO)));
+  BUILD(r, WASM_BLOCK_I(RET_I8(99), WASM_LOCAL_TEE(0, WASM_ZERO)));
   CHECK_EQ(99, r.Call(1));
 }
 
 WASM_EXEC_TEST(ExprIf_P) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   // p0 ? 11 : 22;
-  BUILD(r, WASM_IF_ELSE_I(WASM_GET_LOCAL(0),  // --
+  BUILD(r, WASM_IF_ELSE_I(WASM_LOCAL_GET(0),  // --
                           WASM_I32V_1(11),    // --
                           WASM_I32V_1(22)));  // --
   FOR_INT32_INPUTS(i) {
@@ -1409,11 +1410,12 @@ WASM_EXEC_TEST(ExprIf_P) {
 
 WASM_EXEC_TEST(CountDown) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_LOOP(WASM_IFB(WASM_GET_LOCAL(0),
-                              WASM_SET_LOCAL(0, WASM_I32_SUB(WASM_GET_LOCAL(0),
-                                                             WASM_I32V_1(1))),
-                              WASM_BR(1))),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        WASM_LOOP(WASM_IFB(
+            WASM_LOCAL_GET(0),
+            WASM_LOCAL_SET(0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(1))),
+            WASM_BR(1))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(0, r.Call(1));
   CHECK_EQ(0, r.Call(10));
   CHECK_EQ(0, r.Call(100));
@@ -1424,10 +1426,10 @@ WASM_EXEC_TEST(CountDown_fallthru) {
   BUILD(
       r,
       WASM_LOOP(
-          WASM_IF(WASM_NOT(WASM_GET_LOCAL(0)), WASM_BRV(2, WASM_GET_LOCAL(0))),
-          WASM_SET_LOCAL(0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V_1(1))),
+          WASM_IF(WASM_NOT(WASM_LOCAL_GET(0)), WASM_BRV(2, WASM_LOCAL_GET(0))),
+          WASM_LOCAL_SET(0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(1))),
           WASM_CONTINUE(0)),
-      WASM_GET_LOCAL(0));
+      WASM_LOCAL_GET(0));
   CHECK_EQ(0, r.Call(1));
   CHECK_EQ(0, r.Call(10));
   CHECK_EQ(0, r.Call(100));
@@ -1435,10 +1437,11 @@ WASM_EXEC_TEST(CountDown_fallthru) {
 
 WASM_EXEC_TEST(WhileCountDown) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_WHILE(WASM_GET_LOCAL(0),
-                      WASM_SET_LOCAL(
-                          0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V_1(1)))),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        WASM_WHILE(
+            WASM_LOCAL_GET(0),
+            WASM_LOCAL_SET(0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(1)))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(0, r.Call(1));
   CHECK_EQ(0, r.Call(10));
   CHECK_EQ(0, r.Call(100));
@@ -1446,9 +1449,10 @@ WASM_EXEC_TEST(WhileCountDown) {
 
 WASM_EXEC_TEST(Loop_if_break1) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_LOOP(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(2, WASM_GET_LOCAL(1))),
-                     WASM_SET_LOCAL(0, WASM_I32V_2(99))),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        WASM_LOOP(WASM_IF(WASM_LOCAL_GET(0), WASM_BRV(2, WASM_LOCAL_GET(1))),
+                  WASM_LOCAL_SET(0, WASM_I32V_2(99))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(99, r.Call(0, 11));
   CHECK_EQ(65, r.Call(3, 65));
   CHECK_EQ(10001, r.Call(10000, 10001));
@@ -1457,9 +1461,10 @@ WASM_EXEC_TEST(Loop_if_break1) {
 
 WASM_EXEC_TEST(Loop_if_break2) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_LOOP(WASM_BRV_IF(1, WASM_GET_LOCAL(1), WASM_GET_LOCAL(0)),
-                     WASM_DROP, WASM_SET_LOCAL(0, WASM_I32V_2(99))),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        WASM_LOOP(WASM_BRV_IF(1, WASM_LOCAL_GET(1), WASM_LOCAL_GET(0)),
+                  WASM_DROP, WASM_LOCAL_SET(0, WASM_I32V_2(99))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(99, r.Call(0, 33));
   CHECK_EQ(3, r.Call(1, 3));
   CHECK_EQ(10000, r.Call(99, 10000));
@@ -1468,9 +1473,10 @@ WASM_EXEC_TEST(Loop_if_break2) {
 
 WASM_EXEC_TEST(Loop_if_break_fallthru) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, B1(WASM_LOOP(WASM_IF(WASM_GET_LOCAL(0), WASM_BR(2)),
-                        WASM_SET_LOCAL(0, WASM_I32V_2(93)))),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        B1(WASM_LOOP(WASM_IF(WASM_LOCAL_GET(0), WASM_BR(2)),
+                     WASM_LOCAL_SET(0, WASM_I32V_2(93)))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(93, r.Call(0));
   CHECK_EQ(3, r.Call(3));
   CHECK_EQ(10001, r.Call(10001));
@@ -1479,9 +1485,10 @@ WASM_EXEC_TEST(Loop_if_break_fallthru) {
 
 WASM_EXEC_TEST(Loop_if_break_fallthru2) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, B1(B1(WASM_LOOP(WASM_IF(WASM_GET_LOCAL(0), WASM_BR(2)),
-                           WASM_SET_LOCAL(0, WASM_I32V_2(93))))),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        B1(B1(WASM_LOOP(WASM_IF(WASM_LOCAL_GET(0), WASM_BR(2)),
+                        WASM_LOCAL_SET(0, WASM_I32V_2(93))))),
+        WASM_LOCAL_GET(0));
   CHECK_EQ(93, r.Call(0));
   CHECK_EQ(3, r.Call(3));
   CHECK_EQ(10001, r.Call(10001));
@@ -1490,7 +1497,7 @@ WASM_EXEC_TEST(Loop_if_break_fallthru2) {
 
 WASM_EXEC_TEST(IfBreak1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), WASM_UNREACHABLE)),
+  BUILD(r, WASM_IF(WASM_LOCAL_GET(0), WASM_SEQ(WASM_BR(0), WASM_UNREACHABLE)),
         WASM_I32V_2(91));
   CHECK_EQ(91, r.Call(0));
   CHECK_EQ(91, r.Call(1));
@@ -1499,7 +1506,7 @@ WASM_EXEC_TEST(IfBreak1) {
 
 WASM_EXEC_TEST(IfBreak2) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_BR(0), RET_I8(77))),
+  BUILD(r, WASM_IF(WASM_LOCAL_GET(0), WASM_SEQ(WASM_BR(0), RET_I8(77))),
         WASM_I32V_2(81));
   CHECK_EQ(81, r.Call(0));
   CHECK_EQ(81, r.Call(1));
@@ -1551,7 +1558,7 @@ WASM_EXEC_TEST(LoadMemI32_oob) {
       r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
   r.builder().RandomizeMemory(1111);
 
-  BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_LOCAL_GET(0)));
 
   r.builder().WriteMemory(&memory[0], 88888888);
   CHECK_EQ(88888888, r.Call(0u));
@@ -1582,7 +1589,7 @@ WASM_EXEC_TEST(LoadMem_offset_oob) {
     constexpr byte offset = 8;
     uint32_t boundary = num_bytes - offset - machineTypes[m].MemSize();
 
-    BUILD(r, WASM_LOAD_MEM_OFFSET(machineTypes[m], offset, WASM_GET_LOCAL(0)),
+    BUILD(r, WASM_LOAD_MEM_OFFSET(machineTypes[m], offset, WASM_LOCAL_GET(0)),
           WASM_DROP, WASM_ZERO);
 
     CHECK_EQ(0, r.Call(boundary));  // in bounds.
@@ -1599,7 +1606,7 @@ WASM_EXEC_TEST(LoadMemI32_offset) {
       r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
   r.builder().RandomizeMemory(1111);
 
-  BUILD(r, WASM_LOAD_MEM_OFFSET(MachineType::Int32(), 4, WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM_OFFSET(MachineType::Int32(), 4, WASM_LOCAL_GET(0)));
 
   r.builder().WriteMemory(&memory[0], 66666666);
   r.builder().WriteMemory(&memory[1], 77777777);
@@ -1672,9 +1679,10 @@ WASM_EXEC_TEST(StoreMemI32_alignment) {
     WasmRunner<int32_t, int32_t> r(execution_tier);
     int32_t* memory =
         r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
-    BUILD(r, WASM_STORE_MEM_ALIGNMENT(MachineType::Int32(), WASM_ZERO, i,
-                                      WASM_GET_LOCAL(0)),
-          WASM_GET_LOCAL(0));
+    BUILD(r,
+          WASM_STORE_MEM_ALIGNMENT(MachineType::Int32(), WASM_ZERO, i,
+                                   WASM_LOCAL_GET(0)),
+          WASM_LOCAL_GET(0));
     r.builder().RandomizeMemory(1111);
     memory[0] = 0;
 
@@ -1689,8 +1697,9 @@ WASM_EXEC_TEST(StoreMemI32_offset) {
       r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
   const int32_t kWritten = 0xAABBCCDD;
 
-  BUILD(r, WASM_STORE_MEM_OFFSET(MachineType::Int32(), 4, WASM_GET_LOCAL(0),
-                                 WASM_I32V_5(kWritten)),
+  BUILD(r,
+        WASM_STORE_MEM_OFFSET(MachineType::Int32(), 4, WASM_LOCAL_GET(0),
+                              WASM_I32V_5(kWritten)),
         WASM_I32V_5(kWritten));
 
   for (int i = 0; i < 2; ++i) {
@@ -1722,8 +1731,9 @@ WASM_EXEC_TEST(StoreMem_offset_oob) {
 
     r.builder().RandomizeMemory(1119 + static_cast<int>(m));
 
-    BUILD(r, WASM_STORE_MEM_OFFSET(machineTypes[m], 8, WASM_GET_LOCAL(0),
-                                   WASM_LOAD_MEM(machineTypes[m], WASM_ZERO)),
+    BUILD(r,
+          WASM_STORE_MEM_OFFSET(machineTypes[m], 8, WASM_LOCAL_GET(0),
+                                WASM_LOAD_MEM(machineTypes[m], WASM_ZERO)),
           WASM_ZERO);
 
     byte memsize = machineTypes[m].MemSize();
@@ -1749,8 +1759,8 @@ WASM_EXEC_TEST(Store_i32_narrowed) {
     uint8_t* memory = r.builder().AddMemoryElems<uint8_t>(kWasmPageSize);
     constexpr uint32_t kPattern = 0x12345678;
 
-    BUILD(r, WASM_GET_LOCAL(0),                 // index
-          WASM_GET_LOCAL(1),                    // value
+    BUILD(r, WASM_LOCAL_GET(0),                 // index
+          WASM_LOCAL_GET(1),                    // value
           opcode, ZERO_ALIGNMENT, ZERO_OFFSET,  // store
           WASM_ZERO);                           // return value
 
@@ -1774,7 +1784,7 @@ WASM_EXEC_TEST(LoadMemI32_P) {
       r.builder().AddMemoryElems<int32_t>(kWasmPageSize / sizeof(int32_t));
   r.builder().RandomizeMemory(2222);
 
-  BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM(MachineType::Int32(), WASM_LOCAL_GET(0)));
 
   for (int i = 0; i < kNumElems; ++i) {
     CHECK_EQ(r.builder().ReadMemory(&memory[i]), r.Call(i * 4));
@@ -1788,16 +1798,17 @@ WASM_EXEC_TEST(MemI32_Sum) {
       r.builder().AddMemoryElems<uint32_t>(kWasmPageSize / sizeof(int32_t));
   const byte kSum = r.AllocateLocal(kWasmI32);
 
-  BUILD(r, WASM_WHILE(
-               WASM_GET_LOCAL(0),
-               WASM_BLOCK(
-                   WASM_SET_LOCAL(
-                       kSum, WASM_I32_ADD(WASM_GET_LOCAL(kSum),
-                                          WASM_LOAD_MEM(MachineType::Int32(),
-                                                        WASM_GET_LOCAL(0)))),
-                   WASM_SET_LOCAL(
-                       0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V_1(4))))),
-        WASM_GET_LOCAL(1));
+  BUILD(
+      r,
+      WASM_WHILE(
+          WASM_LOCAL_GET(0),
+          WASM_BLOCK(WASM_LOCAL_SET(
+                         kSum, WASM_I32_ADD(WASM_LOCAL_GET(kSum),
+                                            WASM_LOAD_MEM(MachineType::Int32(),
+                                                          WASM_LOCAL_GET(0)))),
+                     WASM_LOCAL_SET(
+                         0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(4))))),
+      WASM_LOCAL_GET(1));
 
   // Run 4 trials.
   for (int i = 0; i < 3; ++i) {
@@ -1851,17 +1862,18 @@ WASM_EXEC_TEST(MemF32_Sum) {
   r.builder().WriteMemory(&buffer[4], 5555.25f);
   const byte kSum = r.AllocateLocal(kWasmF32);
 
-  BUILD(r, WASM_WHILE(
-               WASM_GET_LOCAL(0),
-               WASM_BLOCK(
-                   WASM_SET_LOCAL(
-                       kSum, WASM_F32_ADD(WASM_GET_LOCAL(kSum),
-                                          WASM_LOAD_MEM(MachineType::Float32(),
-                                                        WASM_GET_LOCAL(0)))),
-                   WASM_SET_LOCAL(
-                       0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V_1(4))))),
-        WASM_STORE_MEM(MachineType::Float32(), WASM_ZERO, WASM_GET_LOCAL(kSum)),
-        WASM_GET_LOCAL(0));
+  BUILD(r,
+        WASM_WHILE(
+            WASM_LOCAL_GET(0),
+            WASM_BLOCK(
+                WASM_LOCAL_SET(
+                    kSum, WASM_F32_ADD(WASM_LOCAL_GET(kSum),
+                                       WASM_LOAD_MEM(MachineType::Float32(),
+                                                     WASM_LOCAL_GET(0)))),
+                WASM_LOCAL_SET(
+                    0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(4))))),
+        WASM_STORE_MEM(MachineType::Float32(), WASM_ZERO, WASM_LOCAL_GET(kSum)),
+        WASM_LOCAL_GET(0));
 
   CHECK_EQ(0, r.Call(4 * (kSize - 1)));
   CHECK_NE(-99.25f, r.builder().ReadMemory(&buffer[0]));
@@ -1881,17 +1893,17 @@ T GenerateAndRunFold(TestExecutionTier execution_tier, WasmOpcode binop,
   const byte kAccum = r.AllocateLocal(astType);
 
   BUILD(
-      r, WASM_SET_LOCAL(kAccum, WASM_LOAD_MEM(memType, WASM_ZERO)),
+      r, WASM_LOCAL_SET(kAccum, WASM_LOAD_MEM(memType, WASM_ZERO)),
       WASM_WHILE(
-          WASM_GET_LOCAL(0),
-          WASM_BLOCK(WASM_SET_LOCAL(
+          WASM_LOCAL_GET(0),
+          WASM_BLOCK(WASM_LOCAL_SET(
                          kAccum,
-                         WASM_BINOP(binop, WASM_GET_LOCAL(kAccum),
-                                    WASM_LOAD_MEM(memType, WASM_GET_LOCAL(0)))),
-                     WASM_SET_LOCAL(0, WASM_I32_SUB(WASM_GET_LOCAL(0),
+                         WASM_BINOP(binop, WASM_LOCAL_GET(kAccum),
+                                    WASM_LOAD_MEM(memType, WASM_LOCAL_GET(0)))),
+                     WASM_LOCAL_SET(0, WASM_I32_SUB(WASM_LOCAL_GET(0),
                                                     WASM_I32V_1(sizeof(T)))))),
-      WASM_STORE_MEM(memType, WASM_ZERO, WASM_GET_LOCAL(kAccum)),
-      WASM_GET_LOCAL(0));
+      WASM_STORE_MEM(memType, WASM_ZERO, WASM_LOCAL_GET(kAccum)),
+      WASM_LOCAL_GET(0));
   r.Call(static_cast<int>(sizeof(T) * (size - 1)));
   return r.builder().ReadMemory(&memory[0]);
 }
@@ -1922,7 +1934,7 @@ WASM_EXEC_TEST(Build_Wasm_Infinite_Loop_effect) {
 
 WASM_EXEC_TEST(Unreachable0a) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(9)), RET(WASM_GET_LOCAL(0))));
+  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_I32V_1(9)), RET(WASM_LOCAL_GET(0))));
   CHECK_EQ(9, r.Call(0));
   CHECK_EQ(9, r.Call(1));
 }
@@ -1952,21 +1964,21 @@ WASM_COMPILED_EXEC_TEST(Build_Wasm_Unreachable3) {
 WASM_COMPILED_EXEC_TEST(Build_Wasm_UnreachableIf1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(r, WASM_UNREACHABLE,
-        WASM_IF(WASM_GET_LOCAL(0), WASM_SEQ(WASM_GET_LOCAL(0), WASM_DROP)),
+        WASM_IF(WASM_LOCAL_GET(0), WASM_SEQ(WASM_LOCAL_GET(0), WASM_DROP)),
         WASM_ZERO);
 }
 
 WASM_COMPILED_EXEC_TEST(Build_Wasm_UnreachableIf2) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(r, WASM_UNREACHABLE,
-        WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_UNREACHABLE));
+        WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), WASM_UNREACHABLE));
 }
 
 WASM_EXEC_TEST(Unreachable_Load) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   r.builder().AddMemory(kWasmPageSize);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_GET_LOCAL(0)),
-                        WASM_LOAD_MEM(MachineType::Int8(), WASM_GET_LOCAL(0))));
+  BUILD(r, WASM_BLOCK_I(WASM_BRV(0, WASM_LOCAL_GET(0)),
+                        WASM_LOAD_MEM(MachineType::Int8(), WASM_LOCAL_GET(0))));
   CHECK_EQ(11, r.Call(11));
   CHECK_EQ(21, r.Call(21));
 }
@@ -1980,7 +1992,7 @@ WASM_EXEC_TEST(BrV_Fallthrough) {
 
 WASM_EXEC_TEST(Infinite_Loop_not_taken1) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_IF(WASM_GET_LOCAL(0), WASM_INFINITE_LOOP), WASM_I32V_1(45));
+  BUILD(r, WASM_IF(WASM_LOCAL_GET(0), WASM_INFINITE_LOOP), WASM_I32V_1(45));
   // Run the code, but don't go into the infinite loop.
   CHECK_EQ(45, r.Call(0));
 }
@@ -1988,7 +2000,7 @@ WASM_EXEC_TEST(Infinite_Loop_not_taken1) {
 WASM_EXEC_TEST(Infinite_Loop_not_taken2) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(r, WASM_BLOCK_I(
-               WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_I32V_1(45)),
+               WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_BRV(1, WASM_I32V_1(45)),
                             WASM_INFINITE_LOOP),
                WASM_ZERO));
   // Run the code, but don't go into the infinite loop.
@@ -1997,7 +2009,7 @@ WASM_EXEC_TEST(Infinite_Loop_not_taken2) {
 
 WASM_EXEC_TEST(Infinite_Loop_not_taken2_brif) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV_IF(0, WASM_I32V_1(45), WASM_GET_LOCAL(0)),
+  BUILD(r, WASM_BLOCK_I(WASM_BRV_IF(0, WASM_I32V_1(45), WASM_LOCAL_GET(0)),
                         WASM_INFINITE_LOOP));
   // Run the code, but don't go into the infinite loop.
   CHECK_EQ(45, r.Call(1));
@@ -2055,7 +2067,7 @@ WASM_EXEC_TEST(Int32LoadInt8_signext) {
   int8_t* memory = r.builder().AddMemoryElems<int8_t>(kNumElems);
   r.builder().RandomizeMemory();
   memory[0] = -1;
-  BUILD(r, WASM_LOAD_MEM(MachineType::Int8(), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM(MachineType::Int8(), WASM_LOCAL_GET(0)));
 
   for (int i = 0; i < kNumElems; ++i) {
     CHECK_EQ(memory[i], r.Call(i));
@@ -2068,7 +2080,7 @@ WASM_EXEC_TEST(Int32LoadInt8_zeroext) {
   byte* memory = r.builder().AddMemory(kNumElems);
   r.builder().RandomizeMemory(77);
   memory[0] = 255;
-  BUILD(r, WASM_LOAD_MEM(MachineType::Uint8(), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM(MachineType::Uint8(), WASM_LOCAL_GET(0)));
 
   for (int i = 0; i < kNumElems; ++i) {
     CHECK_EQ(memory[i], r.Call(i));
@@ -2081,7 +2093,7 @@ WASM_EXEC_TEST(Int32LoadInt16_signext) {
   byte* memory = r.builder().AddMemory(kNumBytes);
   r.builder().RandomizeMemory(888);
   memory[1] = 200;
-  BUILD(r, WASM_LOAD_MEM(MachineType::Int16(), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM(MachineType::Int16(), WASM_LOCAL_GET(0)));
 
   for (int i = 0; i < kNumBytes; i += 2) {
     int32_t expected = static_cast<int16_t>(memory[i] | (memory[i + 1] << 8));
@@ -2095,7 +2107,7 @@ WASM_EXEC_TEST(Int32LoadInt16_zeroext) {
   byte* memory = r.builder().AddMemory(kNumBytes);
   r.builder().RandomizeMemory(9999);
   memory[1] = 204;
-  BUILD(r, WASM_LOAD_MEM(MachineType::Uint16(), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_LOAD_MEM(MachineType::Uint16(), WASM_LOCAL_GET(0)));
 
   for (int i = 0; i < kNumBytes; i += 2) {
     int32_t expected = memory[i] | (memory[i + 1] << 8);
@@ -2108,7 +2120,7 @@ WASM_EXEC_TEST(Int32Global) {
   int32_t* global = r.builder().AddGlobal<int32_t>();
   // global = global + p0
   BUILD(r,
-        WASM_SET_GLOBAL(0, WASM_I32_ADD(WASM_GET_GLOBAL(0), WASM_GET_LOCAL(0))),
+        WASM_GLOBAL_SET(0, WASM_I32_ADD(WASM_GLOBAL_GET(0), WASM_LOCAL_GET(0))),
         WASM_ZERO);
 
   WriteLittleEndianValue<int32_t>(global, 116);
@@ -2128,9 +2140,10 @@ WASM_EXEC_TEST(Int32Globals_DontAlias) {
                           r.builder().AddGlobal<int32_t>(),
                           r.builder().AddGlobal<int32_t>()};
 
-    BUILD(r, WASM_SET_GLOBAL(
-                 g, WASM_I32_ADD(WASM_GET_GLOBAL(g), WASM_GET_LOCAL(0))),
-          WASM_GET_GLOBAL(g));
+    BUILD(
+        r,
+        WASM_GLOBAL_SET(g, WASM_I32_ADD(WASM_GLOBAL_GET(g), WASM_LOCAL_GET(0))),
+        WASM_GLOBAL_GET(g));
 
     // Check that reading/writing global number {g} doesn't alter the others.
     WriteLittleEndianValue<int32_t>(globals[g], 116 * g);
@@ -2153,9 +2166,10 @@ WASM_EXEC_TEST(Float32Global) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   float* global = r.builder().AddGlobal<float>();
   // global = global + p0
-  BUILD(r, WASM_SET_GLOBAL(
-               0, WASM_F32_ADD(WASM_GET_GLOBAL(0),
-                               WASM_F32_SCONVERT_I32(WASM_GET_LOCAL(0)))),
+  BUILD(r,
+        WASM_GLOBAL_SET(0,
+                        WASM_F32_ADD(WASM_GLOBAL_GET(0),
+                                     WASM_F32_SCONVERT_I32(WASM_LOCAL_GET(0)))),
         WASM_ZERO);
 
   WriteLittleEndianValue<float>(global, 1.25);
@@ -2170,9 +2184,10 @@ WASM_EXEC_TEST(Float64Global) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   double* global = r.builder().AddGlobal<double>();
   // global = global + p0
-  BUILD(r, WASM_SET_GLOBAL(
-               0, WASM_F64_ADD(WASM_GET_GLOBAL(0),
-                               WASM_F64_SCONVERT_I32(WASM_GET_LOCAL(0)))),
+  BUILD(r,
+        WASM_GLOBAL_SET(0,
+                        WASM_F64_ADD(WASM_GLOBAL_GET(0),
+                                     WASM_F64_SCONVERT_I32(WASM_LOCAL_GET(0)))),
         WASM_ZERO);
 
   WriteLittleEndianValue<double>(global, 1.25);
@@ -2194,10 +2209,10 @@ WASM_EXEC_TEST(MixedGlobals) {
   float* var_float = r.builder().AddGlobal<float>();
   double* var_double = r.builder().AddGlobal<double>();
 
-  BUILD(r, WASM_SET_GLOBAL(1, WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)),
-        WASM_SET_GLOBAL(2, WASM_LOAD_MEM(MachineType::Uint32(), WASM_ZERO)),
-        WASM_SET_GLOBAL(3, WASM_LOAD_MEM(MachineType::Float32(), WASM_ZERO)),
-        WASM_SET_GLOBAL(4, WASM_LOAD_MEM(MachineType::Float64(), WASM_ZERO)),
+  BUILD(r, WASM_GLOBAL_SET(1, WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)),
+        WASM_GLOBAL_SET(2, WASM_LOAD_MEM(MachineType::Uint32(), WASM_ZERO)),
+        WASM_GLOBAL_SET(3, WASM_LOAD_MEM(MachineType::Float32(), WASM_ZERO)),
+        WASM_GLOBAL_SET(4, WASM_LOAD_MEM(MachineType::Float64(), WASM_ZERO)),
         WASM_ZERO);
 
   memory[0] = 0xAA;
@@ -2244,7 +2259,7 @@ WASM_EXEC_TEST(CallF32StackParameter) {
   for (int i = 0; i < 20; ++i) param_types[i] = kWasmF32;
   FunctionSig sig(1, 19, param_types);
   WasmFunctionCompiler& t = r.NewFunction(&sig);
-  BUILD(t, WASM_GET_LOCAL(17));
+  BUILD(t, WASM_LOCAL_GET(17));
 
   // Build the calling function.
   BUILD(r, WASM_CALL_FUNCTION(
@@ -2267,7 +2282,7 @@ WASM_EXEC_TEST(CallF64StackParameter) {
   for (int i = 0; i < 20; ++i) param_types[i] = kWasmF64;
   FunctionSig sig(1, 19, param_types);
   WasmFunctionCompiler& t = r.NewFunction(&sig);
-  BUILD(t, WASM_GET_LOCAL(17));
+  BUILD(t, WASM_LOCAL_GET(17));
 
   // Build the calling function.
   BUILD(r, WASM_CALL_FUNCTION(t.function_index(), WASM_F64(1.0), WASM_F64(2.0),
@@ -2312,11 +2327,11 @@ WASM_EXEC_TEST(Call_Int32Add) {
 
   // Build the target function.
   WasmFunctionCompiler& t = r.NewFunction<int32_t, int32_t, int32_t>();
-  BUILD(t, WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t, WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   // Build the caller function.
-  BUILD(r, WASM_CALL_FUNCTION(t.function_index(), WASM_GET_LOCAL(0),
-                              WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_CALL_FUNCTION(t.function_index(), WASM_LOCAL_GET(0),
+                              WASM_LOCAL_GET(1)));
 
   FOR_INT32_INPUTS(i) {
     FOR_INT32_INPUTS(j) {
@@ -2332,11 +2347,11 @@ WASM_EXEC_TEST(Call_Float32Sub) {
 
   // Build the target function.
   WasmFunctionCompiler& target_func = r.NewFunction<float, float, float>();
-  BUILD(target_func, WASM_F32_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(target_func, WASM_F32_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   // Build the caller function.
-  BUILD(r, WASM_CALL_FUNCTION(target_func.function_index(), WASM_GET_LOCAL(0),
-                              WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_CALL_FUNCTION(target_func.function_index(), WASM_LOCAL_GET(0),
+                              WASM_LOCAL_GET(1)));
 
   FOR_FLOAT32_INPUTS(i) {
     FOR_FLOAT32_INPUTS(j) { CHECK_FLOAT_EQ(i - j, r.Call(i, j)); }
@@ -2392,16 +2407,16 @@ WASM_EXEC_TEST(Regular_Factorial) {
 
   WasmFunctionCompiler& fact_aux_fn =
       r.NewFunction<uint32_t, uint32_t, uint32_t>("fact_aux");
-  BUILD(r, WASM_CALL_FUNCTION(fact_aux_fn.function_index(), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_CALL_FUNCTION(fact_aux_fn.function_index(), WASM_LOCAL_GET(0),
                               WASM_I32V(1)));
 
   BUILD(fact_aux_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_LES(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(1),
+            WASM_I32_LES(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(1),
             WASM_CALL_FUNCTION(
                 fact_aux_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)))));
 
   uint32_t test_values[] = {1, 2, 5, 10, 20};
 
@@ -2426,15 +2441,15 @@ WASM_EXEC_TEST(ReturnCall_Factorial) {
   WasmFunctionCompiler& fact_aux_fn =
       r.NewFunction<uint32_t, uint32_t, uint32_t>("fact_aux");
   BUILD(r, WASM_RETURN_CALL_FUNCTION(fact_aux_fn.function_index(),
-                                     WASM_GET_LOCAL(0), WASM_I32V(1)));
+                                     WASM_LOCAL_GET(0), WASM_I32V(1)));
 
   BUILD(fact_aux_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_LES(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(1),
+            WASM_I32_LES(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(1),
             WASM_RETURN_CALL_FUNCTION(
                 fact_aux_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)))));
 
   uint32_t test_values[] = {1, 2, 5, 10, 20, 2000};
 
@@ -2459,24 +2474,24 @@ WASM_EXEC_TEST(ReturnCall_MutualFactorial) {
   WasmFunctionCompiler& f_fn = r.NewFunction<uint32_t, uint32_t, uint32_t>("f");
   WasmFunctionCompiler& g_fn = r.NewFunction<uint32_t, uint32_t, uint32_t>("g");
 
-  BUILD(r, WASM_RETURN_CALL_FUNCTION(f_fn.function_index(), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_RETURN_CALL_FUNCTION(f_fn.function_index(), WASM_LOCAL_GET(0),
                                      WASM_I32V(1)));
 
   BUILD(f_fn,
-        WASM_IF_ELSE_I(WASM_I32_LES(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                       WASM_GET_LOCAL(1),
+        WASM_IF_ELSE_I(WASM_I32_LES(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                       WASM_LOCAL_GET(1),
                        WASM_RETURN_CALL_FUNCTION(
                            g_fn.function_index(),
-                           WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
-                           WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)))));
+                           WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                           WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)))));
 
   BUILD(g_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_LES(WASM_GET_LOCAL(1), WASM_I32V(1)), WASM_GET_LOCAL(0),
+            WASM_I32_LES(WASM_LOCAL_GET(1), WASM_I32V(1)), WASM_LOCAL_GET(0),
             WASM_RETURN_CALL_FUNCTION(
                 f_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(1), WASM_I32V(1)),
-                WASM_I32_MUL(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(1), WASM_I32V(1)),
+                WASM_I32_MUL(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0)))));
 
   uint32_t test_values[] = {1, 2, 5, 10, 20, 2000};
 
@@ -2513,16 +2528,16 @@ WASM_EXEC_TEST(ReturnCall_IndirectFactorial) {
                                        arraysize(indirect_function_table));
 
   BUILD(r,
-        WASM_RETURN_CALL_FUNCTION(f_ind_fn.function_index(), WASM_GET_LOCAL(0),
+        WASM_RETURN_CALL_FUNCTION(f_ind_fn.function_index(), WASM_LOCAL_GET(0),
                                   WASM_I32V(1), WASM_I32V(f_ind_index)));
 
   BUILD(f_ind_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_LES(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(1),
+            WASM_I32_LES(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(1),
             WASM_RETURN_CALL_INDIRECT(
-                sig_index, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
-                WASM_GET_LOCAL(2), WASM_GET_LOCAL(2))));
+                sig_index, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                WASM_LOCAL_GET(2), WASM_LOCAL_GET(2))));
 
   uint32_t test_values[] = {1, 2, 5, 10, 10000};
 
@@ -2545,15 +2560,15 @@ WASM_EXEC_TEST(ReturnCall_Sum) {
 
   WasmFunctionCompiler& sum_aux_fn = r.NewFunction(sigs.i_ii(), "sum_aux");
   BUILD(r, WASM_RETURN_CALL_FUNCTION(sum_aux_fn.function_index(),
-                                     WASM_GET_LOCAL(0), WASM_I32V(0)));
+                                     WASM_LOCAL_GET(0), WASM_I32V(0)));
 
   BUILD(sum_aux_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_LTS(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(1),
+            WASM_I32_LTS(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(1),
             WASM_RETURN_CALL_FUNCTION(
                 sum_aux_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)))));
 
   int32_t test_values[] = {1, 2, 5, 10, 1000};
 
@@ -2585,34 +2600,34 @@ WASM_EXEC_TEST(ReturnCall_Bounce_Sum) {
   WasmFunctionCompiler& b3_fn =
       r.NewFunction<int32_t, int32_t, int32_t, int32_t, int32_t>("b3");
 
-  BUILD(r, WASM_RETURN_CALL_FUNCTION(b1_fn.function_index(), WASM_GET_LOCAL(0),
+  BUILD(r, WASM_RETURN_CALL_FUNCTION(b1_fn.function_index(), WASM_LOCAL_GET(0),
                                      WASM_I32V(0)));
 
   BUILD(
       b1_fn,
       WASM_IF_ELSE_I(
-          WASM_I32_LTS(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(1),
+          WASM_I32_LTS(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(1),
           WASM_RETURN_CALL_FUNCTION(
               b2_fn.function_index(),
-              WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(0),
-              WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)))));
+              WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(0),
+              WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)))));
 
   BUILD(b2_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_LTS(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(2),
+            WASM_I32_LTS(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(2),
             WASM_RETURN_CALL_FUNCTION(
                 b3_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(2)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(2)))));
 
   BUILD(b3_fn,
         WASM_IF_ELSE_I(
-            WASM_I32_LTS(WASM_GET_LOCAL(0), WASM_I32V(1)), WASM_GET_LOCAL(3),
+            WASM_I32_LTS(WASM_LOCAL_GET(0), WASM_I32V(1)), WASM_LOCAL_GET(3),
             WASM_RETURN_CALL_FUNCTION(
                 b1_fn.function_index(),
-                WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V(1)),
-                WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(3)))));
+                WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V(1)),
+                WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(3)))));
 
   int32_t test_values[] = {1, 2, 5, 10, 1000};
 
@@ -2657,7 +2672,7 @@ static void Run_WasmMixedCall_N(TestExecutionTier execution_tier, int start) {
       b.AddParam(ValueType::For(memtypes[i]));
     }
     WasmFunctionCompiler& t = r.NewFunction(b.Build());
-    BUILD(t, WASM_GET_LOCAL(which));
+    BUILD(t, WASM_LOCAL_GET(which));
 
     // =========================================================================
     // Build the calling function.
@@ -2679,7 +2694,7 @@ static void Run_WasmMixedCall_N(TestExecutionTier execution_tier, int start) {
 
     // Store the result in memory.
     ADD_CODE(code,
-             WASM_STORE_MEM(result, WASM_ZERO, WASM_GET_LOCAL(local_index)));
+             WASM_STORE_MEM(result, WASM_ZERO, WASM_LOCAL_GET(local_index)));
 
     // Return the expected value.
     ADD_CODE(code, WASM_I32V_2(kExpected));
@@ -2710,15 +2725,15 @@ WASM_EXEC_TEST(MixedCall_3) { Run_WasmMixedCall_N(execution_tier, 3); }
 WASM_EXEC_TEST(AddCall) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   WasmFunctionCompiler& t1 = r.NewFunction<int32_t, int32_t, int32_t>();
-  BUILD(t1, WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t1, WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   byte local = r.AllocateLocal(kWasmI32);
-  BUILD(r, WASM_SET_LOCAL(local, WASM_I32V_2(99)),
+  BUILD(r, WASM_LOCAL_SET(local, WASM_I32V_2(99)),
         WASM_I32_ADD(
-            WASM_CALL_FUNCTION(t1.function_index(), WASM_GET_LOCAL(0),
-                               WASM_GET_LOCAL(0)),
-            WASM_CALL_FUNCTION(t1.function_index(), WASM_GET_LOCAL(local),
-                               WASM_GET_LOCAL(local))));
+            WASM_CALL_FUNCTION(t1.function_index(), WASM_LOCAL_GET(0),
+                               WASM_LOCAL_GET(0)),
+            WASM_CALL_FUNCTION(t1.function_index(), WASM_LOCAL_GET(local),
+                               WASM_LOCAL_GET(local))));
 
   CHECK_EQ(198, r.Call(0));
   CHECK_EQ(200, r.Call(1));
@@ -2732,9 +2747,9 @@ WASM_EXEC_TEST(MultiReturnSub) {
   ValueType storage[] = {kWasmI32, kWasmI32, kWasmI32, kWasmI32};
   FunctionSig sig_ii_ii(2, 2, storage);
   WasmFunctionCompiler& t1 = r.NewFunction(&sig_ii_ii);
-  BUILD(t1, WASM_GET_LOCAL(1), WASM_GET_LOCAL(0));
+  BUILD(t1, WASM_LOCAL_GET(1), WASM_LOCAL_GET(0));
 
-  BUILD(r, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+  BUILD(r, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
         WASM_CALL_FUNCTION0(t1.function_index()), kExprI32Sub);
 
   FOR_INT32_INPUTS(i) {
@@ -2761,19 +2776,20 @@ void RunMultiReturnSelect(TestExecutionTier execution_tier, const T* inputs) {
         WasmRunner<T, T, T, T, T> r(execution_tier);
         WasmFunctionCompiler& r1 = r.NewFunction(&sig);
 
-        BUILD(r1, WASM_GET_LOCAL(i), WASM_GET_LOCAL(j));
+        BUILD(r1, WASM_LOCAL_GET(i), WASM_LOCAL_GET(j));
 
         if (k == 0) {
-          BUILD(r, WASM_CALL_FUNCTION(r1.function_index(), WASM_GET_LOCAL(0),
-                                      WASM_GET_LOCAL(1), WASM_GET_LOCAL(2),
-                                      WASM_GET_LOCAL(3)),
+          BUILD(r,
+                WASM_CALL_FUNCTION(r1.function_index(), WASM_LOCAL_GET(0),
+                                   WASM_LOCAL_GET(1), WASM_LOCAL_GET(2),
+                                   WASM_LOCAL_GET(3)),
                 WASM_DROP);
         } else {
           BUILD(r,
-                WASM_CALL_FUNCTION(r1.function_index(), WASM_GET_LOCAL(0),
-                                   WASM_GET_LOCAL(1), WASM_GET_LOCAL(2),
-                                   WASM_GET_LOCAL(3)),
-                kExprLocalSet, 0, WASM_DROP, WASM_GET_LOCAL(0));
+                WASM_CALL_FUNCTION(r1.function_index(), WASM_LOCAL_GET(0),
+                                   WASM_LOCAL_GET(1), WASM_LOCAL_GET(2),
+                                   WASM_LOCAL_GET(3)),
+                kExprLocalSet, 0, WASM_DROP, WASM_LOCAL_GET(0));
         }
 
         T expected = inputs[k == 0 ? i : j];
@@ -2809,7 +2825,7 @@ WASM_EXEC_TEST(MultiReturnSelect_f64) {
 
 WASM_EXEC_TEST(ExprBlock2a) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_I32V_1(1))),
+  BUILD(r, WASM_BLOCK_I(WASM_IF(WASM_LOCAL_GET(0), WASM_BRV(1, WASM_I32V_1(1))),
                         WASM_I32V_1(1)));
   CHECK_EQ(1, r.Call(0));
   CHECK_EQ(1, r.Call(1));
@@ -2817,7 +2833,7 @@ WASM_EXEC_TEST(ExprBlock2a) {
 
 WASM_EXEC_TEST(ExprBlock2b) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_I32V_1(1))),
+  BUILD(r, WASM_BLOCK_I(WASM_IF(WASM_LOCAL_GET(0), WASM_BRV(1, WASM_I32V_1(1))),
                         WASM_I32V_1(2)));
   CHECK_EQ(2, r.Call(0));
   CHECK_EQ(1, r.Call(1));
@@ -2825,7 +2841,7 @@ WASM_EXEC_TEST(ExprBlock2b) {
 
 WASM_EXEC_TEST(ExprBlock2c) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_I32V_1(1), WASM_GET_LOCAL(0)),
+  BUILD(r, WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_I32V_1(1), WASM_LOCAL_GET(0)),
                         WASM_I32V_1(1)));
   CHECK_EQ(1, r.Call(0));
   CHECK_EQ(1, r.Call(1));
@@ -2833,7 +2849,7 @@ WASM_EXEC_TEST(ExprBlock2c) {
 
 WASM_EXEC_TEST(ExprBlock2d) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_I32V_1(1), WASM_GET_LOCAL(0)),
+  BUILD(r, WASM_BLOCK_I(WASM_BRV_IFD(0, WASM_I32V_1(1), WASM_LOCAL_GET(0)),
                         WASM_I32V_1(2)));
   CHECK_EQ(2, r.Call(0));
   CHECK_EQ(1, r.Call(1));
@@ -2841,15 +2857,15 @@ WASM_EXEC_TEST(ExprBlock2d) {
 
 WASM_EXEC_TEST(ExprBlock_ManualSwitch) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_BLOCK_I(WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(1)),
+  BUILD(r, WASM_BLOCK_I(WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(1)),
                                 WASM_BRV(1, WASM_I32V_1(11))),
-                        WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(2)),
+                        WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(2)),
                                 WASM_BRV(1, WASM_I32V_1(12))),
-                        WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(3)),
+                        WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(3)),
                                 WASM_BRV(1, WASM_I32V_1(13))),
-                        WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(4)),
+                        WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(4)),
                                 WASM_BRV(1, WASM_I32V_1(14))),
-                        WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(5)),
+                        WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(5)),
                                 WASM_BRV(1, WASM_I32V_1(15))),
                         WASM_I32V_2(99)));
   CHECK_EQ(99, r.Call(0));
@@ -2865,15 +2881,15 @@ WASM_EXEC_TEST(ExprBlock_ManualSwitch_brif) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(r, WASM_BLOCK_I(
                WASM_BRV_IFD(0, WASM_I32V_1(11),
-                            WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(1))),
+                            WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(1))),
                WASM_BRV_IFD(0, WASM_I32V_1(12),
-                            WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(2))),
+                            WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(2))),
                WASM_BRV_IFD(0, WASM_I32V_1(13),
-                            WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(3))),
+                            WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(3))),
                WASM_BRV_IFD(0, WASM_I32V_1(14),
-                            WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(4))),
+                            WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(4))),
                WASM_BRV_IFD(0, WASM_I32V_1(15),
-                            WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(5))),
+                            WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(5))),
                WASM_I32V_2(99)));
   CHECK_EQ(99, r.Call(0));
   CHECK_EQ(11, r.Call(1));
@@ -2890,9 +2906,9 @@ WASM_EXEC_TEST(If_nested) {
   BUILD(
       r,
       WASM_IF_ELSE_I(
-          WASM_GET_LOCAL(0),
-          WASM_IF_ELSE_I(WASM_GET_LOCAL(1), WASM_I32V_1(11), WASM_I32V_1(12)),
-          WASM_IF_ELSE_I(WASM_GET_LOCAL(1), WASM_I32V_1(13), WASM_I32V_1(14))));
+          WASM_LOCAL_GET(0),
+          WASM_IF_ELSE_I(WASM_LOCAL_GET(1), WASM_I32V_1(11), WASM_I32V_1(12)),
+          WASM_IF_ELSE_I(WASM_LOCAL_GET(1), WASM_I32V_1(13), WASM_I32V_1(14))));
 
   CHECK_EQ(11, r.Call(1, 1));
   CHECK_EQ(12, r.Call(1, 0));
@@ -2903,7 +2919,7 @@ WASM_EXEC_TEST(If_nested) {
 WASM_EXEC_TEST(ExprBlock_if) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
 
-  BUILD(r, WASM_BLOCK_I(WASM_IF_ELSE_I(WASM_GET_LOCAL(0),
+  BUILD(r, WASM_BLOCK_I(WASM_IF_ELSE_I(WASM_LOCAL_GET(0),
                                        WASM_BRV(0, WASM_I32V_1(11)),
                                        WASM_BRV(1, WASM_I32V_1(14)))));
 
@@ -2915,10 +2931,10 @@ WASM_EXEC_TEST(ExprBlock_nested_ifs) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
 
   BUILD(r, WASM_BLOCK_I(WASM_IF_ELSE_I(
-               WASM_GET_LOCAL(0),
-               WASM_IF_ELSE_I(WASM_GET_LOCAL(1), WASM_BRV(0, WASM_I32V_1(11)),
+               WASM_LOCAL_GET(0),
+               WASM_IF_ELSE_I(WASM_LOCAL_GET(1), WASM_BRV(0, WASM_I32V_1(11)),
                               WASM_BRV(1, WASM_I32V_1(12))),
-               WASM_IF_ELSE_I(WASM_GET_LOCAL(1), WASM_BRV(0, WASM_I32V_1(13)),
+               WASM_IF_ELSE_I(WASM_LOCAL_GET(1), WASM_BRV(0, WASM_I32V_1(13)),
                               WASM_BRV(1, WASM_I32V_1(14))))));
 
   CHECK_EQ(11, r.Call(1, 1));
@@ -2932,11 +2948,11 @@ WASM_EXEC_TEST(SimpleCallIndirect) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
 
   WasmFunctionCompiler& t1 = r.NewFunction(sigs.i_ii());
-  BUILD(t1, WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t1, WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t1.SetSigIndex(1);
 
   WasmFunctionCompiler& t2 = r.NewFunction(sigs.i_ii());
-  BUILD(t2, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t2, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t2.SetSigIndex(1);
 
   // Signature table.
@@ -2953,7 +2969,7 @@ WASM_EXEC_TEST(SimpleCallIndirect) {
 
   // Build the caller function.
   BUILD(r, WASM_CALL_INDIRECT(1, WASM_I32V_2(66), WASM_I32V_1(22),
-                              WASM_GET_LOCAL(0)));
+                              WASM_LOCAL_GET(0)));
 
   CHECK_EQ(88, r.Call(0));
   CHECK_EQ(44, r.Call(1));
@@ -2965,11 +2981,11 @@ WASM_EXEC_TEST(MultipleCallIndirect) {
   WasmRunner<int32_t, int32_t, int32_t, int32_t> r(execution_tier);
 
   WasmFunctionCompiler& t1 = r.NewFunction(sigs.i_ii());
-  BUILD(t1, WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t1, WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t1.SetSigIndex(1);
 
   WasmFunctionCompiler& t2 = r.NewFunction(sigs.i_ii());
-  BUILD(t2, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t2, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t2.SetSigIndex(1);
 
   // Signature table.
@@ -2986,10 +3002,10 @@ WASM_EXEC_TEST(MultipleCallIndirect) {
 
   // Build the caller function.
   BUILD(r,
-        WASM_I32_ADD(WASM_CALL_INDIRECT(1, WASM_GET_LOCAL(1), WASM_GET_LOCAL(2),
-                                        WASM_GET_LOCAL(0)),
-                     WASM_CALL_INDIRECT(1, WASM_GET_LOCAL(2), WASM_GET_LOCAL(0),
-                                        WASM_GET_LOCAL(1))));
+        WASM_I32_ADD(WASM_CALL_INDIRECT(1, WASM_LOCAL_GET(1), WASM_LOCAL_GET(2),
+                                        WASM_LOCAL_GET(0)),
+                     WASM_CALL_INDIRECT(1, WASM_LOCAL_GET(2), WASM_LOCAL_GET(0),
+                                        WASM_LOCAL_GET(1))));
 
   CHECK_EQ(5, r.Call(0, 1, 2));
   CHECK_EQ(19, r.Call(0, 1, 9));
@@ -3008,7 +3024,7 @@ WASM_EXEC_TEST(CallIndirect_EmptyTable) {
 
   // One function.
   WasmFunctionCompiler& t1 = r.NewFunction(sigs.i_ii());
-  BUILD(t1, WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t1, WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t1.SetSigIndex(1);
 
   // Signature table.
@@ -3018,7 +3034,7 @@ WASM_EXEC_TEST(CallIndirect_EmptyTable) {
 
   // Build the caller function.
   BUILD(r, WASM_CALL_INDIRECT(1, WASM_I32V_2(66), WASM_I32V_1(22),
-                              WASM_GET_LOCAL(0)));
+                              WASM_LOCAL_GET(0)));
 
   CHECK_TRAP(r.Call(0));
   CHECK_TRAP(r.Call(1));
@@ -3030,15 +3046,15 @@ WASM_EXEC_TEST(CallIndirect_canonical) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
 
   WasmFunctionCompiler& t1 = r.NewFunction(sigs.i_ii());
-  BUILD(t1, WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t1, WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t1.SetSigIndex(0);
 
   WasmFunctionCompiler& t2 = r.NewFunction(sigs.i_ii());
-  BUILD(t2, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t2, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t2.SetSigIndex(1);
 
   WasmFunctionCompiler& t3 = r.NewFunction(sigs.f_ff());
-  BUILD(t3, WASM_F32_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(t3, WASM_F32_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
   t3.SetSigIndex(2);
 
   // Signature table.
@@ -3057,7 +3073,7 @@ WASM_EXEC_TEST(CallIndirect_canonical) {
 
   // Build the caller function.
   BUILD(r, WASM_CALL_INDIRECT(1, WASM_I32V_2(77), WASM_I32V_1(11),
-                              WASM_GET_LOCAL(0)));
+                              WASM_LOCAL_GET(0)));
 
   CHECK_EQ(88, r.Call(0));
   CHECK_EQ(66, r.Call(1));
@@ -3069,63 +3085,63 @@ WASM_EXEC_TEST(CallIndirect_canonical) {
 
 WASM_EXEC_TEST(F32Floor) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_F32_FLOOR(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_FLOOR(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(floorf(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F32Ceil) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_F32_CEIL(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_CEIL(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(ceilf(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F32Trunc) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_F32_TRUNC(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_TRUNC(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(truncf(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F32NearestInt) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_F32_NEARESTINT(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_NEARESTINT(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) { CHECK_FLOAT_EQ(nearbyintf(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F64Floor) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_F64_FLOOR(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_FLOOR(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(floor(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F64Ceil) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_F64_CEIL(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_CEIL(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(ceil(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F64Trunc) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_F64_TRUNC(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_TRUNC(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(trunc(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F64NearestInt) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_F64_NEARESTINT(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_NEARESTINT(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) { CHECK_DOUBLE_EQ(nearbyint(i), r.Call(i)); }
 }
 
 WASM_EXEC_TEST(F32Min) {
   WasmRunner<float, float, float> r(execution_tier);
-  BUILD(r, WASM_F32_MIN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F32_MIN(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_FLOAT32_INPUTS(i) {
     FOR_FLOAT32_INPUTS(j) { CHECK_DOUBLE_EQ(JSMin(i, j), r.Call(i, j)); }
@@ -3134,14 +3150,14 @@ WASM_EXEC_TEST(F32Min) {
 
 WASM_EXEC_TEST(F32MinSameValue) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_F32_MIN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_MIN(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
   float result = r.Call(5.0f);
   CHECK_FLOAT_EQ(5.0f, result);
 }
 
 WASM_EXEC_TEST(F64Min) {
   WasmRunner<double, double, double> r(execution_tier);
-  BUILD(r, WASM_F64_MIN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F64_MIN(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_FLOAT64_INPUTS(i) {
     FOR_FLOAT64_INPUTS(j) { CHECK_DOUBLE_EQ(JSMin(i, j), r.Call(i, j)); }
@@ -3150,14 +3166,14 @@ WASM_EXEC_TEST(F64Min) {
 
 WASM_EXEC_TEST(F64MinSameValue) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_F64_MIN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_MIN(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
   double result = r.Call(5.0);
   CHECK_DOUBLE_EQ(5.0, result);
 }
 
 WASM_EXEC_TEST(F32Max) {
   WasmRunner<float, float, float> r(execution_tier);
-  BUILD(r, WASM_F32_MAX(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F32_MAX(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_FLOAT32_INPUTS(i) {
     FOR_FLOAT32_INPUTS(j) { CHECK_FLOAT_EQ(JSMax(i, j), r.Call(i, j)); }
@@ -3166,14 +3182,14 @@ WASM_EXEC_TEST(F32Max) {
 
 WASM_EXEC_TEST(F32MaxSameValue) {
   WasmRunner<float, float> r(execution_tier);
-  BUILD(r, WASM_F32_MAX(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F32_MAX(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
   float result = r.Call(5.0f);
   CHECK_FLOAT_EQ(5.0f, result);
 }
 
 WASM_EXEC_TEST(F64Max) {
   WasmRunner<double, double, double> r(execution_tier);
-  BUILD(r, WASM_F64_MAX(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F64_MAX(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_FLOAT64_INPUTS(i) {
     FOR_FLOAT64_INPUTS(j) {
@@ -3185,14 +3201,14 @@ WASM_EXEC_TEST(F64Max) {
 
 WASM_EXEC_TEST(F64MaxSameValue) {
   WasmRunner<double, double> r(execution_tier);
-  BUILD(r, WASM_F64_MAX(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_F64_MAX(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)));
   double result = r.Call(5.0);
   CHECK_DOUBLE_EQ(5.0, result);
 }
 
 WASM_EXEC_TEST(I32SConvertF32) {
   WasmRunner<int32_t, float> r(execution_tier);
-  BUILD(r, WASM_I32_SCONVERT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_SCONVERT_F32(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     if (is_inbounds<int32_t>(i)) {
@@ -3205,7 +3221,7 @@ WASM_EXEC_TEST(I32SConvertF32) {
 
 WASM_EXEC_TEST(I32SConvertSatF32) {
   WasmRunner<int32_t, float> r(execution_tier);
-  BUILD(r, WASM_I32_SCONVERT_SAT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_SCONVERT_SAT_F32(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT32_INPUTS(i) {
     int32_t expected =
@@ -3221,7 +3237,7 @@ WASM_EXEC_TEST(I32SConvertSatF32) {
 
 WASM_EXEC_TEST(I32SConvertF64) {
   WasmRunner<int32_t, double> r(execution_tier);
-  BUILD(r, WASM_I32_SCONVERT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_SCONVERT_F64(WASM_LOCAL_GET(0)));
 
   FOR_FLOAT64_INPUTS(i) {
     if (is_inbounds<int32_t>(i)) {
@@ -3234,7 +3250,7 @@ WASM_EXEC_TEST(I32SConvertF64) {
 
 WASM_EXEC_TEST(I32SConvertSatF64) {
   WasmRunner<int32_t, double> r(execution_tier);
-  BUILD(r, WASM_I32_SCONVERT_SAT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_SCONVERT_SAT_F64(WASM_LOCAL_GET(0)));
   FOR_FLOAT64_INPUTS(i) {
     int32_t expected =
         is_inbounds<int32_t>(i)
@@ -3249,7 +3265,7 @@ WASM_EXEC_TEST(I32SConvertSatF64) {
 
 WASM_EXEC_TEST(I32UConvertF32) {
   WasmRunner<uint32_t, float> r(execution_tier);
-  BUILD(r, WASM_I32_UCONVERT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_UCONVERT_F32(WASM_LOCAL_GET(0)));
   FOR_FLOAT32_INPUTS(i) {
     if (is_inbounds<uint32_t>(i)) {
       CHECK_EQ(static_cast<uint32_t>(i), r.Call(i));
@@ -3261,7 +3277,7 @@ WASM_EXEC_TEST(I32UConvertF32) {
 
 WASM_EXEC_TEST(I32UConvertSatF32) {
   WasmRunner<uint32_t, float> r(execution_tier);
-  BUILD(r, WASM_I32_UCONVERT_SAT_F32(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_UCONVERT_SAT_F32(WASM_LOCAL_GET(0)));
   FOR_FLOAT32_INPUTS(i) {
     int32_t expected =
         is_inbounds<uint32_t>(i)
@@ -3276,7 +3292,7 @@ WASM_EXEC_TEST(I32UConvertSatF32) {
 
 WASM_EXEC_TEST(I32UConvertF64) {
   WasmRunner<uint32_t, double> r(execution_tier);
-  BUILD(r, WASM_I32_UCONVERT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_UCONVERT_F64(WASM_LOCAL_GET(0)));
   FOR_FLOAT64_INPUTS(i) {
     if (is_inbounds<uint32_t>(i)) {
       CHECK_EQ(static_cast<uint32_t>(i), r.Call(i));
@@ -3288,7 +3304,7 @@ WASM_EXEC_TEST(I32UConvertF64) {
 
 WASM_EXEC_TEST(I32UConvertSatF64) {
   WasmRunner<uint32_t, double> r(execution_tier);
-  BUILD(r, WASM_I32_UCONVERT_SAT_F64(WASM_GET_LOCAL(0)));
+  BUILD(r, WASM_I32_UCONVERT_SAT_F64(WASM_LOCAL_GET(0)));
   FOR_FLOAT64_INPUTS(i) {
     int32_t expected =
         is_inbounds<uint32_t>(i)
@@ -3303,7 +3319,7 @@ WASM_EXEC_TEST(I32UConvertSatF64) {
 
 WASM_EXEC_TEST(F64CopySign) {
   WasmRunner<double, double, double> r(execution_tier);
-  BUILD(r, WASM_F64_COPYSIGN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F64_COPYSIGN(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_FLOAT64_INPUTS(i) {
     FOR_FLOAT64_INPUTS(j) { CHECK_DOUBLE_EQ(copysign(i, j), r.Call(i, j)); }
@@ -3312,7 +3328,7 @@ WASM_EXEC_TEST(F64CopySign) {
 
 WASM_EXEC_TEST(F32CopySign) {
   WasmRunner<float, float, float> r(execution_tier);
-  BUILD(r, WASM_F32_COPYSIGN(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_F32_COPYSIGN(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   FOR_FLOAT32_INPUTS(i) {
     FOR_FLOAT32_INPUTS(j) { CHECK_FLOAT_EQ(copysignf(i, j), r.Call(i, j)); }
@@ -3358,7 +3374,7 @@ WASM_COMPILED_EXEC_TEST(Compile_Wasm_CallIndirect_Many_f64) {
 
 WASM_EXEC_TEST(Int32RemS_dead) {
   WasmRunner<int32_t, int32_t, int32_t> r(execution_tier);
-  BUILD(r, WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), WASM_DROP,
+  BUILD(r, WASM_I32_REMS(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), WASM_DROP,
         WASM_ZERO);
   const int32_t kMin = std::numeric_limits<int32_t>::min();
   CHECK_EQ(0, r.Call(133, 100));
@@ -3376,13 +3392,13 @@ WASM_EXEC_TEST(BrToLoopWithValue) {
         // loop i32
         kExprLoop, kI32Code,
         // decrement <0> by 3.
-        WASM_SET_LOCAL(0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V_1(3))),
+        WASM_LOCAL_SET(0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(3))),
         // decrement <1> by 1.
-        WASM_SET_LOCAL(1, WASM_I32_SUB(WASM_GET_LOCAL(1), WASM_ONE)),
+        WASM_LOCAL_SET(1, WASM_I32_SUB(WASM_LOCAL_GET(1), WASM_ONE)),
         // load return value <0>, br_if will drop if if the branch is taken.
-        WASM_GET_LOCAL(0),
+        WASM_LOCAL_GET(0),
         // continue loop if <1> is != 0.
-        WASM_BR_IF(0, WASM_GET_LOCAL(1)),
+        WASM_BR_IF(0, WASM_LOCAL_GET(1)),
         // end of loop, value loaded above is the return value.
         kExprEnd);
   CHECK_EQ(12, r.Call(27, 5));
@@ -3393,8 +3409,8 @@ WASM_EXEC_TEST(BrToLoopWithoutValue) {
   WasmRunner<int32_t, int32_t> r(execution_tier);
   BUILD(
       r, kExprLoop, kI32Code,                                        // loop i32
-      WASM_SET_LOCAL(0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_ONE)),  // dec <0>
-      WASM_BR_IF(0, WASM_GET_LOCAL(0)),  // br_if <0> != 0
+      WASM_LOCAL_SET(0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_ONE)),  // dec <0>
+      WASM_BR_IF(0, WASM_LOCAL_GET(0)),  // br_if <0> != 0
       kExprUnreachable,                  // unreachable
       kExprEnd);                         // end
   CHECK_TRAP32(r.Call(2));
@@ -3531,7 +3547,7 @@ void BinOpOnDifferentRegisters(
     for (int i = 0; i < num_locals; ++i) {
       ADD_CODE(
           init_locals_code,
-          WASM_SET_LOCAL(i, WASM_LOAD_MEM(type.machine_type(),
+          WASM_LOCAL_SET(i, WASM_LOAD_MEM(type.machine_type(),
                                           WASM_I32V_2(sizeof(ctype) * i))));
     }
     // {write_locals_code} is shared by all code generated in the loop below.
@@ -3541,7 +3557,7 @@ void BinOpOnDifferentRegisters(
       ADD_CODE(write_locals_code,
                WASM_STORE_MEM(type.machine_type(),
                               WASM_I32V_2(sizeof(ctype) * (i + 1)),
-                              WASM_GET_LOCAL(i)));
+                              WASM_LOCAL_GET(i)));
     }
     for (int lhs = 0; lhs < num_locals; ++lhs) {
       for (int rhs = 0; rhs < num_locals; ++rhs) {
@@ -3555,8 +3571,8 @@ void BinOpOnDifferentRegisters(
         ADD_CODE(code,
                  // Store the result of the binary operation at memory[0].
                  WASM_STORE_MEM(type.machine_type(), WASM_ZERO,
-                                WASM_BINOP(opcode, WASM_GET_LOCAL(lhs),
-                                           WASM_GET_LOCAL(rhs))),
+                                WASM_BINOP(opcode, WASM_LOCAL_GET(lhs),
+                                           WASM_LOCAL_GET(rhs))),
                  // Return 0.
                  WASM_ZERO);
         code.insert(code.end(), write_locals_code.begin(),
@@ -3759,14 +3775,14 @@ TEST(Liftoff_tier_up) {
   WasmRunner<int32_t, int32_t, int32_t> r(TestExecutionTier::kLiftoff);
 
   WasmFunctionCompiler& add = r.NewFunction<int32_t, int32_t, int32_t>("add");
-  BUILD(add, WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(add, WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   WasmFunctionCompiler& sub = r.NewFunction<int32_t, int32_t, int32_t>("sub");
-  BUILD(sub, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)));
+  BUILD(sub, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)));
 
   // Create the main function, which shall call {add}.
-  BUILD(r, WASM_CALL_FUNCTION(add.function_index(), WASM_GET_LOCAL(0),
-                              WASM_GET_LOCAL(1)));
+  BUILD(r, WASM_CALL_FUNCTION(add.function_index(), WASM_LOCAL_GET(0),
+                              WASM_LOCAL_GET(1)));
 
   NativeModule* native_module =
       r.builder().instance_object()->module_object().native_module();
diff --git a/deps/v8/test/cctest/wasm/test-streaming-compilation.cc b/deps/v8/test/cctest/wasm/test-streaming-compilation.cc
index 9bb5182cfa8b6a..863256818a3455 100644
--- a/deps/v8/test/cctest/wasm/test-streaming-compilation.cc
+++ b/deps/v8/test/cctest/wasm/test-streaming-compilation.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "include/libplatform/libplatform.h"
 #include "src/api/api-inl.h"
 #include "src/init/v8.h"
 #include "src/objects/managed.h"
@@ -38,7 +39,8 @@ class MockPlatform final : public TestPlatform {
   std::unique_ptr<v8::JobHandle> PostJob(
       v8::TaskPriority priority,
       std::unique_ptr<v8::JobTask> job_task) override {
-    auto orig_job_handle = TestPlatform::PostJob(priority, std::move(job_task));
+    auto orig_job_handle = v8::platform::NewDefaultJobHandle(
+        this, priority, std::move(job_task), 1);
     auto job_handle =
         std::make_unique<MockJobHandle>(std::move(orig_job_handle), this);
     job_handles_.insert(job_handle.get());
@@ -56,17 +58,13 @@ class MockPlatform final : public TestPlatform {
 
   bool IdleTasksEnabled(v8::Isolate* isolate) override { return false; }
 
-  void ExecuteTasks() {
-    for (auto* job_handle : job_handles_) {
-      if (job_handle->IsValid()) job_handle->Join();
-    }
-    task_runner_->ExecuteTasks();
-  }
+  void ExecuteTasks() { task_runner_->ExecuteTasks(); }
 
  private:
   class MockTaskRunner final : public TaskRunner {
    public:
     void PostTask(std::unique_ptr<v8::Task> task) override {
+      base::MutexGuard lock_scope(&tasks_lock_);
       tasks_.push(std::move(task));
     }
 
@@ -93,14 +91,23 @@ class MockPlatform final : public TestPlatform {
     bool NonNestableDelayedTasksEnabled() const override { return true; }
 
     void ExecuteTasks() {
-      while (!tasks_.empty()) {
-        std::unique_ptr<Task> task = std::move(tasks_.front());
-        tasks_.pop();
-        task->Run();
+      std::queue<std::unique_ptr<v8::Task>> tasks;
+      while (true) {
+        {
+          base::MutexGuard lock_scope(&tasks_lock_);
+          tasks.swap(tasks_);
+        }
+        if (tasks.empty()) break;
+        while (!tasks.empty()) {
+          std::unique_ptr<Task> task = std::move(tasks.front());
+          tasks.pop();
+          task->Run();
+        }
       }
     }
 
    private:
+    base::Mutex tasks_lock_;
     // We do not execute tasks concurrently, so we only need one list of tasks.
     std::queue<std::unique_ptr<v8::Task>> tasks_;
   };
@@ -123,9 +130,7 @@ class MockPlatform final : public TestPlatform {
     void Join() override { orig_handle_->Join(); }
     void Cancel() override { orig_handle_->Cancel(); }
     void CancelAndDetach() override { orig_handle_->CancelAndDetach(); }
-    bool IsCompleted() override { return orig_handle_->IsCompleted(); }
     bool IsActive() override { return orig_handle_->IsActive(); }
-    bool IsRunning() override { return orig_handle_->IsRunning(); }
     bool IsValid() override { return orig_handle_->IsValid(); }
 
    private:
diff --git a/deps/v8/test/cctest/wasm/test-wasm-breakpoints.cc b/deps/v8/test/cctest/wasm/test-wasm-breakpoints.cc
index 7e52bc84d74897..2d7b4024d7f15c 100644
--- a/deps/v8/test/cctest/wasm/test-wasm-breakpoints.cc
+++ b/deps/v8/test/cctest/wasm/test-wasm-breakpoints.cc
@@ -377,14 +377,14 @@ WASM_COMPILED_EXEC_TEST(WasmStepInAndOut) {
   // functions in the code section matches the function indexes.
 
   // return arg0
-  BUILD(runner, WASM_RETURN1(WASM_GET_LOCAL(0)));
+  BUILD(runner, WASM_RETURN1(WASM_LOCAL_GET(0)));
   // for (int i = 0; i < 10; ++i) { f2(i); }
   BUILD(f2, WASM_LOOP(
-                WASM_BR_IF(0, WASM_BINOP(kExprI32GeU, WASM_GET_LOCAL(0),
+                WASM_BR_IF(0, WASM_BINOP(kExprI32GeU, WASM_LOCAL_GET(0),
                                          WASM_I32V_1(10))),
-                WASM_SET_LOCAL(
-                    0, WASM_BINOP(kExprI32Sub, WASM_GET_LOCAL(0), WASM_ONE)),
-                WASM_CALL_FUNCTION(runner.function_index(), WASM_GET_LOCAL(0)),
+                WASM_LOCAL_SET(
+                    0, WASM_BINOP(kExprI32Sub, WASM_LOCAL_GET(0), WASM_ONE)),
+                WASM_CALL_FUNCTION(runner.function_index(), WASM_LOCAL_GET(0)),
                 WASM_DROP, WASM_BR(1)));
 
   Isolate* isolate = runner.main_isolate();
@@ -415,11 +415,11 @@ WASM_COMPILED_EXEC_TEST(WasmGetLocalsAndStack) {
 
   BUILD(runner,
         // set [1] to 17
-        WASM_SET_LOCAL(1, WASM_I64V_1(17)),
+        WASM_LOCAL_SET(1, WASM_I64V_1(17)),
         // set [2] to <arg0> = 7
-        WASM_SET_LOCAL(2, WASM_F32_SCONVERT_I32(WASM_GET_LOCAL(0))),
+        WASM_LOCAL_SET(2, WASM_F32_SCONVERT_I32(WASM_LOCAL_GET(0))),
         // set [3] to <arg1>/2 = 8.5
-        WASM_SET_LOCAL(3, WASM_F64_DIV(WASM_F64_SCONVERT_I64(WASM_GET_LOCAL(1)),
+        WASM_LOCAL_SET(3, WASM_F64_DIV(WASM_F64_SCONVERT_I64(WASM_LOCAL_GET(1)),
                                        WASM_F64(2))));
 
   Isolate* isolate = runner.main_isolate();
diff --git a/deps/v8/test/cctest/wasm/test-wasm-debug-evaluate.cc b/deps/v8/test/cctest/wasm/test-wasm-debug-evaluate.cc
deleted file mode 100644
index 8696a70b922376..00000000000000
--- a/deps/v8/test/cctest/wasm/test-wasm-debug-evaluate.cc
+++ /dev/null
@@ -1,575 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <initializer_list>
-
-#include "src/api/api-inl.h"
-#include "src/base/macros.h"
-#include "src/codegen/assembler-inl.h"
-#include "src/compiler/heap-refs.h"
-#include "src/debug/debug-evaluate.h"
-#include "src/debug/debug-interface.h"
-#include "src/diagnostics/disassembler.h"
-#include "src/execution/frames-inl.h"
-#include "src/execution/frames.h"
-#include "src/objects/js-objects.h"
-#include "src/objects/property-descriptor.h"
-#include "src/utils/utils.h"
-#include "src/utils/vector.h"
-#include "src/wasm/compilation-environment.h"
-#include "src/wasm/module-decoder.h"
-#include "src/wasm/value-type.h"
-#include "src/wasm/wasm-constants.h"
-#include "src/wasm/wasm-debug-evaluate.h"
-#include "src/wasm/wasm-debug.h"
-#include "src/wasm/wasm-module-builder.h"
-#include "src/wasm/wasm-module.h"
-#include "src/wasm/wasm-objects-inl.h"
-#include "src/wasm/wasm-opcodes.h"
-#include "src/wasm/wasm-tier.h"
-#include "test/cctest/cctest.h"
-#include "test/cctest/compiler/value-helper.h"
-#include "test/cctest/wasm/wasm-run-utils.h"
-#include "test/common/wasm/test-signatures.h"
-#include "test/common/wasm/wasm-macro-gen.h"
-
-namespace v8 {
-namespace internal {
-namespace wasm {
-
-static Handle<String> V8String(Isolate* isolate, const char* str) {
-  return isolate->factory()->NewStringFromAsciiChecked(str);
-}
-
-namespace {
-template <typename... FunctionArgsT>
-class TestCode {
- public:
-  TestCode(WasmRunnerBase* runner, std::initializer_list<byte> code,
-           std::initializer_list<ValueType::Kind> locals = {})
-      : compiler_(&runner->NewFunction<FunctionArgsT...>()),
-        code_(code),
-        locals_(static_cast<int32_t>(locals.size())) {
-    for (ValueType::Kind T : locals) {
-      compiler_->AllocateLocal(ValueType::Primitive(T));
-    }
-    compiler_->Build(code.begin(), code.end());
-  }
-
-  Handle<BreakPoint> BreakOnReturn(WasmRunnerBase* runner) {
-    runner->TierDown();
-    uint32_t return_idx = FindReturn();
-    uint32_t return_offset_in_function =
-        static_cast<uint32_t>(LEBHelper::sizeof_i32v(locals_)) + 2 * locals_ +
-        return_idx;
-
-    int function_index = compiler_->function_index();
-    int function_offset =
-        runner->builder().GetFunctionAt(function_index)->code.offset();
-    int return_offset_in_module = function_offset + return_offset_in_function;
-
-    Handle<WasmInstanceObject> instance = runner->builder().instance_object();
-    Handle<Script> script(instance->module_object().script(),
-                          runner->main_isolate());
-    static int break_index = 0;
-    Handle<BreakPoint> break_point =
-        runner->main_isolate()->factory()->NewBreakPoint(
-            break_index++, runner->main_isolate()->factory()->empty_string());
-
-    int expected_breakpoint_position = return_offset_in_module;
-    CHECK(WasmScript::SetBreakPoint(script, &return_offset_in_module,
-                                    break_point));
-    // Check that the breakpoint doesn't slide
-    DCHECK_EQ(expected_breakpoint_position, return_offset_in_module);
-    USE(expected_breakpoint_position);
-    return break_point;
-  }
-
-  MaybeHandle<Object> Run(WasmRunnerBase* runner) {
-    Isolate* isolate = runner->main_isolate();
-    Handle<JSFunction> fun_wrapper =
-        runner->builder().WrapCode(compiler_->function_index());
-    Handle<Object> global(isolate->context().global_object(), isolate);
-    return Execution::Call(isolate, fun_wrapper, global, 0, nullptr);
-  }
-
- private:
-  uint32_t FindReturn() const {
-    for (auto i = code_.begin(); i != code_.end();
-         i += OpcodeLength(&*i, &*code_.end())) {
-      if (*i == kExprReturn) {
-        return static_cast<uint32_t>(std::distance(code_.begin(), i));
-      }
-    }
-    UNREACHABLE();
-  }
-
-  WasmFunctionCompiler* compiler_;
-  std::vector<byte> code_;
-  int32_t locals_;
-};
-
-class WasmEvaluatorBuilder {
- public:
-  explicit WasmEvaluatorBuilder(TestExecutionTier execution_tier,
-                                uint32_t min_memory = 1,
-                                uint32_t max_memory = 1)
-      : zone_(&allocator_, ZONE_NAME), builder_(&zone_) {
-    get_memory_function_index = AddImport<void, uint32_t, uint32_t, uint32_t>(
-        CStrVector("__getMemory"));
-    get_local_function_index =
-        AddImport<void, uint32_t, uint32_t>(CStrVector("__getLocal"));
-    get_global_function_index =
-        AddImport<void, uint32_t, uint32_t>(CStrVector("__getGlobal"));
-    get_operand_function_index =
-        AddImport<void, uint32_t, uint32_t>(CStrVector("__getOperand"));
-    sbrk_function_index = AddImport<uint32_t, uint32_t>(CStrVector("__sbrk"));
-    wasm_format_function =
-        builder_.AddFunction(WasmRunnerBase::CreateSig<uint32_t>(&zone_));
-    wasm_format_function->SetName(CStrVector("wasm_format"));
-    builder_.AddExport(CStrVector("wasm_format"), wasm_format_function);
-    builder_.SetMinMemorySize(min_memory);
-    builder_.SetMaxMemorySize(max_memory);
-  }
-
-  template <typename ReturnT, typename... ArgTs>
-  uint32_t AddImport(Vector<const char> name) {
-    return builder_.AddImport(
-        name, WasmRunnerBase::CreateSig<ReturnT, ArgTs...>(&zone_),
-        CStrVector("env"));
-  }
-
-  void push_back(std::initializer_list<byte> code) {
-    wasm_format_function->EmitCode(code.begin(),
-                                   static_cast<uint32_t>(code.size()));
-  }
-
-  void CallSbrk(std::initializer_list<byte> args) {
-    push_back(args);
-    push_back({WASM_CALL_FUNCTION0(sbrk_function_index)});
-  }
-
-  void CallGetOperand(std::initializer_list<byte> args) {
-    push_back(args);
-    push_back({WASM_CALL_FUNCTION0(get_operand_function_index)});
-  }
-
-  void CallGetGlobal(std::initializer_list<byte> args) {
-    push_back(args);
-    push_back({WASM_CALL_FUNCTION0(get_global_function_index)});
-  }
-
-  void CallGetLocal(std::initializer_list<byte> args) {
-    push_back(args);
-    push_back({WASM_CALL_FUNCTION0(get_local_function_index)});
-  }
-
-  void CallGetMemory(std::initializer_list<byte> args) {
-    push_back(args);
-    push_back({WASM_CALL_FUNCTION0(get_memory_function_index)});
-  }
-
-  ZoneBuffer bytes() {
-    ZoneBuffer bytes(&zone_);
-    builder_.WriteTo(&bytes);
-    return bytes;
-  }
-
- private:
-  v8::internal::AccountingAllocator allocator_;
-  Zone zone_;
-  WasmModuleBuilder builder_;
-  uint32_t get_memory_function_index = 0;
-  uint32_t get_local_function_index = 0;
-  uint32_t get_global_function_index = 0;
-  uint32_t get_operand_function_index = 0;
-  uint32_t sbrk_function_index = 0;
-  WasmFunctionBuilder* wasm_format_function = nullptr;
-};
-
-class WasmBreakHandler : public debug::DebugDelegate {
- public:
-  struct EvaluationResult {
-    Maybe<std::string> result = Nothing<std::string>();
-    Maybe<std::string> error = Nothing<std::string>();
-  };
-
-  WasmBreakHandler(Isolate* isolate, ZoneBuffer evaluator_bytes)
-      : isolate_(isolate),
-        evaluator_bytes_(std::move(evaluator_bytes)),
-        result_(Nothing<EvaluationResult>()) {
-    v8::debug::SetDebugDelegate(reinterpret_cast<v8::Isolate*>(isolate_), this);
-  }
-
-  ~WasmBreakHandler() override {
-    v8::debug::SetDebugDelegate(reinterpret_cast<v8::Isolate*>(isolate_),
-                                nullptr);
-  }
-
-  const Maybe<EvaluationResult>& result() const { return result_; }
-
- private:
-  Isolate* isolate_;
-  ZoneBuffer evaluator_bytes_;
-  Maybe<EvaluationResult> result_;
-
-  Maybe<std::string> GetPendingExceptionAsString() {
-    if (!isolate_->has_pending_exception()) return Nothing<std::string>();
-    Handle<Object> exception(isolate_->pending_exception(), isolate_);
-    isolate_->clear_pending_exception();
-
-    Handle<String> exception_string;
-    if (!Object::ToString(isolate_, exception).ToHandle(&exception_string)) {
-      return Just<std::string>("");
-    }
-    return Just<std::string>(exception_string->ToCString().get());
-  }
-
-  void BreakProgramRequested(v8::Local<v8::Context> paused_context,
-                             const std::vector<int>&) override {
-    // Check the current position.
-    StackTraceFrameIterator frame_it(isolate_);
-
-    WasmFrame* frame = WasmFrame::cast(frame_it.frame());
-    Handle<WasmInstanceObject> instance{frame->wasm_instance(), isolate_};
-
-    MaybeHandle<String> result_handle = v8::internal::wasm::DebugEvaluate(
-        {evaluator_bytes_.begin(), evaluator_bytes_.size()}, instance,
-        frame_it.frame());
-
-    Maybe<std::string> error_message = GetPendingExceptionAsString();
-    Maybe<std::string> result_message =
-        result_handle.is_null()
-            ? Nothing<std::string>()
-            : Just<std::string>(
-                  result_handle.ToHandleChecked()->ToCString().get());
-
-    isolate_->clear_pending_exception();
-    result_ = Just<EvaluationResult>({result_message, error_message});
-  }
-};
-
-class WasmJSBreakHandler : public debug::DebugDelegate {
- public:
-  struct EvaluationResult {
-    Maybe<std::string> result = Nothing<std::string>();
-    Maybe<std::string> error = Nothing<std::string>();
-  };
-
-  WasmJSBreakHandler(Isolate* isolate, Handle<String> snippet)
-      : isolate_(isolate),
-        snippet_(snippet),
-        result_(Nothing<EvaluationResult>()) {
-    v8::debug::SetDebugDelegate(reinterpret_cast<v8::Isolate*>(isolate_), this);
-  }
-
-  ~WasmJSBreakHandler() override {
-    v8::debug::SetDebugDelegate(reinterpret_cast<v8::Isolate*>(isolate_),
-                                nullptr);
-  }
-
-  const Maybe<EvaluationResult>& result() const { return result_; }
-
- private:
-  Isolate* isolate_;
-  Handle<String> snippet_;
-  Maybe<EvaluationResult> result_;
-
-  Maybe<std::string> GetPendingExceptionAsString() const {
-    if (!isolate_->has_pending_exception()) return Nothing<std::string>();
-    Handle<Object> exception(isolate_->pending_exception(), isolate_);
-    isolate_->clear_pending_exception();
-
-    Handle<String> exception_string;
-    if (!Object::ToString(isolate_, exception).ToHandle(&exception_string)) {
-      return Just<std::string>("");
-    }
-    return Just<std::string>(exception_string->ToCString().get());
-  }
-
-  Maybe<std::string> GetResultAsString(MaybeHandle<Object> result) const {
-    Handle<Object> just_result;
-    if (!result.ToHandle(&just_result)) return Nothing<std::string>();
-    MaybeHandle<String> maybe_string = Object::ToString(isolate_, just_result);
-    Handle<String> just_string;
-    if (!maybe_string.ToHandle(&just_string)) return Nothing<std::string>();
-    return Just<std::string>(just_string->ToCString().get());
-  }
-
-  void BreakProgramRequested(v8::Local<v8::Context> paused_context,
-                             const std::vector<int>&) override {
-    StackTraceFrameIterator frame_it(isolate_);
-
-    WasmFrame* frame = WasmFrame::cast(frame_it.frame());
-    Handle<WasmInstanceObject> instance{frame->wasm_instance(), isolate_};
-
-    MaybeHandle<Object> result_handle = DebugEvaluate::WebAssembly(
-        instance, frame_it.frame()->id(), snippet_, false);
-
-    Maybe<std::string> error_message = GetPendingExceptionAsString();
-    Maybe<std::string> result_message = GetResultAsString(result_handle);
-
-    isolate_->clear_pending_exception();
-    result_ = Just<EvaluationResult>({result_message, error_message});
-  }
-};
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_CompileFailed) {
-  WasmRunner<int> runner(execution_tier);
-
-  TestCode<int> code(&runner, {WASM_RETURN1(WASM_I32V_1(32))});
-  code.BreakOnReturn(&runner);
-
-  WasmEvaluatorBuilder evaluator(execution_tier);
-  // Create a module that doesn't compile by missing the END bytecode.
-  evaluator.push_back({WASM_RETURN1(WASM_I32V_1(33))});
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, evaluator.bytes());
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.result.IsNothing());
-  CHECK_NE(result.error.ToChecked().find(
-               "function body must end with \"end\" opcode"),
-           std::string::npos);
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_MissingEntrypoint) {
-  WasmRunner<int> runner(execution_tier);
-
-  TestCode<int> code(&runner, {WASM_RETURN1(WASM_I32V_1(32))});
-  code.BreakOnReturn(&runner);
-
-  v8::internal::AccountingAllocator allocator;
-  Zone zone(&allocator, ZONE_NAME);
-  WasmModuleBuilder evaluator(&zone);
-  ZoneBuffer evaluator_bytes(&zone);
-  evaluator.WriteTo(&evaluator_bytes);
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, std::move(evaluator_bytes));
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.result.IsNothing());
-  CHECK_NE(result.error.ToChecked().find("Missing export: \"wasm_format\""),
-           std::string::npos);
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_ExecuteFailed_SEGV) {
-  WasmRunner<int> runner(execution_tier);
-  runner.builder().AddMemoryElems<int32_t>(64);
-
-  TestCode<int> code(&runner, {WASM_RETURN1(WASM_I32V_1(32))});
-
-  // Use a max memory size of 2 here to verify the precondition for the
-  // GrowMemory test below.
-  WasmEvaluatorBuilder evaluator(execution_tier, 1, 2);
-  code.BreakOnReturn(&runner);
-
-  // Load 1 byte from an address that's too high.
-  evaluator.CallGetMemory(
-      {WASM_I32V_1(32), WASM_I32V_1(1), WASM_I32V_3((1 << 16) + 1)});
-  evaluator.push_back({WASM_RETURN1(WASM_I32V_1(33)), WASM_END});
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, evaluator.bytes());
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.result.IsNothing());
-  CHECK_NE(
-      result.error.ToChecked().find("Illegal access to out-of-bounds memory"),
-      std::string::npos);
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_GrowMemory) {
-  WasmRunner<int> runner(execution_tier);
-  runner.builder().AddMemoryElems<int32_t>(64);
-
-  TestCode<int> code(
-      &runner,
-      {WASM_STORE_MEM(MachineType::Int32(), WASM_I32V_1(32), WASM_I32V_2('A')),
-       WASM_RETURN1(WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V_1(32)))});
-  code.BreakOnReturn(&runner);
-
-  WasmEvaluatorBuilder evaluator(execution_tier, 1, 2);
-  // Grow the memory.
-  evaluator.CallSbrk({WASM_I32V_1(1)});
-  // Load 1 byte from an address that's too high for the default memory.
-  evaluator.CallGetMemory(
-      {WASM_I32V_1(32), WASM_I32V_1(1), WASM_I32V_3((1 << 16) + 1)});
-  evaluator.push_back({WASM_RETURN1(WASM_I32V_3((1 << 16) + 1)), WASM_END});
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, evaluator.bytes());
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.error.IsNothing());
-  CHECK_EQ(result.result.ToChecked(), "A");
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_LinearMemory) {
-  WasmRunner<int> runner(execution_tier);
-  runner.builder().AddMemoryElems<int32_t>(64);
-
-  TestCode<int> code(
-      &runner,
-      {WASM_STORE_MEM(MachineType::Int32(), WASM_I32V_1(32), WASM_I32V_2('A')),
-       WASM_RETURN1(WASM_LOAD_MEM(MachineType::Int32(), WASM_I32V_1(32)))});
-  code.BreakOnReturn(&runner);
-
-  WasmEvaluatorBuilder evaluator(execution_tier);
-  // Load 4 bytes from debuggee memory at address 32, and store at the offset 33
-  // of the linear memory.
-  evaluator.CallGetMemory({WASM_I32V_1(32), WASM_I32V_1(4), WASM_I32V_1(33)});
-  evaluator.push_back({WASM_RETURN1(WASM_I32V_1(33)), WASM_END});
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, evaluator.bytes());
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.error.IsNothing());
-  CHECK_EQ(result.result.ToChecked(), "A");
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_Locals) {
-  WasmRunner<int> runner(execution_tier);
-  runner.builder().AddMemoryElems<int32_t>(64);
-
-  TestCode<int> code(
-      &runner,
-      {WASM_SET_LOCAL(0, WASM_I32V_2('A')), WASM_RETURN1(WASM_GET_LOCAL(0))},
-      {ValueType::kI32});
-  code.BreakOnReturn(&runner);
-
-  WasmEvaluatorBuilder evaluator(execution_tier);
-  evaluator.CallGetLocal({WASM_I32V_1(0), WASM_I32V_1(33)});
-  evaluator.push_back({WASM_RETURN1(WASM_I32V_1(33)), WASM_END});
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, evaluator.bytes());
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.error.IsNothing());
-  CHECK_EQ(result.result.ToChecked(), "A");
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_Globals) {
-  WasmRunner<int> runner(execution_tier);
-  runner.builder().AddMemoryElems<int32_t>(64);
-  runner.builder().AddGlobal<int32_t>();
-  runner.builder().AddGlobal<int32_t>();
-
-  TestCode<void> code(&runner,
-                      {WASM_SET_GLOBAL(0, WASM_I32V_1('4')),
-                       WASM_SET_GLOBAL(1, WASM_I32V_1('5')), WASM_RETURN0},
-                      {});
-  code.BreakOnReturn(&runner);
-
-  WasmEvaluatorBuilder evaluator(execution_tier);
-  evaluator.CallGetGlobal({WASM_I32V_1(0), WASM_I32V_1(33)});
-  evaluator.CallGetGlobal({WASM_I32V_1(1), WASM_I32V_1(34)});
-  evaluator.push_back({WASM_RETURN1(WASM_I32V_1(33)), WASM_END});
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, evaluator.bytes());
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.error.IsNothing());
-  CHECK_EQ(result.result.ToChecked(), "45");
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_Operands) {
-  WasmRunner<int> runner(execution_tier);
-  runner.builder().AddMemoryElems<int32_t>(64);
-
-  TestCode<int> code(&runner,
-                     {WASM_SET_LOCAL(0, WASM_I32V_1('4')), WASM_GET_LOCAL(0),
-                      WASM_RETURN1(WASM_I32V_1('5'))},
-                     {ValueType::kI32});
-  code.BreakOnReturn(&runner);
-
-  WasmEvaluatorBuilder evaluator(execution_tier);
-  evaluator.CallGetOperand({WASM_I32V_1(0), WASM_I32V_1(33)});
-  evaluator.CallGetOperand({WASM_I32V_1(1), WASM_I32V_1(34)});
-  evaluator.push_back({WASM_RETURN1(WASM_I32V_1(33)), WASM_END});
-
-  Isolate* isolate = runner.main_isolate();
-  WasmBreakHandler break_handler(isolate, evaluator.bytes());
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK(result.error.IsNothing());
-  CHECK_EQ(result.result.ToChecked(), "45");
-}
-
-WASM_COMPILED_EXEC_TEST(WasmDebugEvaluate_JavaScript) {
-  WasmRunner<int> runner(execution_tier);
-  runner.builder().AddGlobal<int32_t>();
-  runner.builder().AddMemoryElems<int32_t>(64);
-  uint16_t index = 0;
-  runner.builder().AddIndirectFunctionTable(&index, 1);
-
-  TestCode<int64_t> code(
-      &runner,
-      {WASM_SET_GLOBAL(0, WASM_I32V_2('B')),
-       WASM_SET_LOCAL(0, WASM_I64V_2('A')), WASM_RETURN1(WASM_GET_LOCAL(0))},
-      {ValueType::kI64});
-  code.BreakOnReturn(&runner);
-
-  Isolate* isolate = runner.main_isolate();
-  Handle<String> snippet =
-      V8String(isolate,
-               "JSON.stringify(["
-               "$global0, "
-               "$table0, "
-               "$var0, "
-               "$main, "
-               "$memory0, "
-               "globals[0], "
-               "tables[0], "
-               "locals[0], "
-               "functions[0], "
-               "memories[0], "
-               "memories, "
-               "tables, "
-               "stack, "
-               "imports, "
-               "exports, "
-               "globals, "
-               "locals, "
-               "functions, "
-               "], (k, v) => k === 'at' || typeof v === 'undefined' || typeof "
-               "v === 'object' ? v : v.toString())");
-
-  WasmJSBreakHandler break_handler(isolate, snippet);
-  CHECK(!code.Run(&runner).is_null());
-
-  WasmJSBreakHandler::EvaluationResult result =
-      break_handler.result().ToChecked();
-  CHECK_WITH_MSG(result.error.IsNothing(), result.error.ToChecked().c_str());
-  CHECK_EQ(result.result.ToChecked(),
-           "[\"66\",{},\"65\",\"function 0() { [native code] }\",{},"
-           "\"66\",{},\"65\",\"function 0() { [native code] }\",{},"
-           "{},{},{\"0\":\"65\"},{},{},{},{},{}]");
-}
-
-}  // namespace
-}  // namespace wasm
-}  // namespace internal
-}  // namespace v8
diff --git a/deps/v8/test/cctest/wasm/test-wasm-metrics.cc b/deps/v8/test/cctest/wasm/test-wasm-metrics.cc
index 03e9ea420cf518..2c49e2de81f7d4 100644
--- a/deps/v8/test/cctest/wasm/test-wasm-metrics.cc
+++ b/deps/v8/test/cctest/wasm/test-wasm-metrics.cc
@@ -4,6 +4,7 @@
 
 #include <memory>
 
+#include "include/libplatform/libplatform.h"
 #include "include/v8-metrics.h"
 #include "src/api/api-inl.h"
 #include "src/wasm/wasm-module-builder.h"
@@ -33,7 +34,8 @@ class MockPlatform final : public TestPlatform {
   std::unique_ptr<v8::JobHandle> PostJob(
       v8::TaskPriority priority,
       std::unique_ptr<v8::JobTask> job_task) override {
-    auto orig_job_handle = TestPlatform::PostJob(priority, std::move(job_task));
+    auto orig_job_handle = v8::platform::NewDefaultJobHandle(
+        this, priority, std::move(job_task), 1);
     auto job_handle =
         std::make_unique<MockJobHandle>(std::move(orig_job_handle), this);
     job_handles_.insert(job_handle.get());
@@ -52,9 +54,6 @@ class MockPlatform final : public TestPlatform {
   bool IdleTasksEnabled(v8::Isolate* isolate) override { return false; }
 
   void ExecuteTasks() {
-    for (auto* job_handle : job_handles_) {
-      if (job_handle->IsValid()) job_handle->Join();
-    }
     task_runner_->ExecuteTasks();
   }
 
@@ -90,14 +89,17 @@ class MockPlatform final : public TestPlatform {
 
     void ExecuteTasks() {
       std::queue<std::unique_ptr<v8::Task>> tasks;
-      {
-        base::MutexGuard lock_scope(&tasks_lock_);
-        tasks.swap(tasks_);
-      }
-      while (!tasks.empty()) {
-        std::unique_ptr<Task> task = std::move(tasks.front());
-        tasks.pop();
-        task->Run();
+      while (true) {
+        {
+          base::MutexGuard lock_scope(&tasks_lock_);
+          tasks.swap(tasks_);
+        }
+        if (tasks.empty()) break;
+        while (!tasks.empty()) {
+          std::unique_ptr<Task> task = std::move(tasks.front());
+          tasks.pop();
+          task->Run();
+        }
       }
     }
 
@@ -125,9 +127,7 @@ class MockPlatform final : public TestPlatform {
     void Join() override { orig_handle_->Join(); }
     void Cancel() override { orig_handle_->Cancel(); }
     void CancelAndDetach() override { orig_handle_->CancelAndDetach(); }
-    bool IsRunning() override { return orig_handle_->IsRunning(); }
     bool IsValid() override { return orig_handle_->IsValid(); }
-    bool IsCompleted() override { return orig_handle_->IsCompleted(); }
     bool IsActive() override { return orig_handle_->IsActive(); }
 
    private:
diff --git a/deps/v8/test/cctest/wasm/test-wasm-serialization.cc b/deps/v8/test/cctest/wasm/test-wasm-serialization.cc
index 225f485b6eb081..2a0f441eb7f092 100644
--- a/deps/v8/test/cctest/wasm/test-wasm-serialization.cc
+++ b/deps/v8/test/cctest/wasm/test-wasm-serialization.cc
@@ -41,7 +41,7 @@ class WasmSerializationTest {
     TestSignatures sigs;
 
     WasmFunctionBuilder* f = builder->AddFunction(sigs.i_i());
-    byte code[] = {WASM_GET_LOCAL(0), kExprI32Const, 1, kExprI32Add, kExprEnd};
+    byte code[] = {WASM_LOCAL_GET(0), kExprI32Const, 1, kExprI32Add, kExprEnd};
     f->EmitCode(code, sizeof(code));
     builder->AddExport(CStrVector(kFunctionName), f);
 
@@ -81,7 +81,7 @@ class WasmSerializationTest {
     Handle<WasmModuleObject> module_object;
     CHECK(Deserialize().ToHandle(&module_object));
     {
-      DisallowHeapAllocation assume_no_gc;
+      DisallowGarbageCollection assume_no_gc;
       Vector<const byte> deserialized_module_wire_bytes =
           module_object->native_module()->wire_bytes();
       CHECK_EQ(deserialized_module_wire_bytes.size(), wire_bytes_.size());
@@ -341,6 +341,7 @@ TEST(TierDownAfterDeserialization) {
   CHECK_EQ(1, native_module->module()->functions.size());
   WasmCodeRefScope code_ref_scope;
   auto* turbofan_code = native_module->GetCode(0);
+  CHECK_NOT_NULL(turbofan_code);
   CHECK_EQ(ExecutionTier::kTurbofan, turbofan_code->tier());
 
   isolate->wasm_engine()->TierDownAllModulesPerIsolate(isolate);
diff --git a/deps/v8/test/cctest/wasm/wasm-run-utils.cc b/deps/v8/test/cctest/wasm/wasm-run-utils.cc
index f15d383386c99a..2657d7e9a7d9a1 100644
--- a/deps/v8/test/cctest/wasm/wasm-run-utils.cc
+++ b/deps/v8/test/cctest/wasm/wasm-run-utils.cc
@@ -23,7 +23,6 @@ TestingModuleBuilder::TestingModuleBuilder(
     TestExecutionTier tier, RuntimeExceptionSupport exception_support,
     LowerSimd lower_simd)
     : test_module_(std::make_shared<WasmModule>()),
-      test_module_ptr_(test_module_.get()),
       isolate_(CcTest::InitIsolateOnce()),
       enabled_features_(WasmFeatures::FromIsolate(isolate_)),
       execution_tier_(tier),
@@ -73,7 +72,7 @@ TestingModuleBuilder::TestingModuleBuilder(
 
   if (tier == TestExecutionTier::kInterpreter) {
     interpreter_ = std::make_unique<WasmInterpreter>(
-        isolate_, test_module_ptr_,
+        isolate_, test_module_.get(),
         ModuleWireBytes{native_module_->wire_bytes()}, instance_object_);
   }
 }
@@ -312,7 +311,7 @@ CompilationEnv TestingModuleBuilder::CreateCompilationEnv() {
   // trap_handler::IsTrapHandlerEnabled().
   const bool is_trap_handler_enabled =
       V8_TRAP_HANDLER_SUPPORTED && i::FLAG_wasm_trap_handler;
-  return {test_module_ptr_,
+  return {test_module_.get(),
           is_trap_handler_enabled ? kUseTrapHandler : kNoTrapHandler,
           runtime_exception_support_, enabled_features_, lower_simd()};
 }
@@ -336,8 +335,9 @@ Handle<WasmInstanceObject> TestingModuleBuilder::InitInstanceObject() {
   auto native_module = isolate_->wasm_engine()->NewNativeModule(
       isolate_, enabled_features_, test_module_, code_size_estimate);
   native_module->SetWireBytes(OwnedVector<const uint8_t>());
-  Handle<Script> script =
-      isolate_->wasm_engine()->GetOrCreateScript(isolate_, native_module);
+  constexpr Vector<const char> kNoSourceUrl{"", 0};
+  Handle<Script> script = isolate_->wasm_engine()->GetOrCreateScript(
+      isolate_, native_module, kNoSourceUrl);
 
   Handle<WasmModuleObject> module_object =
       WasmModuleObject::New(isolate_, std::move(native_module), script);
@@ -558,7 +558,13 @@ void WasmFunctionCompiler::Build(const byte* start, const byte* end) {
   WasmCode* code = native_module->PublishCode(
       native_module->AddCompiledCode(std::move(result)));
   DCHECK_NOT_NULL(code);
-  if (WasmCode::ShouldBeLogged(isolate())) code->LogCode(isolate());
+  DisallowGarbageCollection no_gc;
+  Script script = builder_->instance_object()->module_object().script();
+  std::unique_ptr<char[]> source_url =
+      String::cast(script.source_url()).ToCString();
+  if (WasmCode::ShouldBeLogged(isolate())) {
+    code->LogCode(isolate(), source_url.get(), script.id());
+  }
 }
 
 WasmFunctionCompiler::WasmFunctionCompiler(Zone* zone, const FunctionSig* sig,
diff --git a/deps/v8/test/cctest/wasm/wasm-run-utils.h b/deps/v8/test/cctest/wasm/wasm-run-utils.h
index 5c64c2f4682f8c..eeb29acf81dcf2 100644
--- a/deps/v8/test/cctest/wasm/wasm-run-utils.h
+++ b/deps/v8/test/cctest/wasm/wasm-run-utils.h
@@ -187,6 +187,8 @@ class TestingModuleBuilder {
 
   void SetHasSharedMemory() { test_module_->has_shared_memory = true; }
 
+  void SetMemory64() { test_module_->is_memory64 = true; }
+
   enum FunctionType { kImport, kWasm };
   uint32_t AddFunction(const FunctionSig* sig, const char* name,
                        FunctionType type);
@@ -254,9 +256,10 @@ class TestingModuleBuilder {
     return runtime_exception_support_;
   }
 
+  void EnableFeature(WasmFeature feature) { enabled_features_.Add(feature); }
+
  private:
   std::shared_ptr<WasmModule> test_module_;
-  WasmModule* test_module_ptr_;
   Isolate* isolate_;
   WasmFeatures enabled_features_;
   uint32_t global_offset = 0;
@@ -388,6 +391,15 @@ class WasmRunnerBase : public InitializedHandleScope {
                  runtime_exception_support, lower_simd),
         wrapper_(&zone_, num_params) {}
 
+  static void SetUpTrapCallback() {
+    WasmRunnerBase::trap_happened = false;
+    auto trap_callback = []() -> void {
+      WasmRunnerBase::trap_happened = true;
+      set_trap_callback_for_testing(nullptr);
+    };
+    set_trap_callback_for_testing(trap_callback);
+  }
+
   // Builds a graph from the given Wasm code and generates the machine
   // code and call wrapper for that graph. This method must not be called
   // more than once.
@@ -447,11 +459,49 @@ class WasmRunnerBase : public InitializedHandleScope {
     return CreateSig(zone, MachineTypeForC<ReturnType>(), param_vec);
   }
 
+  void CheckCallApplyViaJS(double expected, uint32_t function_index,
+                           Handle<Object>* buffer, int count) {
+    Isolate* isolate = builder_.isolate();
+    SetUpTrapCallback();
+    if (jsfuncs_.size() <= function_index) {
+      jsfuncs_.resize(function_index + 1);
+    }
+    if (jsfuncs_[function_index].is_null()) {
+      jsfuncs_[function_index] = builder_.WrapCode(function_index);
+    }
+    Handle<JSFunction> jsfunc = jsfuncs_[function_index];
+    Handle<Object> global(isolate->context().global_object(), isolate);
+    MaybeHandle<Object> retval =
+        Execution::TryCall(isolate, jsfunc, global, count, buffer,
+                           Execution::MessageHandling::kReport, nullptr);
+
+    if (retval.is_null() || WasmRunnerBase::trap_happened) {
+      CHECK_EQ(expected, static_cast<double>(0xDEADBEEF));
+    } else {
+      Handle<Object> result = retval.ToHandleChecked();
+      if (result->IsSmi()) {
+        CHECK_EQ(expected, Smi::ToInt(*result));
+      } else {
+        CHECK(result->IsHeapNumber());
+        CHECK_DOUBLE_EQ(expected, HeapNumber::cast(*result).value());
+      }
+    }
+
+    if (builder_.interpret()) {
+      CHECK_GT(builder_.interpreter()->NumInterpretedCalls(), 0);
+    }
+  }
+
+  Handle<Code> GetWrapperCode() { return wrapper_.GetWrapperCode(); }
+
  private:
   static FunctionSig* CreateSig(Zone* zone, MachineType return_type,
                                 Vector<MachineType> param_types);
 
  protected:
+  wasm::WasmCodeRefScope code_ref_scope_;
+  std::vector<Handle<JSFunction>> jsfuncs_;
+
   v8::internal::AccountingAllocator allocator_;
   Zone zone_;
   TestingModuleBuilder builder_;
@@ -461,6 +511,16 @@ class WasmRunnerBase : public InitializedHandleScope {
   bool possible_nondeterminism_ = false;
   int32_t main_fn_index_ = 0;
 
+  static void SetThreadInWasmFlag() {
+    *reinterpret_cast<int*>(trap_handler::GetThreadInWasmThreadLocalAddress()) =
+        true;
+  }
+
+  static void ClearThreadInWasmFlag() {
+    *reinterpret_cast<int*>(trap_handler::GetThreadInWasmThreadLocalAddress()) =
+        false;
+  }
+
  public:
   // This field has to be static. Otherwise, gcc complains about the use in
   // the lambda context below.
@@ -492,15 +552,6 @@ class WasmRunner : public WasmRunnerBase {
       : WasmRunner(execution_tier, nullptr, "main", kNoRuntimeExceptionSupport,
                    lower_simd) {}
 
-  void SetUpTrapCallback() {
-    WasmRunnerBase::trap_happened = false;
-    auto trap_callback = []() -> void {
-      WasmRunnerBase::trap_happened = true;
-      set_trap_callback_for_testing(nullptr);
-    };
-    set_trap_callback_for_testing(trap_callback);
-  }
-
   ReturnType Call(ParamTypes... p) {
     DCHECK(compiled_);
     if (interpret()) return CallInterpreter(p...);
@@ -549,39 +600,6 @@ class WasmRunner : public WasmRunnerBase {
     }
   }
 
-  void CheckCallApplyViaJS(double expected, uint32_t function_index,
-                           Handle<Object>* buffer, int count) {
-    Isolate* isolate = builder_.isolate();
-    SetUpTrapCallback();
-    if (jsfuncs_.size() <= function_index) {
-      jsfuncs_.resize(function_index + 1);
-    }
-    if (jsfuncs_[function_index].is_null()) {
-      jsfuncs_[function_index] = builder_.WrapCode(function_index);
-    }
-    Handle<JSFunction> jsfunc = jsfuncs_[function_index];
-    Handle<Object> global(isolate->context().global_object(), isolate);
-    MaybeHandle<Object> retval =
-        Execution::TryCall(isolate, jsfunc, global, count, buffer,
-                           Execution::MessageHandling::kReport, nullptr);
-
-    if (retval.is_null() || WasmRunnerBase::trap_happened) {
-      CHECK_EQ(expected, static_cast<double>(0xDEADBEEF));
-    } else {
-      Handle<Object> result = retval.ToHandleChecked();
-      if (result->IsSmi()) {
-        CHECK_EQ(expected, Smi::ToInt(*result));
-      } else {
-        CHECK(result->IsHeapNumber());
-        CHECK_DOUBLE_EQ(expected, HeapNumber::cast(*result).value());
-      }
-    }
-
-    if (builder_.interpret()) {
-      CHECK_GT(builder_.interpreter()->NumInterpretedCalls(), 0);
-    }
-  }
-
   void CheckCallViaJS(double expected, ParamTypes... p) {
     Isolate* isolate = builder_.isolate();
     // MSVC doesn't allow empty arrays, so include a dummy at the end.
@@ -593,29 +611,6 @@ class WasmRunner : public WasmRunnerBase {
   void CheckCallViaJSTraps(ParamTypes... p) {
     CheckCallViaJS(static_cast<double>(0xDEADBEEF), p...);
   }
-
-  void CheckUsedExecutionTier(TestExecutionTier expected_tier) {
-    // Liftoff can fail and fallback to Turbofan, so check that the function
-    // gets compiled by the tier requested, to guard against accidental success.
-    CHECK(compiled_);
-    CHECK_EQ(expected_tier, builder_.GetFunctionCode(0)->tier());
-  }
-
-  Handle<Code> GetWrapperCode() { return wrapper_.GetWrapperCode(); }
-
- private:
-  wasm::WasmCodeRefScope code_ref_scope_;
-  std::vector<Handle<JSFunction>> jsfuncs_;
-
-  void SetThreadInWasmFlag() {
-    *reinterpret_cast<int*>(trap_handler::GetThreadInWasmThreadLocalAddress()) =
-        true;
-  }
-
-  void ClearThreadInWasmFlag() {
-    *reinterpret_cast<int*>(trap_handler::GetThreadInWasmThreadLocalAddress()) =
-        false;
-  }
 };
 
 // A macro to define tests that run in different engine configurations.
diff --git a/deps/v8/test/common/flag-utils.h b/deps/v8/test/common/flag-utils.h
index 04ee44cb1c5ce0..1fef842772307f 100644
--- a/deps/v8/test/common/flag-utils.h
+++ b/deps/v8/test/common/flag-utils.h
@@ -9,7 +9,7 @@ namespace v8 {
 namespace internal {
 
 template <typename T>
-class FlagScope {
+class V8_NODISCARD FlagScope {
  public:
   FlagScope(T* flag, T new_value) : flag_(flag), previous_value_(*flag) {
     *flag = new_value;
diff --git a/deps/v8/test/common/wasm/flag-utils.h b/deps/v8/test/common/wasm/flag-utils.h
index 115c6033b182e9..8b1947034495a4 100644
--- a/deps/v8/test/common/wasm/flag-utils.h
+++ b/deps/v8/test/common/wasm/flag-utils.h
@@ -15,7 +15,7 @@ namespace internal {
 
 namespace wasm {
 
-class WasmFeatureScope {
+class V8_NODISCARD WasmFeatureScope {
  public:
   explicit WasmFeatureScope(WasmFeatures* features, WasmFeature feature,
                             bool val = true)
diff --git a/deps/v8/test/common/wasm/wasm-interpreter.cc b/deps/v8/test/common/wasm/wasm-interpreter.cc
index cdbcff8b41fdac..e58e518e8d7978 100644
--- a/deps/v8/test/common/wasm/wasm-interpreter.cc
+++ b/deps/v8/test/common/wasm/wasm-interpreter.cc
@@ -193,7 +193,7 @@ namespace {
 constexpr uint32_t kFloat32SignBitMask = uint32_t{1} << 31;
 constexpr uint64_t kFloat64SignBitMask = uint64_t{1} << 63;
 
-inline int32_t ExecuteI32DivS(int32_t a, int32_t b, TrapReason* trap) {
+int32_t ExecuteI32DivS(int32_t a, int32_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapDivByZero;
     return 0;
@@ -205,7 +205,7 @@ inline int32_t ExecuteI32DivS(int32_t a, int32_t b, TrapReason* trap) {
   return a / b;
 }
 
-inline uint32_t ExecuteI32DivU(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32DivU(uint32_t a, uint32_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapDivByZero;
     return 0;
@@ -213,7 +213,7 @@ inline uint32_t ExecuteI32DivU(uint32_t a, uint32_t b, TrapReason* trap) {
   return a / b;
 }
 
-inline int32_t ExecuteI32RemS(int32_t a, int32_t b, TrapReason* trap) {
+int32_t ExecuteI32RemS(int32_t a, int32_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapRemByZero;
     return 0;
@@ -222,7 +222,7 @@ inline int32_t ExecuteI32RemS(int32_t a, int32_t b, TrapReason* trap) {
   return a % b;
 }
 
-inline uint32_t ExecuteI32RemU(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32RemU(uint32_t a, uint32_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapRemByZero;
     return 0;
@@ -230,19 +230,19 @@ inline uint32_t ExecuteI32RemU(uint32_t a, uint32_t b, TrapReason* trap) {
   return a % b;
 }
 
-inline uint32_t ExecuteI32Shl(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32Shl(uint32_t a, uint32_t b, TrapReason* trap) {
   return a << (b & 0x1F);
 }
 
-inline uint32_t ExecuteI32ShrU(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32ShrU(uint32_t a, uint32_t b, TrapReason* trap) {
   return a >> (b & 0x1F);
 }
 
-inline int32_t ExecuteI32ShrS(int32_t a, int32_t b, TrapReason* trap) {
+int32_t ExecuteI32ShrS(int32_t a, int32_t b, TrapReason* trap) {
   return a >> (b & 0x1F);
 }
 
-inline int64_t ExecuteI64DivS(int64_t a, int64_t b, TrapReason* trap) {
+int64_t ExecuteI64DivS(int64_t a, int64_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapDivByZero;
     return 0;
@@ -254,7 +254,7 @@ inline int64_t ExecuteI64DivS(int64_t a, int64_t b, TrapReason* trap) {
   return a / b;
 }
 
-inline uint64_t ExecuteI64DivU(uint64_t a, uint64_t b, TrapReason* trap) {
+uint64_t ExecuteI64DivU(uint64_t a, uint64_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapDivByZero;
     return 0;
@@ -262,7 +262,7 @@ inline uint64_t ExecuteI64DivU(uint64_t a, uint64_t b, TrapReason* trap) {
   return a / b;
 }
 
-inline int64_t ExecuteI64RemS(int64_t a, int64_t b, TrapReason* trap) {
+int64_t ExecuteI64RemS(int64_t a, int64_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapRemByZero;
     return 0;
@@ -271,7 +271,7 @@ inline int64_t ExecuteI64RemS(int64_t a, int64_t b, TrapReason* trap) {
   return a % b;
 }
 
-inline uint64_t ExecuteI64RemU(uint64_t a, uint64_t b, TrapReason* trap) {
+uint64_t ExecuteI64RemU(uint64_t a, uint64_t b, TrapReason* trap) {
   if (b == 0) {
     *trap = kTrapRemByZero;
     return 0;
@@ -279,61 +279,57 @@ inline uint64_t ExecuteI64RemU(uint64_t a, uint64_t b, TrapReason* trap) {
   return a % b;
 }
 
-inline uint64_t ExecuteI64Shl(uint64_t a, uint64_t b, TrapReason* trap) {
+uint64_t ExecuteI64Shl(uint64_t a, uint64_t b, TrapReason* trap) {
   return a << (b & 0x3F);
 }
 
-inline uint64_t ExecuteI64ShrU(uint64_t a, uint64_t b, TrapReason* trap) {
+uint64_t ExecuteI64ShrU(uint64_t a, uint64_t b, TrapReason* trap) {
   return a >> (b & 0x3F);
 }
 
-inline int64_t ExecuteI64ShrS(int64_t a, int64_t b, TrapReason* trap) {
+int64_t ExecuteI64ShrS(int64_t a, int64_t b, TrapReason* trap) {
   return a >> (b & 0x3F);
 }
 
-inline uint32_t ExecuteI32Ror(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32Ror(uint32_t a, uint32_t b, TrapReason* trap) {
   return (a >> (b & 0x1F)) | (a << ((32 - b) & 0x1F));
 }
 
-inline uint32_t ExecuteI32Rol(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32Rol(uint32_t a, uint32_t b, TrapReason* trap) {
   return (a << (b & 0x1F)) | (a >> ((32 - b) & 0x1F));
 }
 
-inline uint64_t ExecuteI64Ror(uint64_t a, uint64_t b, TrapReason* trap) {
+uint64_t ExecuteI64Ror(uint64_t a, uint64_t b, TrapReason* trap) {
   return (a >> (b & 0x3F)) | (a << ((64 - b) & 0x3F));
 }
 
-inline uint64_t ExecuteI64Rol(uint64_t a, uint64_t b, TrapReason* trap) {
+uint64_t ExecuteI64Rol(uint64_t a, uint64_t b, TrapReason* trap) {
   return (a << (b & 0x3F)) | (a >> ((64 - b) & 0x3F));
 }
 
-inline float ExecuteF32Min(float a, float b, TrapReason* trap) {
-  return JSMin(a, b);
-}
+float ExecuteF32Min(float a, float b, TrapReason* trap) { return JSMin(a, b); }
 
-inline float ExecuteF32Max(float a, float b, TrapReason* trap) {
-  return JSMax(a, b);
-}
+float ExecuteF32Max(float a, float b, TrapReason* trap) { return JSMax(a, b); }
 
-inline Float32 ExecuteF32CopySign(Float32 a, Float32 b, TrapReason* trap) {
+Float32 ExecuteF32CopySign(Float32 a, Float32 b, TrapReason* trap) {
   return Float32::FromBits((a.get_bits() & ~kFloat32SignBitMask) |
                            (b.get_bits() & kFloat32SignBitMask));
 }
 
-inline double ExecuteF64Min(double a, double b, TrapReason* trap) {
+double ExecuteF64Min(double a, double b, TrapReason* trap) {
   return JSMin(a, b);
 }
 
-inline double ExecuteF64Max(double a, double b, TrapReason* trap) {
+double ExecuteF64Max(double a, double b, TrapReason* trap) {
   return JSMax(a, b);
 }
 
-inline Float64 ExecuteF64CopySign(Float64 a, Float64 b, TrapReason* trap) {
+Float64 ExecuteF64CopySign(Float64 a, Float64 b, TrapReason* trap) {
   return Float64::FromBits((a.get_bits() & ~kFloat64SignBitMask) |
                            (b.get_bits() & kFloat64SignBitMask));
 }
 
-inline int32_t ExecuteI32AsmjsDivS(int32_t a, int32_t b, TrapReason* trap) {
+int32_t ExecuteI32AsmjsDivS(int32_t a, int32_t b, TrapReason* trap) {
   if (b == 0) return 0;
   if (b == -1 && a == std::numeric_limits<int32_t>::min()) {
     return std::numeric_limits<int32_t>::min();
@@ -341,35 +337,35 @@ inline int32_t ExecuteI32AsmjsDivS(int32_t a, int32_t b, TrapReason* trap) {
   return a / b;
 }
 
-inline uint32_t ExecuteI32AsmjsDivU(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32AsmjsDivU(uint32_t a, uint32_t b, TrapReason* trap) {
   if (b == 0) return 0;
   return a / b;
 }
 
-inline int32_t ExecuteI32AsmjsRemS(int32_t a, int32_t b, TrapReason* trap) {
+int32_t ExecuteI32AsmjsRemS(int32_t a, int32_t b, TrapReason* trap) {
   if (b == 0) return 0;
   if (b == -1) return 0;
   return a % b;
 }
 
-inline uint32_t ExecuteI32AsmjsRemU(uint32_t a, uint32_t b, TrapReason* trap) {
+uint32_t ExecuteI32AsmjsRemU(uint32_t a, uint32_t b, TrapReason* trap) {
   if (b == 0) return 0;
   return a % b;
 }
 
-inline int32_t ExecuteI32AsmjsSConvertF32(float a, TrapReason* trap) {
+int32_t ExecuteI32AsmjsSConvertF32(float a, TrapReason* trap) {
   return DoubleToInt32(a);
 }
 
-inline uint32_t ExecuteI32AsmjsUConvertF32(float a, TrapReason* trap) {
+uint32_t ExecuteI32AsmjsUConvertF32(float a, TrapReason* trap) {
   return DoubleToUint32(a);
 }
 
-inline int32_t ExecuteI32AsmjsSConvertF64(double a, TrapReason* trap) {
+int32_t ExecuteI32AsmjsSConvertF64(double a, TrapReason* trap) {
   return DoubleToInt32(a);
 }
 
-inline uint32_t ExecuteI32AsmjsUConvertF64(double a, TrapReason* trap) {
+uint32_t ExecuteI32AsmjsUConvertF64(double a, TrapReason* trap) {
   return DoubleToUint32(a);
 }
 
@@ -385,7 +381,7 @@ uint32_t ExecuteI32Popcnt(uint32_t val, TrapReason* trap) {
   return base::bits::CountPopulation(val);
 }
 
-inline uint32_t ExecuteI32Eqz(uint32_t val, TrapReason* trap) {
+uint32_t ExecuteI32Eqz(uint32_t val, TrapReason* trap) {
   return val == 0 ? 1 : 0;
 }
 
@@ -393,60 +389,56 @@ int64_t ExecuteI64Clz(uint64_t val, TrapReason* trap) {
   return base::bits::CountLeadingZeros(val);
 }
 
-inline uint64_t ExecuteI64Ctz(uint64_t val, TrapReason* trap) {
+uint64_t ExecuteI64Ctz(uint64_t val, TrapReason* trap) {
   return base::bits::CountTrailingZeros(val);
 }
 
-inline int64_t ExecuteI64Popcnt(uint64_t val, TrapReason* trap) {
+int64_t ExecuteI64Popcnt(uint64_t val, TrapReason* trap) {
   return base::bits::CountPopulation(val);
 }
 
-inline int32_t ExecuteI64Eqz(uint64_t val, TrapReason* trap) {
+int32_t ExecuteI64Eqz(uint64_t val, TrapReason* trap) {
   return val == 0 ? 1 : 0;
 }
 
-inline Float32 ExecuteF32Abs(Float32 a, TrapReason* trap) {
+Float32 ExecuteF32Abs(Float32 a, TrapReason* trap) {
   return Float32::FromBits(a.get_bits() & ~kFloat32SignBitMask);
 }
 
-inline Float32 ExecuteF32Neg(Float32 a, TrapReason* trap) {
+Float32 ExecuteF32Neg(Float32 a, TrapReason* trap) {
   return Float32::FromBits(a.get_bits() ^ kFloat32SignBitMask);
 }
 
-inline float ExecuteF32Ceil(float a, TrapReason* trap) { return ceilf(a); }
+float ExecuteF32Ceil(float a, TrapReason* trap) { return ceilf(a); }
 
-inline float ExecuteF32Floor(float a, TrapReason* trap) { return floorf(a); }
+float ExecuteF32Floor(float a, TrapReason* trap) { return floorf(a); }
 
-inline float ExecuteF32Trunc(float a, TrapReason* trap) { return truncf(a); }
+float ExecuteF32Trunc(float a, TrapReason* trap) { return truncf(a); }
 
-inline float ExecuteF32NearestInt(float a, TrapReason* trap) {
-  return nearbyintf(a);
-}
+float ExecuteF32NearestInt(float a, TrapReason* trap) { return nearbyintf(a); }
 
-inline float ExecuteF32Sqrt(float a, TrapReason* trap) {
+float ExecuteF32Sqrt(float a, TrapReason* trap) {
   float result = sqrtf(a);
   return result;
 }
 
-inline Float64 ExecuteF64Abs(Float64 a, TrapReason* trap) {
+Float64 ExecuteF64Abs(Float64 a, TrapReason* trap) {
   return Float64::FromBits(a.get_bits() & ~kFloat64SignBitMask);
 }
 
-inline Float64 ExecuteF64Neg(Float64 a, TrapReason* trap) {
+Float64 ExecuteF64Neg(Float64 a, TrapReason* trap) {
   return Float64::FromBits(a.get_bits() ^ kFloat64SignBitMask);
 }
 
-inline double ExecuteF64Ceil(double a, TrapReason* trap) { return ceil(a); }
+double ExecuteF64Ceil(double a, TrapReason* trap) { return ceil(a); }
 
-inline double ExecuteF64Floor(double a, TrapReason* trap) { return floor(a); }
+double ExecuteF64Floor(double a, TrapReason* trap) { return floor(a); }
 
-inline double ExecuteF64Trunc(double a, TrapReason* trap) { return trunc(a); }
+double ExecuteF64Trunc(double a, TrapReason* trap) { return trunc(a); }
 
-inline double ExecuteF64NearestInt(double a, TrapReason* trap) {
-  return nearbyint(a);
-}
+double ExecuteF64NearestInt(double a, TrapReason* trap) { return nearbyint(a); }
 
-inline double ExecuteF64Sqrt(double a, TrapReason* trap) { return sqrt(a); }
+double ExecuteF64Sqrt(double a, TrapReason* trap) { return sqrt(a); }
 
 template <typename int_type, typename float_type>
 int_type ExecuteConvert(float_type a, TrapReason* trap) {
@@ -471,7 +463,7 @@ int_type ExecuteConvertSaturate(float_type a) {
 }
 
 template <typename dst_type, typename src_type, void (*fn)(Address)>
-inline dst_type CallExternalIntToFloatFunction(src_type input) {
+dst_type CallExternalIntToFloatFunction(src_type input) {
   uint8_t data[std::max(sizeof(dst_type), sizeof(src_type))];
   Address data_addr = reinterpret_cast<Address>(data);
   WriteUnalignedValue<src_type>(data_addr, input);
@@ -480,8 +472,7 @@ inline dst_type CallExternalIntToFloatFunction(src_type input) {
 }
 
 template <typename dst_type, typename src_type, int32_t (*fn)(Address)>
-inline dst_type CallExternalFloatToIntFunction(src_type input,
-                                               TrapReason* trap) {
+dst_type CallExternalFloatToIntFunction(src_type input, TrapReason* trap) {
   uint8_t data[std::max(sizeof(dst_type), sizeof(src_type))];
   Address data_addr = reinterpret_cast<Address>(data);
   WriteUnalignedValue<src_type>(data_addr, input);
@@ -489,7 +480,7 @@ inline dst_type CallExternalFloatToIntFunction(src_type input,
   return ReadUnalignedValue<dst_type>(data_addr);
 }
 
-inline uint32_t ExecuteI32ConvertI64(int64_t a, TrapReason* trap) {
+uint32_t ExecuteI32ConvertI64(int64_t a, TrapReason* trap) {
   return static_cast<uint32_t>(a & 0xFFFFFFFF);
 }
 
@@ -557,69 +548,69 @@ uint64_t ExecuteI64UConvertSatF64(double a) {
                                   : std::numeric_limits<uint64_t>::max());
 }
 
-inline int64_t ExecuteI64SConvertI32(int32_t a, TrapReason* trap) {
+int64_t ExecuteI64SConvertI32(int32_t a, TrapReason* trap) {
   return static_cast<int64_t>(a);
 }
 
-inline int64_t ExecuteI64UConvertI32(uint32_t a, TrapReason* trap) {
+int64_t ExecuteI64UConvertI32(uint32_t a, TrapReason* trap) {
   return static_cast<uint64_t>(a);
 }
 
-inline float ExecuteF32SConvertI32(int32_t a, TrapReason* trap) {
+float ExecuteF32SConvertI32(int32_t a, TrapReason* trap) {
   return static_cast<float>(a);
 }
 
-inline float ExecuteF32UConvertI32(uint32_t a, TrapReason* trap) {
+float ExecuteF32UConvertI32(uint32_t a, TrapReason* trap) {
   return static_cast<float>(a);
 }
 
-inline float ExecuteF32SConvertI64(int64_t a, TrapReason* trap) {
+float ExecuteF32SConvertI64(int64_t a, TrapReason* trap) {
   return static_cast<float>(a);
 }
 
-inline float ExecuteF32UConvertI64(uint64_t a, TrapReason* trap) {
+float ExecuteF32UConvertI64(uint64_t a, TrapReason* trap) {
   return CallExternalIntToFloatFunction<float, uint64_t,
                                         uint64_to_float32_wrapper>(a);
 }
 
-inline float ExecuteF32ConvertF64(double a, TrapReason* trap) {
+float ExecuteF32ConvertF64(double a, TrapReason* trap) {
   return DoubleToFloat32(a);
 }
 
-inline Float32 ExecuteF32ReinterpretI32(int32_t a, TrapReason* trap) {
+Float32 ExecuteF32ReinterpretI32(int32_t a, TrapReason* trap) {
   return Float32::FromBits(a);
 }
 
-inline double ExecuteF64SConvertI32(int32_t a, TrapReason* trap) {
+double ExecuteF64SConvertI32(int32_t a, TrapReason* trap) {
   return static_cast<double>(a);
 }
 
-inline double ExecuteF64UConvertI32(uint32_t a, TrapReason* trap) {
+double ExecuteF64UConvertI32(uint32_t a, TrapReason* trap) {
   return static_cast<double>(a);
 }
 
-inline double ExecuteF64SConvertI64(int64_t a, TrapReason* trap) {
+double ExecuteF64SConvertI64(int64_t a, TrapReason* trap) {
   return static_cast<double>(a);
 }
 
-inline double ExecuteF64UConvertI64(uint64_t a, TrapReason* trap) {
+double ExecuteF64UConvertI64(uint64_t a, TrapReason* trap) {
   return CallExternalIntToFloatFunction<double, uint64_t,
                                         uint64_to_float64_wrapper>(a);
 }
 
-inline double ExecuteF64ConvertF32(float a, TrapReason* trap) {
+double ExecuteF64ConvertF32(float a, TrapReason* trap) {
   return static_cast<double>(a);
 }
 
-inline Float64 ExecuteF64ReinterpretI64(int64_t a, TrapReason* trap) {
+Float64 ExecuteF64ReinterpretI64(int64_t a, TrapReason* trap) {
   return Float64::FromBits(a);
 }
 
-inline int32_t ExecuteI32ReinterpretF32(WasmValue a) {
+int32_t ExecuteI32ReinterpretF32(WasmValue a) {
   return a.to_f32_boxed().get_bits();
 }
 
-inline int64_t ExecuteI64ReinterpretF64(WasmValue a) {
+int64_t ExecuteI64ReinterpretF64(WasmValue a) {
   return a.to_f64_boxed().get_bits();
 }
 
@@ -799,8 +790,8 @@ class SideTable : public ZoneObject {
         case kExprBlock:
         case kExprLoop: {
           bool is_loop = opcode == kExprLoop;
-          BlockTypeImmediate<Decoder::kNoValidation> imm(WasmFeatures::All(),
-                                                         &i, i.pc() + 1);
+          BlockTypeImmediate<Decoder::kNoValidation> imm(
+              WasmFeatures::All(), &i, i.pc() + 1, module);
           if (imm.type == kWasmBottom) {
             imm.sig = module->signature(imm.sig_index);
           }
@@ -821,8 +812,8 @@ class SideTable : public ZoneObject {
           break;
         }
         case kExprIf: {
-          BlockTypeImmediate<Decoder::kNoValidation> imm(WasmFeatures::All(),
-                                                         &i, i.pc() + 1);
+          BlockTypeImmediate<Decoder::kNoValidation> imm(
+              WasmFeatures::All(), &i, i.pc() + 1, module);
           if (imm.type == kWasmBottom) {
             imm.sig = module->signature(imm.sig_index);
           }
@@ -861,8 +852,8 @@ class SideTable : public ZoneObject {
           break;
         }
         case kExprTry: {
-          BlockTypeImmediate<Decoder::kNoValidation> imm(WasmFeatures::All(),
-                                                         &i, i.pc() + 1);
+          BlockTypeImmediate<Decoder::kNoValidation> imm(
+              WasmFeatures::All(), &i, i.pc() + 1, module);
           if (imm.type == kWasmBottom) {
             imm.sig = module->signature(imm.sig_index);
           }
@@ -896,20 +887,6 @@ class SideTable : public ZoneObject {
           stack_height = c->end_label->target_stack_height + kCatchInArity;
           break;
         }
-        case kExprBrOnExn: {
-          BranchOnExceptionImmediate<Decoder::kNoValidation> imm(&i,
-                                                                 i.pc() + 1);
-          uint32_t depth = imm.depth.depth;  // Extracted for convenience.
-          imm.index.exception = &module->exceptions[imm.index.index];
-          DCHECK_EQ(0, imm.index.exception->sig->return_count());
-          size_t params = imm.index.exception->sig->parameter_count();
-          // Taken branches pop the exception and push the encoded values.
-          int32_t height = stack_height - 1 + static_cast<int32_t>(params);
-          TRACE("control @%u: BrOnExn[depth=%u]\n", i.pc_offset(), depth);
-          Control* c = &control_stack[control_stack.size() - depth - 1];
-          if (!unreachable) c->end_label->Ref(i.pc(), height);
-          break;
-        }
         case kExprEnd: {
           Control* c = &control_stack.back();
           TRACE("control @%u: End\n", i.pc_offset());
@@ -1495,7 +1472,10 @@ class WasmInterpreterInternals {
     ResetStack(dest + arity);
   }
 
-  inline Address EffectiveAddress(uint32_t index) {
+  Address EffectiveAddress(uint64_t index) {
+    DCHECK_GE(std::numeric_limits<uintptr_t>::max(),
+              instance_object_->memory_size());
+    DCHECK_GE(instance_object_->memory_size(), index);
     // Compute the effective address of the access, making sure to condition
     // the index even in the in-bounds case.
     return reinterpret_cast<Address>(instance_object_->memory_start()) +
@@ -1503,8 +1483,8 @@ class WasmInterpreterInternals {
   }
 
   template <typename mtype>
-  inline Address BoundsCheckMem(uint32_t offset, uint32_t index) {
-    uint32_t effective_index = offset + index;
+  Address BoundsCheckMem(uint64_t offset, uint64_t index) {
+    uint64_t effective_index = offset + index;
     if (effective_index < index) {
       return kNullAddress;  // wraparound => oob
     }
@@ -1515,12 +1495,20 @@ class WasmInterpreterInternals {
     return EffectiveAddress(effective_index);
   }
 
-  inline bool BoundsCheckMemRange(uint32_t index, uint32_t* size,
-                                  Address* out_address) {
-    bool ok = base::ClampToBounds(
-        index, size, static_cast<uint32_t>(instance_object_->memory_size()));
+  bool BoundsCheckMemRange(uint64_t index, uint64_t* size,
+                           Address* out_address) {
+    DCHECK_GE(std::numeric_limits<uintptr_t>::max(),
+              instance_object_->memory_size());
+    if (!base::ClampToBounds<uint64_t>(index, size,
+                                       instance_object_->memory_size())) {
+      return false;
+    }
     *out_address = EffectiveAddress(index);
-    return ok;
+    return true;
+  }
+
+  uint64_t ToMemType(WasmValue value) {
+    return module()->is_memory64 ? value.to<uint64_t>() : value.to<uint32_t>();
   }
 
   template <typename ctype, typename mtype>
@@ -1532,8 +1520,9 @@ class WasmInterpreterInternals {
     // the operation to keep trap reporting and tracing accurate, otherwise
     // those will report at the middle of an opcode.
     MemoryAccessImmediate<Decoder::kNoValidation> imm(
-        decoder, code->at(pc + prefix_len), sizeof(ctype));
-    uint32_t index = Pop().to<uint32_t>();
+        decoder, code->at(pc + prefix_len), sizeof(ctype),
+        module()->is_memory64);
+    uint64_t index = ToMemType(Pop());
     Address addr = BoundsCheckMem<mtype>(imm.offset, index);
     if (!addr) {
       DoTrap(kTrapMemOutOfBounds, pc);
@@ -1564,10 +1553,11 @@ class WasmInterpreterInternals {
     // the operation to keep trap reporting and tracing accurate, otherwise
     // those will report at the middle of an opcode.
     MemoryAccessImmediate<Decoder::kNoValidation> imm(
-        decoder, code->at(pc + prefix_len), sizeof(ctype));
+        decoder, code->at(pc + prefix_len), sizeof(ctype),
+        module()->is_memory64);
     ctype val = Pop().to<ctype>();
 
-    uint32_t index = Pop().to<uint32_t>();
+    uint64_t index = ToMemType(Pop());
     Address addr = BoundsCheckMem<mtype>(imm.offset, index);
     if (!addr) {
       DoTrap(kTrapMemOutOfBounds, pc);
@@ -1591,10 +1581,10 @@ class WasmInterpreterInternals {
                              Address* address, pc_t pc, int* const len,
                              type* val = nullptr, type* val2 = nullptr) {
     MemoryAccessImmediate<Decoder::kNoValidation> imm(
-        decoder, code->at(pc + *len), sizeof(type));
+        decoder, code->at(pc + *len), sizeof(type), module()->is_memory64);
     if (val2) *val2 = static_cast<type>(Pop().to<op_type>());
     if (val) *val = static_cast<type>(Pop().to<op_type>());
-    uint32_t index = Pop().to<uint32_t>();
+    uint64_t index = ToMemType(Pop());
     *address = BoundsCheckMem<type>(imm.offset, index);
     if (!*address) {
       DoTrap(kTrapMemOutOfBounds, pc);
@@ -1611,18 +1601,18 @@ class WasmInterpreterInternals {
   template <typename type>
   bool ExtractAtomicWaitNotifyParams(Decoder* decoder, InterpreterCode* code,
                                      pc_t pc, int* const len,
-                                     uint32_t* buffer_offset, type* val,
+                                     uint64_t* buffer_offset, type* val,
                                      int64_t* timeout = nullptr) {
     // TODO(manoskouk): Introduce test which exposes wrong pc offset below.
     MemoryAccessImmediate<Decoder::kFullValidation> imm(
-        decoder, code->at(pc + *len), sizeof(type));
+        decoder, code->at(pc + *len), sizeof(type), module()->is_memory64);
     if (timeout) {
       *timeout = Pop().to<int64_t>();
     }
     *val = Pop().to<type>();
-    auto index = Pop().to<uint32_t>();
+    uint64_t index = ToMemType(Pop());
     // Check bounds.
-    Address address = BoundsCheckMem<uint32_t>(imm.offset, index);
+    Address address = BoundsCheckMem<uint64_t>(imm.offset, index);
     *buffer_offset = index + imm.offset;
     if (!address) {
       DoTrap(kTrapMemOutOfBounds, pc);
@@ -1672,11 +1662,11 @@ class WasmInterpreterInternals {
         // validation.
         DCHECK_LT(imm.data_segment_index, module()->num_declared_data_segments);
         *len += imm.length;
-        auto size = Pop().to<uint32_t>();
-        auto src = Pop().to<uint32_t>();
-        auto dst = Pop().to<uint32_t>();
+        uint64_t size = ToMemType(Pop());
+        uint64_t src = ToMemType(Pop());
+        uint64_t dst = ToMemType(Pop());
         Address dst_addr;
-        auto src_max =
+        uint64_t src_max =
             instance_object_->data_segment_sizes()[imm.data_segment_index];
         if (!BoundsCheckMemRange(dst, &size, &dst_addr) ||
             !base::IsInBounds(src, size, src_max)) {
@@ -1704,9 +1694,9 @@ class WasmInterpreterInternals {
         MemoryCopyImmediate<Decoder::kNoValidation> imm(decoder,
                                                         code->at(pc + 2));
         *len += imm.length;
-        auto size = Pop().to<uint32_t>();
-        auto src = Pop().to<uint32_t>();
-        auto dst = Pop().to<uint32_t>();
+        uint64_t size = ToMemType(Pop());
+        uint64_t src = ToMemType(Pop());
+        uint64_t dst = ToMemType(Pop());
         Address dst_addr;
         Address src_addr;
         if (!BoundsCheckMemRange(dst, &size, &dst_addr) ||
@@ -1723,12 +1713,11 @@ class WasmInterpreterInternals {
         MemoryIndexImmediate<Decoder::kNoValidation> imm(decoder,
                                                          code->at(pc + 2));
         *len += imm.length;
-        auto size = Pop().to<uint32_t>();
-        auto value = Pop().to<uint32_t>();
-        auto dst = Pop().to<uint32_t>();
+        uint64_t size = ToMemType(Pop());
+        uint32_t value = Pop().to<uint32_t>();
+        uint64_t dst = ToMemType(Pop());
         Address dst_addr;
-        bool ok = BoundsCheckMemRange(dst, &size, &dst_addr);
-        if (!ok) {
+        if (!BoundsCheckMemRange(dst, &size, &dst_addr)) {
           DoTrap(kTrapMemOutOfBounds, pc);
           return false;
         }
@@ -2040,7 +2029,7 @@ class WasmInterpreterInternals {
         }
         int32_t val;
         int64_t timeout;
-        uint32_t buffer_offset;
+        uint64_t buffer_offset;
         if (!ExtractAtomicWaitNotifyParams<int32_t>(
                 decoder, code, pc, len, &buffer_offset, &val, &timeout)) {
           return false;
@@ -2060,7 +2049,7 @@ class WasmInterpreterInternals {
         }
         int64_t val;
         int64_t timeout;
-        uint32_t buffer_offset;
+        uint64_t buffer_offset;
         if (!ExtractAtomicWaitNotifyParams<int64_t>(
                 decoder, code, pc, len, &buffer_offset, &val, &timeout)) {
           return false;
@@ -2075,7 +2064,7 @@ class WasmInterpreterInternals {
       }
       case kExprAtomicNotify: {
         int32_t val;
-        uint32_t buffer_offset;
+        uint64_t buffer_offset;
         if (!ExtractAtomicWaitNotifyParams<int32_t>(decoder, code, pc, len,
                                                     &buffer_offset, &val)) {
           return false;
@@ -2801,6 +2790,16 @@ class WasmInterpreterInternals {
       case kExprI16x8ExtAddPairwiseI8x16U: {
         return DoSimdExtAddPairwise<int8, int16, uint16_t, uint8_t>();
       }
+      case kExprPrefetchT:
+      case kExprPrefetchNT: {
+        // Max alignment doesn't matter, use an arbitrary value.
+        MemoryAccessImmediate<Decoder::kNoValidation> imm(
+            decoder, code->at(pc + *len), 4, module()->is_memory64);
+        // Pop address and do nothing.
+        Pop().to<uint32_t>();
+        *len += imm.length;
+        return true;
+      }
       default:
         return false;
     }
@@ -2886,7 +2885,7 @@ class WasmInterpreterInternals {
     s_type value = Pop().to_s128().to<s_type>();
 
     MemoryAccessImmediate<Decoder::kNoValidation> imm(
-        decoder, code->at(pc + *len), sizeof(load_type));
+        decoder, code->at(pc + *len), sizeof(load_type), module()->is_memory64);
 
     SimdLaneImmediate<Decoder::kNoValidation> lane_imm(
         decoder, code->at(pc + *len + imm.length));
@@ -3045,7 +3044,8 @@ class WasmInterpreterInternals {
           switch (sig->GetParam(i).heap_representation()) {
             case HeapType::kExtern:
             case HeapType::kExn:
-            case HeapType::kFunc: {
+            case HeapType::kFunc:
+            case HeapType::kAny: {
               Handle<Object> externref = value.to_externref();
               encoded_values->set(encoded_index++, *externref);
               break;
@@ -3162,7 +3162,8 @@ class WasmInterpreterInternals {
           switch (sig->GetParam(i).heap_representation()) {
             case HeapType::kExtern:
             case HeapType::kExn:
-            case HeapType::kFunc: {
+            case HeapType::kFunc:
+            case HeapType::kAny: {
               Handle<Object> externref(encoded_values->get(encoded_index++),
                                        isolate_);
               value = WasmValue(externref);
@@ -3247,13 +3248,13 @@ class WasmInterpreterInternals {
         case kExprLoop:
         case kExprTry: {
           BlockTypeImmediate<Decoder::kNoValidation> imm(
-              WasmFeatures::All(), &decoder, code->at(pc + 1));
+              WasmFeatures::All(), &decoder, code->at(pc + 1), module());
           len = 1 + imm.length;
           break;
         }
         case kExprIf: {
           BlockTypeImmediate<Decoder::kNoValidation> imm(
-              WasmFeatures::All(), &decoder, code->at(pc + 1));
+              WasmFeatures::All(), &decoder, code->at(pc + 1), module());
           WasmValue cond = Pop();
           bool is_true = cond.to<uint32_t>() != 0;
           if (is_true) {
@@ -3292,28 +3293,9 @@ class WasmInterpreterInternals {
           ReloadFromFrameOnException(&decoder, &code, &pc, &limit);
           continue;  // Do not bump pc.
         }
-        case kExprBrOnExn: {
-          BranchOnExceptionImmediate<Decoder::kNoValidation> imm(
-              &decoder, code->at(pc + 1));
-          HandleScope handle_scope(isolate_);  // Avoid leaking handles.
-          WasmValue ex = Pop();
-          Handle<Object> exception = ex.to_externref();
-          if (exception->IsNull()) return DoTrap(kTrapBrOnExnNull, pc);
-          if (MatchingExceptionTag(exception, imm.index.index)) {
-            imm.index.exception = &module()->exceptions[imm.index.index];
-            DoUnpackException(imm.index.exception, exception);
-            len = DoBreak(code, pc, imm.depth.depth);
-            TRACE("  match => @%zu\n", pc + len);
-          } else {
-            Push(ex);  // Exception remains on stack.
-            TRACE("  false => fallthrough\n");
-            len = 1 + imm.length;
-          }
-          break;
-        }
         case kExprSelectWithType: {
           SelectTypeImmediate<Decoder::kNoValidation> imm(
-              WasmFeatures::All(), &decoder, code->at(pc + 1));
+              WasmFeatures::All(), &decoder, code->at(pc + 1), module());
           len = 1 + imm.length;
           V8_FALLTHROUGH;
         }
@@ -3402,7 +3384,7 @@ class WasmInterpreterInternals {
         }
         case kExprRefNull: {
           HeapTypeImmediate<Decoder::kNoValidation> imm(
-              WasmFeatures::All(), &decoder, code->at(pc + 1));
+              WasmFeatures::All(), &decoder, code->at(pc + 1), module());
           len = 1 + imm.length;
           Push(WasmValue(isolate_->factory()->null_value()));
           break;
@@ -3699,6 +3681,7 @@ class WasmInterpreterInternals {
         case kExprMemoryGrow: {
           MemoryIndexImmediate<Decoder::kNoValidation> imm(&decoder,
                                                            code->at(pc + 1));
+          // TODO(clemensb): Fix this for memory64.
           uint32_t delta_pages = Pop().to<uint32_t>();
           HandleScope handle_scope(isolate_);  // Avoid leaking handles.
           Handle<WasmMemoryObject> memory(instance_object_->memory_object(),
@@ -3715,8 +3698,10 @@ class WasmInterpreterInternals {
         case kExprMemorySize: {
           MemoryIndexImmediate<Decoder::kNoValidation> imm(&decoder,
                                                            code->at(pc + 1));
-          Push(WasmValue(static_cast<uint32_t>(instance_object_->memory_size() /
-                                               kWasmPageSize)));
+          uint64_t num_pages = instance_object_->memory_size() / kWasmPageSize;
+          Push(module()->is_memory64
+                   ? WasmValue(num_pages)
+                   : WasmValue(static_cast<uint32_t>(num_pages)));
           len = 1 + imm.length;
           break;
         }
diff --git a/deps/v8/test/common/wasm/wasm-macro-gen.h b/deps/v8/test/common/wasm/wasm-macro-gen.h
index 4f998a4bc599b7..106d33091349c8 100644
--- a/deps/v8/test/common/wasm/wasm-macro-gen.h
+++ b/deps/v8/test/common/wasm/wasm-macro-gen.h
@@ -67,6 +67,23 @@
       static_cast<byte>((((x) >> 21) & MASK_7) | 0x80), \
       static_cast<byte>((((x) >> 28) & MASK_7))
 
+#define U64V_1(x) U32V_1(static_cast<uint32_t>(x))
+#define U64V_2(x) U32V_2(static_cast<uint32_t>(x))
+#define U64V_3(x) U32V_3(static_cast<uint32_t>(x))
+#define U64V_4(x) U32V_4(static_cast<uint32_t>(x))
+#define U64V_5(x)                                                  \
+  static_cast<uint8_t>((uint64_t{x} & MASK_7) | 0x80),             \
+      static_cast<uint8_t>(((uint64_t{x} >> 7) & MASK_7) | 0x80),  \
+      static_cast<uint8_t>(((uint64_t{x} >> 14) & MASK_7) | 0x80), \
+      static_cast<uint8_t>(((uint64_t{x} >> 21) & MASK_7) | 0x80), \
+      static_cast<uint8_t>(((uint64_t{x} >> 28) & MASK_7))
+#define U64V_6(x)                                                  \
+  static_cast<uint8_t>((uint64_t{x} & MASK_7) | 0x80),             \
+      static_cast<uint8_t>(((uint64_t{x} >> 7) & MASK_7) | 0x80),  \
+      static_cast<uint8_t>(((uint64_t{x} >> 14) & MASK_7) | 0x80), \
+      static_cast<uint8_t>(((uint64_t{x} >> 21) & MASK_7) | 0x80), \
+      static_cast<uint8_t>(((uint64_t{x} >> 28) & MASK_7) | 0x80), \
+      static_cast<uint8_t>(((uint64_t{x} >> 35) & MASK_7))
 #define U64V_10(x)                                                 \
   static_cast<uint8_t>((uint64_t{x} & MASK_7) | 0x80),             \
       static_cast<uint8_t>(((uint64_t{x} >> 7) & MASK_7) | 0x80),  \
@@ -163,11 +180,16 @@
 #define WASM_IF_ELSE_X(index, cond, tstmt, fstmt)                            \
   cond, kExprIf, static_cast<byte>(index), tstmt, kExprElse, fstmt, kExprEnd
 
-#define WASM_TRY_CATCH_T(t, trystmt, catchstmt)                            \
+#define WASM_TRY_CATCH_T(t, trystmt, catchstmt, except)                    \
   kExprTry, static_cast<byte>((t).value_type_code()), trystmt, kExprCatch, \
-      catchstmt, kExprEnd
+      except, catchstmt, kExprEnd
 #define WASM_TRY_CATCH_R(t, trystmt, catchstmt) \
   kExprTry, WASM_REF_TYPE(t), trystmt, kExprCatch, catchstmt, kExprEnd
+#define WASM_TRY_CATCH_ALL_T(t, trystmt, catchstmt)                           \
+  kExprTry, static_cast<byte>((t).value_type_code()), trystmt, kExprCatchAll, \
+      catchstmt, kExprEnd
+#define WASM_TRY_DELEGATE(trystmt, depth) \
+  kExprTry, kVoidCode, trystmt, kExprDelegate, depth
 
 #define WASM_SELECT(tval, fval, cond) tval, fval, cond, kExprSelect
 #define WASM_SELECT_I(tval, fval, cond) \
@@ -407,12 +429,12 @@ inline WasmOpcode LoadStoreOpcodeOf(MachineType type, bool store) {
       static_cast<byte>(bit_cast<uint64_t>(static_cast<double>(val)) >> 48), \
       static_cast<byte>(bit_cast<uint64_t>(static_cast<double>(val)) >> 56)
 
-#define WASM_GET_LOCAL(index) kExprLocalGet, static_cast<byte>(index)
-#define WASM_SET_LOCAL(index, val) val, kExprLocalSet, static_cast<byte>(index)
-#define WASM_TEE_LOCAL(index, val) val, kExprLocalTee, static_cast<byte>(index)
+#define WASM_LOCAL_GET(index) kExprLocalGet, static_cast<byte>(index)
+#define WASM_LOCAL_SET(index, val) val, kExprLocalSet, static_cast<byte>(index)
+#define WASM_LOCAL_TEE(index, val) val, kExprLocalTee, static_cast<byte>(index)
 #define WASM_DROP kExprDrop
-#define WASM_GET_GLOBAL(index) kExprGlobalGet, static_cast<byte>(index)
-#define WASM_SET_GLOBAL(index, val) \
+#define WASM_GLOBAL_GET(index) kExprGlobalGet, static_cast<byte>(index)
+#define WASM_GLOBAL_SET(index, val) \
   val, kExprGlobalSet, static_cast<byte>(index)
 #define WASM_TABLE_GET(table_index, index) \
   index, kExprTableGet, static_cast<byte>(table_index)
diff --git a/deps/v8/test/common/wasm/wasm-module-runner.cc b/deps/v8/test/common/wasm/wasm-module-runner.cc
index 1a62eea0dd3961..f9ef2e6708add1 100644
--- a/deps/v8/test/common/wasm/wasm-module-runner.cc
+++ b/deps/v8/test/common/wasm/wasm-module-runner.cc
@@ -237,6 +237,13 @@ int32_t CallWasmFunctionForTesting(Isolate* isolate,
     return -1;
   }
   Handle<Object> result = retval.ToHandleChecked();
+
+  // Multi-value returns, get the first return value (see InterpretWasmModule).
+  if (result->IsJSArray()) {
+    auto receiver = Handle<JSReceiver>::cast(result);
+    result = JSObject::GetElement(isolate, receiver, 0).ToHandleChecked();
+  }
+
   if (result->IsSmi()) {
     return Smi::ToInt(*result);
   }
diff --git a/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-caught.js b/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-caught.js
index a5df680d6875f5..cfa4002fb320e4 100644
--- a/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-caught.js
+++ b/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-caught.js
@@ -1,8 +1,6 @@
 // Copyright 2020 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// Flags: --harmony-promise-any
 
 // Test debug events when we only listen to uncaught exceptions and a
 // Promise p3 created by Promise.any has a catch handler, and is rejected
diff --git a/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-uncaught.js b/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-uncaught.js
index 661f22ae2428ec..8ebab3f8a29b3a 100644
--- a/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-uncaught.js
+++ b/deps/v8/test/debugger/debug/es6/debug-promises/promise-any-uncaught.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Flags: --harmony-promise-any --ignore-unhandled-promises
+// Flags: --ignore-unhandled-promises
 
 // Test debug events when we only listen to uncaught exceptions and a
 // Promise p3 created by Promise.any has no catch handler, and is rejected
diff --git a/deps/v8/test/debugger/debug/side-effect/debug-evaluate-no-side-effect-builtins.js b/deps/v8/test/debugger/debug/side-effect/debug-evaluate-no-side-effect-builtins.js
index c515c5d5891d7e..29c13e71d4851a 100644
--- a/deps/v8/test/debugger/debug/side-effect/debug-evaluate-no-side-effect-builtins.js
+++ b/deps/v8/test/debugger/debug/side-effect/debug-evaluate-no-side-effect-builtins.js
@@ -121,7 +121,7 @@ function listener(event, exec_state, event_data, data) {
     success(true, `!!typed_array.buffer`);
     success(0, `typed_array.byteOffset`);
     success(3, `typed_array.byteLength`);
-    fail(`Uint8Array.of(1, 2)`);
+    success({0: 1, 1: 2}, `Uint8Array.of(1, 2)`);
     function_param = [
       "forEach", "every", "some", "reduce", "reduceRight", "find", "filter",
       "map", "findIndex"
diff --git a/deps/v8/test/debugger/debug/wasm/stepping-from-js.js b/deps/v8/test/debugger/debug/wasm/stepping-from-js.js
index 6d2d5e4ef447bb..4b9edabadb9e50 100644
--- a/deps/v8/test/debugger/debug/wasm/stepping-from-js.js
+++ b/deps/v8/test/debugger/debug/wasm/stepping-from-js.js
@@ -36,7 +36,13 @@ const expected_breaks = [
   `imported:${import_line_nr + 1}:2`,   // debugger;
   `imported:${import_line_nr + 2}:2`,   // return 7;
   `imported:${import_line_nr + 2}:11`,  // return 7;
-  'sub:1:58', 'sub:1:60', 'sub:1:62', 'sub:1:63', 'main:1:72'
+  'main:1:68',                          // i32.const 3
+  'main:1:70',                          // call 'sub'
+  'sub:1:58',                           // local.get i0
+  'sub:1:60',                           // local.get i1
+  'sub:1:62',                           // i32.sub
+  'sub:1:63',                           // end
+  'main:1:72'                           // end
 ];
 let error;
 function onBreak(event, exec_state, data) {
diff --git a/deps/v8/test/debugger/test-api.js b/deps/v8/test/debugger/test-api.js
index dc9cd104119378..1b978eb1579bcd 100644
--- a/deps/v8/test/debugger/test-api.js
+++ b/deps/v8/test/debugger/test-api.js
@@ -715,6 +715,7 @@ class DebugWrapper {
       case "EventListener":
       case "assert":
       case "debugCommand":
+      case "CSPViolation":
         assertUnreachable();
       default:
         assertUnreachable();
diff --git a/deps/v8/test/debugging/wasm/gdb-server/gdb_rsp.py b/deps/v8/test/debugging/wasm/gdb-server/gdb_rsp.py
index 0fa6956246487c..69c75520213e1e 100644
--- a/deps/v8/test/debugging/wasm/gdb-server/gdb_rsp.py
+++ b/deps/v8/test/debugging/wasm/gdb-server/gdb_rsp.py
@@ -178,7 +178,7 @@ def AssertReplySignal(reply, signal):
   AssertEquals(ParseThreadStopReply(reply)['signal'], signal)
 
 def ParseThreadStopReply(reply):
-  match = re.match('T([0-9a-f]{2})thread-pcs:([0-9a-f]+);thread:([0-9a-f]+);$', reply)
+  match = re.match('T([0-9a-f]{2})thread-pcs:([0-9a-f]+);thread:([0-9a-f]+);(library:([0-9a-f]*);)?$', reply)
   if not match:
     raise AssertionError('Bad thread stop reply: %r' % reply)
   return {'signal': int(match.group(1), 16),
diff --git a/deps/v8/test/debugging/wasm/gdb-server/memory.py b/deps/v8/test/debugging/wasm/gdb-server/memory.py
index db102a71075fbc..00d2de27a13a4d 100644
--- a/deps/v8/test/debugging/wasm/gdb-server/memory.py
+++ b/deps/v8/test/debugging/wasm/gdb-server/memory.py
@@ -48,12 +48,29 @@ def test_reading_and_writing_memory(self):
       self.assertEqual(result, expected_data)
 
       # Check reading instance memory at a valid range.
-      reply = connection.RspRequest('qWasmMem:0;%x;%x' % (32, 4))
+      module_id = module_load_addr >> 32
+      reply = connection.RspRequest('qWasmMem:%d;%x;%x' % (module_id, 32, 4))
       value = struct.unpack('I', gdb_rsp.DecodeHex(reply))[0]
       self.assertEquals(int(value), 0)
 
       # Check reading instance memory at an invalid range.
-      reply = connection.RspRequest('qWasmMem:0;%x;%x' % (0xf0000000, 4))
+      reply = connection.RspRequest('qWasmMem:%d;%x;%x' % (module_id, 0xf0000000, 4))
+      self.assertEqual(reply, 'E03')
+
+  def test_reading_and_writing_data_section(self):
+    with gdb_rsp.LaunchDebugStub(COMMAND) as connection:
+      module_load_addr = gdb_rsp.GetLoadedModuleAddress(connection)
+      breakpoint_addr = module_load_addr + test_memory.FUNC0_START_ADDR
+      self.RunToWasm(connection, breakpoint_addr)
+
+      # Check reading instance memory at a valid range.
+      module_id = module_load_addr >> 32
+      reply = connection.RspRequest('qWasmData:%d;%x;%x' % (module_id, test_memory.DATA_OFFSET, test_memory.DATA_SIZE))
+      value = struct.unpack('I', gdb_rsp.DecodeHex(reply))[0]
+      self.assertEquals(int(value), test_memory.DATA_CONTENT)
+
+      # Check reading instance memory at an invalid range.
+      reply = connection.RspRequest('qWasmData:%d;%x;%x' % (module_id, 0xf0000000, 4))
       self.assertEqual(reply, 'E03')
 
   def test_wasm_global(self):
diff --git a/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.js b/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.js
index c955f126fae2a2..fa0743500fb955 100644
--- a/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.js
+++ b/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.js
@@ -10,6 +10,8 @@ builder.addGlobal(kWasmI32).exportAs('g_n');
 
 builder.addMemory(32, 128).exportMemoryAs('mem')
 
+builder.addDataSegment(0, [0x2a, 0x2b, 0x2c, 0x2d])
+
 var func_a_idx =
     builder.addFunction('wasm_A', kSig_v_i).addBody([kExprNop, kExprNop]).index;
 
diff --git a/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.py b/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.py
index 5502bcc6e63785..37bb53894c0949 100644
--- a/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.py
+++ b/deps/v8/test/debugging/wasm/gdb-server/test_files/test_memory.py
@@ -41,3 +41,6 @@
 FUNC0_START_ADDR = 0x42
 FUNC1_RETURN_ADDR = 0x59
 FUNC1_START_ADDR = 0x47
+DATA_OFFSET = 0
+DATA_SIZE = 4
+DATA_CONTENT = 0x2d2c2b2a
diff --git a/deps/v8/test/fuzzer/inspector-fuzzer.cc b/deps/v8/test/fuzzer/inspector-fuzzer.cc
index e136a99d67341e..7f09f92ae667d3 100644
--- a/deps/v8/test/fuzzer/inspector-fuzzer.cc
+++ b/deps/v8/test/fuzzer/inspector-fuzzer.cc
@@ -40,9 +40,12 @@ class UtilsExtension : public IsolateData::SetupGlobalTask {
     v8::Local<v8::ObjectTemplate> utils = v8::ObjectTemplate::New(isolate);
     auto Set = [isolate](v8::Local<v8::ObjectTemplate> tmpl, const char* str,
                          v8::Local<v8::Data> value) {
+      // Do not set {ReadOnly}, because fuzzer inputs might overwrite individual
+      // methods, or the whole "utils" global. See the
+      // `testing/libfuzzer/fuzzers/generate_v8_inspector_fuzzer_corpus.py` file
+      // in chromium.
       tmpl->Set(ToV8String(isolate, str), value,
                 static_cast<v8::PropertyAttribute>(
-                    v8::PropertyAttribute::ReadOnly |
                     v8::PropertyAttribute::DontDelete));
     };
     Set(utils, "quit",
@@ -88,8 +91,9 @@ class UtilsExtension : public IsolateData::SetupGlobalTask {
 
   static void CompileAndRunWithOrigin(
       const v8::FunctionCallbackInfo<v8::Value>& args) {
-    if (args.Length() != 5 || !args[0]->IsInt32() || !args[1]->IsString() ||
-        !args[2]->IsString() || !args[3]->IsInt32() || !args[4]->IsInt32()) {
+    if (args.Length() != 6 || !args[0]->IsInt32() || !args[1]->IsString() ||
+        !args[2]->IsString() || !args[3]->IsInt32() || !args[4]->IsInt32() ||
+        !args[5]->IsBoolean()) {
       return;
     }
 
@@ -97,7 +101,7 @@ class UtilsExtension : public IsolateData::SetupGlobalTask {
         args.GetIsolate(), args[0].As<v8::Int32>()->Value(),
         ToVector(args.GetIsolate(), args[1].As<v8::String>()),
         args[2].As<v8::String>(), args[3].As<v8::Int32>(),
-        args[4].As<v8::Int32>(), v8::Boolean::New(args.GetIsolate(), false)));
+        args[4].As<v8::Int32>(), args[5].As<v8::Boolean>()));
   }
 
   static void SchedulePauseOnNextStatement(
@@ -568,8 +572,8 @@ void FuzzInspector(const uint8_t* data, size_t size) {
   IsolateData::SetupGlobalTasks frontend_extensions;
   frontend_extensions.emplace_back(new UtilsExtension());
   TaskRunner frontend_runner(std::move(frontend_extensions),
-                             kDontCatchExceptions, &ready_semaphore, nullptr,
-                             kNoInspector);
+                             kSuppressUncaughtExceptions, &ready_semaphore,
+                             nullptr, kNoInspector);
   ready_semaphore.Wait();
 
   int frontend_context_group_id = 0;
@@ -581,8 +585,9 @@ void FuzzInspector(const uint8_t* data, size_t size) {
   IsolateData::SetupGlobalTasks backend_extensions;
   backend_extensions.emplace_back(new SetTimeoutExtension());
   backend_extensions.emplace_back(new InspectorExtension());
-  TaskRunner backend_runner(std::move(backend_extensions), kDontCatchExceptions,
-                            &ready_semaphore, nullptr, kWithInspector);
+  TaskRunner backend_runner(std::move(backend_extensions),
+                            kSuppressUncaughtExceptions, &ready_semaphore,
+                            nullptr, kWithInspector);
   ready_semaphore.Wait();
   UtilsExtension::set_backend_task_runner(&backend_runner);
 
diff --git a/deps/v8/test/fuzzer/inspector/endless-loop b/deps/v8/test/fuzzer/inspector/endless-loop
new file mode 100644
index 00000000000000..bffbd3679e6d03
--- /dev/null
+++ b/deps/v8/test/fuzzer/inspector/endless-loop
@@ -0,0 +1 @@
+while (1) {}
diff --git a/deps/v8/test/fuzzer/regexp-builtins.cc b/deps/v8/test/fuzzer/regexp-builtins.cc
index f02387bd924153..0cdaaaff214f3a 100644
--- a/deps/v8/test/fuzzer/regexp-builtins.cc
+++ b/deps/v8/test/fuzzer/regexp-builtins.cc
@@ -378,10 +378,11 @@ void CompileRunAndVerify(FuzzerArgs* args, const std::string& source) {
   }
 
   if (!ResultsAreIdentical(args)) {
-    uint32_t hash = StringHasher::HashSequentialString(
+    uint32_t raw_hash_field = StringHasher::HashSequentialString(
         args->input_data, static_cast<int>(args->input_length),
         kRegExpBuiltinsFuzzerHashSeed);
-    FATAL("!ResultAreIdentical(args); RegExpBuiltinsFuzzerHash=%x", hash);
+    FATAL("!ResultAreIdentical(args); RegExpBuiltinsFuzzerHash=%x",
+          raw_hash_field);
   }
 }
 
diff --git a/deps/v8/test/fuzzer/wasm-compile.cc b/deps/v8/test/fuzzer/wasm-compile.cc
index 3f8fe07848ba04..dbb50b55f94793 100644
--- a/deps/v8/test/fuzzer/wasm-compile.cc
+++ b/deps/v8/test/fuzzer/wasm-compile.cc
@@ -111,7 +111,7 @@ class WasmGenerator {
     builder_->Emit(Op);
   }
 
-  class BlockScope {
+  class V8_NODISCARD BlockScope {
    public:
     BlockScope(WasmGenerator* gen, WasmOpcode block_type,
                Vector<const ValueType> param_types,
@@ -1357,6 +1357,14 @@ void WasmGenerator::Generate<ValueType::kS128>(DataRange* data) {
                                      ValueType::kS128>,
       &WasmGenerator::op_with_prefix<kExprI16x8RoundingAverageU,
                                      ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI16x8ExtMulLowI8x16S,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI16x8ExtMulLowI8x16U,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI16x8ExtMulHighI8x16S,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI16x8ExtMulHighI8x16U,
+                                     ValueType::kS128, ValueType::kS128>,
 
       &WasmGenerator::op_with_prefix<kExprI32x4Splat, ValueType::kI32>,
       &WasmGenerator::op_with_prefix<kExprI32x4Eq, ValueType::kS128,
@@ -1403,6 +1411,14 @@ void WasmGenerator::Generate<ValueType::kS128>(DataRange* data) {
                                      ValueType::kS128>,
       &WasmGenerator::op_with_prefix<kExprI32x4DotI16x8S, ValueType::kS128,
                                      ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI32x4ExtMulLowI16x8S,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI32x4ExtMulLowI16x8U,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI32x4ExtMulHighI16x8S,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI32x4ExtMulHighI16x8U,
+                                     ValueType::kS128, ValueType::kS128>,
 
       &WasmGenerator::op_with_prefix<kExprI64x2Splat, ValueType::kI64>,
       &WasmGenerator::op_with_prefix<kExprI64x2Neg, ValueType::kS128>,
@@ -1418,6 +1434,14 @@ void WasmGenerator::Generate<ValueType::kS128>(DataRange* data) {
                                      ValueType::kS128>,
       &WasmGenerator::op_with_prefix<kExprI64x2Mul, ValueType::kS128,
                                      ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI64x2ExtMulLowI32x4S,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI64x2ExtMulLowI32x4U,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI64x2ExtMulHighI32x4S,
+                                     ValueType::kS128, ValueType::kS128>,
+      &WasmGenerator::op_with_prefix<kExprI64x2ExtMulHighI32x4U,
+                                     ValueType::kS128, ValueType::kS128>,
 
       &WasmGenerator::op_with_prefix<kExprF32x4Splat, ValueType::kF32>,
       &WasmGenerator::op_with_prefix<kExprF32x4Eq, ValueType::kS128,
diff --git a/deps/v8/test/fuzzer/wasm-fuzzer-common.cc b/deps/v8/test/fuzzer/wasm-fuzzer-common.cc
index bcdba055a2021c..c67412b938cb85 100644
--- a/deps/v8/test/fuzzer/wasm-fuzzer-common.cc
+++ b/deps/v8/test/fuzzer/wasm-fuzzer-common.cc
@@ -133,7 +133,11 @@ const char* ValueTypeToConstantName(ValueType type) {
           return "kWasmFuncRef";
         case HeapType::kExn:
           return "kWasmExnRef";
+        case HeapType::kAny:
+        case HeapType::kI31:
+        case HeapType::kBottom:
         default:
+          // TODO(7748): Implement these if fuzzing for them is enabled.
           UNREACHABLE();
       }
     default:
@@ -265,7 +269,7 @@ void GenerateTestCase(Isolate* isolate, ModuleWireBytes wire_bytes,
 
     // Add locals.
     BodyLocalDecls decls(&tmp_zone);
-    DecodeLocalDecls(enabled_features, &decls, func_code.begin(),
+    DecodeLocalDecls(enabled_features, &decls, module, func_code.begin(),
                      func_code.end());
     if (!decls.type_list.empty()) {
       os << "  ";
diff --git a/deps/v8/test/fuzzer/wasm_corpus.tar.gz.sha1 b/deps/v8/test/fuzzer/wasm_corpus.tar.gz.sha1
index 32bfeceb0a1024..3f67560ae4ab55 100644
--- a/deps/v8/test/fuzzer/wasm_corpus.tar.gz.sha1
+++ b/deps/v8/test/fuzzer/wasm_corpus.tar.gz.sha1
@@ -1 +1 @@
-f6b95b7dd8300efa84b6382f16cfcae4ec9fa108
\ No newline at end of file
+a1493bb387aed38462c49f4351dc47e79e4b784b
\ No newline at end of file
diff --git a/deps/v8/test/inspector/BUILD.gn b/deps/v8/test/inspector/BUILD.gn
index 1fef57d14bee9d..cf039da0befd5b 100644
--- a/deps/v8/test/inspector/BUILD.gn
+++ b/deps/v8/test/inspector/BUILD.gn
@@ -23,6 +23,7 @@ v8_source_set("inspector_test") {
     "../..:v8",
     "../..:v8_libbase",
     "../..:v8_libplatform",
+    "../..:v8_wrappers",
     "../../src/inspector:inspector_test_headers",
   ]
 }
@@ -51,8 +52,6 @@ v8_executable("inspector-test") {
     "debugger/",
     "heap-profiler/",
     "inspector.status",
-    "json-parse-expected.txt",
-    "json-parse.js",
     "protocol-test.js",
     "runtime/",
     "runtime-call-stats/",
diff --git a/deps/v8/test/inspector/cpu-profiler/console-profile-wasm-expected.txt b/deps/v8/test/inspector/cpu-profiler/console-profile-wasm-expected.txt
index c5b427f475c47d..8613c2f876d502 100644
--- a/deps/v8/test/inspector/cpu-profiler/console-profile-wasm-expected.txt
+++ b/deps/v8/test/inspector/cpu-profiler/console-profile-wasm-expected.txt
@@ -1,4 +1,29 @@
 Test that console profiles contain wasm function names.
+testEnableProfilerEarly
 Compiling wasm.
+Building wasm module with sentinel 1.
 Running fib with increasing input until it shows up in the profile.
 Found expected functions in profile.
+Wasm script id is set.
+Wasm position: wasm://wasm/6b211e7e@0:47
+testEnableProfilerLate
+Compiling wasm.
+Building wasm module with sentinel 2.
+Running fib with increasing input until it shows up in the profile.
+Found expected functions in profile.
+Wasm script id is set.
+Wasm position: wasm://wasm/d6029ed6@0:47
+testEnableProfilerAfterDebugger
+Compiling wasm.
+Building wasm module with sentinel 3.
+Running fib with increasing input until it shows up in the profile.
+Found expected functions in profile.
+Wasm script id is set.
+Wasm position: wasm://wasm/6df1c11a@0:47
+testEnableProfilerBeforeDebugger
+Compiling wasm.
+Building wasm module with sentinel 4.
+Running fib with increasing input until it shows up in the profile.
+Found expected functions in profile.
+Wasm script id is set.
+Wasm position: wasm://wasm/07da49be@0:47
diff --git a/deps/v8/test/inspector/cpu-profiler/console-profile-wasm.js b/deps/v8/test/inspector/cpu-profiler/console-profile-wasm.js
index 192fdbe212a0e6..e08d644981218f 100644
--- a/deps/v8/test/inspector/cpu-profiler/console-profile-wasm.js
+++ b/deps/v8/test/inspector/cpu-profiler/console-profile-wasm.js
@@ -10,25 +10,33 @@ let {session, contextGroup, Protocol} = InspectorTest.start(
 
 utils.load('test/mjsunit/wasm/wasm-module-builder.js');
 
-// Add fibonacci function, calling back and forth between JS and Wasm to also
-// check for the occurrence of the wrappers.
-var builder = new WasmModuleBuilder();
-const imp_index = builder.addImport('q', 'f', kSig_i_i);
-builder.addFunction('fib', kSig_i_i)
-    .addBody([
-      kExprLocalGet, 0,
-      kExprLocalGet, 0,
-      kExprI32Const, 2,
-      kExprI32LeS,  // i < 2 ?
-      kExprBrIf, 0, // --> return i
-      kExprI32Const, 1, kExprI32Sub,  // i - 1
-      kExprCallFunction, imp_index, // imp(i - 1)
-      kExprLocalGet, 0, kExprI32Const, 2, kExprI32Sub,  // i - 2
-      kExprCallFunction, imp_index, // imp(i - 2)
-      kExprI32Add
-    ])
-    .exportFunc();
-let module_bytes = builder.toArray();
+// Build module bytes, including a sentinel such that the module will not be
+// reused from the cache.
+let sentinel = 0;
+function buildModuleBytes() {
+  ++sentinel;
+  InspectorTest.log(`Building wasm module with sentinel ${sentinel}.`);
+  // Add fibonacci function, calling back and forth between JS and Wasm to also
+  // check for the occurrence of the wrappers.
+  var builder = new WasmModuleBuilder();
+  const imp_index = builder.addImport('q', 'f', kSig_i_i);
+  builder.addFunction('fib', kSig_i_i)
+      .addBody([
+        ...wasmI32Const(sentinel), kExprDrop,
+        kExprLocalGet, 0,
+        kExprLocalGet, 0,
+        kExprI32Const, 2,
+        kExprI32LeS,  // i < 2 ?
+        kExprBrIf, 0, // --> return i
+        kExprI32Const, 1, kExprI32Sub,  // i - 1
+        kExprCallFunction, imp_index, // imp(i - 1)
+        kExprLocalGet, 0, kExprI32Const, 2, kExprI32Sub,  // i - 2
+        kExprCallFunction, imp_index, // imp(i - 2)
+        kExprI32Add
+      ])
+      .exportFunc();
+  return builder.toArray();
+}
 
 function compile(bytes) {
   let buffer = new ArrayBuffer(bytes.length);
@@ -51,45 +59,45 @@ function checkError(message) {
   InspectorTest.completeTest();
 }
 
-(async function test() {
-  Protocol.Profiler.enable();
-  checkError(await Protocol.Profiler.start());
-  let found_good_profile = false;
-  let finished_profiles = 0;
-  Protocol.Profiler.onConsoleProfileFinished(e => {
-    ++finished_profiles;
-    let function_names =
-        e.params.profile.nodes.map(n => n.callFrame.functionName);
-    // InspectorTest.log(function_names.join(', '));
-    // Check for at least one full cycle of
-    // fib -> wasm-to-js -> imp -> js-to-wasm -> fib.
-    // There are two different kinds of js-to-wasm-wrappers, so there are two
-    // possible positive traces.
-    const expected_generic =
-        ['fib', 'wasm-to-js:i:i', 'imp', 'GenericJSToWasmWrapper', 'fib'];
-    const expected_optimized =
-        ['fib', 'wasm-to-js:i:i', 'imp', 'js-to-wasm:i:i', 'fib'];
-    for (let i = 0; i <= function_names.length - expected_generic.length; ++i) {
-      if (expected_generic.every(
-              (val, idx) => val == function_names[i + idx]) ||
-          expected_optimized.every(
-              (val, idx) => val == function_names[i + idx])) {
-        found_good_profile = true;
-      }
+let found_good_profile = false;
+let found_wasm_script_id;
+let wasm_position;
+let finished_profiles = 0;
+Protocol.Profiler.onConsoleProfileFinished(e => {
+  ++finished_profiles;
+  let nodes = e.params.profile.nodes;
+  let function_names = nodes.map(n => n.callFrame.functionName);
+  // Enable this line for debugging:
+  // InspectorTest.log(function_names.join(', '));
+  // Check for at least one full cycle of
+  // fib -> wasm-to-js -> imp -> js-to-wasm -> fib.
+  // There are two different kinds of js-to-wasm-wrappers, so there are two
+  // possible positive traces.
+  const expected = [
+    ['fib'], ['wasm-to-js:i:i'], ['imp'],
+    ['GenericJSToWasmWrapper', 'js-to-wasm:i:i'], ['fib']
+  ];
+  for (let i = 0; i <= function_names.length - expected.length; ++i) {
+    if (expected.every((val, idx) => val.includes(function_names[i + idx]))) {
+      found_good_profile = true;
+      let wasm_frame = nodes[i].callFrame;
+      found_wasm_script_id = wasm_frame.scriptId != 0;
+      wasm_position = `${wasm_frame.url}@${wasm_frame.lineNumber}:${
+          wasm_frame.columnNumber}`;
     }
-  });
-  InspectorTest.log('Compiling wasm.');
-  checkError(await Protocol.Runtime.evaluate({
-    expression: 'const instance = (' + compile + ')(' +
-        JSON.stringify(module_bytes) + ');'
-  }));
+  }
+});
+
+async function runFibUntilProfileFound() {
   InspectorTest.log(
       'Running fib with increasing input until it shows up in the profile.');
+  found_good_profile = false;
+  finished_profiles = 0;
   for (let i = 1; !found_good_profile; ++i) {
     checkError(await Protocol.Runtime.evaluate(
         {expression: 'console.profile(\'profile\');'}));
     checkError(await Protocol.Runtime.evaluate(
-        {expression: 'instance.exports.fib(' + i + ');'}));
+        {expression: 'globalThis.instance.exports.fib(' + i + ');'}));
     checkError(await Protocol.Runtime.evaluate(
         {expression: 'console.profileEnd(\'profile\');'}));
     if (finished_profiles != i) {
@@ -99,5 +107,67 @@ function checkError(message) {
     }
   }
   InspectorTest.log('Found expected functions in profile.');
-  InspectorTest.completeTest();
-})().catch(e => InspectorTest.log('caught: ' + e));
+  InspectorTest.log(
+      'Wasm script id is ' + (found_wasm_script_id ? 'set.' : 'NOT SET.'));
+  InspectorTest.log('Wasm position: ' + wasm_position);
+}
+
+async function compileWasm() {
+  InspectorTest.log('Compiling wasm.');
+  checkError(await Protocol.Runtime.evaluate({
+    expression: `globalThis.instance = (${compile})(${
+        JSON.stringify(buildModuleBytes())});`
+  }));
+}
+
+async function testEnableProfilerEarly() {
+  InspectorTest.log(arguments.callee.name);
+  checkError(await Protocol.Profiler.enable());
+  checkError(await Protocol.Profiler.start());
+  await compileWasm();
+  await runFibUntilProfileFound();
+  checkError(await Protocol.Profiler.disable());
+}
+
+async function testEnableProfilerLate() {
+  InspectorTest.log(arguments.callee.name);
+  await compileWasm();
+  checkError(await Protocol.Profiler.enable());
+  checkError(await Protocol.Profiler.start());
+  await runFibUntilProfileFound();
+  checkError(await Protocol.Profiler.disable());
+}
+
+async function testEnableProfilerAfterDebugger() {
+  InspectorTest.log(arguments.callee.name);
+  checkError(await Protocol.Debugger.enable());
+  await compileWasm();
+  checkError(await Protocol.Profiler.enable());
+  checkError(await Protocol.Profiler.start());
+  await runFibUntilProfileFound();
+  checkError(await Protocol.Profiler.disable());
+  checkError(await Protocol.Debugger.disable());
+}
+
+async function testEnableProfilerBeforeDebugger() {
+  InspectorTest.log(arguments.callee.name);
+  await compileWasm();
+  await Protocol.Profiler.enable();
+  await Protocol.Debugger.enable();
+  checkError(await Protocol.Profiler.start());
+  await runFibUntilProfileFound();
+  await Protocol.Debugger.disable();
+  await Protocol.Profiler.disable();
+}
+
+(async function test() {
+  try {
+    await testEnableProfilerEarly();
+    await testEnableProfilerLate();
+    await testEnableProfilerAfterDebugger();
+    await testEnableProfilerBeforeDebugger();
+  } catch (e) {
+    InspectorTest.log('caught: ' + e);
+  }
+})().catch(e => InspectorTest.log('caught: ' + e))
+    .finally(InspectorTest.completeTest);
diff --git a/deps/v8/test/inspector/debugger/class-private-methods-empty-inner.js b/deps/v8/test/inspector/debugger/class-private-methods-empty-inner.js
index 01ad459b8c6a98..5a687480beffd4 100644
--- a/deps/v8/test/inspector/debugger/class-private-methods-empty-inner.js
+++ b/deps/v8/test/inspector/debugger/class-private-methods-empty-inner.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 let {session, contextGroup, Protocol} = InspectorTest.start(
     'Test empty inner classes with private instance methods in the outer class');
 
diff --git a/deps/v8/test/inspector/debugger/class-private-methods-preview.js b/deps/v8/test/inspector/debugger/class-private-methods-preview.js
index 7a8dd87d7d27d9..d27d3c91dd2c5c 100644
--- a/deps/v8/test/inspector/debugger/class-private-methods-preview.js
+++ b/deps/v8/test/inspector/debugger/class-private-methods-preview.js
@@ -1,8 +1,6 @@
 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// Flags: --harmony-private-methods
 
 let {session, contextGroup, Protocol} = InspectorTest.start("Check private methods in object preview.");
 
diff --git a/deps/v8/test/inspector/debugger/class-private-methods-static-nested.js b/deps/v8/test/inspector/debugger/class-private-methods-static-nested.js
index 216241a27c23e1..db43d867f0e560 100644
--- a/deps/v8/test/inspector/debugger/class-private-methods-static-nested.js
+++ b/deps/v8/test/inspector/debugger/class-private-methods-static-nested.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 let { session, contextGroup, Protocol } = InspectorTest.start(
   "Test static private class methods"
 );
diff --git a/deps/v8/test/inspector/debugger/class-private-methods-static-preview.js b/deps/v8/test/inspector/debugger/class-private-methods-static-preview.js
index 3a64ddec77bec5..ea8735c79e38af 100644
--- a/deps/v8/test/inspector/debugger/class-private-methods-static-preview.js
+++ b/deps/v8/test/inspector/debugger/class-private-methods-static-preview.js
@@ -1,8 +1,6 @@
 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// Flags: --harmony-private-methods
 
 let {session, contextGroup, Protocol} = InspectorTest.start("Check static private methods in object preview.");
 
diff --git a/deps/v8/test/inspector/debugger/class-private-methods-static.js b/deps/v8/test/inspector/debugger/class-private-methods-static.js
index 1d493116effc9f..57afd274563777 100644
--- a/deps/v8/test/inspector/debugger/class-private-methods-static.js
+++ b/deps/v8/test/inspector/debugger/class-private-methods-static.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 let { session, contextGroup, Protocol } = InspectorTest.start(
   "Test static private class methods"
 );
diff --git a/deps/v8/test/inspector/debugger/class-private-methods-unused.js b/deps/v8/test/inspector/debugger/class-private-methods-unused.js
index 0c11277c0d5766..5ab79f28437fa6 100644
--- a/deps/v8/test/inspector/debugger/class-private-methods-unused.js
+++ b/deps/v8/test/inspector/debugger/class-private-methods-unused.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 let { session, contextGroup, Protocol } = InspectorTest.start(
   "Test accessing unused private methods at runtime"
 );
diff --git a/deps/v8/test/inspector/debugger/class-private-methods.js b/deps/v8/test/inspector/debugger/class-private-methods.js
index f92916b254e8ff..f86ea6dee1fc3c 100644
--- a/deps/v8/test/inspector/debugger/class-private-methods.js
+++ b/deps/v8/test/inspector/debugger/class-private-methods.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 let { session, contextGroup, Protocol } = InspectorTest.start(
   "Test private class methods"
 );
diff --git a/deps/v8/test/inspector/debugger/get-properties-paused-expected.txt b/deps/v8/test/inspector/debugger/get-properties-paused-expected.txt
index b7e48771450caa..a993c829f1ea31 100644
--- a/deps/v8/test/inspector/debugger/get-properties-paused-expected.txt
+++ b/deps/v8/test/inspector/debugger/get-properties-paused-expected.txt
@@ -52,40 +52,11 @@ Running test: testTypedArrayWithoutLength
   __proto__ own object undefined
 
 Running test: testArrayBuffer
-[[Int8Array]]
-  0 own number 1
-  1 own number 1
-  2 own number 1
-  3 own number 1
-  4 own number 1
-  5 own number 1
-  6 own number 1
-  7 own number 1
-  __proto__ own object undefined
-[[Uint8Array]]
-  0 own number 1
-  1 own number 1
-  2 own number 1
-  3 own number 1
-  4 own number 1
-  5 own number 1
-  6 own number 1
-  7 own number 1
-  __proto__ own object undefined
-[[Int16Array]]
-  0 own number 257
-  1 own number 257
-  2 own number 257
-  3 own number 257
-  __proto__ own object undefined
-[[Int32Array]]
-  0 own number 16843009
-  1 own number 16843009
-  __proto__ own object undefined
 
 Running test: testArrayBufferWithBrokenUintCtor
-  [[Int8Array]] own object undefined
-  [[Uint8Array]] own object undefined
   __proto__ own object undefined
 Internal properties
-  [[IsDetached]] boolean false
+  [[ArrayBufferByteLength]] number 7
+  [[ArrayBufferData]] string 0x...
+  [[Int8Array]] object undefined
+  [[Uint8Array]] object undefined
diff --git a/deps/v8/test/inspector/debugger/get-properties-paused.js b/deps/v8/test/inspector/debugger/get-properties-paused.js
index 4c1e7b9429ec14..c750df0f13b388 100644
--- a/deps/v8/test/inspector/debugger/get-properties-paused.js
+++ b/deps/v8/test/inspector/debugger/get-properties-paused.js
@@ -98,7 +98,11 @@ let { Protocol } = InspectorTest.start('Checks Runtime.getProperties method whil
       for (var i = 0; i < internalPropertyArray.length; i++) {
         var p = internalPropertyArray[i];
         var v = p.value;
-        InspectorTest.log(`  ${p.name} ${v.type} ${v.value}`);
+        if (p.name === "[[ArrayBufferData]]")
+          // Hex value for pointer is non-deterministic
+          InspectorTest.log(`  ${p.name} ${v.type} ${v.value.substr(0, 2)}...`);
+        else
+          InspectorTest.log(`  ${p.name} ${v.type} ${v.value}`);
       }
     }
 
diff --git a/deps/v8/test/inspector/debugger/regress-1125934-expected.txt b/deps/v8/test/inspector/debugger/regress-1125934-expected.txt
new file mode 100644
index 00000000000000..4738a12872e102
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/regress-1125934-expected.txt
@@ -0,0 +1 @@
+Checks pause inside blackboxed optimized function call.
diff --git a/deps/v8/test/inspector/debugger/regress-1125934.js b/deps/v8/test/inspector/debugger/regress-1125934.js
new file mode 100644
index 00000000000000..afc21e95cb880e
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/regress-1125934.js
@@ -0,0 +1,27 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax
+// Flags: --no-enable-experimental-regexp-engine
+// Flags: --no-enable-experimental-regexp-engine-on-excessive-backtracks
+// Flags: --no-regexp-tier-up
+
+let {session, contextGroup, Protocol} = InspectorTest.start(
+  'Checks pause inside blackboxed optimized function call.');
+session.setupScriptMap();
+
+(async function test(){
+  Protocol.Debugger.enable();
+  // Use an non-atomic regexp to trigger the actual regexp engine.
+  Protocol.Debugger.setBlackboxPatterns({patterns: ['.*\.js']});
+  // Run a script dominated by a regexp, with a sourceURL to pattern-match.
+  Protocol.Runtime.evaluate({expression: `
+    /((a*)*)*b/.exec('aaaaaaaaaaaaaa');
+  //# sourceURL=framework.js`});
+  // Issue lots of pause messages to trigger at least one during regexp.
+  for (let i = 0; i < 100; i++) Protocol.Debugger.pause();
+  // Send the messages through interupt while regexp is running.
+  utils.interruptForMessages();
+  InspectorTest.completeTest();
+})();
diff --git a/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart-expected.txt b/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart-expected.txt
index 187a415608e45a..a0078a6cd96dcd 100644
--- a/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart-expected.txt
@@ -1,4 +1,6 @@
 Test that breakpoints do not survive a restart of the debugger.
+
+Running test: test
 Instantiating.
 Waiting for wasm script (ignoring first non-wasm script).
 Setting breakpoint.
@@ -8,4 +10,3 @@ func returned.
 Restarting debugger.
 Calling func.
 func returned.
-Finished.
diff --git a/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart.js b/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart.js
index f964eb0668ab84..273a9be450f9b6 100644
--- a/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart.js
+++ b/deps/v8/test/inspector/debugger/wasm-breakpoint-reset-on-debugger-restart.js
@@ -9,10 +9,8 @@ const {session, contextGroup, Protocol} = InspectorTest.start(
 session.setupScriptMap();
 
 const builder = new WasmModuleBuilder();
-
 const func =
     builder.addFunction('func', kSig_v_v).addBody([kExprNop]).exportFunc();
-
 const module_bytes = builder.toArray();
 
 Protocol.Debugger.onPaused(async msg => {
@@ -20,31 +18,31 @@ Protocol.Debugger.onPaused(async msg => {
   Protocol.Debugger.resume();
 });
 
-(async function test() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Instantiating.');
-  // Spawn asynchronously:
-  WasmInspectorTest.instantiate(module_bytes);
-  InspectorTest.log(
-      'Waiting for wasm script (ignoring first non-wasm script).');
-  const [, {params: wasm_script}] = await Protocol.Debugger.onceScriptParsed(2);
-  InspectorTest.log('Setting breakpoint.');
-  await Protocol.Debugger.setBreakpoint({
-    'location': {
-      'scriptId': wasm_script.scriptId,
-      'lineNumber': 0,
-      'columnNumber': func.body_offset
-    }
-  });
-  for (let run of [0, 1]) {
-    InspectorTest.log('Calling func.');
-    await Protocol.Runtime.evaluate({'expression': 'instance.exports.func()'});
-    InspectorTest.log('func returned.');
-    if (run == 1) continue;
-    InspectorTest.log('Restarting debugger.');
-    await Protocol.Debugger.disable();
+InspectorTest.runAsyncTestSuite([
+  async function test() {
     await Protocol.Debugger.enable();
+    InspectorTest.log('Instantiating.');
+    // Spawn asynchronously:
+    WasmInspectorTest.instantiate(module_bytes);
+    InspectorTest.log(
+        'Waiting for wasm script (ignoring first non-wasm script).');
+    const [, {params: wasm_script}] = await Protocol.Debugger.onceScriptParsed(2);
+    InspectorTest.log('Setting breakpoint.');
+    await Protocol.Debugger.setBreakpoint({
+      'location': {
+        'scriptId': wasm_script.scriptId,
+        'lineNumber': 0,
+        'columnNumber': func.body_offset
+      }
+    });
+    for (let run of [0, 1]) {
+      InspectorTest.log('Calling func.');
+      await Protocol.Runtime.evaluate({'expression': 'instance.exports.func()'});
+      InspectorTest.log('func returned.');
+      if (run == 1) continue;
+      InspectorTest.log('Restarting debugger.');
+      await Protocol.Debugger.disable();
+      await Protocol.Debugger.enable();
+    }
   }
-  InspectorTest.log('Finished.');
-  InspectorTest.completeTest();
-})();
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-debug-command-expected.txt b/deps/v8/test/inspector/debugger/wasm-debug-command-expected.txt
index 53f66b8d50c4b1..ca712d285f1a7d 100644
--- a/deps/v8/test/inspector/debugger/wasm-debug-command-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-debug-command-expected.txt
@@ -1,4 +1,6 @@
 Tests debug command for wasm
+
+Running test: test
 Waiting for wasm scripts to be parsed.
 Ignoring script with url v8://test/instantiate
 Got wasm script: wasm://wasm/7d022e0e
@@ -6,4 +8,3 @@ paused No 1
 Script wasm://wasm/7d022e0e byte offset 35: Wasm opcode 0x20 (kExprLocalGet)
 Debugger.resume
 exports.main returned!
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-debug-command.js b/deps/v8/test/inspector/debugger/wasm-debug-command.js
index c30a067d8e319d..8bea6d5e531226 100644
--- a/deps/v8/test/inspector/debugger/wasm-debug-command.js
+++ b/deps/v8/test/inspector/debugger/wasm-debug-command.js
@@ -43,17 +43,17 @@ function test() {
 }
 //# sourceURL=test.js`);
 
-(async function Test() {
-  breakCount = 0;
-  breakpointId = 0;
-  await Protocol.Debugger.enable();
-  WasmInspectorTest.instantiate(module_bytes);
-  await waitForWasmScript();
-  await Protocol.Runtime.evaluate({ expression: 'test()', includeCommandLineAPI: true});
-  InspectorTest.log('exports.main returned!');
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    breakCount = 0;
+    breakpointId = 0;
+    await Protocol.Debugger.enable();
+    WasmInspectorTest.instantiate(module_bytes);
+    await waitForWasmScript();
+    await Protocol.Runtime.evaluate({ expression: 'test()', includeCommandLineAPI: true});
+    InspectorTest.log('exports.main returned!');
+  }
+]);
 
 function printFailure(message) {
   if (!message.result) {
diff --git a/deps/v8/test/inspector/debugger/wasm-debug-evaluate-expected.txt b/deps/v8/test/inspector/debugger/wasm-debug-evaluate-expected.txt
deleted file mode 100644
index de08ecbf026e96..00000000000000
--- a/deps/v8/test/inspector/debugger/wasm-debug-evaluate-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Tests wasm debug-evaluate
-Test: TestGetMemory
-Result: 2
-Expected: 2
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-debug-evaluate.js b/deps/v8/test/inspector/debugger/wasm-debug-evaluate.js
deleted file mode 100644
index b1b8f57e1fe7ac..00000000000000
--- a/deps/v8/test/inspector/debugger/wasm-debug-evaluate.js
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Flags: --expose-wasm --wasm-expose-debug-eval
-
-utils.load('test/inspector/wasm-inspector-test.js');
-
-const {session, contextGroup, Protocol} =
-    InspectorTest.start('Tests wasm debug-evaluate');
-
-function printFailure(message) {
-  if (!message.result) {
-    InspectorTest.logMessage(message);
-  }
-  return message;
-}
-
-async function getWasmScript() {
-  while (true) {
-    const script = await Protocol.Debugger.onceScriptParsed();
-    if (script.params.url.startsWith('wasm://')) return script.params;
-  }
-}
-
-async function handleDebuggerPaused(data, messageObject) {
-  const topFrameId = messageObject.params.callFrames[0].callFrameId;
-  const params = {callFrameId: topFrameId, evaluator: data};
-  try {
-    const evalResult = await Protocol.Debugger.executeWasmEvaluator(params);
-    InspectorTest.log('Result: ' + evalResult.result.result.value);
-  } catch (err) {
-    InspectorTest.log(
-        'Eval failed: ' + err + '\nGot: ' + JSON.stringify(evalResult));
-  }
-  await Protocol.Debugger.resume();
-}
-
-async function runTest(testName, breakLine, debuggeeBytes, snippetBytes) {
-  try {
-    await Protocol.Debugger.onPaused(
-        handleDebuggerPaused.bind(null, snippetBytes));
-    InspectorTest.log('Test: ' + testName);
-    const scriptListener = getWasmScript();
-    await WasmInspectorTest.instantiate(debuggeeBytes);
-    const script = await scriptListener;
-    const msg = await Protocol.Debugger.setBreakpoint({
-      'location': {
-        'scriptId': script.scriptId,
-        'lineNumber': 0,
-        'columnNumber': breakLine
-      }
-    });
-    printFailure(msg);
-    const eval = await Protocol.Runtime.evaluate(
-        {'expression': 'instance.exports.main()'});
-    InspectorTest.log(
-        'Expected: ' + String.fromCharCode(eval.result.result.value));
-    InspectorTest.log('Finished!');
-  } catch (err) {
-    InspectorTest.log(err.message);
-  }
-}
-
-// copied from v8
-function encode64(data) {
-  const BASE =
-      'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-  const PAD = '=';
-  var ret = '';
-  var leftchar = 0;
-  var leftbits = 0;
-  for (var i = 0; i < data.length; i++) {
-    leftchar = (leftchar << 8) | data[i];
-    leftbits += 8;
-    while (leftbits >= 6) {
-      const curr = (leftchar >> (leftbits - 6)) & 0x3f;
-      leftbits -= 6;
-      ret += BASE[curr];
-    }
-  }
-  if (leftbits == 2) {
-    ret += BASE[(leftchar & 3) << 4];
-    ret += PAD + PAD;
-  } else if (leftbits == 4) {
-    ret += BASE[(leftchar & 0xf) << 2];
-    ret += PAD;
-  }
-  return ret;
-}
-
-(async () => {
-  try {
-    await Protocol.Debugger.enable();
-
-    await (async function TestGetMemory() {
-      const debuggee_builder = new WasmModuleBuilder();
-      debuggee_builder.addMemory(256, 256);
-      const mainFunc =
-          debuggee_builder.addFunction('main', kSig_i_v)
-              .addBody([
-                // clang-format off
-                kExprI32Const, 32,
-                kExprI32Const, 50,
-                kExprI32StoreMem, 0, 0,
-                kExprI32Const, 32,
-                kExprI32LoadMem, 0, 0,
-                kExprReturn
-                // clang-format on
-              ])
-              .exportAs('main');
-
-      const snippet_builder = new WasmModuleBuilder();
-      snippet_builder.addMemory(1, 1);
-      const getMemoryIdx = snippet_builder.addImport(
-          'env', '__getMemory', makeSig([kWasmI32, kWasmI32, kWasmI32], []));
-      const heapBase = 32;  // Just pick some position in memory
-      snippet_builder.addFunction('wasm_format', kSig_i_v)
-          .addBody([
-            // clang-format off
-            // __getMemory(32, 4, heapBase)
-            kExprI32Const, 32, kExprI32Const, 4, kExprI32Const, heapBase,
-            kExprCallFunction, getMemoryIdx,
-            // return heapBase
-            kExprI32Const, heapBase,
-            kExprReturn
-            // clang-format on
-          ])
-          .exportAs('wasm_format');
-
-      const debuggeeModule = debuggee_builder.toArray();
-      await runTest(
-          'TestGetMemory', mainFunc.body_offset + 9, debuggeeModule,
-          encode64(snippet_builder.toArray()));
-    })();
-
-  } catch (err) {
-    InspectorTest.log(err)
-  }
-  InspectorTest.completeTest();
-})();
diff --git a/deps/v8/test/inspector/debugger/wasm-evaluate-on-call-frame-expected.txt b/deps/v8/test/inspector/debugger/wasm-evaluate-on-call-frame-expected.txt
new file mode 100644
index 00000000000000..6f47eac211c7a3
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-evaluate-on-call-frame-expected.txt
@@ -0,0 +1,135 @@
+Test wasm debug evaluate
+
+Running test: testInstanceAndModule
+Compile module.
+Set breakpoint in main.
+Instantiate module.
+Call main.
+Debugger paused in main.
+> instance = Instance
+> module = Module
+
+Running test: testGlobals
+Compile module.
+Set breakpoint in main.
+Instantiate module.
+Call main.
+Debugger paused in main.
+> globals = Globals
+> typeof globals = "object"
+> Object.keys(globals) = Array(2)
+> globals[0] = 0
+> globals[1] = 1
+> globals[2] = 2n
+> globals[3] = 3n
+> globals["$global0"] = 0
+> $global0 = 0
+> globals["$global3"] = 2n
+> $global3 = 2n
+Stepping twice in main.
+Debugger paused in main.
+> globals[0] = 0
+> globals[1] = 1
+> globals[2] = 2n
+> globals[3] = 42n
+> globals["$global0"] = 0
+> $global0 = 0
+> globals["$global3"] = 2n
+> $global3 = 2n
+Changing global from JavaScript.
+> globals[0] = 0
+> globals[1] = 21
+> globals[2] = 2n
+> globals[3] = 42n
+> globals["$global0"] = 0
+> $global0 = 0
+> globals["$global3"] = 2n
+> $global3 = 2n
+
+Running test: testFunctions
+Compile module.
+Set breakpoint in main.
+Instantiate module.
+Call main.
+Debugger paused in main.
+> functions = Functions
+> typeof functions = "object"
+> Object.keys(functions) = Array(3)
+> functions[0] = function 0() { [native code] }
+> functions[1] = function 1() { [native code] }
+> functions[2] = function 2() { [native code] }
+> functions[3] = function 3() { [native code] }
+> functions["$main"] = function 0() { [native code] }
+> $main = function 0() { [native code] }
+> functions["$func1"] = function 1() { [native code] }
+> $func1 = function 1() { [native code] }
+> functions["$func3"] = function 3() { [native code] }
+> $func3 = function 3() { [native code] }
+
+Running test: testLocals
+Compile module.
+Set breakpoint in main.
+Instantiate module.
+Call main.
+Debugger paused in main.
+> locals = Locals
+> typeof locals = "object"
+> Object.keys(locals) = Array(2)
+> locals[0] = 3
+> locals[1] = 6
+> locals[2] = 0
+> locals["$x"] = 3
+> $x = 3
+> locals["$var2"] = 0
+> $var2 = 0
+Stepping twice in main.
+Debugger paused in main.
+> locals[0] = 3
+> locals[1] = 6
+> locals[2] = 42
+> locals["$x"] = 3
+> $x = 3
+> locals["$var2"] = 42
+> $var2 = 42
+
+Running test: testMemories
+Compile module.
+Set breakpoint in main.
+Instantiate module.
+Call main.
+Debugger paused in main.
+> memories = Memories
+> typeof memories = "object"
+> Object.keys(memories) = Array(1)
+> memories[0] = Memory(1)
+> memories["$foo"] = Memory(1)
+> $foo = Memory(1)
+
+Running test: testTables
+Compile module.
+Set breakpoint in main.
+Instantiate module.
+Call main.
+Debugger paused in main.
+> tables = Tables
+> typeof tables = "object"
+> Object.keys(tables) = Array(1)
+> tables[0] = Table
+> tables["$bar"] = Table
+> $bar = Table
+
+Running test: testStack
+Compile module.
+Set breakpoint in main.
+Instantiate module.
+Call main.
+Debugger paused in main.
+> stack = Stack
+> typeof stack = "object"
+> Object.keys(stack) = Array(0)
+Stepping twice in main.
+Debugger paused in main.
+> stack = Stack
+> Object.keys(stack) = Array(2)
+> stack[0] = 5
+> stack[1] = 42
diff --git a/deps/v8/test/inspector/debugger/wasm-evaluate-on-call-frame.js b/deps/v8/test/inspector/debugger/wasm-evaluate-on-call-frame.js
new file mode 100644
index 00000000000000..5ee458fc12ee79
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-evaluate-on-call-frame.js
@@ -0,0 +1,341 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+utils.load('test/inspector/wasm-inspector-test.js');
+
+let {session, contextGroup, Protocol} =
+    InspectorTest.start('Test wasm debug evaluate');
+
+Protocol.Debugger.enable();
+Protocol.Runtime.enable();
+
+async function compileModule(builder) {
+  const moduleBytes = JSON.stringify(builder.toArray());
+  const expression = `new WebAssembly.Module(new Uint8Array(${moduleBytes}).buffer);`;
+  const {result: {scriptId}} = await Protocol.Runtime.compileScript({expression, sourceURL: 'v8://test/compileModule', persistScript: true});
+  const [{params}, {result}] = await Promise.all([
+    Protocol.Debugger.onceScriptParsed(),
+    Protocol.Runtime.runScript({scriptId})
+  ]);
+  return [result.result, params.scriptId];
+}
+
+async function instantiateModule({objectId}) {
+  const {result: {result}} = await Protocol.Runtime.callFunctionOn({
+    functionDeclaration: 'function() { return new WebAssembly.Instance(this); }',
+    objectId
+  });
+  return result;
+}
+
+async function dumpOnCallFrame(callFrameId, expression) {
+  const {result: {result}} = await Protocol.Debugger.evaluateOnCallFrame({
+    callFrameId, expression
+  });
+  if ('description' in result) {
+    InspectorTest.log(`> ${expression} = ${result.description}`);
+  } else {
+    InspectorTest.log(`> ${expression} = ${JSON.stringify(result.value)}`);
+  }
+}
+
+async function dumpKeysOnCallFrame(callFrameId, object, keys) {
+  for (const key of keys) {
+    await dumpOnCallFrame(callFrameId, `${object}[${JSON.stringify(key)}]`);
+    if (typeof key === 'string') {
+      await dumpOnCallFrame(callFrameId, `${key}`);
+    }
+  }
+}
+
+async function waitForDebuggerPaused() {
+  const {params: {callFrames: [{callFrameId, functionName}]}} = await Protocol.Debugger.oncePaused();
+  InspectorTest.log(`Debugger paused in ${functionName}.`);
+  return callFrameId;
+}
+
+InspectorTest.runAsyncTestSuite([
+  async function testInstanceAndModule() {
+    const builder = new WasmModuleBuilder();
+    const main = builder.addFunction('main', kSig_v_v)
+                        .addBody([]).exportFunc();
+
+    InspectorTest.log('Compile module.');
+    const [module, scriptId] = await compileModule(builder);
+
+    InspectorTest.log('Set breakpoint in main.');
+    await Protocol.Debugger.setBreakpoint({
+      location: {scriptId, lineNumber: 0, columnNumber: main.body_offset}
+    });
+
+    InspectorTest.log('Instantiate module.');
+    const instance = await instantiateModule(module);
+
+    InspectorTest.log('Call main.');
+    const callMainPromise = Protocol.Runtime.callFunctionOn({
+      functionDeclaration: `function() { return this.exports.main(); }`,
+      objectId: instance.objectId
+    });
+    const callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `instance`);
+    await dumpOnCallFrame(callFrameId, `module`);
+    await Protocol.Debugger.resume();
+    await callMainPromise;
+  },
+
+  async function testGlobals() {
+    const builder = new WasmModuleBuilder();
+    const global0 = builder.addGlobal(kWasmI32, true);  // global0
+    const global1 = builder.addGlobal(kWasmI32, true).exportAs('global0');
+    const global2 = builder.addGlobal(kWasmI64, true).exportAs('global3');
+    const global3 = builder.addGlobal(kWasmI64, true);  // global3
+    const main = builder.addFunction('main', kSig_v_v)
+                        .addBody([
+                          kExprI64Const, 42,
+                          kExprGlobalSet, global3.index,
+                        ]).exportFunc();
+    const start = builder.addFunction('start', kSig_v_v)
+                         .addBody([
+                           kExprNop,
+                           kExprI32Const, 0,
+                           kExprGlobalSet, global0.index,
+                           kExprI32Const, 1,
+                           kExprGlobalSet, global1.index,
+                           kExprI64Const, 2,
+                           kExprGlobalSet, global2.index,
+                           kExprI64Const, 3,
+                           kExprGlobalSet, global3.index,
+                         ]);
+    builder.addStart(start.index);
+    const KEYS = [0, 1, 2, 3, '$global0', '$global3'];
+
+    InspectorTest.log('Compile module.');
+    const [module, scriptId] = await compileModule(builder);
+
+    InspectorTest.log('Set breakpoint in main.');
+    await Protocol.Debugger.setBreakpoint({
+      location: {scriptId, lineNumber: 0, columnNumber: main.body_offset}
+    });
+
+    InspectorTest.log('Instantiate module.');
+    const instance = await instantiateModule(module);
+
+    InspectorTest.log('Call main.');
+    const callMainPromise = Protocol.Runtime.callFunctionOn({
+      functionDeclaration: `function() { return this.exports.main(); }`,
+      objectId: instance.objectId
+    });
+    let callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `globals`);
+    await dumpOnCallFrame(callFrameId, `typeof globals`);
+    await dumpOnCallFrame(callFrameId, `Object.keys(globals)`);
+    await dumpKeysOnCallFrame(callFrameId, "globals", KEYS);
+
+    InspectorTest.log(`Stepping twice in main.`)
+    await Protocol.Debugger.stepOver();  // i32.const 42
+    await Protocol.Debugger.stepOver();  // global.set $global3
+    callFrameId = await waitForDebuggerPaused();
+    await dumpKeysOnCallFrame(callFrameId, "globals", KEYS);
+
+    InspectorTest.log('Changing global from JavaScript.')
+    await Protocol.Debugger.evaluateOnCallFrame({
+      callFrameId,
+      expression: `instance.exports.global0.value = 21`
+    });
+    await dumpKeysOnCallFrame(callFrameId, "globals", KEYS);
+    await Protocol.Debugger.resume();
+    await callMainPromise;
+  },
+
+  async function testFunctions() {
+    const builder = new WasmModuleBuilder();
+    const main = builder.addFunction('main', kSig_i_v)
+                        .addBody([
+                          kExprI32Const, 0,
+                        ]).exportFunc();
+    builder.addFunction('func1', kSig_i_v)
+           .addBody([
+             kExprI32Const, 1,
+           ]);
+    builder.addFunction(undefined, kSig_i_v)
+           .addBody([
+             kExprI32Const, 2,
+           ]).exportAs('func1');
+    builder.addFunction(undefined, kSig_i_v)
+           .addBody([
+             kExprI32Const, 3,
+           ]);
+    const KEYS = [0, 1, 2, 3, '$main', '$func1', '$func3'];
+
+    InspectorTest.log('Compile module.');
+    const [module, scriptId] = await compileModule(builder);
+
+    InspectorTest.log('Set breakpoint in main.');
+    await Protocol.Debugger.setBreakpoint({
+      location: {scriptId, lineNumber: 0, columnNumber: main.body_offset}
+    });
+
+    InspectorTest.log('Instantiate module.');
+    const instance = await instantiateModule(module);
+
+    InspectorTest.log('Call main.');
+    const callMainPromise = Protocol.Runtime.callFunctionOn({
+      functionDeclaration: `function() { return this.exports.main(); }`,
+      objectId: instance.objectId
+    });
+    let callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `functions`);
+    await dumpOnCallFrame(callFrameId, `typeof functions`);
+    await dumpOnCallFrame(callFrameId, `Object.keys(functions)`);
+    await dumpKeysOnCallFrame(callFrameId, "functions", KEYS);
+    await Protocol.Debugger.resume();
+    await callMainPromise;
+  },
+
+  async function testLocals() {
+    const builder = new WasmModuleBuilder();
+    const main = builder.addFunction('main', kSig_v_ii, ['x', 'x'])
+                        .addLocals(kWasmI32, 1)
+                        .addBody([
+                          kExprI32Const, 42,
+                          kExprLocalSet, 2
+                        ]).exportFunc();
+    const KEYS = [0, 1, 2, '$x', '$var2'];
+
+    InspectorTest.log('Compile module.');
+    const [module, scriptId] = await compileModule(builder);
+
+    InspectorTest.log('Set breakpoint in main.');
+    await Protocol.Debugger.setBreakpoint({
+      location: {scriptId, lineNumber: 0, columnNumber: main.body_offset}
+    });
+
+    InspectorTest.log('Instantiate module.');
+    const instance = await instantiateModule(module);
+
+    InspectorTest.log('Call main.');
+    const callMainPromise = Protocol.Runtime.callFunctionOn({
+      functionDeclaration: `function() { return this.exports.main(3, 6); }`,
+      objectId: instance.objectId
+    });
+    let callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `locals`);
+    await dumpOnCallFrame(callFrameId, `typeof locals`);
+    await dumpOnCallFrame(callFrameId, `Object.keys(locals)`);
+    await dumpKeysOnCallFrame(callFrameId, "locals", KEYS);
+
+    InspectorTest.log(`Stepping twice in main.`)
+    await Protocol.Debugger.stepOver();  // i32.const 42
+    await Protocol.Debugger.stepOver();  // local.set $var2
+    callFrameId = await waitForDebuggerPaused();
+    await dumpKeysOnCallFrame(callFrameId, "locals", KEYS);
+    await Protocol.Debugger.resume();
+    await callMainPromise;
+  },
+
+  async function testMemories() {
+    const builder = new WasmModuleBuilder();
+    builder.addMemory(1, 1).exportMemoryAs('foo');
+    const main = builder.addFunction('main', kSig_v_v)
+                        .addBody([kExprNop]).exportFunc();
+    const KEYS = [0, '$foo'];
+
+    InspectorTest.log('Compile module.');
+    const [module, scriptId] = await compileModule(builder);
+
+    InspectorTest.log('Set breakpoint in main.');
+    await Protocol.Debugger.setBreakpoint({
+      location: {scriptId, lineNumber: 0, columnNumber: main.body_offset}
+    });
+
+    InspectorTest.log('Instantiate module.');
+    const instance = await instantiateModule(module);
+
+    InspectorTest.log('Call main.');
+    const callMainPromise = Protocol.Runtime.callFunctionOn({
+      functionDeclaration: `function() { return this.exports.main(); }`,
+      objectId: instance.objectId
+    });
+    let callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `memories`);
+    await dumpOnCallFrame(callFrameId, `typeof memories`);
+    await dumpOnCallFrame(callFrameId, `Object.keys(memories)`);
+    await dumpKeysOnCallFrame(callFrameId, "memories", KEYS);
+    await Protocol.Debugger.resume();
+    await callMainPromise;
+  },
+
+  async function testTables() {
+    const builder = new WasmModuleBuilder();
+    builder.addTable(kWasmFuncRef, 2).exportAs('bar');
+    const main = builder.addFunction('main', kSig_v_v)
+                        .addBody([kExprNop]).exportFunc();
+    const KEYS = [0, '$bar'];
+
+    InspectorTest.log('Compile module.');
+    const [module, scriptId] = await compileModule(builder);
+
+    InspectorTest.log('Set breakpoint in main.');
+    await Protocol.Debugger.setBreakpoint({
+      location: {scriptId, lineNumber: 0, columnNumber: main.body_offset}
+    });
+
+    InspectorTest.log('Instantiate module.');
+    const instance = await instantiateModule(module);
+
+    InspectorTest.log('Call main.');
+    const callMainPromise = Protocol.Runtime.callFunctionOn({
+      functionDeclaration: `function() { return this.exports.main(); }`,
+      objectId: instance.objectId
+    });
+    let callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `tables`);
+    await dumpOnCallFrame(callFrameId, `typeof tables`);
+    await dumpOnCallFrame(callFrameId, `Object.keys(tables)`);
+    await dumpKeysOnCallFrame(callFrameId, "tables", KEYS);
+    await Protocol.Debugger.resume();
+    await callMainPromise;
+  },
+
+  async function testStack() {
+    const builder = new WasmModuleBuilder();
+    const main = builder.addFunction('main', kSig_i_i)
+                        .addBody([
+                          kExprLocalGet, 0,
+                          kExprI32Const, 42,
+                          kExprI32Add,
+                        ]).exportFunc();
+
+    InspectorTest.log('Compile module.');
+    const [module, scriptId] = await compileModule(builder);
+
+    InspectorTest.log('Set breakpoint in main.');
+    await Protocol.Debugger.setBreakpoint({
+      location: {scriptId, lineNumber: 0, columnNumber: main.body_offset}
+    });
+
+    InspectorTest.log('Instantiate module.');
+    const instance = await instantiateModule(module);
+
+    InspectorTest.log('Call main.');
+    const callMainPromise = Protocol.Runtime.callFunctionOn({
+      functionDeclaration: `function() { return this.exports.main(5); }`,
+      objectId: instance.objectId
+    });
+    let callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `stack`);
+    await dumpOnCallFrame(callFrameId, `typeof stack`);
+    await dumpOnCallFrame(callFrameId, `Object.keys(stack)`);
+
+    InspectorTest.log(`Stepping twice in main.`)
+    await Protocol.Debugger.stepOver();  // local.get $var0
+    await Protocol.Debugger.stepOver();  // i32.const 42
+    callFrameId = await waitForDebuggerPaused();
+    await dumpOnCallFrame(callFrameId, `stack`);
+    await dumpOnCallFrame(callFrameId, `Object.keys(stack)`);
+    await dumpKeysOnCallFrame(callFrameId, "stack", [0, 1]);
+    await Protocol.Debugger.resume();
+    await callMainPromise;
+  }
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-externref-global.js b/deps/v8/test/inspector/debugger/wasm-externref-global.js
index 76df24804f98e1..c1a992be235075 100644
--- a/deps/v8/test/inspector/debugger/wasm-externref-global.js
+++ b/deps/v8/test/inspector/debugger/wasm-externref-global.js
@@ -9,8 +9,8 @@ utils.load('test/inspector/wasm-inspector-test.js');
 let {session, contextGroup, Protocol} =
     InspectorTest.start('Test wasm scope information with externref globals');
 
-(async function() {
-  try {
+InspectorTest.runAsyncTestSuite([
+  async function test() {
     let builder = new WasmModuleBuilder();
     builder.addImportedGlobal('m', 'global', kWasmExternRef, false);
     let func = builder.addFunction('func', kSig_v_v)
@@ -74,11 +74,5 @@ let {session, contextGroup, Protocol} =
         InspectorTest.log(`   ${prop.name}: {${values}}`);
       }
     }
-
-    InspectorTest.log('Finished.');
-  } catch (exc) {
-    InspectorTest.log(`Failed with exception: ${exc}.`);
-  } finally {
-    InspectorTest.completeTest();
   }
-})();
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets-expected.txt b/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets-expected.txt
index ee8bba2f6499d5..a6388d06c31ba8 100644
--- a/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets-expected.txt
@@ -1,4 +1,6 @@
 Tests breakable locations in wasm
+
+Running test: test
 Running testFunction...
 Script nr 0 parsed. URL: v8://test/instantiate
 Script nr 1 parsed. URL: wasm://wasm/354ada0e
@@ -73,4 +75,3 @@ Stopped at wasm://wasm/354ada0e:0:57
 Missing breakpoints: 1
 Stopped at wasm://wasm/354ada0e:0:58
 Missing breakpoints: 0
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets.js b/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets.js
index cad39c0704ffea..931ce978c12e7a 100644
--- a/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets.js
+++ b/deps/v8/test/inspector/debugger/wasm-get-breakable-locations-byte-offsets.js
@@ -35,23 +35,20 @@ var module_bytes = builder.toArray();
 Protocol.Debugger.enable();
 Protocol.Debugger.onScriptParsed(handleScriptParsed);
 
-async function runTest() {
-  InspectorTest.log('Running testFunction...');
-  await WasmInspectorTest.instantiate(module_bytes);
-  await getBreakableLocationsForAllWasmScripts();
-  await setAllBreakableLocations();
-  InspectorTest.log('Running wasm code...');
-  // Begin executing code:
-  var promise = WasmInspectorTest.evalWithUrl('instance.exports.main(1)', 'runWasm');
-  await waitForAllPauses();
-  // Code should now complete
-  await promise;
-  InspectorTest.log('Finished!');
-}
-
-runTest()
-    .catch(reason => InspectorTest.log(`Failed: ${reason}`))
-    .then(InspectorTest.completeTest);
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    InspectorTest.log('Running testFunction...');
+    await WasmInspectorTest.instantiate(module_bytes);
+    await getBreakableLocationsForAllWasmScripts();
+    await setAllBreakableLocations();
+    InspectorTest.log('Running wasm code...');
+    // Begin executing code:
+    var promise = WasmInspectorTest.evalWithUrl('instance.exports.main(1)', 'runWasm');
+    await waitForAllPauses();
+    // Code should now complete
+    await promise;
+  }
+]);
 
 var allBreakableLocations = [];
 
diff --git a/deps/v8/test/inspector/debugger/wasm-global-names-expected.txt b/deps/v8/test/inspector/debugger/wasm-global-names-expected.txt
index 912dbc85e103bb..b7584c1b723163 100644
--- a/deps/v8/test/inspector/debugger/wasm-global-names-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-global-names-expected.txt
@@ -1,7 +1,8 @@
 Test wasm global names
+
+Running test: test
 Waiting for wasm script to be parsed.
 Setting breakpoint in wasm.
 Running main.
 Paused in debugger.
-   globals: {"module_name.imported_global", "exported_global", "global2"}
-Finished.
+   globals: {"$module_name.imported_global", "$exported_global", "$global2"}
diff --git a/deps/v8/test/inspector/debugger/wasm-global-names.js b/deps/v8/test/inspector/debugger/wasm-global-names.js
index b6009bc8e7b6a6..26658db7601b53 100644
--- a/deps/v8/test/inspector/debugger/wasm-global-names.js
+++ b/deps/v8/test/inspector/debugger/wasm-global-names.js
@@ -17,23 +17,13 @@ let func = builder.addFunction('func', kSig_v_i)
                .exportAs('main');
 var o = builder.addGlobal(kWasmI32, func).exportAs('exported_global');
 builder.addGlobal(kWasmI32);  // global2
-let moduleBytes = JSON.stringify(builder.toArray());
+let moduleBytes = builder.toArray();
 
-function test(moduleBytes) {
-  let module = new WebAssembly.Module((new Uint8Array(moduleBytes)).buffer);
-  let imported_global_value = 123;
-  instance = new WebAssembly.Instance(
-      module, {module_name: {imported_global: imported_global_value}});
-}
-
-(async function() {
-  try {
+InspectorTest.runAsyncTestSuite([
+  async function test() {
     Protocol.Debugger.enable();
     Protocol.Runtime.evaluate({
-      expression: `
-      let instance;
-      ${test.toString()}
-      test(${moduleBytes});`
+      expression: `var instance = (${WasmInspectorTest.instantiateFromBuffer})(${JSON.stringify(moduleBytes)}, {module_name: {imported_global: 123}});`
     });
 
     InspectorTest.log('Waiting for wasm script to be parsed.');
@@ -72,11 +62,5 @@ function test(moduleBytes) {
         InspectorTest.log(`   ${prop.name}: {${values}}`);
       }
     }
-
-    InspectorTest.log('Finished.');
-  } catch (exc) {
-    InspectorTest.log(`Failed with exception: ${exc}.`);
-  } finally {
-    InspectorTest.completeTest();
   }
-})();
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-inspect-many-registers-expected.txt b/deps/v8/test/inspector/debugger/wasm-inspect-many-registers-expected.txt
index 3afdf5a85b9df3..2c05e3c1a3e06b 100644
--- a/deps/v8/test/inspector/debugger/wasm-inspect-many-registers-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-inspect-many-registers-expected.txt
@@ -1,102 +1,103 @@
 Test inspecting register values in Liftoff.
+
+Running test: test
 Testing i32.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 50; wasm-expression-stack: [0]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 52; wasm-expression-stack: [0, 1]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 54; wasm-expression-stack: [0, 1, 2]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 56; wasm-expression-stack: [0, 1, 2, 3]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 58; wasm-expression-stack: [0, 1, 2, 3, 4]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 60; wasm-expression-stack: [0, 1, 2, 3, 4, 5]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 62; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 64; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 66; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 68; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 69; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 70; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 71; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 72; wasm-expression-stack: [0, 1, 2, 3, 4, 35]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 73; wasm-expression-stack: [0, 1, 2, 3, 39]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 74; wasm-expression-stack: [0, 1, 2, 42]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 75; wasm-expression-stack: [0, 1, 44]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 76; wasm-expression-stack: [0, 45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 77; wasm-expression-stack: [45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 main returned.
 Testing i64.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 50; wasm-expression-stack: [0n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 52; wasm-expression-stack: [0n, 1n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 54; wasm-expression-stack: [0n, 1n, 2n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 56; wasm-expression-stack: [0n, 1n, 2n, 3n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 58; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 60; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 62; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n, 6n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 64; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 66; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 68; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 69; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 17n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 70; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 24n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 71; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 5n, 30n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 72; wasm-expression-stack: [0n, 1n, 2n, 3n, 4n, 35n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 73; wasm-expression-stack: [0n, 1n, 2n, 3n, 39n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 74; wasm-expression-stack: [0n, 1n, 2n, 42n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 75; wasm-expression-stack: [0n, 1n, 44n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 76; wasm-expression-stack: [0n, 45n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
+Paused at offset 77; wasm-expression-stack: [45n]; local: [0n, 1n, 2n, 3n, 4n, 5n, 6n, 7n, 8n, 9n]
 main returned.
 Testing f32.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 50; wasm-expression-stack: [0]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 52; wasm-expression-stack: [0, 1]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 54; wasm-expression-stack: [0, 1, 2]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 56; wasm-expression-stack: [0, 1, 2, 3]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 58; wasm-expression-stack: [0, 1, 2, 3, 4]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 60; wasm-expression-stack: [0, 1, 2, 3, 4, 5]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 62; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 64; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 66; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 68; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 69; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 70; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 71; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 72; wasm-expression-stack: [0, 1, 2, 3, 4, 35]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 73; wasm-expression-stack: [0, 1, 2, 3, 39]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 74; wasm-expression-stack: [0, 1, 2, 42]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 75; wasm-expression-stack: [0, 1, 44]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 76; wasm-expression-stack: [0, 45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 77; wasm-expression-stack: [45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 main returned.
 Testing f64.
 Waiting for wasm script.
 Setting 20 breakpoints.
 Calling main.
-Paused at offset 48; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: []
-Paused at offset 50; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0]
-Paused at offset 52; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1]
-Paused at offset 54; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2]
-Paused at offset 56; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3]
-Paused at offset 58; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4]
-Paused at offset 60; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5]
-Paused at offset 62; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]
-Paused at offset 64; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]
-Paused at offset 66; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-Paused at offset 68; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-Paused at offset 69; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]
-Paused at offset 70; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]
-Paused at offset 71; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]
-Paused at offset 72; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 4, 35]
-Paused at offset 73; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 3, 39]
-Paused at offset 74; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 2, 42]
-Paused at offset 75; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 1, 44]
-Paused at offset 76; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [0, 45]
-Paused at offset 77; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; wasm-expression-stack: [45]
+Paused at offset 48; wasm-expression-stack: []; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 50; wasm-expression-stack: [0]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 52; wasm-expression-stack: [0, 1]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 54; wasm-expression-stack: [0, 1, 2]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 56; wasm-expression-stack: [0, 1, 2, 3]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 58; wasm-expression-stack: [0, 1, 2, 3, 4]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 60; wasm-expression-stack: [0, 1, 2, 3, 4, 5]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 62; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 64; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 66; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 68; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 69; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 7, 17]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 70; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 6, 24]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 71; wasm-expression-stack: [0, 1, 2, 3, 4, 5, 30]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 72; wasm-expression-stack: [0, 1, 2, 3, 4, 35]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 73; wasm-expression-stack: [0, 1, 2, 3, 39]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 74; wasm-expression-stack: [0, 1, 2, 42]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 75; wasm-expression-stack: [0, 1, 44]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 76; wasm-expression-stack: [0, 45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+Paused at offset 77; wasm-expression-stack: [45]; local: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 main returned.
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-inspect-many-registers.js b/deps/v8/test/inspector/debugger/wasm-inspect-many-registers.js
index 829b9b5bfe075e..0737de88990d8d 100644
--- a/deps/v8/test/inspector/debugger/wasm-inspect-many-registers.js
+++ b/deps/v8/test/inspector/debugger/wasm-inspect-many-registers.js
@@ -88,11 +88,11 @@ async function testConfig(config) {
   InspectorTest.log('main returned.');
 }
 
-(async function test() {
-  await Protocol.Debugger.enable();
-  for (let config in configs) {
-    await testConfig(config);
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    for (let config in configs) {
+      await testConfig(config);
+    }
   }
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-memory-names-expected.txt b/deps/v8/test/inspector/debugger/wasm-memory-names-expected.txt
index e73262b9ab2608..7f390557843b53 100644
--- a/deps/v8/test/inspector/debugger/wasm-memory-names-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-memory-names-expected.txt
@@ -1,19 +1,21 @@
 Test wasm memory names
+
+Running test: test
 Waiting for wasm script to be parsed.
 Setting breakpoint in wasm.
 Running main.
 Paused in debugger.
-name: memory0
+name: $memory0
 Finished.
 Waiting for wasm script to be parsed.
 Setting breakpoint in wasm.
 Running main.
 Paused in debugger.
-name: exported_memory
+name: $exported_memory
 Finished.
 Waiting for wasm script to be parsed.
 Setting breakpoint in wasm.
 Running main.
 Paused in debugger.
-name: module_name.imported_mem
+name: $module_name.imported_mem
 Finished.
diff --git a/deps/v8/test/inspector/debugger/wasm-memory-names.js b/deps/v8/test/inspector/debugger/wasm-memory-names.js
index 955e8ab2333091..de622a2e95eddb 100644
--- a/deps/v8/test/inspector/debugger/wasm-memory-names.js
+++ b/deps/v8/test/inspector/debugger/wasm-memory-names.js
@@ -62,7 +62,7 @@ async function logMemoryName(msg, Protocol) {
                             })).result.result;
 
     for (let prop of moduleObjectProps) {
-      if (prop.name == 'instance') continue;
+      if (prop.name === 'instance' || prop.name === 'module') continue;
       InspectorTest.log(`name: ${prop.name}`);
     }
   }
@@ -102,17 +102,11 @@ contextGroup.addScript(`
   let instance;
   ${createInstance.toString()}`);
 
-(async function test() {
-  try {
+InspectorTest.runAsyncTestSuite([
+  async function test() {
     Protocol.Debugger.enable();
-
     await check(createModuleBytesUnnamedMemory());
     await check(createModuleBytesExportedMemory());
     await check(createModuleBytesImportedMemory());
-
-  } catch (exc) {
-    InspectorTest.log(`Failed with exception: ${exc}.`);
-  } finally {
-    InspectorTest.completeTest();
   }
-})();
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-regress-10957-expected.txt b/deps/v8/test/inspector/debugger/wasm-regress-10957-expected.txt
index 7a932feca1412b..40b3805c03f53a 100644
--- a/deps/v8/test/inspector/debugger/wasm-regress-10957-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-regress-10957-expected.txt
@@ -1,4 +1,5 @@
 Regress 10957
+
+Running test: testRegress10957
 Instantiate
-Finished!
 7
diff --git a/deps/v8/test/inspector/debugger/wasm-regress-10957.js b/deps/v8/test/inspector/debugger/wasm-regress-10957.js
index a2d465b88da93b..38d3b67322af69 100644
--- a/deps/v8/test/inspector/debugger/wasm-regress-10957.js
+++ b/deps/v8/test/inspector/debugger/wasm-regress-10957.js
@@ -53,18 +53,17 @@ function instantiate(bytes, imports) {
   return new WebAssembly.Instance(module, imports);
 }
 
-(async function Regress10957() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Instantiate');
-  const code =
-      `let instance = (${instantiate})(${JSON.stringify(module_bytes)}, {'imports': {'pause': () => { %ScheduleBreak() } }});
-      instance.exports.main();
-  `;
-  Protocol.Runtime.evaluate({'expression': code}).then(message =>
-      InspectorTest.logMessage(message.result.result.value));
-  await Protocol.Debugger.oncePaused();
-  Protocol.Debugger.resume();
-
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+InspectorTest.runAsyncTestSuite([
+  async function testRegress10957() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Instantiate');
+    const code =
+        `let instance = (${instantiate})(${JSON.stringify(module_bytes)}, {'imports': {'pause': () => { %ScheduleBreak() } }});
+        instance.exports.main();
+    `;
+    Protocol.Runtime.evaluate({'expression': code}).then(message =>
+        InspectorTest.logMessage(message.result.result.value));
+    await Protocol.Debugger.oncePaused();
+    Protocol.Debugger.resume();
+  }
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-remove-breakpoint-expected.txt b/deps/v8/test/inspector/debugger/wasm-remove-breakpoint-expected.txt
index 5edefd6ffa4716..50c407bcea6175 100644
--- a/deps/v8/test/inspector/debugger/wasm-remove-breakpoint-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-remove-breakpoint-expected.txt
@@ -1,4 +1,6 @@
 Tests remove breakpoint from wasm scripts.
+
+Running test: Test
 Calling instantiate function.
 Waiting for wasm scripts to be parsed.
 Ignoring script with url v8://test/instantiate
@@ -14,4 +16,3 @@ Script wasm://wasm/7d022e0e byte offset 39: Wasm opcode 0x6b (kExprI32Sub)
 Remove breakpoint
 Debugger.resume
 exports.main returned!
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-remove-breakpoint.js b/deps/v8/test/inspector/debugger/wasm-remove-breakpoint.js
index 3abbaae6d2de5b..b17f03c835a433 100644
--- a/deps/v8/test/inspector/debugger/wasm-remove-breakpoint.js
+++ b/deps/v8/test/inspector/debugger/wasm-remove-breakpoint.js
@@ -46,24 +46,24 @@ function test() {
 }
 //# sourceURL=test.js`);
 
-(async function Test() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Calling instantiate function.');
-  WasmInspectorTest.instantiate(module_bytes);
-  const scriptId = await waitForWasmScript();
-  InspectorTest.log(
-      'Setting breakpoint on line 3 of wasm function');
-  let msg = await Protocol.Debugger.setBreakpoint(
-      {'location': {'scriptId': scriptId, 'lineNumber': 0, 'columnNumber': func.body_offset + 4}});
-  printFailure(msg);
-  InspectorTest.logMessage(msg.result.actualLocation);
-  breakpointId = msg.result.breakpointId;
-  await Protocol.Runtime.evaluate({ expression: 'test()' });
-  await Protocol.Runtime.evaluate({ expression: 'test()' });
-  InspectorTest.log('exports.main returned!');
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+InspectorTest.runAsyncTestSuite([
+  async function Test() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Calling instantiate function.');
+    WasmInspectorTest.instantiate(module_bytes);
+    const scriptId = await waitForWasmScript();
+    InspectorTest.log(
+        'Setting breakpoint on line 3 of wasm function');
+    let msg = await Protocol.Debugger.setBreakpoint(
+        {'location': {'scriptId': scriptId, 'lineNumber': 0, 'columnNumber': func.body_offset + 4}});
+    printFailure(msg);
+    InspectorTest.logMessage(msg.result.actualLocation);
+    breakpointId = msg.result.breakpointId;
+    await Protocol.Runtime.evaluate({ expression: 'test()' });
+    await Protocol.Runtime.evaluate({ expression: 'test()' });
+    InspectorTest.log('exports.main returned!');
+  }
+]);
 
 function printFailure(message) {
   if (!message.result) {
diff --git a/deps/v8/test/inspector/debugger/wasm-reset-context-group-expected.txt b/deps/v8/test/inspector/debugger/wasm-reset-context-group-expected.txt
index a3c2dab8c3f707..fe7bdc9be7413c 100644
--- a/deps/v8/test/inspector/debugger/wasm-reset-context-group-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-reset-context-group-expected.txt
@@ -1,4 +1,6 @@
 Checks resetting context group with wasm.
+
+Running test: test
 {
     id : <messageId>
     result : {
diff --git a/deps/v8/test/inspector/debugger/wasm-reset-context-group.js b/deps/v8/test/inspector/debugger/wasm-reset-context-group.js
index f2b2f983e2642b..b26c74d0150d97 100644
--- a/deps/v8/test/inspector/debugger/wasm-reset-context-group.js
+++ b/deps/v8/test/inspector/debugger/wasm-reset-context-group.js
@@ -30,21 +30,21 @@ let contextGroup2 = new InspectorTest.ContextGroup();
 let session2 = contextGroup2.connect();
 session2.setupScriptMap();
 
-(async function test() {
-  await session1.Protocol.Debugger.enable();
-  await session2.Protocol.Debugger.enable();
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await session1.Protocol.Debugger.enable();
+    await session2.Protocol.Debugger.enable();
 
-  session1.Protocol.Runtime.evaluate({
-    expression: `var instance = (${WasmInspectorTest.instantiateFromBuffer})(${JSON.stringify(module_bytes)})`});
+    session1.Protocol.Runtime.evaluate({
+      expression: `var instance = (${WasmInspectorTest.instantiateFromBuffer})(${JSON.stringify(module_bytes)})`});
 
-  session2.Protocol.Runtime.evaluate({
-    expression: `var instance = (${WasmInspectorTest.instantiateFromBuffer})(${JSON.stringify(module_bytes)})`});
+    session2.Protocol.Runtime.evaluate({
+      expression: `var instance = (${WasmInspectorTest.instantiateFromBuffer})(${JSON.stringify(module_bytes)})`});
 
-  contextGroup2.reset();
+    contextGroup2.reset();
 
-  await session1.Protocol.Debugger.onceScriptParsed(2);
-  InspectorTest.logMessage(await session1.Protocol.Runtime.evaluate({expression: 'instance.exports.main(4)'}));
-  InspectorTest.logMessage(await session2.Protocol.Runtime.evaluate({expression: 'instance.exports.main(5)'}));
-
-  InspectorTest.completeTest();
-})();
+    await session1.Protocol.Debugger.onceScriptParsed(2);
+    InspectorTest.logMessage(await session1.Protocol.Runtime.evaluate({expression: 'instance.exports.main(4)'}));
+    InspectorTest.logMessage(await session2.Protocol.Runtime.evaluate({expression: 'instance.exports.main(5)'}));
+  }
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-scope-info-expected.txt b/deps/v8/test/inspector/debugger/wasm-scope-info-expected.txt
index 834121fef193b9..4fdec85b8d77cb 100644
--- a/deps/v8/test/inspector/debugger/wasm-scope-info-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-scope-info-expected.txt
@@ -1,737 +1,343 @@
-Test retrieving scope information when pausing in wasm functions
+Test retrieving scope information from compiled Liftoff frames
+
+Running test: test
 Calling instantiate function.
 Waiting for wasm script to be parsed.
 Got wasm script!
-Setting breakpoint on first instruction of second function
+Setting breakpoint on line 2 (first instruction) of third function
 {
-    columnNumber : 147
+    columnNumber : 169
     lineNumber : 0
     scriptId : <scriptId>
 }
 Paused:
-Script wasm://wasm/c723f83a byte offset 147: Wasm opcode 0x41 (kExprI32Const)
+Script wasm://wasm/e33badc2 byte offset 169: Wasm opcode 0x20 (kExprLocalGet)
 Scope:
-at func (0:147):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 4 (i32)
-   var1: 0 (i32)
-   i64_local: 0 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+at C (interpreted) (0:169):
  - scope (wasm-expression-stack):
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 149: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at func (0:149):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
  - scope (local):
-   0: 0 (f64)
-   i32Arg: 4 (i32)
-   var1: 0 (i32)
-   i64_local: 0 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 11 (i32)
-at call_func (0:132):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $var2: 0 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 0 (number)
+at B (liftoff) (0:158):
  - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 151: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at func (0:151):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
+   1: 3 (number)
  - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 0 (i32)
-   i64_local: 0 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
- - scope (wasm-expression-stack):
-at call_func (0:132):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 0 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 153: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at func (0:153):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
  - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 0 (i32)
-   i64_local: 0 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 47 (i32)
-at call_func (0:132):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 0 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 155: Wasm opcode 0x42 (kExprI64Const)
+Script wasm://wasm/e33badc2 byte offset 171: Wasm opcode 0x24 (kExprGlobalSet)
 Scope:
-at func (0:155):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: 0 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+at C (interpreted) (0:171):
  - scope (wasm-expression-stack):
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 166: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at func (0:166):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $var2: 0 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: 0 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 0 (number)
+at B (liftoff) (0:158):
  - scope (wasm-expression-stack):
-   0: 9223372036854775807 (i64)
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
+   1: 3 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 168: Wasm opcode 0x42 (kExprI64Const)
-Scope:
-at func (0:168):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: 9223372036854775807 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 0 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-at call_func (0:132):
+ - scope (local):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 0 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 179: Wasm opcode 0x21 (kExprLocalSet)
+Script wasm://wasm/e33badc2 byte offset 173: Wasm opcode 0x41 (kExprI32Const)
 Scope:
-at func (0:179):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: 9223372036854775807 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+at C (interpreted) (0:173):
  - scope (wasm-expression-stack):
-   0: -9223372036854775808 (i64)
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 181: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at func (0:181):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $var2: 0 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at B (liftoff) (0:158):
  - scope (wasm-expression-stack):
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
+   1: 3 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 183: Wasm opcode 0xb8 (kExprF64UConvertI32)
-Scope:
-at func (0:183):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-   0: 1 (i32)
-at call_func (0:132):
+ - scope (local):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 184: Wasm opcode 0x41 (kExprI32Const)
+Script wasm://wasm/e33badc2 byte offset 175: Wasm opcode 0x21 (kExprLocalSet)
 Scope:
-at func (0:184):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+at C (interpreted) (0:175):
  - scope (wasm-expression-stack):
-   0: 1 (f64)
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 47 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 186: Wasm opcode 0xb8 (kExprF64UConvertI32)
-Scope:
-at func (0:186):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $var2: 0 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at B (liftoff) (0:158):
  - scope (wasm-expression-stack):
-   0: 1 (f64)
-   1: 7 (i32)
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
+   1: 3 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 187: Wasm opcode 0xa3 (kExprF64Div)
-Scope:
-at func (0:187):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-   0: 1 (f64)
-   1: 7 (f64)
-at call_func (0:132):
+ - scope (local):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 188: Wasm opcode 0x21 (kExprLocalSet)
+Script wasm://wasm/e33badc2 byte offset 177: Wasm opcode 0x0b (kExprEnd)
 Scope:
-at func (0:188):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+at C (interpreted) (0:177):
  - scope (wasm-expression-stack):
-   0: 0.14285714285714285 (f64)
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 190: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at func (0:190):
+   $i32_arg: 42 (number)
+   $i32_local: 47 (number)
+   $var2: 0 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at B (liftoff) (0:158):
  - scope (wasm-expression-stack):
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
+   1: 3 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 192: Wasm opcode 0xfd (kSimdPrefix)
-Scope:
-at func (0:192):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-   0: 23 (i32)
-at call_func (0:132):
+ - scope (local):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 194: Wasm opcode 0x21 (kExprLocalSet)
+Script wasm://wasm/e33badc2 byte offset 160: Wasm opcode 0x1a (kExprDrop)
 Scope:
-at func (0:194):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  (v128)
-   var7: 0 (f32)
+at B (liftoff) (0:160):
  - scope (wasm-expression-stack):
-   0: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
+   1: 3 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 196: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at func (0:196):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-at call_func (0:132):
+ - scope (local):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 198: Wasm opcode 0xb3 (kExprF32UConvertI32)
+Script wasm://wasm/e33badc2 byte offset 161: Wasm opcode 0x1a (kExprDrop)
 Scope:
-at func (0:198):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-   var7: 0 (f32)
+at B (liftoff) (0:161):
  - scope (wasm-expression-stack):
-   0: 21 (i32)
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
+   0: 42 (number)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 199: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at func (0:199):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-   var7: 0 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-   0: 21 (f32)
-at call_func (0:132):
+ - scope (local):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 201: Wasm opcode 0x41 (kExprI32Const)
+Script wasm://wasm/e33badc2 byte offset 162: Wasm opcode 0x0b (kExprEnd)
 Scope:
-at func (0:201):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-   var7: 21 (f32)
+at B (liftoff) (0:162):
  - scope (wasm-expression-stack):
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 203: Wasm opcode 0x24 (kExprGlobalSet)
-Scope:
-at func (0:203):
+   $i32_arg: 42 (number)
+   $i32_local: 0 (number)
+   $f32_local: 7.199999809265137 (number)
+   $0: 0 (number)
+   $var5: 0 (number)
+   $v128_local: Uint8Array(16)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-   var7: 21 (f32)
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
+at A (liftoff) (0:128):
  - scope (wasm-expression-stack):
-   0: 15 (i32)
-at call_func (0:132):
+ - scope (local):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-Script wasm://wasm/c723f83a byte offset 205: Wasm opcode 0x0b (kExprEnd)
+Script wasm://wasm/e33badc2 byte offset 130: Wasm opcode 0x0b (kExprEnd)
 Scope:
-at func (0:205):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 15 (i32)
- - scope (local):
-   0: 0 (f64)
-   i32Arg: 11 (i32)
-   var1: 47 (i32)
-   i64_local: -9223372036854775808 (i64)
-   unicode☼f64: 0.14285714285714285 (f64)
-   var6: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
-   var7: 21 (f32)
+at A (liftoff) (0:130):
  - scope (wasm-expression-stack):
-at call_func (0:132):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 15 (i32)
  - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/c723f83a byte offset 134: Wasm opcode 0x0b (kExprEnd)
-Scope:
-at call_func (0:134):
+   $var0: 42 (number)
  - scope (module):
    instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 15 (i32)
- - scope (local):
-   var0: 4 (i32)
-   var1: 7.199999809265137 (f32)
- - scope (wasm-expression-stack):
+   module: Module
+   $exported_memory: Memory(1)
+   globals: "$exported_global": 42 (number)
 at (anonymous) (0:17):
  - scope (global):
    -- skipped globals
 
 Paused:
-instance.exports.main(4)
+instance.exports.main(42)
 
 Scope:
 at (anonymous) (1:31):
diff --git a/deps/v8/test/inspector/debugger/wasm-scope-info-liftoff-expected.txt b/deps/v8/test/inspector/debugger/wasm-scope-info-liftoff-expected.txt
deleted file mode 100644
index b5a50d57e75941..00000000000000
--- a/deps/v8/test/inspector/debugger/wasm-scope-info-liftoff-expected.txt
+++ /dev/null
@@ -1,323 +0,0 @@
-Test retrieving scope information from compiled Liftoff frames
-Calling instantiate function.
-Waiting for wasm script to be parsed.
-Got wasm script!
-Setting breakpoint on line 2 (first instruction) of third function
-{
-    columnNumber : 169
-    lineNumber : 0
-    scriptId : <scriptId>
-}
-Paused:
-Script wasm://wasm/e33badc2 byte offset 169: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at C (interpreted) (0:169):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   var2: 0 (f32)
- - scope (wasm-expression-stack):
-at B (liftoff) (0:158):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 171: Wasm opcode 0x24 (kExprGlobalSet)
-Scope:
-at C (interpreted) (0:171):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   var2: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-at B (liftoff) (0:158):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 0 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 173: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at C (interpreted) (0:173):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   var2: 0 (f32)
- - scope (wasm-expression-stack):
-at B (liftoff) (0:158):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 175: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at C (interpreted) (0:175):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   var2: 0 (f32)
- - scope (wasm-expression-stack):
-   0: 47 (i32)
-at B (liftoff) (0:158):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 177: Wasm opcode 0x0b (kExprEnd)
-Scope:
-at C (interpreted) (0:177):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   i32_arg: 42 (i32)
-   i32_local: 47 (i32)
-   var2: 0 (f32)
- - scope (wasm-expression-stack):
-at B (liftoff) (0:158):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 160: Wasm opcode 0x1a (kExprDrop)
-Scope:
-at B (liftoff) (0:160):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-   1: 3 (i32)
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 161: Wasm opcode 0x1a (kExprDrop)
-Scope:
-at B (liftoff) (0:161):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-   0: 42 (i32)
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 162: Wasm opcode 0x0b (kExprEnd)
-Scope:
-at B (liftoff) (0:162):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   0: 0 (f32)
-   i32_arg: 42 (i32)
-   i32_local: 0 (i32)
-   f32_local: 7.199999809265137 (f32)
-   var5: 0 (f32)
-   v128_local: 17 00 00 00 17 00 00 00 17 00 00 00 17 00 00 00  (v128)
- - scope (wasm-expression-stack):
-at A (liftoff) (0:128):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-Script wasm://wasm/e33badc2 byte offset 130: Wasm opcode 0x0b (kExprEnd)
-Scope:
-at A (liftoff) (0:130):
- - scope (module):
-   instance: exports: "exported_global" (Global), "exported_memory" (Memory), "exported_table" (Table), "main" (Function)
-   exported_memory: Uint8Array(65536)
-   globals: "exported_global": 42 (i32)
- - scope (local):
-   var0: 42 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
- - scope (global):
-   -- skipped globals
-
-Paused:
-instance.exports.main(42)
-
-Scope:
-at (anonymous) (1:31):
- - scope (global):
-   -- skipped globals
-
-exports.main returned. Test finished.
diff --git a/deps/v8/test/inspector/debugger/wasm-scope-info-liftoff.js b/deps/v8/test/inspector/debugger/wasm-scope-info-liftoff.js
deleted file mode 100644
index 4a6a8c7e4d269b..00000000000000
--- a/deps/v8/test/inspector/debugger/wasm-scope-info-liftoff.js
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2019 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Flags: --experimental-wasm-type-reflection --experimental-wasm-simd
-// SIMD in Liftoff only works with these cpu features, force them on.
-// Flags: --enable-sse3 --enable-ssse3 --enable-sse4-1
-
-utils.load('test/inspector/wasm-inspector-test.js');
-
-let {session, contextGroup, Protocol} = InspectorTest.start(
-    'Test retrieving scope information from compiled Liftoff frames');
-session.setupScriptMap();
-Protocol.Debugger.enable();
-Protocol.Debugger.onPaused(printPauseLocationsAndContinue);
-
-let breakpointLocation = -1;
-
-(async function test() {
-  // Instantiate wasm and wait for three wasm scripts for the three functions.
-  instantiateWasm();
-  let scriptIds = await waitForWasmScripts();
-
-  // Set a breakpoint.
-  InspectorTest.log(
-      'Setting breakpoint on line 2 (first instruction) of third function');
-  let breakpoint = await Protocol.Debugger.setBreakpoint(
-      {'location': {'scriptId': scriptIds[0], 'lineNumber': 0, 'columnNumber': breakpointLocation}});
-  printIfFailure(breakpoint);
-  InspectorTest.logMessage(breakpoint.result.actualLocation);
-
-  // Now run the wasm code.
-  await WasmInspectorTest.evalWithUrl('instance.exports.main(42)', 'runWasm');
-  InspectorTest.log('exports.main returned. Test finished.');
-  InspectorTest.completeTest();
-})();
-
-async function printPauseLocationsAndContinue(msg) {
-  let loc = msg.params.callFrames[0].location;
-  InspectorTest.log('Paused:');
-  await session.logSourceLocation(loc);
-  InspectorTest.log('Scope:');
-  for (var frame of msg.params.callFrames) {
-    var isWasmFrame = /^wasm/.test(frame.url);
-    var functionName = frame.functionName || '(anonymous)';
-    var lineNumber = frame.location.lineNumber;
-    var columnNumber = frame.location.columnNumber;
-    InspectorTest.log(`at ${functionName} (${lineNumber}:${columnNumber}):`);
-    for (var scope of frame.scopeChain) {
-      InspectorTest.logObject(' - scope (' + scope.type + '):');
-      if (!isWasmFrame && scope.type == 'global') {
-        // Skip global scope for non wasm-functions.
-        InspectorTest.logObject('   -- skipped globals');
-        continue;
-      }
-      var properties = await Protocol.Runtime.getProperties(
-          {'objectId': scope.object.objectId});
-      await WasmInspectorTest.dumpScopeProperties(properties);
-    }
-  }
-  InspectorTest.log();
-  Protocol.Debugger.stepOver();
-}
-
-async function instantiateWasm() {
-  var builder = new WasmModuleBuilder();
-  // Add a global, memory and exports to populate the module scope.
-  builder.addGlobal(kWasmI32, true).exportAs('exported_global');
-  builder.addMemory(1,1).exportMemoryAs('exported_memory');
-  builder.addTable(kWasmAnyFunc, 3).exportAs('exported_table');
-
-  // Add two functions without breakpoint, to check that locals and operand
-  // stack values are shown correctly in Liftoff code.
-  // Function A will have its parameter spilled to the stack, because it calls
-  // function B.
-  // Function B has a local with a constant value (not using a register), the
-  // parameter will be held in a register.
-  const main = builder.addFunction('A (liftoff)', kSig_v_i)
-      .addBody([
-        // Call function 'B', forwarding param 0.
-        kExprLocalGet, 0, kExprCallFunction, 1
-      ])
-      .exportAs('main');
-
-  builder.addFunction('B (liftoff)', kSig_v_i, ['i32_arg'])
-      .addLocals(kWasmI32, 1, ['i32_local'])
-      .addLocals(kWasmF32, 4, ['f32_local', '0', '0'])
-      .addLocals(kWasmS128, 1, ['v128_local'])
-      .addBody([
-        // Load a parameter and a constant onto the operand stack.
-        kExprLocalGet, 0, kExprI32Const, 3,
-        // Set local 6 to v128 i32.x4 23, 23, 23, 23.
-        kExprI32Const, 23,
-        kSimdPrefix, kExprI32x4Splat,
-        kExprLocalSet, 6,
-        // Set local 2 to 7.2.
-        ...wasmF32Const(7.2), kExprLocalSet, 2,
-        // Call function 'C', forwarding param 0.
-        kExprLocalGet, 0, kExprCallFunction, 2,
-        // Drop the two operand stack values.
-        kExprDrop, kExprDrop
-      ]);
-
-  // A third function which will be stepped through.
-  let func = builder.addFunction('C (interpreted)', kSig_v_i, ['i32_arg'])
-      .addLocals(kWasmI32, 1, ['i32_local'])
-      .addLocals(kWasmF32, 1, [''])
-      .addBody([
-        // Set global 0 to param 0.
-        kExprLocalGet, 0, kExprGlobalSet, 0,
-        // Set local 1 to 47.
-        kExprI32Const, 47, kExprLocalSet, 1,
-      ]);
-
-  // Append function to table to test function table output.
-  builder.appendToTable([main.index]);
-
-  var module_bytes = builder.toArray();
-  breakpointLocation = func.body_offset;
-
-
-  function addWasmJSToTable() {
-    // Create WasmJS functions to test the function tables output.
-    const js_func = function js_func() { return 7; };
-    const wasmjs_func = new WebAssembly.Function({parameters:[], results:['i32']}, js_func);
-    const wasmjs_anonymous_func = new WebAssembly.Function({parameters:[], results:['i32']}, _ => 7);
-
-    instance.exports.exported_table.set(0, wasmjs_func);
-    instance.exports.exported_table.set(1, wasmjs_anonymous_func);
-  }
-
-  InspectorTest.log('Calling instantiate function.');
-  await WasmInspectorTest.instantiate(module_bytes);
-  await WasmInspectorTest.evalWithUrl(`(${addWasmJSToTable})()`, 'populateTable');
-}
-
-function printIfFailure(message) {
-  if (!message.result) {
-    InspectorTest.logMessage(message);
-  }
-  return message;
-}
-
-async function waitForWasmScripts() {
-  InspectorTest.log('Waiting for wasm script to be parsed.');
-  let wasm_script_ids = [];
-  while (wasm_script_ids.length < 1) {
-    let script_msg = await Protocol.Debugger.onceScriptParsed();
-    let url = script_msg.params.url;
-    if (url.startsWith('wasm://')) {
-      InspectorTest.log('Got wasm script!');
-      wasm_script_ids.push(script_msg.params.scriptId);
-    }
-  }
-  return wasm_script_ids;
-}
diff --git a/deps/v8/test/inspector/debugger/wasm-scope-info.js b/deps/v8/test/inspector/debugger/wasm-scope-info.js
index 74d024c0274e11..04481a33b86db0 100644
--- a/deps/v8/test/inspector/debugger/wasm-scope-info.js
+++ b/deps/v8/test/inspector/debugger/wasm-scope-info.js
@@ -1,4 +1,4 @@
-// Copyright 2017 the V8 project authors. All rights reserved.
+// Copyright 2019 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,36 +9,32 @@
 utils.load('test/inspector/wasm-inspector-test.js');
 
 let {session, contextGroup, Protocol} = InspectorTest.start(
-    'Test retrieving scope information when pausing in wasm functions');
+    'Test retrieving scope information from compiled Liftoff frames');
 session.setupScriptMap();
 Protocol.Debugger.enable();
 Protocol.Debugger.onPaused(printPauseLocationsAndContinue);
 
-let breakpointLocation = undefined;  // Will be set by {instantiateWasm}.
-
-(async function test() {
-  // Instantiate wasm and wait for three wasm scripts for the three functions.
-  instantiateWasm();
-  let scriptIds = await waitForWasmScripts();
-
-  // Set a breakpoint.
-  InspectorTest.log(
-      'Setting breakpoint on first instruction of second function');
-  let breakpoint = await Protocol.Debugger.setBreakpoint({
-    'location' : {
-      'scriptId' : scriptIds[0],
-      'lineNumber' : 0,
-      'columnNumber' : breakpointLocation
-    }
-  });
-  printIfFailure(breakpoint);
-  InspectorTest.logMessage(breakpoint.result.actualLocation);
-
-  // Now run the wasm code.
-  await WasmInspectorTest.evalWithUrl('instance.exports.main(4)', 'runWasm');
-  InspectorTest.log('exports.main returned. Test finished.');
-  InspectorTest.completeTest();
-})();
+let breakpointLocation = -1;
+
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    // Instantiate wasm and wait for three wasm scripts for the three functions.
+    instantiateWasm();
+    let scriptIds = await waitForWasmScripts();
+
+    // Set a breakpoint.
+    InspectorTest.log(
+        'Setting breakpoint on line 2 (first instruction) of third function');
+    let breakpoint = await Protocol.Debugger.setBreakpoint(
+        {'location': {'scriptId': scriptIds[0], 'lineNumber': 0, 'columnNumber': breakpointLocation}});
+    printIfFailure(breakpoint);
+    InspectorTest.logMessage(breakpoint.result.actualLocation);
+
+    // Now run the wasm code.
+    await WasmInspectorTest.evalWithUrl('instance.exports.main(42)', 'runWasm');
+    InspectorTest.log('exports.main returned. Test finished.');
+  }
+]);
 
 async function printPauseLocationsAndContinue(msg) {
   let loc = msg.params.callFrames[0].location;
@@ -74,71 +70,69 @@ async function instantiateWasm() {
   builder.addMemory(1,1).exportMemoryAs('exported_memory');
   builder.addTable(kWasmAnyFunc, 3).exportAs('exported_table');
 
-  // Add a function without breakpoint, to check that locals are shown
-  // correctly in compiled code.
-  const main = builder.addFunction('call_func', kSig_v_i).addLocals(kWasmF32, 1)
-    .addBody([
-      // Set local 1 to 7.2.
-      ...wasmF32Const(7.2), kExprLocalSet, 1,
-      // Call function 'func', forwarding param 0.
-      kExprLocalGet, 0, kExprCallFunction, 1
-    ]).exportAs('main');
-
-  // A second function which will be stepped through.
-  const func = builder.addFunction('func', kSig_v_i, ['i32Arg'])
-    .addLocals(kWasmI32, 1)
-    .addLocals(kWasmI64, 1, ['i64_local'])
-    .addLocals(kWasmF64, 3, ['unicode☼f64', '0', '0'])
-    .addLocals(kWasmS128, 1)
-    .addLocals(kWasmF32, 1, [''])
-    .addBody([
-      // Set param 0 to 11.
-      kExprI32Const, 11, kExprLocalSet, 0,
-      // Set local 1 to 47.
-      kExprI32Const, 47, kExprLocalSet, 1,
-      // Set local 2 to 0x7FFFFFFFFFFFFFFF (max i64).
-      kExprI64Const, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0,
-      kExprLocalSet, 2,
-      // Set local 2 to 0x8000000000000000 (min i64).
-      kExprI64Const, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f,
-      kExprLocalSet, 2,
-      // Set local 3 to 1/7.
-      kExprI32Const, 1, kExprF64UConvertI32, kExprI32Const, 7,
-      kExprF64UConvertI32, kExprF64Div, kExprLocalSet, 3,
-      // Set local 6 to [23, 23, 23, 23]
-      kExprI32Const, 23,
-      kSimdPrefix, kExprI32x4Splat,
-      kExprLocalSet, 6,
-      // Set local 7 to 21
-      kExprI32Const, 21, kExprF32UConvertI32,
-      kExprLocalSet, 7,
-
-      // Set global 0 to 15
-      kExprI32Const, 15, kExprGlobalSet, 0,
-    ]);
+  // Add two functions without breakpoint, to check that locals and operand
+  // stack values are shown correctly in Liftoff code.
+  // Function A will have its parameter spilled to the stack, because it calls
+  // function B.
+  // Function B has a local with a constant value (not using a register), the
+  // parameter will be held in a register.
+  const main = builder.addFunction('A (liftoff)', kSig_v_i)
+      .addBody([
+        // Call function 'B', forwarding param 0.
+        kExprLocalGet, 0, kExprCallFunction, 1
+      ])
+      .exportAs('main');
+
+  builder.addFunction('B (liftoff)', kSig_v_i, ['i32_arg'])
+      .addLocals(kWasmI32, 1, ['i32_local'])
+      .addLocals(kWasmF32, 4, ['f32_local', '0', '0'])
+      .addLocals(kWasmS128, 1, ['v128_local'])
+      .addBody([
+        // Load a parameter and a constant onto the operand stack.
+        kExprLocalGet, 0, kExprI32Const, 3,
+        // Set local 6 to v128 i32.x4 23, 23, 23, 23.
+        kExprI32Const, 23,
+        kSimdPrefix, kExprI32x4Splat,
+        kExprLocalSet, 6,
+        // Set local 2 to 7.2.
+        ...wasmF32Const(7.2), kExprLocalSet, 2,
+        // Call function 'C', forwarding param 0.
+        kExprLocalGet, 0, kExprCallFunction, 2,
+        // Drop the two operand stack values.
+        kExprDrop, kExprDrop
+      ]);
+
+  // A third function which will be stepped through.
+  let func = builder.addFunction('C (interpreted)', kSig_v_i, ['i32_arg'])
+      .addLocals(kWasmI32, 1, ['i32_local'])
+      .addLocals(kWasmF32, 1, [''])
+      .addBody([
+        // Set global 0 to param 0.
+        kExprLocalGet, 0, kExprGlobalSet, 0,
+        // Set local 1 to 47.
+        kExprI32Const, 47, kExprLocalSet, 1,
+      ]);
 
   // Append function to table to test function table output.
   builder.appendToTable([main.index]);
 
-  let moduleBytes = builder.toArray();
+  var module_bytes = builder.toArray();
   breakpointLocation = func.body_offset;
 
+
   function addWasmJSToTable() {
     // Create WasmJS functions to test the function tables output.
     const js_func = function js_func() { return 7; };
-    const wasmjs_func = new WebAssembly.Function(
-      {parameters:[], results:['i32']}, js_func);
-    const wasmjs_anonymous_func = new WebAssembly.Function(
-      {parameters:[], results:['i32']}, _ => 7);
+    const wasmjs_func = new WebAssembly.Function({parameters:[], results:['i32']}, js_func);
+    const wasmjs_anonymous_func = new WebAssembly.Function({parameters:[], results:['i32']}, _ => 7);
 
     instance.exports.exported_table.set(0, wasmjs_func);
     instance.exports.exported_table.set(1, wasmjs_anonymous_func);
   }
 
   InspectorTest.log('Calling instantiate function.');
-  await WasmInspectorTest.instantiate(moduleBytes);
-  await WasmInspectorTest.evalWithUrl(`(${addWasmJSToTable})()`,
-                                      'populateTable');
+  await WasmInspectorTest.instantiate(module_bytes);
+  await WasmInspectorTest.evalWithUrl(`(${addWasmJSToTable})()`, 'populateTable');
 }
 
 function printIfFailure(message) {
diff --git a/deps/v8/test/inspector/debugger/wasm-script-code-offset-expected.txt b/deps/v8/test/inspector/debugger/wasm-script-code-offset-expected.txt
new file mode 100644
index 00000000000000..96b9aa36b5c9fc
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-script-code-offset-expected.txt
@@ -0,0 +1,11 @@
+Tests reported code offsets on wasm scripts
+
+Running test: test
+Wasm script parsed: ID 0, startColumn: 0, endColumn: 29, codeOffset: 0
+Wasm script parsed: ID 1, startColumn: 0, endColumn: 29, codeOffset: 0
+Wasm script parsed: ID 2, startColumn: 0, endColumn: 32, codeOffset: 31
+Wasm script parsed: ID 3, startColumn: 0, endColumn: 32, codeOffset: 31
+Wasm script parsed: ID 4, startColumn: 0, endColumn: 40, codeOffset: 36
+Wasm script parsed: ID 5, startColumn: 0, endColumn: 40, codeOffset: 36
+Wasm script parsed: ID 6, startColumn: 0, endColumn: 44, codeOffset: 36
+Wasm script parsed: ID 7, startColumn: 0, endColumn: 44, codeOffset: 36
diff --git a/deps/v8/test/inspector/debugger/wasm-script-code-offset-streaming-expected.txt b/deps/v8/test/inspector/debugger/wasm-script-code-offset-streaming-expected.txt
new file mode 100644
index 00000000000000..4d2a969ec4f06a
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-script-code-offset-streaming-expected.txt
@@ -0,0 +1,11 @@
+Tests reported code offsets on wasm scripts
+
+Running test: test
+Wasm script parsed: ID 0, startColumn: 0, endColumn: 29, codeOffset: 0
+Wasm script parsed: ID 1, startColumn: 0, endColumn: 29, codeOffset: 0
+Wasm script parsed: ID 2, startColumn: 0, endColumn: 32, codeOffset: 31
+Wasm script parsed: ID 3, startColumn: 0, endColumn: 32, codeOffset: 0
+Wasm script parsed: ID 4, startColumn: 0, endColumn: 40, codeOffset: 36
+Wasm script parsed: ID 5, startColumn: 0, endColumn: 40, codeOffset: 36
+Wasm script parsed: ID 6, startColumn: 0, endColumn: 44, codeOffset: 36
+Wasm script parsed: ID 7, startColumn: 0, endColumn: 44, codeOffset: 36
diff --git a/deps/v8/test/inspector/debugger/wasm-script-code-offset-streaming.js b/deps/v8/test/inspector/debugger/wasm-script-code-offset-streaming.js
new file mode 100644
index 00000000000000..8cb536d6c96033
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-script-code-offset-streaming.js
@@ -0,0 +1,145 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --wasm-test-streaming
+
+// Because of https://crbug.com/v8/10748 we skip pumping the message loop
+// with --stress-incremental-marking, which makes this test fail. Thus disable
+// that stress mode here.
+// Flags: --no-stress-incremental-marking
+
+utils.load('test/inspector/wasm-inspector-test.js');
+
+let {session, contextGroup, Protocol} =
+    InspectorTest.start('Tests reported code offsets on wasm scripts');
+
+// Include a sentinel in every module to avoid re-using a cached module.
+let sentinel = 0;
+
+function addHeader(binary, num_functions) {
+  binary.emit_header();
+
+  // Add a custom section with the sentinel.
+  var custom_section = new Binary();
+  custom_section.emit_u8(0);               // section code
+  custom_section.emit_u8(10);              // section length
+  custom_section.emit_string('sentinel');  // name
+  custom_section.emit_bytes([sentinel]);   // payload
+  ++sentinel;
+  binary.emit_bytes(custom_section.trunc_buffer());
+
+  // Type section with a single function type with no params and no returns.
+  binary.emit_section(kTypeSectionCode, section => {
+    section.emit_u32v(1);  // count
+    section.emit_u8(kWasmFunctionTypeForm);
+    section.emit_u32v(0);  // params
+    section.emit_u32v(0);  // results
+  });
+
+  // Function section with {num_functions} many functions.
+  binary.emit_section(kFunctionSectionCode, section => {
+    section.emit_u32v(num_functions);
+    for (let i = 0; i < num_functions; ++i) {
+      section.emit_u32v(0);  // type index
+    }
+  });
+}
+
+function createModuleWithNoCodeSection() {
+  let binary = new Binary;
+  addHeader(binary, 0);
+  return binary.trunc_buffer();
+}
+
+function createModuleWithEmptyCodeSection() {
+  let binary = new Binary;
+  addHeader(binary, 0);
+
+  // Section code.
+  binary.emit_u8(kCodeSectionCode);
+  // Section length (1).
+  binary.emit_u32v(1);
+  // Payload (functions count: 0).
+  binary.emit_u32v(0);
+
+  return binary.trunc_buffer();
+}
+
+function createModuleWithFiveByteSectionLength() {
+  let binary = new Binary;
+  addHeader(binary, 1);
+
+  // Section code.
+  binary.emit_u8(kCodeSectionCode);
+  // Section length (4 as 5-byte LEB).
+  binary.emit_bytes([0x84, 0x80, 0x80, 0x80, 0x00]);
+  binary.emit_u32v(1);                // functions count
+  binary.emit_u32v(2);                // body size
+  binary.emit_u32v(0);                // num locals
+  binary.emit_bytes([kExprEnd]);      // body
+
+  return binary.trunc_buffer();
+}
+
+function createModuleWithFiveBytePayload() {
+  let binary = new Binary;
+  addHeader(binary, 1);
+
+  // Section code.
+  binary.emit_u8(kCodeSectionCode);
+  // Section length (8).
+  binary.emit_bytes([0x88, 0x80, 0x80, 0x80, 0x00]);
+  // Functions count (1 as 5-byte LEB).
+  binary.emit_bytes([0x81, 0x80, 0x80, 0x80, 0x00]);
+  binary.emit_u32v(2);                // body size
+  binary.emit_u32v(0);                // num locals
+  binary.emit_bytes([kExprEnd]);      // body
+
+  return binary.trunc_buffer();
+}
+
+function compileSync(bytes) {
+  new WebAssembly.Module(new Uint8Array(bytes));
+}
+function compileAsync(bytes) {
+  WebAssembly.compile(new Uint8Array(bytes));
+}
+
+contextGroup.addScript(
+    `${compileSync}${compileAsync}`, 0, 0, 'v8://test/compileFunctions');
+
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    Protocol.Debugger.enable();
+    let script_ids = new Map();
+    let generators = [
+      createModuleWithNoCodeSection, createModuleWithEmptyCodeSection,
+      createModuleWithFiveByteSectionLength, createModuleWithFiveBytePayload
+    ];
+    for (let generator of generators) {
+      session.Protocol.Runtime.evaluate({
+        'expression': `
+          compileSync([${generator()}]);
+          compileAsync([${generator()}]);
+        `
+      });
+
+      // Wait for both wasm scripts to be there and print their information.
+      for (let wasm_scripts = 0; wasm_scripts < 2;) {
+        ({params} = await Protocol.Debugger.onceScriptParsed());
+        if (!params.url.startsWith('wasm://')) continue;
+        if (!script_ids.has(params.scriptId)) {
+          script_ids.set(params.scriptId, script_ids.size);
+        }
+        // Print script IDs to ensure that script are not deduplicated (via
+        // cache).
+        let stable_id = script_ids.get(params.scriptId);
+        InspectorTest.log(`Wasm script parsed: ID ${stable_id}, startColumn: ${
+            params.startColumn}, endColumn: ${params.endColumn}, codeOffset: ${
+            params.codeOffset}`);
+        ++wasm_scripts;
+      }
+    }
+  }
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-script-code-offset.js b/deps/v8/test/inspector/debugger/wasm-script-code-offset.js
new file mode 100644
index 00000000000000..a2d59a6404c5a0
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-script-code-offset.js
@@ -0,0 +1,143 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Because of https://crbug.com/v8/10748 we skip pumping the message loop
+// with --stress-incremental-marking, which makes this test fail. Thus disable
+// that stress mode here.
+// Flags: --no-stress-incremental-marking
+
+utils.load('test/inspector/wasm-inspector-test.js');
+
+let {session, contextGroup, Protocol} =
+    InspectorTest.start('Tests reported code offsets on wasm scripts');
+
+// Include a sentinel in every module to avoid re-using a cached module.
+let sentinel = 0;
+
+function addHeader(binary, num_functions) {
+  binary.emit_header();
+
+  // Add a custom section with the sentinel.
+  var custom_section = new Binary();
+  custom_section.emit_u8(0);               // section code
+  custom_section.emit_u8(10);              // section length
+  custom_section.emit_string('sentinel');  // name
+  custom_section.emit_bytes([sentinel]);   // payload
+  ++sentinel;
+  binary.emit_bytes(custom_section.trunc_buffer());
+
+  // Type section with a single function type with no params and no returns.
+  binary.emit_section(kTypeSectionCode, section => {
+    section.emit_u32v(1);  // count
+    section.emit_u8(kWasmFunctionTypeForm);
+    section.emit_u32v(0);  // params
+    section.emit_u32v(0);  // results
+  });
+
+  // Function section with {num_functions} many functions.
+  binary.emit_section(kFunctionSectionCode, section => {
+    section.emit_u32v(num_functions);
+    for (let i = 0; i < num_functions; ++i) {
+      section.emit_u32v(0);  // type index
+    }
+  });
+}
+
+function createModuleWithNoCodeSection() {
+  let binary = new Binary;
+  addHeader(binary, 0);
+  return binary.trunc_buffer();
+}
+
+function createModuleWithEmptyCodeSection() {
+  let binary = new Binary;
+  addHeader(binary, 0);
+
+  // Section code.
+  binary.emit_u8(kCodeSectionCode);
+  // Section length (1).
+  binary.emit_u32v(1);
+  // Payload (functions count: 0).
+  binary.emit_u32v(0);
+
+  return binary.trunc_buffer();
+}
+
+function createModuleWithFiveByteSectionLength() {
+  let binary = new Binary;
+  addHeader(binary, 1);
+
+  // Section code.
+  binary.emit_u8(kCodeSectionCode);
+  // Section length (4 as 5-byte LEB).
+  binary.emit_bytes([0x84, 0x80, 0x80, 0x80, 0x00]);
+  binary.emit_u32v(1);                // functions count
+  binary.emit_u32v(2);                // body size
+  binary.emit_u32v(0);                // num locals
+  binary.emit_bytes([kExprEnd]);      // body
+
+  return binary.trunc_buffer();
+}
+
+function createModuleWithFiveBytePayload() {
+  let binary = new Binary;
+  addHeader(binary, 1);
+
+  // Section code.
+  binary.emit_u8(kCodeSectionCode);
+  // Section length (8).
+  binary.emit_bytes([0x88, 0x80, 0x80, 0x80, 0x00]);
+  // Functions count (1 as 5-byte LEB).
+  binary.emit_bytes([0x81, 0x80, 0x80, 0x80, 0x00]);
+  binary.emit_u32v(2);                // body size
+  binary.emit_u32v(0);                // num locals
+  binary.emit_bytes([kExprEnd]);      // body
+
+  return binary.trunc_buffer();
+}
+
+function compileSync(bytes) {
+  new WebAssembly.Module(new Uint8Array(bytes));
+}
+function compileAsync(bytes) {
+  WebAssembly.compile(new Uint8Array(bytes));
+}
+
+contextGroup.addScript(
+    `${compileSync}${compileAsync}`, 0, 0, 'v8://test/compileFunctions');
+
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    Protocol.Debugger.enable();
+    let script_ids = new Map();
+    let generators = [
+      createModuleWithNoCodeSection, createModuleWithEmptyCodeSection,
+      createModuleWithFiveByteSectionLength, createModuleWithFiveBytePayload
+    ];
+    for (let generator of generators) {
+      session.Protocol.Runtime.evaluate({
+        'expression': `
+          compileSync([${generator()}]);
+          compileAsync([${generator()}]);
+        `
+      });
+
+      // Wait for both wasm scripts to be there and print their information.
+      for (let wasm_scripts = 0; wasm_scripts < 2;) {
+        ({params} = await Protocol.Debugger.onceScriptParsed());
+        if (!params.url.startsWith('wasm://')) continue;
+        if (!script_ids.has(params.scriptId)) {
+          script_ids.set(params.scriptId, script_ids.size);
+        }
+        // Print script IDs to ensure that script are not deduplicated (via
+        // cache).
+        let stable_id = script_ids.get(params.scriptId);
+        InspectorTest.log(`Wasm script parsed: ID ${stable_id}, startColumn: ${
+            params.startColumn}, endColumn: ${params.endColumn}, codeOffset: ${
+            params.codeOffset}`);
+        ++wasm_scripts;
+      }
+    }
+  }
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location-expected.txt b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location-expected.txt
index f5e94adbe52b36..25fbd9239e42a2 100644
--- a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location-expected.txt
@@ -1,4 +1,6 @@
 Tests if breakpoint set is first breakable location
+
+Running test: test
 Running test function...
 Set breakpoint outside of any function: (0, 0).
 Setting breakpoint for id: 4 at 0, 0.
@@ -18,4 +20,3 @@ Set breakpoint at non-breakable location: (0, 42).
 Setting breakpoint for id: 4 at 0, 42.
 Location match for (0, 43).
 Initial location is expected to be breakable: false.
-Finished!
\ No newline at end of file
diff --git a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location.js b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location.js
index 2627e87cfd366f..8c183963187538 100644
--- a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location.js
+++ b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-breaks-on-first-breakable-location.js
@@ -32,17 +32,14 @@ builder.addFunction('main', kSig_v_i)
 var module_bytes = builder.toArray();
 Protocol.Debugger.enable();
 
-runTest()
-    .catch(reason => InspectorTest.log(`Failed: ${reason}.`))
-    .then(InspectorTest.completeTest);
-
-async function runTest() {
-  InspectorTest.log('Running test function...');
-  WasmInspectorTest.instantiate(module_bytes);
-  const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
-  await checkSetBreakpointForScript(wasmScript.scriptId);
-  InspectorTest.log('Finished!');
-}
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    InspectorTest.log('Running test function...');
+    WasmInspectorTest.instantiate(module_bytes);
+    const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
+    await checkSetBreakpointForScript(wasmScript.scriptId);
+  }
+]);
 
 function printFailure(message) {
   if (!message.result) {
diff --git a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-expected.txt b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-expected.txt
index bb65e4f47d03ef..e3f47f8a2e8dd0 100644
--- a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-expected.txt
@@ -1,38 +1,429 @@
 Tests stepping through wasm scripts.
+
+Running test: test
 Instantiating.
 Waiting for wasm script (ignoring first non-wasm script).
-Setting breakpoint at offset 54 on script wasm://wasm/0c10a5fe
-Setting breakpoint at offset 53 on script wasm://wasm/0c10a5fe
-Setting breakpoint at offset 51 on script wasm://wasm/0c10a5fe
-Setting breakpoint at offset 49 on script wasm://wasm/0c10a5fe
-Setting breakpoint at offset 45 on script wasm://wasm/0c10a5fe
-Setting breakpoint at offset 47 on script wasm://wasm/0c10a5fe
+Setting breakpoint at offset 38 on script wasm://wasm/0c10a5fe
 Calling main(4)
-Breaking on byte offset 45
-Breaking on byte offset 47
-Breaking on byte offset 49
-Breaking on byte offset 51
-Breaking on byte offset 53
-Breaking on byte offset 54
-Breaking on byte offset 45
-Breaking on byte offset 47
-Breaking on byte offset 49
-Breaking on byte offset 51
-Breaking on byte offset 53
-Breaking on byte offset 54
-Breaking on byte offset 45
-Breaking on byte offset 47
-Breaking on byte offset 49
-Breaking on byte offset 51
-Breaking on byte offset 53
-Breaking on byte offset 54
-Breaking on byte offset 45
-Breaking on byte offset 47
-Breaking on byte offset 49
-Breaking on byte offset 51
-Breaking on byte offset 53
-Breaking on byte offset 54
-Breaking on byte offset 45
-Breaking on byte offset 47
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:38):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Setting breakpoint at offset 39 on script v8://test/runWasm
+Setting breakpoint at offset 61 on script v8://test/runWasm
+Setting breakpoint at offset 60 on script v8://test/runWasm
+Setting breakpoint at offset 54 on script v8://test/runWasm
+Setting breakpoint at offset 53 on script v8://test/runWasm
+Setting breakpoint at offset 51 on script v8://test/runWasm
+Setting breakpoint at offset 49 on script v8://test/runWasm
+Setting breakpoint at offset 45 on script v8://test/runWasm
+Setting breakpoint at offset 47 on script v8://test/runWasm
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:39):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
+Scope:
+at wasm_B (0:45):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
+Scope:
+at wasm_B (0:47):
+ - scope (wasm-expression-stack):
+   0: 3 (number)
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
+Scope:
+at wasm_B (0:49):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
+Scope:
+at wasm_B (0:51):
+ - scope (wasm-expression-stack):
+   0: 3 (number)
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
+Scope:
+at wasm_B (0:53):
+ - scope (wasm-expression-stack):
+   0: 3 (number)
+   1: 1 (number)
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
+Scope:
+at wasm_B (0:54):
+ - scope (wasm-expression-stack):
+   0: 2 (number)
+ - scope (local):
+   $var0: 3 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:38):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:39):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
+Scope:
+at wasm_B (0:45):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
+Scope:
+at wasm_B (0:47):
+ - scope (wasm-expression-stack):
+   0: 2 (number)
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
+Scope:
+at wasm_B (0:49):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
+Scope:
+at wasm_B (0:51):
+ - scope (wasm-expression-stack):
+   0: 2 (number)
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
+Scope:
+at wasm_B (0:53):
+ - scope (wasm-expression-stack):
+   0: 2 (number)
+   1: 1 (number)
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
+Scope:
+at wasm_B (0:54):
+ - scope (wasm-expression-stack):
+   0: 1 (number)
+ - scope (local):
+   $var0: 2 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:38):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:39):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
+Scope:
+at wasm_B (0:45):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
+Scope:
+at wasm_B (0:47):
+ - scope (wasm-expression-stack):
+   0: 1 (number)
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
+Scope:
+at wasm_B (0:49):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
+Scope:
+at wasm_B (0:51):
+ - scope (wasm-expression-stack):
+   0: 1 (number)
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
+Scope:
+at wasm_B (0:53):
+ - scope (wasm-expression-stack):
+   0: 1 (number)
+   1: 1 (number)
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
+Scope:
+at wasm_B (0:54):
+ - scope (wasm-expression-stack):
+   0: 0 (number)
+ - scope (local):
+   $var0: 1 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:38):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 0 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
+Scope:
+at wasm_A (0:39):
+ - scope (wasm-expression-stack):
+ - scope (local):
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at wasm_B (0:56):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 0 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
+Scope:
+at wasm_B (0:45):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 0 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
+Scope:
+at wasm_B (0:47):
+ - scope (wasm-expression-stack):
+   0: 0 (number)
+ - scope (local):
+   $var0: 0 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
+Paused:
+Script wasm://wasm/0c10a5fe byte offset 61: Wasm opcode 0x0b (kExprEnd)
+Scope:
+at wasm_B (0:61):
+ - scope (wasm-expression-stack):
+ - scope (local):
+   $var0: 0 (number)
+ - scope (module):
+   instance: exports: "main" (Function)
+   module: Module
+at (anonymous) (0:17):
+   -- skipped
 exports.main returned!
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-liftoff-expected.txt b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-liftoff-expected.txt
deleted file mode 100644
index 9511f986d809fe..00000000000000
--- a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-liftoff-expected.txt
+++ /dev/null
@@ -1,391 +0,0 @@
-Tests stepping through wasm scripts.
-Instantiating.
-Waiting for wasm script (ignoring first non-wasm script).
-Setting breakpoint at offset 38 on script wasm://wasm/0c10a5fe
-Calling main(4)
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Setting breakpoint at offset 39 on script v8://test/runWasm
-Setting breakpoint at offset 61 on script v8://test/runWasm
-Setting breakpoint at offset 60 on script v8://test/runWasm
-Setting breakpoint at offset 54 on script v8://test/runWasm
-Setting breakpoint at offset 53 on script v8://test/runWasm
-Setting breakpoint at offset 51 on script v8://test/runWasm
-Setting breakpoint at offset 49 on script v8://test/runWasm
-Setting breakpoint at offset 45 on script v8://test/runWasm
-Setting breakpoint at offset 47 on script v8://test/runWasm
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
-Scope:
-at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-   0: 3 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at wasm_B (0:49):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at wasm_B (0:51):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-   0: 3 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
-Scope:
-at wasm_B (0:53):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-   0: 3 (i32)
-   1: 1 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at wasm_B (0:54):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 3 (i32)
- - scope (wasm-expression-stack):
-   0: 2 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
-Scope:
-at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-   0: 2 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at wasm_B (0:49):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at wasm_B (0:51):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-   0: 2 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
-Scope:
-at wasm_B (0:53):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-   0: 2 (i32)
-   1: 1 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at wasm_B (0:54):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 2 (i32)
- - scope (wasm-expression-stack):
-   0: 1 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
-Scope:
-at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-   0: 1 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at wasm_B (0:49):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 51: Wasm opcode 0x41 (kExprI32Const)
-Scope:
-at wasm_B (0:51):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-   0: 1 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
-Scope:
-at wasm_B (0:53):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-   0: 1 (i32)
-   1: 1 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
-Scope:
-at wasm_B (0:54):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 1 (i32)
- - scope (wasm-expression-stack):
-   0: 0 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 38: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:38):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 0 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 39: Wasm opcode 0x01 (kExprNop)
-Scope:
-at wasm_A (0:39):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
- - scope (wasm-expression-stack):
-at wasm_B (0:56):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 0 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
-Scope:
-at wasm_B (0:45):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 0 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 47: Wasm opcode 0x04 (kExprIf)
-Scope:
-at wasm_B (0:47):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 0 (i32)
- - scope (wasm-expression-stack):
-   0: 0 (i32)
-at (anonymous) (0:17):
-   -- skipped
-Paused:
-Script wasm://wasm/0c10a5fe byte offset 61: Wasm opcode 0x0b (kExprEnd)
-Scope:
-at wasm_B (0:61):
- - scope (module):
-   instance: exports: "main" (Function)
- - scope (local):
-   var0: 0 (i32)
- - scope (wasm-expression-stack):
-at (anonymous) (0:17):
-   -- skipped
-exports.main returned!
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-liftoff.js b/deps/v8/test/inspector/debugger/wasm-set-breakpoint-liftoff.js
deleted file mode 100644
index 205b6fd604608d..00000000000000
--- a/deps/v8/test/inspector/debugger/wasm-set-breakpoint-liftoff.js
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-utils.load('test/inspector/wasm-inspector-test.js');
-
-const {session, contextGroup, Protocol} =
-    InspectorTest.start('Tests stepping through wasm scripts.');
-session.setupScriptMap();
-
-const builder = new WasmModuleBuilder();
-
-const func_a =
-    builder.addFunction('wasm_A', kSig_v_v).addBody([kExprNop, kExprNop]);
-
-// wasm_B calls wasm_A <param0> times.
-const func_b = builder.addFunction('wasm_B', kSig_v_i)
-    .addBody([
-      // clang-format off
-      kExprLoop, kWasmStmt,                // while
-        kExprLocalGet, 0,                  // -
-        kExprIf, kWasmStmt,                // if <param0> != 0
-          kExprLocalGet, 0,                // -
-          kExprI32Const, 1,                // -
-          kExprI32Sub,                     // -
-          kExprLocalSet, 0,                // decrease <param0>
-          kExprCallFunction, func_a.index, // -
-          kExprBr, 1,                      // continue
-          kExprEnd,                        // -
-        kExprEnd,                          // break
-      // clang-format on
-    ])
-    .exportAs('main');
-
-const module_bytes = builder.toArray();
-
-const getResult = msg => msg.result || InspectorTest.logMessage(msg);
-
-function setBreakpoint(offset, scriptId, scriptUrl) {
-  InspectorTest.log(
-      'Setting breakpoint at offset ' + offset + ' on script ' + scriptUrl);
-  return Protocol.Debugger
-      .setBreakpoint(
-          {'location': {'scriptId': scriptId, 'lineNumber': 0, 'columnNumber': offset}})
-      .then(getResult);
-}
-
-// Only set breakpoints during the first loop iteration.
-var first_iteration = true;
-
-Protocol.Debugger.onPaused(async msg => {
-  let loc = msg.params.callFrames[0].location;
-  InspectorTest.log('Paused:');
-  await session.logSourceLocation(loc);
-  InspectorTest.log('Scope:');
-  for (var frame of msg.params.callFrames) {
-    var functionName = frame.functionName || '(anonymous)';
-    var lineNumber = frame.location.lineNumber;
-    var columnNumber = frame.location.columnNumber;
-    InspectorTest.log(`at ${functionName} (${lineNumber}:${columnNumber}):`);
-    if (!/^wasm/.test(frame.url)) {
-      InspectorTest.log('   -- skipped');
-      continue;
-    }
-    for (var scope of frame.scopeChain) {
-      InspectorTest.logObject(' - scope (' + scope.type + '):');
-      var properties = await Protocol.Runtime.getProperties(
-          {'objectId': scope.object.objectId});
-      await WasmInspectorTest.dumpScopeProperties(properties);
-    }
-  }
-
-  if (first_iteration && loc.columnNumber == func_a.body_offset) {
-    // Check that setting breakpoints on active instances of A and B takes
-    // effect immediately.
-    setBreakpoint(func_a.body_offset + 1, loc.scriptId, frame.url);
-    // All of the following breakpoints are in reachable code, except offset 17.
-    for (offset of [18, 17, 11, 10, 8, 6, 2, 4]) {
-      setBreakpoint(func_b.body_offset + offset, loc.scriptId, frame.url);
-    }
-    first_iteration = false;
-  }
-
-  Protocol.Debugger.resume();
-});
-
-(async function test() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Instantiating.');
-  // Spawn asynchronously:
-  WasmInspectorTest.instantiate(module_bytes);
-  InspectorTest.log(
-      'Waiting for wasm script (ignoring first non-wasm script).');
-  // Ignore javascript and full module wasm script, get scripts for functions.
-  const [, {params: wasm_script}] = await Protocol.Debugger.onceScriptParsed(2);
-  // Set a breakpoint in function A at offset 0. When the debugger hits this
-  // breakpoint, new ones will be added.
-  await setBreakpoint(func_a.body_offset, wasm_script.scriptId, wasm_script.url);
-  InspectorTest.log('Calling main(4)');
-  await WasmInspectorTest.evalWithUrl('instance.exports.main(4)', 'runWasm');
-  InspectorTest.log('exports.main returned!');
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
diff --git a/deps/v8/test/inspector/debugger/wasm-set-breakpoint.js b/deps/v8/test/inspector/debugger/wasm-set-breakpoint.js
index 33507f97df2715..5db1e36979416e 100644
--- a/deps/v8/test/inspector/debugger/wasm-set-breakpoint.js
+++ b/deps/v8/test/inspector/debugger/wasm-set-breakpoint.js
@@ -1,4 +1,4 @@
-// Copyright 2018 the V8 project authors. All rights reserved.
+// Copyright 2020 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,27 +6,28 @@ utils.load('test/inspector/wasm-inspector-test.js');
 
 const {session, contextGroup, Protocol} =
     InspectorTest.start('Tests stepping through wasm scripts.');
+session.setupScriptMap();
 
 const builder = new WasmModuleBuilder();
 
-const func_a_idx =
-    builder.addFunction('wasm_A', kSig_v_v).addBody([kExprNop, kExprNop]).index;
+const func_a =
+    builder.addFunction('wasm_A', kSig_v_v).addBody([kExprNop, kExprNop]);
 
 // wasm_B calls wasm_A <param0> times.
 const func_b = builder.addFunction('wasm_B', kSig_v_i)
     .addBody([
       // clang-format off
-      kExprLoop, kWasmStmt,               // while
-        kExprLocalGet, 0,                 // -
-        kExprIf, kWasmStmt,               // if <param0> != 0
-          kExprLocalGet, 0,               // -
-          kExprI32Const, 1,               // -
-          kExprI32Sub,                    // -
-          kExprLocalSet, 0,               // decrease <param0>
-          kExprCallFunction, func_a_idx,  // -
-          kExprBr, 1,                     // continue
-          kExprEnd,                       // -
-        kExprEnd,                         // break
+      kExprLoop, kWasmStmt,                // while
+        kExprLocalGet, 0,                  // -
+        kExprIf, kWasmStmt,                // if <param0> != 0
+          kExprLocalGet, 0,                // -
+          kExprI32Const, 1,                // -
+          kExprI32Sub,                     // -
+          kExprLocalSet, 0,                // decrease <param0>
+          kExprCallFunction, func_a.index, // -
+          kExprBr, 1,                      // continue
+          kExprEnd,                        // -
+        kExprEnd,                          // break
       // clang-format on
     ])
     .exportAs('main');
@@ -35,39 +36,69 @@ const module_bytes = builder.toArray();
 
 const getResult = msg => msg.result || InspectorTest.logMessage(msg);
 
-function setBreakpoint(offset, script) {
+function setBreakpoint(offset, scriptId, scriptUrl) {
   InspectorTest.log(
-      'Setting breakpoint at offset ' + offset + ' on script ' + script.url);
+      'Setting breakpoint at offset ' + offset + ' on script ' + scriptUrl);
   return Protocol.Debugger
       .setBreakpoint(
-          {'location': {'scriptId': script.scriptId, 'lineNumber': 0, 'columnNumber': offset}})
+          {'location': {'scriptId': scriptId, 'lineNumber': 0, 'columnNumber': offset}})
       .then(getResult);
 }
 
-Protocol.Debugger.onPaused(pause_msg => {
-  let loc = pause_msg.params.callFrames[0].location;
-  if (loc.lineNumber != 0) {
-    InspectorTest.log('Unexpected line number: ' + loc.lineNumber);
+// Only set breakpoints during the first loop iteration.
+var first_iteration = true;
+
+Protocol.Debugger.onPaused(async msg => {
+  let loc = msg.params.callFrames[0].location;
+  InspectorTest.log('Paused:');
+  await session.logSourceLocation(loc);
+  InspectorTest.log('Scope:');
+  for (var frame of msg.params.callFrames) {
+    var functionName = frame.functionName || '(anonymous)';
+    var lineNumber = frame.location.lineNumber;
+    var columnNumber = frame.location.columnNumber;
+    InspectorTest.log(`at ${functionName} (${lineNumber}:${columnNumber}):`);
+    if (!/^wasm/.test(frame.url)) {
+      InspectorTest.log('   -- skipped');
+      continue;
+    }
+    for (var scope of frame.scopeChain) {
+      InspectorTest.logObject(' - scope (' + scope.type + '):');
+      var properties = await Protocol.Runtime.getProperties(
+          {'objectId': scope.object.objectId});
+      await WasmInspectorTest.dumpScopeProperties(properties);
+    }
+  }
+
+  if (first_iteration && loc.columnNumber == func_a.body_offset) {
+    // Check that setting breakpoints on active instances of A and B takes
+    // effect immediately.
+    setBreakpoint(func_a.body_offset + 1, loc.scriptId, frame.url);
+    // All of the following breakpoints are in reachable code, except offset 17.
+    for (offset of [18, 17, 11, 10, 8, 6, 2, 4]) {
+      setBreakpoint(func_b.body_offset + offset, loc.scriptId, frame.url);
+    }
+    first_iteration = false;
   }
-  InspectorTest.log('Breaking on byte offset ' + loc.columnNumber);
+
   Protocol.Debugger.resume();
 });
 
-(async function test() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Instantiating.');
-  // Spawn asynchronously:
-  WasmInspectorTest.instantiate(module_bytes);
-  InspectorTest.log(
-      'Waiting for wasm script (ignoring first non-wasm script).');
-  // Ignore javascript and full module wasm script, get scripts for functions.
-  const [, {params: wasm_script}] = await Protocol.Debugger.onceScriptParsed(2);
-  for (offset of [11, 10, 8, 6, 2, 4]) {
-    await setBreakpoint(func_b.body_offset + offset, wasm_script);
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Instantiating.');
+    // Spawn asynchronously:
+    WasmInspectorTest.instantiate(module_bytes);
+    InspectorTest.log(
+        'Waiting for wasm script (ignoring first non-wasm script).');
+    // Ignore javascript and full module wasm script, get scripts for functions.
+    const [, {params: wasm_script}] = await Protocol.Debugger.onceScriptParsed(2);
+    // Set a breakpoint in function A at offset 0. When the debugger hits this
+    // breakpoint, new ones will be added.
+    await setBreakpoint(func_a.body_offset, wasm_script.scriptId, wasm_script.url);
+    InspectorTest.log('Calling main(4)');
+    await WasmInspectorTest.evalWithUrl('instance.exports.main(4)', 'runWasm');
+    InspectorTest.log('exports.main returned!');
   }
-  InspectorTest.log('Calling main(4)');
-  await WasmInspectorTest.evalWithUrl('instance.exports.main(4)', 'runWasm');
-  InspectorTest.log('exports.main returned!');
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-stack-check-expected.txt b/deps/v8/test/inspector/debugger/wasm-stack-check-expected.txt
index 4868b3e3a24f70..08cfb12c064325 100644
--- a/deps/v8/test/inspector/debugger/wasm-stack-check-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-stack-check-expected.txt
@@ -1,12 +1,13 @@
 Tests pausing a running script and stepping
+
+Running test: testPauseAndStep
 Instantiate
 Wait for script
 Got wasm script: wasm://wasm/c84b7cde
 Run
 Expecting to pause at 61
-Paused at offset 61; local: [12]; wasm-expression-stack: []
-Paused at offset 62; local: [12]; wasm-expression-stack: []
-Paused at offset 64; local: [12]; wasm-expression-stack: [12]
-Paused at offset 66; local: [12]; wasm-expression-stack: [12, 1]
-Paused at offset 67; local: [12]; wasm-expression-stack: [13]
-Finished!
+Paused at offset 61; wasm-expression-stack: []; local: [12]
+Paused at offset 62; wasm-expression-stack: []; local: [12]
+Paused at offset 64; wasm-expression-stack: [12]; local: [12]
+Paused at offset 66; wasm-expression-stack: [12, 1]; local: [12]
+Paused at offset 67; wasm-expression-stack: [13]; local: [12]
diff --git a/deps/v8/test/inspector/debugger/wasm-stack-check.js b/deps/v8/test/inspector/debugger/wasm-stack-check.js
index 7963ab27e040a5..13f78446ea0d56 100644
--- a/deps/v8/test/inspector/debugger/wasm-stack-check.js
+++ b/deps/v8/test/inspector/debugger/wasm-stack-check.js
@@ -35,26 +35,26 @@ function instantiate(bytes, imports) {
   return new WebAssembly.Instance(module, imports);
 }
 
-(async function pauseAndStep() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Instantiate');
-  const instantiate_code = `var instance = (${instantiate})(${JSON.stringify(module_bytes)}, {'imports': {'pause': () => { %ScheduleBreak() } }});`;
-  WasmInspectorTest.evalWithUrl(instantiate_code, 'instantiate');
-  InspectorTest.log('Wait for script');
-  const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
-  InspectorTest.log('Got wasm script: ' + wasmScript.url);
+InspectorTest.runAsyncTestSuite([
+  async function testPauseAndStep() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Instantiate');
+    const instantiate_code = `var instance = (${instantiate})(${JSON.stringify(module_bytes)}, {'imports': {'pause': () => { %ScheduleBreak() } }});`;
+    WasmInspectorTest.evalWithUrl(instantiate_code, 'instantiate');
+    InspectorTest.log('Wait for script');
+    const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
+    InspectorTest.log('Got wasm script: ' + wasmScript.url);
 
-  InspectorTest.log('Run');
-  Protocol.Runtime.evaluate({expression: 'instance.exports.main()'});
-  InspectorTest.log('Expecting to pause at ' + (f.body_offset - 1));
-  await waitForPauseAndStep('stepInto');
-  await waitForPauseAndStep('stepInto');
-  await waitForPauseAndStep('stepInto');
-  await waitForPauseAndStep('stepInto');
-  await waitForPauseAndStep('resume');
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+    InspectorTest.log('Run');
+    Protocol.Runtime.evaluate({expression: 'instance.exports.main()'});
+    InspectorTest.log('Expecting to pause at ' + (f.body_offset - 1));
+    await waitForPauseAndStep('stepInto');
+    await waitForPauseAndStep('stepInto');
+    await waitForPauseAndStep('stepInto');
+    await waitForPauseAndStep('stepInto');
+    await waitForPauseAndStep('resume');
+  }
+]);
 
 async function waitForPauseAndStep(stepAction) {
   const msg = await Protocol.Debugger.oncePaused();
diff --git a/deps/v8/test/inspector/debugger/wasm-step-after-trap-expected.txt b/deps/v8/test/inspector/debugger/wasm-step-after-trap-expected.txt
index 3e3421ff8707e5..3424b6987a611c 100644
--- a/deps/v8/test/inspector/debugger/wasm-step-after-trap-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-step-after-trap-expected.txt
@@ -1,15 +1,17 @@
 Test scope inspection and stepping after a trap.
+
+Running test: test
 Instantiating.
 Calling div function.
 Paused at:
 --- 0 ---
 Script wasm://wasm/a9a86c5e byte offset 46: Wasm opcode 0x6d (kExprI32DivS)
 scope at div (0:46):
-   a: 1
-   b: 0
-   unused: 4711
-   local_zero: 0
-   local_const_11: 11
+   $a: 1
+   $b: 0
+   $unused: 4711
+   $local_zero: 0
+   $local_const_11: 11
 --- 1 ---
   try {
     instance.exports.#div(1, 0, 4711);  // traps (div by zero)
@@ -35,11 +37,11 @@ Paused at:
 --- 0 ---
 Script wasm://wasm/a9a86c5e byte offset 46: Wasm opcode 0x6d (kExprI32DivS)
 scope at div (0:46):
-   a: -2147483648
-   b: -1
-   unused: 4711
-   local_zero: 0
-   local_const_11: 11
+   $a: -2147483648
+   $b: -1
+   $unused: 4711
+   $local_zero: 0
+   $local_const_11: 11
 --- 1 ---
   try {
     instance.exports.#div(0x80000000, -1, 4711);  // traps (unrepresentable)
@@ -61,4 +63,3 @@ Paused at:
 
 -------------
 -> resume
-Finished.
diff --git a/deps/v8/test/inspector/debugger/wasm-step-after-trap.js b/deps/v8/test/inspector/debugger/wasm-step-after-trap.js
index 52c57fd1fa2038..6ccf83df58b5f3 100644
--- a/deps/v8/test/inspector/debugger/wasm-step-after-trap.js
+++ b/deps/v8/test/inspector/debugger/wasm-step-after-trap.js
@@ -62,16 +62,16 @@ function call_div() {
 
 contextGroup.addScript(call_div.toString());
 
-(async function test() {
-  await Protocol.Debugger.enable();
-  await Protocol.Debugger.setPauseOnExceptions({state: 'all'});
-  InspectorTest.log('Instantiating.');
-  await WasmInspectorTest.instantiate(module_bytes);
-  InspectorTest.log('Calling div function.');
-  await Protocol.Runtime.evaluate({'expression': 'call_div()'});
-  InspectorTest.log('Finished.');
-  InspectorTest.completeTest();
-})();
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    await Protocol.Debugger.setPauseOnExceptions({state: 'all'});
+    InspectorTest.log('Instantiating.');
+    await WasmInspectorTest.instantiate(module_bytes);
+    InspectorTest.log('Calling div function.');
+    await Protocol.Runtime.evaluate({'expression': 'call_div()'});
+  }
+]);
 
 async function printLocalScope(frame) {
   InspectorTest.log(`scope at ${frame.functionName} (${
diff --git a/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position-expected.txt b/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position-expected.txt
index 28e1bbe0916fa1..aae652248c98a8 100644
--- a/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position-expected.txt
@@ -1,4 +1,6 @@
 Step into a function that starts with a non-breakable opcode (i.e. block), then step from there. See https://crbug.com/1137710.
+
+Running test: test
 Setting up global instance variable.
 Got wasm script: wasm://wasm/4658c40e
 Setting breakpoint on offset 44
diff --git a/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position.js b/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position.js
index 2576d1364ae013..6371e80874d8bb 100644
--- a/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position.js
+++ b/deps/v8/test/inspector/debugger/wasm-step-from-non-breakable-position.js
@@ -21,34 +21,35 @@ var main = builder.addFunction('main', kSig_v_i)
 
 var module_bytes = builder.toArray();
 
-(async function test() {
-  InspectorTest.logProtocolCommandCalls('Debugger.stepInto');
-  InspectorTest.logProtocolCommandCalls('Debugger.resume');
-
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Setting up global instance variable.');
-  WasmInspectorTest.instantiate(module_bytes);
-  const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
-
-  InspectorTest.log(`Got wasm script: ${wasmScript.url}`);
-
-  // Set a breakpoint in 'main', at the call.
-  InspectorTest.log(`Setting breakpoint on offset ${main.body_offset}`);
-  await Protocol.Debugger.setBreakpoint({
-    location: {
-      scriptId: wasmScript.scriptId,
-      lineNumber: 0,
-      columnNumber: main.body_offset
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    InspectorTest.logProtocolCommandCalls('Debugger.stepInto');
+    InspectorTest.logProtocolCommandCalls('Debugger.resume');
+
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Setting up global instance variable.');
+    WasmInspectorTest.instantiate(module_bytes);
+    const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
+
+    InspectorTest.log(`Got wasm script: ${wasmScript.url}`);
+
+    // Set a breakpoint in 'main', at the call.
+    InspectorTest.log(`Setting breakpoint on offset ${main.body_offset}`);
+    await Protocol.Debugger.setBreakpoint({
+      location: {
+        scriptId: wasmScript.scriptId,
+        lineNumber: 0,
+        columnNumber: main.body_offset
+      }
+    });
+
+    InspectorTest.log('Running main function.');
+    Protocol.Runtime.evaluate({ expression: 'instance.exports.main()' });
+    for (let action of ['stepInto', 'stepInto', 'resume']) {
+      const {params: {callFrames}} = await Protocol.Debugger.oncePaused();
+      await session.logSourceLocation(callFrames[0].location);
+      Protocol.Debugger[action]();
     }
-  });
-
-  InspectorTest.log('Running main function.');
-  Protocol.Runtime.evaluate({ expression: 'instance.exports.main()' });
-  for (let action of ['stepInto', 'stepInto', 'resume']) {
-    const {params: {callFrames}} = await Protocol.Debugger.oncePaused();
-    await session.logSourceLocation(callFrames[0].location);
-    Protocol.Debugger[action]();
+    InspectorTest.log('exports.main returned.');
   }
-  InspectorTest.log('exports.main returned.');
-})().catch(reason => InspectorTest.log(`Failed: ${reason}`))
-    .finally(InspectorTest.completeTest);
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-expected.txt b/deps/v8/test/inspector/debugger/wasm-stepping-expected.txt
index 5d019fcb6c58ef..a29df6e5b3d5ad 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-expected.txt
@@ -1,4 +1,6 @@
 Tests stepping through wasm scripts by byte offsets
+
+Running test: test
 Setting up global instance variable.
 Got wasm script: wasm://wasm/42af3c82
 Setting breakpoint on offset 72 (should be propagated to 73, the offset of the call), url wasm://wasm/42af3c82
@@ -66,4 +68,3 @@ Removing breakpoint
 Debugger.stepOver called
 Script wasm://wasm/42af3c82 byte offset 95: Wasm opcode 0x20 (kExprLocalGet)
 Debugger.resume called
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js-expected.txt b/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js-expected.txt
index b22ff77a532fe7..eb48d90f20e7e9 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js-expected.txt
@@ -1,4 +1,6 @@
 Tests stepping from javascript into wasm
+
+Running test: test
 Calling instantiate function.
 Waiting for wasm scripts to be parsed.
 Ignoring script with url v8://test/instantiate
@@ -28,4 +30,3 @@ paused
 Script wasm://wasm/7d022e0e byte offset 37: Wasm opcode 0x41 (kExprI32Const)
 Debugger.resume
 exports.main returned!
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js.js b/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js.js
index 1cd0046a98715f..e445b436e98cf1 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js.js
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-in-from-js.js
@@ -44,26 +44,26 @@ function test() {
 }
 //# sourceURL=test.js`);
 
-(async function Test() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Calling instantiate function.');
-  WasmInspectorTest.instantiate(module_bytes);
-  const scriptId = await waitForWasmScript();
-  InspectorTest.log('Setting breakpoint on i32.const');
-  let msg = await Protocol.Debugger.setBreakpoint({
-    'location': {
-      'scriptId': scriptId,
-      'lineNumber': 0,
-      'columnNumber': 2 + func.body_offset
-    }
-  });
-  printFailure(msg);
-  InspectorTest.logMessage(msg.result.actualLocation);
-  await Protocol.Runtime.evaluate({expression: 'test()'});
-  InspectorTest.log('exports.main returned!');
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Calling instantiate function.');
+    WasmInspectorTest.instantiate(module_bytes);
+    const scriptId = await waitForWasmScript();
+    InspectorTest.log('Setting breakpoint on i32.const');
+    let msg = await Protocol.Debugger.setBreakpoint({
+      'location': {
+        'scriptId': scriptId,
+        'lineNumber': 0,
+        'columnNumber': 2 + func.body_offset
+      }
+    });
+    printFailure(msg);
+    InspectorTest.logMessage(msg.result.actualLocation);
+    await Protocol.Runtime.evaluate({expression: 'test()'});
+    InspectorTest.log('exports.main returned!');
+  }
+]);
 
 function printFailure(message) {
   if (!message.result) {
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging-expected.txt b/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging-expected.txt
index 61e9037fab4df0..066f5c354ee5f5 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging-expected.txt
@@ -1,4 +1,6 @@
 Tests that Liftoff does not merge opcodes while stepping
+
+Running test: test
 Setting breakpoint at offset 33.
 Paused at offset 33: [0]
 Paused at offset 35: [0, 0]
@@ -11,4 +13,3 @@ Paused at offset 33: [13]
 Paused at offset 35: [13, 13]
 Paused at offset 36: [13, 0]
 Paused at offset 38: [13]
-Finished.
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging.js b/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging.js
index 172ea1223d7dc8..2522386f2a231b 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging.js
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-no-opcode-merging.js
@@ -21,25 +21,25 @@ let module_bytes = builder.toArray();
 let wasm_script_id = undefined;
 Protocol.Debugger.onPaused(printPauseLocationAndStep);
 
-(async function test() {
-  await Protocol.Debugger.enable();
-  WasmInspectorTest.instantiate(module_bytes);
-  [, {params: {scriptId: wasm_script_id}}] = await Protocol.Debugger.onceScriptParsed(2);
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    WasmInspectorTest.instantiate(module_bytes);
+    [, {params: {scriptId: wasm_script_id}}] = await Protocol.Debugger.onceScriptParsed(2);
 
-  // Set a breakpoint at the beginning of 'fun'.
-  const offset = fun.body_offset;
-  InspectorTest.log(`Setting breakpoint at offset ${offset}.`);
-  let bpmsg = await Protocol.Debugger.setBreakpoint({
-    location: {scriptId: wasm_script_id, lineNumber: 0, columnNumber: offset}
-  });
+    // Set a breakpoint at the beginning of 'fun'.
+    const offset = fun.body_offset;
+    InspectorTest.log(`Setting breakpoint at offset ${offset}.`);
+    let bpmsg = await Protocol.Debugger.setBreakpoint({
+      location: {scriptId: wasm_script_id, lineNumber: 0, columnNumber: offset}
+    });
 
-  for (let value of [0, -1, 13]) {
-    await Protocol.Runtime.evaluate(
-        {expression: `instance.exports.fun(${value})`});
+    for (let value of [0, -1, 13]) {
+      await Protocol.Runtime.evaluate(
+          {expression: `instance.exports.fun(${value})`});
+    }
   }
-  InspectorTest.log('Finished.');
-})().catch(reason => InspectorTest.log(`Failed: ${reason}`))
-    .finally(InspectorTest.completeTest);
+]);
 
 async function printPauseLocationAndStep(msg) {
   // If we are outside of wasm, continue.
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-out-from-js-expected.txt b/deps/v8/test/inspector/debugger/wasm-stepping-out-from-js-expected.txt
new file mode 100644
index 00000000000000..dbfc0af780f840
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-out-from-js-expected.txt
@@ -0,0 +1,39 @@
+Tests stepping out from javascript to a wasm caller
+
+Running test: test
+Instantiating.
+Running exports.main.
+>>> First round
+Paused at:
+function pauseAlternating() {
+  if (pause) #debugger;
+  pause = !pause;
+
+Paused at:
+Script wasm://wasm/15df010e byte offset 53: Wasm opcode 0x0b (kExprEnd)
+Paused at:
+instance.exports.main()#
+
+exports.main returned.
+After stepping out of the last script, we should stop right at the beginning of the next script.
+>>> Second round
+Paused at:
+#instance.exports.main()
+
+exports.main returned.
+The next cycle should work as before (stopping at the "debugger" statement), after stopping at script entry.
+>>> Third round
+Paused at:
+#instance.exports.main()
+
+Paused at:
+function pauseAlternating() {
+  if (pause) #debugger;
+  pause = !pause;
+
+Paused at:
+Script wasm://wasm/15df010e byte offset 53: Wasm opcode 0x0b (kExprEnd)
+Paused at:
+instance.exports.main()#
+
+exports.main returned.
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-out-from-js.js b/deps/v8/test/inspector/debugger/wasm-stepping-out-from-js.js
new file mode 100644
index 00000000000000..a3c837d311b342
--- /dev/null
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-out-from-js.js
@@ -0,0 +1,61 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+utils.load('test/inspector/wasm-inspector-test.js');
+
+let {session, contextGroup, Protocol} =
+    InspectorTest.start('Tests stepping out from javascript to a wasm caller');
+session.setupScriptMap();
+
+let builder = new WasmModuleBuilder();
+
+let pause = builder.addImport('imp', 'pause', kSig_v_v);
+let func = builder.addFunction('wasm_main', kSig_v_v)
+               .addBody([kExprCallFunction, pause])
+               .exportAs('main');
+
+let module_bytes = builder.toArray();
+
+Protocol.Debugger.onPaused(async message => {
+  InspectorTest.log('Paused at:');
+  var frames = message.params.callFrames;
+  await session.logSourceLocation(frames[0].location);
+  await Protocol.Debugger.stepOut();
+});
+
+contextGroup.addScript(`
+let pause = true;
+function pauseAlternating() {
+  if (pause) debugger;
+  pause = !pause;
+}
+`);
+
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Instantiating.');
+    const instantiate_code =
+        `const instance = (${WasmInspectorTest.instantiateFromBuffer})(${
+            JSON.stringify(module_bytes)}, {imp: {pause: pauseAlternating}});`;
+    WasmInspectorTest.evalWithUrl(instantiate_code, 'instantiate');
+    const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
+    const scriptId = wasmScript.scriptId;
+
+    InspectorTest.log('Running exports.main.');
+    InspectorTest.log('>>> First round');
+    await Protocol.Runtime.evaluate({expression: 'instance.exports.main()'});
+    InspectorTest.log('exports.main returned.');
+
+    InspectorTest.log('After stepping out of the last script, we should stop right at the beginning of the next script.');
+    InspectorTest.log('>>> Second round');
+    await Protocol.Runtime.evaluate({expression: 'instance.exports.main()'});
+    InspectorTest.log('exports.main returned.');
+
+    InspectorTest.log('The next cycle should work as before (stopping at the "debugger" statement), after stopping at script entry.');
+    InspectorTest.log('>>> Third round');
+    await Protocol.Runtime.evaluate({expression: 'instance.exports.main()'});
+    InspectorTest.log('exports.main returned.');
+  }
+]);
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-to-js-expected.txt b/deps/v8/test/inspector/debugger/wasm-stepping-to-js-expected.txt
index 4b3bd5dd60715d..1c3996a93e42e4 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-to-js-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-to-js-expected.txt
@@ -1,4 +1,6 @@
 Tests stepping to javascript from wasm
+
+Running test: test
 Calling instantiate function.
 Waiting for wasm scripts to be parsed.
 Ignoring script with url v8://test/instantiate
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-to-js.js b/deps/v8/test/inspector/debugger/wasm-stepping-to-js.js
index 7ab7599c7561c2..2debb024ee81dd 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-to-js.js
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-to-js.js
@@ -61,26 +61,27 @@ function test() {
 }
 //# sourceURL=test.js`);
 
-(async function Test() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Calling instantiate function.');
-  WasmInspectorTest.instantiate(module_bytes);
-  const scriptId = await waitForWasmScript();
-  InspectorTest.log(
-      'Setting breakpoint at start of wasm function');
-  let msg = await Protocol.Debugger.setBreakpoint(
-      {'location': {'scriptId': scriptId, 'lineNumber': 0, 'columnNumber': func.body_offset}});
-  printFailure(msg);
-  InspectorTest.logMessage(msg.result.actualLocation);
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Calling instantiate function.');
+    WasmInspectorTest.instantiate(module_bytes);
+    const scriptId = await waitForWasmScript();
+    InspectorTest.log(
+        'Setting breakpoint at start of wasm function');
+    let msg = await Protocol.Debugger.setBreakpoint(
+        {'location': {'scriptId': scriptId, 'lineNumber': 0, 'columnNumber': func.body_offset}});
+    printFailure(msg);
+    InspectorTest.logMessage(msg.result.actualLocation);
 
-  for (var i=1; i<=3; i++) {
-    InspectorTest.log('Start run '+ i);
-    await Protocol.Runtime.evaluate({ expression: 'test()' });
-    InspectorTest.log('exports.main returned!');
-    InspectorTest.log('Finished run '+ i +'!\n');
+    for (var i=1; i<=3; i++) {
+      InspectorTest.log('Start run '+ i);
+      await Protocol.Runtime.evaluate({ expression: 'test()' });
+      InspectorTest.log('exports.main returned!');
+      InspectorTest.log('Finished run '+ i +'!\n');
+    }
   }
-  InspectorTest.completeTest();
-})();
+]);
 
 function printFailure(message) {
   if (!message.result) {
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist-expected.txt b/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist-expected.txt
index e501728678c0c4..26d815bf25d6b7 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist-expected.txt
@@ -1,4 +1,6 @@
 Tests stepping through wasm scripts by byte offsets
+
+Running test: test
 Setting up global instance variable
 Got wasm script: wasm://wasm/befe41aa
 {
@@ -114,4 +116,3 @@ Input positions array is not sorted or contains duplicate values.
 Test: skip list is not sorted
 Testing stepInto with skipList: [{"scriptId":"4","start":{"lineNumber":0,"columnNumber":50},"end":{"lineNumber":0,"columnNumber":62}},{"scriptId":"4","start":{"lineNumber":0,"columnNumber":48},"end":{"lineNumber":0,"columnNumber":62}}]
 Input positions array is not sorted or contains duplicate values.
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist.js b/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist.js
index 0017274ef68435..e315a565e0d00c 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist.js
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-with-skiplist.js
@@ -44,30 +44,26 @@ const call_function_offset = loop_body_start_offset + 12;
 const func_a_start_offset = func_a.body_offset;
 const func_a_end_offset = func_a_start_offset + 2;
 
-runTest()
-    .catch(reason => InspectorTest.log(`Failed: ${reason}`))
-    .then(InspectorTest.completeTest);
-
-async function runTest() {
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Setting up global instance variable');
-  WasmInspectorTest.instantiate(module_bytes);
-  const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
-  const scriptId = wasmScript.scriptId;
-
-  InspectorTest.log('Got wasm script: ' + wasmScript.url);
-
-  let bpmsg = await Protocol.Debugger.setBreakpoint({
-    location:
-        {scriptId: scriptId, lineNumber: 0, columnNumber: loop_start_offset}
-  });
-  InspectorTest.logMessage(bpmsg.result.actualLocation);
-
-  await checkValidSkipLists(scriptId);
-  await checkInvalidSkipLists(scriptId);
-
-  InspectorTest.log('Finished!');
-}
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Setting up global instance variable');
+    WasmInspectorTest.instantiate(module_bytes);
+    const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
+    const scriptId = wasmScript.scriptId;
+
+    InspectorTest.log('Got wasm script: ' + wasmScript.url);
+
+    let bpmsg = await Protocol.Debugger.setBreakpoint({
+      location:
+          {scriptId: scriptId, lineNumber: 0, columnNumber: loop_start_offset}
+    });
+    InspectorTest.logMessage(bpmsg.result.actualLocation);
+
+    await checkValidSkipLists(scriptId);
+    await checkInvalidSkipLists(scriptId);
+  }
+]);
 
 async function checkValidSkipLists(scriptId) {
   InspectorTest.log('Test with valid skip lists');
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map-expected.txt b/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map-expected.txt
index bf423acd1ae214..12865dec50438b 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map-expected.txt
@@ -1,4 +1,6 @@
 Tests stepping through wasm scripts with source maps
+
+Running test: test
 Got wasm script: wasm://wasm/9b4bf87e
 Script sourceMapURL: abc
 Requesting source for wasm://wasm/9b4bf87e...
@@ -11,321 +13,320 @@ Setting breakpoint on offset 54 (on the setlocal before the call), url wasm://wa
 }
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":4}
  - scope (wasm-expression-stack):
    {"0":3}
+ - scope (local):
+   {"$var0":4}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":3}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:38):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
  - scope (wasm-expression-stack):
    {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
  - scope (module):
    -- skipped
- - scope (local):
-   {"var0":3}
+at wasm_B (0:56):
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 39: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:39):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
  - scope (wasm-expression-stack):
    {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
  - scope (module):
    -- skipped
- - scope (local):
-   {"var0":3}
+at wasm_B (0:56):
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":3}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":3}
  - scope (wasm-expression-stack):
    {"0":2}
+ - scope (local):
+   {"$var0":3}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":2}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":2}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepOver called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":2}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":2}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.resume called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":2}
  - scope (wasm-expression-stack):
    {"0":1}
+ - scope (local):
+   {"$var0":2}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:38):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
  - scope (wasm-expression-stack):
    {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
  - scope (module):
    -- skipped
- - scope (local):
-   {"var0":1}
+at wasm_B (0:56):
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepOut called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 45: Wasm opcode 0x20 (kExprLocalGet)
 at wasm_B (0:45):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 47: Wasm opcode 0x04 (kExprIf)
 at wasm_B (0:47):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {"0":1}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 49: Wasm opcode 0x20 (kExprLocalGet)
 at wasm_B (0:49):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 51: Wasm opcode 0x41 (kExprI32Const)
 at wasm_B (0:51):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {"0":1}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 53: Wasm opcode 0x6b (kExprI32Sub)
 at wasm_B (0:53):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {"0":1,"1":1}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 54: Wasm opcode 0x21 (kExprLocalSet)
 at wasm_B (0:54):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":1}
  - scope (wasm-expression-stack):
    {"0":0}
+ - scope (local):
+   {"$var0":1}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 56: Wasm opcode 0x10 (kExprCallFunction)
 at wasm_B (0:56):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":0}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 38: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:38):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
  - scope (wasm-expression-stack):
    {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
  - scope (module):
    -- skipped
- - scope (local):
-   {"var0":0}
+at wasm_B (0:56):
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 39: Wasm opcode 0x01 (kExprNop)
 at wasm_A (0:39):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
  - scope (wasm-expression-stack):
    {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
  - scope (module):
    -- skipped
- - scope (local):
-   {"var0":0}
+at wasm_B (0:56):
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 40: Wasm opcode 0x0b (kExprEnd)
 at wasm_A (0:40):
- - scope (module):
-   -- skipped
- - scope (local):
-   {}
  - scope (wasm-expression-stack):
    {}
-at wasm_B (0:56):
+ - scope (local):
+   {}
  - scope (module):
    -- skipped
- - scope (local):
-   {"var0":0}
+at wasm_B (0:56):
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.stepInto called
 Script wasm://wasm/9b4bf87e byte offset 58: Wasm opcode 0x0c (kExprBr)
 at wasm_B (0:58):
- - scope (module):
-   -- skipped
- - scope (local):
-   {"var0":0}
  - scope (wasm-expression-stack):
    {}
+ - scope (local):
+   {"$var0":0}
+ - scope (module):
+   -- skipped
 at (anonymous) (0:17):
  - scope (global):
    -- skipped
 Debugger.resume called
 exports.main returned!
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map.js b/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map.js
index 5c7e514e45c807..18766b89e809ac 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map.js
+++ b/deps/v8/test/inspector/debugger/wasm-stepping-with-source-map.js
@@ -36,47 +36,47 @@ builder.addCustomSection('sourceMappingURL', [3, 97, 98, 99]);
 
 var module_bytes = builder.toArray();
 
-(async function test() {
-  for (const action of ['stepInto', 'stepOver', 'stepOut', 'resume'])
-    InspectorTest.logProtocolCommandCalls('Debugger.' + action);
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    for (const action of ['stepInto', 'stepOver', 'stepOut', 'resume'])
+      InspectorTest.logProtocolCommandCalls('Debugger.' + action);
 
-  await Protocol.Debugger.enable();
-  WasmInspectorTest.instantiate(module_bytes);
-  const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
+    await Protocol.Debugger.enable();
+    WasmInspectorTest.instantiate(module_bytes);
+    const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
 
-  InspectorTest.log('Got wasm script: ' + wasmScript.url);
-  InspectorTest.log('Script sourceMapURL: ' + wasmScript.sourceMapURL);
-  InspectorTest.log('Requesting source for ' + wasmScript.url + '...');
-  const msg =
-      await Protocol.Debugger.getScriptSource({scriptId: wasmScript.scriptId});
-  InspectorTest.log(`Source retrieved without error: ${!msg.error}`);
-  InspectorTest.log(
-      `Setting breakpoint on offset 54 (on the setlocal before the call), url ${wasmScript.url}`);
-  const {result: {actualLocation}} = await Protocol.Debugger.setBreakpoint({
-    location:{scriptId: wasmScript.scriptId, lineNumber: 0, columnNumber: 54}});
-  InspectorTest.logMessage(actualLocation);
-  Protocol.Runtime.evaluate({expression: 'instance.exports.main(4)'});
-  await waitForPauseAndStep('stepInto');  // == stepOver, to call instruction
-  await waitForPauseAndStep('stepInto');  // into call to wasm_A
-  await waitForPauseAndStep('stepOver');  // over first nop
-  await waitForPauseAndStep('stepOut');   // out of wasm_A
-  await waitForPauseAndStep('stepOut');  // out of wasm_B, stop on breakpoint again
-  await waitForPauseAndStep('stepOver');  // to call
-  await waitForPauseAndStep('stepOver');  // over call
-  await waitForPauseAndStep('resume');  // to next breakpoint (third iteration)
-  await waitForPauseAndStep('stepInto');  // to call
-  await waitForPauseAndStep('stepInto');  // into wasm_A
-  await waitForPauseAndStep('stepOut');   // out to wasm_B
-  // Now step 8 times, until we are in wasm_A again.
-  for (let i = 0; i < 8; ++i) await waitForPauseAndStep('stepInto');
-  // 3 more times, back to wasm_B.
-  for (let i = 0; i < 3; ++i) await waitForPauseAndStep('stepInto');
-  // then just resume.
-  await waitForPauseAndStep('resume');
-  InspectorTest.log('exports.main returned!');
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+    InspectorTest.log('Got wasm script: ' + wasmScript.url);
+    InspectorTest.log('Script sourceMapURL: ' + wasmScript.sourceMapURL);
+    InspectorTest.log('Requesting source for ' + wasmScript.url + '...');
+    const msg =
+        await Protocol.Debugger.getScriptSource({scriptId: wasmScript.scriptId});
+    InspectorTest.log(`Source retrieved without error: ${!msg.error}`);
+    InspectorTest.log(
+        `Setting breakpoint on offset 54 (on the setlocal before the call), url ${wasmScript.url}`);
+    const {result: {actualLocation}} = await Protocol.Debugger.setBreakpoint({
+      location:{scriptId: wasmScript.scriptId, lineNumber: 0, columnNumber: 54}});
+    InspectorTest.logMessage(actualLocation);
+    Protocol.Runtime.evaluate({expression: 'instance.exports.main(4)'});
+    await waitForPauseAndStep('stepInto');  // == stepOver, to call instruction
+    await waitForPauseAndStep('stepInto');  // into call to wasm_A
+    await waitForPauseAndStep('stepOver');  // over first nop
+    await waitForPauseAndStep('stepOut');   // out of wasm_A
+    await waitForPauseAndStep('stepOut');  // out of wasm_B, stop on breakpoint again
+    await waitForPauseAndStep('stepOver');  // to call
+    await waitForPauseAndStep('stepOver');  // over call
+    await waitForPauseAndStep('resume');  // to next breakpoint (third iteration)
+    await waitForPauseAndStep('stepInto');  // to call
+    await waitForPauseAndStep('stepInto');  // into wasm_A
+    await waitForPauseAndStep('stepOut');   // out to wasm_B
+    // Now step 8 times, until we are in wasm_A again.
+    for (let i = 0; i < 8; ++i) await waitForPauseAndStep('stepInto');
+    // 3 more times, back to wasm_B.
+    for (let i = 0; i < 3; ++i) await waitForPauseAndStep('stepInto');
+    // then just resume.
+    await waitForPauseAndStep('resume');
+    InspectorTest.log('exports.main returned!');
+  }
+]);
 
 async function waitForPauseAndStep(stepAction) {
   const {params: {callFrames}} = await Protocol.Debugger.oncePaused();
@@ -91,14 +91,15 @@ async function waitForPauseAndStep(stepAction) {
       if (scope.type === 'global' || scope.type === 'module') {
         InspectorTest.logObject('   -- skipped');
       } else {
-        const {result: {result: {value}}} =
-            await Protocol.Runtime.callFunctionOn({
-              objectId: scope.object.objectId,
-              functionDeclaration: 'function() { return this; }',
-              returnByValue: true
+        const object = {};
+        const {result: {result: properties}} =
+            await Protocol.Runtime.getProperties({
+              objectId: scope.object.objectId
             });
-
-        InspectorTest.log(`   ${JSON.stringify(value)}`);
+        for (const {name, value: {value}} of properties) {
+          object[name] = value;
+        }
+        InspectorTest.log(`   ${JSON.stringify(object)}`);
       }
     }
   }
diff --git a/deps/v8/test/inspector/debugger/wasm-stepping.js b/deps/v8/test/inspector/debugger/wasm-stepping.js
index c8dbedef5c6abb..83ca29606d4e5d 100644
--- a/deps/v8/test/inspector/debugger/wasm-stepping.js
+++ b/deps/v8/test/inspector/debugger/wasm-stepping.js
@@ -54,69 +54,69 @@ let fact = builder.addFunction('fact', kSig_i_i)
 
 var module_bytes = builder.toArray();
 
-(async function test() {
-  for (const action of ['stepInto', 'stepOver', 'stepOut', 'resume'])
-    InspectorTest.logProtocolCommandCalls('Debugger.' + action);
-
-  await Protocol.Debugger.enable();
-  InspectorTest.log('Setting up global instance variable.');
-  WasmInspectorTest.instantiate(module_bytes);
-  const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
-
-  InspectorTest.log('Got wasm script: ' + wasmScript.url);
-
-  // Set the breakpoint on a non-breakable position. This should resolve to the
-  // next instruction.
-  var offset = func_b.body_offset + 15;
-  InspectorTest.log(
-      `Setting breakpoint on offset ` + offset + ` (should be propagated to ` +
-        (offset + 1) + `, the offset of the call), url ${wasmScript.url}`);
-  let bpmsg = await Protocol.Debugger.setBreakpoint({
-    location: {scriptId: wasmScript.scriptId, lineNumber: 0, columnNumber: offset}
-  });
-
-  InspectorTest.logMessage(bpmsg.result.actualLocation);
-  Protocol.Runtime.evaluate({ expression: 'instance.exports.main(4)' });
-  await waitForPauseAndStep('stepInto');  // into call to wasm_A
-  await waitForPauseAndStep('stepOver');  // over first nop
-  await waitForPauseAndStep('stepOut');   // out of wasm_A
-  await waitForPauseAndStep('stepOut');   // out of wasm_B, stop on breakpoint
-  await waitForPauseAndStep('stepOver');  // over call
-  await waitForPauseAndStep('stepInto');  // == stepOver br
-  await waitForPauseAndStep('resume');    // to next breakpoint (3rd iteration)
-  await waitForPauseAndStep('stepInto');  // into wasm_A
-  await waitForPauseAndStep('stepOut');   // out to wasm_B
-  // Now step 10 times, until we are in wasm_A again.
-  for (let i = 0; i < 10; ++i) await waitForPauseAndStep('stepInto');
-  // 3 more times, back to wasm_B.
-  for (let i = 0; i < 3; ++i) await waitForPauseAndStep('stepInto');
-  // Then just resume.
-  await waitForPauseAndStep('resume');
-  InspectorTest.log('exports.main returned!');
-
-  InspectorTest.log('Test stepping over a recursive call');
-  // Set a breakpoint at the recursive call and run.
-  offset = fact.body_offset + 9; // Offset of the recursive call instruction.
-  InspectorTest.log(
-      `Setting breakpoint on the recursive call instruction @+` + offset +
-      `, url ${wasmScript.url}`);
-  bpmsg = await Protocol.Debugger.setBreakpoint({
-    location: {scriptId: wasmScript.scriptId, lineNumber: 0, columnNumber: offset}
-  });
-  actualLocation = bpmsg.result.actualLocation;
-  InspectorTest.logMessage(actualLocation);
-  Protocol.Runtime.evaluate({ expression: 'instance.exports.fact(4)' });
-  await waitForPause();
-
-  // Remove the breakpoint before stepping over.
-  InspectorTest.log('Removing breakpoint');
-  let breakpointId = bpmsg.result.breakpointId;
-  await Protocol.Debugger.removeBreakpoint({breakpointId});
-  await Protocol.Debugger.stepOver();
-  await waitForPauseAndStep('resume');
-  InspectorTest.log('Finished!');
-})().catch(reason => InspectorTest.log(`Failed: ${reason}`))
-    .finally(InspectorTest.completeTest);
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    for (const action of ['stepInto', 'stepOver', 'stepOut', 'resume'])
+      InspectorTest.logProtocolCommandCalls('Debugger.' + action);
+
+    await Protocol.Debugger.enable();
+    InspectorTest.log('Setting up global instance variable.');
+    WasmInspectorTest.instantiate(module_bytes);
+    const [, {params: wasmScript}] = await Protocol.Debugger.onceScriptParsed(2);
+
+    InspectorTest.log('Got wasm script: ' + wasmScript.url);
+
+    // Set the breakpoint on a non-breakable position. This should resolve to the
+    // next instruction.
+    var offset = func_b.body_offset + 15;
+    InspectorTest.log(
+        `Setting breakpoint on offset ` + offset + ` (should be propagated to ` +
+          (offset + 1) + `, the offset of the call), url ${wasmScript.url}`);
+    let bpmsg = await Protocol.Debugger.setBreakpoint({
+      location: {scriptId: wasmScript.scriptId, lineNumber: 0, columnNumber: offset}
+    });
+
+    InspectorTest.logMessage(bpmsg.result.actualLocation);
+    Protocol.Runtime.evaluate({ expression: 'instance.exports.main(4)' });
+    await waitForPauseAndStep('stepInto');  // into call to wasm_A
+    await waitForPauseAndStep('stepOver');  // over first nop
+    await waitForPauseAndStep('stepOut');   // out of wasm_A
+    await waitForPauseAndStep('stepOut');   // out of wasm_B, stop on breakpoint
+    await waitForPauseAndStep('stepOver');  // over call
+    await waitForPauseAndStep('stepInto');  // == stepOver br
+    await waitForPauseAndStep('resume');    // to next breakpoint (3rd iteration)
+    await waitForPauseAndStep('stepInto');  // into wasm_A
+    await waitForPauseAndStep('stepOut');   // out to wasm_B
+    // Now step 10 times, until we are in wasm_A again.
+    for (let i = 0; i < 10; ++i) await waitForPauseAndStep('stepInto');
+    // 3 more times, back to wasm_B.
+    for (let i = 0; i < 3; ++i) await waitForPauseAndStep('stepInto');
+    // Then just resume.
+    await waitForPauseAndStep('resume');
+    InspectorTest.log('exports.main returned!');
+
+    InspectorTest.log('Test stepping over a recursive call');
+    // Set a breakpoint at the recursive call and run.
+    offset = fact.body_offset + 9; // Offset of the recursive call instruction.
+    InspectorTest.log(
+        `Setting breakpoint on the recursive call instruction @+` + offset +
+        `, url ${wasmScript.url}`);
+    bpmsg = await Protocol.Debugger.setBreakpoint({
+      location: {scriptId: wasmScript.scriptId, lineNumber: 0, columnNumber: offset}
+    });
+    actualLocation = bpmsg.result.actualLocation;
+    InspectorTest.logMessage(actualLocation);
+    Protocol.Runtime.evaluate({ expression: 'instance.exports.fact(4)' });
+    await waitForPause();
+
+    // Remove the breakpoint before stepping over.
+    InspectorTest.log('Removing breakpoint');
+    let breakpointId = bpmsg.result.breakpointId;
+    await Protocol.Debugger.removeBreakpoint({breakpointId});
+    await Protocol.Debugger.stepOver();
+    await waitForPauseAndStep('resume');
+  }
+]);
 
 async function waitForPauseAndStep(stepAction) {
   await waitForPause();
diff --git a/deps/v8/test/inspector/debugger/wasm-unnamed-function-names-expected.txt b/deps/v8/test/inspector/debugger/wasm-unnamed-function-names-expected.txt
index d7819588a586c7..e0146285cf1ea7 100644
--- a/deps/v8/test/inspector/debugger/wasm-unnamed-function-names-expected.txt
+++ b/deps/v8/test/inspector/debugger/wasm-unnamed-function-names-expected.txt
@@ -1,4 +1,6 @@
 Tests unnamed function in wasm scripts
+
+Running test: test
 Running testFunction with generated wasm bytes...
 Paused on 'debugger;'
 Number of frames: 5
@@ -7,4 +9,3 @@ Number of frames: 5
   - [2] main
   - [3] testFunction
   - [4] 
-Finished!
diff --git a/deps/v8/test/inspector/debugger/wasm-unnamed-function-names.js b/deps/v8/test/inspector/debugger/wasm-unnamed-function-names.js
index 307bc0f3d62bde..7d39849914fe05 100644
--- a/deps/v8/test/inspector/debugger/wasm-unnamed-function-names.js
+++ b/deps/v8/test/inspector/debugger/wasm-unnamed-function-names.js
@@ -43,16 +43,15 @@ function testFunction(bytes) {
 
 contextGroup.addScript(testFunction.toString());
 
-(async function test() {
-  await Protocol.Debugger.enable();
-  Protocol.Debugger.onPaused(handleDebuggerPaused);
-  InspectorTest.log('Running testFunction with generated wasm bytes...');
-  await Protocol.Runtime.evaluate(
-      {'expression': 'testFunction(' + JSON.stringify(module_bytes) + ')'});
-
-  InspectorTest.log('Finished!');
-  InspectorTest.completeTest();
-})();
+InspectorTest.runAsyncTestSuite([
+  async function test() {
+    await Protocol.Debugger.enable();
+    Protocol.Debugger.onPaused(handleDebuggerPaused);
+    InspectorTest.log('Running testFunction with generated wasm bytes...');
+    await Protocol.Runtime.evaluate(
+        {'expression': 'testFunction(' + JSON.stringify(module_bytes) + ')'});
+  }
+]);
 
 function logStackTrace(messageObject) {
   var frames = messageObject.params.callFrames;
diff --git a/deps/v8/test/inspector/inspector-test.cc b/deps/v8/test/inspector/inspector-test.cc
index 8cf5f27d91bcce..6a7e5e23e43981 100644
--- a/deps/v8/test/inspector/inspector-test.cc
+++ b/deps/v8/test/inspector/inspector-test.cc
@@ -100,6 +100,9 @@ class UtilsExtension : public IsolateData::SetupGlobalTask {
     utils->Set(isolate, "sendMessageToBackend",
                v8::FunctionTemplate::New(
                    isolate, &UtilsExtension::SendMessageToBackend));
+    utils->Set(isolate, "interruptForMessages",
+               v8::FunctionTemplate::New(
+                   isolate, &UtilsExtension::InterruptForMessages));
     global->Set(isolate, "utils", utils);
   }
 
@@ -388,6 +391,11 @@ class UtilsExtension : public IsolateData::SetupGlobalTask {
         ToVector(args.GetIsolate(), args[1].As<v8::String>())));
   }
 
+  static void InterruptForMessages(
+      const v8::FunctionCallbackInfo<v8::Value>& args) {
+    backend_runner_->InterruptForMessages();
+  }
+
   static std::map<int, std::unique_ptr<FrontendChannelImpl>> channels_;
 };
 
@@ -753,9 +761,10 @@ int InspectorTestMain(int argc, char* argv[]) {
   {
     IsolateData::SetupGlobalTasks frontend_extensions;
     frontend_extensions.emplace_back(new UtilsExtension());
-    TaskRunner frontend_runner(
-        std::move(frontend_extensions), kDoCatchExceptions, &ready_semaphore,
-        startup_data.data ? &startup_data : nullptr, kNoInspector);
+    TaskRunner frontend_runner(std::move(frontend_extensions),
+                               kFailOnUncaughtExceptions, &ready_semaphore,
+                               startup_data.data ? &startup_data : nullptr,
+                               kNoInspector);
     ready_semaphore.Wait();
 
     int frontend_context_group_id = 0;
@@ -768,8 +777,9 @@ int InspectorTestMain(int argc, char* argv[]) {
     backend_extensions.emplace_back(new SetTimeoutExtension());
     backend_extensions.emplace_back(new InspectorExtension());
     TaskRunner backend_runner(
-        std::move(backend_extensions), kDontCatchExceptions, &ready_semaphore,
-        startup_data.data ? &startup_data : nullptr, kWithInspector);
+        std::move(backend_extensions), kStandardPropagateUncaughtExceptions,
+        &ready_semaphore, startup_data.data ? &startup_data : nullptr,
+        kWithInspector);
     ready_semaphore.Wait();
     UtilsExtension::set_backend_task_runner(&backend_runner);
 
diff --git a/deps/v8/test/inspector/inspector.status b/deps/v8/test/inspector/inspector.status
index 22f5dd0842ba48..ede16a957d9f9d 100644
--- a/deps/v8/test/inspector/inspector.status
+++ b/deps/v8/test/inspector/inspector.status
@@ -80,6 +80,7 @@
 ['(arch == ppc64) and simulator_run', {
   # Slow test: https://crbug.com/v8/10965
   'runtime/console-messages-limits': [PASS, SLOW],
+  'debugger/regress-1125934': [PASS, SLOW],
 }],  # (arch == ppc64) and simulator_run
 
 ##############################################################################
@@ -151,7 +152,7 @@
   # Skip tests that fail with GC stress: https://crbug.com/v8/10748
   'debugger/wasm-debug-command': [SKIP],
   'debugger/wasm-global-names': [SKIP],
-  'debugger/wasm-set-breakpoint-liftoff': [SKIP],
+  'debugger/wasm-set-breakpoint': [SKIP],
   'debugger/wasm-source': [SKIP],
   'debugger/wasm-stepping-with-skiplist': [SKIP],
 }], # stress_js_bg_compile_wasm_code_gc
@@ -163,6 +164,9 @@
   'cpu-profiler/coverage-block': [SKIP],
   'runtime/internal-properties-entries': [SKIP],
   'runtime-call-stats/collection': [SKIP],
+
+  # Skip tests that might fail with concurrent allocation
+  'debugger/pause-on-oom-wide': [SKIP],
 }], # stress_concurrent_allocation
 
 ##############################################################################
diff --git a/deps/v8/test/inspector/isolate-data.cc b/deps/v8/test/inspector/isolate-data.cc
index c58e3d20b9a080..3bd225ea1da982 100644
--- a/deps/v8/test/inspector/isolate-data.cc
+++ b/deps/v8/test/inspector/isolate-data.cc
@@ -129,7 +129,9 @@ void IsolateData::RegisterModule(v8::Local<v8::Context> context,
 // static
 v8::MaybeLocal<v8::Module> IsolateData::ModuleResolveCallback(
     v8::Local<v8::Context> context, v8::Local<v8::String> specifier,
+    v8::Local<v8::FixedArray> import_assertions,
     v8::Local<v8::Module> referrer) {
+  // TODO(v8:11189) Consider JSON modules support in the InspectorClient
   IsolateData* data = IsolateData::FromContext(context);
   std::string str = *v8::String::Utf8Value(data->isolate(), specifier);
   return data->modules_[ToVector(data->isolate(), specifier)].Get(
@@ -256,8 +258,7 @@ int IsolateData::HandleMessage(v8::Local<v8::Message> message,
       IsolateData::FromContext(context)->inspector_.get();
 
   v8::Local<v8::StackTrace> stack = message->GetStackTrace();
-  int script_id =
-      static_cast<int>(message->GetScriptOrigin().ScriptID()->Value());
+  int script_id = message->GetScriptOrigin().ScriptId();
   if (!stack.IsEmpty() && stack->GetFrameCount() > 0) {
     int top_script_id = stack->GetFrame(isolate, 0)->GetScriptId();
     if (top_script_id == script_id) script_id = 0;
@@ -486,5 +487,11 @@ std::unique_ptr<v8_inspector::StringBuffer> IsolateData::resourceNameToUrl(
   return std::make_unique<StringBufferImpl>(isolate(), url);
 }
 
+int64_t IsolateData::generateUniqueId() {
+  static int64_t last_unique_id = 0L;
+  // Keep it not too random for tests.
+  return ++last_unique_id;
+}
+
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/test/inspector/isolate-data.h b/deps/v8/test/inspector/isolate-data.h
index 6cab3de1080027..e38c6c50824925 100644
--- a/deps/v8/test/inspector/isolate-data.h
+++ b/deps/v8/test/inspector/isolate-data.h
@@ -100,6 +100,7 @@ class IsolateData : public v8_inspector::V8InspectorClient {
  private:
   static v8::MaybeLocal<v8::Module> ModuleResolveCallback(
       v8::Local<v8::Context> context, v8::Local<v8::String> specifier,
+      v8::Local<v8::FixedArray> import_assertions,
       v8::Local<v8::Module> referrer);
   static void MessageHandler(v8::Local<v8::Message> message,
                              v8::Local<v8::Value> exception);
@@ -129,6 +130,7 @@ class IsolateData : public v8_inspector::V8InspectorClient {
   void maxAsyncCallStackDepthChanged(int depth) override;
   std::unique_ptr<v8_inspector::StringBuffer> resourceNameToUrl(
       const v8_inspector::StringView& resourceName) override;
+  int64_t generateUniqueId() override;
 
   // The isolate gets deleted by its {Dispose} method, not by the default
   // deleter. Therefore we have to define a custom deleter for the unique_ptr to
diff --git a/deps/v8/test/inspector/protocol-test.js b/deps/v8/test/inspector/protocol-test.js
index 89b663f052a4e3..2b0f571e168197 100644
--- a/deps/v8/test/inspector/protocol-test.js
+++ b/deps/v8/test/inspector/protocol-test.js
@@ -36,7 +36,7 @@ InspectorTest.logMessage = function(originalMessage) {
   const nonStableFields = new Set([
     'objectId', 'scriptId', 'exceptionId', 'timestamp', 'executionContextId',
     'callFrameId', 'breakpointId', 'bindRemoteObjectFunctionId',
-    'formatterObjectId', 'debuggerId', 'bodyGetterId'
+    'formatterObjectId', 'debuggerId', 'bodyGetterId', 'uniqueId'
   ]);
   const message = JSON.parse(JSON.stringify(originalMessage, replacer.bind(null, Symbol(), nonStableFields)));
   if (message.id)
diff --git a/deps/v8/test/inspector/regress/regress-crbug-1147552-expected.txt b/deps/v8/test/inspector/regress/regress-crbug-1147552-expected.txt
new file mode 100644
index 00000000000000..c843d5e1c9d495
--- /dev/null
+++ b/deps/v8/test/inspector/regress/regress-crbug-1147552-expected.txt
@@ -0,0 +1,2 @@
+Regression test for crbug.com/1147552. Found by Clusterfuzz.
+Test must not have crashed.
diff --git a/deps/v8/test/inspector/regress/regress-crbug-1147552.js b/deps/v8/test/inspector/regress/regress-crbug-1147552.js
new file mode 100644
index 00000000000000..7cc86950af0436
--- /dev/null
+++ b/deps/v8/test/inspector/regress/regress-crbug-1147552.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+const {session, Protocol} = InspectorTest.start('Regression test for crbug.com/1147552. Found by Clusterfuzz.');
+
+Protocol.Runtime.enable();
+
+Protocol.Runtime.setAsyncCallStackDepth({maxDepth: 10});
+(async function test() {
+  await Protocol.Runtime.setMaxCallStackSizeToCapture({size: 0});
+  await Protocol.Runtime.evaluate({ expression: 'foo'});
+
+  InspectorTest.log('Test must not have crashed.')
+  InspectorTest.completeTest();
+})();
diff --git a/deps/v8/test/inspector/runtime/create-context-expected.txt b/deps/v8/test/inspector/runtime/create-context-expected.txt
index 770d2e32d24f02..2141b0bab9b1df 100644
--- a/deps/v8/test/inspector/runtime/create-context-expected.txt
+++ b/deps/v8/test/inspector/runtime/create-context-expected.txt
@@ -6,6 +6,7 @@ Checks createContext().
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -16,6 +17,7 @@ Checks createContext().
             id : 2
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -37,6 +39,7 @@ Reported script's execution id: 2
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -47,6 +50,7 @@ Reported script's execution id: 2
             id : 2
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
diff --git a/deps/v8/test/inspector/runtime/evaluate-unique-context-id-expected.txt b/deps/v8/test/inspector/runtime/evaluate-unique-context-id-expected.txt
new file mode 100644
index 00000000000000..708ac401f60656
--- /dev/null
+++ b/deps/v8/test/inspector/runtime/evaluate-unique-context-id-expected.txt
@@ -0,0 +1,24 @@
+Tests how Runtime.evaluate handles uniqueContextId argument
+token in context 1: context 1
+token in context 2: context 2
+{
+    error : {
+        code : -32602
+        message : contextId and uniqueContextId are mutually exclusive
+    }
+    id : <messageId>
+}
+{
+    error : {
+        code : -32602
+        message : invalid uniqueContextId
+    }
+    id : <messageId>
+}
+{
+    error : {
+        code : -32602
+        message : uniqueContextId not found
+    }
+    id : <messageId>
+}
diff --git a/deps/v8/test/inspector/runtime/evaluate-unique-context-id.js b/deps/v8/test/inspector/runtime/evaluate-unique-context-id.js
new file mode 100644
index 00000000000000..21eddfb26ed69a
--- /dev/null
+++ b/deps/v8/test/inspector/runtime/evaluate-unique-context-id.js
@@ -0,0 +1,66 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+const {Protocol, contextGroup} = InspectorTest.start(
+  `Tests how Runtime.evaluate handles uniqueContextId argument`);
+
+(async function test(){
+  Protocol.Runtime.enable();
+  const context1 = (await Protocol.Runtime.onceExecutionContextCreated()).params.context;
+
+  contextGroup.createContext();
+  const context2 = (await Protocol.Runtime.onceExecutionContextCreated()).params.context;
+
+  Protocol.Runtime.evaluate({
+    expression: 'token = "context 1";',
+    contextId: context1.id
+  });
+  Protocol.Runtime.evaluate({
+    expression: 'token = "context 2";',
+    contextId: context2.id
+  });
+
+  {
+    const response = (await Protocol.Runtime.evaluate({
+      expression: 'token',
+      uniqueContextId: context1.uniqueId,
+      returnByValue: true
+    })).result.result.value;
+    InspectorTest.logMessage(`token in context 1: ${response}`);
+  }
+  {
+    const response = (await Protocol.Runtime.evaluate({
+      expression: 'token',
+      uniqueContextId: context2.uniqueId,
+      returnByValue: true
+    })).result.result.value;
+    InspectorTest.logMessage(`token in context 2: ${response}`);
+  }
+
+  // The following tests are for error handling.
+  {
+    const response = (await Protocol.Runtime.evaluate({
+      expression: 'token',
+      uniqueContextId: context1.uniqueId,
+      contextId: context1.id
+    }));
+    InspectorTest.logMessage(response);
+  }
+  {
+    const response = (await Protocol.Runtime.evaluate({
+      expression: 'token',
+      uniqueContextId: 'fubar',
+    }));
+    InspectorTest.logMessage(response);
+  }
+  {
+    const response = (await Protocol.Runtime.evaluate({
+      expression: 'token',
+      uniqueContextId: context1.uniqueId + 1,
+    }));
+    InspectorTest.logMessage(response);
+  }
+
+  InspectorTest.completeTest();
+})();
diff --git a/deps/v8/test/inspector/runtime/evaluate-without-side-effects-expected.txt b/deps/v8/test/inspector/runtime/evaluate-without-side-effects-expected.txt
index 892467a975027e..7a31980584ca0a 100644
--- a/deps/v8/test/inspector/runtime/evaluate-without-side-effects-expected.txt
+++ b/deps/v8/test/inspector/runtime/evaluate-without-side-effects-expected.txt
@@ -10,6 +10,33 @@ Test throwOnSideEffect: false
         }
     }
 }
+Test prototype extension expression with side-effect, with throwOnSideEffect: true
+{
+    id : <messageId>
+    result : {
+        exceptionDetails : {
+            columnNumber : -1
+            exception : {
+                className : EvalError
+                description : EvalError: Possible side-effect in debug-evaluate
+                objectId : <objectId>
+                subtype : error
+                type : object
+            }
+            exceptionId : <exceptionId>
+            lineNumber : -1
+            scriptId : <scriptId>
+            text : Uncaught
+        }
+        result : {
+            className : EvalError
+            description : EvalError: Possible side-effect in debug-evaluate
+            objectId : <objectId>
+            subtype : error
+            type : object
+        }
+    }
+}
 Test expression with side-effect, with throwOnSideEffect: true
 {
     id : <messageId>
diff --git a/deps/v8/test/inspector/runtime/evaluate-without-side-effects.js b/deps/v8/test/inspector/runtime/evaluate-without-side-effects.js
index 5736a65e061ce9..27ff71dee4ae61 100644
--- a/deps/v8/test/inspector/runtime/evaluate-without-side-effects.js
+++ b/deps/v8/test/inspector/runtime/evaluate-without-side-effects.js
@@ -24,6 +24,12 @@ Protocol.Debugger.onPaused(message => {
     throwOnSideEffect: false
   }));
 
+  InspectorTest.log("Test prototype extension expression with side-effect, with throwOnSideEffect: true");
+  InspectorTest.logMessage(await Protocol.Runtime.evaluate({
+    expression: "f.prototype.test = () => console.log('test fn');",
+    throwOnSideEffect: true
+  }));
+
   InspectorTest.log("Test expression with side-effect, with throwOnSideEffect: true");
   InspectorTest.logMessage(await Protocol.Runtime.evaluate({
     expression: "x = 3; x;",
diff --git a/deps/v8/test/inspector/runtime/get-properties-expected.txt b/deps/v8/test/inspector/runtime/get-properties-expected.txt
index 51537d3ecb39da..8a764d0b0c02a7 100644
--- a/deps/v8/test/inspector/runtime/get-properties-expected.txt
+++ b/deps/v8/test/inspector/runtime/get-properties-expected.txt
@@ -102,22 +102,16 @@ Running test: testArrayBuffer
   0 own number 16843009
   1 own number 16843009
   __proto__ own object undefined
-[[IsDetached]] false
+[[ArrayBufferByteLength]]
+[[ArrayBufferData]]
 
 Running test: testDetachedArrayBuffer
-[[Int8Array]]
-  __proto__ own object undefined
-[[Uint8Array]]
-  __proto__ own object undefined
-[[Int16Array]]
-  __proto__ own object undefined
-[[Int32Array]]
-  __proto__ own object undefined
 [[IsDetached]] true
 
 Running test: testArrayBufferWithBrokenUintCtor
-  [[Int8Array]] own object undefined
-  [[Uint8Array]] own object undefined
   __proto__ own object undefined
 Internal properties
-  [[IsDetached]] boolean false
+  [[ArrayBufferByteLength]] number 7
+  [[ArrayBufferData]] string 0x...
+  [[Int8Array]] object undefined
+  [[Uint8Array]] object undefined
diff --git a/deps/v8/test/inspector/runtime/get-properties.js b/deps/v8/test/inspector/runtime/get-properties.js
index ad0e2f91e40cdd..737616ef4c1349 100644
--- a/deps/v8/test/inspector/runtime/get-properties.js
+++ b/deps/v8/test/inspector/runtime/get-properties.js
@@ -51,7 +51,9 @@ InspectorTest.runAsyncTestSuite([
       await logGetPropertiesResult(prop.value.objectId);
     }
     for (let prop of props.result.internalProperties) {
-      InspectorTest.log(prop.name + ' ' + prop.value.value);
+      InspectorTest.log(prop.name);
+      if (prop.value.objectId)
+        await logGetPropertiesResult(prop.value.objectId);
     }
   },
 
@@ -111,7 +113,7 @@ async function logGetPropertiesResult(objectId, flags = { ownProperties: true })
     var v = p.value;
     var own = p.isOwn ? "own" : "inherited";
     if (v)
-      InspectorTest.log("  " + p.name + " " + own + " " + v.type + " " + v.value);
+      InspectorTest.log(`  ${p.name} ${own} ${v.type} ${v.value}`);
     else
       InspectorTest.log("  " + p.name + " " + own + " no value" +
         (hasGetterSetter(p, "get") ? ", getter" : "") + (hasGetterSetter(p, "set") ? ", setter" : ""));
@@ -124,7 +126,11 @@ async function logGetPropertiesResult(objectId, flags = { ownProperties: true })
     for (var i = 0; i < array.length; i++) {
       var p = array[i];
       var v = p.value;
-      InspectorTest.log('  ' + p.name + ' ' + v.type + ' ' + v.value);
+      if (p.name == "[[ArrayBufferData]]")
+        // Hex value for pointer is non-deterministic
+        InspectorTest.log(`  ${p.name} ${v.type} ${v.value.substr(0, 2)}...`);
+      else
+        InspectorTest.log(`  ${p.name} ${v.type} ${v.value}`);
     }
   }
 
diff --git a/deps/v8/test/inspector/runtime/runtime-restore-expected.txt b/deps/v8/test/inspector/runtime/runtime-restore-expected.txt
index 1810872f0b8124..0072588abcf58c 100644
--- a/deps/v8/test/inspector/runtime/runtime-restore-expected.txt
+++ b/deps/v8/test/inspector/runtime/runtime-restore-expected.txt
@@ -8,6 +8,7 @@ Running test: testExecutionContextsNotificationsOnRestore
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -24,6 +25,7 @@ will reconnect..
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
diff --git a/deps/v8/test/inspector/sessions/create-session-expected.txt b/deps/v8/test/inspector/sessions/create-session-expected.txt
index e3d921e3b782de..4459f4d19cd1cb 100644
--- a/deps/v8/test/inspector/sessions/create-session-expected.txt
+++ b/deps/v8/test/inspector/sessions/create-session-expected.txt
@@ -8,6 +8,7 @@ From session 1
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -20,6 +21,7 @@ From session 2
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -32,6 +34,7 @@ From session 2
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -44,6 +47,7 @@ From session 1
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -56,6 +60,7 @@ From session 3
             id : 1
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -92,6 +97,7 @@ From session 2
             id : 2
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -103,6 +109,7 @@ From session 1
             id : 2
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -114,6 +121,7 @@ From session 3
             id : 2
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
@@ -127,6 +135,7 @@ From session 4
             id : 2
             name : 
             origin : 
+            uniqueId : <uniqueId>
         }
     }
 }
diff --git a/deps/v8/test/inspector/task-runner.cc b/deps/v8/test/inspector/task-runner.cc
index bc12c6f6a43a3f..65fbeb4d6baf0c 100644
--- a/deps/v8/test/inspector/task-runner.cc
+++ b/deps/v8/test/inspector/task-runner.cc
@@ -68,18 +68,17 @@ void TaskRunner::RunMessageLoop(bool only_protocol) {
     std::unique_ptr<TaskRunner::Task> task = GetNext(only_protocol);
     if (!task) return;
     v8::Isolate::Scope isolate_scope(isolate());
-    if (catch_exceptions_) {
-      v8::TryCatch try_catch(isolate());
-      task->Run(data_.get());
-      if (try_catch.HasCaught()) {
-        ReportUncaughtException(isolate(), try_catch);
-        fflush(stdout);
-        fflush(stderr);
-        _exit(0);
-      }
-    } else {
-      task->Run(data_.get());
+    v8::TryCatch try_catch(isolate());
+    if (catch_exceptions_ == kStandardPropagateUncaughtExceptions) {
+      try_catch.SetVerbose(true);
     }
+    task->Run(data_.get());
+    if (catch_exceptions_ == kFailOnUncaughtExceptions &&
+        try_catch.HasCaught()) {
+      ReportUncaughtException(isolate(), try_catch);
+      base::OS::ExitProcess(0);
+    }
+    try_catch.Reset();
     task.reset();
     // Also pump isolate's foreground task queue to ensure progress.
     // This can be removed once https://crbug.com/v8/10747 is fixed.
@@ -87,12 +86,24 @@ void TaskRunner::RunMessageLoop(bool only_protocol) {
     // tests are fixed.
     if (!i::FLAG_stress_incremental_marking) {
       while (v8::platform::PumpMessageLoop(
-          v8::internal::V8::GetCurrentPlatform(), isolate())) {
+          v8::internal::V8::GetCurrentPlatform(), isolate(),
+          isolate()->HasPendingBackgroundTasks()
+              ? platform::MessageLoopBehavior::kWaitForWork
+              : platform::MessageLoopBehavior::kDoNotWait)) {
       }
     }
   }
 }
 
+static void RunMessageLoopInInterrupt(v8::Isolate* isolate, void* task_runner) {
+  TaskRunner* runner = reinterpret_cast<TaskRunner*>(task_runner);
+  runner->RunMessageLoop(true);
+}
+
+void TaskRunner::InterruptForMessages() {
+  isolate()->RequestInterrupt(&RunMessageLoopInInterrupt, this);
+}
+
 void TaskRunner::QuitMessageLoop() {
   DCHECK_LT(0, nested_loop_count_);
   --nested_loop_count_;
@@ -105,6 +116,7 @@ void TaskRunner::Append(std::unique_ptr<Task> task) {
 
 void TaskRunner::Terminate() {
   is_terminated_++;
+  isolate()->TerminateExecution();
   process_queue_semaphore_.Signal();
 }
 
diff --git a/deps/v8/test/inspector/task-runner.h b/deps/v8/test/inspector/task-runner.h
index 039fb61da83319..61bb22569292d2 100644
--- a/deps/v8/test/inspector/task-runner.h
+++ b/deps/v8/test/inspector/task-runner.h
@@ -20,9 +20,10 @@
 namespace v8 {
 namespace internal {
 
-enum CatchExceptions : bool {
-  kDoCatchExceptions = true,
-  kDontCatchExceptions = false
+enum CatchExceptions {
+  kFailOnUncaughtExceptions,
+  kStandardPropagateUncaughtExceptions,
+  kSuppressUncaughtExceptions
 };
 
 class TaskRunner : public v8::base::Thread {
@@ -51,7 +52,7 @@ class TaskRunner : public v8::base::Thread {
   void QuitMessageLoop();
 
   void Append(std::unique_ptr<Task>);
-
+  void InterruptForMessages();
   void Terminate();
 
  private:
@@ -73,7 +74,6 @@ class TaskRunner : public v8::base::Thread {
   v8::base::Semaphore process_queue_semaphore_;
 
   int nested_loop_count_;
-
   std::atomic<int> is_terminated_;
 };
 
diff --git a/deps/v8/test/inspector/tasks.cc b/deps/v8/test/inspector/tasks.cc
index bf40847aac896f..08c829e761ff7c 100644
--- a/deps/v8/test/inspector/tasks.cc
+++ b/deps/v8/test/inspector/tasks.cc
@@ -20,16 +20,13 @@ void ExecuteStringTask::Run(IsolateData* data) {
   v8::HandleScope handle_scope(data->isolate());
   v8::Local<v8::Context> context = data->GetDefaultContext(context_group_id_);
   v8::Context::Scope context_scope(context);
-  v8::ScriptOrigin origin(
-      ToV8String(data->isolate(), name_),
-      v8::Integer::New(data->isolate(), line_offset_),
-      v8::Integer::New(data->isolate(), column_offset_),
-      /* resource_is_shared_cross_origin */ v8::Local<v8::Boolean>(),
-      /* script_id */ v8::Local<v8::Integer>(),
-      /* source_map_url */ v8::Local<v8::Value>(),
-      /* resource_is_opaque */ v8::Local<v8::Boolean>(),
-      /* is_wasm */ v8::Local<v8::Boolean>(),
-      v8::Boolean::New(data->isolate(), is_module_));
+  v8::ScriptOrigin origin(ToV8String(data->isolate(), name_), line_offset_,
+                          column_offset_,
+                          /* resource_is_shared_cross_origin */ false,
+                          /* script_id */ -1,
+                          /* source_map_url */ v8::Local<v8::Value>(),
+                          /* resource_is_opaque */ false,
+                          /* is_wasm */ false, is_module_);
   v8::Local<v8::String> source;
   if (expression_.size() != 0)
     source = ToV8String(data->isolate(), expression_);
diff --git a/deps/v8/test/inspector/wasm-inspector-test.js b/deps/v8/test/inspector/wasm-inspector-test.js
index e8ebe21439cf01..67333dcbb6dfb3 100644
--- a/deps/v8/test/inspector/wasm-inspector-test.js
+++ b/deps/v8/test/inspector/wasm-inspector-test.js
@@ -12,14 +12,14 @@ WasmInspectorTest.evalWithUrl = (code, url) =>
         .evaluate({'expression': code + '\n//# sourceURL=v8://test/' + url})
         .then(printIfFailure);
 
-WasmInspectorTest.instantiateFromBuffer = function(bytes) {
+WasmInspectorTest.instantiateFromBuffer = function(bytes, imports) {
   var buffer = new ArrayBuffer(bytes.length);
   var view = new Uint8Array(buffer);
   for (var i = 0; i < bytes.length; ++i) {
     view[i] = bytes[i] | 0;
   }
   const module = new WebAssembly.Module(buffer);
-  return new WebAssembly.Instance(module);
+  return new WebAssembly.Instance(module, imports);
 }
 
 WasmInspectorTest.instantiate = async function(bytes, instance_name = 'instance') {
@@ -35,10 +35,8 @@ WasmInspectorTest.dumpScopeProperties = async function(message) {
   }
 }
 
-WasmInspectorTest.getWasmValue = function(wasmValue) {
-  return typeof (wasmValue.value) === 'undefined' ?
-      wasmValue.unserializableValue :
-      wasmValue.value;
+WasmInspectorTest.getWasmValue = value => {
+  return value.unserializableValue ?? value.value;
 }
 
 function printIfFailure(message) {
@@ -50,19 +48,18 @@ function printIfFailure(message) {
 
 async function getScopeValues(name, value) {
   if (value.type == 'object') {
-    if (value.subtype == 'typedarray') return value.description;
-    if (name == 'instance') return dumpInstanceProperties(value);
-    if (name == 'function tables') return dumpTables(value);
+    if (value.subtype === 'typedarray' || value.subtype == 'webassemblymemory') return value.description;
+    if (name === 'instance') return dumpInstanceProperties(value);
+    if (name === 'module') return value.description;
 
     let msg = await Protocol.Runtime.getProperties({objectId: value.objectId});
     printIfFailure(msg);
-    const printProperty = function(elem) {
-      const wasmValue = WasmInspectorTest.getWasmValue(elem.value);
-      return `"${elem.name}": ${wasmValue} (${elem.value.subtype})`;
+    const printProperty = function({name, value}) {
+      return `"${name}": ${WasmInspectorTest.getWasmValue(value)} (${value.subtype ?? value.type})`;
     }
     return msg.result.result.map(printProperty).join(', ');
   }
-  return WasmInspectorTest.getWasmValue(value) + ' (' + value.subtype + ')';
+  return `${WasmInspectorTest.getWasmValue(value)} (${value.subtype ?? value.type})`;
 }
 
 function recursiveGetPropertiesWrapper(value, depth) {
@@ -80,23 +77,6 @@ async function recursiveGetProperties(value, depth) {
   return value;
 }
 
-async function dumpTables(tablesObj) {
-  let msg = await Protocol.Runtime.getProperties({objectId: tablesObj.objectId});
-  var tables_str = [];
-  for (var table of msg.result.result) {
-    const func_entries = await recursiveGetPropertiesWrapper(table, 2);
-    var functions = [];
-    for (var func of func_entries) {
-      for (var value of func.result.result) {
-        functions.push(`${value.name}: ${value.value.description}`);
-      }
-    }
-    const functions_str = functions.join(', ');
-    tables_str.push(`      ${table.name}: ${functions_str}`);
-  }
-  return '\n' + tables_str.join('\n');
-}
-
 async function dumpInstanceProperties(instanceObj) {
   function invokeGetter(property) {
     return this[JSON.parse(property)];
diff --git a/deps/v8/test/intl/general/getCanonicalLocales.js b/deps/v8/test/intl/general/getCanonicalLocales.js
index 65c7fc6e3a8e2d..a6a344ff9c2e5e 100644
--- a/deps/v8/test/intl/general/getCanonicalLocales.js
+++ b/deps/v8/test/intl/general/getCanonicalLocales.js
@@ -14,3 +14,15 @@ assertEquals("en-u-ca-gregory", Intl.getCanonicalLocales("en-u-ca-gregory-ca-chi
 
 // Check duplicate subtags (after the first tag) are detected.
 assertThrows(() => Intl.getCanonicalLocales("en-foobar-foobar"), RangeError);
+
+// Check some common case
+assertEquals("id", Intl.getCanonicalLocales("in")[0]);
+assertEquals("he", Intl.getCanonicalLocales("iw")[0]);
+assertEquals("yi", Intl.getCanonicalLocales("ji")[0]);
+assertEquals("jv", Intl.getCanonicalLocales("jw")[0]);
+assertEquals("ro", Intl.getCanonicalLocales("mo")[0]);
+assertEquals("sr", Intl.getCanonicalLocales("scc")[0]);
+assertEquals("sr-Latn", Intl.getCanonicalLocales("sh")[0]);
+assertEquals("sr-ME", Intl.getCanonicalLocales("cnr")[0]);
+assertEquals("nb", Intl.getCanonicalLocales("no")[0]);
+assertEquals("fil", Intl.getCanonicalLocales("tl")[0]);
diff --git a/deps/v8/test/intl/general/grandfathered_tags_without_preferred_value.js b/deps/v8/test/intl/general/grandfathered_tags_without_preferred_value.js
index 16bf369601fc90..49faf5b82f84ea 100644
--- a/deps/v8/test/intl/general/grandfathered_tags_without_preferred_value.js
+++ b/deps/v8/test/intl/general/grandfathered_tags_without_preferred_value.js
@@ -7,7 +7,7 @@
   // tag registry. Nonetheless, ICU cooks up a value when canonicalizing.
   // v8 works around that ICU issue.
   // See https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry .
-  ["cel-gaulish", "cel-gaulish"],
+  ["cel-gaulish", "xtg"],
 
   // Matching should be case-insensitive.
 ].forEach(([inputLocale, expectedLocale]) => {
diff --git a/deps/v8/test/intl/general/invalid-locale.js b/deps/v8/test/intl/general/invalid-locale.js
index c3dd59ad684f1f..df4773d87d4ee6 100644
--- a/deps/v8/test/intl/general/invalid-locale.js
+++ b/deps/v8/test/intl/general/invalid-locale.js
@@ -13,7 +13,6 @@ for (let locale  of invalid_locales) {
 }
 
 var not_so_long_locales = [
-  "bs-u-nu-bzcu-cab-cabs-avnlubs-avnihu-zcu-cab-cbs-avnllubs-avnihq-zcu-cab-cbs-ubs-avnihu-cabs-flus-xxd-vnluy",
   "bs-u-nu-bzcu-cab-cabs-avnlubs-avnihu-zcu-cab-cbs-avnllubs-avnihq-zcu-cab-cbs-ubs-avnihu-cabs-flus-xxd",
   "bs-u-nu-bzcu-cab-cabs-avnlubs-avnihu-zcu",
 ];
diff --git a/deps/v8/test/intl/general/supported-locales-of.js b/deps/v8/test/intl/general/supported-locales-of.js
index aeb5f328e7b208..05c75c2b0b8466 100644
--- a/deps/v8/test/intl/general/supported-locales-of.js
+++ b/deps/v8/test/intl/general/supported-locales-of.js
@@ -27,8 +27,6 @@
 
 // Tests supportedLocalesOf method.
 
-// Flags: --harmony-intl-segmenter
-
 var services = [
   Intl.Collator,
   Intl.DateTimeFormat,
diff --git a/deps/v8/test/intl/locale/locale.js b/deps/v8/test/intl/locale/locale.js
new file mode 100644
index 00000000000000..15b5870f3a7776
--- /dev/null
+++ b/deps/v8/test/intl/locale/locale.js
@@ -0,0 +1,19 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+assertEquals("id", (new Intl.Locale("in")).toString());
+assertEquals("he", (new Intl.Locale("iw")).toString());
+assertEquals("yi", (new Intl.Locale("ji")).toString());
+assertEquals("jv", (new Intl.Locale("jw")).toString());
+assertEquals("ro", (new Intl.Locale("mo")).toString());
+assertEquals("sr", (new Intl.Locale("scc")).toString());
+assertEquals("hr", (new Intl.Locale("scr")).toString());
+
+assertEquals("sr-Latn", (new Intl.Locale("sh")).toString());
+assertEquals("sr-ME", (new Intl.Locale("cnr")).toString());
+assertEquals("nb", (new Intl.Locale("no")).toString());
+assertEquals("fil", (new Intl.Locale("tl")).toString());
+
+assertEquals("hy-AM", (new Intl.Locale("hy-SU")).toString());
+assertEquals("lv-LV", (new Intl.Locale("lv-SU")).toString());
diff --git a/deps/v8/test/intl/regress-1012579.js b/deps/v8/test/intl/regress-1012579.js
index 9051a0004cca90..330265b41afdaf 100644
--- a/deps/v8/test/intl/regress-1012579.js
+++ b/deps/v8/test/intl/regress-1012579.js
@@ -1,6 +1,9 @@
-// Copyright 2019 the V8 project authors. All rights reserved.
+// Copyright 2020 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-let longLocale = 'de-u-cf-cu-em-kk-kr-ks-kv-lb-lw-ms-nu-rg-sd-ss-tz';
-rtf = new Intl.RelativeTimeFormat(longLocale);
+// Verify won't crash in ListFormat
+//            1    2    3    4    5    6    7    8    9
+var list = [ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'];
+const lf = new Intl.ListFormat();
+const parts = lf.formatToParts(list);
diff --git a/deps/v8/test/intl/regress-10526.js b/deps/v8/test/intl/regress-10526.js
new file mode 100644
index 00000000000000..4e6c79bdf0bfce
--- /dev/null
+++ b/deps/v8/test/intl/regress-10526.js
@@ -0,0 +1,21 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Test date format in islamic-umalqura calendar of date prior to
+// -195366-07-23
+// On Android, islamic-umalqura calendar is only available on ar and fa locales.
+let dateOK = new Date (Date.UTC(-195366, 6, 23));
+let dateKO = new Date (Date.UTC(-195366, 6, 22));
+let dateDisplay = new Intl.DateTimeFormat (
+    'ar-u-ca-islamic-umalqura',
+    { timeZone : 'UTC', year : 'numeric', month :'long',
+      day : 'numeric', weekday : 'long' });
+assertEquals("Wed, 23 Jul -195366 00:00:00 GMT",
+    dateOK.toUTCString(), "dateOK.toUTCString()");
+assertEquals("Tue, 22 Jul -195366 00:00:00 GMT",
+    dateKO.toUTCString(), "dateKO.toUTCString()");
+assertEquals("الأربعاء، 17 ذو الحجة ‎-202003 هـ",
+    dateDisplay.format(dateOK), "dateDisplay.format(dateOK)");
+assertEquals("الثلاثاء، 16 ذو الحجة ‎-202003 هـ",
+    dateDisplay.format(dateKO), "dateDisplay.format(dateKO)");
diff --git a/deps/v8/test/intl/regress-10527.js b/deps/v8/test/intl/regress-10527.js
new file mode 100644
index 00000000000000..f01131b7566923
--- /dev/null
+++ b/deps/v8/test/intl/regress-10527.js
@@ -0,0 +1,30 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Test date format in  Islamic and Islamic-rgsa calendars of dates prior
+// to 0622-07-18
+// On Android, islamic and islamic-rgsac calendar are only available on ar
+// and fa locales.
+let dateOK = new Date (Date.UTC(622, 6, 18));
+let dateKO = new Date (Date.UTC(622, 6, 17));
+let dateDisplay = new Intl.DateTimeFormat (
+    'ar-u-ca-islamic',
+    { timeZone : 'UTC', year : 'numeric', month :'long',
+      day : 'numeric', weekday : 'long' });
+let dateDisplay2 = new Intl.DateTimeFormat (
+    'ar-u-ca-islamic-rgsa',
+    { timeZone : 'UTC', year : 'numeric', month :'long',
+      day : 'numeric', weekday : 'long' });
+assertEquals("Thu, 18 Jul 0622 00:00:00 GMT",
+    dateOK.toUTCString(), "dateOK.toUTCString()");
+assertEquals("Wed, 17 Jul 0622 00:00:00 GMT",
+    dateKO.toUTCString(), "dateKO.toUTCString()");
+assertEquals("الخميس، 1 محرم 1 هـ",
+    dateDisplay.format(dateOK), "dateDisplay.format(dateOK)");
+assertEquals("الأربعاء، 30 ذو الحجة 0 هـ",
+    dateDisplay.format(dateKO), "dateDisplay.format(dateKO)");
+assertEquals("الخميس، 1 محرم 1 هـ",
+    dateDisplay2.format(dateOK), "dateDisplay.format(dateOK)");
+assertEquals("الأربعاء، 30 ذو الحجة 0 هـ",
+    dateDisplay2.format(dateKO), "dateDisplay.format(dateKO)");
diff --git a/deps/v8/test/intl/regress-10528.js b/deps/v8/test/intl/regress-10528.js
new file mode 100644
index 00000000000000..59194b0a7c4b6e
--- /dev/null
+++ b/deps/v8/test/intl/regress-10528.js
@@ -0,0 +1,20 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Test date format in Hebrew calendar of dates prior to -003760-09-07
+// On Android, hebrew calendar is only available on he locale.
+let dateOK = new Date (Date.UTC(-3760, 8, 7));
+let dateKO = new Date (Date.UTC(-3760, 8, 6));
+let dateDisplay = new Intl.DateTimeFormat (
+    'he-u-ca-hebrew',
+    { timeZone : 'UTC', year : 'numeric', month :'long',
+      day : 'numeric', weekday : 'long' });
+assertEquals("Mon, 07 Sep -3760 00:00:00 GMT",
+    dateOK.toUTCString(), "dateOK.toUTCString()");
+assertEquals("Sun, 06 Sep -3760 00:00:00 GMT",
+    dateKO.toUTCString(), "dateKO.toUTCString()");
+assertEquals("יום שני, 1 בתשרי 1",
+    dateDisplay.format(dateOK), "dateDisplay.format(dateOK)");
+assertEquals("יום ראשון, 29 באלול 0",
+    dateDisplay.format(dateKO), "dateDisplay.format(dateKO)");
diff --git a/deps/v8/test/intl/regress-10529.js b/deps/v8/test/intl/regress-10529.js
new file mode 100644
index 00000000000000..5cb0fbd5bf5e6c
--- /dev/null
+++ b/deps/v8/test/intl/regress-10529.js
@@ -0,0 +1,20 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Test date format in Indian calendar of date prior to 0001-01-01
+// On Android, indian calendar is only available on hi locale.
+let dateOK = new Date ("0001-12-31T23:52:58.000Z");
+let dateKO = new Date ("0000-12-30T23:52:58.000Z");
+let dateDisplay = new Intl.DateTimeFormat (
+    'hi-u-ca-indian',
+    { timeZone : 'UTC', year : 'numeric', month :'long',
+      day : 'numeric', weekday : 'long' });
+assertEquals("Mon, 31 Dec 0001 23:52:58 GMT",
+    dateOK.toUTCString(), "dateOK.toUTCString()");
+assertEquals("Sat, 30 Dec 0000 23:52:58 GMT",
+    dateKO.toUTCString(), "dateKO.toUTCString()");
+assertEquals("शक -77 पौष 10, सोमवार",
+    dateDisplay.format(dateOK), "dateDisplay.format(dateOK)");
+assertEquals("शक -78 पौष 9, शनिवार",
+    dateDisplay.format(dateKO), "dateDisplay.format(dateKO)");
diff --git a/deps/v8/test/intl/regress-1121156.js b/deps/v8/test/intl/regress-1121156.js
index cf0f245c3acb2a..75c02b4b70d768 100644
--- a/deps/v8/test/intl/regress-1121156.js
+++ b/deps/v8/test/intl/regress-1121156.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter --expose-gc
+// Flags: --expose-gc
 
 let segmenter = new Intl.Segmenter();
 let segments = segmenter.segment(undefined);
diff --git a/deps/v8/test/intl/regress-11295.js b/deps/v8/test/intl/regress-11295.js
new file mode 100644
index 00000000000000..aa12596c0e66ce
--- /dev/null
+++ b/deps/v8/test/intl/regress-11295.js
@@ -0,0 +1,22 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+let cal = (new Intl.DateTimeFormat('en-u-ca-iso8601'))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en-u-ca-ISO8601'))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en', {calendar: 'iso8601'}))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en', {calendar: 'ISO8601'}))
+        .resolvedOptions().calendar;
+assertEquals('iso8601', cal);
+cal = (new Intl.DateTimeFormat('en-u-ca-ISO8601x'))
+        .resolvedOptions().calendar;
+assertEquals('gregory', cal);
+cal = (new Intl.DateTimeFormat('en', {calendar: 'iso8601x'}))
+        .resolvedOptions().calendar;
+assertEquals('gregory', cal);
diff --git a/deps/v8/test/intl/regress-1146468.js b/deps/v8/test/intl/regress-1146468.js
new file mode 100644
index 00000000000000..c70e3ed31351cc
--- /dev/null
+++ b/deps/v8/test/intl/regress-1146468.js
@@ -0,0 +1,8 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Test Long Locale won't cause Intl.Locale to assert in debug mode
+let lo = new Intl.Locale(
+    "de-u-kk-false-ks-level1-kv-space-cu-eur-ms-metric-nu-latn-lb-strict-" +
+    "lw-normal-ss-none-em-default-rg-atzzzz-sd-atat1-va-posix");
diff --git a/deps/v8/test/intl/regress-900013.js b/deps/v8/test/intl/regress-900013.js
index c7cdc658954bc9..55b168d3699b51 100644
--- a/deps/v8/test/intl/regress-900013.js
+++ b/deps/v8/test/intl/regress-900013.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 // Regression test to ensure no Intl["SegmentIterator"]
 
 assertThrows(() => new Intl["SegmentIterator"](), TypeError);
diff --git a/deps/v8/test/intl/segmenter/check-lb-option.js b/deps/v8/test/intl/segmenter/check-lb-option.js
index 0e54d182028176..b214c664121bbe 100644
--- a/deps/v8/test/intl/segmenter/check-lb-option.js
+++ b/deps/v8/test/intl/segmenter/check-lb-option.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 let invalid_lb = [
   "invalid",
   "abce",
diff --git a/deps/v8/test/intl/segmenter/constructor-order.js b/deps/v8/test/intl/segmenter/constructor-order.js
index e43fb9f963085d..67f6681c8c3356 100644
--- a/deps/v8/test/intl/segmenter/constructor-order.js
+++ b/deps/v8/test/intl/segmenter/constructor-order.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 // Throws only once during construction.
 // Check for all getters to prevent regression.
 // Preserve the order of getter initialization.
diff --git a/deps/v8/test/intl/segmenter/constructor.js b/deps/v8/test/intl/segmenter/constructor.js
index 6612e1eab6827e..7cf824305641f0 100644
--- a/deps/v8/test/intl/segmenter/constructor.js
+++ b/deps/v8/test/intl/segmenter/constructor.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 // Segmenter constructor can't be called as function.
 assertThrows(() => Intl.Segmenter(["sr"]), TypeError);
 
diff --git a/deps/v8/test/intl/segmenter/grapheme-containing.js b/deps/v8/test/intl/segmenter/grapheme-containing.js
index 193a26e6011d3b..6464c2224e3b25 100644
--- a/deps/v8/test/intl/segmenter/grapheme-containing.js
+++ b/deps/v8/test/intl/segmenter/grapheme-containing.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 const segmenter = new Intl.Segmenter();
 const waving_hand_light_skin_tone = "\uD83D\uDC4B\uD83C\uDFFB";
 const man_light_skin_tone_red_hair =
diff --git a/deps/v8/test/intl/segmenter/grapheme-nested-next.js b/deps/v8/test/intl/segmenter/grapheme-nested-next.js
index 21be34326f891b..022ed2303cad42 100644
--- a/deps/v8/test/intl/segmenter/grapheme-nested-next.js
+++ b/deps/v8/test/intl/segmenter/grapheme-nested-next.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 // Test to ensure the nested calling of the next method won't caused
 // confusion to each other.
 const segmenter = new Intl.Segmenter();
diff --git a/deps/v8/test/intl/segmenter/grapheme-next-after-containing.js b/deps/v8/test/intl/segmenter/grapheme-next-after-containing.js
index 5ad97f681033f4..aec1f9db03ac00 100644
--- a/deps/v8/test/intl/segmenter/grapheme-next-after-containing.js
+++ b/deps/v8/test/intl/segmenter/grapheme-next-after-containing.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 // Test to ensure the calling of containing() won't impact the calling of
 // the next() method.
 const segmenter = new Intl.Segmenter();
diff --git a/deps/v8/test/intl/segmenter/segment-grapheme.js b/deps/v8/test/intl/segmenter/segment-grapheme.js
index 3e28142e6430aa..f36aafe95585bb 100644
--- a/deps/v8/test/intl/segmenter/segment-grapheme.js
+++ b/deps/v8/test/intl/segmenter/segment-grapheme.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 const seg = new Intl.Segmenter([], {granularity: "grapheme"})
 for (const text of [
     "Hello world!", // English
diff --git a/deps/v8/test/intl/segmenter/segment-iterator-ownPropertyDescriptor.js b/deps/v8/test/intl/segmenter/segment-iterator-ownPropertyDescriptor.js
index 2aba164c0500ec..2626f8cac02303 100644
--- a/deps/v8/test/intl/segmenter/segment-iterator-ownPropertyDescriptor.js
+++ b/deps/v8/test/intl/segmenter/segment-iterator-ownPropertyDescriptor.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 let seg = new Intl.Segmenter();
 let descriptor = Object.getOwnPropertyDescriptor(
     Intl.Segmenter, "supportedLocalesOf");
diff --git a/deps/v8/test/intl/segmenter/segment-sentence.js b/deps/v8/test/intl/segmenter/segment-sentence.js
index 6bfcebd2b4d675..aa70953c851ce7 100644
--- a/deps/v8/test/intl/segmenter/segment-sentence.js
+++ b/deps/v8/test/intl/segmenter/segment-sentence.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 const seg = new Intl.Segmenter([], {granularity: "sentence"})
 for (const text of [
     "Hello world!", // English
diff --git a/deps/v8/test/intl/segmenter/segment-word.js b/deps/v8/test/intl/segmenter/segment-word.js
index c2919e59112a38..4961baf0e0a554 100644
--- a/deps/v8/test/intl/segmenter/segment-word.js
+++ b/deps/v8/test/intl/segmenter/segment-word.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 const seg = new Intl.Segmenter([], {granularity: "word"})
 for (const text of [
     "Hello world!", // English
diff --git a/deps/v8/test/intl/segmenter/segment.js b/deps/v8/test/intl/segmenter/segment.js
index a4c44f34522433..25f3244ea77efc 100644
--- a/deps/v8/test/intl/segmenter/segment.js
+++ b/deps/v8/test/intl/segmenter/segment.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 assertEquals("function", typeof Intl.Segmenter.prototype.segment);
 assertEquals(1, Intl.Segmenter.prototype.segment.length);
 
diff --git a/deps/v8/test/intl/segmenter/subclassing.js b/deps/v8/test/intl/segmenter/subclassing.js
index 2bea1e88ce8c27..69db0aaf9293e2 100644
--- a/deps/v8/test/intl/segmenter/subclassing.js
+++ b/deps/v8/test/intl/segmenter/subclassing.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 // Test subclassing of Segmenter
 class CustomSegmenter extends Intl.Segmenter {
   constructor(locales, options) {
diff --git a/deps/v8/test/intl/segmenter/supported-locale.js b/deps/v8/test/intl/segmenter/supported-locale.js
index b1a035315649ac..b09832a04dbc6a 100644
--- a/deps/v8/test/intl/segmenter/supported-locale.js
+++ b/deps/v8/test/intl/segmenter/supported-locale.js
@@ -1,8 +1,6 @@
 // Copyright 2018 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
-// Flags: --harmony-intl-segmenter
 assertEquals(
     typeof Intl.Segmenter.supportedLocalesOf,
     "function",
diff --git a/deps/v8/test/intl/segmenter/word-containing.js b/deps/v8/test/intl/segmenter/word-containing.js
index 8c68eed373ad35..b6e43d3d7d64ab 100644
--- a/deps/v8/test/intl/segmenter/word-containing.js
+++ b/deps/v8/test/intl/segmenter/word-containing.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-intl-segmenter
-
 const segmenter = new Intl.Segmenter(undefined, {granularity: 'word'});
 const waving_hand_light_skin_tone = "\uD83D\uDC4B\uD83C\uDFFB";
 const man_light_skin_tone_red_hair =
diff --git a/deps/v8/test/js-perf-test/SuperIC.json b/deps/v8/test/js-perf-test/SuperIC.json
index cc97396778434b..f133ee7aaf98dd 100644
--- a/deps/v8/test/js-perf-test/SuperIC.json
+++ b/deps/v8/test/js-perf-test/SuperIC.json
@@ -11,352 +11,202 @@
   "resources": ["base.js"],
   "tests": [
     {
-      "name": "Monomorphic",
+      "name": "Compare-Monomorphic-1-opt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["monomorphic"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["monomorphic.js"],
-          "test_flags": ["baseline"]
+          "name": "normal-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-opt", "normal_1", "opt"]
         },
         {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "super-baseline-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-opt", "super_1", "opt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["monomorphic.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
-        },
-        {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
-        }
-      ]
-    },
-    {
-      "name": "Monomorphic-MegaReceivers",
-      "path": ["SuperIC"],
-      "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["monomorphic-mega-receivers"],
-      "tests": [
-        {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers.js"],
-          "test_flags": ["baseline"]
-        },
-        {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
-        },
-        {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
-        },
-        {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
-        }
-      ]
-    },
-    {
-      "name": "Polymorphic-Mixin",
-      "path": ["SuperIC"],
-      "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["polymorphic-mixin"],
-      "tests": [
-        {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin.js"],
-          "test_flags": ["baseline"]
-        },
-        {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
-        },
-        {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
-        },
-        {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-opt", "super_1", "opt"]
         }
       ]
     },
     {
-      "name": "Polymorphic-Mixin-MegaReceivers",
+      "name": "Compare-Monomorphic-1-noopt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["polymorphic-mixin-mega-receivers"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers.js"],
-          "test_flags": ["baseline"]
+          "name": "normal-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-noopt", "normal_1", "noopt"]
         },
         {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "super-baseline-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-noopt", "super_1", "noopt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
-        },
-        {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-noopt", "super_1", "noopt"]
         }
       ]
     },
     {
-      "name": "Megamorphic-Mixin",
+      "name": "Compare-Monomorphic-2-opt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["polymorphic-mixin"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin.js"],
-          "test_flags": ["baseline"]
-        },
-        {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "normal-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-opt", "normal_2", "opt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
+          "name": "super-baseline-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-opt", "super_2", "opt"]
         },
         {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-opt", "super_2", "opt"]
         }
       ]
     },
     {
-      "name": "Monomorphic-Getter",
+      "name": "Compare-Monomorphic-2-noopt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["monomorphic-getter"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["monomorphic-getter.js"],
-          "test_flags": ["baseline"]
-        },
-        {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic-getter.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "normal-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-noopt", "normal_2", "noopt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["monomorphic-getter.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
+          "name": "super-baseline-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-noopt", "super_2", "noopt"]
         },
         {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic-getter.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-noopt", "super_2", "noopt"]
         }
       ]
     },
     {
-      "name": "Monomorphic-MegaReceivers-Getter",
+      "name": "Compare-Megamorphic-1-opt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["monomorphic-mega-receivers-getter"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers-getter.js"],
-          "test_flags": ["baseline"]
+          "name": "normal-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-opt", "normal_3", "opt"]
         },
         {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers-getter.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "super-baseline-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-opt", "super_3", "opt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers-getter.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
-        },
-        {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["monomorphic-mega-receivers-getter.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-opt", "super_3", "opt"]
         }
       ]
     },
     {
-      "name": "Polymorphic-Mixin-Getter",
+      "name": "Compare-Megamorphic-1-noopt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["polymorphic-mixin-getter"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-getter.js"],
-          "test_flags": ["baseline"]
+          "name": "normal-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-noopt", "normal_3", "noopt"]
         },
         {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-getter.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "super-baseline-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-noopt", "super_3", "noopt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-getter.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
-        },
-        {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-getter.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-noopt", "super_3", "noopt"]
         }
       ]
     },
     {
-      "name": "Polymorphic-Mixin-MegaReceivers-Getter",
+      "name": "Compare-Megamorphic-2-opt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["polymorphic-mixin-mega-receivers-getter"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers-getter.js"],
-          "test_flags": ["baseline"]
-        },
-        {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers-getter.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "normal-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-opt", "normal_4", "opt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers-getter.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
+          "name": "super-baseline-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-opt", "super_4", "opt"]
         },
         {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["polymorphic-mixin-mega-receivers-getter.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-opt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-opt", "super_4", "opt"]
         }
       ]
     },
     {
-      "name": "Megamorphic-Mixin-Getter",
+      "name": "Compare-Megamorphic-2-noopt",
       "path": ["SuperIC"],
       "results_regexp": "^%s\\(Score\\): (.+)$",
-      "test_flags": ["polymorphic-mixin-getter"],
+      "resources": ["compare-super-and-normal-property-access.js"],
+      "flags": ["--allow-natives-syntax"],
       "tests": [
         {
-          "name": "baseline",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin-getter.js"],
-          "test_flags": ["baseline"]
-        },
-        {
-          "name": "baseline-noopt",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin-getter.js"],
-          "test_flags": ["baseline-noopt"],
-          "flags": ["--noopt"]
+          "name": "normal-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["normal-noopt", "normal_4", "noopt"]
         },
         {
-          "name": "superic",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin-getter.js"],
-          "test_flags": ["superic"],
-          "flags": ["--super-ic"]
+          "name": "super-baseline-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "test_flags": ["super-baseline-noopt", "super_4", "noopt"]
         },
         {
-          "name": "superic-noopt",
-          "main": "run.js",
-          "resources": ["megamorphic-mixin-getter.js"],
-          "test_flags": ["superic-noopt"],
-          "flags": ["--super-ic", "--noopt"]
+          "name": "super-super-ic-noopt",
+          "main": "compare-super-and-normal-property-access.js",
+          "flags": ["--super-ic"],
+          "test_flags": ["super-super-ic-noopt", "super_4", "noopt"]
         }
       ]
     }
diff --git a/deps/v8/test/js-perf-test/SuperIC/compare-super-and-normal-property-access.js b/deps/v8/test/js-perf-test/SuperIC/compare-super-and-normal-property-access.js
new file mode 100644
index 00000000000000..70229e26d37b0f
--- /dev/null
+++ b/deps/v8/test/js-perf-test/SuperIC/compare-super-and-normal-property-access.js
@@ -0,0 +1,243 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+load('../base.js');
+
+const BENCHMARK_NAME = arguments[0];
+const TEST_TYPE = arguments[1];
+const optimize_param = arguments[2];
+let optimize;
+if (optimize_param == "opt") {
+  optimize = true;
+} else if (optimize_param == "noopt"){
+  optimize = false;
+} else {
+  throw new Error("Test configuration error");
+}
+
+const DETERMINISTIC_RUNS = 1;
+const LOCAL_ITERATIONS = 10000;
+new BenchmarkSuite(BENCHMARK_NAME, [1000], [
+  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS, runBenchmark)
+]);
+
+// Classes for monomorphic super property access.
+class A { };
+A.prototype.super_prop_a0 = 10;
+A.prototype.super_prop_a1 = 10;
+A.prototype.super_prop_a2 = 10;
+A.prototype.super_prop_a3 = 10;
+A.prototype.super_prop_a4 = 10;
+A.prototype.super_prop_a5 = 10;
+A.prototype.super_prop_a6 = 10;
+A.prototype.super_prop_a7 = 10;
+A.prototype.super_prop_a8 = 10;
+A.prototype.super_prop_a9 = 10;
+
+class B extends A { }
+B.prototype.super_prop_b0 = 10;
+B.prototype.super_prop_b1 = 10;
+B.prototype.super_prop_b2 = 10;
+B.prototype.super_prop_b3 = 10;
+B.prototype.super_prop_b4 = 10;
+B.prototype.super_prop_b5 = 10;
+B.prototype.super_prop_b6 = 10;
+B.prototype.super_prop_b7 = 10;
+B.prototype.super_prop_b8 = 10;
+B.prototype.super_prop_b9 = 10;
+
+class C extends B {
+  test_super_a(unused) {
+    // Do many property accesses to increase the time taken by the thing we want
+    // to measure, in comparison to the overhead of calling this function.
+    return (super.super_prop_a0 + super.super_prop_a1 + super.super_prop_a2 +
+      super.super_prop_a3 + super.super_prop_a4 + super.super_prop_a5 +
+      super.super_prop_a6 + super.super_prop_a7 + super.super_prop_a8 +
+      super.super_prop_a9);
+  }
+  test_super_b(unused) {
+    return (super.super_prop_b0 + super.super_prop_b1 + super.super_prop_b2 +
+        super.super_prop_b3 + super.super_prop_b4 + super.super_prop_b5 +
+        super.super_prop_b6 + super.super_prop_b7 + super.super_prop_b8 +
+        super.super_prop_b9);
+  }
+};
+
+// Classes for megamorphic super property access.
+function createClasses(base) {
+  class B extends base { };
+  B.prototype.super_prop_b0 = 10;
+  B.prototype.super_prop_b1 = 10;
+  B.prototype.super_prop_b2 = 10;
+  B.prototype.super_prop_b3 = 10;
+  B.prototype.super_prop_b4 = 10;
+  B.prototype.super_prop_b5 = 10;
+  B.prototype.super_prop_b6 = 10;
+  B.prototype.super_prop_b7 = 10;
+  B.prototype.super_prop_b8 = 10;
+  B.prototype.super_prop_b9 = 10;
+
+  class C extends B {
+    test_super_a(unused) {
+      return (super.super_prop_a0 + super.super_prop_a1 + super.super_prop_a2 +
+        super.super_prop_a3 + super.super_prop_a4 + super.super_prop_a5 +
+        super.super_prop_a6 + super.super_prop_a7 + super.super_prop_a8 +
+        super.super_prop_a9);
+    }
+    test_super_b(unused) {
+      return (super.super_prop_b0 + super.super_prop_b1 + super.super_prop_b2 +
+        super.super_prop_b3 + super.super_prop_b4 + super.super_prop_b5 +
+        super.super_prop_b6 + super.super_prop_b7 + super.super_prop_b8 +
+        super.super_prop_b9);
+    }
+  }
+  return C;
+}
+
+function test_property_access(o) {
+  return (o.prop0 + o.prop1 + o.prop2 + o.prop3 + o.prop4 + o.prop5 + o.prop6 +
+     o.prop7 + o.prop8 + o.prop9);
+}
+
+// Set up "objects" and "tested_functions" based on which test we're running.
+let objects;
+let tested_functions;
+
+switch (TEST_TYPE) {
+  case "super_1":
+    // Monomorphic super property lookup, property is a constant, found 1 step
+    // above the lookup start object in the prototype chain.
+    objects = [new C()];
+    tested_functions = [C.prototype.test_super_a];
+    break;
+  case "normal_1":
+    // Monomorphic normal property lookup, property is a constant, found 1 step
+    // above the lookup start object in the prototype chain.
+    objects = [{__proto__: {"prop0": 10, "prop1": 10, "prop2": 10, "prop3": 10,
+                            "prop4": 10, "prop5": 10, "prop6": 10, "prop7": 10,
+                            "prop8": 10, "prop9": 10}}];
+    tested_functions = [test_property_access];
+    break;
+  case "super_2":
+    // Monomorphic super property lookup, property is a constant, found in the
+    // lookup start object.
+    objects = [new C()];
+    tested_functions = [C.prototype.test_super_b];
+    break;
+  case "normal_2":
+    // Monomorphic normal property lookup, property is a constant, found in the
+    // lookup start object.
+    objects = [{"prop0": 10, "prop1": 10, "prop2": 10, "prop3": 10, "prop4": 10,
+                "prop5": 10, "prop6": 10, "prop7": 10, "prop8": 10,
+                "prop9": 10}];
+    tested_functions = [test_property_access];
+    break;
+  case "super_3":
+    // Megamorphic super property lookup, property is a constant, found 1 step
+    // above the lookup start object in the prototype chain. The holder is
+    // the same in all cases though.
+    objects = [];
+    tested_functions = [];
+    for (let i = 0; i < 5; ++i) {
+      const c = createClasses(A);
+      objects.push(new c());
+      tested_functions.push(c.prototype.test_super_a);
+    }
+    break;
+  case "normal_3":
+    // Megamorphic normal property lookup, property is a constant, found 1 step
+    // above the lookup start object in the prototype chain. The holder is
+    // the same in all cases though.
+    const proto = {"prop0": 10, "prop1": 10, "prop2": 10, "prop3": 10,
+                   "prop4": 10, "prop5": 10, "prop6": 10, "prop7": 10,
+                   "prop8": 10, "prop9": 10};
+    objects = [{__proto__: proto}, {__proto__: proto, "a": 1},
+               {__proto__: proto, "a": 1, "b": 1},
+               {__proto__: proto, "a": 1, "b": 1, "c": 1},
+               {__proto__: proto, "a": 1, "b": 1, "c": 1, "d": 1}];
+    tested_functions = [test_property_access, test_property_access,
+                        test_property_access, test_property_access,
+                        test_property_access];
+    break;
+  case "super_4":
+    // Megamorphic super property lookup, property is a constant, found in the
+    // lookup start object. The holder is always a different object.
+    objects = [];
+    tested_functions = [];
+    for (let i = 0; i < 5; ++i) {
+      const c = createClasses(A);
+      objects.push(new c());
+      tested_functions.push(c.prototype.test_super_b);
+    }
+    break;
+  case "normal_4":
+    // Megamorphic normal property lookup, property is a constant, found in the
+    // lookup start object. The holder is always a different object.
+    objects = [{"prop0": 10, "prop1": 10, "prop2": 10, "prop3": 10, "prop4": 10,
+                "prop5": 10, "prop6": 10, "prop7": 10, "prop8": 10,
+                "prop9": 10},
+               {"a": 0, "prop0": 10, "prop1": 10, "prop2": 10, "prop3": 10,
+                "prop4": 10, "prop5": 10, "prop6": 10, "prop7": 10, "prop8": 10,
+                "prop9": 10},
+               {"a": 0, "b": 0, "prop0": 10, "prop1": 10, "prop2": 10,
+                "prop3": 10, "prop4": 10, "prop5": 10, "prop6": 10, "prop7": 10,
+                "prop8": 10, "prop9": 10},
+               {"a": 0, "b": 0, "c": 0, "prop0": 10, "prop1": 10, "prop2": 10,
+                "prop3": 10, "prop4": 10, "prop5": 10, "prop6": 10, "prop7": 10,
+                "prop8": 10, "prop9": 10},
+               {"a": 0, "b": 0, "c": 0, "d": 0, "prop0": 10, "prop1": 10,
+                "prop2": 10, "prop3": 10, "prop4": 10, "prop5": 10, "prop6": 10,
+                "prop7": 10, "prop8": 10, "prop9": 10}];
+
+    tested_functions = [test_property_access, test_property_access,
+                        test_property_access, test_property_access,
+                        test_property_access];
+    break;
+  default:
+    throw new Error("Test configuration error");
+}
+
+for (f of tested_functions) {
+  if (optimize) {
+    %PrepareFunctionForOptimization(f);
+  } else {
+    %NeverOptimizeFunction(f);
+  }
+}
+
+function runBenchmark() {
+  const expected_value = 10 * 10;
+  let ix = 0;
+  for (let i = 0; i < LOCAL_ITERATIONS; ++i) {
+    const object = objects[ix];
+    const r = tested_functions[ix].call(object, object);
+    if (r != expected_value) {
+      throw new Error("Test error");
+    }
+    if (++ix == objects.length) {
+      ix = 0;
+      if (optimize) {
+        for (f of tested_functions) {
+          %OptimizeFunctionOnNextCall(f);
+        }
+      }
+    }
+  }
+}
+
+var success = true;
+
+function PrintResult(name, result) {
+  print(name + '(Score): ' + result);
+}
+
+function PrintError(name, error) {
+  PrintResult(name, error);
+  success = false;
+}
+
+BenchmarkSuite.config.doWarmup = false;
+BenchmarkSuite.config.doDeterministic = true;
+
+BenchmarkSuite.RunSuites({NotifyResult: PrintResult, NotifyError: PrintError});
diff --git a/deps/v8/test/js-perf-test/SuperIC/megamorphic-mixin-getter.js b/deps/v8/test/js-perf-test/SuperIC/megamorphic-mixin-getter.js
deleted file mode 100644
index 17264e68c8386f..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/megamorphic-mixin-getter.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS,
-                runBenchmark)
-]);
-
-function createSubclass() {
-  class A {
-    get super_prop() {
-        return 10;
-    }
-  };
-  class B extends A {
-    test() {
-      return super.super_prop;
-    }
-  };
-  return B;
-}
-
-const NO_CLASSES = 10;
-let objects = [];
-for (let i = 0; i < NO_CLASSES; ++i) {
-  const klass = createSubclass();
-  objects.push(new klass());
-}
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/megamorphic-mixin.js b/deps/v8/test/js-perf-test/SuperIC/megamorphic-mixin.js
deleted file mode 100644
index bd59bba19e57fe..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/megamorphic-mixin.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS,
-                runBenchmark)
-]);
-
-function createSubclass() {
-  class A { };
-  A.prototype.super_prop = 10;
-  class B extends A {
-    test() {
-      return super.super_prop;
-    }
-  };
-  return B;
-}
-
-const NO_CLASSES = 10;
-let objects = [];
-for (let i = 0; i < NO_CLASSES; ++i) {
-  const klass = createSubclass();
-  objects.push(new klass());
-}
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/monomorphic-getter.js b/deps/v8/test/js-perf-test/SuperIC/monomorphic-getter.js
deleted file mode 100644
index 7d35ef1008d8a5..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/monomorphic-getter.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS, runBenchmark)
-]);
-
-class A {
-  get super_prop() {
-    return 10;
-  }
-};
-
-class B extends A {
-  test() {
-    return super.super_prop;
-  }
-};
-
-const objects = [new B(), new B(), new B(), new B()];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/monomorphic-mega-receivers-getter.js b/deps/v8/test/js-perf-test/SuperIC/monomorphic-mega-receivers-getter.js
deleted file mode 100644
index 31845a1b46ecf2..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/monomorphic-mega-receivers-getter.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS, runBenchmark)
-]);
-
-class A {
-  get super_prop() {
-    return 10;
-  }
-};
-
-class B extends A {
-  test() {
-    return super.super_prop;
-  }
-};
-
-class C0 extends B { };
-class C1 extends B { };
-class C2 extends B { };
-class C3 extends B { };
-class C4 extends B { };
-class C5 extends B { };
-class C6 extends B { };
-class C7 extends B { };
-class C8 extends B { };
-class C9 extends B { };
-
-const objects = [
-  new C0(),
-  new C1(),
-  new C2(),
-  new C3(),
-  new C4(),
-  new C5(),
-  new C6(),
-  new C7(),
-  new C8(),
-  new C9(),
-];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/monomorphic-mega-receivers.js b/deps/v8/test/js-perf-test/SuperIC/monomorphic-mega-receivers.js
deleted file mode 100644
index 00ed665ad9e270..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/monomorphic-mega-receivers.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS,
-                runBenchmark)
-]);
-
-class A { };
-A.prototype.super_prop = 10;
-
-class B extends A {
-  test() {
-    return super.super_prop;
-  }
-};
-
-class C0 extends B { };
-class C1 extends B { };
-class C2 extends B { };
-class C3 extends B { };
-class C4 extends B { };
-class C5 extends B { };
-class C6 extends B { };
-class C7 extends B { };
-class C8 extends B { };
-class C9 extends B { };
-
-const objects = [
-  new C0(),
-  new C1(),
-  new C2(),
-  new C3(),
-  new C4(),
-  new C5(),
-  new C6(),
-  new C7(),
-  new C8(),
-  new C9(),
-];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/monomorphic.js b/deps/v8/test/js-perf-test/SuperIC/monomorphic.js
deleted file mode 100644
index 3b48fcb62a3038..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/monomorphic.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS, runBenchmark)
-]);
-
-class A { };
-A.prototype.super_prop = 10;
-
-class B extends A {
-  test() {
-    return super.super_prop;
-  }
-};
-
-const objects = [new B(), new B(), new B(), new B()];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-getter.js b/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-getter.js
deleted file mode 100644
index 3413630575d122..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-getter.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS,
-                runBenchmark)
-]);
-
-function createSubclass() {
-  class A {
-    get super_prop() {
-      return 10;
-    }
-  };
-  class B extends A {
-    test() {
-      return super.super_prop;
-    }
-  };
-  return B;
-}
-
-const b1 = createSubclass();
-const b2 = createSubclass();
-
-const objects = [
-  new b1(),
-  new b2()
-];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-mega-receivers-getter.js b/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-mega-receivers-getter.js
deleted file mode 100644
index 5d60e3687a8571..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-mega-receivers-getter.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS, runBenchmark)
-]);
-
-
-function createSubclass() {
-  class A {
-    get super_prop() {
-      return 10;
-    }
-  };
-  class B extends A {
-    test() {
-      return super.super_prop;
-    }
-  };
-  return B;
-}
-
-const b1 = createSubclass();
-const b2 = createSubclass();
-
-class C0 extends b1 { };
-class C1 extends b2 { };
-class C2 extends b1 { };
-class C3 extends b2 { };
-class C4 extends b1 { };
-class C5 extends b2 { };
-class C6 extends b1 { };
-class C7 extends b2 { };
-class C8 extends b1 { };
-class C9 extends b2 { };
-
-const objects = [
-  new C0(),
-  new C1(),
-  new C2(),
-  new C3(),
-  new C4(),
-  new C5(),
-  new C6(),
-  new C7(),
-  new C8(),
-  new C9(),
-];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-mega-receivers.js b/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-mega-receivers.js
deleted file mode 100644
index 0e115bf6f9350e..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin-mega-receivers.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS, runBenchmark)
-]);
-
-function createSubclass() {
-  class A { };
-  A.prototype.super_prop = 10;
-  class B extends A {
-    test() {
-      return super.super_prop;
-    }
-  };
-  return B;
-}
-
-const b1 = createSubclass();
-const b2 = createSubclass();
-
-class C0 extends b1 { };
-class C1 extends b2 { };
-class C2 extends b1 { };
-class C3 extends b2 { };
-class C4 extends b1 { };
-class C5 extends b2 { };
-class C6 extends b1 { };
-class C7 extends b2 { };
-class C8 extends b1 { };
-class C9 extends b2 { };
-
-const objects = [
-  new C0(),
-  new C1(),
-  new C2(),
-  new C3(),
-  new C4(),
-  new C5(),
-  new C6(),
-  new C7(),
-  new C8(),
-  new C9(),
-];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin.js b/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin.js
deleted file mode 100644
index e9b797a0b7c163..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/polymorphic-mixin.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-const DETERMINISTIC_RUNS = 10000;
-new BenchmarkSuite(BENCHMARK_NAME, [1000], [
-  new Benchmark(BENCHMARK_NAME, false, false, DETERMINISTIC_RUNS,
-                runBenchmark)
-]);
-
-function createSubclass() {
-  class A { };
-  A.prototype.super_prop = 10;
-  class B extends A {
-    test() {
-      return super.super_prop;
-    }
-  };
-  return B;
-}
-
-const b1 = createSubclass();
-const b2 = createSubclass();
-
-const objects = [
-  new b1(),
-  new b2()
-];
-
-let ix = 0;
-const EXPECTED_VALUE = 10;
-
-function runBenchmark() {
-  const r = objects[ix].test();
-  if (r != EXPECTED_VALUE) {
-    throw new Error("Test error");
-  }
-  if (++ix == objects.length) {
-    ix = 0;
-  }
-}
diff --git a/deps/v8/test/js-perf-test/SuperIC/run.js b/deps/v8/test/js-perf-test/SuperIC/run.js
deleted file mode 100644
index 64e306a79d8154..00000000000000
--- a/deps/v8/test/js-perf-test/SuperIC/run.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-load('../base.js');
-
-BENCHMARK_NAME = arguments[1];
-load(arguments[0] + '.js');
-
-var success = true;
-
-function PrintResult(name, result) {
-  print(name + '(Score): ' + result);
-}
-
-function PrintError(name, error) {
-  PrintResult(name, error);
-  success = false;
-}
-
-BenchmarkSuite.config.doWarmup = false;
-BenchmarkSuite.config.doDeterministic = true;
-
-BenchmarkSuite.RunSuites({NotifyResult: PrintResult, NotifyError: PrintError});
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.js b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.js
index 35f30accdfa9c1..e7d09565e54c64 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.js
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   set #foo(val) {}
   constructor() {
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.out b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.out
index f6328b9c43403b..8e5322cfa80a1e 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.out
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-count.out
@@ -1,9 +1,9 @@
 # Copyright 2019 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:10: TypeError: '#foo' was defined without a getter
+*%(basename)s:8: TypeError: '#foo' was defined without a getter
     this.#foo++;
     ^
 TypeError: '#foo' was defined without a getter
-    at new C (*%(basename)s:10:5)
-    at *%(basename)s:14:1
+    at new C (*%(basename)s:8:5)
+    at *%(basename)s:12:1
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.js b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.js
index 680c1bba744d98..778aba024006e4 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.js
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   set #a(val) {}
   setA(obj, val) { obj.#a = val; }
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.out b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.out
index 66429501f638e5..2d308523d4b4b0 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.out
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-getter-nested.out
@@ -1,10 +1,10 @@
 # Copyright 2019 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:9: TypeError: Object must be an instance of class C
+*%(basename)s:7: TypeError: Object must be an instance of class C
   setA(obj, val) { obj.#a = val; }
                        ^
 TypeError: Object must be an instance of class C
-    at C.setA (*%(basename)s:9:24)
-    at new C (*%(basename)s:15:10)
-    at *%(basename)s:19:1
\ No newline at end of file
+    at C.setA (*%(basename)s:7:24)
+    at new C (*%(basename)s:13:10)
+    at *%(basename)s:17:1
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-getter.js b/deps/v8/test/message/fail/class-accessors-private-undefined-getter.js
index 9422739f7def29..f2a6fed3a244e1 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-getter.js
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-getter.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   set #a(val) {}
   constructor() {
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-getter.out b/deps/v8/test/message/fail/class-accessors-private-undefined-getter.out
index c41451c3af3814..06b65cdc2f8d61 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-getter.out
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-getter.out
@@ -1,9 +1,9 @@
 # Copyright 2019 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:10: TypeError: '#a' was defined without a getter
+*%(basename)s:8: TypeError: '#a' was defined without a getter
     const a = this.#a;
               ^
 TypeError: '#a' was defined without a getter
-    at new C (*%(basename)s:10:15)
-    at *%(basename)s:13:1
+    at new C (*%(basename)s:8:15)
+    at *%(basename)s:11:1
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.js b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.js
index 2a1f05767f57d0..267456d4f60838 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.js
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   get #a() {}
   constructor() {
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.out b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.out
index a98f4707d412af..207e2bfaa99b94 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.out
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-compound.out
@@ -1,9 +1,9 @@
 # Copyright 2019 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:10: TypeError: '#a' was defined without a setter
+*%(basename)s:8: TypeError: '#a' was defined without a setter
     this.#a = 1;
             ^
 TypeError: '#a' was defined without a setter
-    at new C (*%(basename)s:10:13)
-    at *%(basename)s:13:1
+    at new C (*%(basename)s:8:13)
+    at *%(basename)s:11:1
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.js b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.js
index 33367c7ef9d303..2f9bfaaaaa927c 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.js
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   get #foo() {}
   constructor() {
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.out b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.out
index 787a00019adc78..8fc15c8b9b09ed 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.out
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-count.out
@@ -1,9 +1,9 @@
 # Copyright 2019 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:10: TypeError: '#foo' was defined without a setter
+*%(basename)s:8: TypeError: '#foo' was defined without a setter
     this.#foo++;
     ^
 TypeError: '#foo' was defined without a setter
-    at new C (*%(basename)s:10:5)
-    at *%(basename)s:14:1
+    at new C (*%(basename)s:8:5)
+    at *%(basename)s:12:1
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.js b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.js
index 2f28fc26f35498..af0dcdd778847e 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.js
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   get #a() {}
   getA(obj) { return obj.#a; }
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.out b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.out
index ffdc328a95eb6d..8a340115b3e0d8 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.out
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter-nested.out
@@ -1,10 +1,10 @@
 # Copyright 2019 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:9: TypeError: Object must be an instance of class C
+*%(basename)s:7: TypeError: Object must be an instance of class C
   getA(obj) { return obj.#a; }
                          ^
 TypeError: Object must be an instance of class C
-    at C.getA (*%(basename)s:9:26)
-    at new C (*%(basename)s:15:10)
-    at *%(basename)s:19:1
+    at C.getA (*%(basename)s:7:26)
+    at new C (*%(basename)s:13:10)
+    at *%(basename)s:17:1
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter.js b/deps/v8/test/message/fail/class-accessors-private-undefined-setter.js
index 2a1f05767f57d0..267456d4f60838 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter.js
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   get #a() {}
   constructor() {
diff --git a/deps/v8/test/message/fail/class-accessors-private-undefined-setter.out b/deps/v8/test/message/fail/class-accessors-private-undefined-setter.out
index a5c56ca4d001b7..207e2bfaa99b94 100644
--- a/deps/v8/test/message/fail/class-accessors-private-undefined-setter.out
+++ b/deps/v8/test/message/fail/class-accessors-private-undefined-setter.out
@@ -1,9 +1,9 @@
 # Copyright 2019 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:10: TypeError: '#a' was defined without a setter
+*%(basename)s:8: TypeError: '#a' was defined without a setter
     this.#a = 1;
             ^
 TypeError: '#a' was defined without a setter
-    at new C (*%(basename)s:10:13)
-    at *%(basename)s:13:1
\ No newline at end of file
+    at new C (*%(basename)s:8:13)
+    at *%(basename)s:11:1
diff --git a/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.js b/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.js
index 4f012e1b937a7c..38a81f0d7cbd5a 100644
--- a/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.js
+++ b/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 const C = class {
   #a() {}
   test(obj) { obj.#a(); }
diff --git a/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.out b/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.out
index e5efede21c4c05..3207c7fb502633 100644
--- a/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.out
+++ b/deps/v8/test/message/fail/class-methods-private-brand-check-anonymous.out
@@ -1,9 +1,9 @@
 # Copyright 2020 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:9: TypeError: Object must be an instance of class anonymous
+*%(basename)s:7: TypeError: Object must be an instance of class anonymous
   test(obj) { obj.#a(); }
                   ^
 TypeError: Object must be an instance of class anonymous
-    at C.test (*%(basename)s:9:19)
-    at *%(basename)s:11:9
+    at C.test (*%(basename)s:7:19)
+    at *%(basename)s:9:9
diff --git a/deps/v8/test/message/fail/class-methods-private-brand-check.js b/deps/v8/test/message/fail/class-methods-private-brand-check.js
index 7d044b884e32d2..9b68e66a5f4d4e 100644
--- a/deps/v8/test/message/fail/class-methods-private-brand-check.js
+++ b/deps/v8/test/message/fail/class-methods-private-brand-check.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   #a() {}
   test(obj) { obj.#a(); }
diff --git a/deps/v8/test/message/fail/class-methods-private-brand-check.out b/deps/v8/test/message/fail/class-methods-private-brand-check.out
index fe166fa359b7cc..1712a5cbd87f02 100644
--- a/deps/v8/test/message/fail/class-methods-private-brand-check.out
+++ b/deps/v8/test/message/fail/class-methods-private-brand-check.out
@@ -1,9 +1,9 @@
 # Copyright 2020 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-*%(basename)s:9: TypeError: Object must be an instance of class C
+*%(basename)s:7: TypeError: Object must be an instance of class C
   test(obj) { obj.#a(); }
                   ^
 TypeError: Object must be an instance of class C
-    at C.test (*%(basename)s:9:19)
-    at *%(basename)s:11:9 
\ No newline at end of file
+    at C.test (*%(basename)s:7:19)
+    at *%(basename)s:9:9 
diff --git a/deps/v8/test/message/fail/class-methods-private-throw-write.js b/deps/v8/test/message/fail/class-methods-private-throw-write.js
index 3181fea1b6c7cb..1b9bd815b03d17 100644
--- a/deps/v8/test/message/fail/class-methods-private-throw-write.js
+++ b/deps/v8/test/message/fail/class-methods-private-throw-write.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 class C {
   #a() {}
   constructor() {
diff --git a/deps/v8/test/message/fail/class-methods-private-throw-write.out b/deps/v8/test/message/fail/class-methods-private-throw-write.out
index 2aadad9c3cbbd3..d5213afba71056 100644
--- a/deps/v8/test/message/fail/class-methods-private-throw-write.out
+++ b/deps/v8/test/message/fail/class-methods-private-throw-write.out
@@ -1,6 +1,6 @@
-*%(basename)s:10: TypeError: Private method '#a' is not writable
+*%(basename)s:8: TypeError: Private method '#a' is not writable
     this.#a = 1;
             ^
 TypeError: Private method '#a' is not writable
-    at new C (*%(basename)s:10:13)
-    at *%(basename)s:13:1
\ No newline at end of file
+    at new C (*%(basename)s:8:13)
+    at *%(basename)s:11:1
diff --git a/deps/v8/test/message/fail/wasm-exception-rethrow.js b/deps/v8/test/message/fail/wasm-exception-rethrow.js
index 9731914ede4009..0f6073e17aba2e 100644
--- a/deps/v8/test/message/fail/wasm-exception-rethrow.js
+++ b/deps/v8/test/message/fail/wasm-exception-rethrow.js
@@ -13,8 +13,8 @@ builder.addFunction("rethrow0", kSig_v_v)
       kExprTry, kWasmStmt,
         kExprI32Const, 23,
         kExprThrow, except,
-      kExprCatch,
-        kExprRethrow,
+      kExprCatch, except,
+        kExprRethrow, 0,
       kExprEnd,
 ]).exportFunc();
 let instance = builder.instantiate();
diff --git a/deps/v8/test/mjsunit/BUILD.gn b/deps/v8/test/mjsunit/BUILD.gn
index b8de0da11cd38b..184bf5b59683b9 100644
--- a/deps/v8/test/mjsunit/BUILD.gn
+++ b/deps/v8/test/mjsunit/BUILD.gn
@@ -26,7 +26,8 @@ group("v8_mjsunit") {
     "../../tools/profile_view.mjs",
     "../../tools/splaytree.mjs",
     "../../tools/system-analyzer/helper.mjs",
-    "../../tools/system-analyzer/log/deopt.mjs",
+    "../../tools/system-analyzer/log/api.mjs",
+    "../../tools/system-analyzer/log/code.mjs",
     "../../tools/system-analyzer/log/ic.mjs",
     "../../tools/system-analyzer/log/log.mjs",
     "../../tools/system-analyzer/log/map.mjs",
diff --git a/deps/v8/test/mjsunit/async-stack-traces-promise-any.js b/deps/v8/test/mjsunit/async-stack-traces-promise-any.js
index 0b81bfec8fcf2a..47aecd4039d4a7 100644
--- a/deps/v8/test/mjsunit/async-stack-traces-promise-any.js
+++ b/deps/v8/test/mjsunit/async-stack-traces-promise-any.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --async-stack-traces --harmony-promise-any
+// Flags: --allow-natives-syntax --async-stack-traces
 
 // Basic test with Promise.any().
 (function() {
diff --git a/deps/v8/test/mjsunit/code-coverage-block.js b/deps/v8/test/mjsunit/code-coverage-block.js
index e9d38d71466a9b..4584f3134a90db 100644
--- a/deps/v8/test/mjsunit/code-coverage-block.js
+++ b/deps/v8/test/mjsunit/code-coverage-block.js
@@ -1177,7 +1177,7 @@ a(true);                                  // 0500
  {"start":0,"end":401,"count":2},
  {"start":154,"end":254,"count":0}]);
 
-TestCoverage(
+ TestCoverage(
 "https://crbug.com/v8/11231 - nullish coalescing",
 `
 const a = true                            // 0000
@@ -1195,41 +1195,4 @@ const i = c ?? b ?? 'hello'               // 0400
  {"start":262,"end":274,"count":0},
  {"start":417,"end":427,"count":0}]);
 
-TestCoverage(
-"Optional Chaining",
-`
-const a = undefined || null               // 0000
-const b = a?.b                            // 0050
-const c = a?.['b']                        // 0100
-const d = {                               // 0150
-  e: {f: 99, g: () => {return undefined}} // 0200
-}                                         // 0250
-const e = d?.e?.f                         // 0300
-const f = d?.e?.['f']                     // 0350
-const g = d?.e?.f?.g                      // 0400
-const h = d?.e?.f?.g?.h                   // 0450
-const i = d?.['d']?.['e']?.['h']          // 0500
-const k = a?.('b')                        // 0550
-const l = d?.e?.g?.()                     // 0600
-const m = d?.e?.g?.()?.a?.b               // 0650
-delete a?.b                               // 0700
-const n = d?.[d?.x?.f]                    // 0750
-if (a?.[d?.x?.f]) { const p = 99 } else {}// 0800
-const p = d?.[d?.x?.f]?.x                 // 0850
-`,
-[{"start":0,"end":899,"count":1},
- {"start":61,"end":64,"count":0},
- {"start":111,"end":118,"count":0},
- {"start":470,"end":473,"count":0},
- {"start":518,"end":532,"count":0},
- {"start":561,"end":568,"count":0},
- {"start":671,"end":677,"count":0},
- {"start":708,"end":711,"count":0},
- {"start":768,"end":771,"count":0},
- {"start":805,"end":816,"count":0},
- {"start":818,"end":834,"count":0},
- {"start":868,"end":871,"count":0},
- {"start":872,"end":875,"count":0},
- {"start":216,"end":240,"count":2}]);
-
 %DebugToggleBlockCoverage(false);
diff --git a/deps/v8/test/mjsunit/compiler/field-representation-tracking.js b/deps/v8/test/mjsunit/compiler/field-representation-tracking.js
index 7f03348970d3b1..bc2261563da124 100644
--- a/deps/v8/test/mjsunit/compiler/field-representation-tracking.js
+++ b/deps/v8/test/mjsunit/compiler/field-representation-tracking.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --modify-field-representation-inplace
+// Flags: --allow-natives-syntax
 // Flags: --no-always-opt --opt
 
 // Test that code embedding accesses to a Smi field gets properly
diff --git a/deps/v8/test/mjsunit/compiler/globals-change-writable.js b/deps/v8/test/mjsunit/compiler/globals-change-writable.js
new file mode 100644
index 00000000000000..ab5480e055786f
--- /dev/null
+++ b/deps/v8/test/mjsunit/compiler/globals-change-writable.js
@@ -0,0 +1,143 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --opt --no-always-opt
+
+
+// Test Constant cell value going from writable to read-only.
+{
+  glo4 = 4;
+
+  function write_glo4(x) { glo4 = x }
+
+  %PrepareFunctionForOptimization(write_glo4);
+  write_glo4(4);
+  assertEquals(4, glo4);
+
+  // At this point, glo4 has cell type Constant.
+
+  %OptimizeFunctionOnNextCall(write_glo4);
+  write_glo4(4);
+  assertEquals(4, glo4);
+  assertOptimized(write_glo4);
+
+  Object.defineProperty(this, 'glo4', {writable: false});
+  assertUnoptimized(write_glo4);
+  write_glo4(2);
+  assertEquals(4, glo4);
+}
+
+
+// Test ConstantType cell value going from writable to read-only.
+{
+  glo5 = 5;
+
+  function write_glo5(x) { glo5 = x }
+
+  %PrepareFunctionForOptimization(write_glo5);
+  write_glo5(0);
+  assertEquals(0, glo5);
+
+  // At this point, glo5 has cell type ConstantType.
+
+  %OptimizeFunctionOnNextCall(write_glo5);
+  write_glo5(5);
+  assertEquals(5, glo5);
+  assertOptimized(write_glo5);
+
+  Object.defineProperty(this, 'glo5', {writable: false});
+  assertUnoptimized(write_glo5);
+  write_glo5(2);
+  assertEquals(5, glo5);
+}
+
+
+// Test Mutable cell value going from writable to read-only.
+{
+  glo6 = 6;
+
+  function write_glo6(x) { glo6 = x }
+
+  %PrepareFunctionForOptimization(write_glo6);
+  write_glo6({});
+  write_glo6(3);
+  assertEquals(3, glo6);
+
+  // At this point, glo6 has cell type Mutable.
+
+  %OptimizeFunctionOnNextCall(write_glo6);
+  write_glo6(6);
+  assertEquals(6, glo6);
+  assertOptimized(write_glo6);
+
+  Object.defineProperty(this, 'glo6', {writable: false});
+  assertUnoptimized(write_glo6);
+  write_glo6(2);
+  assertEquals(6, glo6);
+}
+
+
+// Test Constant cell value going from read-only to writable.
+{
+  glo7 = 7;
+  Object.defineProperty(this, 'glo7', {writable: false});
+
+  function read_glo7() { return glo7 }
+
+  %PrepareFunctionForOptimization(read_glo7);
+  assertEquals(7, read_glo7());
+
+  // At this point, glo7 has cell type Constant.
+
+  %OptimizeFunctionOnNextCall(read_glo7);
+  assertEquals(7, read_glo7());
+
+  Object.defineProperty(this, 'glo7', {writable: true});
+  assertEquals(7, read_glo7());
+  assertOptimized(read_glo7);
+}
+
+
+// Test ConstantType cell value going from read-only to writable.
+{
+  glo8 = 0;
+  glo8 = 8;
+  Object.defineProperty(this, 'glo8', {writable: false});
+
+  function read_glo8() { return glo8 }
+
+  %PrepareFunctionForOptimization(read_glo8);
+  assertEquals(8, read_glo8());
+
+  // At this point, glo8 has cell type ConstantType.
+
+  %OptimizeFunctionOnNextCall(read_glo8);
+  assertEquals(8, read_glo8());
+
+  Object.defineProperty(this, 'glo8', {writable: true});
+  assertEquals(8, read_glo8());
+  assertOptimized(read_glo8);
+}
+
+
+// Test Mutable cell value going from read-only to writable.
+{
+  glo9 = {};
+  glo9 = 9;
+  Object.defineProperty(this, 'glo9', {writable: false});
+
+  function read_glo9() { return glo9 }
+
+  %PrepareFunctionForOptimization(read_glo9);
+  assertEquals(9, read_glo9());
+
+  // At this point, glo9 has cell type Mutable.
+
+  %OptimizeFunctionOnNextCall(read_glo9);
+  assertEquals(9, read_glo9());
+
+  Object.defineProperty(this, 'glo9', {writable: true});
+  assertEquals(9, read_glo9());
+  assertOptimized(read_glo9);
+}
diff --git a/deps/v8/test/mjsunit/compiler/globals-freeze-constant.js b/deps/v8/test/mjsunit/compiler/globals-freeze-constant.js
new file mode 100644
index 00000000000000..ec7854ea21599d
--- /dev/null
+++ b/deps/v8/test/mjsunit/compiler/globals-freeze-constant.js
@@ -0,0 +1,26 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --opt --no-always-opt
+
+
+glo = 0;
+
+function write_glo(x) { glo = x }
+
+%PrepareFunctionForOptimization(write_glo);
+write_glo(0);
+assertEquals(0, glo);
+
+// At this point, glo has cell type Constant.
+
+%OptimizeFunctionOnNextCall(write_glo);
+write_glo(0);
+assertEquals(0, glo);
+assertOptimized(write_glo);
+
+Object.freeze(this);
+assertUnoptimized(write_glo);
+write_glo(1);
+assertEquals(0, glo);
diff --git a/deps/v8/test/mjsunit/compiler/globals-freeze-constanttype.js b/deps/v8/test/mjsunit/compiler/globals-freeze-constanttype.js
new file mode 100644
index 00000000000000..e875570a785c17
--- /dev/null
+++ b/deps/v8/test/mjsunit/compiler/globals-freeze-constanttype.js
@@ -0,0 +1,26 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --opt --no-always-opt
+
+
+glo = 0;
+
+function write_glo(x) { glo = x }
+
+%PrepareFunctionForOptimization(write_glo);
+write_glo(1);
+assertEquals(1, glo);
+
+// At this point, glo has cell type ConstantType.
+
+%OptimizeFunctionOnNextCall(write_glo);
+write_glo(0);
+assertEquals(0, glo);
+assertOptimized(write_glo);
+
+Object.freeze(this);
+assertUnoptimized(write_glo);
+write_glo(1);
+assertEquals(0, glo);
diff --git a/deps/v8/test/mjsunit/compiler/globals-freeze-mutable.js b/deps/v8/test/mjsunit/compiler/globals-freeze-mutable.js
new file mode 100644
index 00000000000000..53b7e4ce687595
--- /dev/null
+++ b/deps/v8/test/mjsunit/compiler/globals-freeze-mutable.js
@@ -0,0 +1,27 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --opt --no-always-opt
+
+
+glo = 0;
+
+function write_glo(x) { glo = x }
+
+%PrepareFunctionForOptimization(write_glo);
+write_glo({});
+write_glo(1);
+assertEquals(1, glo);
+
+// At this point, glo has cell type Mutable.
+
+%OptimizeFunctionOnNextCall(write_glo);
+write_glo(0);
+assertEquals(0, glo);
+assertOptimized(write_glo);
+
+Object.freeze(this);
+assertUnoptimized(write_glo);
+write_glo(1);
+assertEquals(0, glo);
diff --git a/deps/v8/test/mjsunit/compiler/regress-1158049.js b/deps/v8/test/mjsunit/compiler/regress-1158049.js
new file mode 100644
index 00000000000000..243dc6749336c3
--- /dev/null
+++ b/deps/v8/test/mjsunit/compiler/regress-1158049.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+const v2 = Symbol.unscopables;
+
+function v6(v7,v8,v9,v10) {
+  try {
+    let v11 = eval && v2;
+    const v12 = v11++;
+  } catch(v13) {}
+}
+
+for (let v17 = 1; v17 < 10000; v17++) {
+  const v18 = v6();
+}
diff --git a/deps/v8/test/mjsunit/regress/regress-1161357.js b/deps/v8/test/mjsunit/compiler/regress-1161357.js
similarity index 57%
rename from deps/v8/test/mjsunit/regress/regress-1161357.js
rename to deps/v8/test/mjsunit/compiler/regress-1161357.js
index b6f03b92ac970f..1d506ba4a73df4 100644
--- a/deps/v8/test/mjsunit/regress/regress-1161357.js
+++ b/deps/v8/test/mjsunit/compiler/regress-1161357.js
@@ -3,13 +3,8 @@
 // found in the LICENSE file.
 
 for (let i = 0; i < 3; i++) {
-  for (let j = 0; j < 32767; j++) {
-    Number;
-  }
-  for (let j = 0; j < 2335; j++) {
-    Number;
-  }
-  var arr = [, ...(new Int16Array(0xffff)), 4294967296];
+  for (let j = 0; j < 32767; j++) Number;
+  for (let j = 0; j < 2335; j++) Number;
+  var arr = [, ...(new Int16Array(0xffff)), 0.5];
   arr.concat(Number, arr)
 }
-eval(``);
diff --git a/deps/v8/test/mjsunit/compiler/regress-crbug-1148758.js b/deps/v8/test/mjsunit/compiler/regress-crbug-1148758.js
new file mode 100644
index 00000000000000..f8c0eaf79cc373
--- /dev/null
+++ b/deps/v8/test/mjsunit/compiler/regress-crbug-1148758.js
@@ -0,0 +1,45 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --interrupt-budget=100
+
+var caught = 0;
+
+function runManyTimes(f) {
+  for (let i = 0; i < 1000; ++i) {
+    try {
+      // Seems to be important that this is inside a try catch.
+      f();
+    } catch (e) {
+      assertUnreachable();
+    }
+  }
+}
+
+let A = {
+  get foo() {
+    return 0;
+  }
+};
+
+let B = {
+  __proto__: A,
+
+  aa() {
+    "use strict";
+    super.foo;
+  }
+};
+
+var superAccessingFunc = B.aa;
+
+runManyTimes(function () {
+  try {
+    superAccessingFunc();
+  } catch (e) {
+    caught++;
+  }
+});
+
+assertEquals(0, caught);
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps-polymorphic.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps-polymorphic.js
index e373b03be0f989..552d2564cb816b 100644
--- a/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps-polymorphic.js
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps-polymorphic.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop --turboprop-dynamic-map-checks --opt
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks --opt
 // Flags: --no-always-opt
 
 function f(o) {
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps.js
index b9f61ef852c5f4..ee5abffe99010d 100644
--- a/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps.js
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop --turboprop-dynamic-map-checks --opt
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks --opt
 // Flags: --no-always-opt
 
 function f(o) {
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps2.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps2.js
index 0c16ff36b48293..d3c201bc9d12e0 100644
--- a/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps2.js
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps2.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop --turboprop-dynamic-map-checks
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks
 // Flags: --opt --no-always-opt --deopt-every-n-times=0
 
 function b(a) { return a; }
@@ -37,7 +37,9 @@ o1.c = 20.23;
 f(o1, true);
 assertOptimized(f);
 
-// We should migrates o's map without bailing out.
+// We should migrates o's map with a bailout, but then should not bailout after
+// migrating.
+f(o, true);
 f(o, false);
 f(o1, false);
 f(o2, false);
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps3.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps3.js
new file mode 100644
index 00000000000000..fa6dc826f00307
--- /dev/null
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-check-deprecated-maps3.js
@@ -0,0 +1,41 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks
+// Flags: --opt --no-always-opt --deopt-every-n-times=0
+
+function b(a) { return a; }
+
+function f(o, should_bailout) {
+  b(o.a);
+  let did_bailout = (%GetOptimizationStatus(f) &
+                    V8OptimizationStatus.kTopmostFrameIsTurboFanned) == 0;
+  assertEquals(should_bailout, did_bailout);
+}
+
+var o = {a:10, b:20, c:30};
+var o1 = {a:10, b:20, c:30};
+var o2 = {a:10, b:20, c:30};
+
+// Make o's map a migration target.
+o1.b = 10.23;
+o.a;
+
+%PrepareFunctionForOptimization(f);
+f(o, true);
+%OptimizeFunctionOnNextCall(f);
+f(o, false);
+assertOptimized(f);
+
+// Deprecate o's new map again and update the feedback vector but don't migrate
+// o.
+o1.c = 20.23;
+f(o1, true);
+assertOptimized(f);
+
+// We migrates o's map without deopting or bailing out.
+f(o, false);
+f(o1, false);
+f(o2, false);
+assertOptimized(f);
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-poly-mono.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-poly-mono.js
index c29f64a835eddd..9058fc00b264d3 100644
--- a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-poly-mono.js
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-poly-mono.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop --turboprop-dynamic-map-checks --opt
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks --opt
 // Flags: --no-always-opt
 
 function load(obj){
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler.js
index 660f3f30818116..0de7ae0c86a67f 100644
--- a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler.js
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop --turboprop-dynamic-map-checks --opt
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks --opt
 // Flags: --no-always-opt
 
 function load(obj){
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler1.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler1.js
index c907d1ad6c5e85..4f938f67444d5c 100644
--- a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler1.js
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks-wrong-handler1.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop --turboprop-dynamic-map-checks --opt
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks --opt
 // Flags: --no-always-opt
 
 function load(obj){
diff --git a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks.js b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks.js
index cddba98858fe6e..f3c5289dbebd89 100644
--- a/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks.js
+++ b/deps/v8/test/mjsunit/compiler/test-dynamic-map-checks.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop --turboprop-dynamic-map-checks --opt
+// Flags: --allow-natives-syntax --turboprop --turbo-dynamic-map-checks --opt
 // Flags: --no-always-opt
 
 function load(obj){
diff --git a/deps/v8/test/mjsunit/element-accessor.js b/deps/v8/test/mjsunit/element-accessor.js
index 8d412ed12ff6c0..0fa30f23e986f4 100644
--- a/deps/v8/test/mjsunit/element-accessor.js
+++ b/deps/v8/test/mjsunit/element-accessor.js
@@ -38,7 +38,7 @@
   assertThrows(
       () => Object.defineProperty(o, '0', {get: function() {}}), TypeError);
   assertEquals(
-      {value: 0, writable: true, enumerable: true, configurable: false},
+      {value: 0, writable: true, enumerable: true, configurable: true},
       Object.getOwnPropertyDescriptor(o, '0'));
 })();
 
diff --git a/deps/v8/test/mjsunit/es6/computed-property-names-classes.js b/deps/v8/test/mjsunit/es6/computed-property-names-classes.js
index b3a62ed810ec65..67b86415912f18 100644
--- a/deps/v8/test/mjsunit/es6/computed-property-names-classes.js
+++ b/deps/v8/test/mjsunit/es6/computed-property-names-classes.js
@@ -509,3 +509,229 @@ function assertIteratorResult(value, done, result) {
     }
   }, ReferenceError);
 })();
+
+
+// The following tests deal with computed and statically known properties
+// of the same name overwriting each other.
+//
+// More concretely, we consider the cases where:
+// The computed property appears ...
+//   - before an existing data property           (case 1)
+//   - after an existing data property            (case 2)
+//   - before an existing getter and setter pair  (case 3)
+//   - before an existing getter xor setter       (case 4)
+//   - after an existing getter and setter pair   (case 5)
+//   - after an existing getter xor setter        (case 6)
+//   - in between two existing accessors          (case 7)
+//
+// For each of the 7 cases above, there exists A and B variants, indicating
+// whether the computed property refers to an accessor (variant A) or a
+// plain property (variant B).
+
+
+// |expect_getter| and |expect_setter| must be undefined if and only if we are
+// expecting |b| to be a data property.
+function TestOverwritingHelper(clazz, expect_getter, expect_setter) {
+  var proto = clazz.prototype;
+  var desc = Object.getOwnPropertyDescriptor(proto, 'b');
+
+  if (desc.hasOwnProperty('value')) {
+    assertEquals(undefined, expect_getter);
+    assertEquals(undefined, expect_setter);
+
+    assertEquals('B', proto.b());
+  } else {
+    assertEquals("boolean", typeof expect_getter);
+    assertEquals("boolean", typeof expect_setter);
+
+    if (expect_getter) {
+      assertEquals('B', proto.b);
+    } else {
+      assertEquals(undefined, desc.getter);
+    }
+
+      assertEquals(expect_setter, desc.set !== undefined);
+  }
+
+  assertEquals('A', proto.a());
+  assertEquals('C', proto.c());
+  assertEquals('D', proto.d());
+
+  assertArrayEquals([], Object.keys(proto));
+  assertArrayEquals(['constructor', 'a', 'b', 'c', 'd'],
+                    Object.getOwnPropertyNames(proto));
+}
+
+
+(function TestOverwriting1A() {
+  class C {
+    a() { return 'A'}
+    get [ID('b')]() { return 'Bx'; }
+    c() { return 'C'; }
+    b() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C);
+})();
+
+
+(function TestOverwriting1B() {
+  class C {
+    a() { return 'A'}
+    [ID('b')]() { return 'Bx'; }
+    c() { return 'C'; }
+    b() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C);
+})();
+
+
+(function TestOverwriting2A() {
+  class C {
+    a() { return 'A'}
+    b() { return 'Bx'; }
+    c() { return 'C'; }
+    get [ID('b')]() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C, true, false);
+})();
+
+
+(function TestOverwriting2B() {
+  class C {
+    a() { return 'A'}
+    b() { return 'Bx'; }
+    c() { return 'C'; }
+    [ID('b')]() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C);
+})();
+
+
+(function TestOverwriting3A() {
+  class C {
+    a() { return 'A'}
+    get [ID('b')]() { return 'Bx'; }
+    c() { return 'C'; }
+    get b() { return 'B'; }
+    set b(foo) { this.x = foo; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C, true, true);
+})();
+
+
+(function TestOverwriting3B() {
+  class C {
+    a() { return 'A'}
+    [ID('b')]() { return 'Bx'; }
+    c() { return 'C'; }
+    get b() { return 'B'; }
+    set b(foo) { this.x = foo; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C, true, true);
+})();
+
+
+(function TestOverwriting4A() {
+  class C {
+    a() { return 'A'}
+    get [ID('b')]() { return 'Bx'; }
+    c() { return 'C'; }
+    get b() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C, true, false);
+})();
+
+
+(function TestOverwriting4B() {
+  class C {
+    a() { return 'A'}
+    [ID('b')]() { return 'Bx'; }
+    c() { return 'C'; }
+    get b() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C, true, false);
+})();
+
+
+(function TestOverwriting5A() {
+  class C {
+    a() { return 'A'}
+    get b() { return 'Bx'; }
+    set b(foo) { this.x = foo; }
+    c() { return 'C'; }
+    get [ID('b')]() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C, true, true);
+})();
+
+
+(function TestOverwriting5B() {
+  class C {
+    a() { return 'A'}
+    get b() { return 'Bx'; }
+    set b(foo) { this.x = foo; }
+    c() { return 'C'; }
+    [ID('b')]() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C);
+})();
+
+
+(function TestOverwriting6A() {
+  class C {
+    a() { return 'A'}
+    set b(foo) { this.x = foo; }
+    c() { return 'C'; }
+    get [ID('b')]() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C, true, true);
+})();
+
+
+(function TestOverwriting6B() {
+  class C {
+    a() { return 'A'}
+    set b(foo) { this.x = foo; }
+    c() { return 'C'; }
+    [ID('b')]() { return 'B'; }
+    d() { return 'D'; }
+  }
+  TestOverwritingHelper(C);
+})();
+
+
+(function TestOverwriting7A() {
+  class C {
+    a() { return 'A'}
+    get b() { return 'Bx'; }
+    c() { return 'C'; }
+    get [ID('b')]() { return 'B'; }
+    d() { return 'D'; }
+    set b(foo) { this.x = foo; }
+  }
+  TestOverwritingHelper(C, true, true);
+})();
+
+
+(function TestOverwriting7B() {
+  class C {
+    a() { return 'A'}
+    set b(foo) { this.x = foo; }
+    c() { return 'C'; }
+    [ID('b')]() { return 'Bx'; }
+    d() { return 'D'; }
+    get b() { return 'B'; }
+  }
+  TestOverwritingHelper(C, true, false);
+})();
diff --git a/deps/v8/test/mjsunit/es6/reflect-construct.js b/deps/v8/test/mjsunit/es6/reflect-construct.js
index f69a93b4879233..486d7bb05699ca 100644
--- a/deps/v8/test/mjsunit/es6/reflect-construct.js
+++ b/deps/v8/test/mjsunit/es6/reflect-construct.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Flags: --allow-unsafe-function-constructor --harmony-promise-any
+// Flags: --allow-unsafe-function-constructor
 
 
 (function testReflectConstructArity() {
diff --git a/deps/v8/test/mjsunit/es6/super-ic-opt-dynamic-map-checks.js b/deps/v8/test/mjsunit/es6/super-ic-opt-dynamic-map-checks.js
index b05bc9435a71d6..4e3d02e5e34d81 100644
--- a/deps/v8/test/mjsunit/es6/super-ic-opt-dynamic-map-checks.js
+++ b/deps/v8/test/mjsunit/es6/super-ic-opt-dynamic-map-checks.js
@@ -4,7 +4,7 @@
 
 // Flags: --allow-natives-syntax --super-ic --opt
 // Flags: --no-always-opt --no-stress-opt --turboprop
-// Flags: --turboprop-dynamic-map-checks --deopt-every-n-times=0
+// Flags: --turbo-dynamic-map-checks --deopt-every-n-times=0
 
 // This file contains tests which require --dynamic-map-chekcs.
 
diff --git a/deps/v8/test/mjsunit/es6/super-ic-opt-no-turboprop.js b/deps/v8/test/mjsunit/es6/super-ic-opt-no-turboprop.js
index 8653ffbe3d1fa8..365d01f32bf5f3 100644
--- a/deps/v8/test/mjsunit/es6/super-ic-opt-no-turboprop.js
+++ b/deps/v8/test/mjsunit/es6/super-ic-opt-no-turboprop.js
@@ -7,7 +7,8 @@
 
 // This file contains tests which are disabled for TurboProp. TurboProp deopts
 // differently than TurboFan, so the assertions about when a function is
-// deoptimized won't hold.
+// deoptimized won't hold. In addition, TurboProp doesn't inline, so all
+// tests that rely on inlining need to be in this file.
 
 (function TestPropertyIsConstant() {
   // Test for a case where the property is a constant found in the lookup start
@@ -49,3 +50,131 @@
   // value).
   assertFalse(isOptimized(C.prototype.foo));
 })();
+
+(function TestSuperpropertyAccessInlined() {
+  class A {}
+  A.prototype.bar = "wrong value: A.prototype.bar";
+
+  class B extends A {}
+  B.prototype.bar = "correct value";
+
+  class C extends B {}
+
+  let inline_this_is_being_interpreted;
+  class D extends C {
+    inline_this() {
+      inline_this_is_being_interpreted = %IsBeingInterpreted();
+      return super.bar;
+    }
+    foo() { return this.inline_this(); }
+  }
+  %PrepareFunctionForOptimization(D.prototype.inline_this);
+  %PrepareFunctionForOptimization(D.prototype.foo);
+  D.prototype.bar = "wrong value: D.prototype.bar";
+
+  const o = new D();
+
+  // Fill in the feedback.
+  let r = o.foo();
+  assertEquals("correct value", r);
+
+  %OptimizeFunctionOnNextCall(D.prototype.foo);
+
+  // Test the optimized function.
+  r = o.foo();
+  assertEquals("correct value", r);
+
+  // Assert that the function was not deoptimized.
+  assertOptimized(D.prototype.foo);
+
+  // Assert that inline_this really got inlined.
+  assertFalse(inline_this_is_being_interpreted);
+})();
+
+(function TestMegamorphicInlined() {
+  class A {}
+  A.prototype.bar = "wrong value: A.prototype.bar";
+
+  class B extends A {}
+  B.prototype.bar = "correct value";
+
+  class C extends B {}
+
+  let inline_this_is_being_interpreted;
+  class D extends C {
+    inline_this() {
+      inline_this_is_being_interpreted = %IsBeingInterpreted();
+      return super.bar;
+    }
+    foo() { return this.inline_this(); }
+  }
+  %PrepareFunctionForOptimization(D.prototype.inline_this);
+  %PrepareFunctionForOptimization(D.prototype.foo);
+  D.prototype.bar = "wrong value: D.prototype.bar";
+
+  const o = new D();
+
+  // Create objects which will act as the "home object's prototype" later.
+  const prototypes = [{"a": 0}, {"b": 0}, {"c": 0}, {"d": 0}, {"e": 0},
+  {"f": 0}, {"g": 0}, {"e": 0}];
+  for (p of prototypes) {
+    p.__proto__ = B.prototype;
+  }
+
+  // Fill in the feedback (megamorphic).
+  for (p of prototypes) {
+    D.prototype.__proto__ = p;
+    const r = o.foo();
+    assertEquals("correct value", r);
+  }
+
+  %OptimizeFunctionOnNextCall(D.prototype.foo);
+
+  // Test the optimized function - don't change the home object's proto any
+  // more.
+  let r = o.foo();
+  assertEquals("correct value", r);
+
+  // Assert that the function was not deoptimized.
+  assertOptimized(D.prototype.foo);
+
+  // Assert that inline_this really got inlined.
+  assertFalse(inline_this_is_being_interpreted);
+})();
+
+(function TestHomeObjectProtoIsGlobalThisGetterPropertyInlined() {
+  class A {}
+
+  let inline_this_is_being_interpreted;
+  class B extends A {
+    inline_this() {
+      inline_this_is_being_interpreted = %IsBeingInterpreted();
+      return super.bar;
+    }
+    foo() { return this.inline_this(); }
+  }
+  B.prototype.__proto__ = globalThis;
+  Object.defineProperty(globalThis, "bar",
+                        {get: function() { return this.this_value; }});
+  %PrepareFunctionForOptimization(B.prototype.inline_this);
+  %PrepareFunctionForOptimization(B.prototype.foo);
+
+  let o = new B();
+  o.this_value = "correct value";
+
+  // Fill in the feedback.
+  let r = o.foo();
+  assertEquals("correct value", r);
+
+  %OptimizeFunctionOnNextCall(B.prototype.foo);
+
+  // Test the optimized function.
+  r = o.foo();
+  assertEquals("correct value", r);
+
+  // Assert that the function was not deoptimized.
+  assertOptimized(B.prototype.foo);
+
+  // Assert that inline_this really got inlined.
+  assertFalse(inline_this_is_being_interpreted);
+})();
diff --git a/deps/v8/test/mjsunit/es6/typedarray-detached.js b/deps/v8/test/mjsunit/es6/typedarray-detached.js
index 8148e206b34c14..fc5421b8b13048 100644
--- a/deps/v8/test/mjsunit/es6/typedarray-detached.js
+++ b/deps/v8/test/mjsunit/es6/typedarray-detached.js
@@ -770,7 +770,7 @@ assertThrows(function() { DataView(new ArrayBuffer()); }, TypeError);
 
 function TestNonConfigurableProperties(constructor) {
   var arr = new constructor([100])
-  assertFalse(Object.getOwnPropertyDescriptor(arr,"0").configurable)
+  assertTrue(Object.getOwnPropertyDescriptor(arr,"0").configurable)
   assertFalse(delete arr[0])
 }
 
diff --git a/deps/v8/test/mjsunit/es6/typedarray.js b/deps/v8/test/mjsunit/es6/typedarray.js
index 4db5276c848b31..9d1e9d782ca4c1 100644
--- a/deps/v8/test/mjsunit/es6/typedarray.js
+++ b/deps/v8/test/mjsunit/es6/typedarray.js
@@ -974,7 +974,7 @@ assertThrows(function() { DataView(new ArrayBuffer()); }, TypeError);
 
 function TestNonConfigurableProperties(constructor) {
   var arr = new constructor([100])
-  assertFalse(Object.getOwnPropertyDescriptor(arr,"0").configurable)
+  assertTrue(Object.getOwnPropertyDescriptor(arr,"0").configurable)
   assertFalse(delete arr[0])
 }
 
diff --git a/deps/v8/test/mjsunit/es7/exponentiation-operator.js b/deps/v8/test/mjsunit/es7/exponentiation-operator.js
index 2c504a9f1e82c1..91a060684efc04 100644
--- a/deps/v8/test/mjsunit/es7/exponentiation-operator.js
+++ b/deps/v8/test/mjsunit/es7/exponentiation-operator.js
@@ -269,6 +269,7 @@ function TestBadAssignmentLHS() {
   assertThrows("if (false) { /17/ **= 10; }", SyntaxError);
   assertThrows("if (false) { ({ valueOf() { return 17; } } **= 10); }",
                SyntaxError);
+  assertThrows("async function f() { await 1 ** 2; }", SyntaxError);
   // TODO(caitp): a Call expression as LHS should be an early SyntaxError!
   // assertThrows("if (false) { Array() **= 10; }", SyntaxError);
   assertThrows(() => Array() **= 10, ReferenceError);
diff --git a/deps/v8/test/mjsunit/extinction/array.js b/deps/v8/test/mjsunit/extinction/array.js
new file mode 100644
index 00000000000000..60cb81dcc25790
--- /dev/null
+++ b/deps/v8/test/mjsunit/extinction/array.js
@@ -0,0 +1,14 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --no-builtin-subclassing
+
+class SubArray extends Array { }
+
+// Constructor methods
+assertInstanceof(SubArray.from([1,2,3]), Array);
+assertEquals(SubArray.from([1,2,3]).constructor, Array);
+
+assertInstanceof(SubArray.of([1,2,3]), Array);
+assertEquals(SubArray.of([1,2,3]).constructor, Array);
diff --git a/deps/v8/test/mjsunit/field-representation-tracking.js b/deps/v8/test/mjsunit/field-representation-tracking.js
index a1c431751531ca..6f43daa6af2362 100644
--- a/deps/v8/test/mjsunit/field-representation-tracking.js
+++ b/deps/v8/test/mjsunit/field-representation-tracking.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --modify-field-representation-inplace
+// Flags: --allow-natives-syntax
 
 // Test that s->t field representation changes are done in-place.
 (function() {
diff --git a/deps/v8/test/mjsunit/compiler/globals.js b/deps/v8/test/mjsunit/globals.js
similarity index 99%
rename from deps/v8/test/mjsunit/compiler/globals.js
rename to deps/v8/test/mjsunit/globals.js
index 3b778daaecd3a5..521342a3a2cb1e 100644
--- a/deps/v8/test/mjsunit/compiler/globals.js
+++ b/deps/v8/test/mjsunit/globals.js
@@ -26,6 +26,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Test references and assignments to global variables.
+
 var g = 0;
 
 // Test compilation of a global variable store.
diff --git a/deps/v8/test/mjsunit/harmony/aggregate-error.js b/deps/v8/test/mjsunit/harmony/aggregate-error.js
index a3b53b2be756a6..bf3c5418123748 100644
--- a/deps/v8/test/mjsunit/harmony/aggregate-error.js
+++ b/deps/v8/test/mjsunit/harmony/aggregate-error.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-promise-any
-
 (function TestNoParameters() {
     // Can't omit the "errors" parameter; there's nothing to iterate.
     assertThrows(() => { new AggregateError(); });
diff --git a/deps/v8/test/mjsunit/harmony/modules-import-rqstd-order-async-cycle.mjs b/deps/v8/test/mjsunit/harmony/modules-import-rqstd-order-async-cycle.mjs
new file mode 100644
index 00000000000000..e9aa18e577d4c9
--- /dev/null
+++ b/deps/v8/test/mjsunit/harmony/modules-import-rqstd-order-async-cycle.mjs
@@ -0,0 +1,12 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-top-level-await
+
+import "modules-skip-async-cycle-start.mjs"
+
+assertEquals(globalThis.test_order, [
+  '2', 'async before', 'async after', '1',
+  '3', 'start',
+]);
diff --git a/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-1.mjs b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-1.mjs
new file mode 100644
index 00000000000000..b2f7ecac865917
--- /dev/null
+++ b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-1.mjs
@@ -0,0 +1,14 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-top-level-await
+
+import "modules-skip-async-cycle-2.mjs";
+import "modules-skip-async-cycle-leaf.mjs";
+
+if (globalThis.test_order === undefined) {
+  globalThis.test_order = [];
+}
+globalThis.test_order.push('1');
+
diff --git a/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-2.mjs b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-2.mjs
new file mode 100644
index 00000000000000..391927ae128ebd
--- /dev/null
+++ b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-2.mjs
@@ -0,0 +1,12 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-top-level-await
+
+import "modules-skip-async-cycle-1.mjs";
+
+if (globalThis.test_order === undefined) {
+  globalThis.test_order = [];
+}
+globalThis.test_order.push('2');
diff --git a/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-3.mjs b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-3.mjs
new file mode 100644
index 00000000000000..f61dcdf55a2af4
--- /dev/null
+++ b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-3.mjs
@@ -0,0 +1,12 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-top-level-await
+
+import "modules-skip-async-cycle-2.mjs";
+
+if (globalThis.test_order === undefined) {
+  globalThis.test_order = [];
+}
+globalThis.test_order.push('3');
diff --git a/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-leaf.mjs b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-leaf.mjs
new file mode 100644
index 00000000000000..7f8e8589f36679
--- /dev/null
+++ b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-leaf.mjs
@@ -0,0 +1,13 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-top-level-await
+
+if (globalThis.test_order === undefined) {
+  globalThis.test_order = [];
+}
+
+globalThis.test_order.push('async before');
+await 0;
+globalThis.test_order.push('async after');
diff --git a/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-start.mjs b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-start.mjs
new file mode 100644
index 00000000000000..feeb6c6b2aebdf
--- /dev/null
+++ b/deps/v8/test/mjsunit/harmony/modules-skip-async-cycle-start.mjs
@@ -0,0 +1,13 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-top-level-await
+
+import "modules-skip-async-cycle-1.mjs";
+import "modules-skip-async-cycle-3.mjs";
+
+if (globalThis.test_order === undefined) {
+  globalThis.test_order = [];
+}
+globalThis.test_order.push('start');
diff --git a/deps/v8/test/mjsunit/harmony/private-accessors.js b/deps/v8/test/mjsunit/harmony/private-accessors.js
index 44ec2a07906a3b..73d0f6dc0e1e76 100644
--- a/deps/v8/test/mjsunit/harmony/private-accessors.js
+++ b/deps/v8/test/mjsunit/harmony/private-accessors.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 "use strict";
 
 // Complementary private accessors.
diff --git a/deps/v8/test/mjsunit/harmony/private-methods-empty-inner.js b/deps/v8/test/mjsunit/harmony/private-methods-empty-inner.js
index 20fb5756941639..bd64217c7bdd07 100644
--- a/deps/v8/test/mjsunit/harmony/private-methods-empty-inner.js
+++ b/deps/v8/test/mjsunit/harmony/private-methods-empty-inner.js
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
 // This tests that empty inner classes don't assign private brands of outer
 // classes in their instances after scope chain deserialization.
 
diff --git a/deps/v8/test/mjsunit/harmony/private-methods.js b/deps/v8/test/mjsunit/harmony/private-methods.js
index 7147c6d255b4a4..7e6bb6e6aa67d2 100644
--- a/deps/v8/test/mjsunit/harmony/private-methods.js
+++ b/deps/v8/test/mjsunit/harmony/private-methods.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 "use strict";
 
 // Basic private method test
diff --git a/deps/v8/test/mjsunit/harmony/promise-any-overflow-1.js b/deps/v8/test/mjsunit/harmony/promise-any-overflow-1.js
index 0a95edd05c3a24..cbab18ee86da04 100644
--- a/deps/v8/test/mjsunit/harmony/promise-any-overflow-1.js
+++ b/deps/v8/test/mjsunit/harmony/promise-any-overflow-1.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --harmony-promise-any
+// Flags: --allow-natives-syntax
 
 load('test/mjsunit/test-async.js');
 
diff --git a/deps/v8/test/mjsunit/harmony/promise-any-overflow-2.js b/deps/v8/test/mjsunit/harmony/promise-any-overflow-2.js
index 2ed8453e3a62d8..2a8048096315ee 100644
--- a/deps/v8/test/mjsunit/harmony/promise-any-overflow-2.js
+++ b/deps/v8/test/mjsunit/harmony/promise-any-overflow-2.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --harmony-promise-any
+// Flags: --allow-natives-syntax
 
 load('test/mjsunit/test-async.js');
 
diff --git a/deps/v8/test/mjsunit/harmony/promise-any-resolve-not-callable.js b/deps/v8/test/mjsunit/harmony/promise-any-resolve-not-callable.js
index b65bafd2a4616f..a4aae6071c290c 100644
--- a/deps/v8/test/mjsunit/harmony/promise-any-resolve-not-callable.js
+++ b/deps/v8/test/mjsunit/harmony/promise-any-resolve-not-callable.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --harmony-promise-any
+// Flags: --allow-natives-syntax
 
 load('test/mjsunit/test-async.js');
 
diff --git a/deps/v8/test/mjsunit/harmony/promise-any.js b/deps/v8/test/mjsunit/harmony/promise-any.js
index f1244bce8cfb90..6251b05cbcf8b1 100644
--- a/deps/v8/test/mjsunit/harmony/promise-any.js
+++ b/deps/v8/test/mjsunit/harmony/promise-any.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Flags: --allow-natives-syntax --harmony-promise-any
+// Flags: --allow-natives-syntax
 
 load('test/mjsunit/test-async.js');
 
diff --git a/deps/v8/test/mjsunit/harmony/relative-indexing-methods.js b/deps/v8/test/mjsunit/harmony/relative-indexing-methods.js
new file mode 100644
index 00000000000000..b9497f8e5929ae
--- /dev/null
+++ b/deps/v8/test/mjsunit/harmony/relative-indexing-methods.js
@@ -0,0 +1,49 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-relative-indexing-methods --allow-natives-syntax
+
+'use strict';
+
+[
+  [1, 2, 3],
+  '123',
+  new Uint8Array([1, 2, 3]),
+].forEach((v) => {
+  assertEquals(v.at(0), v[0]);
+  assertEquals(v.at(-1), v[2]);
+  assertEquals(v.at(-4), undefined);
+  assertEquals(v.at(3), undefined);
+  assertEquals(v.at(1337), undefined);
+  assertEquals(v.at(-Infinity), undefined);
+  assertEquals(v.at(Infinity), undefined);
+  assertEquals(v.at(NaN), v[0]);
+  assertEquals(v.at(undefined), v[0])
+  assertEquals(v.at(), v[0]);
+});
+
+{
+  const props = ['length', '2'];
+  const proxy = new Proxy([1, 2, 3], {
+    get(t, p, r) {
+      assertEquals(p, props.shift());
+      return Reflect.get(t, p, r);
+    }
+  });
+  assertEquals(Array.prototype.at.call(proxy, -1), 3);
+}
+
+assertThrows(() => {
+  Uint8Array.prototype.at.call({});
+}, TypeError);
+
+{
+  const a = new Uint8Array([1, 2, 3]);
+  %ArrayBufferDetach(a.buffer);
+  assertThrows(() => {
+    a.at(0);
+  }, TypeError);
+}
+
+assertEquals(Array.prototype[Symbol.unscopables].at, true);
diff --git a/deps/v8/test/mjsunit/harmony/static-private-methods.js b/deps/v8/test/mjsunit/harmony/static-private-methods.js
index ed81bb303877a2..b73a1144f0db0a 100644
--- a/deps/v8/test/mjsunit/harmony/static-private-methods.js
+++ b/deps/v8/test/mjsunit/harmony/static-private-methods.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --harmony-private-methods
-
 "use strict";
 
 // Static private methods
diff --git a/deps/v8/test/mjsunit/json2.js b/deps/v8/test/mjsunit/json2.js
index f56fd43f58f839..d3cd3d5d84bf88 100644
--- a/deps/v8/test/mjsunit/json2.js
+++ b/deps/v8/test/mjsunit/json2.js
@@ -180,11 +180,11 @@ Object.defineProperty(non_enum, "b", { value: 2, enumerable: false });
 non_enum.c = 3;
 TestStringify('{"a":1,"c":3}', non_enum);
 
-var str = "external";
+var str = "external_string";
 try {
   externalizeString(str, true);
 } catch (e) { }
-TestStringify("\"external\"", str, null, 0);
+TestStringify("\"external_string\"", str, null, 0);
 
 var o = {};
 o.somespecialproperty = 10;
diff --git a/deps/v8/test/mjsunit/mjsunit.status b/deps/v8/test/mjsunit/mjsunit.status
index 398e7c111a62a2..6e76e714507542 100644
--- a/deps/v8/test/mjsunit/mjsunit.status
+++ b/deps/v8/test/mjsunit/mjsunit.status
@@ -41,10 +41,6 @@
   ##############################################################################
   # Open bugs.
 
-  # https://crbug.com/v8/10929
-  'wasm/externref-liftoff' : [SKIP],
-  'wasm/externref-globals-liftoff' : [SKIP],
-
   # BUG(v8:2989).
   'regress/regress-2989': [FAIL, NO_VARIANTS, ['lite_mode == True', SKIP]],
 
@@ -77,10 +73,6 @@
   # https://crbug.com/1129854
   'tools/log': ['arch == arm or arch == arm64', SKIP],
 
-  # crbug.com/1161357
-  # TODO(solanes): Remove this entry once the underlying issue is fixed.
-  'regress/regress-1161357': [PASS, FAIL],
-
   ##############################################################################
   # Tests where variants make no sense.
   'd8/enable-tracing': [PASS, NO_VARIANTS],
@@ -159,7 +151,8 @@
   'wasm/compare-exchange64-stress': [PASS, SLOW, NO_VARIANTS],
 
   # Very slow on ARM and MIPS, contains no architecture dependent code.
-  'unicode-case-overoptimization': [PASS, NO_VARIANTS, ['arch in (arm, arm64, mipsel, mips64el, mips64, mips)', SKIP]],
+  'unicode-case-overoptimization0': [PASS, NO_VARIANTS, ['arch in (arm, arm64, mipsel, mips64el, mips64, mips)', SKIP]],
+  'unicode-case-overoptimization1': [PASS, NO_VARIANTS, ['arch in (arm, arm64, mipsel, mips64el, mips64, mips)', SKIP]],
   'regress/regress-3976': [PASS, NO_VARIANTS, ['arch in (arm, arm64, mipsel, mips64el, mips64, mips)', SKIP]],
   'regress/regress-crbug-482998': [PASS, NO_VARIANTS, ['arch in (arm, arm64, mipsel, mips64el, mips)', SKIP]],
   'regress/regress-740784': [PASS, NO_VARIANTS, ['arch in (arm, arm64, mipsel, mips64el, mips)', SKIP]],
@@ -188,6 +181,7 @@
   # Skip slow tests in debug mode.
   'array-functions-prototype-misc': [SKIP],
   'compiler/regress-808472': [SKIP],
+  'compiler/regress-1161357': [SKIP],
   'es6/promise-all-overflow-2': [SKIP],
   'generated-transition-stub': [SKIP],
   'regress/regress-524': [SKIP],
@@ -323,6 +317,9 @@
 
   # BUG(v8:10035)
   'compiler/deopt-array-builtins': [SKIP],
+
+  # BUG(v8:11240)
+  'regress/regress-v8-9267-1': [SKIP],
 }],  # 'gc_stress'
 
 ##############################################################################
@@ -628,6 +625,7 @@
   'math-floor-part1': [PASS, SLOW],
   'regress/regress-430201': [SKIP],
   'regress/regress-500980': [PASS, SLOW],
+  'wasm/shared-memory-worker-stress': [PASS, SLOW],
 
   # BUG(v8:9506): times out.
   'wasm/shared-memory-worker-explicit-gc-stress': [SKIP],
@@ -1018,6 +1016,9 @@
 ['system == aix', {
   # stack overflow
   'regress/regress-crbug-178790': [PASS, ['mode == debug', SKIP]],
+  # PASE environment currently ships with no tzdata database
+  'tzoffset-transition-new-york-noi18n': [SKIP],
+  'tzoffset-seoul-noi18n': [SKIP],
 }],  # 'system == aix'
 
 ##############################################################################
@@ -1199,15 +1200,12 @@
   # fixed in a later cl.
   # TODO(mythria): Reenable this when the cl that migrates deprecated maps
   # lands
-  'regress/regress-932953': [PASS],
+  'regress/regress-932953': [FAIL],
 
   # Tests failing for the lack of function context specialization in Turboprop.
   'compiler/abstract-equal-receiver': [FAIL],
   'compiler/constant-fold-cow-array': [FAIL],
   'compiler/promise-resolve-stable-maps': [FAIL],
-
-  # https://crbug.com/v8/10894
-  'math-floor-of-div': [SLOW],
 }],  # variant == turboprop
 
 ##############################################################################
@@ -1357,6 +1355,8 @@
   'compiler/dataview-set': [SKIP],
   'compiler/deopt-inlined-from-call': [SKIP],
   'compiler/field-representation-tracking': [SKIP],
+  'compiler/globals-change-writable': [SKIP],
+  'compiler/globals-freeze-*': [SKIP],
   'compiler/manual-concurrent-recompile': [SKIP],
   'compiler/native-context-specialization-hole-check': [SKIP],
   'compiler/number-divide': [SKIP],
@@ -1466,4 +1466,9 @@
   'regress/regress-set-flags-stress-compact': [SKIP],
 }],  # variant == stress_sampling
 
+##############################################################################
+['variant == stress_incremental_marking', {
+  'wasm/shared-memory-worker-stress': [PASS, SLOW, ['tsan', SKIP]],
+}],  # variant == stress_incremental_marking
+
 ]
diff --git a/deps/v8/test/mjsunit/protector-cell/array-constructor-2.js b/deps/v8/test/mjsunit/protector-cell/array-constructor-2.js
new file mode 100644
index 00000000000000..7be0cc20366fae
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/array-constructor-2.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty([], "constructor", { value: {} });
+assertFalse(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/array-constructor.js b/deps/v8/test/mjsunit/protector-cell/array-constructor.js
new file mode 100644
index 00000000000000..6d82de9847aa04
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/array-constructor.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Array.prototype, "constructor", { value: {} });
+assertFalse(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/array-iterator-2.js b/deps/v8/test/mjsunit/protector-cell/array-iterator-2.js
new file mode 100644
index 00000000000000..5ffbf9cbe67c66
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/array-iterator-2.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+Object.defineProperty([], Symbol.iterator, { value: {} });
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertFalse(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/array-iterator.js b/deps/v8/test/mjsunit/protector-cell/array-iterator.js
new file mode 100644
index 00000000000000..3d71d7e7577fc1
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/array-iterator.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+Object.defineProperty(Array.prototype, Symbol.iterator, { value: {} });
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertFalse(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/array-next-1.js b/deps/v8/test/mjsunit/protector-cell/array-next-1.js
new file mode 100644
index 00000000000000..64eee170a2b70b
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/array-next-1.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+Object.defineProperty([].values(), "next", { value: {}})
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertFalse(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/array-next-2.js b/deps/v8/test/mjsunit/protector-cell/array-next-2.js
new file mode 100644
index 00000000000000..8e9b20d4d1bab1
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/array-next-2.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const arrayIteratorPrototype = Object.getPrototypeOf([].values());
+Object.defineProperty(arrayIteratorPrototype, "next", { value: {}})
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertFalse(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/bigint64Array-species.js b/deps/v8/test/mjsunit/protector-cell/bigint64Array-species.js
new file mode 100644
index 00000000000000..6f5ae95fd789a3
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/bigint64Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyBigInt64Array extends BigInt64Array { }
+Object.defineProperty(BigInt64Array, Symbol.species, { value: MyBigInt64Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/biguint64Array-species.js b/deps/v8/test/mjsunit/protector-cell/biguint64Array-species.js
new file mode 100644
index 00000000000000..6746f71dd47ffa
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/biguint64Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyBigUint64Array extends BigUint64Array { }
+Object.defineProperty(BigUint64Array, Symbol.species, { value: MyBigUint64Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/concat-spreadable.js.js b/deps/v8/test/mjsunit/protector-cell/concat-spreadable.js.js
new file mode 100644
index 00000000000000..79d25f771fa97c
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/concat-spreadable.js.js
@@ -0,0 +1,9 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%IsConcatSpreadableProtector());
+Object.defineProperty(Array, Symbol.isConcatSpreadable, { value: false });
+assertFalse(%IsConcatSpreadableProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/float32Array-species.js b/deps/v8/test/mjsunit/protector-cell/float32Array-species.js
new file mode 100644
index 00000000000000..b2b37936f3e0c8
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/float32Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyFloat32Array extends Float32Array { }
+Object.defineProperty(Float32Array, Symbol.species, { value: MyFloat32Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/float64Array-species.js b/deps/v8/test/mjsunit/protector-cell/float64Array-species.js
new file mode 100644
index 00000000000000..d9f729636eb464
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/float64Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyFloat64Array extends Float64Array { }
+Object.defineProperty(Float64Array, Symbol.species, { value: MyFloat64Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/int16Array-species.js b/deps/v8/test/mjsunit/protector-cell/int16Array-species.js
new file mode 100644
index 00000000000000..858ef20eeb22c2
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/int16Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyInt16Array extends Int16Array { }
+Object.defineProperty(Int16Array, Symbol.species, { value: MyInt16Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/int32Array-species.js b/deps/v8/test/mjsunit/protector-cell/int32Array-species.js
new file mode 100644
index 00000000000000..3e0f790d20d6dd
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/int32Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyInt32Array extends Int32Array { }
+Object.defineProperty(Int32Array, Symbol.species, { value: MyInt32Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/int8array-species.js b/deps/v8/test/mjsunit/protector-cell/int8array-species.js
new file mode 100644
index 00000000000000..36101576eb416e
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/int8array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyInt8Array extends Int8Array { }
+Object.defineProperty(Int8Array, Symbol.species, { value: MyInt8Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/iterator.js b/deps/v8/test/mjsunit/protector-cell/iterator.js
new file mode 100644
index 00000000000000..6b8fb7f4944a2e
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/iterator.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const iteratorPrototype = Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]()))
+Object.defineProperty(iteratorPrototype, Symbol.iterator, { value: {} });
+assertFalse(%SetIteratorProtector());
+assertFalse(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/map-iterator-2.js b/deps/v8/test/mjsunit/protector-cell/map-iterator-2.js
new file mode 100644
index 00000000000000..8ba7ddfd039321
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/map-iterator-2.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const mapIterator = new Map().values();
+Object.defineProperty(mapIterator, Symbol.iterator, { value: {} });
+assertTrue(%SetIteratorProtector());
+assertFalse(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/map-iterator.js b/deps/v8/test/mjsunit/protector-cell/map-iterator.js
new file mode 100644
index 00000000000000..3ec3b5853504cd
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/map-iterator.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const mapIteratorProto = Object.getPrototypeOf(new Map().values());
+Object.defineProperty(mapIteratorProto, Symbol.iterator, { value: {} });
+assertTrue(%SetIteratorProtector());
+assertFalse(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/map-next-1.js b/deps/v8/test/mjsunit/protector-cell/map-next-1.js
new file mode 100644
index 00000000000000..808c9c012e8cd5
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/map-next-1.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const mapIterator = new Map().values();
+Object.defineProperty(mapIterator, "next", { value: {} });
+assertTrue(%SetIteratorProtector());
+assertFalse(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/map-next-2.js b/deps/v8/test/mjsunit/protector-cell/map-next-2.js
new file mode 100644
index 00000000000000..6a4809a5679864
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/map-next-2.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const mapIteratorPrototype = Object.getPrototypeOf(new Map().values());
+Object.defineProperty(mapIteratorPrototype, "next", { value: {} });
+assertTrue(%SetIteratorProtector());
+assertFalse(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/promise-constructor-2.js b/deps/v8/test/mjsunit/protector-cell/promise-constructor-2.js
new file mode 100644
index 00000000000000..ff81733bcfd5a7
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/promise-constructor-2.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Promise.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertFalse(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/promise-constructor.js b/deps/v8/test/mjsunit/protector-cell/promise-constructor.js
new file mode 100644
index 00000000000000..2090551a86a445
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/promise-constructor.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Promise(() => { }), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertFalse(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/regexp-constructor-2.js b/deps/v8/test/mjsunit/protector-cell/regexp-constructor-2.js
new file mode 100644
index 00000000000000..e5bff11a90b881
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/regexp-constructor-2.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(RegExp.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertFalse(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/regexp-constructor.js b/deps/v8/test/mjsunit/protector-cell/regexp-constructor.js
new file mode 100644
index 00000000000000..030709645e9b35
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/regexp-constructor.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new RegExp(''), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertFalse(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/set-iterator-1.js b/deps/v8/test/mjsunit/protector-cell/set-iterator-1.js
new file mode 100644
index 00000000000000..1aced6ffae7136
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/set-iterator-1.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+Object.defineProperty(new Set(), Symbol.iterator, { value: {} });
+assertFalse(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/set-iterator-2.js b/deps/v8/test/mjsunit/protector-cell/set-iterator-2.js
new file mode 100644
index 00000000000000..03080acbece925
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/set-iterator-2.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+Object.defineProperty(Set.prototype, Symbol.iterator, { value: {} });
+assertFalse(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/set-iterator-3.js b/deps/v8/test/mjsunit/protector-cell/set-iterator-3.js
new file mode 100644
index 00000000000000..a3932fe6af8eba
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/set-iterator-3.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+Object.defineProperty(new Set().values(), Symbol.iterator, { value: {} });
+assertFalse(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/set-iterator-4.js b/deps/v8/test/mjsunit/protector-cell/set-iterator-4.js
new file mode 100644
index 00000000000000..1c494edd67ad56
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/set-iterator-4.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const setIteratorPrototype = Object.getPrototypeOf(new Set().values())
+Object.defineProperty(new Set(), Symbol.iterator, { value: {} });
+assertFalse(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/set-next-1.js b/deps/v8/test/mjsunit/protector-cell/set-next-1.js
new file mode 100644
index 00000000000000..e803669becfef9
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/set-next-1.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const setIterator = new Set().values();
+Object.defineProperty(setIterator, "next", { value: {} });
+assertFalse(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/set-next-2.js b/deps/v8/test/mjsunit/protector-cell/set-next-2.js
new file mode 100644
index 00000000000000..32f34c0c57430e
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/set-next-2.js
@@ -0,0 +1,16 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+const setIteratorPrototype = Object.getPrototypeOf(new Set().values());
+Object.defineProperty(setIteratorPrototype, "next", { value: {} });
+assertFalse(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/species.js b/deps/v8/test/mjsunit/protector-cell/species.js
new file mode 100644
index 00000000000000..35044d9557710c
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/species.js
@@ -0,0 +1,20 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+class MyArray extends Array { }
+Object.defineProperty(Array, Symbol.species, { value: MyArray });
+assertFalse(%ArraySpeciesProtector());
+
+assertTrue(%PromiseSpeciesProtector());
+class MyPromise extends Promise { }
+Object.defineProperty(Promise, Symbol.species, { value: MyPromise });
+assertFalse(%PromiseSpeciesProtector());
+
+assertTrue(%RegExpSpeciesProtector());
+class MyRegExp extends RegExp { }
+Object.defineProperty(RegExp, Symbol.species, { value: MyRegExp });
+assertFalse(%RegExpSpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/string-iterator.js b/deps/v8/test/mjsunit/protector-cell/string-iterator.js
new file mode 100644
index 00000000000000..b3f9105d1317bc
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/string-iterator.js
@@ -0,0 +1,9 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%StringIteratorProtector());
+Object.defineProperty(String.prototype, Symbol.iterator, { value: {} });
+assertFalse(%StringIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/string-next-1.js b/deps/v8/test/mjsunit/protector-cell/string-next-1.js
new file mode 100644
index 00000000000000..e41eebefb77bcf
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/string-next-1.js
@@ -0,0 +1,17 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+var str = 'ott';
+var iterator = str[Symbol.iterator]();
+iterator.__proto__.next = () => ({value : undefined, done : true});
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertFalse(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/string-next-2.js b/deps/v8/test/mjsunit/protector-cell/string-next-2.js
new file mode 100644
index 00000000000000..e2ab55810296bc
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/string-next-2.js
@@ -0,0 +1,17 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertTrue(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
+var str = 'ott';
+var iterator = str[Symbol.iterator]();
+iterator.next = () => ({value : undefined, done : true});
+assertTrue(%SetIteratorProtector());
+assertTrue(%MapIteratorProtector());
+assertFalse(%StringIteratorProtector());
+assertTrue(%ArrayIteratorProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-1.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-1.js
new file mode 100644
index 00000000000000..21a261a133fb15
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-1.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Int8Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-10.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-10.js
new file mode 100644
index 00000000000000..ae33b68ab4fbab
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-10.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new BigUint64Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-2.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-2.js
new file mode 100644
index 00000000000000..cf6836aac7b697
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-2.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Uint8Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-3.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-3.js
new file mode 100644
index 00000000000000..badbab0c4e54a0
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-3.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Int16Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-4.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-4.js
new file mode 100644
index 00000000000000..e8e0334accd0d8
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-4.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Uint16Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-5.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-5.js
new file mode 100644
index 00000000000000..bbf0053688a72c
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-5.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Int32Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-6.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-6.js
new file mode 100644
index 00000000000000..370e8fdb644560
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-6.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Uint32Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-7.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-7.js
new file mode 100644
index 00000000000000..3295df51329e3b
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-7.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Float32Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-8.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-8.js
new file mode 100644
index 00000000000000..4244c60e8c3d1a
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-8.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new Float64Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-9.js b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-9.js
new file mode 100644
index 00000000000000..fd74abc99787f0
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-constructor-9.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(new BigInt64Array(8), "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-1.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-1.js
new file mode 100644
index 00000000000000..667d001983df69
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-1.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Int8Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-10.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-10.js
new file mode 100644
index 00000000000000..cf3cd5abd8cafa
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-10.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(BigUint64Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-2.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-2.js
new file mode 100644
index 00000000000000..fe5dd0d7c40d87
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-2.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Uint8Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-3.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-3.js
new file mode 100644
index 00000000000000..7e5404d74a6824
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-3.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Int16Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-4.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-4.js
new file mode 100644
index 00000000000000..f3ae9771f2067c
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-4.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Uint16Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-5.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-5.js
new file mode 100644
index 00000000000000..d0fe82a22b5d4d
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-5.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Int32Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-6.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-6.js
new file mode 100644
index 00000000000000..718ff6030b2f78
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-6.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Uint32Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-7.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-7.js
new file mode 100644
index 00000000000000..66b5d975349633
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-7.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Float32Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-8.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-8.js
new file mode 100644
index 00000000000000..0cfaade3764498
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-8.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(Float64Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-9.js b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-9.js
new file mode 100644
index 00000000000000..4b981145acfeca
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/typedarray-prototype-constructor-9.js
@@ -0,0 +1,15 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertTrue(%TypedArraySpeciesProtector());
+Object.defineProperty(BigInt64Array.prototype, "constructor", { value: {} });
+assertTrue(%ArraySpeciesProtector());
+assertTrue(%PromiseSpeciesProtector());
+assertTrue(%RegExpSpeciesProtector());
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/uint16Array-species.js b/deps/v8/test/mjsunit/protector-cell/uint16Array-species.js
new file mode 100644
index 00000000000000..b4f699512b5735
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/uint16Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyUint16Array extends Uint16Array { }
+Object.defineProperty(Uint16Array, Symbol.species, { value: MyUint16Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/uint32Array-species.js b/deps/v8/test/mjsunit/protector-cell/uint32Array-species.js
new file mode 100644
index 00000000000000..845de9f1ac8c6f
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/uint32Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyUint32Array extends Uint32Array { }
+Object.defineProperty(Uint32Array, Symbol.species, { value: MyUint32Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/protector-cell/uint8Array-species.js b/deps/v8/test/mjsunit/protector-cell/uint8Array-species.js
new file mode 100644
index 00000000000000..dc21a7681965c0
--- /dev/null
+++ b/deps/v8/test/mjsunit/protector-cell/uint8Array-species.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --no-stress-opt
+
+assertTrue(%TypedArraySpeciesProtector());
+class MyUint8Array extends Uint8Array { }
+Object.defineProperty(Uint8Array, Symbol.species, { value: MyUint8Array });
+assertFalse(%TypedArraySpeciesProtector());
diff --git a/deps/v8/test/mjsunit/regress-crbug-1078825.js b/deps/v8/test/mjsunit/regress-crbug-1078825.js
index 9381da50a06db4..20dcb9624cb4b3 100644
--- a/deps/v8/test/mjsunit/regress-crbug-1078825.js
+++ b/deps/v8/test/mjsunit/regress-crbug-1078825.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Flags: --allow-natives-syntax --harmony-promise-any
+// Flags: --allow-natives-syntax
 
 load('test/mjsunit/test-async.js');
 
diff --git a/deps/v8/test/mjsunit/regress/regress-11115.js b/deps/v8/test/mjsunit/regress/regress-11115.js
new file mode 100644
index 00000000000000..5da8600946e621
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-11115.js
@@ -0,0 +1,18 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --stack-size=100
+
+var f = function() {}
+
+for (var i = 0; i < 1000; ++i) {
+  f = f.bind();
+  Object.defineProperty(f, Symbol.hasInstance, {value: undefined});
+}
+
+try {
+  ({}) instanceof f;  // Don't overflow the stack!
+} catch (e) {
+  // Throwing a RangeError is okay.
+}
diff --git a/deps/v8/test/mjsunit/regress/regress-1112155.js b/deps/v8/test/mjsunit/regress/regress-1112155.js
index b7955894c77927..e2c3a23bbfcd13 100644
--- a/deps/v8/test/mjsunit/regress/regress-1112155.js
+++ b/deps/v8/test/mjsunit/regress/regress-1112155.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Flags: --turboprop-dynamic-map-checks --allow-natives-syntax --opt --no-always-opt
+// Flags: --turbo-dynamic-map-checks --allow-natives-syntax --opt --no-always-opt
 
 function f(v) {
   return v.b;
diff --git a/deps/v8/test/mjsunit/regress/regress-1125871.js b/deps/v8/test/mjsunit/regress/regress-1125871.js
index 706d0b96d825d7..daa45aca71cb5c 100644
--- a/deps/v8/test/mjsunit/regress/regress-1125871.js
+++ b/deps/v8/test/mjsunit/regress/regress-1125871.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax --turboprop-dynamic-map-checks --opt --no-always-opt
+// Flags: --allow-natives-syntax --turbo-dynamic-map-checks --opt --no-always-opt
 
 function bar(obj) {
   // Add two dummy loads to make sure obj.b is in the same slot index as obj.a
diff --git a/deps/v8/test/mjsunit/regress/regress-11274.js b/deps/v8/test/mjsunit/regress/regress-11274.js
new file mode 100644
index 00000000000000..42f7f07688e7a7
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-11274.js
@@ -0,0 +1,20 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+var typedArrayProto = Uint8Array.prototype.__proto__;
+var typedArrayConstructor = Uint8Array.prototype.constructor[Symbol.species];
+var called = false;
+
+Uint8Array.prototype.__proto__ = {};
+Uint8Array.prototype.constructor = {
+    get [Symbol.species]() {
+        called = true;
+        return typedArrayConstructor;
+    }
+}
+
+Uint8Array.prototype.__proto__ = typedArrayProto;
+var arr = new Uint8Array(8);
+arr.slice(1, 5);
+assertTrue(called);
diff --git a/deps/v8/test/mjsunit/regress/regress-1141502.js b/deps/v8/test/mjsunit/regress/regress-1141502.js
index b516c1c0c5cc4b..dba76d9fd2153a 100644
--- a/deps/v8/test/mjsunit/regress/regress-1141502.js
+++ b/deps/v8/test/mjsunit/regress/regress-1141502.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // Flags: --allow-natives-syntax --no-lazy-feedback-allocation
-// Flags: --turboprop-dynamic-map-checks
+// Flags: --turbo-dynamic-map-checks
 
 function bar(a) {
   return a.x;
diff --git a/deps/v8/tools/system-analyzer/log/deopt.mjs b/deps/v8/test/mjsunit/regress/regress-1145988.js
similarity index 56%
rename from deps/v8/tools/system-analyzer/log/deopt.mjs
rename to deps/v8/test/mjsunit/regress/regress-1145988.js
index f3ff1a71a26208..4a7dac2c3bc2d0 100644
--- a/deps/v8/tools/system-analyzer/log/deopt.mjs
+++ b/deps/v8/test/mjsunit/regress/regress-1145988.js
@@ -1,10 +1,10 @@
 // Copyright 2020 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-import {LogEntry} from './log.mjs';
 
-export class DeoptLogEntry extends LogEntry {
-  constructor(type, time) {
-    super(type, time);
+__f_1();
+function __f_1() {
+  for (var __v_3 = 0; __v_3 < 100000; __v_3++) {
   }
 }
+__f_1();
diff --git a/deps/v8/test/mjsunit/regress/regress-1145990.js b/deps/v8/test/mjsunit/regress/regress-1145990.js
new file mode 100644
index 00000000000000..0a1b32ccffc296
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1145990.js
@@ -0,0 +1,13 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+class B { }
+
+class C extends B {
+  #field = 'test';
+}
+
+for (let i = 0; i < 10000; i++) {
+  new C();
+}
diff --git a/deps/v8/test/mjsunit/regress/regress-1146013.js b/deps/v8/test/mjsunit/regress/regress-1146013.js
new file mode 100644
index 00000000000000..44a3ede0df9aa7
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1146013.js
@@ -0,0 +1,22 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --no-use-ic --interrupt-budget=1000
+
+try {
+} catch (e) {}
+class __c_0 extends class {} {
+  constructor() {
+    let __v_18 = () => {
+      for (let __v_19 = 0; __v_19 < 10; __v_19++) {
+        this.x;
+      }
+    };
+    super();
+    __v_18();
+  }
+}
+for (let __v_21 = 0; __v_21 < 10000; __v_21++) {
+  new __c_0();
+}
diff --git a/deps/v8/test/mjsunit/regress/regress-1152231.js b/deps/v8/test/mjsunit/regress/regress-1152231.js
new file mode 100644
index 00000000000000..681900469de2bb
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1152231.js
@@ -0,0 +1,31 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+
+function ID(x) {
+  return x;
+}
+
+function f2(v) {
+  var p = v.prototype;
+  Object.defineProperty(p, undefined, { });
+  assertArrayEquals(['constructor', 'a', 'b', 'c', 'd', 'undefined'],
+                    Object.getOwnPropertyNames(p));
+}
+
+function f22() {
+  class class1 {
+    a() {
+    }
+    get [ID('b')]() {
+    }
+    c() {
+    }
+    d() {
+    }
+  }
+  f2(class1);
+};
+
+f22();
diff --git a/deps/v8/test/mjsunit/regress/regress-1154961.js b/deps/v8/test/mjsunit/regress/regress-1154961.js
new file mode 100644
index 00000000000000..5bc1a8e8b85491
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1154961.js
@@ -0,0 +1,42 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --turboprop --stack-size=100
+
+function runNearStackLimit(f) {
+  function t() {
+    try {
+      return t();
+    } catch (e) {
+      return f();
+    }
+  }
+  return t();
+}
+
+function baz(f) {
+  return [[f(1)], 1, 2, 3, 4, 5, 6, 7, 8];
+}
+
+function foo(__v_3) {
+  try {
+    var arr = baz(__v_3);
+  } catch (e) {}
+  try {
+    for (var i = 0; i < arr.length; i++) {
+      function bar() {
+        return arr[i];
+      }
+      try {
+        throw e;
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+%PrepareFunctionForOptimization(foo);
+foo(a => a);
+foo(a => a);
+%OptimizeFunctionOnNextCall(foo);
+runNearStackLimit(() => { foo(a => a); });
diff --git a/deps/v8/test/mjsunit/regress/regress-1158124.js b/deps/v8/test/mjsunit/regress/regress-1158124.js
new file mode 100644
index 00000000000000..36109d029c3e73
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1158124.js
@@ -0,0 +1,8 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --log-code
+
+o = new Proxy(this, {});
+o.printErr();
diff --git a/deps/v8/test/mjsunit/regress/regress-1166136-0.js b/deps/v8/test/mjsunit/regress/regress-1166136-0.js
new file mode 100644
index 00000000000000..a1441c38b4ff94
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1166136-0.js
@@ -0,0 +1,41 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --allow-natives-syntax --opt --turbo-inlining
+
+function main() {
+  function vul(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9,
+               arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18,
+               arg19, arg20, arg21, arg22, arg23, arg24, arg25, arg26,) {
+    let local_0 = Reflect.construct(Object,arguments,vul);
+    let local_1;
+    let local_2;
+    let local_3;
+    let local_4;
+    let local_5;
+    let local_6;
+    let local_7;
+    let local_8;
+    let local_9;
+    let local_10;
+    let local_11;
+    let local_12;
+    let local_13;
+    let local_14;
+    let local_15;
+    let local_16;
+    let local_17;
+    let local_18;
+    let local_19;
+    let local_20;
+  }
+
+  %PrepareFunctionForOptimization(vul);
+  vul(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+      1,1);
+}
+%PrepareFunctionForOptimization(main);
+main();
+%OptimizeFunctionOnNextCall(main);
+main();
diff --git a/deps/v8/test/mjsunit/regress/regress-1166136-1.js b/deps/v8/test/mjsunit/regress/regress-1166136-1.js
new file mode 100644
index 00000000000000..762023ab0087f0
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1166136-1.js
@@ -0,0 +1,29 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --allow-natives-syntax --opt --turbo-inlining
+
+function main() {
+  function vul(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9,
+               arg10, arg11) {
+    const res = Reflect.construct(Array,arguments,vul);
+    let local_1;
+    let local_2;
+    let local_3;
+    let local_4;
+    let local_5;
+    return res;
+  }
+
+  %PrepareFunctionForOptimization(vul);
+  return vul(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+}
+
+%PrepareFunctionForOptimization(main);
+main();
+const unoptimized_result = main();
+%OptimizeFunctionOnNextCall(main);
+const optimized_result = main();
+
+assertEquals(unoptimized_result, optimized_result);
diff --git a/deps/v8/test/mjsunit/regress/regress-1166136-2.js b/deps/v8/test/mjsunit/regress/regress-1166136-2.js
new file mode 100644
index 00000000000000..539ce93d3e07c3
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1166136-2.js
@@ -0,0 +1,28 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --allow-natives-syntax --opt --turbo-inlining
+
+function main() {
+  function vul(x0, x1, ...args) {
+    const res = Reflect.construct(Array,args,vul);
+    let local_1;
+    let local_2;
+    let local_3;
+    let local_4;
+    let local_5;
+    return res;
+  }
+
+  %PrepareFunctionForOptimization(vul);
+  return vul(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+}
+
+%PrepareFunctionForOptimization(main);
+main();
+const unoptimized_result = main();
+%OptimizeFunctionOnNextCall(main);
+const optimized_result = main();
+
+assertEquals(unoptimized_result, optimized_result);
diff --git a/deps/v8/test/mjsunit/regress/regress-1166138.js b/deps/v8/test/mjsunit/regress/regress-1166138.js
new file mode 100644
index 00000000000000..f3e4bde83e2769
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1166138.js
@@ -0,0 +1,7 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+let badregexp =  "(?:" +  " ".repeat(32768*2)+  ")*";
+reg = RegExp(badregexp);
+assertThrows(() => reg.test(), SyntaxError);
diff --git a/deps/v8/test/mjsunit/regress/regress-1167709-1.js b/deps/v8/test/mjsunit/regress/regress-1167709-1.js
new file mode 100644
index 00000000000000..c0631ff6c7ca7d
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1167709-1.js
@@ -0,0 +1,18 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --allow-natives-syntax --no-lazy-feedback-allocation
+
+function __f_0() {
+}
+function __f_3( __v_7, ...__v_8) {
+  return __f_0( ...__v_8);
+}
+function __f_5() {
+  __f_3();
+}
+%PrepareFunctionForOptimization(__f_5);
+__f_5();
+%OptimizeFunctionOnNextCall(__f_5);
+__f_5();
diff --git a/deps/v8/test/mjsunit/regress/regress-1167709-2.js b/deps/v8/test/mjsunit/regress/regress-1167709-2.js
new file mode 100644
index 00000000000000..dce367d56d85a2
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-1167709-2.js
@@ -0,0 +1,18 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --allow-natives-syntax --no-lazy-feedback-allocation
+
+function __f_0() {
+}
+function __f_3( __v_7, ...__v_8) {
+  return new __f_0( ...__v_8);
+}
+function __f_5() {
+  __f_3();
+}
+%PrepareFunctionForOptimization(__f_5);
+__f_5();
+%OptimizeFunctionOnNextCall(__f_5);
+__f_5();
diff --git a/deps/v8/test/mjsunit/regress/regress-385565.js b/deps/v8/test/mjsunit/regress/regress-385565.js
index c2907c06f4e14d..96dded2a00f86d 100644
--- a/deps/v8/test/mjsunit/regress/regress-385565.js
+++ b/deps/v8/test/mjsunit/regress/regress-385565.js
@@ -50,7 +50,7 @@ callsFReceiver(o1);
 var r2 = callsFReceiver(o1);
 assertOptimized(callsFReceiver);
 callsFReceiver(o2);
-if (%DynamicMapChecksEnabled()) {
+if (%DynamicCheckMapsEnabled()) {
   // Call it again to ensure a deopt when dynamic map checks is enabled.
   callsFReceiver(o2);
 }
@@ -77,7 +77,7 @@ assertTrue(r1 === r2);
 assertTrue(r2 === r3);
 
 
-if (%DynamicMapChecksEnabled()) {
+if (%DynamicCheckMapsEnabled()) {
   assertEquals(11, calls);
 } else {
   assertEquals(10, calls);
diff --git a/deps/v8/test/mjsunit/regress/regress-9832.js b/deps/v8/test/mjsunit/regress/regress-9832.js
index eedd628718274c..f8b40fd661ab16 100644
--- a/deps/v8/test/mjsunit/regress/regress-9832.js
+++ b/deps/v8/test/mjsunit/regress/regress-9832.js
@@ -22,8 +22,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
           kExprCallFunction, f.index,
           kExprCallFunction, f.index,
           kExprLocalSet, 0,
-        kExprCatch,
-          kExprDrop,
+        kExprCatchAll,
           kExprLocalGet, 0,
           kExprCallFunction, f.index,
           kExprLocalSet, 0,
diff --git a/deps/v8/test/mjsunit/regress/regress-crbug-1163184.js b/deps/v8/test/mjsunit/regress/regress-crbug-1163184.js
new file mode 100644
index 00000000000000..52769329845705
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-crbug-1163184.js
@@ -0,0 +1,29 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax --stress-compact
+
+let arr = [20];
+// This forces arr.concat to create a new dictionary map which can be collected
+// on a GC.
+arr[Symbol.isConcatSpreadable] = true;
+
+for (let i = 0; i < 4; ++i) {
+  function tmp() {
+    // Creates a new map that is collected on a GC.
+    let c = arr.concat();
+    // Access something from c, so c's map is embedded in code object.
+    c.x;
+  };
+  %PrepareFunctionForOptimization(tmp);
+  tmp();
+  // Optimize on the second iteration, so the optimized code isn't function
+  // context specialized and installed on feedback vector.
+  if (i == 1) {
+    %OptimizeFunctionOnNextCall(tmp);
+    tmp();
+  }
+  // Simulate full Newspace, so on next closure creation we cause a GC.
+  if (i == 2) %SimulateNewspaceFull();
+}
diff --git a/deps/v8/test/mjsunit/regress/regress-unlink-closures-on-deopt.js b/deps/v8/test/mjsunit/regress/regress-unlink-closures-on-deopt.js
index 2af3d115397239..fceac248e9c0a6 100644
--- a/deps/v8/test/mjsunit/regress/regress-unlink-closures-on-deopt.js
+++ b/deps/v8/test/mjsunit/regress/regress-unlink-closures-on-deopt.js
@@ -27,7 +27,7 @@ g1({ f : 1});
 %OptimizeFunctionOnNextCall(g2);
 g2({ f : 2});
 g1({});
-if (%DynamicMapChecksEnabled()) {
+if (%DynamicCheckMapsEnabled()) {
   // One more call to ensure a deopt even if dynamic map checks is enabled.
   g1({});
 }
diff --git a/deps/v8/test/mjsunit/regress/regress-v8-11261.js b/deps/v8/test/mjsunit/regress/regress-v8-11261.js
new file mode 100644
index 00000000000000..3245cfeb441e50
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-v8-11261.js
@@ -0,0 +1,10 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+let obj = ({ __proto__: { x: class {} }, y() { return new super.x; } });
+obj.y();
+
+class A { static a = class {} }
+class B extends A { static b() { return new super.a(); } }
+B.b();
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-1046472.js b/deps/v8/test/mjsunit/regress/wasm/regress-1046472.js
index 02cb585bf6c3d5..20ffb0f204b58e 100644
--- a/deps/v8/test/mjsunit/regress/wasm/regress-1046472.js
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-1046472.js
@@ -29,6 +29,5 @@ kExprEnd,   // @21
   assertThrows(
       () => {builder.toModule()}, WebAssembly.CompileError,
       'WebAssembly.Module(): Compiling function #0:\"main\" failed: ' +
-      'inconsistent type in br_table target 1 (previous was i32, ' +
-      'this one is f32) @+60');
+      'type error in merge[0] (expected <bot>, got i32) @+57');
 })();
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-10831.js b/deps/v8/test/mjsunit/regress/wasm/regress-10831.js
index 0f562ee87dc4a4..58c6c4dec1d564 100644
--- a/deps/v8/test/mjsunit/regress/wasm/regress-10831.js
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-10831.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --experimental-wasm-simd --enable-sse3 --enable-ssse3 --enable-sse4-1
+// Flags: --experimental-wasm-simd
 
 load('test/mjsunit/wasm/wasm-module-builder.js');
 
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-11206.js b/deps/v8/test/mjsunit/regress/wasm/regress-11206.js
new file mode 100644
index 00000000000000..e839dd9d0bc7a5
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-11206.js
@@ -0,0 +1,55 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --experimental-wasm-mv --expose-gc --stress-compaction
+// Flags: --stress-scavenge=16
+
+load('test/mjsunit/wasm/wasm-module-builder.js');
+
+(function TestReturnOddNumberOfReturns() {
+  let builder = new WasmModuleBuilder();
+  let void_sig = builder.addType(kSig_v_v);
+  let mv_sig = builder.addType(
+      makeSig([], [kWasmI32, kWasmI32, kWasmI32, kWasmI32, kWasmI32]));
+
+  let gc_index = builder.addImport('q', 'gc', void_sig);
+  builder.addFunction('main', mv_sig)
+      .addBodyWithEnd([
+        kExprCallFunction, gc_index,
+        kExprI32Const, 1,
+        kExprI32Const, 2,
+        kExprI32Const, 3,
+        kExprI32Const, 4,
+        kExprI32Const, 5,
+        kExprEnd
+      ])
+      .exportFunc();
+
+  let instance = builder.instantiate({q: {gc: gc}});
+
+  instance.exports.main();
+})();
+
+(function TestReturnEvenNumberOfReturns() {
+  let builder = new WasmModuleBuilder();
+  let void_sig = builder.addType(kSig_v_v);
+  let mv_sig =
+      builder.addType(makeSig([], [kWasmI32, kWasmI32, kWasmI32, kWasmI32]));
+
+  let gc_index = builder.addImport('q', 'gc', void_sig);
+  builder.addFunction('main', mv_sig)
+      .addBodyWithEnd([
+        kExprCallFunction, gc_index,
+        kExprI32Const, 1,
+        kExprI32Const, 2,
+        kExprI32Const, 3,
+        kExprI32Const, 4,
+        kExprEnd
+      ])
+      .exportFunc();
+
+  let instance = builder.instantiate({q: {gc: gc}});
+
+  instance.exports.main();
+})();
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-1124885.js b/deps/v8/test/mjsunit/regress/wasm/regress-1124885.js
new file mode 100644
index 00000000000000..9a4c7abb8848a1
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-1124885.js
@@ -0,0 +1,47 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --experimental-wasm-simd
+
+// This exercises an bug in scalar-lowering for load transforms. In
+// particular, if the index input to v128.load32_splat was a extract_lane, the
+// input wasn't correctly lowered. This caused the extract_lane node to stick
+// around until code-generator, where we hit a mismatch in the register types.
+load('test/mjsunit/wasm/wasm-module-builder.js');
+(function() {
+  const builder = new WasmModuleBuilder();
+  builder.addMemory(1, 1);
+  builder.addFunction(undefined, kSig_i_ii)
+    .addBodyWithEnd([
+      kExprI32Const, 0,
+      kExprLocalGet, 0,
+      kExprI32StoreMem, 0, 0,
+
+      kExprI32Const, 4,
+      kExprLocalGet, 0,
+      kExprI32StoreMem, 0, 0,
+
+      kExprI32Const, 8,
+      kExprLocalGet, 0,
+      kExprI32StoreMem, 0, 0,
+
+      kExprI32Const, 12,
+      kExprLocalGet, 0,
+      kExprI32StoreMem, 0, 0,
+      // Memory now looks like (in bytes):
+      // [4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0]
+
+      kExprI32Const, 0,
+      kSimdPrefix, kExprS128LoadMem, 0, 0,
+
+      kSimdPrefix, kExprI32x4ExtractLane, 0,
+      // load 32-bit from byte 4, then splat to all lanes.
+      kSimdPrefix, kExprS128Load32Splat, 0, 0,
+      kSimdPrefix, kExprI32x4ExtractLane, 3,
+      kExprEnd,
+    ])
+    .exportAs('main');
+  const instance = builder.instantiate();
+  assertEquals(4, instance.exports.main(4));
+})();
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-1145135.js b/deps/v8/test/mjsunit/regress/wasm/regress-1145135.js
new file mode 100644
index 00000000000000..aacaedc93f8597
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-1145135.js
@@ -0,0 +1,39 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --wasm-staging
+
+load('test/mjsunit/wasm/wasm-module-builder.js');
+
+const builder = new WasmModuleBuilder();
+builder.addMemory(1, 1, false, true);
+builder.addGlobal(kWasmI32, 1);
+builder.addFunction(undefined, kSig_v_i)
+  .addLocals(kWasmI32, 5)
+  .addBody([
+// signature: v_i
+// body:
+kExprGlobalGet, 0x00,  // global.get
+kExprI32Const, 0x10,  // i32.const
+kExprI32Sub,  // i32.sub
+kExprLocalTee, 0x02,  // local.tee
+kExprGlobalSet, 0x00,  // global.set
+kExprBlock, kWasmStmt,  // block @12
+  kExprLocalGet, 0x00,  // local.get
+  kExprI32LoadMem, 0x02, 0x00,  // i32.load
+  kExprI32Eqz,  // i32.eqz
+  kExprIf, kWasmStmt,  // if @20
+    kExprLocalGet, 0x02,  // local.get
+    kExprI32Const, 0x00,  // i32.const
+    kExprI32StoreMem, 0x02, 0x0c,  // i32.store
+    kExprLocalGet, 0x00,  // local.get
+    kExprI32Const, 0x20,  // i32.const
+    kExprI32Add,  // i32.add
+    kExprLocalSet, 0x05,  // local.set
+    kExprLocalGet, 0x00,  // local.get
+    kExprI32Const, 0x00,  // i32.const
+    kExprI32Const, 0x01,  // i32.const
+    kAtomicPrefix, kExprI32AtomicCompareExchange, 0x02, 0x20,  // i32.atomic.cmpxchng32
+]);
+assertThrows(() => builder.toModule(), WebAssembly.CompileError);
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-11472.js b/deps/v8/test/mjsunit/regress/wasm/regress-11472.js
new file mode 100644
index 00000000000000..f61fdb71c6066b
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-11472.js
@@ -0,0 +1,29 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Flags: --experimental-wasm-eh
+
+load("test/mjsunit/wasm/wasm-module-builder.js");
+
+(function Regress11472() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let throw_fn = builder.addFunction('throw', kSig_v_v)
+      .addBody([kExprNop])
+      .exportFunc();
+  builder.addFunction('test', kSig_i_ii)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprCallFunction, throw_fn.index,
+          kExprCallFunction, throw_fn.index,
+          kExprTry, kWasmI32,
+            kExprCallFunction, throw_fn.index,
+            kExprI32Const, 1,
+          kExprDelegate, 0,
+        kExprCatchAll,
+          kExprI32Const, 2,
+        kExprEnd,
+      ]).exportFunc();
+  instance = builder.instantiate();
+})();
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-1152937.js b/deps/v8/test/mjsunit/regress/wasm/regress-1152937.js
new file mode 100644
index 00000000000000..9c9d9f22bb02e1
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-1152937.js
@@ -0,0 +1,14 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Test that decoding of 'br' exits early and does not invoke the codegen
+// interface when reading the LEB128 branch target fails.
+
+load('test/mjsunit/wasm/wasm-module-builder.js');
+
+const builder = new WasmModuleBuilder();
+builder.addFunction(undefined, kSig_v_v)
+  .addBodyWithEnd([kExprBr, 0xFF]);
+
+assertThrows(() => builder.instantiate(), WebAssembly.CompileError);
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-1161954.js b/deps/v8/test/mjsunit/regress/wasm/regress-1161954.js
new file mode 100644
index 00000000000000..5a30abb293339c
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-1161954.js
@@ -0,0 +1,79 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --wasm-staging
+
+// This test is manually reduced from a fuzzer test case at
+// https://crbug.com/1161954. This exercises a bug in IA32 instruction
+// selection for v128.select, in the AVX case it was too flexible and allowed
+// the input operands to be slots, but the code-gen required them to be
+// registers.
+load('test/mjsunit/wasm/wasm-module-builder.js');
+
+const builder = new WasmModuleBuilder();
+// Generate function 1 (out of 1).
+builder.addFunction(undefined, kSig_i_v)
+  .addBodyWithEnd([
+// signature: i_v
+// body:
+kExprI32Const, 0x37,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0xb9, 0xf2, 0xd8, 0x01,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprS128AndNot,  // s128.andnot
+kExprI32Const, 0xb2, 0xf2, 0x00,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x00,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0xf2, 0x82, 0x02,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprF64x2Max, 0x01,  // f64x2.max
+kSimdPrefix, kExprI16x8Add, 0x01,  // i16x8.add
+kSimdPrefix, kExprS128Or,  // s128.or
+kSimdPrefix, kExprI8x16Neg,  // i8x16.neg
+kExprI32Const, 0x8e, 0x1c,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x00,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x9d, 0x26,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0xf0, 0xe0, 0x01,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprI8x16LeS,  // i8x16.le_s
+kSimdPrefix, kExprI8x16LeS,  // i8x16.le_s
+kExprI32Const, 0xff, 0xfb, 0x03,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x93, 0x26,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x9d, 0x26,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprI8x16GtU,  // i8x16.gt_u
+kExprI32Const, 0xf0, 0x00,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprI16x8Mul, 0x01,  // i16x8.mul
+kSimdPrefix, kExprF32x4Ge,  // f32x4.ge
+kSimdPrefix, kExprI8x16LeS,  // i8x16.le_s
+kSimdPrefix, kExprI8x16LeS,  // i8x16.le_s
+kExprI32Const, 0x00,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0xc1, 0x8e, 0x35,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x0d,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprI32x4Ne,  // i32x4.ne
+kSimdPrefix, kExprF32x4Ge,  // f32x4.ge
+kSimdPrefix, kExprI8x16LeS,  // i8x16.le_s
+kExprI32Const, 0xc1, 0x8e, 0x35,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x0d,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprS128Select,  // s128.select
+kSimdPrefix, kExprF64x2Div, 0x01,  // f64x2.div
+kSimdPrefix, kExprF64x2ExtractLane, 0x00,  // f64x2.extract_lane
+kNumericPrefix, kExprI32SConvertSatF64,  // i32.trunc_sat_f64_s
+kExprEnd,  // end @142
+]);
+builder.addExport('main', 0);
+const instance = builder.instantiate();
+print(instance.exports.main());
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-1165966.js b/deps/v8/test/mjsunit/regress/wasm/regress-1165966.js
new file mode 100644
index 00000000000000..aba4ef40e44320
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-1165966.js
@@ -0,0 +1,42 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --wasm-staging
+
+// This test case is simplified slightly from a fuzzer-generated test case. It
+// causes spills for one of the inputs to kExprI64x2ExtMulHighI32x4U, which the
+// codegen incorrectly assumes will always be a register.
+load('test/mjsunit/wasm/wasm-module-builder.js');
+
+const builder = new WasmModuleBuilder();
+builder.addMemory(16, 32, false, true);
+// Generate function 1 (out of 1).
+builder.addFunction(undefined, kSig_i_v)
+  .addLocals(kWasmI64, 1)
+  .addBodyWithEnd([
+// signature: i_v
+// body:
+kExprI32Const, 0x00,  // i32.const
+kExprI32Const, 0x00,  // i32.const
+kExprI32Const, 0x00,  // i32.const
+kExprSelectWithType, 0x01, 0x7f,  // select
+kExprMemoryGrow, 0x00,  // memory.grow
+kExprI32Const, 0xb0, 0xde, 0xc9, 0x03,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0x00,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kExprI32Const, 0xb0, 0xe0, 0xc0, 0x01,  // i32.const
+kSimdPrefix, kExprI8x16Splat,  // i8x16.splat
+kSimdPrefix, kExprI64x2ExtMulHighI32x4U, 0x01,  // i64x2.extmul_high_i32x4_u
+kSimdPrefix, kExprF32x4Le,  // f32x4.le
+kSimdPrefix, kExprI32x4ExtractLane, 0x00,  // i32x4.extract_lane
+kExprI32DivS,  // i32.div_s
+kExprEnd,  // end @41
+]);
+builder.addExport('main', 0);
+const instance = builder.instantiate();
+assertThrows(
+  () => instance.exports.main(),
+  WebAssembly.RuntimeError,
+  "divide by zero");
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-922432.js b/deps/v8/test/mjsunit/regress/wasm/regress-922432.js
deleted file mode 100644
index 26a004652a7336..00000000000000
--- a/deps/v8/test/mjsunit/regress/wasm/regress-922432.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2019 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Flags: --experimental-wasm-eh
-
-load("test/mjsunit/wasm/wasm-module-builder.js");
-
-(function TestTruncatedBrOnExnInLoop() {
-  let builder = new WasmModuleBuilder();
-  let fun = builder.addFunction(undefined, kSig_v_v)
-      .addLocals(kWasmExnRef, 1)
-      .addBody([
-        kExprLoop, kWasmStmt,
-          kExprLocalGet, 0,
-          kExprBrOnExn  // Bytecode truncated here.
-      ]).exportFunc();
-  fun.body.pop();  // Pop implicitly added kExprEnd from body.
-  assertThrows(() => builder.instantiate(), WebAssembly.CompileError);
-})();
diff --git a/deps/v8/test/mjsunit/regress/wasm/regress-9447.js b/deps/v8/test/mjsunit/regress/wasm/regress-9447.js
index 77d819d48c24fb..540f31611249eb 100644
--- a/deps/v8/test/mjsunit/regress/wasm/regress-9447.js
+++ b/deps/v8/test/mjsunit/regress/wasm/regress-9447.js
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --no-experimental-wasm-bigint
+// Flags: --experimental-wasm-simd
 
 load('test/mjsunit/wasm/wasm-module-builder.js');
 
+let kSig_s_v = makeSig([], [kWasmS128]);
 // Generate a re-exported function that wraps a JavaScript callable, but with a
-// function signature that is incompatible (i.e. i64 return type) with JS.
+// function signature that is incompatible (i.e. simd return type) with JS.
 var fun1 = (function GenerateFun1() {
   let builder = new WasmModuleBuilder();
   function fun() { return 0 }
-  let fun_index = builder.addImport("m", "fun", kSig_l_v)
+  let fun_index = builder.addImport('m', 'fun', kSig_s_v)
   builder.addExport("fun", fun_index);
   let instance = builder.instantiate({ m: { fun: fun }});
   return instance.exports.fun;
@@ -21,7 +22,7 @@ var fun1 = (function GenerateFun1() {
 // module, still with a function signature that is incompatible with JS.
 var fun2 = (function GenerateFun2() {
   let builder = new WasmModuleBuilder();
-  let fun_index = builder.addImport("m", "fun", kSig_l_v)
+  let fun_index = builder.addImport("m", "fun", kSig_s_v)
   builder.addFunction('main', kSig_v_v)
       .addBody([
         kExprCallFunction, fun_index,
diff --git a/deps/v8/test/mjsunit/string-external-cached.js b/deps/v8/test/mjsunit/string-external-cached.js
index dd8a99382bdfce..bfecd17314c5f1 100644
--- a/deps/v8/test/mjsunit/string-external-cached.js
+++ b/deps/v8/test/mjsunit/string-external-cached.js
@@ -53,7 +53,7 @@ function test() {
     assertEquals('B', charat_str[i].charAt(3*16 + 11));
   }
 
-  charat_short = "01234";
+  charat_short = "0123456789ABC";
   try {  // String can only be externalized once
     externalizeString(charat_short, true);
   } catch (ex) { }
diff --git a/deps/v8/test/mjsunit/tools/dumpcpp.mjs b/deps/v8/test/mjsunit/tools/dumpcpp.mjs
index 596049c9ce431d..0ade52da2497f0 100644
--- a/deps/v8/test/mjsunit/tools/dumpcpp.mjs
+++ b/deps/v8/test/mjsunit/tools/dumpcpp.mjs
@@ -31,19 +31,25 @@ import {
                [288,{size:1,
                      name:'v8::internal::Runtime_DebugGetPropertyDetails(v8::internal::Arguments)',
                      type:'CPP',
-                     nameUpdated_:false}
+                     nameUpdated_:false,
+                     source: undefined,
+                }
                ]);
   assertEquals(staticEntries[1],
                [272,{size:1,
                      name:'v8::internal::Runtime::GetElementOrCharAt(v8::internal::Handle<v8::internal::Object>, unsigned int)',
                      type:'CPP',
-                     nameUpdated_:false}
+                     nameUpdated_:false,
+                     source: undefined,
+                }
                ]);
   assertEquals(staticEntries[2],
               [256,{size:1,
                     name:'v8::internal::Runtime_StringReplaceRegExpWithString(v8::internal::Arguments)',
                     type:'CPP',
-                    nameUpdated_:false}
+                    nameUpdated_:false,
+                    source: undefined,
+                }
               ]);
 
   UnixCppEntriesProvider.prototype.loadSymbols = oldLoadSymbols;
diff --git a/deps/v8/test/mjsunit/tools/foozzie.js b/deps/v8/test/mjsunit/tools/foozzie.js
index d5298593f53b77..147f6370601005 100644
--- a/deps/v8/test/mjsunit/tools/foozzie.js
+++ b/deps/v8/test/mjsunit/tools/foozzie.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax
+// Flags: --allow-natives-syntax --correctness-fuzzer-suppressions
 // Files: tools/clusterfuzz/v8_mock.js
 
 // Test foozzie mocks for differential fuzzing.
@@ -22,6 +22,13 @@ assertEquals(710, new Date.prototype.constructor().getUTCMilliseconds());
 assertEquals(819134640000,
              new Date('December 17, 1995 03:24:00 GMT+1000').getTime());
 
+// Deterministic DateTimeFormat.
+if (this.Intl) {
+  const df = new Intl.DateTimeFormat(undefined, {fractionalSecondDigits: 3});
+  assertEquals('004', df.format());
+  assertEquals('004', df.formatToParts()[0].value);
+}
+
 // Dummy performance methods.
 assertEquals(1.2, performance.now());
 assertEquals([], performance.measureMemory());
diff --git a/deps/v8/test/mjsunit/tools/timeline.mjs b/deps/v8/test/mjsunit/tools/timeline.mjs
index 5d3eca92d6b36c..87313b87a79dc8 100644
--- a/deps/v8/test/mjsunit/tools/timeline.mjs
+++ b/deps/v8/test/mjsunit/tools/timeline.mjs
@@ -8,23 +8,45 @@ import { LogEntry} from "../../../tools/system-analyzer/log/log.mjs";
 
 (function testTimeline() {
   let timeline = new Timeline();
+
   let id1 = "0x3e7e082470cd";
   let id2 = "0x3e7e082470ad";
-  let time = 12;
-  let entry1 = new LogEntry(id1, time);
+  let time = 10;
+
+  let entry1 = new LogEntry(id1, time + 0);
   let entry2 = new LogEntry(id1, time + 1);
   let entry3 = new LogEntry(id1, time + 2);
   let entry4 = new LogEntry(id1, time + 3);
   let entry5 = new LogEntry(id2, time + 3);
+  let entry6 = new LogEntry(id1, time + 4);
+
   timeline.push(entry1);
   timeline.push(entry2);
   timeline.push(entry3);
   timeline.push(entry4);
   timeline.push(entry5);
+  timeline.push(entry6);
+
+  assertEquals(timeline.find(time + 0), 0);
+  assertEquals(timeline.find(time + 1), 1);
+  assertEquals(timeline.find(time + 2), 2);
+  assertEquals(timeline.find(time + 3), 3);
+  assertEquals(timeline.find(time + 4), 5);
+  assertEquals(timeline.find(time + 5), 5);
+
+  assertEquals(timeline.find(time + 2.00), 2);
+  assertEquals(timeline.find(time + 2.01), 3);
+  assertEquals(timeline.find(time + 2.90), 3);
+  assertEquals(timeline.find(time + 3.01), 5);
+  assertEquals(timeline.find(time + 3.90), 5);
+  assertEquals(timeline.find(time + 4.00), 5);
+
   let startTime = time;
   let endTime = time + 2;
   timeline.selectTimeRange(startTime, endTime);
-  assertArrayEquals(timeline.selection, [entry1, entry2, entry3]);
+  assertArrayEquals(timeline.selection.startTime, startTime);
+  assertArrayEquals(timeline.selection.endTime, endTime);
+  assertArrayEquals(timeline.selection.values, [entry1, entry2]);
   let entryIdx = timeline.find(time + 1);
   let entry = timeline.at(entryIdx);
   assertEquals(entry.time, time + 1);
diff --git a/deps/v8/test/mjsunit/track-fields.js b/deps/v8/test/mjsunit/track-fields.js
index 9edd260d90b502..21e55d4c24f9f3 100644
--- a/deps/v8/test/mjsunit/track-fields.js
+++ b/deps/v8/test/mjsunit/track-fields.js
@@ -26,7 +26,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --track-fields --track-double-fields --allow-natives-syntax
-// Flags: --modify-field-representation-inplace
 
 // Test transitions caused by changes to field representations.
 
diff --git a/deps/v8/test/mjsunit/unicode-case-overoptimization.js b/deps/v8/test/mjsunit/unicode-case-overoptimization0.js
similarity index 97%
rename from deps/v8/test/mjsunit/unicode-case-overoptimization.js
rename to deps/v8/test/mjsunit/unicode-case-overoptimization0.js
index bfda48c77c175e..96ca81d0010e01 100644
--- a/deps/v8/test/mjsunit/unicode-case-overoptimization.js
+++ b/deps/v8/test/mjsunit/unicode-case-overoptimization0.js
@@ -27,7 +27,8 @@
 
 // Test all non-ASCII characters individually to ensure that our optimizations
 // didn't break anything.
-for (var i = 0x80; i <= 0xfffe; i++) {
+// Part 1 of 2.
+for (var i = 0x80; i <= 0x803f; i++) {
   var c = String.fromCharCode(i);
   var c2 = String.fromCharCode(i + 1);
   var re = new RegExp("[" + c + "-" + c2 + "]", "i");
diff --git a/deps/v8/test/mjsunit/unicode-case-overoptimization1.js b/deps/v8/test/mjsunit/unicode-case-overoptimization1.js
new file mode 100644
index 00000000000000..87bdd8a6dbb182
--- /dev/null
+++ b/deps/v8/test/mjsunit/unicode-case-overoptimization1.js
@@ -0,0 +1,36 @@
+// Copyright 2009 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Test all non-ASCII characters individually to ensure that our optimizations
+// didn't break anything.
+// Part 2 of 2.
+for (var i = 0x8040; i <= 0xfffe; i++) {
+  var c = String.fromCharCode(i);
+  var c2 = String.fromCharCode(i + 1);
+  var re = new RegExp("[" + c + "-" + c2 + "]", "i");
+  assertTrue(re.test(c), i);
+}
diff --git a/deps/v8/test/mjsunit/wasm/bigint-i64-to-imported-js-func.js b/deps/v8/test/mjsunit/wasm/bigint-i64-to-imported-js-func.js
index 2fa48d9b966667..f0225bc9d9df1b 100644
--- a/deps/v8/test/mjsunit/wasm/bigint-i64-to-imported-js-func.js
+++ b/deps/v8/test/mjsunit/wasm/bigint-i64-to-imported-js-func.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --experimental-wasm-bigint
-
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 (function TestWasmI64ToJSBigIntImportedFunc() {
diff --git a/deps/v8/test/mjsunit/wasm/bigint.js b/deps/v8/test/mjsunit/wasm/bigint.js
index 785ee182f15299..3d3f23cedd929e 100644
--- a/deps/v8/test/mjsunit/wasm/bigint.js
+++ b/deps/v8/test/mjsunit/wasm/bigint.js
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --experimental-wasm-bigint
-
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 (function TestWasmI64ToJSBigInt() {
diff --git a/deps/v8/test/mjsunit/wasm/exceptions-externref.js b/deps/v8/test/mjsunit/wasm/exceptions-externref.js
index f91132401e9655..f32c154ebaf24d 100644
--- a/deps/v8/test/mjsunit/wasm/exceptions-externref.js
+++ b/deps/v8/test/mjsunit/wasm/exceptions-externref.js
@@ -29,25 +29,22 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   let except = builder.addException(kSig_v_r);
   builder.addFunction("throw_catch_null", kSig_i_i)
       .addBody([
-        kExprTry, kWasmExternRef,
+        kExprTry, kWasmI32,
           kExprLocalGet, 0,
           kExprI32Eqz,
-          kExprIf, kWasmExternRef,
+          kExprIf, kWasmI32,
             kExprRefNull, kWasmExternRef,
             kExprThrow, except,
           kExprElse,
             kExprI32Const, 42,
-            kExprReturn,
           kExprEnd,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
-        kExprEnd,
-        kExprRefIsNull,
-        kExprIf, kWasmI32,
-          kExprI32Const, 23,
-        kExprElse,
-          kExprUnreachable,
+        kExprCatch, except,
+          kExprRefIsNull,
+          kExprIf, kWasmI32,
+            kExprI32Const, 23,
+          kExprElse,
+            kExprUnreachable,
+          kExprEnd,
         kExprEnd,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -85,9 +82,8 @@ load("test/mjsunit/wasm/exceptions-utils.js");
         kExprTry, kWasmExternRef,
           kExprLocalGet, 0,
           kExprThrow, except,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
+          // fall-through
         kExprEnd,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -98,182 +94,3 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   assertEquals(2.3, instance.exports.throw_catch_param(2.3));
   assertEquals("str", instance.exports.throw_catch_param("str"));
 })();
-
-// Test throwing/catching a function reference type value.
-(function TestThrowCatchAnyFunc() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_a);
-  builder.addFunction("throw_catch_local", kSig_a_v)
-      .addLocals(kWasmAnyFunc, 1)
-      .addBody([
-        kExprTry, kWasmAnyFunc,
-          kExprLocalGet, 0,
-          kExprThrow, except,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
-        kExprEnd,
-      ]).exportFunc();
-  let instance = builder.instantiate();
-
-  assertEquals(null, instance.exports.throw_catch_local());
-})();
-
-// Test throwing/catching an encapsulated exception type value.
-(function TestThrowCatchExnRef() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_e);
-  builder.addFunction("throw_catch_param", kSig_e_e)
-      .addBody([
-        kExprTry, kWasmExnRef,
-          kExprLocalGet, 0,
-          kExprThrow, except,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
-        kExprEnd,
-      ]).exportFunc();
-  let instance = builder.instantiate();
-  let e = new Error("my encapsulated error");
-
-  assertEquals(e, instance.exports.throw_catch_param(e));
-  assertEquals(1, instance.exports.throw_catch_param(1));
-  assertEquals(2.3, instance.exports.throw_catch_param(2.3));
-  assertEquals("str", instance.exports.throw_catch_param("str"));
-})();
-
-// Test storing and loading to/from an exception type table.
-(function TestTableExnRef() {
-  print(arguments.callee.name);
-  let kSig_e_i = makeSig([kWasmI32], [kWasmExnRef]);
-  let kSig_v_ie = makeSig([kWasmI32, kWasmExnRef], []);
-  let builder = new WasmModuleBuilder();
-  let table = builder.addTable(kWasmExnRef, 2).exportAs("table");
-  builder.addFunction("table_load", kSig_e_i)
-      .addBody([
-        kExprLocalGet, 0,
-        kExprTableGet, table.index
-      ]).exportFunc();
-  builder.addFunction("table_store", kSig_v_ie)
-      .addBody([
-        kExprLocalGet, 0,
-        kExprLocalGet, 1,
-        kExprTableSet, table.index
-      ]).exportFunc();
-  let instance = builder.instantiate();
-  let e0 = new Error("my encapsulated error");
-  let e1 = new Error("my other encapsulated error");
-
-  assertNull(instance.exports.table_load(0));
-  assertNull(instance.exports.table_load(1));
-  assertNull(instance.exports.table.get(0));
-  assertNull(instance.exports.table.get(1));
-
-  instance.exports.table_store(0, e0);
-  assertSame(e0, instance.exports.table_load(0));
-  assertNull(instance.exports.table_load(1));
-  assertSame(e0, instance.exports.table.get(0));
-  assertNull(instance.exports.table.get(1));
-
-  instance.exports.table.set(1, e1);
-  assertSame(e0, instance.exports.table_load(0));
-  assertSame(e1, instance.exports.table_load(1));
-  assertSame(e0, instance.exports.table.get(0));
-  assertSame(e1, instance.exports.table.get(1));
-})();
-
-// 'br_on_exn' on a null-ref value should trap.
-(function TestBrOnExnNullSimple() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_r);
-  builder.addFunction('br_on_exn_null', kSig_v_v)
-      .addBody([
-        kExprRefNull, kWasmExnRef,
-        kExprBrOnExn, 0, except,
-        kExprDrop
-      ]).exportFunc();
-  let instance = builder.instantiate();
-
-  assertTraps(kTrapBrOnExnNull, () => instance.exports.br_on_exn_null());
-})();
-
-(function TestBrOnExnNullFromJS() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_i);
-  let imp = builder.addImport('imp', 'ort', kSig_i_i);
-  let kConstant0 = 11;
-  let kNoMatch = 13;
-  builder.addFunction('call_import', kSig_i_i)
-      .addBody([
-        kExprTry, kWasmI32,
-          kExprLocalGet, 0,
-          kExprCallFunction, imp,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprDrop,
-          kExprI32Const, kNoMatch,
-        kExprEnd
-      ]).exportFunc();
-  let instance;
-  function js_import(i) {
-    if (i == 0) return kConstant0;     // Will return kConstant0.
-    if (i == 1) throw new Error('1');  // Will not match.
-    if (i == 2) throw null;            // Will trap.
-    throw undefined;                   // Will not match.
-  }
-  instance = builder.instantiate({imp: {ort: js_import}});
-
-  assertEquals(kConstant0, instance.exports.call_import(0));
-  assertEquals(kNoMatch, instance.exports.call_import(1));
-  assertTraps(kTrapBrOnExnNull, () => instance.exports.call_import(2));
-  assertEquals(kNoMatch, instance.exports.call_import(3));
-})();
-
-// 'rethrow' on a null-ref value should trap.
-(function TestRethrowNullSimple() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_r);
-  builder.addFunction('rethrow_null', kSig_v_v)
-      .addBody([
-        kExprRefNull, kWasmExnRef,
-        kExprRethrow
-      ]).exportFunc();
-  let instance = builder.instantiate();
-
-  assertTraps(kTrapRethrowNull, () => instance.exports.rethrow_null());
-})();
-
-(function TestRethrowNullFromJS() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_i);
-  let imp = builder.addImport('imp', 'ort', kSig_i_i);
-  let kSuccess = 11;
-  builder.addFunction('call_import', kSig_i_i)
-      .addBody([
-        kExprTry, kWasmI32,
-          kExprLocalGet, 0,
-          kExprCallFunction, imp,
-        kExprCatch,
-          kExprRethrow,
-        kExprEnd
-      ]).exportFunc();
-  let instance;
-  function js_import(i) {
-    if (i == 0) return kSuccess;       // Will return kSuccess.
-    if (i == 1) throw new Error('1');  // Will rethrow.
-    if (i == 2) throw null;            // Will trap.
-    throw undefined;                   // Will rethrow.
-  }
-  instance = builder.instantiate({imp: {ort: js_import}});
-
-  assertEquals(kSuccess, instance.exports.call_import(0));
-  assertThrows(() => instance.exports.call_import(1), Error, '1');
-  assertTraps(kTrapRethrowNull, () => instance.exports.call_import(2));
-  assertThrowsEquals(() => instance.exports.call_import(3), undefined);
-})();
diff --git a/deps/v8/test/mjsunit/wasm/exceptions-global.js b/deps/v8/test/mjsunit/wasm/exceptions-global.js
index e7b24e19b9f305..136cee808a1b65 100644
--- a/deps/v8/test/mjsunit/wasm/exceptions-global.js
+++ b/deps/v8/test/mjsunit/wasm/exceptions-global.js
@@ -37,104 +37,6 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   assertEquals(null, instance.exports.push_and_return_exnref());
 })();
 
-// Test storing a caught exception into an exported mutable "exnref" global.
-(function TestGlobalExnRefSetCaught() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_i);
-  let g = builder.addGlobal(kWasmExnRef, true).exportAs("exn");
-  builder.addFunction('catch_and_set_exnref', kSig_v_i)
-      .addBody([
-        kExprTry, kWasmStmt,
-          kExprLocalGet, 0,
-          kExprThrow, except,
-        kExprCatch,
-          kExprGlobalSet, g.index,
-        kExprEnd,
-      ]).exportFunc();
-  let instance = builder.instantiate();
-
-  assertDoesNotThrow(() => instance.exports.catch_and_set_exnref(23));
-  let exception = instance.exports.exn.value;  // Exported mutable global.
-  assertInstanceof(exception, WebAssembly.RuntimeError);
-  assertEquals(except, %GetWasmExceptionId(exception, instance));
-})();
-
-// Test storing a parameter into an exported mutable "exnref" global.
-(function TestGlobalExnRefSetParameter() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let g = builder.addGlobal(kWasmExnRef, true).exportAs("exn");
-  builder.addFunction('set_param_exnref', kSig_v_e)
-      .addBody([
-        kExprTry, kWasmStmt,
-          kExprLocalGet, 0,
-          kExprRethrow,
-        kExprCatch,
-          kExprGlobalSet, g.index,
-        kExprEnd,
-      ]).exportFunc();
-  let exception = "my fancy exception";
-  let instance = builder.instantiate();
-
-  assertDoesNotThrow(() => instance.exports.set_param_exnref(exception));
-  assertEquals(exception, instance.exports.exn.value);
-})();
-
-// Test loading an imported "exnref" global and re-throwing the exception.
-(function TestGlobalExnRefGetImportedAndRethrow() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let g_index = builder.addImportedGlobal("m", "exn", kWasmExnRef);
-  builder.addFunction('rethrow_exnref', kSig_v_v)
-      .addBody([
-        kExprGlobalGet, g_index,
-        kExprRethrow,
-      ]).exportFunc();
-  let exception = "my fancy exception";
-  let instance = builder.instantiate({ "m": { "exn": exception }});
-
-  assertThrowsEquals(() => instance.exports.rethrow_exnref(), exception);
-})();
-
-// Test loading an exported mutable "exnref" being changed from the outside.
-(function TestGlobalExnRefGetExportedMutableAndRethrow() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let g = builder.addGlobal(kWasmExnRef, true).exportAs("exn");
-  builder.addFunction('rethrow_exnref', kSig_v_v)
-      .addBody([
-        kExprGlobalGet, g.index,
-        kExprRethrow,
-      ]).exportFunc();
-  let instance = builder.instantiate();
-
-  let exception1 = instance.exports.exn.value = "my fancy exception";
-  assertThrowsEquals(() => instance.exports.rethrow_exnref(), exception1);
-  let exception2 = instance.exports.exn.value = "an even fancier exception";
-  assertThrowsEquals(() => instance.exports.rethrow_exnref(), exception2);
-})();
-
-// Test loading an imported mutable "exnref" being changed from the outside.
-(function TestGlobalExnRefGetImportedMutableAndRethrow() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let g_index = builder.addImportedGlobal("m", "exn", kWasmExnRef, true);
-  builder.addFunction('rethrow_exnref', kSig_v_v)
-      .addBody([
-        kExprGlobalGet, g_index,
-        kExprRethrow,
-      ]).exportFunc();
-  let exception1 = "my fancy exception";
-  let desc = { value: 'exnref', mutable: true };
-  let mutable_global = new WebAssembly.Global(desc, exception1);
-  let instance = builder.instantiate({ "m": { "exn": mutable_global }});
-
-  assertThrowsEquals(() => instance.exports.rethrow_exnref(), exception1);
-  let exception2 = mutable_global.value = "an even fancier exception";
-  assertThrowsEquals(() => instance.exports.rethrow_exnref(), exception2);
-})();
-
 // Test custom initialization index for a global "exnref" variable.
 (function TestGlobalExnRefInitIndex() {
   print(arguments.callee.name);
diff --git a/deps/v8/test/mjsunit/wasm/exceptions-rethrow.js b/deps/v8/test/mjsunit/wasm/exceptions-rethrow.js
index 0264115d7e2da3..ec689791cadaa8 100644
--- a/deps/v8/test/mjsunit/wasm/exceptions-rethrow.js
+++ b/deps/v8/test/mjsunit/wasm/exceptions-rethrow.js
@@ -7,7 +7,7 @@
 load("test/mjsunit/wasm/wasm-module-builder.js");
 load("test/mjsunit/wasm/exceptions-utils.js");
 
-// Test that rethrow expressions work inside catch blocks.
+// Test that rethrow expressions can target catch blocks.
 (function TestRethrowInCatch() {
   print(arguments.callee.name);
   let builder = new WasmModuleBuilder();
@@ -16,22 +16,19 @@ load("test/mjsunit/wasm/exceptions-utils.js");
       .addBody([
         kExprTry, kWasmStmt,
           kExprThrow, except,
-        kExprCatch,
-          kExprRethrow,
+        kExprCatch, except,
+          kExprRethrow, 0,
         kExprEnd,
   ]).exportFunc();
   builder.addFunction("rethrow1", kSig_i_i)
-      .addLocals(kWasmExnRef, 1)
       .addBody([
         kExprTry, kWasmI32,
           kExprThrow, except,
-        kExprCatch,
-          kExprLocalSet, 1,
+        kExprCatch, except,
           kExprLocalGet, 0,
           kExprI32Eqz,
           kExprIf, kWasmStmt,
-            kExprLocalGet, 1,
-            kExprRethrow,
+            kExprRethrow, 1,
           kExprEnd,
           kExprI32Const, 23,
         kExprEnd
@@ -43,37 +40,65 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   assertEquals(23, instance.exports.rethrow1(1));
 })();
 
-// Test that rethrow expressions work properly even in the presence of multiple
-// nested handlers being involved.
+// Test that rethrow expressions can target catch-all blocks.
+(function TestRethrowInCatchAll() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except = builder.addException(kSig_v_v);
+  builder.addFunction("rethrow0", kSig_v_v)
+      .addBody([
+        kExprTry, kWasmStmt,
+          kExprThrow, except,
+        kExprCatchAll,
+          kExprRethrow, 0,
+        kExprEnd,
+  ]).exportFunc();
+  builder.addFunction("rethrow1", kSig_i_i)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprThrow, except,
+        kExprCatchAll,
+          kExprLocalGet, 0,
+          kExprI32Eqz,
+          kExprIf, kWasmStmt,
+            kExprRethrow, 1,
+          kExprEnd,
+          kExprI32Const, 23,
+        kExprEnd
+  ]).exportFunc();
+  let instance = builder.instantiate();
+
+  assertWasmThrows(instance, except, [], () => instance.exports.rethrow0());
+  assertWasmThrows(instance, except, [], () => instance.exports.rethrow1(0));
+  assertEquals(23, instance.exports.rethrow1(1));
+})();
+
+// Test that rethrow expression properly target the correct surrounding try
+// block even in the presence of multiple handlers being involved.
 (function TestRethrowNested() {
   print(arguments.callee.name);
   let builder = new WasmModuleBuilder();
   let except1 = builder.addException(kSig_v_v);
   let except2 = builder.addException(kSig_v_v);
   builder.addFunction("rethrow_nested", kSig_i_i)
-      .addLocals(kWasmExnRef, 2)
       .addBody([
         kExprTry, kWasmI32,
           kExprThrow, except2,
-        kExprCatch,
-          kExprLocalSet, 2,
+        kExprCatch, except2,
           kExprTry, kWasmI32,
             kExprThrow, except1,
-          kExprCatch,
-            kExprLocalSet, 1,
+          kExprCatch, except1,
             kExprLocalGet, 0,
             kExprI32Const, 0,
             kExprI32Eq,
             kExprIf, kWasmStmt,
-              kExprLocalGet, 1,
-              kExprRethrow,
+              kExprRethrow, 1,
             kExprEnd,
             kExprLocalGet, 0,
             kExprI32Const, 1,
             kExprI32Eq,
             kExprIf, kWasmStmt,
-              kExprLocalGet, 2,
-              kExprRethrow,
+              kExprRethrow, 2,
             kExprEnd,
             kExprI32Const, 23,
           kExprEnd,
@@ -93,22 +118,18 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   let builder = new WasmModuleBuilder();
   let except = builder.addException(kSig_v_v);
   builder.addFunction("rethrow_recatch", kSig_i_i)
-      .addLocals(kWasmExnRef, 1)
       .addBody([
         kExprTry, kWasmI32,
           kExprThrow, except,
-        kExprCatch,
-          kExprLocalSet, 1,
+        kExprCatch, except,
           kExprTry, kWasmI32,
             kExprLocalGet, 0,
             kExprI32Eqz,
             kExprIf, kWasmStmt,
-              kExprLocalGet, 1,
-              kExprRethrow,
+              kExprRethrow, 2,
             kExprEnd,
             kExprI32Const, 42,
-          kExprCatch,
-            kExprDrop,
+          kExprCatch, except,
             kExprI32Const, 23,
           kExprEnd,
         kExprEnd,
diff --git a/deps/v8/test/mjsunit/wasm/exceptions-shared.js b/deps/v8/test/mjsunit/wasm/exceptions-shared.js
index 48835901f9df45..8b3defb9af909c 100644
--- a/deps/v8/test/mjsunit/wasm/exceptions-shared.js
+++ b/deps/v8/test/mjsunit/wasm/exceptions-shared.js
@@ -32,9 +32,7 @@ function NewExportedException() {
       .addBody([
         kExprTry, kWasmStmt,
           kExprCallFunction, fun,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd,
       ]).exportFunc();
   let ex_obj = new Error("my exception");
@@ -66,9 +64,7 @@ function NewExportedException() {
       .addBody([
         kExprTry, kWasmStmt,
           kExprCallFunction, fun,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd,
       ]).exportFunc();
   let ex_obj = new Error("my exception");
@@ -103,9 +99,7 @@ function NewExportedException() {
       .addBody([
         kExprTry, kWasmStmt,
           kExprCallFunction, fun,
-        kExprCatch,
-          kExprBrOnExn, 0, except1,
-          kExprRethrow,
+        kExprCatch, except1,
         kExprEnd,
       ]).exportFunc();
   let ex_obj = new Error("my exception");
@@ -144,9 +138,7 @@ function NewExportedException() {
       .addBody([
         kExprTry, kWasmStmt,
           kExprCallFunction, fun,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd,
       ]).exportFunc();
   let ex_obj = new Error("my exception");
diff --git a/deps/v8/test/mjsunit/wasm/exceptions-simd.js b/deps/v8/test/mjsunit/wasm/exceptions-simd.js
index bfa8d60757bbb3..9082a7f49e548b 100644
--- a/deps/v8/test/mjsunit/wasm/exceptions-simd.js
+++ b/deps/v8/test/mjsunit/wasm/exceptions-simd.js
@@ -36,9 +36,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
         kExprTry, kWasmS128,
           kExprLocalGet, 0,
           kExprThrow, 0,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd,
         kExprLocalGet, 0,
         kSimdPrefix, kExprI32x4Eq,
@@ -65,9 +63,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprI32Const, in_idx,
           kSimdPrefix, kExprS128LoadMem, 0, 0,
           kExprThrow, 0,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd,
         kSimdPrefix, kExprS128StoreMem, 0, 0,
       ])
diff --git a/deps/v8/test/mjsunit/wasm/exceptions.js b/deps/v8/test/mjsunit/wasm/exceptions.js
index 5d5fc5de733485..1b1f66f4107d3c 100644
--- a/deps/v8/test/mjsunit/wasm/exceptions.js
+++ b/deps/v8/test/mjsunit/wasm/exceptions.js
@@ -48,11 +48,11 @@ load("test/mjsunit/wasm/exceptions-utils.js");
 (function TestCatchEmptyBlocks() {
   print(arguments.callee.name);
   let builder = new WasmModuleBuilder();
+  let except = builder.addException(kSig_v_v);
   builder.addFunction("catch_empty_try", kSig_v_v)
       .addBody([
         kExprTry, kWasmStmt,
-        kExprCatch,
-          kExprDrop,
+        kExprCatch, except,
         kExprEnd,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -74,8 +74,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
             kExprThrow, except,
           kExprEnd,
           kExprI32Const, 42,
-        kExprCatch,
-          kExprDrop,
+        kExprCatch, except,
           kExprI32Const, 23,
         kExprEnd
       ]).exportFunc();
@@ -92,13 +91,20 @@ load("test/mjsunit/wasm/exceptions-utils.js");
       .addBody([
         kExprTry, kWasmStmt,
           kExprUnreachable,
-        kExprCatch,
-          kExprDrop,
+        kExprCatchAll,
+        kExprEnd
+      ]).exportFunc();
+  builder.addFunction('unreachable_in_try_unwind', kSig_v_v)
+      .addBody([
+        kExprTry, kWasmStmt,
+          kExprUnreachable,
+        kExprUnwind,
         kExprEnd
       ]).exportFunc();
   let instance = builder.instantiate();
 
   assertTraps(kTrapUnreachable, () => instance.exports.unreachable_in_try());
+  assertTraps(kTrapUnreachable, () => instance.exports.unreachable_in_try_unwind());
 })();
 
 (function TestTrapInCalleeNotCaught() {
@@ -115,8 +121,17 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprLocalGet, 0,
           kExprLocalGet, 1,
           kExprCallFunction, func_div.index,
-        kExprCatch,
-          kExprDrop,
+        kExprCatchAll,
+          kExprI32Const, 11,
+        kExprEnd
+      ]).exportFunc();
+  builder.addFunction('trap_in_callee_unwind', kSig_i_ii)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprLocalGet, 0,
+          kExprLocalGet, 1,
+          kExprCallFunction, func_div.index,
+        kExprUnwind,
           kExprI32Const, 11,
         kExprEnd
       ]).exportFunc();
@@ -124,6 +139,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
 
   assertEquals(3, instance.exports.trap_in_callee(7, 2));
   assertTraps(kTrapDivByZero, () => instance.exports.trap_in_callee(1, 0));
+  assertTraps(kTrapDivByZero, () => instance.exports.trap_in_callee_unwind(1, 0));
 })();
 
 (function TestTrapViaJSNotCaught() {
@@ -140,8 +156,15 @@ load("test/mjsunit/wasm/exceptions-utils.js");
       .addBody([
         kExprTry, kWasmI32,
           kExprCallFunction, imp,
-        kExprCatch,
-          kExprDrop,
+        kExprCatchAll,
+          kExprI32Const, 11,
+        kExprEnd
+      ]).exportFunc();
+  builder.addFunction('call_import_unwind', kSig_i_v)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprCallFunction, imp,
+        kExprUnwind,
           kExprI32Const, 11,
         kExprEnd
       ]).exportFunc();
@@ -156,6 +179,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
     throw exception;
   }
   instance = builder.instantiate({imp: {ort: js_import}});
+
   let caught = undefined;
   try {
     let res = instance.exports.call_import();
@@ -166,6 +190,18 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   assertSame(exception, caught);
   assertInstanceof(exception, WebAssembly.RuntimeError);
   assertEquals(exception.message, kTrapMsgs[kTrapDivByZero]);
+
+  // Same test with unwind instead of catch_all.
+  caught = undefined;
+  try {
+    let res = instance.exports.call_import_unwind();
+    assertUnreachable('call_import_unwind should trap, but returned with ' + res);
+  } catch (e) {
+    caught = e;
+  }
+  assertSame(exception, caught);
+  assertInstanceof(exception, WebAssembly.RuntimeError);
+  assertEquals(exception.message, kTrapMsgs[kTrapDivByZero]);
 })();
 
 (function TestManuallyThrownRuntimeErrorCaught() {
@@ -176,8 +212,15 @@ load("test/mjsunit/wasm/exceptions-utils.js");
       .addBody([
         kExprTry, kWasmI32,
           kExprCallFunction, imp,
-        kExprCatch,
-          kExprDrop,
+        kExprCatchAll,
+          kExprI32Const, 11,
+        kExprEnd
+      ]).exportFunc();
+  builder.addFunction('call_import_unwind', kSig_i_v)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprCallFunction, imp,
+        kExprUnwind,
           kExprI32Const, 11,
         kExprEnd
       ]).exportFunc();
@@ -187,6 +230,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   let instance = builder.instantiate({imp: {ort: throw_exc}});
 
   assertEquals(11, instance.exports.call_import());
+  assertThrows(instance.exports.call_import_unwind, WebAssembly.RuntimeError, "My user text");
 })();
 
 (function TestExnWithWasmProtoNotCaught() {
@@ -202,17 +246,13 @@ load("test/mjsunit/wasm/exceptions-utils.js");
         // Calling "throw" directly should produce the expected exception.
         kExprTry, kWasmStmt,
           kExprCallFunction, throw_fn.index,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd,
         // Calling through JS produces a wrapped exceptions which does not match
         // the br_on_exn.
         kExprTry, kWasmStmt,
           kExprCallFunction, imp,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd
       ]).exportFunc();
   let instance;
@@ -239,7 +279,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
 })();
 
 // Test that we can distinguish which exception was thrown by using a cascaded
-// sequence of nested try blocks with a single handler in each catch block.
+// sequence of nested try blocks with a single catch block each.
 (function TestCatchComplex1() {
   print(arguments.callee.name);
   let builder = new WasmModuleBuilder();
@@ -248,39 +288,29 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   let except3 = builder.addException(kSig_v_v);
   builder.addFunction("catch_complex", kSig_i_i)
       .addBody([
-        kExprBlock, kWasmStmt,
-          kExprBlock, kWasmStmt,
-            kExprTry, kWasmStmt,
-              kExprTry, kWasmStmt,
-                kExprLocalGet, 0,
-                kExprI32Eqz,
-                kExprIf, kWasmStmt,
-                  kExprThrow, except1,
-                kExprElse,
-                  kExprLocalGet, 0,
-                  kExprI32Const, 1,
-                  kExprI32Eq,
-                  kExprIf, kWasmStmt,
-                    kExprThrow, except2,
-                  kExprElse,
-                    kExprThrow, except3,
-                  kExprEnd,
-                kExprEnd,
-                kExprI32Const, 2,
-                kExprReturn,
-              kExprCatch,
-                kExprBrOnExn, 2, except1,
-                kExprRethrow,
+        kExprTry, kWasmI32,
+          kExprTry, kWasmI32,
+            kExprLocalGet, 0,
+            kExprI32Eqz,
+            kExprIf, kWasmStmt,
+              kExprThrow, except1,
+            kExprElse,
+              kExprLocalGet, 0,
+              kExprI32Const, 1,
+              kExprI32Eq,
+              kExprIf, kWasmStmt,
+                kExprThrow, except2,
+              kExprElse,
+                kExprThrow, except3,
               kExprEnd,
-            kExprCatch,
-              kExprBrOnExn, 2, except2,
-              kExprRethrow,
             kExprEnd,
+            kExprI32Const, 2,
+          kExprCatch, except1,
+            kExprI32Const, 3,
           kExprEnd,
-          kExprI32Const, 3,
-          kExprReturn,
+        kExprCatch, except2,
+          kExprI32Const, 4,
         kExprEnd,
-        kExprI32Const, 4,
       ]).exportFunc();
   let instance = builder.instantiate();
 
@@ -290,7 +320,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
 })();
 
 // Test that we can distinguish which exception was thrown by using a single
-// try block with multiple handlers in the associated catch block.
+// try block with multiple associated catch blocks in sequence.
 (function TestCatchComplex2() {
   print(arguments.callee.name);
   let builder = new WasmModuleBuilder();
@@ -299,35 +329,27 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   let except3 = builder.addException(kSig_v_v);
   builder.addFunction("catch_complex", kSig_i_i)
       .addBody([
-        kExprBlock, kWasmStmt,
-          kExprBlock, kWasmStmt,
-            kExprTry, kWasmStmt,
-              kExprLocalGet, 0,
-              kExprI32Eqz,
-              kExprIf, kWasmStmt,
-                kExprThrow, except1,
-              kExprElse,
-                kExprLocalGet, 0,
-                kExprI32Const, 1,
-                kExprI32Eq,
-                kExprIf, kWasmStmt,
-                  kExprThrow, except2,
-                kExprElse,
-                  kExprThrow, except3,
-                kExprEnd,
-              kExprEnd,
-              kExprI32Const, 2,
-              kExprReturn,
-            kExprCatch,
-              kExprBrOnExn, 1, except1,
-              kExprBrOnExn, 2, except2,
-              kExprRethrow,
+        kExprTry, kWasmI32,
+          kExprLocalGet, 0,
+          kExprI32Eqz,
+          kExprIf, kWasmStmt,
+            kExprThrow, except1,
+          kExprElse,
+            kExprLocalGet, 0,
+            kExprI32Const, 1,
+            kExprI32Eq,
+            kExprIf, kWasmStmt,
+              kExprThrow, except2,
+            kExprElse,
+              kExprThrow, except3,
             kExprEnd,
           kExprEnd,
+          kExprI32Const, 2,
+        kExprCatch, except1,
           kExprI32Const, 3,
-          kExprReturn,
+        kExprCatch, except2,
+          kExprI32Const, 4,
         kExprEnd,
-        kExprI32Const, 4,
       ]).exportFunc();
   let instance = builder.instantiate();
 
@@ -336,38 +358,6 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   assertWasmThrows(instance, except3, [], () => instance.exports.catch_complex(2));
 })();
 
-// Test that br-on-exn also is allowed to consume values already present on the
-// operand stack, instead of solely values being pushed by the branch itself.
-(function TestCatchBranchWithValueOnStack() {
-  print(arguments.callee.name);
-  let builder = new WasmModuleBuilder();
-  let except = builder.addException(kSig_v_v);
-  builder.addFunction("catch_complex", kSig_i_i)
-      .addLocals(kWasmExnRef, 1)
-      .addBody([
-        kExprBlock, kWasmI32,
-          kExprTry, kWasmStmt,
-            kExprLocalGet, 0,
-            kExprI32Eqz,
-            kExprIf, kWasmStmt,
-              kExprThrow, except,
-            kExprEnd,
-          kExprCatch,
-            kExprLocalSet, 1,
-            kExprI32Const, 23,
-            kExprLocalGet, 1,
-            kExprBrOnExn, 1, except,
-            kExprRethrow,
-          kExprEnd,
-          kExprI32Const, 42,
-        kExprEnd,
-      ]).exportFunc();
-  let instance = builder.instantiate();
-
-  assertEquals(23, instance.exports.catch_complex(0));
-  assertEquals(42, instance.exports.catch_complex(1));
-})();
-
 // Test throwing an exception with multiple values.
 (function TestThrowMultipleValues() {
   print(arguments.callee.name);
@@ -395,9 +385,8 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprLocalGet, 0,
           kExprThrow, except,
           kExprI32Const, 2,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
+          kExprReturn,
         kExprEnd,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -434,9 +423,8 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprLocalGet, 0,
           kExprThrow, except,
           kExprF32Const, 0, 0, 0, 0,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
+          kExprReturn,
         kExprEnd,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -467,22 +455,24 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   let builder = new WasmModuleBuilder();
   let except = builder.addException(kSig_v_l);
   builder.addFunction("throw_catch_param", kSig_i_i)
-      .addLocals(kWasmI64, 1)
       .addBody([
         kExprLocalGet, 0,
         kExprI64UConvertI32,
         kExprLocalSet, 1,
-        kExprTry, kWasmI64,
+        kExprTry, kWasmI32,
           kExprLocalGet, 1,
           kExprThrow, except,
-          kExprI64Const, 23,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+          kExprI32Const, 2,
+        kExprCatch, except,
+          kExprLocalGet, 1,
+          kExprI64Eq,
+          kExprIf, kWasmI32,
+            kExprI32Const, 1,
+          kExprElse,
+            kExprI32Const, 0,
+          kExprEnd,
         kExprEnd,
-        kExprLocalGet, 1,
-        kExprI64Eq,
-      ]).exportFunc();
+      ]).addLocals(kWasmI64, 1).exportFunc();
   let instance = builder.instantiate();
 
   assertEquals(1, instance.exports.throw_catch_param(5));
@@ -523,9 +513,8 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprLocalGet, 0,
           kExprThrow, except,
           kExprF64Const, 0, 0, 0, 0, 0, 0, 0, 0,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
+          kExprReturn,
         kExprEnd,
       ]).exportFunc();
   let instance = builder.instantiate();
@@ -640,9 +629,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprUnreachable,
         kExprEnd,
         kExprI32Const, 63,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
       kExprEnd
     ])
     .exportFunc();
@@ -653,15 +640,12 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprLocalGet, 0,
           kExprThrow, except,
           kExprUnreachable,
-        kExprCatch,
-          kExprBrOnExn, 0, except,
-          kExprRethrow,
+        kExprCatch, except,
         kExprEnd,
     ])
     .exportFunc();
 
   builder.addFunction("same_scope_multiple", kSig_i_i)
-    .addLocals(kWasmI32, 1).addLocals(kWasmExnRef, 1)
     // path = 0;
     //
     // try {
@@ -707,13 +691,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
                 kExprUnreachable,
               kExprEnd,
               kExprI32Const, 2,
-            kExprCatch,
-              kExprLocalSet, 2,
-              kExprBlock, kWasmI32,
-                kExprLocalGet, 2,
-                kExprBrOnExn, 0, except,
-                kExprRethrow,
-              kExprEnd,
+            kExprCatch, except,
               kExprI32Const, 4,
               kExprI32Ior,
               kExprThrow, except,
@@ -732,13 +710,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
             kExprEnd,
             kExprI32Const, 16,
             kExprI32Ior,
-          kExprCatch,
-            kExprLocalSet, 2,
-            kExprBlock, kWasmI32,
-              kExprLocalGet, 2,
-              kExprBrOnExn, 0, except,
-              kExprRethrow,
-            kExprEnd,
+          kExprCatch, except,
             kExprI32Const, 32,
             kExprI32Ior,
             kExprThrow, except,
@@ -757,17 +729,12 @@ load("test/mjsunit/wasm/exceptions-utils.js");
           kExprEnd,
           kExprI32Const, /*128=*/ 128, 1,
           kExprI32Ior,
-        kExprCatch,
-          kExprLocalSet, 2,
-          kExprBlock, kWasmI32,
-            kExprLocalGet, 2,
-            kExprBrOnExn, 0, except,
-            kExprRethrow,
-          kExprEnd,
+        kExprCatch, except,
           kExprI32Const, /*256=*/ 128, 2,
           kExprI32Ior,
         kExprEnd,
     ])
+    .addLocals(kWasmI32, 1)
     .exportFunc();
 
   // Scenario 2: Catches an exception raised from the direct callee.
@@ -777,9 +744,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
         kExprLocalGet, 0,
         kExprCallFunction, kWasmThrowFunction,
         kExprUnreachable,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
       kExprEnd,
     ])
     .exportFunc();
@@ -794,9 +759,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
         kExprLocalGet, 1,
         kExprCallIndirect, sig_v_i, kTableZero,
         kExprUnreachable,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
       kExprEnd
     ])
     .exportFunc();
@@ -809,11 +772,9 @@ load("test/mjsunit/wasm/exceptions-utils.js");
         kExprLocalGet, 0,
         kExprCallFunction, kJSThrowI,
         kExprUnreachable,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
+        kExprUnreachable,
       kExprEnd,
-      kExprUnreachable,
     ])
     .exportFunc();
 
@@ -821,11 +782,9 @@ load("test/mjsunit/wasm/exceptions-utils.js");
     .addBody([
       kExprTry, kWasmStmt,
         kExprCallFunction, kJSThrowString,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
+        kExprUnreachable,
       kExprEnd,
-      kExprUnreachable,
     ])
     .exportFunc();
 
@@ -833,11 +792,9 @@ load("test/mjsunit/wasm/exceptions-utils.js");
     .addBody([
       kExprTry, kWasmStmt,
         kExprCallFunction, kJSThrowFP,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
+        kExprUnreachable,
       kExprEnd,
-      kExprUnreachable,
     ])
     .exportFunc();
 
@@ -845,11 +802,9 @@ load("test/mjsunit/wasm/exceptions-utils.js");
     .addBody([
       kExprTry, kWasmStmt,
         kExprCallFunction, kJSThrowLarge,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
+        kExprUnreachable,
       kExprEnd,
-      kExprUnreachable,
     ])
     .exportFunc();
 
@@ -857,11 +812,9 @@ load("test/mjsunit/wasm/exceptions-utils.js");
     .addBody([
       kExprTry, kWasmStmt,
         kExprCallFunction, kJSThrowUndefined,
-      kExprCatch,
-        kExprBrOnExn, 0, except,
-        kExprRethrow,
+      kExprCatch, except,
+        kExprUnreachable,
       kExprEnd,
-      kExprUnreachable,
     ])
     .exportFunc();
 
@@ -899,3 +852,198 @@ load("test/mjsunit/wasm/exceptions-utils.js");
   assertThrowsEquals(instance.exports.large_from_js, 1e+28);
   assertThrowsEquals(instance.exports.undefined_from_js, undefined);
 })();
+
+// Delegate with a try block that never throws.
+(function TestDelegateNoThrow() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except1 = builder.addException(kSig_v_v);
+  builder.addFunction('test', kSig_i_v)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprTry, kWasmI32,
+            kExprI32Const, 1,
+          kExprDelegate, 0,
+        kExprCatch, except1,
+          kExprI32Const, 2,
+        kExprEnd,
+      ]).exportFunc();
+  instance = builder.instantiate();
+  assertEquals(1, instance.exports.test());
+})();
+
+// Delegate exception handling to outer try/catch block.
+(function TestDelegateThrow() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except = builder.addException(kSig_v_v);
+  let throw_if = builder.addFunction('throw', kSig_v_i)
+      .addBody([
+          kExprLocalGet, 0,
+          kExprIf, kWasmStmt,
+            kExprThrow, except,
+          kExprEnd]).exportFunc();
+  builder.addFunction('test', kSig_i_i)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprTry, kWasmI32,
+            kExprLocalGet, 0,
+            kExprCallFunction, throw_if.index,
+            kExprI32Const, 1,
+          kExprDelegate, 0,
+        kExprCatch, except,
+          kExprI32Const, 2,
+        kExprEnd,
+      ]).exportFunc();
+  instance = builder.instantiate();
+  assertEquals(1, instance.exports.test(0));
+  assertEquals(2, instance.exports.test(1));
+})();
+
+// No catch block matching the exception in the delegate target.
+(function TestDelegateThrowNoCatch() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except1 = builder.addException(kSig_v_v);
+  let except2 = builder.addException(kSig_v_v);
+  let throw_fn = builder.addFunction('throw', kSig_v_v)
+                     .addBody([kExprThrow, except1])
+                     .exportFunc();
+  let throw_fn_2 = builder.addFunction('throw_2', kSig_v_v)
+                     .addBody([kExprThrow, except2])
+                     .exportFunc();
+  builder.addFunction('test', kSig_i_v)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprTry, kWasmI32,
+            kExprCallFunction, throw_fn.index,
+            kExprI32Const, 1,
+          kExprDelegate, 0,
+        kExprCatch, except2,
+          kExprI32Const, 2,
+        kExprEnd,
+      ]).exportFunc();
+  instance = builder.instantiate();
+  assertTraps(WebAssembly.RuntimeError, instance.exports.test);
+})();
+
+// Check that the exception is merged properly when both scopes can throw.
+(function TestDelegateMerge() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except1 = builder.addException(kSig_v_v);
+  let except2 = builder.addException(kSig_v_v);
+  // throw_fn: 0 -> returns
+  //           1 -> throw except1
+  //           2 -> throw except2
+  let throw_fn = builder.addFunction('throw', kSig_v_i)
+      .addBody([
+          kExprBlock, kWasmStmt,
+            kExprBlock, kWasmStmt,
+              kExprBlock, kWasmStmt,
+                kExprLocalGet, 0,
+                kExprBrTable, 2, 0, 1, 2,
+              kExprEnd,
+              kExprReturn,
+            kExprEnd,
+            kExprThrow, except1,
+          kExprEnd,
+          kExprThrow, except2])
+      .exportFunc();
+  builder.addFunction('test', kSig_i_ii)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprLocalGet, 0,
+          kExprCallFunction, throw_fn.index,
+          kExprTry, kWasmI32,
+            kExprLocalGet, 1,
+            kExprCallFunction, throw_fn.index,
+            kExprI32Const, 1,
+          kExprDelegate, 0,
+        kExprCatch, except1,
+          kExprI32Const, 2,
+        kExprEnd,
+      ]).exportFunc();
+  instance = builder.instantiate();
+  assertEquals(2, instance.exports.test(1, 0));
+  assertTraps(WebAssembly.RuntimeError, () => instance.exports.test(2, 0));
+  assertEquals(2, instance.exports.test(0, 1));
+  assertTraps(WebAssembly.RuntimeError, () => instance.exports.test(0, 2));
+  assertEquals(1, instance.exports.test(0, 0));
+})();
+
+// Delegate to second enclosing try scope.
+(function TestDelegate1() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except = builder.addException(kSig_v_v);
+  let throw_fn = builder.addFunction('throw', kSig_v_v)
+                     .addBody([kExprThrow, except])
+                     .exportFunc();
+  builder.addFunction('test', kSig_i_v)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprTry, kWasmI32,
+            kExprTry, kWasmI32,
+              kExprCallFunction, throw_fn.index,
+              kExprI32Const, 1,
+            kExprDelegate, 1,
+          kExprCatch, except,
+            kExprI32Const, 2,
+          kExprEnd,
+        kExprCatch, except,
+          kExprI32Const, 3,
+        kExprEnd,
+      ]).exportFunc();
+  instance = builder.instantiate();
+  assertEquals(3, instance.exports.test());
+})();
+
+(function TestDelegateUnreachable() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except1 = builder.addException(kSig_v_v);
+  let except2 = builder.addException(kSig_v_v);
+  builder.addFunction('test', kSig_i_v)
+      .addBody([
+        kExprTry, kWasmI32,
+          kExprTry, kWasmStmt,
+            kExprThrow, except1,
+          kExprDelegate, 0,
+          kExprI32Const, 1,
+        kExprCatch, except1,
+          kExprI32Const, 2,
+        kExprCatch, except2,
+          kExprI32Const, 3,
+        kExprEnd,
+      ]).exportFunc();
+  instance = builder.instantiate();
+  assertEquals(2, instance.exports.test());
+})();
+
+(function TestDelegateToCaller() {
+  print(arguments.callee.name);
+  let builder = new WasmModuleBuilder();
+  let except = builder.addException(kSig_v_v);
+  builder.addFunction('test', kSig_v_v)
+      .addBody([
+        kExprTry, kWasmStmt,
+          kExprTry, kWasmStmt,
+            kExprThrow, except,
+          kExprDelegate, 1,
+        kExprCatchAll,
+        kExprEnd
+      ]).exportFunc();
+  builder.addFunction('test_unwind', kSig_v_v)
+      .addBody([
+        kExprTry, kWasmStmt,
+          kExprTry, kWasmStmt,
+            kExprThrow, except,
+          kExprDelegate, 1,
+        kExprUnwind,
+        kExprEnd
+      ]).exportFunc();
+  instance = builder.instantiate();
+  assertTraps(WebAssembly.RuntimeError, () => instance.exports.test());
+  assertTraps(WebAssembly.RuntimeError, () => instance.exports.test_unwind());
+})();
diff --git a/deps/v8/test/mjsunit/wasm/externref-liftoff.js b/deps/v8/test/mjsunit/wasm/externref-liftoff.js
index dbfff539a01630..14be66cd974424 100644
--- a/deps/v8/test/mjsunit/wasm/externref-liftoff.js
+++ b/deps/v8/test/mjsunit/wasm/externref-liftoff.js
@@ -4,5 +4,6 @@
 
 // Flags: --expose-wasm --experimental-wasm-reftypes --expose-gc --liftoff
 // Flags: --no-wasm-tier-up --experimental-liftoff-extern-ref
+// Flags: --allow-natives-syntax
 
 load("test/mjsunit/wasm/externref.js");
diff --git a/deps/v8/test/mjsunit/wasm/externref.js b/deps/v8/test/mjsunit/wasm/externref.js
index cf4c8a41e7d877..741f95955b2324 100644
--- a/deps/v8/test/mjsunit/wasm/externref.js
+++ b/deps/v8/test/mjsunit/wasm/externref.js
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 // Flags: --expose-wasm --experimental-wasm-reftypes --expose-gc
+// Flags: --allow-natives-syntax
 
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
@@ -13,7 +14,6 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
       .addBody([kExprLocalGet, 0])
       .exportFunc();
 
-
   const instance = builder.instantiate();
 
   let obj = {'hello' : 'world'};
@@ -240,3 +240,48 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
   const main = builder.instantiate().exports.main;
   assertEquals(null, main());
 })();
+
+(function testGCInStackCheck() {
+  print(arguments.callee.name);
+  const builder = new WasmModuleBuilder();
+
+  const gc_sig = builder.addType(kSig_v_v);
+  const mysig = makeSig(
+      [
+        kWasmExternRef, kWasmI32, kWasmExternRef, kWasmExternRef, kWasmExternRef
+      ],
+      []);
+  const func_sig = builder.addType(mysig);
+  const triggerGC_index = builder.addImport('q', 'triggerGC', gc_sig);
+  const func_index = builder.addImport('q', 'func', func_sig);
+
+  const foo = builder.addFunction('foo', func_sig).addBody([
+    kExprLocalGet, 0, // --
+    kExprLocalGet, 1, // --
+    kExprLocalGet, 2, // --
+    kExprLocalGet, 3, // --
+    kExprLocalGet, 4, // --
+    kExprCallFunction, func_index
+  ]);
+
+  builder.addFunction('main', func_sig)
+      .addBody([
+        kExprCallFunction, triggerGC_index,  // --
+        kExprLocalGet, 0,                    // --
+        kExprLocalGet, 1,                    // --
+        kExprLocalGet, 2,                    // --
+        kExprLocalGet, 3,                    // --
+        kExprLocalGet, 4,                    // --
+        kExprCallFunction, foo.index
+      ])
+      .exportFunc();
+
+  const instance = builder.instantiate({
+    q: {
+      triggerGC: () => %ScheduleGCInStackCheck(),
+      func: (ref) => assertEquals(ref.hello, 4)
+    }
+  });
+
+  instance.exports.main({hello: 4}, 5, {world: 6}, null, {bar: 7});
+})();
diff --git a/deps/v8/test/mjsunit/wasm/generic-wrapper.js b/deps/v8/test/mjsunit/wasm/generic-wrapper.js
index 16e5668eb3beba..3e44ffb50e7f86 100644
--- a/deps/v8/test/mjsunit/wasm/generic-wrapper.js
+++ b/deps/v8/test/mjsunit/wasm/generic-wrapper.js
@@ -762,3 +762,28 @@ let kSig_f_iiliiiffddlifffdi = makeSig([kWasmI32, kWasmI32, kWasmI64, kWasmI32,
   let instance = builder.instantiate();
   assertEquals(15, instance.exports.f1());
 })();
+
+(function testDeoptWithIncorrectNumberOfParams() {
+  print(arguments.callee.name);
+  const builder = new WasmModuleBuilder();
+  let sig_index = builder.addType(kSig_v_ii);
+  let imp = builder.addImport('q', 'func', sig_index);
+  builder.addFunction('main', sig_index)
+      .addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprCallFunction, imp])
+      .exportAs('main');
+
+  function deopt() {
+    %DeoptimizeFunction(caller);
+  }
+
+  let main = builder.instantiate({q: {func: deopt}}).exports.main;
+  function caller() {
+    main(1, 2, 3, 4, 5);
+    main(1, 2, 3, 4);
+    main(1, 2, 3);
+    main(1, 2);
+    main(1);
+    main();
+  }
+  caller();
+})();
diff --git a/deps/v8/test/mjsunit/wasm/single-threaded-compilation.js b/deps/v8/test/mjsunit/wasm/single-threaded-compilation.js
new file mode 100644
index 00000000000000..fa98768792ecd3
--- /dev/null
+++ b/deps/v8/test/mjsunit/wasm/single-threaded-compilation.js
@@ -0,0 +1,27 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --wasm-num-compilation-tasks=0
+
+load('test/mjsunit/wasm/wasm-module-builder.js');
+
+(function testSyncCompilation() {
+  print(arguments.callee.name);
+  const builder = new WasmModuleBuilder();
+  builder.addFunction("main", kSig_d_d)
+      .addBody([kExprLocalGet, 0])
+      .exportFunc();
+
+  const instance = builder.instantiate();
+})();
+
+(function testAsyncCompilation() {
+  print(arguments.callee.name);
+  const builder = new WasmModuleBuilder();
+  builder.addFunction("main", kSig_i_i)
+      .addBody([kExprLocalGet, 0])
+      .exportFunc();
+
+  const instance = builder.asyncInstantiate();
+})();
diff --git a/deps/v8/test/mjsunit/wasm/table-access-liftoff.js b/deps/v8/test/mjsunit/wasm/table-access-liftoff.js
new file mode 100644
index 00000000000000..6c3561bdde0f0d
--- /dev/null
+++ b/deps/v8/test/mjsunit/wasm/table-access-liftoff.js
@@ -0,0 +1,8 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --experimental-wasm-reftypes --liftoff
+// Flags: --no-wasm-tier-up --liftoff-extern-ref
+
+load("test/mjsunit/wasm/table-access.js");
diff --git a/deps/v8/test/mjsunit/wasm/wasm-module-builder.js b/deps/v8/test/mjsunit/wasm/wasm-module-builder.js
index 79e70ff7926874..7b9500eb70c74f 100644
--- a/deps/v8/test/mjsunit/wasm/wasm-module-builder.js
+++ b/deps/v8/test/mjsunit/wasm/wasm-module-builder.js
@@ -73,7 +73,8 @@ let kFunctionNamesCode = 1;
 let kLocalNamesCode = 2;
 
 let kWasmFunctionTypeForm = 0x60;
-let kWasmAnyFunctionTypeForm = 0x70;
+let kWasmStructTypeForm = 0x5f;
+let kWasmArrayTypeForm = 0x5e;
 
 let kLimitsNoMaximum = 0
 let kLimitsHasMaximum = 1;
@@ -94,21 +95,28 @@ let kDeclFunctionImport = 0x02;
 let kDeclFunctionLocals = 0x04;
 let kDeclFunctionExport = 0x08;
 
-// Local types
+// Value types and related
 let kWasmStmt = 0x40;
 let kWasmI32 = 0x7f;
 let kWasmI64 = 0x7e;
 let kWasmF32 = 0x7d;
 let kWasmF64 = 0x7c;
 let kWasmS128 = 0x7b;
+let kWasmI8 = 0x7a;
+let kWasmI16 = 0x79;
 let kWasmFuncRef = 0x70;
 let kWasmAnyFunc = kWasmFuncRef; // Alias named as in the JS API spec
 let kWasmExternRef = 0x6f;
-function wasmOptRefType(index) { return {opcode: 0x6c, index: index}; }
-function wasmRefType(index) { return {opcode: 0x6b, index: index}; }
+let kWasmAnyRef = 0x6e;
+let kWasmEqRef = 0x6d;
+let kWasmOptRef = 0x6c;
+let kWasmRef = 0x6b;
+function wasmOptRefType(index) { return {opcode: kWasmOptRef, index: index}; }
+function wasmRefType(index) { return {opcode: kWasmRef, index: index}; }
 let kWasmI31Ref = 0x6a;
+let kWasmRtt = 0x69;
 function wasmRtt(index, depth) {
-  return {opcode: 0x69, index: index, depth: depth};
+  return {opcode: kWasmRtt, index: index, depth: depth};
 }
 let kWasmExnRef = 0x68;
 
@@ -210,7 +218,8 @@ const kWasmOpcodes = {
   'Catch': 0x07,
   'Throw': 0x08,
   'Rethrow': 0x09,
-  'BrOnExn': 0x0a,
+  'CatchAll': 0x19,
+  'Unwind': 0x0a,
   'End': 0x0b,
   'Br': 0x0c,
   'BrIf': 0x0d,
@@ -222,6 +231,8 @@ const kWasmOpcodes = {
   'ReturnCallIndirect': 0x13,
   'CallRef': 0x14,
   'ReturnCallRef': 0x15,
+  'Let': 0x17,
+  'Delegate': 0x18,
   'Drop': 0x1a,
   'Select': 0x1b,
   'SelectWithType': 0x1c,
@@ -421,9 +432,27 @@ for (let prefix in kPrefixOpcodes) {
 }
 
 // GC opcodes
+let kExprStructNewWithRtt = 0x01;
+let kExprStructNewDefault = 0x02;
+let kExprStructGet = 0x03;
+let kExprStructGetS = 0x04;
+let kExprStructGetU = 0x05;
+let kExprStructSet = 0x06;
+let kExprArrayNewWithRtt = 0x11;
+let kExprArrayNewDefault = 0x12;
+let kExprArrayGet = 0x13;
+let kExprArrayGetS = 0x14;
+let kExprArrayGetU = 0x15;
+let kExprArraySet = 0x16;
+let kExprArrayLen = 0x17;
+let kExprI31New = 0x20;
+let kExprI31GetS = 0x21;
+let kExprI31GetU = 0x22;
 let kExprRttCanon = 0x30;
+let kExprRttSub = 0x31;
+let kExprRefTest = 0x40;
 let kExprRefCast = 0x41;
-let kExprI31New = 0x20;
+let kExprBrOnCast = 0x42;
 
 // Numeric opcodes.
 let kExprI32SConvertSatF32 = 0x00;
@@ -545,6 +574,7 @@ let kExprI32x4ExtractLane = 0x1b;
 let kExprI32x4ReplaceLane = 0x1c;
 let kExprI64x2ReplaceLane = 0x1e;
 let kExprF32x4ReplaceLane = 0x20;
+let kExprF64x2ExtractLane = 0x21;
 let kExprF64x2ReplaceLane = 0x22;
 let kExprI8x16Eq = 0x23;
 let kExprI8x16Ne = 0x24;
@@ -664,6 +694,7 @@ let kExprI64x2ShrU = 0xcd;
 let kExprI64x2Add = 0xce;
 let kExprI64x2Sub = 0xd1;
 let kExprI64x2Mul = 0xd5;
+let kExprI64x2ExtMulHighI32x4U = 0xd7;
 let kExprF32x4Abs = 0xe0;
 let kExprF32x4Neg = 0xe1;
 let kExprF32x4Sqrt = 0xe3;
@@ -707,8 +738,7 @@ let kTrapFuncSigMismatch      = 7;
 let kTrapUnalignedAccess      = 8;
 let kTrapDataSegmentDropped   = 9;
 let kTrapElemSegmentDropped   = 10;
-let kTrapBrOnExnNull          = 11;
-let kTrapRethrowNull          = 12;
+let kTrapRethrowNull          = 11;
 
 let kTrapMsgs = [
   "unreachable",
@@ -722,7 +752,6 @@ let kTrapMsgs = [
   "operation does not support unaligned accesses",
   "data segment has been dropped",
   "element segment has been dropped",
-  "br_on_exn on null value",
   "rethrowing null value"
 ];
 
@@ -951,6 +980,25 @@ class WasmTableBuilder {
   }
 }
 
+function makeField(type, mutability) {
+  assertEquals("boolean", typeof mutability,
+               "field mutability must be boolean");
+  return {type: type, mutability: mutability};
+}
+
+class WasmStruct {
+  constructor(fields) {
+    assertTrue(Array.isArray(fields), "struct fields must be an array");
+    this.fields = fields;
+  }
+}
+
+class WasmArray {
+  constructor(type) {
+    this.type = type;
+  }
+}
+
 class WasmModuleBuilder {
   constructor() {
     this.types = [];
@@ -1016,6 +1064,16 @@ class WasmModuleBuilder {
     return this.types.length - 1;
   }
 
+  addStruct(fields) {
+    this.types.push(new WasmStruct(fields));
+    return this.types.length - 1;
+  }
+
+  addArray(type) {
+    this.types.push(new WasmArray(type));
+    return this.types.length - 1;
+  }
+
   addGlobal(type, mutable) {
     let glob = new WasmGlobalBuilder(this, type, mutable);
     glob.index = this.globals.length + this.num_imported_globals;
@@ -1085,7 +1143,7 @@ class WasmModuleBuilder {
       throw new Error('Imported tables must be declared before local ones');
     }
     let o = {module: module, name: name, kind: kExternalTable, initial: initial,
-             maximum: maximum, type: type || kWasmAnyFunctionTypeForm};
+             maximum: maximum, type: type || kWasmFuncRef};
     this.imports.push(o);
     return this.num_imported_tables++;
   }
@@ -1209,14 +1267,27 @@ class WasmModuleBuilder {
       binary.emit_section(kTypeSectionCode, section => {
         section.emit_u32v(wasm.types.length);
         for (let type of wasm.types) {
-          section.emit_u8(kWasmFunctionTypeForm);
-          section.emit_u32v(type.params.length);
-          for (let param of type.params) {
-            section.emit_type(param);
-          }
-          section.emit_u32v(type.results.length);
-          for (let result of type.results) {
-            section.emit_type(result);
+          if (type instanceof WasmStruct) {
+            section.emit_u8(kWasmStructTypeForm);
+            section.emit_u32v(type.fields.length);
+            for (let field of type.fields) {
+              section.emit_type(field.type);
+              section.emit_u8(field.mutability ? 1 : 0);
+            }
+          } else if (type instanceof WasmArray) {
+            section.emit_u8(kWasmArrayTypeForm);
+            section.emit_type(type.type);
+            section.emit_u8(1); // Only mutable arrays supported currently.
+          } else {
+            section.emit_u8(kWasmFunctionTypeForm);
+            section.emit_u32v(type.params.length);
+            for (let param of type.params) {
+              section.emit_type(param);
+            }
+            section.emit_u32v(type.results.length);
+            for (let result of type.results) {
+              section.emit_type(result);
+            }
           }
         }
       });
diff --git a/deps/v8/test/mkgrokdump/BUILD.gn b/deps/v8/test/mkgrokdump/BUILD.gn
index eae9f265786321..67f8f98e7aaa8e 100644
--- a/deps/v8/test/mkgrokdump/BUILD.gn
+++ b/deps/v8/test/mkgrokdump/BUILD.gn
@@ -9,9 +9,7 @@ v8_executable("mkgrokdump") {
 
   # mkgrokdump is used to create tools/v8heapconst.py.
 
-  sources = [
-    "mkgrokdump.cc",
-  ]
+  sources = [ "mkgrokdump.cc" ]
 
   configs = [ "../..:internal_config_base" ]
 
@@ -21,12 +19,11 @@ v8_executable("mkgrokdump") {
     "../..:v8",
     "../..:v8_libbase",
     "../..:v8_libplatform",
+    "../..:v8_wrappers",
     "//build/win:default_exe_manifest",
   ]
 
-  data_deps = [
-    "../../tools:v8_testrunner",
-  ]
+  data_deps = [ "../../tools:v8_testrunner" ]
 
   data = [
     "mkgrokdump.status",
diff --git a/deps/v8/test/test262/test262.status b/deps/v8/test/test262/test262.status
index 3016baf87f1533..d5a49570ecef80 100644
--- a/deps/v8/test/test262/test262.status
+++ b/deps/v8/test/test262/test262.status
@@ -79,17 +79,12 @@
   # https://bugs.chromium.org/p/v8/issues/detail?id=4895
   'built-ins/TypedArrayConstructors/internals/DefineOwnProperty/tonumber-value-detached-buffer': [FAIL],
   'built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/key-is-numericindex-desc-configurable': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/DefineOwnProperty/key-is-numericindex': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/DefineOwnProperty/key-is-numericindex-desc-configurable': [FAIL],
   'built-ins/TypedArrayConstructors/internals/GetOwnProperty/BigInt/index-prop-desc': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/GetOwnProperty/index-prop-desc': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/Set/tonumber-value-detached-buffer': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/Set/BigInt/tonumber-value-detached-buffer': [FAIL],
   # Some TypedArray methods throw due to the same bug, from Get
   'built-ins/TypedArray/prototype/every/callbackfn-detachbuffer': [FAIL],
   'built-ins/TypedArray/prototype/every/BigInt/callbackfn-detachbuffer': [FAIL],
+  'built-ins/TypedArray/prototype/filter/callbackfn-detachbuffer': [FAIL],
+  'built-ins/TypedArray/prototype/filter/BigInt/callbackfn-detachbuffer': [FAIL],
   'built-ins/TypedArray/prototype/find/predicate-may-detach-buffer': [FAIL],
   'built-ins/TypedArray/prototype/find/BigInt/predicate-may-detach-buffer': [FAIL],
   'built-ins/TypedArray/prototype/findIndex/predicate-may-detach-buffer': [FAIL],
@@ -120,8 +115,8 @@
   'built-ins/TypedArray/prototype/fill/coerced-value-detach': [FAIL],
   'built-ins/TypedArray/prototype/fill/coerced-end-detach': [FAIL],
   'built-ins/TypedArray/prototype/fill/coerced-start-detach': [FAIL],
-  # includes should also throw on detached buffers
-  'built-ins/TypedArray/prototype/includes/detached-buffer-tointeger': [FAIL],
+  'built-ins/TypedArray/prototype/includes/detached-buffer-during-fromIndex-returns-true-for-undefined': [FAIL],
+  'built-ins/TypedArray/prototype/includes/BigInt/detached-buffer-during-fromIndex-returns-true-for-undefined': [FAIL],
 
   # https://bugs.chromium.org/p/v8/issues/detail?id=4951
   'language/expressions/assignment/destructuring/iterator-destructuring-property-reference-target-evaluation-order': [FAIL],
@@ -493,14 +488,6 @@
   'language/statements/try/tco-finally': [SKIP],
   'language/statements/while/tco-body': [SKIP],
 
-  # https://bugs.chromium.org/p/v8/issues/detail?id=5327
-  'built-ins/TypedArrayConstructors/internals/Set/key-is-minus-zero': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/Set/BigInt/key-is-minus-zero': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/Set/key-is-not-integer': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/Set/BigInt/key-is-not-integer': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/Set/key-is-out-of-bounds': [FAIL],
-  'built-ins/TypedArrayConstructors/internals/Set/BigInt/key-is-out-of-bounds': [FAIL],
-
   # https://bugs.chromium.org/p/v8/issues/detail?id=6049
   'built-ins/Object/internals/DefineOwnProperty/consistent-value-function-caller': [FAIL_SLOPPY],
   'built-ins/Object/internals/DefineOwnProperty/consistent-value-function-arguments': [FAIL_SLOPPY],
@@ -544,29 +531,8 @@
   # https://bugs.chromium.org/p/v8/issues/detail?id=9049
   'language/comments/hashbang/use-strict': [SKIP],
 
-  # https://bugs.chromium.org/p/v8/issues/detail?id=9613
-  'intl402/Intl/getCanonicalLocales/canonicalized-tags': [FAIL],
-  'intl402/Intl/getCanonicalLocales/grandfathered': [FAIL],
-  'intl402/Intl/getCanonicalLocales/preferred-grandfathered': [FAIL],
-  'intl402/Intl/getCanonicalLocales/preferred-variant': [FAIL],
-  'intl402/Locale/constructor-apply-options-canonicalizes-twice': [FAIL],
-  'intl402/Locale/likely-subtags-grandfathered': [FAIL],
-
   # http://crbug/v8/10447
-  'intl402/Intl/getCanonicalLocales/complex-language-subtag-replacement': [FAIL],
-  'intl402/Intl/getCanonicalLocales/complex-region-subtag-replacement': [FAIL],
-  'intl402/Intl/getCanonicalLocales/transformed-ext-canonical': [FAIL],
-  'intl402/Intl/getCanonicalLocales/transformed-ext-invalid': [FAIL],
-  'intl402/Intl/getCanonicalLocales/unicode-ext-canonicalize-region': [FAIL],
-  'intl402/Intl/getCanonicalLocales/unicode-ext-canonicalize-subdivision': [FAIL],
   'intl402/Intl/getCanonicalLocales/unicode-ext-canonicalize-yes-to-true': [FAIL],
-  'intl402/Intl/getCanonicalLocales/unicode-ext-key-with-digit': [FAIL],
-
-  # https://bugs.chromium.org/p/v8/issues/detail?id=9742
-  'intl402/Locale/getters': [FAIL],
-
-  # https://github.com/tc39/test262/pull/2349
-  'intl402/Locale/constructor-options-region-valid': [FAIL],
 
   # https://bugs.chromium.org/p/v8/issues/detail?id=9818
   'built-ins/AsyncFunction/proto-from-ctor-realm': [FAIL],
@@ -610,43 +576,10 @@
   # http://crbug/v8/10905
   'language/identifier-resolution/assign-to-global-undefined': [FAIL],
 
-  # http://crbug/v8/10961
-  'built-ins/Array/prototype/item/index-argument-tointeger': [FAIL],
-  'built-ins/Array/prototype/item/index-non-numeric-argument-tointeger': [FAIL],
-  'built-ins/Array/prototype/item/index-non-numeric-argument-tointeger-invalid': [FAIL],
-  'built-ins/Array/prototype/item/length': [FAIL],
-  'built-ins/Array/prototype/item/name': [FAIL],
-  'built-ins/Array/prototype/item/prop-desc': [FAIL],
-  'built-ins/Array/prototype/item/return-abrupt-from-this': [FAIL],
-  'built-ins/Array/prototype/item/returns-item': [FAIL],
-  'built-ins/Array/prototype/item/returns-item-relative-index': [FAIL],
-  'built-ins/Array/prototype/item/returns-undefined-for-holes-in-sparse-arrays': [FAIL],
-  'built-ins/Array/prototype/item/returns-undefined-for-out-of-range-index': [FAIL],
-  'built-ins/String/prototype/item/index-argument-tointeger': [FAIL],
-  'built-ins/String/prototype/item/index-non-numeric-argument-tointeger': [FAIL],
-  'built-ins/String/prototype/item/index-non-numeric-argument-tointeger-invalid': [FAIL],
-  'built-ins/String/prototype/item/length': [FAIL],
-  'built-ins/String/prototype/item/name': [FAIL],
-  'built-ins/String/prototype/item/prop-desc': [FAIL],
-  'built-ins/String/prototype/item/return-abrupt-from-this': [FAIL],
-  'built-ins/String/prototype/item/returns-code-unit': [FAIL],
-  'built-ins/String/prototype/item/returns-item': [FAIL],
-  'built-ins/String/prototype/item/returns-item-relative-index': [FAIL],
-  'built-ins/String/prototype/item/returns-undefined-for-out-of-range-index': [FAIL],
-  'built-ins/TypedArray/prototype/item/index-argument-tointeger': [FAIL],
-  'built-ins/TypedArray/prototype/item/index-non-numeric-argument-tointeger': [FAIL],
-  'built-ins/TypedArray/prototype/item/index-non-numeric-argument-tointeger-invalid': [FAIL],
-  'built-ins/TypedArray/prototype/item/length': [FAIL],
-  'built-ins/TypedArray/prototype/item/name': [FAIL],
-  'built-ins/TypedArray/prototype/item/prop-desc': [FAIL],
-  'built-ins/TypedArray/prototype/item/return-abrupt-from-this': [FAIL],
-  'built-ins/TypedArray/prototype/item/returns-item': [FAIL],
-  'built-ins/TypedArray/prototype/item/returns-item-relative-index': [FAIL],
-  'built-ins/TypedArray/prototype/item/returns-undefined-for-holes-in-sparse-arrays': [FAIL],
-  'built-ins/TypedArray/prototype/item/returns-undefined-for-out-of-range-index': [FAIL],
-
-  # http://crbug/v8/11039
-  'intl402/Locale/reject-duplicate-variants-in-tlang': [FAIL],
+  # https://bugs.chromium.org/p/chromium/issues/detail?id=1159764
+  'built-ins/Array/prototype/at/*': [FAIL],
+  'built-ins/String/prototype/at/*': [FAIL],
+  'built-ins/TypedArray/prototype/at/*': [FAIL],
 
   ######################## NEEDS INVESTIGATION ###########################
 
diff --git a/deps/v8/test/test262/testcfg.py b/deps/v8/test/test262/testcfg.py
index 34cf4bab30eeb7..24e02607d6264d 100644
--- a/deps/v8/test/test262/testcfg.py
+++ b/deps/v8/test/test262/testcfg.py
@@ -44,9 +44,7 @@
 
 # TODO(littledan): move the flag mapping into the status file
 FEATURE_FLAGS = {
-  'Intl.Segmenter': '--harmony-intl-segmenter',
   'Intl.DateTimeFormat-dayPeriod': '--harmony-intl-dateformat-day-period',
-  'Intl.DateTimeFormat-quarter': '--harmony-intl-dateformat-quarter',
   'String.prototype.replaceAll': '--harmony_string_replaceall',
   'Symbol.prototype.description': '--harmony-symbol-description',
   'FinalizationRegistry': '--harmony-weak-refs-with-cleanup-some',
@@ -57,11 +55,7 @@
   'regexp-match-indices': '--harmony-regexp-match-indices',
   # https://github.com/tc39/test262/pull/2395
   'regexp-named-groups': '--harmony-regexp-match-indices',
-  'class-methods-private': '--harmony-private-methods',
-  'class-static-methods-private': '--harmony-private-methods',
-  'AggregateError': '--harmony-promise-any',
   'logical-assignment-operators': '--harmony-logical-assignment',
-  'Promise.any': '--harmony-promise-any',
   'Atomics.waitAsync': '--harmony-atomics-waitasync',
 }
 
diff --git a/deps/v8/test/torque/test-torque.tq b/deps/v8/test/torque/test-torque.tq
index 8eabf82aa7292d..f5431fbc9d717c 100644
--- a/deps/v8/test/torque/test-torque.tq
+++ b/deps/v8/test/torque/test-torque.tq
@@ -860,7 +860,7 @@ macro TestSlices() {
   const firstRef:&Object = &a.objects[0];
   check(TaggedEqual(*firstRef, oneTwoThree));
 
-  const slice: torque_internal::Slice<Object> = &a.objects;
+  const slice: MutableSlice<Object> = &a.objects;
   const firstRefAgain:&Object = slice.TryAtIndex(0) otherwise unreachable;
   check(TaggedEqual(*firstRefAgain, oneTwoThree));
 
@@ -873,7 +873,7 @@ macro TestSlices() {
   // a.objects = slice;  // error, not allowed
 
   // TODO(gsps): Currently errors, but should be allowed:
-  // const _sameSlice: torque_internal::Slice<Object> = &(*slice);
+  // const _sameSlice: MutableSlice<Object> = &(*slice);
   // (*slice)[0] : Smi
 }
 
@@ -1340,4 +1340,17 @@ macro TestWord8Phi() {
     check(x == Convert<int8>(i));
   }
 }
+
+@export
+macro TestOffHeapSlice(ptr: RawPtr<char8>, length: intptr) {
+  const string = UnsafeCast<SeqOneByteString>(Convert<String>('Hello World!'));
+
+  check(*torque_internal::unsafe::NewOffHeapReference(ptr) == string.chars[0]);
+
+  let offHeapSlice = torque_internal::unsafe::NewOffHeapConstSlice(ptr, length);
+  let onHeapSlice = &string.chars;
+  for (let i: intptr = 0; i < onHeapSlice.length; ++i) {
+    check(*onHeapSlice.AtIndex(i) == *offHeapSlice.AtIndex(i));
+  }
+}
 }
diff --git a/deps/v8/test/unittests/BUILD.gn b/deps/v8/test/unittests/BUILD.gn
index 290661ce5b57b5..d98c5b82c13749 100644
--- a/deps/v8/test/unittests/BUILD.gn
+++ b/deps/v8/test/unittests/BUILD.gn
@@ -57,23 +57,25 @@ v8_source_set("v8_cppgc_shared_unittests_sources") {
 # Stand-alone target for C++ GC unittests. This is used to ensure that it
 # builds without V8 as well. They are also included in the regular unittests
 # target for simplicity.
-v8_executable("cppgc_unittests") {
-  testonly = true
+if (cppgc_is_standalone) {
+  v8_executable("cppgc_unittests") {
+    testonly = true
 
-  configs = [
-    "../..:external_config",
-    "../..:internal_config_base",
-  ]
+    configs = [
+      "../..:external_config",
+      "../..:internal_config_base",
+    ]
 
-  sources = [ "heap/cppgc/run-all-unittests.cc" ]
+    sources = [ "heap/cppgc/run-all-unittests.cc" ]
 
-  deps = [
-    ":cppgc_unittests_sources",
-    ":v8_cppgc_shared_unittests_sources",
-    "../..:cppgc_for_testing",
-    "//testing/gmock",
-    "//testing/gtest",
-  ]
+    deps = [
+      ":cppgc_unittests_sources",
+      ":v8_cppgc_shared_unittests_sources",
+      "../..:cppgc_for_testing",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
 }
 
 v8_source_set("cppgc_unittests_sources") {
@@ -109,6 +111,7 @@ v8_source_set("cppgc_unittests_sources") {
     "heap/cppgc/prefinalizer-unittest.cc",
     "heap/cppgc/source-location-unittest.cc",
     "heap/cppgc/stack-unittest.cc",
+    "heap/cppgc/stats-collector-scopes-unittest.cc",
     "heap/cppgc/stats-collector-unittest.cc",
     "heap/cppgc/sweeper-unittest.cc",
     "heap/cppgc/test-platform.cc",
@@ -130,6 +133,10 @@ v8_source_set("cppgc_unittests_sources") {
     "//testing/gmock",
     "//testing/gtest",
   ]
+
+  if (!cppgc_is_standalone) {
+    deps += [ "../..:v8_tracing" ]
+  }
 }
 
 v8_executable("unittests") {
@@ -141,7 +148,6 @@ v8_executable("unittests") {
   #}],
 
   deps = [
-    ":cppgc_unittests_sources",
     ":unittests_sources",
     ":v8_cppgc_shared_unittests_sources",
     "../..:v8_for_testing",
@@ -152,6 +158,10 @@ v8_executable("unittests") {
     "//testing/gtest",
   ]
 
+  if (!cppgc_is_standalone) {
+    deps += [ ":cppgc_unittests_sources" ]
+  }
+
   data_deps = [ "../../tools:v8_testrunner" ]
 
   data = [
@@ -449,6 +459,7 @@ v8_source_set("unittests_sources") {
     "../..:v8_for_testing",
     "../..:v8_libbase",
     "../..:v8_libplatform",
+    "../..:v8_wrappers",
     "../..:wasm_test_common",
     "../../third_party/inspector_protocol:crdtp_test",
     "//build/win:default_exe_manifest",
diff --git a/deps/v8/test/unittests/api/exception-unittest.cc b/deps/v8/test/unittests/api/exception-unittest.cc
index 36b87d00f7b195..04d32691ad6c9b 100644
--- a/deps/v8/test/unittests/api/exception-unittest.cc
+++ b/deps/v8/test/unittests/api/exception-unittest.cc
@@ -12,7 +12,7 @@ namespace {
 
 using APIExceptionTest = TestWithIsolate;
 
-class ScopedExposeGc {
+class V8_NODISCARD ScopedExposeGc {
  public:
   ScopedExposeGc() : was_exposed_(i::FLAG_expose_gc) {
     i::FLAG_expose_gc = true;
diff --git a/deps/v8/test/unittests/assembler/turbo-assembler-s390-unittest.cc b/deps/v8/test/unittests/assembler/turbo-assembler-s390-unittest.cc
index b0c398f5717900..d86a09f67caeea 100644
--- a/deps/v8/test/unittests/assembler/turbo-assembler-s390-unittest.cc
+++ b/deps/v8/test/unittests/assembler/turbo-assembler-s390-unittest.cc
@@ -47,7 +47,7 @@ TEST_F(TurboAssemblerTest, TestCheck) {
 
   // Fail if the first parameter is 17.
   __ lgfi(r3, Operand(17));
-  __ CmpP(r2, r3);  // 1st parameter is in {r2}.
+  __ CmpS64(r2, r3);  // 1st parameter is in {r2}.
   __ Check(Condition::ne, AbortReason::kNoReason);
   __ Ret();
 
diff --git a/deps/v8/test/unittests/base/cpu-unittest.cc b/deps/v8/test/unittests/base/cpu-unittest.cc
index c12e339701c865..71b71eb841e066 100644
--- a/deps/v8/test/unittests/base/cpu-unittest.cc
+++ b/deps/v8/test/unittests/base/cpu-unittest.cc
@@ -20,6 +20,7 @@ TEST(CPUTest, FeatureImplications) {
   EXPECT_TRUE(!cpu.has_sse42() || cpu.has_sse41());
   EXPECT_TRUE(!cpu.has_avx() || cpu.has_sse2());
   EXPECT_TRUE(!cpu.has_fma3() || cpu.has_avx());
+  EXPECT_TRUE(!cpu.has_avx2() || cpu.has_avx());
 
   // arm features
   EXPECT_TRUE(!cpu.has_vfp3_d32() || cpu.has_vfp3());
diff --git a/deps/v8/test/unittests/base/logging-unittest.cc b/deps/v8/test/unittests/base/logging-unittest.cc
index 157d84bac1d418..1146bd5d8309fb 100644
--- a/deps/v8/test/unittests/base/logging-unittest.cc
+++ b/deps/v8/test/unittests/base/logging-unittest.cc
@@ -86,20 +86,30 @@ std::string SanitizeRegexp(std::string msg) {
 }
 
 std::string FailureMessage(const char* msg, const char* lhs, const char* rhs) {
-  std::string full_msg(msg);
 #ifdef DEBUG
-  full_msg.append(" (").append(lhs).append(" vs. ").append(rhs);
+  return SanitizeRegexp(
+      std::string{msg}.append(" (").append(lhs).append(" vs. ").append(rhs));
+#elif defined(OFFICIAL_BUILD)
+  // Official release builds strip all fatal messages for saving binary size,
+  // see src/base/logging.h.
+  USE(SanitizeRegexp);
+  return "ignored";
+#else
+  return SanitizeRegexp(msg);
 #endif
-  return SanitizeRegexp(std::move(full_msg));
 }
 
 std::string LongFailureMessage(const char* msg, const char* lhs,
                                const char* rhs) {
-  std::string full_msg(msg);
 #ifdef DEBUG
-  full_msg.append("\n   ").append(lhs).append("\n vs.\n   ").append(rhs);
+  return SanitizeRegexp(std::string{msg}
+                            .append("\n   ")
+                            .append(lhs)
+                            .append("\n vs.\n   ")
+                            .append(rhs));
+#else
+  return FailureMessage(msg, lhs, rhs);
 #endif
-  return SanitizeRegexp(std::move(full_msg));
 }
 }  // namespace
 
diff --git a/deps/v8/test/unittests/base/utils/random-number-generator-unittest.cc b/deps/v8/test/unittests/base/utils/random-number-generator-unittest.cc
index 86850e0ae0c189..123e3e3450ffdf 100644
--- a/deps/v8/test/unittests/base/utils/random-number-generator-unittest.cc
+++ b/deps/v8/test/unittests/base/utils/random-number-generator-unittest.cc
@@ -74,27 +74,36 @@ TEST_P(RandomNumberGeneratorTest, NextDoubleReturnsValueBetween0And1) {
   }
 }
 
-#if GTEST_HAS_DEATH_TEST
+#if !defined(DEBUG) && defined(OFFICIAL_BUILD)
+// Official release builds strip all fatal messages for saving binary size,
+// see src/base/logging.h.
+#define FATAL_MSG(msg) "ignored"
+#else
+#define FATAL_MSG(msg) "Check failed: " msg
+#endif
+
 TEST(RandomNumberGenerator, NextSampleInvalidParam) {
   RandomNumberGenerator rng(123);
   std::vector<uint64_t> sample;
-  EXPECT_DEATH(sample = rng.NextSample(10, 11), ".*Check failed: n <= max.*");
+  ASSERT_DEATH_IF_SUPPORTED(sample = rng.NextSample(10, 11),
+                            FATAL_MSG("n <= max"));
 }
 
 TEST(RandomNumberGenerator, NextSampleSlowInvalidParam1) {
   RandomNumberGenerator rng(123);
   std::vector<uint64_t> sample;
-  EXPECT_DEATH(sample = rng.NextSampleSlow(10, 11),
-               ".*Check failed: max - excluded.size*");
+  ASSERT_DEATH_IF_SUPPORTED(sample = rng.NextSampleSlow(10, 11),
+                            FATAL_MSG("max - excluded.size"));
 }
 
 TEST(RandomNumberGenerator, NextSampleSlowInvalidParam2) {
   RandomNumberGenerator rng(123);
   std::vector<uint64_t> sample;
-  EXPECT_DEATH(sample = rng.NextSampleSlow(5, 3, {0, 2, 3}),
-               ".*Check failed: max - excluded.size*");
+  ASSERT_DEATH_IF_SUPPORTED(sample = rng.NextSampleSlow(5, 3, {0, 2, 3}),
+                            FATAL_MSG("max - excluded.size"));
 }
-#endif
+
+#undef FATAL_MSG
 
 TEST_P(RandomNumberGeneratorTest, NextSample0) {
   size_t m = 1;
diff --git a/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc b/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc
index 837b89a66719ac..f8704d36a01d50 100644
--- a/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc
+++ b/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc
@@ -36,10 +36,9 @@ class CompilerDispatcherTestFlags {
     CHECK_NULL(save_flags_);
     save_flags_ = new SaveFlags();
     FLAG_single_threaded = true;
-    // TODO(leszeks): Support background finalization in compiler dispatcher.
-    FLAG_finalize_streaming_on_background = false;
     FlagList::EnforceFlagImplications();
     FLAG_compiler_dispatcher = true;
+    FLAG_finalize_streaming_on_background = false;
   }
 
   static void RestoreFlags() {
@@ -105,6 +104,15 @@ class CompilerDispatcherTest : public TestWithNativeContext {
     return dispatcher->Enqueue(outer_parse_info.get(), function_name,
                                function_literal);
   }
+
+ protected:
+  void SetUp() override {
+    // TODO(leszeks): Support background finalization in compiler dispatcher.
+    if (FLAG_finalize_streaming_on_background) {
+      GTEST_SKIP_(
+          "Parallel compile tasks don't yet support background finalization");
+    }
+  }
 };
 
 namespace {
diff --git a/deps/v8/test/unittests/compiler/common-operator-unittest.cc b/deps/v8/test/unittests/compiler/common-operator-unittest.cc
index 365b3ea05baaa8..1c9369cb3426ba 100644
--- a/deps/v8/test/unittests/compiler/common-operator-unittest.cc
+++ b/deps/v8/test/unittests/compiler/common-operator-unittest.cc
@@ -248,6 +248,12 @@ TEST_F(CommonOperatorTest, IfValue) {
       EXPECT_EQ(1, op->ControlOutputCount());
     }
   }
+
+  // Specific test for a regression in the IfValueParameters operator==.
+  CHECK(!(IfValueParameters(0, 0) == IfValueParameters(1, 0)));
+  CHECK(!(IfValueParameters(0, 0) == IfValueParameters(0, 1)));
+  CHECK(!(IfValueParameters(0, 1, BranchHint::kFalse) ==
+          IfValueParameters(0, 1, BranchHint::kTrue)));
 }
 
 
diff --git a/deps/v8/test/unittests/compiler/loop-peeling-unittest.cc b/deps/v8/test/unittests/compiler/loop-peeling-unittest.cc
index e084b495f9567e..27e6b32560f2d5 100644
--- a/deps/v8/test/unittests/compiler/loop-peeling-unittest.cc
+++ b/deps/v8/test/unittests/compiler/loop-peeling-unittest.cc
@@ -144,7 +144,9 @@ class LoopPeelingTest : public GraphTest {
                              c.base, c.base, w->loop);
     c.add = graph()->NewNode(machine()->Int32Add(), c.phi, c.inc);
     c.phi->ReplaceInput(1, c.add);
-    c.exit_marker = graph()->NewNode(common()->LoopExitValue(), c.phi, w->exit);
+    c.exit_marker = graph()->NewNode(
+        common()->LoopExitValue(MachineRepresentation::kTagged), c.phi,
+        w->exit);
     return c;
   }
 };
@@ -372,7 +374,8 @@ TEST_F(LoopPeelingTest, TwoBackedgeLoopWithPhi) {
   loop->ReplaceInput(2, b2.if_false);
 
   Node* exit = graph()->NewNode(common()->LoopExit(), b1.if_false, loop);
-  Node* exit_marker = graph()->NewNode(common()->LoopExitValue(), phi, exit);
+  Node* exit_marker = graph()->NewNode(
+      common()->LoopExitValue(MachineRepresentation::kTagged), phi, exit);
   Node* r = InsertReturn(exit_marker, start(), exit);
 
   PeeledIteration* peeled = PeelOne();
@@ -426,7 +429,8 @@ TEST_F(LoopPeelingTest, TwoBackedgeLoopWithCounter) {
   loop->ReplaceInput(2, b2.if_false);
 
   Node* exit = graph()->NewNode(common()->LoopExit(), b1.if_false, loop);
-  Node* exit_marker = graph()->NewNode(common()->LoopExitValue(), phi, exit);
+  Node* exit_marker = graph()->NewNode(
+      common()->LoopExitValue(MachineRepresentation::kTagged), phi, exit);
   Node* r = InsertReturn(exit_marker, start(), exit);
 
   PeeledIteration* peeled = PeelOne();
diff --git a/deps/v8/test/unittests/compiler/redundancy-elimination-unittest.cc b/deps/v8/test/unittests/compiler/redundancy-elimination-unittest.cc
index 07ce18cb6a5b09..14960358788643 100644
--- a/deps/v8/test/unittests/compiler/redundancy-elimination-unittest.cc
+++ b/deps/v8/test/unittests/compiler/redundancy-elimination-unittest.cc
@@ -77,7 +77,6 @@ const CheckTaggedInputMode kCheckTaggedInputModes[] = {
 const NumberOperationHint kNumberOperationHints[] = {
     NumberOperationHint::kSignedSmall,
     NumberOperationHint::kSignedSmallInputs,
-    NumberOperationHint::kSigned32,
     NumberOperationHint::kNumber,
     NumberOperationHint::kNumberOrOddball,
 };
diff --git a/deps/v8/test/unittests/heap/cppgc/compactor-unittest.cc b/deps/v8/test/unittests/heap/cppgc/compactor-unittest.cc
index 92ae9dc6b6df26..9298a775411280 100644
--- a/deps/v8/test/unittests/heap/cppgc/compactor-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/compactor-unittest.cc
@@ -7,6 +7,7 @@
 #include "include/cppgc/allocation.h"
 #include "include/cppgc/custom-space.h"
 #include "include/cppgc/persistent.h"
+#include "src/heap/cppgc/garbage-collector.h"
 #include "src/heap/cppgc/heap-object-header.h"
 #include "src/heap/cppgc/heap-page.h"
 #include "src/heap/cppgc/marker.h"
@@ -125,7 +126,12 @@ namespace internal {
 
 TEST_F(CompactorTest, NothingToCompact) {
   StartCompaction();
+  heap()->stats_collector()->NotifyMarkingStarted(
+      GarbageCollector::Config::CollectionType::kMajor,
+      GarbageCollector::Config::IsForcedGC::kNotForced);
+  heap()->stats_collector()->NotifyMarkingCompleted(0);
   FinishCompaction();
+  heap()->stats_collector()->NotifySweepingCompleted();
 }
 
 TEST_F(CompactorTest, CancelledNothingToCompact) {
diff --git a/deps/v8/test/unittests/heap/cppgc/concurrent-sweeper-unittest.cc b/deps/v8/test/unittests/heap/cppgc/concurrent-sweeper-unittest.cc
index b1cdc5d8fc71b6..4541216b1f77ea 100644
--- a/deps/v8/test/unittests/heap/cppgc/concurrent-sweeper-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/concurrent-sweeper-unittest.cc
@@ -72,7 +72,9 @@ class ConcurrentSweeperTest : public testing::TestWithHeap {
     ResetLinearAllocationBuffers();
     // Pretend do finish marking as StatsCollector verifies that Notify*
     // methods are called in the right order.
-    heap->stats_collector()->NotifyMarkingStarted();
+    heap->stats_collector()->NotifyMarkingStarted(
+        GarbageCollector::Config::CollectionType::kMajor,
+        GarbageCollector::Config::IsForcedGC::kNotForced);
     heap->stats_collector()->NotifyMarkingCompleted(0);
     Sweeper& sweeper = heap->sweeper();
     const Sweeper::SweepingConfig sweeping_config{
diff --git a/deps/v8/test/unittests/heap/cppgc/gc-invoker-unittest.cc b/deps/v8/test/unittests/heap/cppgc/gc-invoker-unittest.cc
index 319f6e433dafa0..c43531494f1a5f 100644
--- a/deps/v8/test/unittests/heap/cppgc/gc-invoker-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/gc-invoker-unittest.cc
@@ -46,7 +46,8 @@ class MockTaskRunner : public cppgc::TaskRunner {
 class MockPlatform : public cppgc::Platform {
  public:
   explicit MockPlatform(std::shared_ptr<TaskRunner> runner)
-      : runner_(std::move(runner)) {}
+      : runner_(std::move(runner)),
+        tracing_controller_(std::make_unique<TracingController>()) {}
 
   PageAllocator* GetPageAllocator() override { return nullptr; }
   double MonotonicallyIncreasingTime() override { return 0.0; }
@@ -55,8 +56,13 @@ class MockPlatform : public cppgc::Platform {
     return runner_;
   }
 
+  TracingController* GetTracingController() override {
+    return tracing_controller_.get();
+  }
+
  private:
   std::shared_ptr<TaskRunner> runner_;
+  std::unique_ptr<TracingController> tracing_controller_;
 };
 
 }  // namespace
diff --git a/deps/v8/test/unittests/heap/cppgc/heap-growing-unittest.cc b/deps/v8/test/unittests/heap/cppgc/heap-growing-unittest.cc
index f1ff2a58777e6f..39d6cb3b94095e 100644
--- a/deps/v8/test/unittests/heap/cppgc/heap-growing-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/heap-growing-unittest.cc
@@ -23,7 +23,9 @@ class FakeGarbageCollector : public GarbageCollector {
   void SetLiveBytes(size_t live_bytes) { live_bytes_ = live_bytes; }
 
   void CollectGarbage(GarbageCollector::Config config) override {
-    stats_collector_->NotifyMarkingStarted();
+    stats_collector_->NotifyMarkingStarted(
+        GarbageCollector::Config::CollectionType::kMajor,
+        GarbageCollector::Config::IsForcedGC::kNotForced);
     stats_collector_->NotifyMarkingCompleted(live_bytes_);
     stats_collector_->NotifySweepingCompleted();
     callcount_++;
@@ -63,7 +65,9 @@ TEST(HeapGrowingTest, ConservativeGCInvoked) {
   cppgc::Heap::ResourceConstraints constraints;
   // Force GC at the first update.
   constraints.initial_heap_size_bytes = 1;
-  HeapGrowing growing(&gc, &stats_collector, constraints);
+  HeapGrowing growing(&gc, &stats_collector, constraints,
+                      cppgc::Heap::MarkingType::kIncrementalAndConcurrent,
+                      cppgc::Heap::SweepingType::kIncrementalAndConcurrent);
   EXPECT_CALL(gc, CollectGarbage(::testing::_));
   FakeAllocate(&stats_collector, 100 * kMB);
 }
@@ -75,7 +79,9 @@ TEST(HeapGrowingTest, InitialHeapSize) {
   // Use larger size to avoid running into small heap optimizations.
   constexpr size_t kObjectSize = 10 * HeapGrowing::kMinLimitIncrease;
   constraints.initial_heap_size_bytes = kObjectSize;
-  HeapGrowing growing(&gc, &stats_collector, constraints);
+  HeapGrowing growing(&gc, &stats_collector, constraints,
+                      cppgc::Heap::MarkingType::kIncrementalAndConcurrent,
+                      cppgc::Heap::SweepingType::kIncrementalAndConcurrent);
   FakeAllocate(&stats_collector, kObjectSize - 1);
   EXPECT_CALL(gc, CollectGarbage(::testing::_));
   FakeAllocate(&stats_collector, kObjectSize);
@@ -89,7 +95,9 @@ TEST(HeapGrowingTest, ConstantGrowingFactor) {
   cppgc::Heap::ResourceConstraints constraints;
   // Force GC at the first update.
   constraints.initial_heap_size_bytes = HeapGrowing::kMinLimitIncrease;
-  HeapGrowing growing(&gc, &stats_collector, constraints);
+  HeapGrowing growing(&gc, &stats_collector, constraints,
+                      cppgc::Heap::MarkingType::kIncrementalAndConcurrent,
+                      cppgc::Heap::SweepingType::kIncrementalAndConcurrent);
   EXPECT_EQ(0u, gc.epoch());
   gc.SetLiveBytes(kObjectSize);
   FakeAllocate(&stats_collector, kObjectSize + 1);
@@ -105,7 +113,9 @@ TEST(HeapGrowingTest, SmallHeapGrowing) {
   cppgc::Heap::ResourceConstraints constraints;
   // Force GC at the first update.
   constraints.initial_heap_size_bytes = 1;
-  HeapGrowing growing(&gc, &stats_collector, constraints);
+  HeapGrowing growing(&gc, &stats_collector, constraints,
+                      cppgc::Heap::MarkingType::kIncrementalAndConcurrent,
+                      cppgc::Heap::SweepingType::kIncrementalAndConcurrent);
   EXPECT_EQ(0u, gc.epoch());
   gc.SetLiveBytes(1);
   FakeAllocate(&stats_collector, kLargeAllocation);
@@ -117,7 +127,9 @@ TEST(HeapGrowingTest, IncrementalGCStarted) {
   StatsCollector stats_collector;
   MockGarbageCollector gc;
   cppgc::Heap::ResourceConstraints constraints;
-  HeapGrowing growing(&gc, &stats_collector, constraints);
+  HeapGrowing growing(&gc, &stats_collector, constraints,
+                      cppgc::Heap::MarkingType::kIncrementalAndConcurrent,
+                      cppgc::Heap::SweepingType::kIncrementalAndConcurrent);
   EXPECT_CALL(gc, CollectGarbage(::testing::_)).Times(0);
   EXPECT_CALL(gc, StartIncrementalGarbageCollection(::testing::_));
   // Allocate 1 byte less the limit for atomic gc to trigger incremental gc.
@@ -128,7 +140,9 @@ TEST(HeapGrowingTest, IncrementalGCFinalized) {
   StatsCollector stats_collector;
   MockGarbageCollector gc;
   cppgc::Heap::ResourceConstraints constraints;
-  HeapGrowing growing(&gc, &stats_collector, constraints);
+  HeapGrowing growing(&gc, &stats_collector, constraints,
+                      cppgc::Heap::MarkingType::kIncrementalAndConcurrent,
+                      cppgc::Heap::SweepingType::kIncrementalAndConcurrent);
   EXPECT_CALL(gc, CollectGarbage(::testing::_)).Times(0);
   EXPECT_CALL(gc, StartIncrementalGarbageCollection(::testing::_));
   // Allocate 1 byte less the limit for atomic gc to trigger incremental gc.
diff --git a/deps/v8/test/unittests/heap/cppgc/incremental-marking-schedule-unittest.cc b/deps/v8/test/unittests/heap/cppgc/incremental-marking-schedule-unittest.cc
index e91870be9dae87..0c811668e83d12 100644
--- a/deps/v8/test/unittests/heap/cppgc/incremental-marking-schedule-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/incremental-marking-schedule-unittest.cc
@@ -14,7 +14,7 @@ namespace internal {
 
 namespace {
 
-class IncrementalMarkingScheduleTest : public testing::Test {
+class IncrementalMarkingScheduleTest : public ::testing::Test {
  public:
   static const size_t kObjectSize;
 };
diff --git a/deps/v8/test/unittests/heap/cppgc/marker-unittest.cc b/deps/v8/test/unittests/heap/cppgc/marker-unittest.cc
index 2574db151f250b..5bb28147054de5 100644
--- a/deps/v8/test/unittests/heap/cppgc/marker-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/marker-unittest.cc
@@ -231,7 +231,7 @@ TEST_F(MarkerTest, InConstructionObjectIsEventuallyMarkedEmptyStack) {
   GCedWithCallback* object = MakeGarbageCollected<GCedWithCallback>(
       GetAllocationHandle(), [marker = marker()](GCedWithCallback* obj) {
         Member<GCedWithCallback> member(obj);
-        marker->VisitorForTesting().Trace(member);
+        marker->Visitor().Trace(member);
       });
   EXPECT_FALSE(HeapObjectHeader::FromPayload(object).IsMarked());
   marker()->FinishMarking(MarkingConfig::StackState::kMayContainHeapPointers);
@@ -246,7 +246,7 @@ TEST_F(MarkerTest, InConstructionObjectIsEventuallyMarkedNonEmptyStack) {
   MakeGarbageCollected<GCedWithCallback>(
       GetAllocationHandle(), [marker = marker()](GCedWithCallback* obj) {
         Member<GCedWithCallback> member(obj);
-        marker->VisitorForTesting().Trace(member);
+        marker->Visitor().Trace(member);
         EXPECT_FALSE(HeapObjectHeader::FromPayload(obj).IsMarked());
         marker->FinishMarking(
             MarkingConfig::StackState::kMayContainHeapPointers);
diff --git a/deps/v8/test/unittests/heap/cppgc/member-unittest.cc b/deps/v8/test/unittests/heap/cppgc/member-unittest.cc
index 64934d69cdef71..6d2161112b0a52 100644
--- a/deps/v8/test/unittests/heap/cppgc/member-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/member-unittest.cc
@@ -30,6 +30,27 @@ struct DerivedGCed : GCed {
 static_assert(!IsWeakV<Member<GCed>>, "Member is always strong.");
 static_assert(IsWeakV<WeakMember<GCed>>, "WeakMember is always weak.");
 
+static_assert(IsMemberTypeV<Member<GCed>>, "Member must be Member.");
+static_assert(!IsMemberTypeV<WeakMember<GCed>>,
+              "WeakMember must not be Member.");
+static_assert(!IsMemberTypeV<UntracedMember<GCed>>,
+              "UntracedMember must not be Member.");
+static_assert(!IsMemberTypeV<int>, "int must not be Member.");
+static_assert(!IsWeakMemberTypeV<Member<GCed>>,
+              "Member must not be WeakMember.");
+static_assert(IsWeakMemberTypeV<WeakMember<GCed>>,
+              "WeakMember must be WeakMember.");
+static_assert(!IsWeakMemberTypeV<UntracedMember<GCed>>,
+              "UntracedMember must not be WeakMember.");
+static_assert(!IsWeakMemberTypeV<int>, "int must not be WeakMember.");
+static_assert(!IsUntracedMemberTypeV<Member<GCed>>,
+              "Member must not be UntracedMember.");
+static_assert(!IsUntracedMemberTypeV<WeakMember<GCed>>,
+              "WeakMember must not be UntracedMember.");
+static_assert(IsUntracedMemberTypeV<UntracedMember<GCed>>,
+              "UntracedMember must be UntracedMember.");
+static_assert(!IsUntracedMemberTypeV<int>, "int must not be UntracedMember.");
+
 struct CustomWriteBarrierPolicy {
   static size_t InitializingWriteBarriersTriggered;
   static size_t AssigningWriteBarriersTriggered;
diff --git a/deps/v8/test/unittests/heap/cppgc/minor-gc-unittest.cc b/deps/v8/test/unittests/heap/cppgc/minor-gc-unittest.cc
index 6849d63a316ce9..a023a37f0d1e2e 100644
--- a/deps/v8/test/unittests/heap/cppgc/minor-gc-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/minor-gc-unittest.cc
@@ -5,6 +5,7 @@
 #if defined(CPPGC_YOUNG_GENERATION)
 
 #include "include/cppgc/allocation.h"
+#include "include/cppgc/heap-consistency.h"
 #include "include/cppgc/persistent.h"
 #include "src/heap/cppgc/heap-object-header.h"
 #include "src/heap/cppgc/heap.h"
@@ -200,17 +201,13 @@ TYPED_TEST(MinorGCTestForType, OmitGenerationalBarrierForOnStackObject) {
     Type* ptr = nullptr;
   } stack_object;
 
-  auto* new_object = MakeGarbageCollected<Type>(this->GetAllocationHandle());
-
-  const auto& set = Heap::From(this->GetHeap())->remembered_slots();
-  const size_t set_size_before_barrier = set.size();
-
   // Try issuing generational barrier for on-stack object.
-  stack_object.ptr = new_object;
-  WriteBarrier::MarkingBarrier(reinterpret_cast<void*>(&stack_object.ptr),
-                               new_object);
-
-  EXPECT_EQ(set_size_before_barrier, set.size());
+  stack_object.ptr = MakeGarbageCollected<Type>(this->GetAllocationHandle());
+  subtle::HeapConsistency::WriteBarrierParams params;
+  EXPECT_EQ(subtle::HeapConsistency::WriteBarrierType::kNone,
+            subtle::HeapConsistency::GetWriteBarrierType(
+                reinterpret_cast<void*>(&stack_object.ptr), stack_object.ptr,
+                params));
 }
 
 TYPED_TEST(MinorGCTestForType, OmitGenerationalBarrierForSentinels) {
diff --git a/deps/v8/test/unittests/heap/cppgc/stats-collector-scopes-unittest.cc b/deps/v8/test/unittests/heap/cppgc/stats-collector-scopes-unittest.cc
new file mode 100644
index 00000000000000..e9640ecbb6b2bf
--- /dev/null
+++ b/deps/v8/test/unittests/heap/cppgc/stats-collector-scopes-unittest.cc
@@ -0,0 +1,306 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#if CPPGC_IS_STANDALONE
+
+#include "src/heap/cppgc/stats-collector.h"
+#include "test/unittests/heap/cppgc/tests.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace cppgc {
+namespace internal {
+
+namespace {
+
+class DelegatingTracingControllerImpl : public TracingController {
+ public:
+  virtual uint64_t AddTraceEvent(
+      char phase, const uint8_t* category_enabled_flag, const char* name,
+      const char* scope, uint64_t id, uint64_t bind_id, int32_t num_args,
+      const char** arg_names, const uint8_t* arg_types,
+      const uint64_t* arg_values,
+      std::unique_ptr<ConvertableToTraceFormat>* arg_convertables,
+      unsigned int flags) {
+    if (!check_expectations) return 0;
+    static char phases[2] = {'B', 'E'};
+    EXPECT_EQ(phases[AddTraceEvent_callcount], phase);
+    EXPECT_TRUE(*category_enabled_flag);
+    if (expected_name) {
+      EXPECT_EQ(0, strcmp(expected_name, name));
+    }
+    stored_num_args += num_args;
+    for (int i = 0; i < num_args; ++i) {
+      stored_arg_names.push_back(arg_names[i]);
+      stored_arg_types.push_back(arg_types[i]);
+      stored_arg_values.push_back(arg_values[i]);
+    }
+    AddTraceEvent_callcount++;
+    return 0;
+  }
+
+  static bool check_expectations;
+  static size_t AddTraceEvent_callcount;
+  static const char* expected_name;
+  static int32_t stored_num_args;
+  static std::vector<std::string> stored_arg_names;
+  static std::vector<uint8_t> stored_arg_types;
+  static std::vector<uint64_t> stored_arg_values;
+};
+
+bool DelegatingTracingControllerImpl::check_expectations = false;
+size_t DelegatingTracingControllerImpl::AddTraceEvent_callcount = 0u;
+const char* DelegatingTracingControllerImpl::expected_name = nullptr;
+int32_t DelegatingTracingControllerImpl::stored_num_args = 0;
+std::vector<std::string> DelegatingTracingControllerImpl::stored_arg_names;
+std::vector<uint8_t> DelegatingTracingControllerImpl::stored_arg_types;
+std::vector<uint64_t> DelegatingTracingControllerImpl::stored_arg_values;
+
+class V8_NODISCARD CppgcTracingScopesTest : public testing::TestWithHeap {
+  using Config = Marker::MarkingConfig;
+
+ public:
+  CppgcTracingScopesTest() {
+    SetTracingController(std::make_unique<DelegatingTracingControllerImpl>());
+  }
+
+  void StartGC() {
+    Config config = {Config::CollectionType::kMajor,
+                     Config::StackState::kNoHeapPointers,
+                     Config::MarkingType::kIncremental};
+    GetMarkerRef() = MarkerFactory::CreateAndStartMarking<Marker>(
+        Heap::From(GetHeap())->AsBase(), GetPlatformHandle().get(), config);
+    DelegatingTracingControllerImpl::check_expectations = true;
+  }
+
+  void EndGC() {
+    DelegatingTracingControllerImpl::check_expectations = false;
+    GetMarkerRef()->FinishMarking(Config::StackState::kNoHeapPointers);
+    GetMarkerRef().reset();
+    Heap::From(GetHeap())->stats_collector()->NotifySweepingCompleted();
+  }
+
+  void ResetDelegatingTracingController(const char* expected_name = nullptr) {
+    DelegatingTracingControllerImpl::AddTraceEvent_callcount = 0u;
+    DelegatingTracingControllerImpl::stored_num_args = 0;
+    DelegatingTracingControllerImpl::stored_arg_names.clear();
+    DelegatingTracingControllerImpl::stored_arg_types.clear();
+    DelegatingTracingControllerImpl::stored_arg_values.clear();
+    DelegatingTracingControllerImpl::expected_name = expected_name;
+  }
+
+  void FindArgument(std::string name, uint8_t type, uint64_t value) {
+    int i = 0;
+    for (; i < DelegatingTracingControllerImpl::stored_num_args; ++i) {
+      if (name.compare(DelegatingTracingControllerImpl::stored_arg_names[i]) ==
+          0)
+        break;
+    }
+    EXPECT_LT(i, DelegatingTracingControllerImpl::stored_num_args);
+    EXPECT_EQ(type, DelegatingTracingControllerImpl::stored_arg_types[i]);
+    EXPECT_EQ(value, DelegatingTracingControllerImpl::stored_arg_values[i]);
+  }
+};
+
+}  // namespace
+
+TEST_F(CppgcTracingScopesTest, DisabledScope) {
+  StartGC();
+  ResetDelegatingTracingController();
+  {
+    StatsCollector::DisabledScope scope(
+        *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist);
+  }
+  EXPECT_EQ(0u, DelegatingTracingControllerImpl::AddTraceEvent_callcount);
+  EndGC();
+}
+
+TEST_F(CppgcTracingScopesTest, EnabledScope) {
+  {
+    StartGC();
+    ResetDelegatingTracingController("CppGC.MarkProcessMarkingWorklist");
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist);
+    }
+    EXPECT_EQ(2u, DelegatingTracingControllerImpl::AddTraceEvent_callcount);
+    EndGC();
+  }
+  {
+    StartGC();
+    ResetDelegatingTracingController("CppGC.MarkProcessWriteBarrierWorklist");
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()),
+          StatsCollector::kMarkProcessWriteBarrierWorklist);
+    }
+    EXPECT_EQ(2u, DelegatingTracingControllerImpl::AddTraceEvent_callcount);
+    EndGC();
+  }
+}
+
+TEST_F(CppgcTracingScopesTest, EnabledScopeWithArgs) {
+  // Scopes always add 2 arguments: epoch and is_forced_gc.
+  {
+    StartGC();
+    ResetDelegatingTracingController();
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist);
+    }
+    EXPECT_EQ(2, DelegatingTracingControllerImpl::stored_num_args);
+    EndGC();
+  }
+  {
+    StartGC();
+    ResetDelegatingTracingController();
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist,
+          "arg1", 1);
+    }
+    EXPECT_EQ(3, DelegatingTracingControllerImpl::stored_num_args);
+    EndGC();
+  }
+  {
+    StartGC();
+    ResetDelegatingTracingController();
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist,
+          "arg1", 1, "arg2", 2);
+    }
+    EXPECT_EQ(4, DelegatingTracingControllerImpl::stored_num_args);
+    EndGC();
+  }
+}
+
+TEST_F(CppgcTracingScopesTest, CheckScopeArgs) {
+  {
+    StartGC();
+    ResetDelegatingTracingController();
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist,
+          "uint_arg", 13u, "bool_arg", false);
+    }
+    FindArgument("uint_arg", TRACE_VALUE_TYPE_UINT, 13);
+    FindArgument("bool_arg", TRACE_VALUE_TYPE_BOOL, false);
+    EndGC();
+  }
+  {
+    StartGC();
+    ResetDelegatingTracingController();
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist,
+          "neg_int_arg", -5, "pos_int_arg", 7);
+    }
+    FindArgument("neg_int_arg", TRACE_VALUE_TYPE_INT, -5);
+    FindArgument("pos_int_arg", TRACE_VALUE_TYPE_INT, 7);
+    EndGC();
+  }
+  {
+    StartGC();
+    ResetDelegatingTracingController();
+    double double_value = 1.2;
+    const char* string_value = "test";
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()), StatsCollector::kMarkProcessMarkingWorklist,
+          "string_arg", string_value, "double_arg", double_value);
+    }
+    FindArgument("string_arg", TRACE_VALUE_TYPE_STRING,
+                 reinterpret_cast<uint64_t>(string_value));
+    FindArgument("double_arg", TRACE_VALUE_TYPE_DOUBLE,
+                 *reinterpret_cast<uint64_t*>(&double_value));
+    EndGC();
+  }
+}
+
+TEST_F(CppgcTracingScopesTest, InitalScopesAreZero) {
+  StatsCollector* stats_collector = Heap::From(GetHeap())->stats_collector();
+  stats_collector->NotifyMarkingStarted(
+      GarbageCollector::Config::CollectionType::kMajor,
+      GarbageCollector::Config::IsForcedGC::kNotForced);
+  stats_collector->NotifyMarkingCompleted(0);
+  stats_collector->NotifySweepingCompleted();
+  const StatsCollector::Event& event =
+      stats_collector->GetPreviousEventForTesting();
+  for (int i = 0; i < StatsCollector::kNumScopeIds; ++i) {
+    EXPECT_TRUE(event.scope_data[i].IsZero());
+  }
+  for (int i = 0; i < StatsCollector::kNumConcurrentScopeIds; ++i) {
+    EXPECT_EQ(0, event.concurrent_scope_data[i]);
+  }
+}
+
+TEST_F(CppgcTracingScopesTest, TestIndividualScopes) {
+  for (int scope_id = 0; scope_id < StatsCollector::kNumScopeIds; ++scope_id) {
+    StatsCollector* stats_collector = Heap::From(GetHeap())->stats_collector();
+    stats_collector->NotifyMarkingStarted(
+        GarbageCollector::Config::CollectionType::kMajor,
+        GarbageCollector::Config::IsForcedGC::kNotForced);
+    DelegatingTracingControllerImpl::check_expectations = false;
+    {
+      StatsCollector::EnabledScope scope(
+          *Heap::From(GetHeap()),
+          static_cast<StatsCollector::ScopeId>(scope_id));
+      v8::base::TimeTicks time = v8::base::TimeTicks::Now();
+      while (time == v8::base::TimeTicks::Now()) {
+        // Force time to progress before destroying scope.
+      }
+    }
+    stats_collector->NotifyMarkingCompleted(0);
+    stats_collector->NotifySweepingCompleted();
+    const StatsCollector::Event& event =
+        stats_collector->GetPreviousEventForTesting();
+    for (int i = 0; i < StatsCollector::kNumScopeIds; ++i) {
+      if (i == scope_id)
+        EXPECT_LT(v8::base::TimeDelta(), event.scope_data[i]);
+      else
+        EXPECT_TRUE(event.scope_data[i].IsZero());
+    }
+    for (int i = 0; i < StatsCollector::kNumConcurrentScopeIds; ++i) {
+      EXPECT_EQ(0, event.concurrent_scope_data[i]);
+    }
+  }
+}
+
+TEST_F(CppgcTracingScopesTest, TestIndividualConcurrentScopes) {
+  for (int scope_id = 0; scope_id < StatsCollector::kNumConcurrentScopeIds;
+       ++scope_id) {
+    StatsCollector* stats_collector = Heap::From(GetHeap())->stats_collector();
+    stats_collector->NotifyMarkingStarted(
+        GarbageCollector::Config::CollectionType::kMajor,
+        GarbageCollector::Config::IsForcedGC::kNotForced);
+    DelegatingTracingControllerImpl::check_expectations = false;
+    {
+      StatsCollector::EnabledConcurrentScope scope(
+          *Heap::From(GetHeap()),
+          static_cast<StatsCollector::ConcurrentScopeId>(scope_id));
+      v8::base::TimeTicks time = v8::base::TimeTicks::Now();
+      while (time == v8::base::TimeTicks::Now()) {
+        // Force time to progress before destroying scope.
+      }
+    }
+    stats_collector->NotifyMarkingCompleted(0);
+    stats_collector->NotifySweepingCompleted();
+    const StatsCollector::Event& event =
+        stats_collector->GetPreviousEventForTesting();
+    for (int i = 0; i < StatsCollector::kNumScopeIds; ++i) {
+      EXPECT_TRUE(event.scope_data[i].IsZero());
+    }
+    for (int i = 0; i < StatsCollector::kNumConcurrentScopeIds; ++i) {
+      if (i == scope_id)
+        EXPECT_LT(0, event.concurrent_scope_data[i]);
+      else
+        EXPECT_EQ(0, event.concurrent_scope_data[i]);
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace cppgc
+
+#endif  // CPPGC_IS_STANDALONE
diff --git a/deps/v8/test/unittests/heap/cppgc/stats-collector-unittest.cc b/deps/v8/test/unittests/heap/cppgc/stats-collector-unittest.cc
index 708abe01f0b64a..154ac3cfc6de53 100644
--- a/deps/v8/test/unittests/heap/cppgc/stats-collector-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/stats-collector-unittest.cc
@@ -34,16 +34,20 @@ class StatsCollectorTest : public ::testing::Test {
 }  // namespace
 
 TEST_F(StatsCollectorTest, NoMarkedBytes) {
-  stats.NotifyMarkingStarted();
+  stats.NotifyMarkingStarted(GarbageCollector::Config::CollectionType::kMajor,
+                             GarbageCollector::Config::IsForcedGC::kNotForced);
   stats.NotifyMarkingCompleted(kNoMarkedBytes);
-  auto event = stats.NotifySweepingCompleted();
+  stats.NotifySweepingCompleted();
+  auto event = stats.GetPreviousEventForTesting();
   EXPECT_EQ(0u, event.marked_bytes);
 }
 
 TEST_F(StatsCollectorTest, EventPrevGCMarkedObjectSize) {
-  stats.NotifyMarkingStarted();
+  stats.NotifyMarkingStarted(GarbageCollector::Config::CollectionType::kMajor,
+                             GarbageCollector::Config::IsForcedGC::kNotForced);
   stats.NotifyMarkingCompleted(1024);
-  auto event = stats.NotifySweepingCompleted();
+  stats.NotifySweepingCompleted();
+  auto event = stats.GetPreviousEventForTesting();
   EXPECT_EQ(1024u, event.marked_bytes);
 }
 
@@ -62,7 +66,8 @@ TEST_F(StatsCollectorTest, AlllocationReportAboveAllocationThresholdBytes) {
 }
 
 TEST_F(StatsCollectorTest, InitialAllocatedObjectSize) {
-  stats.NotifyMarkingStarted();
+  stats.NotifyMarkingStarted(GarbageCollector::Config::CollectionType::kMajor,
+                             GarbageCollector::Config::IsForcedGC::kNotForced);
   EXPECT_EQ(0u, stats.allocated_object_size());
   stats.NotifyMarkingCompleted(kNoMarkedBytes);
   EXPECT_EQ(0u, stats.allocated_object_size());
@@ -71,7 +76,8 @@ TEST_F(StatsCollectorTest, InitialAllocatedObjectSize) {
 }
 
 TEST_F(StatsCollectorTest, AllocatedObjectSize) {
-  stats.NotifyMarkingStarted();
+  stats.NotifyMarkingStarted(GarbageCollector::Config::CollectionType::kMajor,
+                             GarbageCollector::Config::IsForcedGC::kNotForced);
   FakeAllocate(kMinReportedSize);
   EXPECT_EQ(kMinReportedSize, stats.allocated_object_size());
   stats.NotifyMarkingCompleted(kMinReportedSize);
@@ -81,7 +87,8 @@ TEST_F(StatsCollectorTest, AllocatedObjectSize) {
 }
 
 TEST_F(StatsCollectorTest, AllocatedObjectSizeNoMarkedBytes) {
-  stats.NotifyMarkingStarted();
+  stats.NotifyMarkingStarted(GarbageCollector::Config::CollectionType::kMajor,
+                             GarbageCollector::Config::IsForcedGC::kNotForced);
   FakeAllocate(kMinReportedSize);
   EXPECT_EQ(kMinReportedSize, stats.allocated_object_size());
   stats.NotifyMarkingCompleted(kNoMarkedBytes);
@@ -91,7 +98,8 @@ TEST_F(StatsCollectorTest, AllocatedObjectSizeNoMarkedBytes) {
 }
 
 TEST_F(StatsCollectorTest, AllocatedObjectSizeAllocateAfterMarking) {
-  stats.NotifyMarkingStarted();
+  stats.NotifyMarkingStarted(GarbageCollector::Config::CollectionType::kMajor,
+                             GarbageCollector::Config::IsForcedGC::kNotForced);
   FakeAllocate(kMinReportedSize);
   EXPECT_EQ(kMinReportedSize, stats.allocated_object_size());
   stats.NotifyMarkingCompleted(kMinReportedSize);
@@ -127,7 +135,8 @@ TEST_F(StatsCollectorTest, ObserveAllocatedObjectSizeIncreaseAndDecrease) {
 namespace {
 
 void FakeGC(StatsCollector* stats, size_t marked_bytes) {
-  stats->NotifyMarkingStarted();
+  stats->NotifyMarkingStarted(GarbageCollector::Config::CollectionType::kMajor,
+                              GarbageCollector::Config::IsForcedGC::kNotForced);
   stats->NotifyMarkingCompleted(marked_bytes);
   stats->NotifySweepingCompleted();
 }
diff --git a/deps/v8/test/unittests/heap/cppgc/sweeper-unittest.cc b/deps/v8/test/unittests/heap/cppgc/sweeper-unittest.cc
index 8031deac415321..09384cf90b5b9e 100644
--- a/deps/v8/test/unittests/heap/cppgc/sweeper-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/sweeper-unittest.cc
@@ -46,7 +46,9 @@ class SweeperTest : public testing::TestWithHeap {
     Sweeper& sweeper = heap->sweeper();
     // Pretend do finish marking as StatsCollector verifies that Notify*
     // methods are called in the right order.
-    heap->stats_collector()->NotifyMarkingStarted();
+    heap->stats_collector()->NotifyMarkingStarted(
+        GarbageCollector::Config::CollectionType::kMajor,
+        GarbageCollector::Config::IsForcedGC::kNotForced);
     heap->stats_collector()->NotifyMarkingCompleted(0);
     const Sweeper::SweepingConfig sweeping_config{
         Sweeper::SweepingConfig::SweepingType::kAtomic,
diff --git a/deps/v8/test/unittests/heap/cppgc/test-platform.cc b/deps/v8/test/unittests/heap/cppgc/test-platform.cc
index 2268d546b328fe..5b2139a101a030 100644
--- a/deps/v8/test/unittests/heap/cppgc/test-platform.cc
+++ b/deps/v8/test/unittests/heap/cppgc/test-platform.cc
@@ -12,8 +12,10 @@ namespace cppgc {
 namespace internal {
 namespace testing {
 
-TestPlatform::TestPlatform()
-    : DefaultPlatform(0, DefaultPlatform::IdleTaskSupport::kEnabled) {}
+TestPlatform::TestPlatform(
+    std::unique_ptr<v8::TracingController> tracing_controller)
+    : DefaultPlatform(0 /* thread_pool_size */, IdleTaskSupport::kEnabled,
+                      std::move(tracing_controller)) {}
 
 std::unique_ptr<cppgc::JobHandle> TestPlatform::PostJob(
     cppgc::TaskPriority priority, std::unique_ptr<cppgc::JobTask> job_task) {
diff --git a/deps/v8/test/unittests/heap/cppgc/test-platform.h b/deps/v8/test/unittests/heap/cppgc/test-platform.h
index d6a93f45c90d3b..1a19e111dc5b97 100644
--- a/deps/v8/test/unittests/heap/cppgc/test-platform.h
+++ b/deps/v8/test/unittests/heap/cppgc/test-platform.h
@@ -14,7 +14,7 @@ namespace testing {
 
 class TestPlatform : public DefaultPlatform {
  public:
-  class DisableBackgroundTasksScope {
+  class V8_NODISCARD DisableBackgroundTasksScope {
    public:
     explicit DisableBackgroundTasksScope(TestPlatform*);
     ~DisableBackgroundTasksScope() V8_NOEXCEPT;
@@ -23,7 +23,8 @@ class TestPlatform : public DefaultPlatform {
     TestPlatform* platform_;
   };
 
-  TestPlatform();
+  TestPlatform(
+      std::unique_ptr<v8::TracingController> tracing_controller = nullptr);
 
   std::unique_ptr<cppgc::JobHandle> PostJob(
       cppgc::TaskPriority priority,
diff --git a/deps/v8/test/unittests/heap/cppgc/tests.cc b/deps/v8/test/unittests/heap/cppgc/tests.cc
index b7f09a1ba282ad..a170ecd879ae26 100644
--- a/deps/v8/test/unittests/heap/cppgc/tests.cc
+++ b/deps/v8/test/unittests/heap/cppgc/tests.cc
@@ -18,7 +18,8 @@ std::shared_ptr<TestPlatform> TestWithPlatform::platform_;
 
 // static
 void TestWithPlatform::SetUpTestSuite() {
-  platform_ = std::make_unique<TestPlatform>();
+  platform_ = std::make_unique<TestPlatform>(
+      std::make_unique<DelegatingTracingController>());
   cppgc::InitializeProcess(platform_->GetPageAllocator());
 }
 
diff --git a/deps/v8/test/unittests/heap/cppgc/tests.h b/deps/v8/test/unittests/heap/cppgc/tests.h
index ac445c33703ac9..fba3ab92e90d47 100644
--- a/deps/v8/test/unittests/heap/cppgc/tests.h
+++ b/deps/v8/test/unittests/heap/cppgc/tests.h
@@ -8,12 +8,43 @@
 #include "include/cppgc/heap.h"
 #include "include/cppgc/platform.h"
 #include "src/heap/cppgc/heap.h"
+#include "src/heap/cppgc/trace-event.h"
 #include "test/unittests/heap/cppgc/test-platform.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cppgc {
 namespace internal {
 namespace testing {
+class DelegatingTracingController : public TracingController {
+ public:
+#if !defined(V8_USE_PERFETTO)
+  const uint8_t* GetCategoryGroupEnabled(const char* name) override {
+    static uint8_t yes = 1;
+    return &yes;
+  }
+
+  uint64_t AddTraceEvent(
+      char phase, const uint8_t* category_enabled_flag, const char* name,
+      const char* scope, uint64_t id, uint64_t bind_id, int32_t num_args,
+      const char** arg_names, const uint8_t* arg_types,
+      const uint64_t* arg_values,
+      std::unique_ptr<ConvertableToTraceFormat>* arg_convertables,
+      unsigned int flags) override {
+    return tracing_controller_->AddTraceEvent(
+        phase, category_enabled_flag, name, scope, id, bind_id, num_args,
+        arg_names, arg_types, arg_values, arg_convertables, flags);
+  }
+#endif  // !defined(V8_USE_PERFETTO)
+
+  void SetTracingController(
+      std::unique_ptr<TracingController> tracing_controller_impl) {
+    tracing_controller_ = std::move(tracing_controller_impl);
+  }
+
+ private:
+  std::unique_ptr<TracingController> tracing_controller_ =
+      std::make_unique<TracingController>();
+};
 
 class TestWithPlatform : public ::testing::Test {
  protected:
@@ -24,6 +55,12 @@ class TestWithPlatform : public ::testing::Test {
 
   std::shared_ptr<TestPlatform> GetPlatformHandle() const { return platform_; }
 
+  void SetTracingController(
+      std::unique_ptr<TracingController> tracing_controller_impl) {
+    static_cast<DelegatingTracingController*>(platform_->GetTracingController())
+        ->SetTracingController(std::move(tracing_controller_impl));
+  }
+
  protected:
   static std::shared_ptr<TestPlatform> platform_;
 };
diff --git a/deps/v8/test/unittests/heap/cppgc/weak-container-unittest.cc b/deps/v8/test/unittests/heap/cppgc/weak-container-unittest.cc
index d21f4249b36e44..0aee3287ef00a1 100644
--- a/deps/v8/test/unittests/heap/cppgc/weak-container-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/weak-container-unittest.cc
@@ -27,6 +27,7 @@ class WeakContainerTest : public testing::TestWithHeap {
 
   void FinishMarking(Config::StackState stack_state) {
     GetMarkerRef()->FinishMarking(stack_state);
+    GetMarkerRef().reset();
     Heap::From(GetHeap())->stats_collector()->NotifySweepingCompleted();
   }
 };
@@ -79,8 +80,7 @@ TEST_F(WeakContainerTest, TraceableGCedTraced) {
       MakeGarbageCollected<TraceableGCed>(GetAllocationHandle());
   TraceableGCed::n_trace_calls = 0u;
   StartMarking();
-  GetMarkerRef()->VisitorForTesting().TraceWeakContainer(obj, EmptyWeakCallback,
-                                                         nullptr);
+  GetMarkerRef()->Visitor().TraceWeakContainer(obj, EmptyWeakCallback, nullptr);
   FinishMarking(Config::StackState::kNoHeapPointers);
   EXPECT_NE(0u, TraceableGCed::n_trace_calls);
   access(obj);
@@ -91,8 +91,7 @@ TEST_F(WeakContainerTest, NonTraceableGCedNotTraced) {
       MakeGarbageCollected<NonTraceableGCed>(GetAllocationHandle());
   NonTraceableGCed::n_trace_calls = 0u;
   StartMarking();
-  GetMarkerRef()->VisitorForTesting().TraceWeakContainer(obj, EmptyWeakCallback,
-                                                         nullptr);
+  GetMarkerRef()->Visitor().TraceWeakContainer(obj, EmptyWeakCallback, nullptr);
   FinishMarking(Config::StackState::kNoHeapPointers);
   EXPECT_EQ(0u, NonTraceableGCed::n_trace_calls);
   access(obj);
@@ -103,8 +102,7 @@ TEST_F(WeakContainerTest, NonTraceableGCedNotTracedConservatively) {
       MakeGarbageCollected<NonTraceableGCed>(GetAllocationHandle());
   NonTraceableGCed::n_trace_calls = 0u;
   StartMarking();
-  GetMarkerRef()->VisitorForTesting().TraceWeakContainer(obj, EmptyWeakCallback,
-                                                         nullptr);
+  GetMarkerRef()->Visitor().TraceWeakContainer(obj, EmptyWeakCallback, nullptr);
   FinishMarking(Config::StackState::kMayContainHeapPointers);
   EXPECT_NE(0u, NonTraceableGCed::n_trace_calls);
   access(obj);
@@ -117,8 +115,8 @@ TEST_F(WeakContainerTest, ConservativeGCTracesWeakContainer) {
         MakeGarbageCollected<TraceableGCed>(GetAllocationHandle());
     TraceableGCed::n_trace_calls = 0u;
     StartMarking();
-    GetMarkerRef()->VisitorForTesting().TraceWeakContainer(
-        obj, EmptyWeakCallback, nullptr);
+    GetMarkerRef()->Visitor().TraceWeakContainer(obj, EmptyWeakCallback,
+                                                 nullptr);
     FinishMarking(Config::StackState::kNoHeapPointers);
     trace_count_without_conservative = TraceableGCed::n_trace_calls;
     access(obj);
@@ -128,8 +126,8 @@ TEST_F(WeakContainerTest, ConservativeGCTracesWeakContainer) {
         MakeGarbageCollected<TraceableGCed>(GetAllocationHandle());
     TraceableGCed::n_trace_calls = 0u;
     StartMarking();
-    GetMarkerRef()->VisitorForTesting().TraceWeakContainer(
-        obj, EmptyWeakCallback, nullptr);
+    GetMarkerRef()->Visitor().TraceWeakContainer(obj, EmptyWeakCallback,
+                                                 nullptr);
     FinishMarking(Config::StackState::kMayContainHeapPointers);
     EXPECT_LT(trace_count_without_conservative, TraceableGCed::n_trace_calls);
     access(obj);
@@ -145,8 +143,7 @@ TEST_F(WeakContainerTest, ConservativeGCTracesWeakContainerOnce) {
   USE(another_copy_obj);
   NonTraceableGCed::n_trace_calls = 0u;
   StartMarking();
-  GetMarkerRef()->VisitorForTesting().TraceWeakContainer(obj, EmptyWeakCallback,
-                                                         nullptr);
+  GetMarkerRef()->Visitor().TraceWeakContainer(obj, EmptyWeakCallback, nullptr);
   FinishMarking(Config::StackState::kMayContainHeapPointers);
   EXPECT_EQ(1u, NonTraceableGCed::n_trace_calls);
   access(obj);
@@ -173,8 +170,8 @@ TEST_F(WeakContainerTest, WeakContainerWeakCallbackCalled) {
   WeakCallback::n_callback_called = 0u;
   WeakCallback::obj = nullptr;
   StartMarking();
-  GetMarkerRef()->VisitorForTesting().TraceWeakContainer(
-      obj, WeakCallback::callback, obj);
+  GetMarkerRef()->Visitor().TraceWeakContainer(obj, WeakCallback::callback,
+                                               obj);
   FinishMarking(Config::StackState::kMayContainHeapPointers);
   EXPECT_NE(0u, WeakCallback::n_callback_called);
   EXPECT_EQ(obj, WeakCallback::obj);
diff --git a/deps/v8/test/unittests/heap/cppgc/write-barrier-unittest.cc b/deps/v8/test/unittests/heap/cppgc/write-barrier-unittest.cc
index 5673d47c8c447d..c179635c8ac2d2 100644
--- a/deps/v8/test/unittests/heap/cppgc/write-barrier-unittest.cc
+++ b/deps/v8/test/unittests/heap/cppgc/write-barrier-unittest.cc
@@ -8,7 +8,9 @@
 #include <initializer_list>
 #include <vector>
 
+#include "include/cppgc/heap-consistency.h"
 #include "include/cppgc/internal/pointer-policies.h"
+#include "src/base/logging.h"
 #include "src/heap/cppgc/heap-object-header.h"
 #include "src/heap/cppgc/marker.h"
 #include "test/unittests/heap/cppgc/tests.h"
@@ -19,7 +21,7 @@ namespace internal {
 
 namespace {
 
-class IncrementalMarkingScope {
+class V8_NODISCARD IncrementalMarkingScope {
  public:
   explicit IncrementalMarkingScope(MarkerBase* marker) : marker_(marker) {}
 
@@ -38,7 +40,8 @@ class IncrementalMarkingScope {
 
 constexpr Marker::MarkingConfig IncrementalMarkingScope::kIncrementalConfig;
 
-class ExpectWriteBarrierFires final : private IncrementalMarkingScope {
+class V8_NODISCARD ExpectWriteBarrierFires final
+    : private IncrementalMarkingScope {
  public:
   ExpectWriteBarrierFires(MarkerBase* marker,
                           std::initializer_list<void*> objects)
@@ -88,7 +91,8 @@ class ExpectWriteBarrierFires final : private IncrementalMarkingScope {
   std::vector<HeapObjectHeader*> headers_;
 };
 
-class ExpectNoWriteBarrierFires final : private IncrementalMarkingScope {
+class V8_NODISCARD ExpectNoWriteBarrierFires final
+    : private IncrementalMarkingScope {
  public:
   ExpectNoWriteBarrierFires(MarkerBase* marker,
                             std::initializer_list<void*> objects)
@@ -143,6 +147,7 @@ class GCed : public GarbageCollected<GCed> {
 class WriteBarrierTest : public testing::TestWithHeap {
  public:
   WriteBarrierTest() : internal_heap_(Heap::From(GetHeap())) {
+    DCHECK_NULL(GetMarkerRef().get());
     GetMarkerRef() = MarkerFactory::CreateAndStartMarking<Marker>(
         *internal_heap_, GetPlatformHandle().get(),
         IncrementalMarkingScope::kIncrementalConfig);
@@ -317,5 +322,149 @@ TEST_F(WriteBarrierTest, NoWriteBarrierOnMarkedMixinApplication) {
   }
 }
 
+// =============================================================================
+// Raw barriers. ===============================================================
+// =============================================================================
+
+using WriteBarrierParams = subtle::HeapConsistency::WriteBarrierParams;
+using WriteBarrierType = subtle::HeapConsistency::WriteBarrierType;
+using subtle::HeapConsistency;
+
+TEST_F(NoWriteBarrierTest, WriteBarrierBailoutWhenMarkingIsOff) {
+  auto* object1 = MakeGarbageCollected<GCed>(GetAllocationHandle());
+  auto* object2 = MakeGarbageCollected<GCed>(GetAllocationHandle(), object1);
+  {
+    EXPECT_FALSE(object1->IsMarked());
+    WriteBarrierParams params;
+#if defined(CPPGC_YOUNG_GENERATION)
+    WriteBarrierType expected = WriteBarrierType::kGenerational;
+#else   // !CPPGC_YOUNG_GENERATION
+    WriteBarrierType expected = WriteBarrierType::kNone;
+#endif  // !CPPGC_YOUNG_GENERATION
+    EXPECT_EQ(expected, HeapConsistency::GetWriteBarrierType(
+                            object2->next_ref().GetSlotForTesting(),
+                            object2->next_ref().Get(), params));
+    EXPECT_FALSE(object1->IsMarked());
+  }
+}
+
+TEST_F(WriteBarrierTest, DijkstraWriteBarrierTriggersWhenMarkingIsOn) {
+  auto* object1 = MakeGarbageCollected<GCed>(GetAllocationHandle());
+  auto* object2 = MakeGarbageCollected<GCed>(GetAllocationHandle(), object1);
+  {
+    ExpectWriteBarrierFires scope(marker(), {object1});
+    EXPECT_FALSE(object1->IsMarked());
+    WriteBarrierParams params;
+    EXPECT_EQ(WriteBarrierType::kMarking,
+              HeapConsistency::GetWriteBarrierType(
+                  object2->next_ref().GetSlotForTesting(),
+                  object2->next_ref().Get(), params));
+    HeapConsistency::DijkstraWriteBarrier(params, object2->next_ref().Get());
+    EXPECT_TRUE(object1->IsMarked());
+  }
+}
+
+TEST_F(WriteBarrierTest, DijkstraWriteBarrierBailoutIfMarked) {
+  auto* object1 = MakeGarbageCollected<GCed>(GetAllocationHandle());
+  auto* object2 = MakeGarbageCollected<GCed>(GetAllocationHandle(), object1);
+  EXPECT_TRUE(HeapObjectHeader::FromPayload(object1).TryMarkAtomic());
+  {
+    ExpectNoWriteBarrierFires scope(marker(), {object1});
+    WriteBarrierParams params;
+    EXPECT_EQ(WriteBarrierType::kMarking,
+              HeapConsistency::GetWriteBarrierType(
+                  object2->next_ref().GetSlotForTesting(),
+                  object2->next_ref().Get(), params));
+    HeapConsistency::DijkstraWriteBarrier(params, object2->next_ref().Get());
+  }
+}
+
+namespace {
+
+struct InlinedObject {
+  void Trace(cppgc::Visitor* v) const { v->Trace(ref); }
+
+  Member<GCed> ref;
+};
+
+class GCedWithInlinedArray : public GarbageCollected<GCed> {
+ public:
+  static constexpr size_t kNumReferences = 4;
+
+  explicit GCedWithInlinedArray(GCed* value2) {
+    new (&objects[2].ref) Member<GCed>(value2);
+  }
+
+  void Trace(cppgc::Visitor* v) const {
+    for (size_t i = 0; i < kNumReferences; ++i) {
+      v->Trace(objects[i]);
+    }
+  }
+
+  InlinedObject objects[kNumReferences];
+};
+
+}  // namespace
+
+TEST_F(WriteBarrierTest, DijkstraWriteBarrierRangeTriggersWhenMarkingIsOn) {
+  auto* object1 = MakeGarbageCollected<GCed>(GetAllocationHandle());
+  auto* object2 = MakeGarbageCollected<GCedWithInlinedArray>(
+      GetAllocationHandle(), object1);
+  {
+    ExpectWriteBarrierFires scope(marker(), {object1});
+    EXPECT_FALSE(object1->IsMarked());
+    WriteBarrierParams params;
+    EXPECT_EQ(WriteBarrierType::kMarking,
+              HeapConsistency::GetWriteBarrierType(object2->objects, params));
+    HeapConsistency::DijkstraWriteBarrierRange(
+        params, GetHeap()->GetHeapHandle(), object2->objects,
+        sizeof(InlinedObject), 4, TraceTrait<InlinedObject>::Trace);
+    EXPECT_TRUE(object1->IsMarked());
+  }
+}
+
+TEST_F(WriteBarrierTest, DijkstraWriteBarrierRangeBailoutIfMarked) {
+  auto* object1 = MakeGarbageCollected<GCed>(GetAllocationHandle());
+  auto* object2 = MakeGarbageCollected<GCedWithInlinedArray>(
+      GetAllocationHandle(), object1);
+  EXPECT_TRUE(HeapObjectHeader::FromPayload(object1).TryMarkAtomic());
+  {
+    ExpectNoWriteBarrierFires scope(marker(), {object1});
+    WriteBarrierParams params;
+    EXPECT_EQ(WriteBarrierType::kMarking,
+              HeapConsistency::GetWriteBarrierType(object2->objects, params));
+    HeapConsistency::DijkstraWriteBarrierRange(
+        params, GetHeap()->GetHeapHandle(), object2->objects,
+        sizeof(InlinedObject), 4, TraceTrait<InlinedObject>::Trace);
+  }
+}
+
+TEST_F(WriteBarrierTest, SteeleWriteBarrierTriggersWhenMarkingIsOn) {
+  auto* object1 = MakeGarbageCollected<GCed>(GetAllocationHandle());
+  auto* object2 = MakeGarbageCollected<GCed>(GetAllocationHandle(), object1);
+  {
+    ExpectWriteBarrierFires scope(marker(), {object1});
+    EXPECT_TRUE(HeapObjectHeader::FromPayload(object1).TryMarkAtomic());
+    WriteBarrierParams params;
+    EXPECT_EQ(WriteBarrierType::kMarking,
+              HeapConsistency::GetWriteBarrierType(object2->next_ref().Get(),
+                                                   params));
+    HeapConsistency::SteeleWriteBarrier(params, object2->next_ref().Get());
+  }
+}
+
+TEST_F(WriteBarrierTest, SteeleWriteBarrierBailoutIfNotMarked) {
+  auto* object1 = MakeGarbageCollected<GCed>(GetAllocationHandle());
+  auto* object2 = MakeGarbageCollected<GCed>(GetAllocationHandle(), object1);
+  {
+    ExpectNoWriteBarrierFires scope(marker(), {object1});
+    WriteBarrierParams params;
+    EXPECT_EQ(WriteBarrierType::kMarking,
+              HeapConsistency::GetWriteBarrierType(object2->next_ref().Get(),
+                                                   params));
+    HeapConsistency::SteeleWriteBarrier(params, object2->next_ref().Get());
+  }
+}
+
 }  // namespace internal
 }  // namespace cppgc
diff --git a/deps/v8/test/unittests/heap/gc-tracer-unittest.cc b/deps/v8/test/unittests/heap/gc-tracer-unittest.cc
index 742e86c357e258..eefacb33edc7db 100644
--- a/deps/v8/test/unittests/heap/gc-tracer-unittest.cc
+++ b/deps/v8/test/unittests/heap/gc-tracer-unittest.cc
@@ -354,10 +354,10 @@ TEST_F(GCTracerTest, BackgroundScavengerScope) {
   tracer->ResetForTesting();
   tracer->Start(SCAVENGER, GarbageCollectionReason::kTesting,
                 "collector unittest");
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL, 10);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL, 1);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL, 10);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::SCAVENGER_BACKGROUND_SCAVENGE_PARALLEL, 1);
   tracer->Stop(SCAVENGER);
   EXPECT_DOUBLE_EQ(
       11, tracer->current_
@@ -369,20 +369,18 @@ TEST_F(GCTracerTest, BackgroundMinorMCScope) {
   tracer->ResetForTesting();
   tracer->Start(MINOR_MARK_COMPACTOR, GarbageCollectionReason::kTesting,
                 "collector unittest");
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_MARKING, 10);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_MARKING, 1);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_EVACUATE_COPY, 20);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_EVACUATE_COPY, 2);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_EVACUATE_UPDATE_POINTERS,
-      30);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MINOR_MC_BACKGROUND_EVACUATE_UPDATE_POINTERS,
-      3);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MINOR_MC_BACKGROUND_MARKING,
+                                   10);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MINOR_MC_BACKGROUND_MARKING,
+                                   1);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::MINOR_MC_BACKGROUND_EVACUATE_COPY, 20);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::MINOR_MC_BACKGROUND_EVACUATE_COPY, 2);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::MINOR_MC_BACKGROUND_EVACUATE_UPDATE_POINTERS, 30);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::MINOR_MC_BACKGROUND_EVACUATE_UPDATE_POINTERS, 3);
   tracer->Stop(MINOR_MARK_COMPACTOR);
   EXPECT_DOUBLE_EQ(
       11,
@@ -398,32 +396,27 @@ TEST_F(GCTracerTest, BackgroundMinorMCScope) {
 TEST_F(GCTracerTest, BackgroundMajorMCScope) {
   GCTracer* tracer = i_isolate()->heap()->tracer();
   tracer->ResetForTesting();
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_MARKING, 100);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_SWEEPING, 200);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_MARKING, 10);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_MARKING, 100);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_SWEEPING,
+                                   200);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_MARKING, 10);
   // Scavenger should not affect the major mark-compact scopes.
   tracer->Start(SCAVENGER, GarbageCollectionReason::kTesting,
                 "collector unittest");
   tracer->Stop(SCAVENGER);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_SWEEPING, 20);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_MARKING, 1);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_SWEEPING, 2);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_SWEEPING, 20);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_MARKING, 1);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_SWEEPING, 2);
   tracer->Start(MARK_COMPACTOR, GarbageCollectionReason::kTesting,
                 "collector unittest");
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_EVACUATE_COPY, 30);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_EVACUATE_COPY, 3);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS, 40);
-  tracer->AddBackgroundScopeSample(
-      GCTracer::BackgroundScope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS, 4);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_EVACUATE_COPY,
+                                   30);
+  tracer->AddScopeSampleBackground(GCTracer::Scope::MC_BACKGROUND_EVACUATE_COPY,
+                                   3);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS, 40);
+  tracer->AddScopeSampleBackground(
+      GCTracer::Scope::MC_BACKGROUND_EVACUATE_UPDATE_POINTERS, 4);
   tracer->Stop(MARK_COMPACTOR);
   EXPECT_DOUBLE_EQ(
       111, tracer->current_.scopes[GCTracer::Scope::MC_BACKGROUND_MARKING]);
@@ -442,8 +435,8 @@ class ThreadWithBackgroundScope final : public base::Thread {
   explicit ThreadWithBackgroundScope(GCTracer* tracer)
       : Thread(Options("ThreadWithBackgroundScope")), tracer_(tracer) {}
   void Run() override {
-    GCTracer::BackgroundScope scope(
-        tracer_, GCTracer::BackgroundScope::MC_BACKGROUND_MARKING, nullptr);
+    GCTracer::Scope scope(tracer_, GCTracer::Scope::MC_BACKGROUND_MARKING,
+                          ThreadKind::kBackground);
   }
 
  private:
diff --git a/deps/v8/test/unittests/heap/heap-controller-unittest.cc b/deps/v8/test/unittests/heap/heap-controller-unittest.cc
index db330608f2074c..91e0dbfcce8b69 100644
--- a/deps/v8/test/unittests/heap/heap-controller-unittest.cc
+++ b/deps/v8/test/unittests/heap/heap-controller-unittest.cc
@@ -79,13 +79,13 @@ TEST_F(MemoryControllerTest, OldGenerationAllocationLimit) {
                 heap, old_gen_size, 0u, max_old_generation_size,
                 new_space_capacity, factor, Heap::HeapGrowingMode::kDefault));
 
-  factor = Min(factor, V8HeapTrait::kConservativeGrowingFactor);
+  factor = std::min({factor, V8HeapTrait::kConservativeGrowingFactor});
   EXPECT_EQ(static_cast<size_t>(old_gen_size * factor + new_space_capacity),
             V8Controller::CalculateAllocationLimit(
                 heap, old_gen_size, 0u, max_old_generation_size,
                 new_space_capacity, factor, Heap::HeapGrowingMode::kSlow));
 
-  factor = Min(factor, V8HeapTrait::kConservativeGrowingFactor);
+  factor = std::min({factor, V8HeapTrait::kConservativeGrowingFactor});
   EXPECT_EQ(
       static_cast<size_t>(old_gen_size * factor + new_space_capacity),
       V8Controller::CalculateAllocationLimit(
diff --git a/deps/v8/test/unittests/heap/local-factory-unittest.cc b/deps/v8/test/unittests/heap/local-factory-unittest.cc
index a5b9646d3cf547..a41ce1a3e16b66 100644
--- a/deps/v8/test/unittests/heap/local-factory-unittest.cc
+++ b/deps/v8/test/unittests/heap/local-factory-unittest.cc
@@ -62,8 +62,7 @@ class LocalFactoryTest : public TestWithIsolateAndZone {
                 isolate(), true, construct_language_mode(FLAG_use_strict),
                 REPLMode::kNo),
             &state_),
-        local_isolate_(isolate(), ThreadKind::kMain),
-        unparked_scope_(local_isolate_.heap()) {
+        local_isolate_(isolate()->main_thread_local_isolate()) {
     FLAG_concurrent_allocation = true;
   }
 
@@ -79,8 +78,7 @@ class LocalFactoryTest : public TestWithIsolateAndZone {
         ScannerStream::ForTesting(utf16_source.data(), utf16_source.size()));
 
     {
-      DisallowHeapAllocation no_allocation;
-      DisallowHandleAllocation no_handles;
+      DisallowGarbageCollection no_gc;
       DisallowHeapAccess no_heap_access;
 
       Parser parser(parse_info());
@@ -107,15 +105,14 @@ class LocalFactoryTest : public TestWithIsolateAndZone {
 
   Handle<Script> script() { return script_; }
 
-  LocalIsolate* local_isolate() { return &local_isolate_; }
+  LocalIsolate* local_isolate() { return local_isolate_; }
   LocalFactory* local_factory() { return local_isolate()->factory(); }
 
  private:
   SaveFlags save_flags_;
   UnoptimizedCompileState state_;
   ParseInfo parse_info_;
-  LocalIsolate local_isolate_;
-  UnparkedScope unparked_scope_;
+  LocalIsolate* local_isolate_;
   Handle<String> source_string_;
   Handle<Script> script_;
 };
diff --git a/deps/v8/test/unittests/heap/local-heap-unittest.cc b/deps/v8/test/unittests/heap/local-heap-unittest.cc
index 06dfede8950206..f08e6e03ff3603 100644
--- a/deps/v8/test/unittests/heap/local-heap-unittest.cc
+++ b/deps/v8/test/unittests/heap/local-heap-unittest.cc
@@ -15,15 +15,7 @@ using LocalHeapTest = TestWithIsolate;
 
 TEST_F(LocalHeapTest, Initialize) {
   Heap* heap = i_isolate()->heap();
-
-  CHECK(!heap->safepoint()->ContainsAnyLocalHeap());
-
-  {
-    LocalHeap lh(heap, ThreadKind::kMain);
-    CHECK(heap->safepoint()->ContainsLocalHeap(&lh));
-  }
-
-  CHECK(!heap->safepoint()->ContainsAnyLocalHeap());
+  CHECK(heap->safepoint()->ContainsAnyLocalHeap());
 }
 
 TEST_F(LocalHeapTest, Current) {
@@ -33,14 +25,14 @@ TEST_F(LocalHeapTest, Current) {
 
   {
     LocalHeap lh(heap, ThreadKind::kMain);
-    CHECK_EQ(&lh, LocalHeap::Current());
+    CHECK_NULL(LocalHeap::Current());
   }
 
   CHECK_NULL(LocalHeap::Current());
 
   {
     LocalHeap lh(heap, ThreadKind::kMain);
-    CHECK_EQ(&lh, LocalHeap::Current());
+    CHECK_NULL(LocalHeap::Current());
   }
 
   CHECK_NULL(LocalHeap::Current());
@@ -73,9 +65,9 @@ TEST_F(LocalHeapTest, CurrentBackground) {
     LocalHeap lh(heap, ThreadKind::kMain);
     auto thread = std::make_unique<BackgroundThread>(heap);
     CHECK(thread->Start());
-    CHECK_EQ(&lh, LocalHeap::Current());
+    CHECK_NULL(LocalHeap::Current());
     thread->Join();
-    CHECK_EQ(&lh, LocalHeap::Current());
+    CHECK_NULL(LocalHeap::Current());
   }
   CHECK_NULL(LocalHeap::Current());
 }
diff --git a/deps/v8/test/unittests/heap/safepoint-unittest.cc b/deps/v8/test/unittests/heap/safepoint-unittest.cc
index 4ae34adc22eecd..0846e0de6fe1fd 100644
--- a/deps/v8/test/unittests/heap/safepoint-unittest.cc
+++ b/deps/v8/test/unittests/heap/safepoint-unittest.cc
@@ -3,10 +3,12 @@
 // found in the LICENSE file.
 
 #include "src/heap/safepoint.h"
+
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/platform.h"
 #include "src/heap/heap.h"
 #include "src/heap/local-heap.h"
+#include "src/heap/parked-scope.h"
 #include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -144,25 +146,5 @@ TEST_F(SafepointTest, StopRunningThreads) {
   CHECK_EQ(safepoint_count, kRuns * kSafepoints);
 }
 
-TEST_F(SafepointTest, SkipLocalHeapOfThisThread) {
-  EnsureFlagLocalHeapsEnabled();
-  Heap* heap = i_isolate()->heap();
-  LocalHeap local_heap(heap, ThreadKind::kMain);
-  UnparkedScope unparked_scope(&local_heap);
-  {
-    SafepointScope scope(heap);
-    local_heap.Safepoint();
-  }
-  {
-    ParkedScope parked_scope(&local_heap);
-    SafepointScope scope(heap);
-    local_heap.Safepoint();
-  }
-  {
-    SafepointScope scope(heap);
-    local_heap.Safepoint();
-  }
-}
-
 }  // namespace internal
 }  // namespace v8
diff --git a/deps/v8/test/unittests/heap/unified-heap-snapshot-unittest.cc b/deps/v8/test/unittests/heap/unified-heap-snapshot-unittest.cc
index 0f8363d0693aff..c06e85a69e3b20 100644
--- a/deps/v8/test/unittests/heap/unified-heap-snapshot-unittest.cc
+++ b/deps/v8/test/unittests/heap/unified-heap-snapshot-unittest.cc
@@ -14,7 +14,9 @@
 #include "include/v8-profiler.h"
 #include "src/api/api-inl.h"
 #include "src/heap/cppgc-js/cpp-heap.h"
+#include "src/heap/cppgc/heap-object-header.h"
 #include "src/heap/cppgc/object-allocator.h"
+#include "src/objects/heap-object.h"
 #include "src/objects/objects-inl.h"
 #include "src/profiler/heap-snapshot-generator-inl.h"
 #include "src/profiler/heap-snapshot-generator.h"
@@ -285,7 +287,7 @@ class GCedWithJSRef : public cppgc::GarbageCollected<GCedWithJSRef> {
 };
 constexpr const char GCedWithJSRef::kExpectedName[];
 
-class JsTestingScope {
+class V8_NODISCARD JsTestingScope {
  public:
   explicit JsTestingScope(v8::Isolate* isolate)
       : isolate_(isolate),
@@ -314,6 +316,18 @@ cppgc::Persistent<GCedWithJSRef> SetupWrapperWrappablePair(
   return std::move(gc_w_js_ref);
 }
 
+template <typename Callback>
+void ForEachEntryWithName(const v8::HeapSnapshot* snapshot, const char* needle,
+                          Callback callback) {
+  const HeapSnapshot* heap_snapshot =
+      reinterpret_cast<const HeapSnapshot*>(snapshot);
+  for (const HeapEntry& entry : heap_snapshot->entries()) {
+    if (strcmp(entry.name(), needle) == 0) {
+      callback(entry);
+    }
+  }
+}
+
 }  // namespace
 
 TEST_F(UnifiedHeapSnapshotTest, JSReferenceForcesVisibleObject) {
@@ -335,8 +349,8 @@ TEST_F(UnifiedHeapSnapshotTest, JSReferenceForcesVisibleObject) {
 
 TEST_F(UnifiedHeapSnapshotTest, MergedWrapperNode) {
   // Test ensures that the snapshot sets a wrapper node for C++->JS references
-  // that have a class id set and that object nodes are merged into the C++
-  // node, i.e., the directly reachable JS object is merged into the C++ object.
+  // that have a class id set and that object nodes are merged. In practice, the
+  // C++ node is merged into the existing JS node.
   JsTestingScope testing_scope(v8_isolate());
   cppgc::Persistent<GCedWithJSRef> gc_w_js_ref = SetupWrapperWrappablePair(
       testing_scope, allocation_handle(), "MergedObject");
@@ -356,14 +370,22 @@ TEST_F(UnifiedHeapSnapshotTest, MergedWrapperNode) {
       .ToChecked();
   const v8::HeapSnapshot* snapshot = TakeHeapSnapshot();
   EXPECT_TRUE(IsValidSnapshot(snapshot));
-  EXPECT_TRUE(
-      ContainsRetainingPath(*snapshot,
-                            {
-                                kExpectedCppRootsName,             // NOLINT
-                                GetExpectedName<GCedWithJSRef>(),  // NOLINT
-                                // MergedObject is merged into GCedWithJSRef.
-                                "NextObject"  // NOLINT
-                            }));
+  EXPECT_TRUE(ContainsRetainingPath(
+      *snapshot,
+      {
+          kExpectedCppRootsName,             // NOLINT
+          GetExpectedName<GCedWithJSRef>(),  // NOLINT
+          // GCedWithJSRef is merged into MergedObject, replacing its name.
+          "NextObject"  // NOLINT
+      }));
+  const size_t cpp_size =
+      cppgc::internal::HeapObjectHeader::FromPayload(gc_w_js_ref.Get())
+          .GetSize();
+  const size_t js_size = Utils::OpenHandle(*wrapper_object)->Size();
+  ForEachEntryWithName(snapshot, GetExpectedName<GCedWithJSRef>(),
+                       [cpp_size, js_size](const HeapEntry& entry) {
+                         EXPECT_EQ(cpp_size + js_size, entry.self_size());
+                       });
 }
 
 namespace {
@@ -388,18 +410,6 @@ class DetachednessHandler {
 // static
 size_t DetachednessHandler::callback_count = 0;
 
-template <typename Callback>
-void ForEachEntryWithName(const v8::HeapSnapshot* snapshot, const char* needle,
-                          Callback callback) {
-  const HeapSnapshot* heap_snapshot =
-      reinterpret_cast<const HeapSnapshot*>(snapshot);
-  for (const HeapEntry& entry : heap_snapshot->entries()) {
-    if (strcmp(entry.name(), needle) == 0) {
-      callback(entry);
-    }
-  }
-}
-
 constexpr uint8_t kExpectedDetachedValueForUnknown =
     static_cast<uint8_t>(v8::EmbedderGraph::Node::Detachedness::kUnknown);
 constexpr uint8_t kExpectedDetachedValueForAttached =
diff --git a/deps/v8/test/unittests/heap/unified-heap-utils.cc b/deps/v8/test/unittests/heap/unified-heap-utils.cc
index 905e09b07a901c..03ca79f21fb838 100644
--- a/deps/v8/test/unittests/heap/unified-heap-utils.cc
+++ b/deps/v8/test/unittests/heap/unified-heap-utils.cc
@@ -5,8 +5,10 @@
 #include "test/unittests/heap/unified-heap-utils.h"
 
 #include "include/cppgc/platform.h"
+#include "include/v8-cppgc.h"
 #include "src/api/api-inl.h"
 #include "src/heap/cppgc-js/cpp-heap.h"
+#include "src/heap/heap.h"
 #include "src/objects/objects-inl.h"
 
 namespace v8 {
@@ -15,16 +17,11 @@ namespace internal {
 UnifiedHeapTest::UnifiedHeapTest()
     : saved_incremental_marking_wrappers_(FLAG_incremental_marking_wrappers) {
   FLAG_incremental_marking_wrappers = false;
-  cppgc::InitializeProcess(V8::GetCurrentPlatform()->GetPageAllocator());
-  cpp_heap_ = std::make_unique<CppHeap>(
-      v8_isolate(), std::vector<std::unique_ptr<cppgc::CustomSpaceBase>>());
-  heap()->SetEmbedderHeapTracer(&cpp_heap());
+  isolate()->heap()->ConfigureCppHeap(std::make_unique<CppHeapCreateParams>());
 }
 
 UnifiedHeapTest::~UnifiedHeapTest() {
-  heap()->SetEmbedderHeapTracer(nullptr);
   FLAG_incremental_marking_wrappers = saved_incremental_marking_wrappers_;
-  cppgc::ShutdownProcess();
 }
 
 void UnifiedHeapTest::CollectGarbageWithEmbedderStack() {
@@ -39,7 +36,9 @@ void UnifiedHeapTest::CollectGarbageWithoutEmbedderStack() {
   CollectGarbage(OLD_SPACE);
 }
 
-CppHeap& UnifiedHeapTest::cpp_heap() const { return *cpp_heap_.get(); }
+CppHeap& UnifiedHeapTest::cpp_heap() const {
+  return *CppHeap::From(isolate()->heap()->cpp_heap());
+}
 
 cppgc::AllocationHandle& UnifiedHeapTest::allocation_handle() {
   return cpp_heap().object_allocator();
diff --git a/deps/v8/test/unittests/heap/unified-heap-utils.h b/deps/v8/test/unittests/heap/unified-heap-utils.h
index e11ab11c42fcde..6c37f03163048a 100644
--- a/deps/v8/test/unittests/heap/unified-heap-utils.h
+++ b/deps/v8/test/unittests/heap/unified-heap-utils.h
@@ -26,7 +26,6 @@ class UnifiedHeapTest : public TestWithHeapInternals {
   cppgc::AllocationHandle& allocation_handle();
 
  private:
-  std::unique_ptr<CppHeap> cpp_heap_;
   bool saved_incremental_marking_wrappers_;
 };
 
diff --git a/deps/v8/test/unittests/logging/counters-unittest.cc b/deps/v8/test/unittests/logging/counters-unittest.cc
index c27c33e3e80f30..c0ab18343bea41 100644
--- a/deps/v8/test/unittests/logging/counters-unittest.cc
+++ b/deps/v8/test/unittests/logging/counters-unittest.cc
@@ -119,7 +119,7 @@ class RuntimeCallStatsTest : public TestWithNativeContext {
 };
 
 // Temporarily use the native time to modify the test time.
-class ElapsedTimeScope {
+class V8_NODISCARD ElapsedTimeScope {
  public:
   explicit ElapsedTimeScope(RuntimeCallStatsTest* test) : test_(test) {
     timer_.Start();
@@ -132,7 +132,7 @@ class ElapsedTimeScope {
 };
 
 // Temporarily use the default time source.
-class NativeTimeScope {
+class V8_NODISCARD NativeTimeScope {
  public:
   NativeTimeScope() {
     CHECK_EQ(RuntimeCallTimer::Now, &RuntimeCallStatsTestNow);
diff --git a/deps/v8/test/unittests/objects/object-unittest.cc b/deps/v8/test/unittests/objects/object-unittest.cc
index f12f366318c414..e5aea4c68207f8 100644
--- a/deps/v8/test/unittests/objects/object-unittest.cc
+++ b/deps/v8/test/unittests/objects/object-unittest.cc
@@ -171,7 +171,6 @@ TEST_F(TestWithNativeContext, EmptyFunctionScopeInfo) {
       isolate()->empty_function()->shared().scope_info(),
       function->GetIsolate());
 
-  EXPECT_EQ(scope_info->length(), empty_function_scope_info->length());
   EXPECT_EQ(scope_info->Flags(), empty_function_scope_info->Flags());
   EXPECT_EQ(scope_info->ParameterCount(),
             empty_function_scope_info->ParameterCount());
@@ -197,7 +196,7 @@ TEST_F(TestWithNativeContext, RecreateScopeInfoWithLocalsBlocklistWorks) {
   Handle<ScopeInfo> scope_info = ScopeInfo::RecreateWithBlockList(
       isolate(), original_scope_info, blocklist);
 
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
   EXPECT_TRUE(scope_info->HasLocalsBlockList());
   EXPECT_TRUE(scope_info->LocalsBlockList().Has(isolate(), foo_string));
   EXPECT_FALSE(scope_info->LocalsBlockList().Has(isolate(), bar_string));
diff --git a/deps/v8/test/unittests/profiler/strings-storage-unittest.cc b/deps/v8/test/unittests/profiler/strings-storage-unittest.cc
index 087a7bf7353272..a15640ce653a26 100644
--- a/deps/v8/test/unittests/profiler/strings-storage-unittest.cc
+++ b/deps/v8/test/unittests/profiler/strings-storage-unittest.cc
@@ -141,20 +141,27 @@ TEST_F(StringsStorageWithIsolate, Refcounting) {
   CHECK_EQ(storage.GetStringCountForTesting(), 1);
   CHECK(storage.Release(d));
   CHECK_EQ(storage.GetStringCountForTesting(), 0);
-#if !DEBUG
   CHECK(!storage.Release("12"));
-#endif  // !DEBUG
 }
 
 TEST_F(StringsStorageWithIsolate, InvalidRelease) {
   StringsStorage storage;
 
-  // If a refcount becomes invalid, throw in debug builds.
-#ifdef DEBUG
-  ASSERT_DEATH_IF_SUPPORTED(storage.Release("12"), "check failed");
-#else
+  // If we attempt to release a string not being managed by the StringsStorage,
+  // return false.
   CHECK(!storage.Release("12"));
-#endif  // DEBUG
+}
+
+TEST_F(StringsStorageWithIsolate, CopyAndConsShareStorage) {
+  StringsStorage storage;
+
+  Handle<String> str = isolate()->factory()->NewStringFromAsciiChecked("foo");
+
+  const char* copy_str = storage.GetCopy("get foo");
+  const char* cons_str = storage.GetConsName("get ", *str);
+
+  CHECK_EQ(storage.GetStringCountForTesting(), 1);
+  CHECK_EQ(copy_str, cons_str);
 }
 
 }  // namespace internal
diff --git a/deps/v8/test/unittests/regress/regress-crbug-1056054-unittest.cc b/deps/v8/test/unittests/regress/regress-crbug-1056054-unittest.cc
index 4478e9f94d438b..2e15bae6f5d5bb 100644
--- a/deps/v8/test/unittests/regress/regress-crbug-1056054-unittest.cc
+++ b/deps/v8/test/unittests/regress/regress-crbug-1056054-unittest.cc
@@ -13,7 +13,7 @@ using EnumIndexOverflowTest = TestWithNativeContextAndZone;
 
 TEST_F(EnumIndexOverflowTest, GlobalObject) {
   Handle<GlobalDictionary> dictionary(
-      isolate()->global_object()->global_dictionary(), isolate());
+      isolate()->global_object()->global_dictionary(kAcquireLoad), isolate());
   dictionary->set_next_enumeration_index(
       PropertyDetails::DictionaryStorageField::kMax);
   Handle<Object> value(Smi::FromInt(static_cast<int>(42)), isolate());
diff --git a/deps/v8/test/unittests/tasks/background-compile-task-unittest.cc b/deps/v8/test/unittests/tasks/background-compile-task-unittest.cc
index 323e429139bcc8..92d45f79499a53 100644
--- a/deps/v8/test/unittests/tasks/background-compile-task-unittest.cc
+++ b/deps/v8/test/unittests/tasks/background-compile-task-unittest.cc
@@ -38,8 +38,6 @@ class BackgroundCompileTaskTest : public TestWithNativeContext {
   static void SetUpTestCase() {
     CHECK_NULL(save_flags_);
     save_flags_ = new SaveFlags();
-    // TODO(leszeks): Support background finalization in compiler dispatcher.
-    FLAG_finalize_streaming_on_background = false;
     TestWithNativeContext::SetUpTestCase();
   }
 
@@ -87,6 +85,15 @@ class BackgroundCompileTaskTest : public TestWithNativeContext {
         isolate->counters()->compile_function_on_background(), FLAG_stack_size);
   }
 
+ protected:
+  void SetUp() override {
+    // TODO(leszeks): Support background finalization in compiler dispatcher.
+    if (FLAG_finalize_streaming_on_background) {
+      GTEST_SKIP_(
+          "Parallel compile tasks don't yet support background finalization");
+    }
+  }
+
  private:
   AccountingAllocator* allocator_;
   static SaveFlags* save_flags_;
diff --git a/deps/v8/test/unittests/test-utils.h b/deps/v8/test/unittests/test-utils.h
index d1301b8848a594..541574df6d973c 100644
--- a/deps/v8/test/unittests/test-utils.h
+++ b/deps/v8/test/unittests/test-utils.h
@@ -230,7 +230,7 @@ using TestWithNativeContextAndZone =    //
                     WithIsolateMixin<   //
                         ::testing::Test>>>>>;
 
-class SaveFlags {
+class V8_NODISCARD SaveFlags {
  public:
   SaveFlags();
   ~SaveFlags();
diff --git a/deps/v8/test/unittests/torque/torque-unittest.cc b/deps/v8/test/unittests/torque/torque-unittest.cc
index 2d5e14a9fd26f9..ca62119e566f5f 100644
--- a/deps/v8/test/unittests/torque/torque-unittest.cc
+++ b/deps/v8/test/unittests/torque/torque-unittest.cc
@@ -45,6 +45,8 @@ type Smi extends StrongTagged generates 'TNode<Smi>' constexpr 'Smi';
 type WeakHeapObject extends Tagged;
 type Weak<T : type extends HeapObject> extends WeakHeapObject;
 type Uninitialized extends Tagged;
+type TaggedIndex extends StrongTagged;
+type TaggedZeroPattern extends TaggedIndex;
 
 @abstract
 extern class HeapObject extends StrongTagged {
diff --git a/deps/v8/test/unittests/unittests.status b/deps/v8/test/unittests/unittests.status
index 283bb9606c5950..f799bb9eae6101 100644
--- a/deps/v8/test/unittests/unittests.status
+++ b/deps/v8/test/unittests/unittests.status
@@ -45,6 +45,12 @@
   'ValueSerializerTestWithWasm.*': [SKIP],
 }], # lite_mode or variant == jitless
 
+##############################################################################
+['system == aix', {
+  # PASE does not support detecting physical memory size
+  'SysInfoTest.AmountOfPhysicalMemory': [SKIP],
+}],  # system == aix
+
 ##############################################################################
 ['system == windows and asan', {
   # BUG(893437).
diff --git a/deps/v8/test/unittests/wasm/function-body-decoder-unittest.cc b/deps/v8/test/unittests/wasm/function-body-decoder-unittest.cc
index 312fdacb3e3cd1..b445cedcd8bedb 100644
--- a/deps/v8/test/unittests/wasm/function-body-decoder-unittest.cc
+++ b/deps/v8/test/unittests/wasm/function-body-decoder-unittest.cc
@@ -44,8 +44,8 @@ namespace function_body_decoder_unittest {
 
 static const byte kCodeGetLocal0[] = {kExprLocalGet, 0};
 static const byte kCodeGetLocal1[] = {kExprLocalGet, 1};
-static const byte kCodeSetLocal0[] = {WASM_SET_LOCAL(0, WASM_ZERO)};
-static const byte kCodeTeeLocal0[] = {WASM_TEE_LOCAL(0, WASM_ZERO)};
+static const byte kCodeSetLocal0[] = {WASM_LOCAL_SET(0, WASM_ZERO)};
+static const byte kCodeTeeLocal0[] = {WASM_LOCAL_TEE(0, WASM_ZERO)};
 
 static const ValueType kValueTypes[] = {kWasmI32, kWasmI64, kWasmF32, kWasmF64,
                                         kWasmExternRef};
@@ -185,19 +185,18 @@ class TestModuleBuilder {
   WasmModule mod;
 };
 
-class FunctionBodyDecoderTest : public TestWithZone {
+template <class BaseTest>
+class FunctionBodyDecoderTestBase : public WithZoneMixin<BaseTest> {
  public:
   using LocalsDecl = std::pair<uint32_t, ValueType>;
   // All features are disabled by default and must be activated with
   // a WASM_FEATURE_SCOPE in individual tests.
   WasmFeatures enabled_features_ = WasmFeatures::None();
 
-  FunctionBodyDecoderTest() : local_decls(zone()) {}
-
   TestSignatures sigs;
   TestModuleBuilder builder;
   WasmModule* module = builder.module();
-  LocalDeclEncoder local_decls;
+  LocalDeclEncoder local_decls{this->zone()};
 
   void AddLocals(ValueType type, uint32_t count) {
     local_decls.AddLocals(count, type);
@@ -210,7 +209,7 @@ class FunctionBodyDecoderTest : public TestWithZone {
     size_t locals_size = local_decls.Size();
     size_t total_size =
         code.size() + locals_size + (append_end == kAppendEnd ? 1 : 0);
-    byte* buffer = zone()->NewArray<byte>(total_size);
+    byte* buffer = this->zone()->template NewArray<byte>(total_size);
     // Prepend the local decls to the code.
     local_decls.Emit(buffer);
     // Emit the code.
@@ -250,7 +249,7 @@ class FunctionBodyDecoderTest : public TestWithZone {
     FunctionBody body(sig, 0, code.begin(), code.end());
     WasmFeatures unused_detected_features = WasmFeatures::None();
     DecodeResult result =
-        VerifyWasmCode(zone()->allocator(), enabled_features_, module,
+        VerifyWasmCode(this->zone()->allocator(), enabled_features_, module,
                        &unused_detected_features, body);
 
     std::ostringstream str;
@@ -282,7 +281,7 @@ class FunctionBodyDecoderTest : public TestWithZone {
 
   void TestBinop(WasmOpcode opcode, const FunctionSig* success) {
     // op(local[0], local[1])
-    byte code[] = {WASM_BINOP(opcode, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
+    byte code[] = {WASM_BINOP(opcode, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))};
     ExpectValidates(success, code);
 
     // Try all combinations of return and parameter types.
@@ -308,7 +307,7 @@ class FunctionBodyDecoderTest : public TestWithZone {
 
   void TestUnop(WasmOpcode opcode, ValueType ret_type, ValueType param_type) {
     // Return(op(local[0]))
-    byte code[] = {WASM_UNOP(opcode, WASM_GET_LOCAL(0))};
+    byte code[] = {WASM_UNOP(opcode, WASM_LOCAL_GET(0))};
     {
       ValueType types[] = {ret_type, param_type};
       FunctionSig sig(1, 1, types);
@@ -329,6 +328,8 @@ class FunctionBodyDecoderTest : public TestWithZone {
   }
 };
 
+using FunctionBodyDecoderTest = FunctionBodyDecoderTestBase<::testing::Test>;
+
 TEST_F(FunctionBodyDecoderTest, Int32Const1) {
   byte code[] = {kExprI32Const, 0};
   for (int i = -64; i <= 63; i++) {
@@ -534,7 +535,7 @@ TEST_F(FunctionBodyDecoderTest, Nop) {
 }
 
 TEST_F(FunctionBodyDecoderTest, SetLocal0_void) {
-  ExpectFailure(sigs.i_i(), {WASM_SET_LOCAL(0, WASM_ZERO)});
+  ExpectFailure(sigs.i_i(), {WASM_LOCAL_SET(0, WASM_ZERO)});
 }
 
 TEST_F(FunctionBodyDecoderTest, SetLocal0_param) {
@@ -567,8 +568,8 @@ TEST_F(FunctionBodyDecoderTest, TeeLocalN_local) {
   for (byte i = 1; i < 8; i++) {
     AddLocals(kWasmI32, 1);
     for (byte j = 0; j < i; j++) {
-      ExpectFailure(sigs.v_v(), {WASM_TEE_LOCAL(j, WASM_I32V_1(i))});
-      ExpectValidates(sigs.i_i(), {WASM_TEE_LOCAL(j, WASM_I32V_1(i))});
+      ExpectFailure(sigs.v_v(), {WASM_LOCAL_TEE(j, WASM_I32V_1(i))});
+      ExpectValidates(sigs.i_i(), {WASM_LOCAL_TEE(j, WASM_I32V_1(i))});
     }
   }
 }
@@ -610,7 +611,7 @@ TEST_F(FunctionBodyDecoderTest, Block0_end) {
 #undef WASM_EMPTY_BLOCK
 
 TEST_F(FunctionBodyDecoderTest, Block1) {
-  byte code[] = {WASM_BLOCK_I(WASM_GET_LOCAL(0))};
+  byte code[] = {WASM_BLOCK_I(WASM_LOCAL_GET(0))};
   ExpectValidates(sigs.i_i(), code);
   ExpectFailure(sigs.v_i(), code);
   ExpectFailure(sigs.d_dd(), code);
@@ -659,21 +660,21 @@ TEST_F(FunctionBodyDecoderTest, Block2) {
 }
 
 TEST_F(FunctionBodyDecoderTest, Block2b) {
-  byte code[] = {WASM_BLOCK_I(WASM_SET_LOCAL(0, WASM_ZERO), WASM_ZERO)};
+  byte code[] = {WASM_BLOCK_I(WASM_LOCAL_SET(0, WASM_ZERO), WASM_ZERO)};
   ExpectValidates(sigs.i_i(), code);
   ExpectFailure(sigs.v_v(), code);
   ExpectFailure(sigs.f_ff(), code);
 }
 
 TEST_F(FunctionBodyDecoderTest, Block2_fallthru) {
-  ExpectValidates(sigs.i_i(), {B2(WASM_SET_LOCAL(0, WASM_ZERO),
-                                  WASM_SET_LOCAL(0, WASM_ZERO)),
+  ExpectValidates(sigs.i_i(), {B2(WASM_LOCAL_SET(0, WASM_ZERO),
+                                  WASM_LOCAL_SET(0, WASM_ZERO)),
                                WASM_I32V_1(23)});
 }
 
 TEST_F(FunctionBodyDecoderTest, Block3) {
-  ExpectValidates(sigs.i_i(), {WASM_BLOCK_I(WASM_SET_LOCAL(0, WASM_ZERO),
-                                            WASM_SET_LOCAL(0, WASM_ZERO),
+  ExpectValidates(sigs.i_i(), {WASM_BLOCK_I(WASM_LOCAL_SET(0, WASM_ZERO),
+                                            WASM_LOCAL_SET(0, WASM_ZERO),
                                             WASM_I32V_1(11))});
 }
 
@@ -692,10 +693,10 @@ TEST_F(FunctionBodyDecoderTest, Block5) {
 }
 
 TEST_F(FunctionBodyDecoderTest, BlockType) {
-  ExpectValidates(sigs.i_i(), {WASM_BLOCK_I(WASM_GET_LOCAL(0))});
-  ExpectValidates(sigs.l_l(), {WASM_BLOCK_L(WASM_GET_LOCAL(0))});
-  ExpectValidates(sigs.f_f(), {WASM_BLOCK_F(WASM_GET_LOCAL(0))});
-  ExpectValidates(sigs.d_d(), {WASM_BLOCK_D(WASM_GET_LOCAL(0))});
+  ExpectValidates(sigs.i_i(), {WASM_BLOCK_I(WASM_LOCAL_GET(0))});
+  ExpectValidates(sigs.l_l(), {WASM_BLOCK_L(WASM_LOCAL_GET(0))});
+  ExpectValidates(sigs.f_f(), {WASM_BLOCK_F(WASM_LOCAL_GET(0))});
+  ExpectValidates(sigs.d_d(), {WASM_BLOCK_D(WASM_LOCAL_GET(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, BlockType_fail) {
@@ -760,7 +761,7 @@ TEST_F(FunctionBodyDecoderTest, VoidBlockTypeVariants) {
   ExpectValidates(sigs.v_v(), {kExprBlock, kVoidCode | 0x80, 0x7F, kExprEnd});
   // Invalid code, whose last 7 bits coincide with kVoidCode.
   ExpectFailure(sigs.v_v(), {kExprBlock, kVoidCode | 0x80, 0x45, kExprEnd},
-                kAppendEnd, "Invalid block type");
+                kAppendEnd, "invalid block type");
 }
 
 TEST_F(FunctionBodyDecoderTest, If_empty1) {
@@ -815,31 +816,31 @@ TEST_F(FunctionBodyDecoderTest, IfEmpty) {
 
 TEST_F(FunctionBodyDecoderTest, IfSet) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF(WASM_GET_LOCAL(0), WASM_SET_LOCAL(0, WASM_ZERO))});
+                  {WASM_IF(WASM_LOCAL_GET(0), WASM_LOCAL_SET(0, WASM_ZERO))});
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_SET_LOCAL(0, WASM_ZERO),
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_LOCAL_SET(0, WASM_ZERO),
                                 WASM_NOP)});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfElseEmpty) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_GET_LOCAL(0), WASM_IF_OP, kExprElse, kExprEnd});
+                  {WASM_LOCAL_GET(0), WASM_IF_OP, kExprElse, kExprEnd});
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_NOP, WASM_NOP)});
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_NOP, WASM_NOP)});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfElseUnreachable1) {
   ExpectValidates(
       sigs.i_i(),
-      {WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_UNREACHABLE, WASM_GET_LOCAL(0))});
+      {WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_UNREACHABLE, WASM_LOCAL_GET(0))});
   ExpectValidates(
       sigs.i_i(),
-      {WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_UNREACHABLE)});
+      {WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), WASM_UNREACHABLE)});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfElseUnreachable2) {
   static const byte code[] = {
-      WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_UNREACHABLE, WASM_GET_LOCAL(0))};
+      WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_UNREACHABLE, WASM_LOCAL_GET(0))};
 
   for (size_t i = 0; i < arraysize(kValueTypes); i++) {
     ValueType types[] = {kWasmI32, kValueTypes[i]};
@@ -856,18 +857,18 @@ TEST_F(FunctionBodyDecoderTest, OneArmedIfWithArity) {
 }
 
 TEST_F(FunctionBodyDecoderTest, IfBreak) {
-  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_GET_LOCAL(0), WASM_BR(0))});
-  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_GET_LOCAL(0), WASM_BR(1))});
-  ExpectFailure(sigs.v_i(), {WASM_IF(WASM_GET_LOCAL(0), WASM_BR(2))});
+  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_LOCAL_GET(0), WASM_BR(0))});
+  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_LOCAL_GET(0), WASM_BR(1))});
+  ExpectFailure(sigs.v_i(), {WASM_IF(WASM_LOCAL_GET(0), WASM_BR(2))});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfElseBreak) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_NOP, WASM_BR(0))});
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_NOP, WASM_BR(0))});
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_NOP, WASM_BR(1))});
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_NOP, WASM_BR(1))});
   ExpectFailure(sigs.v_i(),
-                {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_NOP, WASM_BR(2))});
+                {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_NOP, WASM_BR(2))});
 }
 
 TEST_F(FunctionBodyDecoderTest, Block_else) {
@@ -877,9 +878,9 @@ TEST_F(FunctionBodyDecoderTest, Block_else) {
 }
 
 TEST_F(FunctionBodyDecoderTest, IfNop) {
-  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_GET_LOCAL(0), WASM_NOP)});
+  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_LOCAL_GET(0), WASM_NOP)});
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_NOP, WASM_NOP)});
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_NOP, WASM_NOP)});
 }
 
 TEST_F(FunctionBodyDecoderTest, If_end) {
@@ -896,38 +897,38 @@ TEST_F(FunctionBodyDecoderTest, If_falloff1) {
 
 TEST_F(FunctionBodyDecoderTest, IfElseNop) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_SET_LOCAL(0, WASM_ZERO),
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_LOCAL_SET(0, WASM_ZERO),
                                 WASM_NOP)});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfBlock1) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0),
-                                B1(WASM_SET_LOCAL(0, WASM_ZERO)), WASM_NOP)});
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0),
+                                B1(WASM_LOCAL_SET(0, WASM_ZERO)), WASM_NOP)});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfBlock1b) {
-  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_GET_LOCAL(0),
-                                       B1(WASM_SET_LOCAL(0, WASM_ZERO)))});
+  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_LOCAL_GET(0),
+                                       B1(WASM_LOCAL_SET(0, WASM_ZERO)))});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfBlock2a) {
-  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_GET_LOCAL(0),
-                                       B2(WASM_SET_LOCAL(0, WASM_ZERO),
-                                          WASM_SET_LOCAL(0, WASM_ZERO)))});
+  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_LOCAL_GET(0),
+                                       B2(WASM_LOCAL_SET(0, WASM_ZERO),
+                                          WASM_LOCAL_SET(0, WASM_ZERO)))});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfBlock2b) {
-  ExpectValidates(sigs.v_i(), {WASM_IF_ELSE(WASM_GET_LOCAL(0),
-                                            B2(WASM_SET_LOCAL(0, WASM_ZERO),
-                                               WASM_SET_LOCAL(0, WASM_ZERO)),
+  ExpectValidates(sigs.v_i(), {WASM_IF_ELSE(WASM_LOCAL_GET(0),
+                                            B2(WASM_LOCAL_SET(0, WASM_ZERO),
+                                               WASM_LOCAL_SET(0, WASM_ZERO)),
                                             WASM_NOP)});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfElseSet) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_SET_LOCAL(0, WASM_ZERO),
-                                WASM_SET_LOCAL(0, WASM_I32V_1(1)))});
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_LOCAL_SET(0, WASM_ZERO),
+                                WASM_LOCAL_SET(0, WASM_I32V_1(1)))});
 }
 
 TEST_F(FunctionBodyDecoderTest, Loop0) {
@@ -935,15 +936,15 @@ TEST_F(FunctionBodyDecoderTest, Loop0) {
 }
 
 TEST_F(FunctionBodyDecoderTest, Loop1) {
-  static const byte code[] = {WASM_LOOP(WASM_SET_LOCAL(0, WASM_ZERO))};
+  static const byte code[] = {WASM_LOOP(WASM_LOCAL_SET(0, WASM_ZERO))};
   ExpectValidates(sigs.v_i(), code);
   ExpectFailure(sigs.v_v(), code);
   ExpectFailure(sigs.f_ff(), code);
 }
 
 TEST_F(FunctionBodyDecoderTest, Loop2) {
-  ExpectValidates(sigs.v_i(), {WASM_LOOP(WASM_SET_LOCAL(0, WASM_ZERO),
-                                         WASM_SET_LOCAL(0, WASM_ZERO))});
+  ExpectValidates(sigs.v_i(), {WASM_LOOP(WASM_LOCAL_SET(0, WASM_ZERO),
+                                         WASM_LOCAL_SET(0, WASM_ZERO))});
 }
 
 TEST_F(FunctionBodyDecoderTest, Loop1_continue) {
@@ -956,12 +957,12 @@ TEST_F(FunctionBodyDecoderTest, Loop1_break) {
 
 TEST_F(FunctionBodyDecoderTest, Loop2_continue) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_LOOP(WASM_SET_LOCAL(0, WASM_ZERO), WASM_BR(0))});
+                  {WASM_LOOP(WASM_LOCAL_SET(0, WASM_ZERO), WASM_BR(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, Loop2_break) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_LOOP(WASM_SET_LOCAL(0, WASM_ZERO), WASM_BR(1))});
+                  {WASM_LOOP(WASM_LOCAL_SET(0, WASM_ZERO), WASM_BR(1))});
 }
 
 TEST_F(FunctionBodyDecoderTest, InfiniteLoop1) {
@@ -979,10 +980,10 @@ TEST_F(FunctionBodyDecoderTest, Loop2_unreachable) {
 }
 
 TEST_F(FunctionBodyDecoderTest, LoopType) {
-  ExpectValidates(sigs.i_i(), {WASM_LOOP_I(WASM_GET_LOCAL(0))});
-  ExpectValidates(sigs.l_l(), {WASM_LOOP_L(WASM_GET_LOCAL(0))});
-  ExpectValidates(sigs.f_f(), {WASM_LOOP_F(WASM_GET_LOCAL(0))});
-  ExpectValidates(sigs.d_d(), {WASM_LOOP_D(WASM_GET_LOCAL(0))});
+  ExpectValidates(sigs.i_i(), {WASM_LOOP_I(WASM_LOCAL_GET(0))});
+  ExpectValidates(sigs.l_l(), {WASM_LOOP_L(WASM_LOCAL_GET(0))});
+  ExpectValidates(sigs.f_f(), {WASM_LOOP_F(WASM_LOCAL_GET(0))});
+  ExpectValidates(sigs.d_d(), {WASM_LOOP_D(WASM_LOCAL_GET(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, LoopType_void) {
@@ -1095,7 +1096,6 @@ TEST_F(FunctionBodyDecoderTest, UnreachableRefTypes) {
   FunctionSig sig_v_s(0, 1, &struct_type);
   byte struct_consumer = builder.AddFunction(&sig_v_s);
 
-  ExpectValidates(sigs.v_v(), {WASM_BLOCK(WASM_UNREACHABLE, kExprBrOnNull, 0)});
   ExpectValidates(sigs.i_v(), {WASM_UNREACHABLE, kExprRefIsNull});
   ExpectValidates(sigs.v_v(), {WASM_UNREACHABLE, kExprRefAsNonNull, kExprDrop});
 
@@ -1152,21 +1152,37 @@ TEST_F(FunctionBodyDecoderTest, UnreachableRefTypes) {
   ExpectValidates(sigs.v_v(),
                   {WASM_UNREACHABLE, WASM_GC_OP(kExprRttSub), array_index,
                    WASM_GC_OP(kExprRttSub), array_index, kExprDrop});
+
+  ExpectValidates(sigs.v_v(), {WASM_UNREACHABLE, kExprBrOnNull, 0, WASM_DROP});
+
+  ExpectValidates(&sig_v_s, {WASM_UNREACHABLE, WASM_LOCAL_GET(0), kExprBrOnNull,
+                             0, kExprCallFunction, struct_consumer});
+
+  ValueType opt_struct_type = ValueType::Ref(struct_index, kNullable);
+  FunctionSig sig_v_os(0, 1, &opt_struct_type);
+  ExpectValidates(&sig_v_os,
+                  {WASM_UNREACHABLE, WASM_LOCAL_GET(0), kExprBrOnNull, 0,
+                   kExprCallFunction, struct_consumer});
+
+  ExpectFailure(
+      sigs.v_v(), {WASM_UNREACHABLE, WASM_I32V(42), kExprBrOnNull, 0},
+      kAppendEnd,
+      "br_on_null[0] expected object reference, found i32.const of type i32");
 }
 
 TEST_F(FunctionBodyDecoderTest, If1) {
-  ExpectValidates(sigs.i_i(), {WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_I32V_1(9),
+  ExpectValidates(sigs.i_i(), {WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_I32V_1(9),
                                               WASM_I32V_1(8))});
-  ExpectValidates(sigs.i_i(), {WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_I32V_1(9),
-                                              WASM_GET_LOCAL(0))});
+  ExpectValidates(sigs.i_i(), {WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_I32V_1(9),
+                                              WASM_LOCAL_GET(0))});
   ExpectValidates(
       sigs.i_i(),
-      {WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_I32V_1(8))});
+      {WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), WASM_I32V_1(8))});
 }
 
 TEST_F(FunctionBodyDecoderTest, If_off_end) {
   static const byte kCode[] = {
-      WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_GET_LOCAL(0))};
+      WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), WASM_LOCAL_GET(0))};
   for (size_t len = 3; len < arraysize(kCode); len++) {
     ExpectFailure(sigs.i_i(), VectorOf(kCode, len), kAppendEnd);
     ExpectFailure(sigs.i_i(), VectorOf(kCode, len), kOmitEnd);
@@ -1176,7 +1192,7 @@ TEST_F(FunctionBodyDecoderTest, If_off_end) {
 TEST_F(FunctionBodyDecoderTest, If_type1) {
   // float|double ? 1 : 2
   static const byte kCode[] = {
-      WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_I32V_1(0), WASM_I32V_1(2))};
+      WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_I32V_1(0), WASM_I32V_1(2))};
   ExpectValidates(sigs.i_i(), kCode);
   ExpectFailure(sigs.i_f(), kCode);
   ExpectFailure(sigs.i_d(), kCode);
@@ -1185,7 +1201,7 @@ TEST_F(FunctionBodyDecoderTest, If_type1) {
 TEST_F(FunctionBodyDecoderTest, If_type2) {
   // 1 ? float|double : 2
   static const byte kCode[] = {
-      WASM_IF_ELSE_I(WASM_I32V_1(1), WASM_GET_LOCAL(0), WASM_I32V_1(1))};
+      WASM_IF_ELSE_I(WASM_I32V_1(1), WASM_LOCAL_GET(0), WASM_I32V_1(1))};
   ExpectValidates(sigs.i_i(), kCode);
   ExpectFailure(sigs.i_f(), kCode);
   ExpectFailure(sigs.i_d(), kCode);
@@ -1203,7 +1219,7 @@ TEST_F(FunctionBodyDecoderTest, If_type3) {
 TEST_F(FunctionBodyDecoderTest, If_type4) {
   // 0 ? stmt : 1
   static const byte kCode[] = {
-      WASM_IF_ELSE_I(WASM_GET_LOCAL(0), WASM_NOP, WASM_I32V_1(1))};
+      WASM_IF_ELSE_I(WASM_LOCAL_GET(0), WASM_NOP, WASM_I32V_1(1))};
   ExpectFailure(sigs.i_i(), kCode);
   ExpectFailure(sigs.i_f(), kCode);
   ExpectFailure(sigs.i_d(), kCode);
@@ -1226,7 +1242,7 @@ TEST_F(FunctionBodyDecoderTest, Int64Locals) {
   for (byte i = 1; i < 8; i++) {
     AddLocals(kWasmI64, 1);
     for (byte j = 0; j < i; j++) {
-      ExpectValidates(sigs.l_v(), {WASM_GET_LOCAL(j)});
+      ExpectValidates(sigs.l_v(), {WASM_LOCAL_GET(j)});
     }
   }
 }
@@ -1289,13 +1305,13 @@ TEST_F(FunctionBodyDecoderTest, TypeConversions) {
 
 TEST_F(FunctionBodyDecoderTest, MacrosStmt) {
   builder.InitializeMemory();
-  ExpectValidates(sigs.v_i(), {WASM_SET_LOCAL(0, WASM_I32V_3(87348))});
+  ExpectValidates(sigs.v_i(), {WASM_LOCAL_SET(0, WASM_I32V_3(87348))});
   ExpectValidates(
       sigs.v_i(),
       {WASM_STORE_MEM(MachineType::Int32(), WASM_I32V_1(24), WASM_I32V_1(40))});
-  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_GET_LOCAL(0), WASM_NOP)});
+  ExpectValidates(sigs.v_i(), {WASM_IF(WASM_LOCAL_GET(0), WASM_NOP)});
   ExpectValidates(sigs.v_i(),
-                  {WASM_IF_ELSE(WASM_GET_LOCAL(0), WASM_NOP, WASM_NOP)});
+                  {WASM_IF_ELSE(WASM_LOCAL_GET(0), WASM_NOP, WASM_NOP)});
   ExpectValidates(sigs.v_v(), {WASM_NOP});
   ExpectValidates(sigs.v_v(), {B1(WASM_NOP)});
   ExpectValidates(sigs.v_v(), {WASM_LOOP(WASM_NOP)});
@@ -1349,114 +1365,114 @@ TEST_F(FunctionBodyDecoderTest, MultipleReturn_fallthru) {
 
 TEST_F(FunctionBodyDecoderTest, MacrosInt32) {
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_ADD(WASM_GET_LOCAL(0), WASM_I32V_1(12))});
+                  {WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_I32V_1(12))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I32V_1(13))});
+                  {WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_I32V_1(13))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_MUL(WASM_GET_LOCAL(0), WASM_I32V_1(14))});
+                  {WASM_I32_MUL(WASM_LOCAL_GET(0), WASM_I32V_1(14))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_DIVS(WASM_GET_LOCAL(0), WASM_I32V_1(15))});
+                  {WASM_I32_DIVS(WASM_LOCAL_GET(0), WASM_I32V_1(15))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_DIVU(WASM_GET_LOCAL(0), WASM_I32V_1(16))});
+                  {WASM_I32_DIVU(WASM_LOCAL_GET(0), WASM_I32V_1(16))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_REMS(WASM_GET_LOCAL(0), WASM_I32V_1(17))});
+                  {WASM_I32_REMS(WASM_LOCAL_GET(0), WASM_I32V_1(17))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_REMU(WASM_GET_LOCAL(0), WASM_I32V_1(18))});
+                  {WASM_I32_REMU(WASM_LOCAL_GET(0), WASM_I32V_1(18))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_AND(WASM_GET_LOCAL(0), WASM_I32V_1(19))});
+                  {WASM_I32_AND(WASM_LOCAL_GET(0), WASM_I32V_1(19))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_IOR(WASM_GET_LOCAL(0), WASM_I32V_1(20))});
+                  {WASM_I32_IOR(WASM_LOCAL_GET(0), WASM_I32V_1(20))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_XOR(WASM_GET_LOCAL(0), WASM_I32V_1(21))});
+                  {WASM_I32_XOR(WASM_LOCAL_GET(0), WASM_I32V_1(21))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_SHL(WASM_GET_LOCAL(0), WASM_I32V_1(22))});
+                  {WASM_I32_SHL(WASM_LOCAL_GET(0), WASM_I32V_1(22))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_SHR(WASM_GET_LOCAL(0), WASM_I32V_1(23))});
+                  {WASM_I32_SHR(WASM_LOCAL_GET(0), WASM_I32V_1(23))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_SAR(WASM_GET_LOCAL(0), WASM_I32V_1(24))});
+                  {WASM_I32_SAR(WASM_LOCAL_GET(0), WASM_I32V_1(24))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_ROR(WASM_GET_LOCAL(0), WASM_I32V_1(24))});
+                  {WASM_I32_ROR(WASM_LOCAL_GET(0), WASM_I32V_1(24))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_ROL(WASM_GET_LOCAL(0), WASM_I32V_1(24))});
+                  {WASM_I32_ROL(WASM_LOCAL_GET(0), WASM_I32V_1(24))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_I32V_1(25))});
+                  {WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_I32V_1(25))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_NE(WASM_GET_LOCAL(0), WASM_I32V_1(25))});
+                  {WASM_I32_NE(WASM_LOCAL_GET(0), WASM_I32V_1(25))});
 
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_LTS(WASM_GET_LOCAL(0), WASM_I32V_1(26))});
+                  {WASM_I32_LTS(WASM_LOCAL_GET(0), WASM_I32V_1(26))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_LES(WASM_GET_LOCAL(0), WASM_I32V_1(27))});
+                  {WASM_I32_LES(WASM_LOCAL_GET(0), WASM_I32V_1(27))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_LTU(WASM_GET_LOCAL(0), WASM_I32V_1(28))});
+                  {WASM_I32_LTU(WASM_LOCAL_GET(0), WASM_I32V_1(28))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_LEU(WASM_GET_LOCAL(0), WASM_I32V_1(29))});
+                  {WASM_I32_LEU(WASM_LOCAL_GET(0), WASM_I32V_1(29))});
 
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_GTS(WASM_GET_LOCAL(0), WASM_I32V_1(26))});
+                  {WASM_I32_GTS(WASM_LOCAL_GET(0), WASM_I32V_1(26))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_GES(WASM_GET_LOCAL(0), WASM_I32V_1(27))});
+                  {WASM_I32_GES(WASM_LOCAL_GET(0), WASM_I32V_1(27))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_GTU(WASM_GET_LOCAL(0), WASM_I32V_1(28))});
+                  {WASM_I32_GTU(WASM_LOCAL_GET(0), WASM_I32V_1(28))});
   ExpectValidates(sigs.i_i(),
-                  {WASM_I32_GEU(WASM_GET_LOCAL(0), WASM_I32V_1(29))});
+                  {WASM_I32_GEU(WASM_LOCAL_GET(0), WASM_I32V_1(29))});
 }
 
 TEST_F(FunctionBodyDecoderTest, MacrosInt64) {
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_ADD(WASM_GET_LOCAL(0), WASM_I64V_1(12))});
+                  {WASM_I64_ADD(WASM_LOCAL_GET(0), WASM_I64V_1(12))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_SUB(WASM_GET_LOCAL(0), WASM_I64V_1(13))});
+                  {WASM_I64_SUB(WASM_LOCAL_GET(0), WASM_I64V_1(13))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_MUL(WASM_GET_LOCAL(0), WASM_I64V_1(14))});
+                  {WASM_I64_MUL(WASM_LOCAL_GET(0), WASM_I64V_1(14))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_DIVS(WASM_GET_LOCAL(0), WASM_I64V_1(15))});
+                  {WASM_I64_DIVS(WASM_LOCAL_GET(0), WASM_I64V_1(15))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_DIVU(WASM_GET_LOCAL(0), WASM_I64V_1(16))});
+                  {WASM_I64_DIVU(WASM_LOCAL_GET(0), WASM_I64V_1(16))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_REMS(WASM_GET_LOCAL(0), WASM_I64V_1(17))});
+                  {WASM_I64_REMS(WASM_LOCAL_GET(0), WASM_I64V_1(17))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_REMU(WASM_GET_LOCAL(0), WASM_I64V_1(18))});
+                  {WASM_I64_REMU(WASM_LOCAL_GET(0), WASM_I64V_1(18))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_AND(WASM_GET_LOCAL(0), WASM_I64V_1(19))});
+                  {WASM_I64_AND(WASM_LOCAL_GET(0), WASM_I64V_1(19))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_IOR(WASM_GET_LOCAL(0), WASM_I64V_1(20))});
+                  {WASM_I64_IOR(WASM_LOCAL_GET(0), WASM_I64V_1(20))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_XOR(WASM_GET_LOCAL(0), WASM_I64V_1(21))});
+                  {WASM_I64_XOR(WASM_LOCAL_GET(0), WASM_I64V_1(21))});
 
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_SHL(WASM_GET_LOCAL(0), WASM_I64V_1(22))});
+                  {WASM_I64_SHL(WASM_LOCAL_GET(0), WASM_I64V_1(22))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_SHR(WASM_GET_LOCAL(0), WASM_I64V_1(23))});
+                  {WASM_I64_SHR(WASM_LOCAL_GET(0), WASM_I64V_1(23))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_SAR(WASM_GET_LOCAL(0), WASM_I64V_1(24))});
+                  {WASM_I64_SAR(WASM_LOCAL_GET(0), WASM_I64V_1(24))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_ROR(WASM_GET_LOCAL(0), WASM_I64V_1(24))});
+                  {WASM_I64_ROR(WASM_LOCAL_GET(0), WASM_I64V_1(24))});
   ExpectValidates(sigs.l_ll(),
-                  {WASM_I64_ROL(WASM_GET_LOCAL(0), WASM_I64V_1(24))});
+                  {WASM_I64_ROL(WASM_LOCAL_GET(0), WASM_I64V_1(24))});
 
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_LTS(WASM_GET_LOCAL(0), WASM_I64V_1(26))});
+                  {WASM_I64_LTS(WASM_LOCAL_GET(0), WASM_I64V_1(26))});
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_LES(WASM_GET_LOCAL(0), WASM_I64V_1(27))});
+                  {WASM_I64_LES(WASM_LOCAL_GET(0), WASM_I64V_1(27))});
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_LTU(WASM_GET_LOCAL(0), WASM_I64V_1(28))});
+                  {WASM_I64_LTU(WASM_LOCAL_GET(0), WASM_I64V_1(28))});
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_LEU(WASM_GET_LOCAL(0), WASM_I64V_1(29))});
+                  {WASM_I64_LEU(WASM_LOCAL_GET(0), WASM_I64V_1(29))});
 
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_GTS(WASM_GET_LOCAL(0), WASM_I64V_1(26))});
+                  {WASM_I64_GTS(WASM_LOCAL_GET(0), WASM_I64V_1(26))});
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_GES(WASM_GET_LOCAL(0), WASM_I64V_1(27))});
+                  {WASM_I64_GES(WASM_LOCAL_GET(0), WASM_I64V_1(27))});
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_GTU(WASM_GET_LOCAL(0), WASM_I64V_1(28))});
+                  {WASM_I64_GTU(WASM_LOCAL_GET(0), WASM_I64V_1(28))});
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_GEU(WASM_GET_LOCAL(0), WASM_I64V_1(29))});
+                  {WASM_I64_GEU(WASM_LOCAL_GET(0), WASM_I64V_1(29))});
 
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_EQ(WASM_GET_LOCAL(0), WASM_I64V_1(25))});
+                  {WASM_I64_EQ(WASM_LOCAL_GET(0), WASM_I64V_1(25))});
   ExpectValidates(sigs.i_ll(),
-                  {WASM_I64_NE(WASM_GET_LOCAL(0), WASM_I64V_1(25))});
+                  {WASM_I64_NE(WASM_LOCAL_GET(0), WASM_I64V_1(25))});
 }
 
 TEST_F(FunctionBodyDecoderTest, AllSimpleExpressions) {
@@ -1582,7 +1598,7 @@ TEST_F(FunctionBodyDecoderTest, AllStoreMemCombinations) {
     ValueType local_type = kValueTypes[i];
     for (size_t j = 0; j < arraysize(machineTypes); j++) {
       MachineType mem_type = machineTypes[j];
-      byte code[] = {WASM_STORE_MEM(mem_type, WASM_ZERO, WASM_GET_LOCAL(0))};
+      byte code[] = {WASM_STORE_MEM(mem_type, WASM_ZERO, WASM_LOCAL_GET(0))};
       FunctionSig sig(0, 1, &local_type);
       Validate(local_type == ValueType::For(mem_type), &sig, code);
     }
@@ -1611,7 +1627,7 @@ TEST_F(FunctionBodyDecoderTest, CallsWithTooFewArguments) {
 
   ExpectFailure(sig, {WASM_CALL_FUNCTION0(0)});
   ExpectFailure(sig, {WASM_CALL_FUNCTION(1, WASM_ZERO)});
-  ExpectFailure(sig, {WASM_CALL_FUNCTION(2, WASM_GET_LOCAL(0))});
+  ExpectFailure(sig, {WASM_CALL_FUNCTION(2, WASM_LOCAL_GET(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, CallsWithMismatchedSigs2) {
@@ -1666,7 +1682,7 @@ TEST_F(FunctionBodyDecoderTest, ReturnCallsWithTooFewArguments) {
 
   ExpectFailure(sig, {WASM_RETURN_CALL_FUNCTION0(0)});
   ExpectFailure(sig, {WASM_RETURN_CALL_FUNCTION(1, WASM_ZERO)});
-  ExpectFailure(sig, {WASM_RETURN_CALL_FUNCTION(2, WASM_GET_LOCAL(0))});
+  ExpectFailure(sig, {WASM_RETURN_CALL_FUNCTION(2, WASM_LOCAL_GET(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, ReturnCallsWithMismatchedSigs) {
@@ -1974,9 +1990,9 @@ TEST_F(FunctionBodyDecoderTest, Int32Globals) {
 
   builder.AddGlobal(kWasmI32);
 
-  ExpectValidates(sig, {WASM_GET_GLOBAL(0)});
-  ExpectFailure(sig, {WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0))});
-  ExpectValidates(sig, {WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)), WASM_ZERO});
+  ExpectValidates(sig, {WASM_GLOBAL_GET(0)});
+  ExpectFailure(sig, {WASM_GLOBAL_SET(0, WASM_LOCAL_GET(0))});
+  ExpectValidates(sig, {WASM_GLOBAL_SET(0, WASM_LOCAL_GET(0)), WASM_ZERO});
 }
 
 TEST_F(FunctionBodyDecoderTest, ImmutableGlobal) {
@@ -1985,8 +2001,8 @@ TEST_F(FunctionBodyDecoderTest, ImmutableGlobal) {
   uint32_t g0 = builder.AddGlobal(kWasmI32, true);
   uint32_t g1 = builder.AddGlobal(kWasmI32, false);
 
-  ExpectValidates(sig, {WASM_SET_GLOBAL(g0, WASM_ZERO)});
-  ExpectFailure(sig, {WASM_SET_GLOBAL(g1, WASM_ZERO)});
+  ExpectValidates(sig, {WASM_GLOBAL_SET(g0, WASM_ZERO)});
+  ExpectFailure(sig, {WASM_GLOBAL_SET(g1, WASM_ZERO)});
 }
 
 TEST_F(FunctionBodyDecoderTest, Int32Globals_fail) {
@@ -1997,15 +2013,15 @@ TEST_F(FunctionBodyDecoderTest, Int32Globals_fail) {
   builder.AddGlobal(kWasmF32);
   builder.AddGlobal(kWasmF64);
 
-  ExpectFailure(sig, {WASM_GET_GLOBAL(0)});
-  ExpectFailure(sig, {WASM_GET_GLOBAL(1)});
-  ExpectFailure(sig, {WASM_GET_GLOBAL(2)});
-  ExpectFailure(sig, {WASM_GET_GLOBAL(3)});
+  ExpectFailure(sig, {WASM_GLOBAL_GET(0)});
+  ExpectFailure(sig, {WASM_GLOBAL_GET(1)});
+  ExpectFailure(sig, {WASM_GLOBAL_GET(2)});
+  ExpectFailure(sig, {WASM_GLOBAL_GET(3)});
 
-  ExpectFailure(sig, {WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)), WASM_ZERO});
-  ExpectFailure(sig, {WASM_SET_GLOBAL(1, WASM_GET_LOCAL(0)), WASM_ZERO});
-  ExpectFailure(sig, {WASM_SET_GLOBAL(2, WASM_GET_LOCAL(0)), WASM_ZERO});
-  ExpectFailure(sig, {WASM_SET_GLOBAL(3, WASM_GET_LOCAL(0)), WASM_ZERO});
+  ExpectFailure(sig, {WASM_GLOBAL_SET(0, WASM_LOCAL_GET(0)), WASM_ZERO});
+  ExpectFailure(sig, {WASM_GLOBAL_SET(1, WASM_LOCAL_GET(0)), WASM_ZERO});
+  ExpectFailure(sig, {WASM_GLOBAL_SET(2, WASM_LOCAL_GET(0)), WASM_ZERO});
+  ExpectFailure(sig, {WASM_GLOBAL_SET(3, WASM_LOCAL_GET(0)), WASM_ZERO});
 }
 
 TEST_F(FunctionBodyDecoderTest, Int64Globals) {
@@ -2014,13 +2030,13 @@ TEST_F(FunctionBodyDecoderTest, Int64Globals) {
   builder.AddGlobal(kWasmI64);
   builder.AddGlobal(kWasmI64);
 
-  ExpectValidates(sig, {WASM_GET_GLOBAL(0)});
-  ExpectValidates(sig, {WASM_GET_GLOBAL(1)});
+  ExpectValidates(sig, {WASM_GLOBAL_GET(0)});
+  ExpectValidates(sig, {WASM_GLOBAL_GET(1)});
 
   ExpectValidates(sig,
-                  {WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)), WASM_GET_LOCAL(0)});
+                  {WASM_GLOBAL_SET(0, WASM_LOCAL_GET(0)), WASM_LOCAL_GET(0)});
   ExpectValidates(sig,
-                  {WASM_SET_GLOBAL(1, WASM_GET_LOCAL(0)), WASM_GET_LOCAL(0)});
+                  {WASM_GLOBAL_SET(1, WASM_LOCAL_GET(0)), WASM_LOCAL_GET(0)});
 }
 
 TEST_F(FunctionBodyDecoderTest, Float32Globals) {
@@ -2028,9 +2044,9 @@ TEST_F(FunctionBodyDecoderTest, Float32Globals) {
 
   builder.AddGlobal(kWasmF32);
 
-  ExpectValidates(sig, {WASM_GET_GLOBAL(0)});
+  ExpectValidates(sig, {WASM_GLOBAL_GET(0)});
   ExpectValidates(sig,
-                  {WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)), WASM_GET_LOCAL(0)});
+                  {WASM_GLOBAL_SET(0, WASM_LOCAL_GET(0)), WASM_LOCAL_GET(0)});
 }
 
 TEST_F(FunctionBodyDecoderTest, Float64Globals) {
@@ -2038,9 +2054,9 @@ TEST_F(FunctionBodyDecoderTest, Float64Globals) {
 
   builder.AddGlobal(kWasmF64);
 
-  ExpectValidates(sig, {WASM_GET_GLOBAL(0)});
+  ExpectValidates(sig, {WASM_GLOBAL_GET(0)});
   ExpectValidates(sig,
-                  {WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0)), WASM_GET_LOCAL(0)});
+                  {WASM_GLOBAL_SET(0, WASM_LOCAL_GET(0)), WASM_LOCAL_GET(0)});
 }
 
 TEST_F(FunctionBodyDecoderTest, AllGetGlobalCombinations) {
@@ -2053,7 +2069,7 @@ TEST_F(FunctionBodyDecoderTest, AllGetGlobalCombinations) {
       module = builder.module();
       builder.AddGlobal(global_type);
       Validate(IsSubtypeOf(global_type, local_type, module), &sig,
-               {WASM_GET_GLOBAL(0)});
+               {WASM_GLOBAL_GET(0)});
     }
   }
 }
@@ -2068,7 +2084,7 @@ TEST_F(FunctionBodyDecoderTest, AllSetGlobalCombinations) {
       module = builder.module();
       builder.AddGlobal(global_type);
       Validate(IsSubtypeOf(local_type, global_type, module), &sig,
-               {WASM_SET_GLOBAL(0, WASM_GET_LOCAL(0))});
+               {WASM_GLOBAL_SET(0, WASM_LOCAL_GET(0))});
     }
   }
 }
@@ -2094,40 +2110,40 @@ TEST_F(FunctionBodyDecoderTest, TableSet) {
   byte local_typed_func = 3;
 
   ExpectValidates(&sig, {WASM_TABLE_SET(tab_ref1, WASM_I32V(6),
-                                        WASM_GET_LOCAL(local_ref))});
+                                        WASM_LOCAL_GET(local_ref))});
   ExpectValidates(&sig, {WASM_TABLE_SET(tab_func1, WASM_I32V(5),
-                                        WASM_GET_LOCAL(local_func))});
+                                        WASM_LOCAL_GET(local_func))});
   ExpectValidates(&sig, {WASM_TABLE_SET(tab_func2, WASM_I32V(7),
-                                        WASM_GET_LOCAL(local_func))});
+                                        WASM_LOCAL_GET(local_func))});
   ExpectValidates(&sig, {WASM_TABLE_SET(tab_ref2, WASM_I32V(8),
-                                        WASM_GET_LOCAL(local_ref))});
+                                        WASM_LOCAL_GET(local_ref))});
   ExpectValidates(&sig, {WASM_TABLE_SET(tab_typed_func, WASM_I32V(8),
-                                        WASM_GET_LOCAL(local_typed_func))});
+                                        WASM_LOCAL_GET(local_typed_func))});
   ExpectValidates(&sig, {WASM_TABLE_SET(tab_func1, WASM_I32V(8),
-                                        WASM_GET_LOCAL(local_typed_func))});
+                                        WASM_LOCAL_GET(local_typed_func))});
 
   // Only values of the correct type can be set to a table.
   ExpectFailure(&sig, {WASM_TABLE_SET(tab_ref1, WASM_I32V(4),
-                                      WASM_GET_LOCAL(local_func))});
+                                      WASM_LOCAL_GET(local_func))});
   ExpectFailure(&sig, {WASM_TABLE_SET(tab_func1, WASM_I32V(9),
-                                      WASM_GET_LOCAL(local_ref))});
+                                      WASM_LOCAL_GET(local_ref))});
   ExpectFailure(&sig, {WASM_TABLE_SET(tab_func2, WASM_I32V(3),
-                                      WASM_GET_LOCAL(local_ref))});
+                                      WASM_LOCAL_GET(local_ref))});
   ExpectFailure(&sig, {WASM_TABLE_SET(tab_ref2, WASM_I32V(2),
-                                      WASM_GET_LOCAL(local_func))});
+                                      WASM_LOCAL_GET(local_func))});
   ExpectFailure(&sig, {WASM_TABLE_SET(tab_ref1, WASM_I32V(9),
-                                      WASM_GET_LOCAL(local_int))});
+                                      WASM_LOCAL_GET(local_int))});
   ExpectFailure(&sig, {WASM_TABLE_SET(tab_func1, WASM_I32V(3),
-                                      WASM_GET_LOCAL(local_int))});
+                                      WASM_LOCAL_GET(local_int))});
   ExpectFailure(&sig, {WASM_TABLE_SET(tab_typed_func, WASM_I32V(3),
-                                      WASM_GET_LOCAL(local_func))});
+                                      WASM_LOCAL_GET(local_func))});
 
   // Out-of-bounds table index should fail.
   byte oob_tab = 37;
   ExpectFailure(
-      &sig, {WASM_TABLE_SET(oob_tab, WASM_I32V(9), WASM_GET_LOCAL(local_ref))});
+      &sig, {WASM_TABLE_SET(oob_tab, WASM_I32V(9), WASM_LOCAL_GET(local_ref))});
   ExpectFailure(&sig, {WASM_TABLE_SET(oob_tab, WASM_I32V(3),
-                                      WASM_GET_LOCAL(local_func))});
+                                      WASM_LOCAL_GET(local_func))});
 }
 
 TEST_F(FunctionBodyDecoderTest, TableGet) {
@@ -2152,49 +2168,49 @@ TEST_F(FunctionBodyDecoderTest, TableGet) {
 
   ExpectValidates(
       &sig,
-      {WASM_SET_LOCAL(local_ref, WASM_TABLE_GET(tab_ref1, WASM_I32V(6)))});
+      {WASM_LOCAL_SET(local_ref, WASM_TABLE_GET(tab_ref1, WASM_I32V(6)))});
   ExpectValidates(
       &sig,
-      {WASM_SET_LOCAL(local_ref, WASM_TABLE_GET(tab_ref2, WASM_I32V(8)))});
+      {WASM_LOCAL_SET(local_ref, WASM_TABLE_GET(tab_ref2, WASM_I32V(8)))});
   ExpectValidates(
       &sig,
-      {WASM_SET_LOCAL(local_func, WASM_TABLE_GET(tab_func1, WASM_I32V(5)))});
+      {WASM_LOCAL_SET(local_func, WASM_TABLE_GET(tab_func1, WASM_I32V(5)))});
   ExpectValidates(
       &sig,
-      {WASM_SET_LOCAL(local_func, WASM_TABLE_GET(tab_func2, WASM_I32V(7)))});
+      {WASM_LOCAL_SET(local_func, WASM_TABLE_GET(tab_func2, WASM_I32V(7)))});
   ExpectValidates(
-      &sig, {WASM_SET_LOCAL(local_ref, WASM_SEQ(WASM_I32V(6), kExprTableGet,
+      &sig, {WASM_LOCAL_SET(local_ref, WASM_SEQ(WASM_I32V(6), kExprTableGet,
                                                 U32V_2(tab_ref1)))});
   ExpectValidates(
-      &sig, {WASM_SET_LOCAL(local_func,
+      &sig, {WASM_LOCAL_SET(local_func,
                             WASM_TABLE_GET(tab_typed_func, WASM_I32V(7)))});
   ExpectValidates(
-      &sig, {WASM_SET_LOCAL(local_typed_func,
+      &sig, {WASM_LOCAL_SET(local_typed_func,
                             WASM_TABLE_GET(tab_typed_func, WASM_I32V(7)))});
 
   // We cannot store references as any other type.
-  ExpectFailure(&sig, {WASM_SET_LOCAL(local_func,
+  ExpectFailure(&sig, {WASM_LOCAL_SET(local_func,
                                       WASM_TABLE_GET(tab_ref1, WASM_I32V(4)))});
-  ExpectFailure(&sig, {WASM_SET_LOCAL(
+  ExpectFailure(&sig, {WASM_LOCAL_SET(
                           local_ref, WASM_TABLE_GET(tab_func1, WASM_I32V(9)))});
-  ExpectFailure(&sig, {WASM_SET_LOCAL(
+  ExpectFailure(&sig, {WASM_LOCAL_SET(
                           local_ref, WASM_TABLE_GET(tab_func2, WASM_I32V(3)))});
-  ExpectFailure(&sig, {WASM_SET_LOCAL(local_func,
+  ExpectFailure(&sig, {WASM_LOCAL_SET(local_func,
                                       WASM_TABLE_GET(tab_ref2, WASM_I32V(2)))});
 
-  ExpectFailure(&sig, {WASM_SET_LOCAL(local_int,
+  ExpectFailure(&sig, {WASM_LOCAL_SET(local_int,
                                       WASM_TABLE_GET(tab_ref1, WASM_I32V(9)))});
-  ExpectFailure(&sig, {WASM_SET_LOCAL(
+  ExpectFailure(&sig, {WASM_LOCAL_SET(
                           local_int, WASM_TABLE_GET(tab_func1, WASM_I32V(3)))});
   ExpectFailure(&sig,
-                {WASM_SET_LOCAL(local_typed_func,
+                {WASM_LOCAL_SET(local_typed_func,
                                 WASM_TABLE_GET(tab_func1, WASM_I32V(3)))});
 
   // Out-of-bounds table index should fail.
   byte oob_tab = 37;
   ExpectFailure(
-      &sig, {WASM_SET_LOCAL(local_ref, WASM_TABLE_GET(oob_tab, WASM_I32V(9)))});
-  ExpectFailure(&sig, {WASM_SET_LOCAL(local_func,
+      &sig, {WASM_LOCAL_SET(local_ref, WASM_TABLE_GET(oob_tab, WASM_I32V(9)))});
+  ExpectFailure(&sig, {WASM_LOCAL_SET(local_func,
                                       WASM_TABLE_GET(oob_tab, WASM_I32V(3)))});
 }
 
@@ -2218,7 +2234,7 @@ TEST_F(FunctionBodyDecoderTest, MultiTableCallIndirect) {
 TEST_F(FunctionBodyDecoderTest, WasmMemoryGrow) {
   builder.InitializeMemory();
 
-  byte code[] = {WASM_GET_LOCAL(0), kExprMemoryGrow, 0};
+  byte code[] = {WASM_LOCAL_GET(0), kExprMemoryGrow, 0};
   ExpectValidates(sigs.i_i(), code);
   ExpectFailure(sigs.i_d(), code);
 }
@@ -2227,7 +2243,7 @@ TEST_F(FunctionBodyDecoderTest, AsmJsMemoryGrow) {
   module->origin = kAsmJsSloppyOrigin;
   builder.InitializeMemory();
 
-  byte code[] = {WASM_GET_LOCAL(0), kExprMemoryGrow, 0};
+  byte code[] = {WASM_LOCAL_GET(0), kExprMemoryGrow, 0};
   ExpectFailure(sigs.i_i(), code);
 }
 
@@ -2269,8 +2285,8 @@ TEST_F(FunctionBodyDecoderTest, AsmJsBinOpsCheckOrigin) {
     builder.InitializeMemory();
     for (size_t i = 0; i < arraysize(AsmJsBinOps); i++) {
       ExpectFailure(AsmJsBinOps[i].sig,
-                    {WASM_BINOP(AsmJsBinOps[i].op, WASM_GET_LOCAL(0),
-                                WASM_GET_LOCAL(1))});
+                    {WASM_BINOP(AsmJsBinOps[i].op, WASM_LOCAL_GET(0),
+                                WASM_LOCAL_GET(1))});
     }
   }
 }
@@ -2317,7 +2333,7 @@ TEST_F(FunctionBodyDecoderTest, AsmJsUnOpsCheckOrigin) {
     builder.InitializeMemory();
     for (size_t i = 0; i < arraysize(AsmJsUnOps); i++) {
       ExpectFailure(AsmJsUnOps[i].sig,
-                    {WASM_UNOP(AsmJsUnOps[i].op, WASM_GET_LOCAL(0))});
+                    {WASM_UNOP(AsmJsUnOps[i].op, WASM_LOCAL_GET(0))});
     }
   }
 }
@@ -2364,8 +2380,8 @@ TEST_F(FunctionBodyDecoderTest, BreakNesting1) {
   for (int i = 0; i < 5; i++) {
     // (block[2] (loop[2] (if (get p) break[N]) (set p 1)) p)
     byte code[] = {WASM_BLOCK_I(
-        WASM_LOOP(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(i + 1, WASM_ZERO)),
-                  WASM_SET_LOCAL(0, WASM_I32V_1(1))),
+        WASM_LOOP(WASM_IF(WASM_LOCAL_GET(0), WASM_BRV(i + 1, WASM_ZERO)),
+                  WASM_LOCAL_SET(0, WASM_I32V_1(1))),
         WASM_ZERO)};
     Validate(i < 3, sigs.i_i(), code);
   }
@@ -2428,8 +2444,8 @@ TEST_F(FunctionBodyDecoderTest, Break_TypeCheck) {
        {sigs.i_i(), sigs.l_l(), sigs.f_ff(), sigs.d_dd()}) {
     // unify X and X => OK
     byte code[] = {WASM_BLOCK_T(
-        sig->GetReturn(), WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_GET_LOCAL(0))),
-        WASM_GET_LOCAL(0))};
+        sig->GetReturn(), WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_LOCAL_GET(0))),
+        WASM_LOCAL_GET(0))};
     ExpectValidates(sig, code);
   }
 
@@ -2441,7 +2457,7 @@ TEST_F(FunctionBodyDecoderTest, Break_TypeCheck) {
   // unify f64 and f64 => OK
   ExpectValidates(
       sigs.d_dd(),
-      {WASM_BLOCK_D(WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_GET_LOCAL(0))),
+      {WASM_BLOCK_D(WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_LOCAL_GET(0))),
                     WASM_F64(1.2))});
 }
 
@@ -2452,8 +2468,8 @@ TEST_F(FunctionBodyDecoderTest, Break_TypeCheckAll1) {
       ValueType storage[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, storage);
       byte code[] = {WASM_BLOCK_T(
-          sig.GetReturn(), WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_GET_LOCAL(0))),
-          WASM_GET_LOCAL(1))};
+          sig.GetReturn(), WASM_IF(WASM_ZERO, WASM_BRV(0, WASM_LOCAL_GET(0))),
+          WASM_LOCAL_GET(1))};
 
       Validate(IsSubtypeOf(kValueTypes[j], kValueTypes[i], module), &sig, code);
     }
@@ -2467,8 +2483,8 @@ TEST_F(FunctionBodyDecoderTest, Break_TypeCheckAll2) {
       ValueType storage[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, storage);
       byte code[] = {WASM_IF_ELSE_T(sig.GetReturn(0), WASM_ZERO,
-                                    WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)),
-                                    WASM_GET_LOCAL(1))};
+                                    WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)),
+                                    WASM_LOCAL_GET(1))};
 
       Validate(IsSubtypeOf(kValueTypes[j], kValueTypes[i], module), &sig, code);
     }
@@ -2482,8 +2498,8 @@ TEST_F(FunctionBodyDecoderTest, Break_TypeCheckAll3) {
       ValueType storage[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, storage);
       byte code[] = {WASM_IF_ELSE_T(sig.GetReturn(), WASM_ZERO,
-                                    WASM_GET_LOCAL(1),
-                                    WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))};
+                                    WASM_LOCAL_GET(1),
+                                    WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)))};
 
       Validate(IsSubtypeOf(kValueTypes[j], kValueTypes[i], module), &sig, code);
     }
@@ -2498,8 +2514,8 @@ TEST_F(FunctionBodyDecoderTest, Break_Unify) {
       FunctionSig sig(1, 2, storage);
 
       byte code1[] = {WASM_BLOCK_T(
-          type, WASM_IF(WASM_ZERO, WASM_BRV(1, WASM_GET_LOCAL(which))),
-          WASM_GET_LOCAL(which ^ 1))};
+          type, WASM_IF(WASM_ZERO, WASM_BRV(1, WASM_LOCAL_GET(which))),
+          WASM_LOCAL_GET(which ^ 1))};
 
       Validate(type == kWasmI32, &sig, code1);
     }
@@ -2513,7 +2529,7 @@ TEST_F(FunctionBodyDecoderTest, BreakIf_cond_type) {
       ValueType types[] = {kValueTypes[i], kValueTypes[i], kValueTypes[j]};
       FunctionSig sig(1, 2, types);
       byte code[] = {WASM_BLOCK_T(
-          types[0], WASM_BRV_IF(0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)))};
+          types[0], WASM_BRV_IF(0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)))};
 
       Validate(types[2] == kWasmI32, &sig, code);
     }
@@ -2528,8 +2544,8 @@ TEST_F(FunctionBodyDecoderTest, BreakIf_val_type) {
                            kWasmI32};
       FunctionSig sig(1, 3, types);
       byte code[] = {WASM_BLOCK_T(
-          types[1], WASM_BRV_IF(0, WASM_GET_LOCAL(1), WASM_GET_LOCAL(2)),
-          WASM_DROP, WASM_GET_LOCAL(0))};
+          types[1], WASM_BRV_IF(0, WASM_LOCAL_GET(1), WASM_LOCAL_GET(2)),
+          WASM_DROP, WASM_LOCAL_GET(0))};
 
       Validate(IsSubtypeOf(kValueTypes[j], kValueTypes[i], module), &sig, code);
     }
@@ -2542,8 +2558,8 @@ TEST_F(FunctionBodyDecoderTest, BreakIf_Unify) {
       ValueType type = kValueTypes[i];
       ValueType storage[] = {kWasmI32, kWasmI32, type};
       FunctionSig sig(1, 2, storage);
-      byte code[] = {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(which)),
-                                  WASM_DROP, WASM_GET_LOCAL(which ^ 1))};
+      byte code[] = {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(which)),
+                                  WASM_DROP, WASM_LOCAL_GET(which ^ 1))};
 
       Validate(type == kWasmI32, &sig, code);
     }
@@ -2592,7 +2608,7 @@ TEST_F(FunctionBodyDecoderTest, BrTable2b) {
 }
 
 TEST_F(FunctionBodyDecoderTest, BrTable_off_end) {
-  static byte code[] = {B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 0, BR_TARGET(0)))};
+  static byte code[] = {B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 0, BR_TARGET(0)))};
   for (size_t len = 1; len < sizeof(code); len++) {
     ExpectFailure(sigs.i_i(), VectorOf(code, len), kAppendEnd);
     ExpectFailure(sigs.i_i(), VectorOf(code, len), kOmitEnd);
@@ -2601,7 +2617,7 @@ TEST_F(FunctionBodyDecoderTest, BrTable_off_end) {
 
 TEST_F(FunctionBodyDecoderTest, BrTable_invalid_br1) {
   for (int depth = 0; depth < 4; depth++) {
-    byte code[] = {B1(WASM_BR_TABLE(WASM_GET_LOCAL(0), 0, BR_TARGET(depth)))};
+    byte code[] = {B1(WASM_BR_TABLE(WASM_LOCAL_GET(0), 0, BR_TARGET(depth)))};
     Validate(depth <= 1, sigs.v_i(), code);
   }
 }
@@ -2609,7 +2625,7 @@ TEST_F(FunctionBodyDecoderTest, BrTable_invalid_br1) {
 TEST_F(FunctionBodyDecoderTest, BrTable_invalid_br2) {
   for (int depth = 0; depth < 7; depth++) {
     byte code[] = {
-        WASM_LOOP(WASM_BR_TABLE(WASM_GET_LOCAL(0), 0, BR_TARGET(depth)))};
+        WASM_LOOP(WASM_BR_TABLE(WASM_LOCAL_GET(0), 0, BR_TARGET(depth)))};
     Validate(depth < 2, sigs.v_i(), code);
   }
 }
@@ -2679,14 +2695,14 @@ TEST_F(FunctionBodyDecoderTest, BrTable_type_mismatch_unreachable) {
 
 TEST_F(FunctionBodyDecoderTest, BrUnreachable1) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_GET_LOCAL(0), kExprBrTable, 0, BR_TARGET(0)});
+                  {WASM_LOCAL_GET(0), kExprBrTable, 0, BR_TARGET(0)});
 }
 
 TEST_F(FunctionBodyDecoderTest, BrUnreachable2) {
   ExpectValidates(sigs.v_i(),
-                  {WASM_GET_LOCAL(0), kExprBrTable, 0, BR_TARGET(0), WASM_NOP});
+                  {WASM_LOCAL_GET(0), kExprBrTable, 0, BR_TARGET(0), WASM_NOP});
   ExpectFailure(sigs.v_i(),
-                {WASM_GET_LOCAL(0), kExprBrTable, 0, BR_TARGET(0), WASM_ZERO});
+                {WASM_LOCAL_GET(0), kExprBrTable, 0, BR_TARGET(0), WASM_ZERO});
 }
 
 TEST_F(FunctionBodyDecoderTest, Brv1) {
@@ -2696,15 +2712,15 @@ TEST_F(FunctionBodyDecoderTest, Brv1) {
 }
 
 TEST_F(FunctionBodyDecoderTest, Brv1_type) {
-  ExpectValidates(sigs.i_ii(), {WASM_BLOCK_I(WASM_BRV(0, WASM_GET_LOCAL(0)))});
-  ExpectValidates(sigs.l_ll(), {WASM_BLOCK_L(WASM_BRV(0, WASM_GET_LOCAL(0)))});
-  ExpectValidates(sigs.f_ff(), {WASM_BLOCK_F(WASM_BRV(0, WASM_GET_LOCAL(0)))});
-  ExpectValidates(sigs.d_dd(), {WASM_BLOCK_D(WASM_BRV(0, WASM_GET_LOCAL(0)))});
+  ExpectValidates(sigs.i_ii(), {WASM_BLOCK_I(WASM_BRV(0, WASM_LOCAL_GET(0)))});
+  ExpectValidates(sigs.l_ll(), {WASM_BLOCK_L(WASM_BRV(0, WASM_LOCAL_GET(0)))});
+  ExpectValidates(sigs.f_ff(), {WASM_BLOCK_F(WASM_BRV(0, WASM_LOCAL_GET(0)))});
+  ExpectValidates(sigs.d_dd(), {WASM_BLOCK_D(WASM_BRV(0, WASM_LOCAL_GET(0)))});
 }
 
 TEST_F(FunctionBodyDecoderTest, Brv1_type_n) {
-  ExpectFailure(sigs.i_f(), {WASM_BLOCK_I(WASM_BRV(0, WASM_GET_LOCAL(0)))});
-  ExpectFailure(sigs.i_d(), {WASM_BLOCK_I(WASM_BRV(0, WASM_GET_LOCAL(0)))});
+  ExpectFailure(sigs.i_f(), {WASM_BLOCK_I(WASM_BRV(0, WASM_LOCAL_GET(0)))});
+  ExpectFailure(sigs.i_d(), {WASM_BLOCK_I(WASM_BRV(0, WASM_LOCAL_GET(0)))});
 }
 
 TEST_F(FunctionBodyDecoderTest, BrvIf1) {
@@ -2713,24 +2729,24 @@ TEST_F(FunctionBodyDecoderTest, BrvIf1) {
 
 TEST_F(FunctionBodyDecoderTest, BrvIf1_type) {
   ExpectValidates(sigs.i_i(),
-                  {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))});
+                  {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)))});
   ExpectValidates(sigs.l_l(),
-                  {WASM_BLOCK_L(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))});
+                  {WASM_BLOCK_L(WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)))});
   ExpectValidates(sigs.f_ff(),
-                  {WASM_BLOCK_F(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))});
+                  {WASM_BLOCK_F(WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)))});
   ExpectValidates(sigs.d_dd(),
-                  {WASM_BLOCK_D(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))});
+                  {WASM_BLOCK_D(WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)))});
 }
 
 TEST_F(FunctionBodyDecoderTest, BrvIf1_type_n) {
   ExpectFailure(sigs.i_f(),
-                {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))});
+                {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)))});
   ExpectFailure(sigs.i_d(),
-                {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_GET_LOCAL(0)))});
+                {WASM_BLOCK_I(WASM_BRV_IF_ZERO(0, WASM_LOCAL_GET(0)))});
 }
 
 TEST_F(FunctionBodyDecoderTest, Select) {
-  ExpectValidates(sigs.i_i(), {WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
+  ExpectValidates(sigs.i_i(), {WASM_SELECT(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0),
                                            WASM_ZERO)});
   ExpectValidates(sigs.f_ff(),
                   {WASM_SELECT(WASM_F32(0.0), WASM_F32(0.0), WASM_ZERO)});
@@ -2743,17 +2759,17 @@ TEST_F(FunctionBodyDecoderTest, Select) {
 TEST_F(FunctionBodyDecoderTest, Select_needs_value_type) {
   WASM_FEATURE_SCOPE(reftypes);
   ExpectFailure(sigs.e_e(),
-                {WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_ZERO)});
+                {WASM_SELECT(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), WASM_ZERO)});
   ExpectFailure(sigs.c_c(),
-                {WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_ZERO)});
+                {WASM_SELECT(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), WASM_ZERO)});
 }
 
 TEST_F(FunctionBodyDecoderTest, Select_fail1) {
-  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_F32(0.0), WASM_GET_LOCAL(0),
-                                         WASM_GET_LOCAL(0))});
-  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_GET_LOCAL(0), WASM_F32(0.0),
-                                         WASM_GET_LOCAL(0))});
-  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
+  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_F32(0.0), WASM_LOCAL_GET(0),
+                                         WASM_LOCAL_GET(0))});
+  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_LOCAL_GET(0), WASM_F32(0.0),
+                                         WASM_LOCAL_GET(0))});
+  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0),
                                          WASM_F32(0.0))});
 }
 
@@ -2767,35 +2783,35 @@ TEST_F(FunctionBodyDecoderTest, Select_fail2) {
     ValueType types[] = {type, kWasmI32, type};
     FunctionSig sig(1, 2, types);
 
-    ExpectValidates(&sig, {WASM_SELECT(WASM_GET_LOCAL(1), WASM_GET_LOCAL(1),
-                                       WASM_GET_LOCAL(0))});
+    ExpectValidates(&sig, {WASM_SELECT(WASM_LOCAL_GET(1), WASM_LOCAL_GET(1),
+                                       WASM_LOCAL_GET(0))});
 
-    ExpectFailure(&sig, {WASM_SELECT(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0),
-                                     WASM_GET_LOCAL(0))});
+    ExpectFailure(&sig, {WASM_SELECT(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0),
+                                     WASM_LOCAL_GET(0))});
 
-    ExpectFailure(&sig, {WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                                     WASM_GET_LOCAL(0))});
+    ExpectFailure(&sig, {WASM_SELECT(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                                     WASM_LOCAL_GET(0))});
 
-    ExpectFailure(&sig, {WASM_SELECT(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
-                                     WASM_GET_LOCAL(1))});
+    ExpectFailure(&sig, {WASM_SELECT(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0),
+                                     WASM_LOCAL_GET(1))});
   }
 }
 
 TEST_F(FunctionBodyDecoderTest, Select_TypeCheck) {
-  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_F32(9.9), WASM_GET_LOCAL(0),
-                                         WASM_GET_LOCAL(0))});
+  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_F32(9.9), WASM_LOCAL_GET(0),
+                                         WASM_LOCAL_GET(0))});
 
-  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_GET_LOCAL(0), WASM_F64(0.25),
-                                         WASM_GET_LOCAL(0))});
+  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_LOCAL_GET(0), WASM_F64(0.25),
+                                         WASM_LOCAL_GET(0))});
 
-  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_F32(9.9), WASM_GET_LOCAL(0),
+  ExpectFailure(sigs.i_i(), {WASM_SELECT(WASM_F32(9.9), WASM_LOCAL_GET(0),
                                          WASM_I64V_1(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, SelectWithType) {
   WASM_FEATURE_SCOPE(reftypes);
-  ExpectValidates(sigs.i_i(), {WASM_SELECT_I(WASM_GET_LOCAL(0),
-                                             WASM_GET_LOCAL(0), WASM_ZERO)});
+  ExpectValidates(sigs.i_i(), {WASM_SELECT_I(WASM_LOCAL_GET(0),
+                                             WASM_LOCAL_GET(0), WASM_ZERO)});
   ExpectValidates(sigs.f_ff(),
                   {WASM_SELECT_F(WASM_F32(0.0), WASM_F32(0.0), WASM_ZERO)});
   ExpectValidates(sigs.d_dd(),
@@ -2812,7 +2828,7 @@ TEST_F(FunctionBodyDecoderTest, SelectWithType) {
 
 TEST_F(FunctionBodyDecoderTest, SelectWithType_fail) {
   WASM_FEATURE_SCOPE(reftypes);
-  ExpectFailure(sigs.i_i(), {WASM_SELECT_F(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
+  ExpectFailure(sigs.i_i(), {WASM_SELECT_F(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0),
                                            WASM_ZERO)});
   ExpectFailure(sigs.f_ff(),
                 {WASM_SELECT_D(WASM_F32(0.0), WASM_F32(0.0), WASM_ZERO)});
@@ -2839,63 +2855,105 @@ TEST_F(FunctionBodyDecoderTest, ThrowUnreachable) {
   WASM_FEATURE_SCOPE(eh);
   byte ex1 = builder.AddException(sigs.v_v());
   byte ex2 = builder.AddException(sigs.v_i());
-  ExpectValidates(sigs.i_i(), {WASM_GET_LOCAL(0), kExprThrow, ex1, WASM_NOP});
-  ExpectValidates(sigs.v_i(), {WASM_GET_LOCAL(0), kExprThrow, ex2, WASM_NOP});
-  ExpectValidates(sigs.i_i(), {WASM_GET_LOCAL(0), kExprThrow, ex1, WASM_ZERO});
-  ExpectFailure(sigs.v_i(), {WASM_GET_LOCAL(0), kExprThrow, ex2, WASM_ZERO});
+  ExpectValidates(sigs.i_i(), {WASM_LOCAL_GET(0), kExprThrow, ex1, WASM_NOP});
+  ExpectValidates(sigs.v_i(), {WASM_LOCAL_GET(0), kExprThrow, ex2, WASM_NOP});
+  ExpectValidates(sigs.i_i(), {WASM_LOCAL_GET(0), kExprThrow, ex1, WASM_ZERO});
+  ExpectFailure(sigs.v_i(), {WASM_LOCAL_GET(0), kExprThrow, ex2, WASM_ZERO});
   ExpectFailure(sigs.i_i(),
-                {WASM_GET_LOCAL(0), kExprThrow, ex1, WASM_F32(0.0)});
+                {WASM_LOCAL_GET(0), kExprThrow, ex1, WASM_F32(0.0)});
   ExpectFailure(sigs.v_i(),
-                {WASM_GET_LOCAL(0), kExprThrow, ex2, WASM_F32(0.0)});
+                {WASM_LOCAL_GET(0), kExprThrow, ex2, WASM_F32(0.0)});
 }
 
 #define WASM_TRY_OP kExprTry, kVoidCode
-#define WASM_BR_ON_EXN(depth, index) \
-  kExprBrOnExn, static_cast<byte>(depth), static_cast<byte>(index)
 
 TEST_F(FunctionBodyDecoderTest, TryCatch) {
   WASM_FEATURE_SCOPE(eh);
-  ExpectValidates(sigs.v_v(), {WASM_TRY_OP, kExprCatch, kExprDrop, kExprEnd});
-  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprCatch, kExprCatch, kExprEnd});
-  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprEnd});    // Missing catch.
-  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprCatch});  // Missing end.
-  ExpectFailure(sigs.v_v(), {kExprCatch, kExprEnd});     // Missing try.
+  byte ex = builder.AddException(sigs.v_v());
+  ExpectValidates(sigs.v_v(), {WASM_TRY_OP, kExprCatch, ex, kExprEnd});
+  ExpectValidates(sigs.v_v(),
+                  {WASM_TRY_OP, kExprCatch, ex, kExprCatchAll, kExprEnd});
+  ExpectFailure(sigs.v_v(),
+                {WASM_TRY_OP, kExprCatchAll, kExprCatch, ex, kExprEnd},
+                kAppendEnd, "catch after catch-all for try");
+  ExpectFailure(sigs.v_v(),
+                {WASM_TRY_OP, kExprCatchAll, kExprCatchAll, kExprEnd},
+                kAppendEnd, "catch-all already present for try");
+  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprEnd}, kAppendEnd,
+                "missing catch or catch-all in try");
+  ExpectFailure(sigs.v_v(), {kExprCatch, ex, kExprEnd}, kAppendEnd,
+                "catch does not match any try");
+}
+
+TEST_F(FunctionBodyDecoderTest, TryUnwind) {
+  WASM_FEATURE_SCOPE(eh);
+  byte ex = builder.AddException(sigs.v_v());
+  ExpectValidates(sigs.v_v(), {WASM_TRY_OP, kExprUnwind, kExprEnd});
+  ExpectFailure(sigs.v_v(),
+                {WASM_TRY_OP, kExprUnwind, kExprCatch, ex, kExprEnd},
+                kAppendEnd, "catch after unwind for try");
+  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprCatchAll, kExprUnwind, kExprEnd},
+                kAppendEnd,
+                "catch, catch-all or unwind already present for try");
+  ExpectFailure(
+      sigs.v_v(), {WASM_TRY_OP, kExprCatch, ex, kExprUnwind, kExprEnd},
+      kAppendEnd, "catch, catch-all or unwind already present for try");
 }
 
 TEST_F(FunctionBodyDecoderTest, Rethrow) {
   WASM_FEATURE_SCOPE(eh);
   ExpectValidates(sigs.v_v(),
-                  {WASM_TRY_OP, kExprCatch, kExprRethrow, kExprEnd});
-  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprRethrow, kExprCatch, kExprEnd});
-  ExpectFailure(sigs.v_v(), {WASM_BLOCK(kExprRethrow)});
-  ExpectFailure(sigs.v_v(), {kExprRethrow});
+                  {WASM_TRY_OP, kExprCatchAll, kExprRethrow, 0, kExprEnd});
+  ExpectFailure(sigs.v_v(),
+                {WASM_TRY_OP, kExprRethrow, 0, kExprCatch, kExprEnd},
+                kAppendEnd, "rethrow not targeting catch or catch-all");
+  ExpectFailure(sigs.v_v(), {WASM_BLOCK(kExprRethrow, 0)}, kAppendEnd,
+                "rethrow not targeting catch or catch-all");
+  ExpectFailure(sigs.v_v(), {kExprRethrow, 0}, kAppendEnd,
+                "rethrow not targeting catch or catch-all");
+  ExpectFailure(sigs.v_v(),
+                {WASM_TRY_OP, kExprUnwind, kExprRethrow, 0, kExprEnd},
+                kAppendEnd, "rethrow not targeting catch or catch-all");
 }
 
-TEST_F(FunctionBodyDecoderTest, BrOnExn) {
+TEST_F(FunctionBodyDecoderTest, TryDelegate) {
   WASM_FEATURE_SCOPE(eh);
-  byte ex1 = builder.AddException(sigs.v_v());
-  byte ex2 = builder.AddException(sigs.v_i());
-  ExpectValidates(sigs.v_v(), {WASM_TRY_OP, kExprCatch, WASM_BR_ON_EXN(0, ex1),
-                               kExprDrop, kExprEnd});
-  ExpectValidates(sigs.v_v(), {WASM_TRY_OP, kExprCatch, WASM_BR_ON_EXN(1, ex1),
-                               kExprDrop, kExprEnd});
-  ExpectValidates(sigs.v_v(), {WASM_TRY_OP, kExprCatch, WASM_BR_ON_EXN(0, ex1),
-                               WASM_BR_ON_EXN(0, ex1), kExprDrop, kExprEnd});
-  ExpectValidates(sigs.v_v(),
-                  {WASM_BLOCK(WASM_TRY_OP, kExprCatch, WASM_BR_ON_EXN(1, ex1),
-                              kExprDrop, kExprEnd)});
-  ExpectValidates(sigs.i_v(),
-                  {WASM_BLOCK_I(WASM_TRY_OP, kExprCatch, WASM_BR_ON_EXN(1, ex2),
-                                kExprDrop, kExprEnd, kExprI32Const, 0)});
-  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprCatch, WASM_BR_ON_EXN(2, ex1),
-                             kExprDrop, kExprEnd});
-  ExpectFailure(sigs.v_v(), {WASM_TRY_OP, kExprCatch, kExprDrop,
-                             WASM_BR_ON_EXN(0, ex1), kExprEnd});
+  byte ex = builder.AddException(sigs.v_v());
+
+  ExpectValidates(sigs.v_v(), {WASM_TRY_OP,
+                               WASM_TRY_DELEGATE(WASM_STMTS(kExprThrow, ex), 0),
+                               kExprCatch, ex, kExprEnd});
+  ExpectValidates(
+      sigs.v_v(),
+      {WASM_BLOCK(WASM_TRY_OP, WASM_TRY_DELEGATE(WASM_STMTS(kExprThrow, ex), 2),
+                  kExprCatch, ex, kExprEnd)});
+
   ExpectFailure(sigs.v_v(),
-                {WASM_TRY_OP, kExprCatch, WASM_BR_ON_EXN(0, ex1), kExprEnd});
+                {WASM_TRY_OP,
+                 WASM_BLOCK(WASM_TRY_DELEGATE(WASM_STMTS(kExprThrow, ex), 0)),
+                 kExprCatch, ex, kExprEnd},
+                kAppendEnd,
+                "delegate target must be a try block or the function block");
+  ExpectFailure(sigs.v_v(),
+                {WASM_TRY_OP, kExprCatch, ex,
+                 WASM_TRY_DELEGATE(WASM_STMTS(kExprThrow, ex), 0), kExprEnd},
+                kAppendEnd,
+                "cannot delegate inside the catch handler of the target");
+  ExpectFailure(
+      sigs.v_v(),
+      {WASM_BLOCK(WASM_TRY_OP, WASM_TRY_DELEGATE(WASM_STMTS(kExprThrow, ex), 3),
+                  kExprCatch, ex, kExprEnd)},
+      kAppendEnd, "invalid branch depth: 3");
+  ExpectFailure(
+      sigs.v_v(),
+      {WASM_TRY_OP, WASM_TRY_OP, kExprCatch, ex, kExprDelegate, 0, kExprEnd},
+      kAppendEnd, "delegate does not match a try");
+  ExpectFailure(
+      sigs.v_v(),
+      {WASM_TRY_OP, WASM_TRY_OP, kExprCatchAll, kExprDelegate, 1, kExprEnd},
+      kAppendEnd, "delegate does not match a try");
 }
 
-#undef WASM_BR_ON_EXN
 #undef WASM_TRY_OP
 
 TEST_F(FunctionBodyDecoderTest, MultiValBlock1) {
@@ -2903,45 +2961,45 @@ TEST_F(FunctionBodyDecoderTest, MultiValBlock1) {
   byte sig0 = builder.AddSignature(sigs.ii_v());
   ExpectValidates(
       sigs.i_ii(),
-      {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), kExprI32Add});
+      {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), kExprI32Add});
   ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_NOP), kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0)), kExprI32Add});
+                {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0)), kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                              WASM_GET_LOCAL(0)),
+                {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                              WASM_LOCAL_GET(0)),
                  kExprI32Add});
   ExpectFailure(
       sigs.i_ii(),
-      {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), kExprF32Add});
+      {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), kExprF32Add});
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiValBlock2) {
   WASM_FEATURE_SCOPE(mv);
   byte sig0 = builder.AddSignature(sigs.ii_v());
   ExpectValidates(sigs.i_ii(),
-                  {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
+                  {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
                    WASM_I32_ADD(WASM_NOP, WASM_NOP)});
   ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_NOP),
                               WASM_I32_ADD(WASM_NOP, WASM_NOP)});
-  ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0)),
+  ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0)),
                               WASM_I32_ADD(WASM_NOP, WASM_NOP)});
   ExpectFailure(sigs.i_ii(),
-                {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                              WASM_GET_LOCAL(0)),
+                {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                              WASM_LOCAL_GET(0)),
                  WASM_I32_ADD(WASM_NOP, WASM_NOP)});
   ExpectFailure(sigs.i_ii(),
-                {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
+                {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
                  WASM_F32_ADD(WASM_NOP, WASM_NOP)});
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiValBlockBr) {
   WASM_FEATURE_SCOPE(mv);
   byte sig0 = builder.AddSignature(sigs.ii_v());
-  ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0), WASM_BR(0)),
+  ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0), WASM_BR(0)),
                               kExprI32Add});
-  ExpectValidates(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_GET_LOCAL(0),
-                                             WASM_GET_LOCAL(1), WASM_BR(0)),
+  ExpectValidates(sigs.i_ii(), {WASM_BLOCK_X(sig0, WASM_LOCAL_GET(0),
+                                             WASM_LOCAL_GET(1), WASM_BR(0)),
                                 kExprI32Add});
 }
 
@@ -2950,16 +3008,16 @@ TEST_F(FunctionBodyDecoderTest, MultiValLoop1) {
   byte sig0 = builder.AddSignature(sigs.ii_v());
   ExpectValidates(
       sigs.i_ii(),
-      {WASM_LOOP_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), kExprI32Add});
+      {WASM_LOOP_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), kExprI32Add});
   ExpectFailure(sigs.i_ii(), {WASM_LOOP_X(sig0, WASM_NOP), kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_LOOP_X(sig0, WASM_GET_LOCAL(0)), kExprI32Add});
-  ExpectFailure(sigs.i_ii(), {WASM_LOOP_X(sig0, WASM_GET_LOCAL(0),
-                                          WASM_GET_LOCAL(1), WASM_GET_LOCAL(0)),
+                {WASM_LOOP_X(sig0, WASM_LOCAL_GET(0)), kExprI32Add});
+  ExpectFailure(sigs.i_ii(), {WASM_LOOP_X(sig0, WASM_LOCAL_GET(0),
+                                          WASM_LOCAL_GET(1), WASM_LOCAL_GET(0)),
                               kExprI32Add});
   ExpectFailure(
       sigs.i_ii(),
-      {WASM_LOOP_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), kExprF32Add});
+      {WASM_LOOP_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), kExprF32Add});
 }
 
 TEST_F(FunctionBodyDecoderTest, MultiValIf) {
@@ -2967,58 +3025,58 @@ TEST_F(FunctionBodyDecoderTest, MultiValIf) {
   byte sig0 = builder.AddSignature(sigs.ii_v());
   ExpectValidates(
       sigs.i_ii(),
-      {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0),
-                      WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
-                      WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))),
+      {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0),
+                      WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                      WASM_SEQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))),
        kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0), WASM_NOP, WASM_NOP),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0), WASM_NOP, WASM_NOP),
                  kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0), WASM_NOP,
-                                WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0), WASM_NOP,
+                                WASM_SEQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))),
                  kExprI32Add});
   ExpectFailure(
       sigs.i_ii(),
-      {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0),
-                      WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)), WASM_NOP),
+      {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0),
+                      WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), WASM_NOP),
        kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
-                                WASM_GET_LOCAL(1)),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(0),
+                                WASM_LOCAL_GET(1)),
                  kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
-                                WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0), WASM_LOCAL_GET(0),
+                                WASM_SEQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))),
                  kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0),
-                                WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
-                                WASM_GET_LOCAL(1)),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0),
+                                WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                                WASM_LOCAL_GET(1)),
                  kExprI32Add});
   ExpectFailure(
       sigs.i_ii(),
       {WASM_IF_ELSE_X(
-           sig0, WASM_GET_LOCAL(0),
-           WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0), WASM_GET_LOCAL(0)),
-           WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0), WASM_GET_LOCAL(0))),
+           sig0, WASM_LOCAL_GET(0),
+           WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0), WASM_LOCAL_GET(0)),
+           WASM_SEQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0), WASM_LOCAL_GET(0))),
        kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0),
-                                WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(0),
-                                         WASM_GET_LOCAL(0)),
-                                WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0),
+                                WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(0),
+                                         WASM_LOCAL_GET(0)),
+                                WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))),
                  kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0),
-                                WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
-                                WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(1),
-                                         WASM_GET_LOCAL(1))),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0),
+                                WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                                WASM_SEQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(1),
+                                         WASM_LOCAL_GET(1))),
                  kExprI32Add});
   ExpectFailure(sigs.i_ii(),
-                {WASM_IF_ELSE_X(sig0, WASM_GET_LOCAL(0),
-                                WASM_SEQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1)),
-                                WASM_SEQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))),
+                {WASM_IF_ELSE_X(sig0, WASM_LOCAL_GET(0),
+                                WASM_SEQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)),
+                                WASM_SEQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))),
                  kExprF32Add});
 }
 
@@ -3028,51 +3086,51 @@ TEST_F(FunctionBodyDecoderTest, BlockParam) {
   byte sig2 = builder.AddSignature(sigs.i_ii());
   ExpectValidates(
       sigs.i_ii(),
-      {WASM_GET_LOCAL(0), WASM_BLOCK_X(sig1, WASM_GET_LOCAL(1),
+      {WASM_LOCAL_GET(0), WASM_BLOCK_X(sig1, WASM_LOCAL_GET(1),
                                        WASM_I32_ADD(WASM_NOP, WASM_NOP))});
   ExpectValidates(sigs.i_ii(),
-                  {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+                  {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                    WASM_BLOCK_X(sig2, WASM_I32_ADD(WASM_NOP, WASM_NOP))});
-  ExpectValidates(sigs.i_ii(), {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+  ExpectValidates(sigs.i_ii(), {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                                 WASM_BLOCK_X(sig1, WASM_NOP),
                                 WASM_I32_ADD(WASM_NOP, WASM_NOP)});
   ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig1, WASM_NOP),
-                              WASM_RETURN1(WASM_GET_LOCAL(0))});
-  ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig1, WASM_GET_LOCAL(0)),
-                              WASM_RETURN1(WASM_GET_LOCAL(0))});
+                              WASM_RETURN1(WASM_LOCAL_GET(0))});
+  ExpectFailure(sigs.i_ii(), {WASM_BLOCK_X(sig1, WASM_LOCAL_GET(0)),
+                              WASM_RETURN1(WASM_LOCAL_GET(0))});
   ExpectFailure(
       sigs.i_ii(),
-      {WASM_GET_LOCAL(0), WASM_BLOCK_X(sig2, WASM_I32_ADD(WASM_NOP, WASM_NOP)),
-       WASM_RETURN1(WASM_GET_LOCAL(0))});
+      {WASM_LOCAL_GET(0), WASM_BLOCK_X(sig2, WASM_I32_ADD(WASM_NOP, WASM_NOP)),
+       WASM_RETURN1(WASM_LOCAL_GET(0))});
   ExpectFailure(sigs.i_ii(),
-                {WASM_GET_LOCAL(0), WASM_BLOCK_X(sig1, WASM_F32_NEG(WASM_NOP)),
-                 WASM_RETURN1(WASM_GET_LOCAL(0))});
+                {WASM_LOCAL_GET(0), WASM_BLOCK_X(sig1, WASM_F32_NEG(WASM_NOP)),
+                 WASM_RETURN1(WASM_LOCAL_GET(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, LoopParam) {
   WASM_FEATURE_SCOPE(mv);
   byte sig1 = builder.AddSignature(sigs.i_i());
   byte sig2 = builder.AddSignature(sigs.i_ii());
-  ExpectValidates(sigs.i_ii(), {WASM_GET_LOCAL(0),
-                                WASM_LOOP_X(sig1, WASM_GET_LOCAL(1),
+  ExpectValidates(sigs.i_ii(), {WASM_LOCAL_GET(0),
+                                WASM_LOOP_X(sig1, WASM_LOCAL_GET(1),
                                             WASM_I32_ADD(WASM_NOP, WASM_NOP))});
   ExpectValidates(sigs.i_ii(),
-                  {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+                  {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                    WASM_LOOP_X(sig2, WASM_I32_ADD(WASM_NOP, WASM_NOP))});
-  ExpectValidates(sigs.i_ii(), {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+  ExpectValidates(sigs.i_ii(), {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                                 WASM_LOOP_X(sig1, WASM_NOP),
                                 WASM_I32_ADD(WASM_NOP, WASM_NOP)});
   ExpectFailure(sigs.i_ii(),
-                {WASM_LOOP_X(sig1, WASM_NOP), WASM_RETURN1(WASM_GET_LOCAL(0))});
-  ExpectFailure(sigs.i_ii(), {WASM_LOOP_X(sig1, WASM_GET_LOCAL(0)),
-                              WASM_RETURN1(WASM_GET_LOCAL(0))});
+                {WASM_LOOP_X(sig1, WASM_NOP), WASM_RETURN1(WASM_LOCAL_GET(0))});
+  ExpectFailure(sigs.i_ii(), {WASM_LOOP_X(sig1, WASM_LOCAL_GET(0)),
+                              WASM_RETURN1(WASM_LOCAL_GET(0))});
   ExpectFailure(
       sigs.i_ii(),
-      {WASM_GET_LOCAL(0), WASM_LOOP_X(sig2, WASM_I32_ADD(WASM_NOP, WASM_NOP)),
-       WASM_RETURN1(WASM_GET_LOCAL(0))});
+      {WASM_LOCAL_GET(0), WASM_LOOP_X(sig2, WASM_I32_ADD(WASM_NOP, WASM_NOP)),
+       WASM_RETURN1(WASM_LOCAL_GET(0))});
   ExpectFailure(sigs.i_ii(),
-                {WASM_GET_LOCAL(0), WASM_LOOP_X(sig1, WASM_F32_NEG(WASM_NOP)),
-                 WASM_RETURN1(WASM_GET_LOCAL(0))});
+                {WASM_LOCAL_GET(0), WASM_LOOP_X(sig1, WASM_F32_NEG(WASM_NOP)),
+                 WASM_RETURN1(WASM_LOCAL_GET(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, LoopParamBr) {
@@ -3080,21 +3138,21 @@ TEST_F(FunctionBodyDecoderTest, LoopParamBr) {
   byte sig1 = builder.AddSignature(sigs.i_i());
   byte sig2 = builder.AddSignature(sigs.i_ii());
   ExpectValidates(sigs.i_ii(),
-                  {WASM_GET_LOCAL(0), WASM_LOOP_X(sig1, WASM_BR(0))});
+                  {WASM_LOCAL_GET(0), WASM_LOOP_X(sig1, WASM_BR(0))});
   ExpectValidates(
       sigs.i_ii(),
-      {WASM_GET_LOCAL(0), WASM_LOOP_X(sig1, WASM_BRV(0, WASM_GET_LOCAL(1)))});
-  ExpectValidates(sigs.i_ii(), {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+      {WASM_LOCAL_GET(0), WASM_LOOP_X(sig1, WASM_BRV(0, WASM_LOCAL_GET(1)))});
+  ExpectValidates(sigs.i_ii(), {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                                 WASM_LOOP_X(sig2, WASM_BR(0))});
   ExpectValidates(
       sigs.i_ii(),
-      {WASM_GET_LOCAL(0), WASM_LOOP_X(sig1, WASM_BLOCK_X(sig1, WASM_BR(1)))});
+      {WASM_LOCAL_GET(0), WASM_LOOP_X(sig1, WASM_BLOCK_X(sig1, WASM_BR(1)))});
   ExpectFailure(sigs.i_ii(),
-                {WASM_GET_LOCAL(0), WASM_LOOP_X(sig1, WASM_BLOCK(WASM_BR(1))),
-                 WASM_RETURN1(WASM_GET_LOCAL(0))});
-  ExpectFailure(sigs.i_ii(), {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
+                {WASM_LOCAL_GET(0), WASM_LOOP_X(sig1, WASM_BLOCK(WASM_BR(1))),
+                 WASM_RETURN1(WASM_LOCAL_GET(0))});
+  ExpectFailure(sigs.i_ii(), {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
                               WASM_LOOP_X(sig2, WASM_BLOCK_X(sig1, WASM_BR(1))),
-                              WASM_RETURN1(WASM_GET_LOCAL(0))});
+                              WASM_RETURN1(WASM_LOCAL_GET(0))});
 }
 
 TEST_F(FunctionBodyDecoderTest, IfParam) {
@@ -3102,25 +3160,25 @@ TEST_F(FunctionBodyDecoderTest, IfParam) {
   byte sig1 = builder.AddSignature(sigs.i_i());
   byte sig2 = builder.AddSignature(sigs.i_ii());
   ExpectValidates(sigs.i_ii(),
-                  {WASM_GET_LOCAL(0),
-                   WASM_IF_X(sig1, WASM_GET_LOCAL(0),
-                             WASM_I32_ADD(WASM_NOP, WASM_GET_LOCAL(1)))});
+                  {WASM_LOCAL_GET(0),
+                   WASM_IF_X(sig1, WASM_LOCAL_GET(0),
+                             WASM_I32_ADD(WASM_NOP, WASM_LOCAL_GET(1)))});
   ExpectValidates(sigs.i_ii(),
-                  {WASM_GET_LOCAL(0),
-                   WASM_IF_ELSE_X(sig1, WASM_GET_LOCAL(0),
-                                  WASM_I32_ADD(WASM_NOP, WASM_GET_LOCAL(1)),
+                  {WASM_LOCAL_GET(0),
+                   WASM_IF_ELSE_X(sig1, WASM_LOCAL_GET(0),
+                                  WASM_I32_ADD(WASM_NOP, WASM_LOCAL_GET(1)),
                                   WASM_I32_EQZ(WASM_NOP))});
   ExpectValidates(
       sigs.i_ii(),
-      {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-       WASM_IF_ELSE_X(sig2, WASM_GET_LOCAL(0), WASM_I32_ADD(WASM_NOP, WASM_NOP),
+      {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+       WASM_IF_ELSE_X(sig2, WASM_LOCAL_GET(0), WASM_I32_ADD(WASM_NOP, WASM_NOP),
                       WASM_I32_MUL(WASM_NOP, WASM_NOP))});
-  ExpectValidates(sigs.i_ii(), {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                                WASM_IF_X(sig1, WASM_GET_LOCAL(0), WASM_NOP),
+  ExpectValidates(sigs.i_ii(), {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                                WASM_IF_X(sig1, WASM_LOCAL_GET(0), WASM_NOP),
                                 WASM_I32_ADD(WASM_NOP, WASM_NOP)});
   ExpectValidates(sigs.i_ii(),
-                  {WASM_GET_LOCAL(0), WASM_GET_LOCAL(1),
-                   WASM_IF_ELSE_X(sig1, WASM_GET_LOCAL(0), WASM_NOP,
+                  {WASM_LOCAL_GET(0), WASM_LOCAL_GET(1),
+                   WASM_IF_ELSE_X(sig1, WASM_LOCAL_GET(0), WASM_NOP,
                                   WASM_I32_EQZ(WASM_NOP)),
                    WASM_I32_ADD(WASM_NOP, WASM_NOP)});
 }
@@ -3134,7 +3192,7 @@ TEST_F(FunctionBodyDecoderTest, Regression709741) {
     FunctionBody body(sigs.v_v(), 0, code, code + i);
     WasmFeatures unused_detected_features;
     DecodeResult result =
-        VerifyWasmCode(zone()->allocator(), WasmFeatures::All(), nullptr,
+        VerifyWasmCode(this->zone()->allocator(), WasmFeatures::All(), nullptr,
                        &unused_detected_features, body);
     if (result.ok()) {
       std::ostringstream str;
@@ -3359,10 +3417,10 @@ TEST_F(FunctionBodyDecoderTest, TableGrow) {
       {WASM_TABLE_GROW(tab_ref, WASM_REF_NULL(kExternRefCode), WASM_ONE)});
   // FuncRef table cannot be initialized with an ExternRef value.
   ExpectFailure(sigs.i_e(),
-                {WASM_TABLE_GROW(tab_func, WASM_GET_LOCAL(0), WASM_ONE)});
+                {WASM_TABLE_GROW(tab_func, WASM_LOCAL_GET(0), WASM_ONE)});
   // ExternRef table cannot be initialized with a FuncRef value.
   ExpectFailure(sigs.i_c(),
-                {WASM_TABLE_GROW(tab_ref, WASM_GET_LOCAL(0), WASM_ONE)});
+                {WASM_TABLE_GROW(tab_ref, WASM_LOCAL_GET(0), WASM_ONE)});
   // Check that the table index gets verified.
   ExpectFailure(
       sigs.i_e(),
@@ -3394,10 +3452,10 @@ TEST_F(FunctionBodyDecoderTest, TableFill) {
                                    WASM_REF_NULL(kExternRefCode), WASM_ONE)});
   // FuncRef table cannot be initialized with an ExternRef value.
   ExpectFailure(sigs.v_e(), {WASM_TABLE_FILL(tab_func, WASM_ONE,
-                                             WASM_GET_LOCAL(0), WASM_ONE)});
+                                             WASM_LOCAL_GET(0), WASM_ONE)});
   // ExternRef table cannot be initialized with a FuncRef value.
   ExpectFailure(sigs.v_c(), {WASM_TABLE_FILL(tab_ref, WASM_ONE,
-                                             WASM_GET_LOCAL(0), WASM_ONE)});
+                                             WASM_LOCAL_GET(0), WASM_ONE)});
   // Check that the table index gets verified.
   ExpectFailure(sigs.v_e(),
                 {WASM_TABLE_FILL(tab_ref + 2, WASM_ONE,
@@ -3617,6 +3675,7 @@ TEST_F(FunctionBodyDecoderTest, RefEq) {
       kWasmExnRef,
       kWasmExternRef,
       kWasmFuncRef,
+      kWasmAnyRef,
       ValueType::Ref(HeapType::kExn, kNonNullable),
       ValueType::Ref(HeapType::kExtern, kNonNullable),
       ValueType::Ref(HeapType::kFunc, kNonNullable)};
@@ -3626,7 +3685,7 @@ TEST_F(FunctionBodyDecoderTest, RefEq) {
       ValueType reps[] = {kWasmI32, type1, type2};
       FunctionSig sig(1, 2, reps);
       ExpectValidates(&sig,
-                      {WASM_REF_EQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))});
+                      {WASM_REF_EQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))});
     }
   }
 
@@ -3634,9 +3693,9 @@ TEST_F(FunctionBodyDecoderTest, RefEq) {
     for (ValueType type2 : non_eqref_subtypes) {
       ValueType reps[] = {kWasmI32, type1, type2};
       FunctionSig sig(1, 2, reps);
-      ExpectFailure(&sig, {WASM_REF_EQ(WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))},
+      ExpectFailure(&sig, {WASM_REF_EQ(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))},
                     kAppendEnd, "expected type eqref, found local.get of type");
-      ExpectFailure(&sig, {WASM_REF_EQ(WASM_GET_LOCAL(1), WASM_GET_LOCAL(0))},
+      ExpectFailure(&sig, {WASM_REF_EQ(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))},
                     kAppendEnd, "expected type eqref, found local.get of type");
     }
   }
@@ -3655,7 +3714,7 @@ TEST_F(FunctionBodyDecoderTest, RefAsNonNull) {
   byte array_type_index = builder.AddArray(kWasmI32, true);
   uint32_t heap_types[] = {
       struct_type_index, array_type_index,  HeapType::kExn, HeapType::kFunc,
-      HeapType::kEq,     HeapType::kExtern, HeapType::kI31};
+      HeapType::kEq,     HeapType::kExtern, HeapType::kI31, HeapType::kAny};
 
   ValueType non_compatible_types[] = {kWasmI32, kWasmI64, kWasmF32, kWasmF64,
                                       kWasmS128};
@@ -3665,7 +3724,7 @@ TEST_F(FunctionBodyDecoderTest, RefAsNonNull) {
     ValueType reprs[] = {ValueType::Ref(heap_type, kNonNullable),
                          ValueType::Ref(heap_type, kNullable)};
     FunctionSig sig(1, 1, reprs);
-    ExpectValidates(&sig, {WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0))});
+    ExpectValidates(&sig, {WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0))});
   }
 
   // It works with non-nullable types.
@@ -3673,16 +3732,15 @@ TEST_F(FunctionBodyDecoderTest, RefAsNonNull) {
     ValueType reprs[] = {ValueType::Ref(heap_type, kNonNullable),
                          ValueType::Ref(heap_type, kNonNullable)};
     FunctionSig sig(1, 1, reprs);
-    ExpectValidates(&sig, {WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0))});
+    ExpectValidates(&sig, {WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0))});
   }
 
   // It fails with other types.
   for (ValueType type : non_compatible_types) {
     FunctionSig sig(0, 1, &type);
     ExpectFailure(
-        &sig, {WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0)), kExprDrop}, kAppendEnd,
-        "invalid agrument type to ref.as_non_null: Expected reference type, "
-        "got");
+        &sig, {WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0)), kExprDrop}, kAppendEnd,
+        "ref.as_non_null[0] expected reference type, found local.get of type");
   }
 }
 
@@ -3698,7 +3756,7 @@ TEST_F(FunctionBodyDecoderTest, RefNull) {
   byte array_type_index = builder.AddArray(kWasmI32, true);
   uint32_t type_reprs[] = {
       struct_type_index, array_type_index,  HeapType::kExn, HeapType::kFunc,
-      HeapType::kEq,     HeapType::kExtern, HeapType::kI31};
+      HeapType::kEq,     HeapType::kExtern, HeapType::kI31, HeapType::kAny};
   // It works with heap types.
   for (uint32_t type_repr : type_reprs) {
     const ValueType type = ValueType::Ref(type_repr, kNullable);
@@ -3719,8 +3777,8 @@ TEST_F(FunctionBodyDecoderTest, RefIsNull) {
   ExpectValidates(sigs.i_i(),
                   {WASM_REF_IS_NULL(WASM_REF_NULL(kExternRefCode))});
   ExpectFailure(
-      sigs.i_i(), {WASM_REF_IS_NULL(WASM_GET_LOCAL(0))}, kAppendEnd,
-      "invalid argument type to ref.is_null. Expected reference type, got i32");
+      sigs.i_i(), {WASM_REF_IS_NULL(WASM_LOCAL_GET(0))}, kAppendEnd,
+      "ref.is_null[0] expected reference type, found local.get of type i32");
 
   TestModuleBuilder builder;
   module = builder.module();
@@ -3728,22 +3786,22 @@ TEST_F(FunctionBodyDecoderTest, RefIsNull) {
   byte array_type_index = builder.AddArray(kWasmI32, true);
   uint32_t heap_types[] = {
       struct_type_index, array_type_index,  HeapType::kExn, HeapType::kFunc,
-      HeapType::kEq,     HeapType::kExtern, HeapType::kI31};
+      HeapType::kEq,     HeapType::kExtern, HeapType::kI31, HeapType::kAny};
 
   for (uint32_t heap_type : heap_types) {
     const ValueType types[] = {kWasmI32, ValueType::Ref(heap_type, kNullable)};
     const FunctionSig sig(1, 1, types);
     // It works for nullable references.
-    ExpectValidates(&sig, {WASM_REF_IS_NULL(WASM_GET_LOCAL(0))});
+    ExpectValidates(&sig, {WASM_REF_IS_NULL(WASM_LOCAL_GET(0))});
     // It works for non-nullable references.
     ExpectValidates(
-        &sig, {WASM_REF_IS_NULL(WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0)))});
+        &sig, {WASM_REF_IS_NULL(WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0)))});
   }
 
   // It fails if the argument type is not a reference type.
   ExpectFailure(
       sigs.v_v(), {WASM_REF_IS_NULL(WASM_I32V(0)), kExprDrop}, kAppendEnd,
-      "invalid argument type to ref.is_null. Expected reference type, got ");
+      "ref.is_null[0] expected reference type, found i32.const of type i32");
 }
 
 TEST_F(FunctionBodyDecoderTest, BrOnNull) {
@@ -3755,13 +3813,13 @@ TEST_F(FunctionBodyDecoderTest, BrOnNull) {
                             ValueType::Ref(HeapType::kFunc, kNullable)};
   const FunctionSig sig(1, 1, reps);
   ExpectValidates(
-      &sig, {WASM_BLOCK_R(reps[0], WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0)),
-                          WASM_BR_ON_NULL(0, WASM_GET_LOCAL(0)), WASM_I32V(0),
+      &sig, {WASM_BLOCK_R(reps[0], WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0)),
+                          WASM_BR_ON_NULL(0, WASM_LOCAL_GET(0)), WASM_I32V(0),
                           kExprSelectWithType, 1, WASM_REF_TYPE(reps[0]))});
 
   // Should have block return value on stack before calling br_on_null.
   ExpectFailure(&sig,
-                {WASM_BLOCK_R(reps[0], WASM_BR_ON_NULL(0, WASM_GET_LOCAL(0)),
+                {WASM_BLOCK_R(reps[0], WASM_BR_ON_NULL(0, WASM_LOCAL_GET(0)),
                               WASM_I32V(0), kExprSelectWithType, 1,
                               WASM_REF_TYPE(reps[0]))},
                 kAppendEnd,
@@ -3808,7 +3866,7 @@ TEST_F(FunctionBodyDecoderTest, GCStruct) {
       "expected 1 elements on the stack for fallthru to @1, found 2");
   // Mistyped arguments.
   ExpectFailure(&sig_v_r,
-                {WASM_STRUCT_NEW_WITH_RTT(struct_type_index, WASM_GET_LOCAL(0),
+                {WASM_STRUCT_NEW_WITH_RTT(struct_type_index, WASM_LOCAL_GET(0),
                                           WASM_RTT_CANON(struct_type_index))},
                 kAppendEnd,
                 "struct.new_with_rtt[0] expected type i32, found local.get of "
@@ -3820,13 +3878,13 @@ TEST_F(FunctionBodyDecoderTest, GCStruct) {
                  kExprDrop},
                 kAppendEnd, "invalid struct index: 1");
   // Wrongly typed rtt.
-  ExpectFailure(
-      sigs.v_v(),
-      {WASM_STRUCT_NEW_WITH_RTT(struct_type_index, WASM_I32V(0),
-                                WASM_RTT_CANON(array_type_index)),
-       kExprDrop},
-      kAppendEnd,
-      "struct.new_with_rtt expected rtt for type 0, found rtt for type 1");
+  ExpectFailure(sigs.v_v(),
+                {WASM_STRUCT_NEW_WITH_RTT(struct_type_index, WASM_I32V(0),
+                                          WASM_RTT_CANON(array_type_index)),
+                 kExprDrop},
+                kAppendEnd,
+                "struct.new_with_rtt[1] expected rtt for type 0, found "
+                "rtt.canon of type (rtt 1 1)");
   // Out-of-bounds index.
   ExpectFailure(sigs.v_v(),
                 {WASM_STRUCT_NEW_WITH_RTT(42, WASM_I32V(0),
@@ -3836,46 +3894,46 @@ TEST_F(FunctionBodyDecoderTest, GCStruct) {
 
   /** struct.get **/
   ExpectValidates(&sig_i_r, {WASM_STRUCT_GET(struct_type_index, field_index,
-                                             WASM_GET_LOCAL(0))});
+                                             WASM_LOCAL_GET(0))});
   // With non-nullable struct.
   ExpectValidates(&sig_i_r,
                   {WASM_STRUCT_GET(struct_type_index, field_index,
-                                   WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0)))});
+                                   WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0)))});
   // Wrong index.
   ExpectFailure(
       &sig_v_r,
-      {WASM_STRUCT_GET(struct_type_index, field_index + 1, WASM_GET_LOCAL(0)),
+      {WASM_STRUCT_GET(struct_type_index, field_index + 1, WASM_LOCAL_GET(0)),
        kExprDrop},
       kAppendEnd, "invalid field index: 1");
   // Mistyped expected type.
   ExpectFailure(
       &sig_f_r,
-      {WASM_STRUCT_GET(struct_type_index, field_index, WASM_GET_LOCAL(0))},
+      {WASM_STRUCT_GET(struct_type_index, field_index, WASM_LOCAL_GET(0))},
       kAppendEnd, "type error in merge[0] (expected f32, got i32)");
 
   /** struct.set **/
   ExpectValidates(&sig_v_r, {WASM_STRUCT_SET(struct_type_index, field_index,
-                                             WASM_GET_LOCAL(0), WASM_I32V(0))});
+                                             WASM_LOCAL_GET(0), WASM_I32V(0))});
   // Non-nullable struct.
   ExpectValidates(
       &sig_v_r,
       {WASM_STRUCT_SET(struct_type_index, field_index,
-                       WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0)), WASM_I32V(0))});
+                       WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0)), WASM_I32V(0))});
   // Wrong index.
   ExpectFailure(&sig_v_r,
                 {WASM_STRUCT_SET(struct_type_index, field_index + 1,
-                                 WASM_GET_LOCAL(0), WASM_I32V(0))},
+                                 WASM_LOCAL_GET(0), WASM_I32V(0))},
                 kAppendEnd, "invalid field index: 1");
   // Mistyped input.
   ExpectFailure(&sig_v_r,
                 {WASM_STRUCT_SET(struct_type_index, field_index,
-                                 WASM_GET_LOCAL(0), WASM_I64V(0))},
+                                 WASM_LOCAL_GET(0), WASM_I64V(0))},
                 kAppendEnd,
                 "struct.set[1] expected type i32, found i64.const of type i64");
   // Expecting output.
   ExpectFailure(&sig_i_r,
                 {WASM_STRUCT_SET(struct_type_index, field_index,
-                                 WASM_GET_LOCAL(0), WASM_I32V(0))},
+                                 WASM_LOCAL_GET(0), WASM_I32V(0))},
                 kAppendEnd,
                 "expected 1 elements on the stack for fallthru to @1, found 0");
   // Setting immutable field.
@@ -3886,21 +3944,22 @@ TEST_F(FunctionBodyDecoderTest, GCStruct) {
           WASM_STRUCT_NEW_WITH_RTT(immutable_struct_type_index, WASM_I32V(42),
                                    WASM_RTT_CANON(immutable_struct_type_index)),
           WASM_I32V(0))},
-      kAppendEnd, "setting immutable struct field");
+      kAppendEnd, "struct.set: Field 0 of type 2 is immutable.");
 
   // struct.get_s/u fail
   ExpectFailure(
       &sig_i_r,
-      {WASM_STRUCT_GET_S(struct_type_index, field_index, WASM_GET_LOCAL(0))},
+      {WASM_STRUCT_GET_S(struct_type_index, field_index, WASM_LOCAL_GET(0))},
       kAppendEnd,
-      "struct.get_s is only valid for packed struct fields. Use struct.get "
-      "instead.");
+      "struct.get_s: Immediate field 0 of type 0 has non-packed type i32. Use "
+      "struct.get instead.");
+
   ExpectFailure(
       &sig_i_r,
-      {WASM_STRUCT_GET_U(struct_type_index, field_index, WASM_GET_LOCAL(0))},
+      {WASM_STRUCT_GET_U(struct_type_index, field_index, WASM_LOCAL_GET(0))},
       kAppendEnd,
-      "struct.get_u is only valid for packed struct fields. Use struct.get "
-      "instead.");
+      "struct.get_u: Immediate field 0 of type 0 has non-packed type i32. Use "
+      "struct.get instead.");
 }
 
 TEST_F(FunctionBodyDecoderTest, GCArray) {
@@ -3952,13 +4011,13 @@ TEST_F(FunctionBodyDecoderTest, GCArray) {
       kAppendEnd,
       "array.new_with_rtt[1] expected type i32, found i64.const of type i64");
   // Mistyped rtt.
-  ExpectFailure(
-      &sig_r_v,
-      {WASM_ARRAY_NEW_WITH_RTT(array_type_index, WASM_REF_NULL(kFuncRefCode),
-                               WASM_I32V(5),
-                               WASM_RTT_CANON(struct_type_index))},
-      kAppendEnd,
-      "array.new_with_rtt expected rtt for type 0, found rtt for type 1");
+  ExpectFailure(&sig_r_v,
+                {WASM_ARRAY_NEW_WITH_RTT(
+                    array_type_index, WASM_REF_NULL(kFuncRefCode), WASM_I32V(5),
+                    WASM_RTT_CANON(struct_type_index))},
+                kAppendEnd,
+                "array.new_with_rtt[2] expected rtt for type 0, found "
+                "rtt.canon of type (rtt 1 1)");
   // Wrong type index.
   ExpectFailure(
       sigs.v_v(),
@@ -3968,75 +4027,77 @@ TEST_F(FunctionBodyDecoderTest, GCArray) {
       kAppendEnd, "invalid array index: 1");
 
   /** array.get **/
-  ExpectValidates(&sig_c_r, {WASM_ARRAY_GET(array_type_index, WASM_GET_LOCAL(0),
+  ExpectValidates(&sig_c_r, {WASM_ARRAY_GET(array_type_index, WASM_LOCAL_GET(0),
                                             WASM_I32V(5))});
   // With non-nullable array type.
   ExpectValidates(
       &sig_c_r,
-      {WASM_ARRAY_GET(array_type_index, WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0)),
+      {WASM_ARRAY_GET(array_type_index, WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0)),
                       WASM_I32V(5))});
   // Wrongly typed index.
   ExpectFailure(
       &sig_v_r,
-      {WASM_ARRAY_GET(array_type_index, WASM_GET_LOCAL(0), WASM_I64V(5)),
+      {WASM_ARRAY_GET(array_type_index, WASM_LOCAL_GET(0), WASM_I64V(5)),
        kExprDrop},
       kAppendEnd,
       "array.get[1] expected type i32, found i64.const of type i64");
   // Mistyped expected type.
   ExpectFailure(
       &sig_f_r,
-      {WASM_ARRAY_GET(array_type_index, WASM_GET_LOCAL(0), WASM_I32V(5))},
+      {WASM_ARRAY_GET(array_type_index, WASM_LOCAL_GET(0), WASM_I32V(5))},
       kAppendEnd, "type error in merge[0] (expected f32, got funcref)");
 
   // array.get_s/u fail.
   ExpectFailure(
       &sig_c_r,
-      {WASM_ARRAY_GET_S(array_type_index, WASM_GET_LOCAL(0), WASM_I32V(5))},
+      {WASM_ARRAY_GET_S(array_type_index, WASM_LOCAL_GET(0), WASM_I32V(5))},
       kAppendEnd,
-      "array.get_s is only valid for packed arrays. Use array.get instead.");
+      "array.get_s: Immediate array type 0 has non-packed type funcref. Use "
+      "array.get instead.");
   ExpectFailure(
       &sig_c_r,
-      {WASM_ARRAY_GET_U(array_type_index, WASM_GET_LOCAL(0), WASM_I32V(5))},
+      {WASM_ARRAY_GET_U(array_type_index, WASM_LOCAL_GET(0), WASM_I32V(5))},
       kAppendEnd,
-      "array.get_u is only valid for packed arrays. Use array.get instead.");
+      "array.get_u: Immediate array type 0 has non-packed type funcref. Use "
+      "array.get instead.");
 
   /** array.set **/
   ExpectValidates(&sig_v_r,
-                  {WASM_ARRAY_SET(array_type_index, WASM_GET_LOCAL(0),
+                  {WASM_ARRAY_SET(array_type_index, WASM_LOCAL_GET(0),
                                   WASM_I32V(42), WASM_REF_NULL(kFuncRefCode))});
   // With non-nullable array type.
   ExpectValidates(
       &sig_v_cr,
-      {WASM_ARRAY_SET(array_type_index, WASM_GET_LOCAL(1), WASM_I32V(42),
-                      WASM_REF_AS_NON_NULL(WASM_GET_LOCAL(0)))});
+      {WASM_ARRAY_SET(array_type_index, WASM_LOCAL_GET(1), WASM_I32V(42),
+                      WASM_REF_AS_NON_NULL(WASM_LOCAL_GET(0)))});
   // Non-array type index.
   ExpectFailure(&sig_v_cr,
-                {WASM_ARRAY_SET(struct_type_index, WASM_GET_LOCAL(1),
-                                WASM_I32V(42), WASM_GET_LOCAL(0))},
+                {WASM_ARRAY_SET(struct_type_index, WASM_LOCAL_GET(1),
+                                WASM_I32V(42), WASM_LOCAL_GET(0))},
                 kAppendEnd, "invalid array index: 1");
   // Wrongly typed index.
   ExpectFailure(&sig_v_cr,
-                {WASM_ARRAY_SET(array_type_index, WASM_GET_LOCAL(1),
-                                WASM_I64V(42), WASM_GET_LOCAL(0))},
+                {WASM_ARRAY_SET(array_type_index, WASM_LOCAL_GET(1),
+                                WASM_I64V(42), WASM_LOCAL_GET(0))},
                 kAppendEnd,
                 "array.set[1] expected type i32, found i64.const of type i64");
   // Wrongly typed value.
   ExpectFailure(
       &sig_v_cr,
-      {WASM_ARRAY_SET(array_type_index, WASM_GET_LOCAL(1), WASM_I32V(42),
+      {WASM_ARRAY_SET(array_type_index, WASM_LOCAL_GET(1), WASM_I32V(42),
                       WASM_I64V(0))},
       kAppendEnd,
       "array.set[2] expected type funcref, found i64.const of type i64");
 
   /** array.len **/
   ExpectValidates(&sig_i_r,
-                  {WASM_ARRAY_LEN(array_type_index, WASM_GET_LOCAL(0))});
+                  {WASM_ARRAY_LEN(array_type_index, WASM_LOCAL_GET(0))});
   // Wrong return type.
-  ExpectFailure(&sig_f_r, {WASM_ARRAY_LEN(array_type_index, WASM_GET_LOCAL(0))},
+  ExpectFailure(&sig_f_r, {WASM_ARRAY_LEN(array_type_index, WASM_LOCAL_GET(0))},
                 kAppendEnd, "type error in merge[0] (expected f32, got i32)");
   // Non-array type index.
   ExpectFailure(&sig_i_r,
-                {WASM_ARRAY_LEN(struct_type_index, WASM_GET_LOCAL(0))},
+                {WASM_ARRAY_LEN(struct_type_index, WASM_LOCAL_GET(0))},
                 kAppendEnd, "invalid array index: 1");
 }
 
@@ -4117,14 +4178,14 @@ TEST_F(FunctionBodyDecoderTest, PackedFields) {
                 {WASM_ARRAY_GET(array_type_index,
                                 WASM_REF_NULL(array_type_index), WASM_I32V(0))},
                 kAppendEnd,
-                "array.get used with a field of packed type. Use array.get_s "
-                "or array.get_u instead.");
+                "array.get: Immediate array type 0 has packed type i8. Use "
+                "array.get_s or array.get_u instead.");
   ExpectFailure(sigs.i_v(),
                 {WASM_STRUCT_GET(struct_type_index, field_index,
                                  WASM_REF_NULL(struct_type_index))},
                 kAppendEnd,
-                "struct.get used with a field of packed type. Use struct.get_s "
-                "or struct.get_u instead.");
+                "struct.get: Immediate field 0 of type 1 has packed type i16. "
+                "Use struct.get_s or struct.get_u instead.");
 }
 
 TEST_F(FunctionBodyDecoderTest, PackedTypesAsLocals) {
@@ -4132,7 +4193,7 @@ TEST_F(FunctionBodyDecoderTest, PackedTypesAsLocals) {
   WASM_FEATURE_SCOPE(typed_funcref);
   WASM_FEATURE_SCOPE(gc);
   AddLocals(kWasmI8, 1);
-  ExpectFailure(sigs.v_v(), {}, kAppendEnd, "invalid local type");
+  ExpectFailure(sigs.v_v(), {}, kAppendEnd, "invalid value type");
 }
 
 TEST_F(FunctionBodyDecoderTest, RttCanon) {
@@ -4148,13 +4209,16 @@ TEST_F(FunctionBodyDecoderTest, RttCanon) {
 
   for (HeapType::Representation heap :
        {HeapType::kExtern, HeapType::kEq, HeapType::kExn, HeapType::kI31,
-        static_cast<HeapType::Representation>(array_type_index),
+        HeapType::kAny, static_cast<HeapType::Representation>(array_type_index),
         static_cast<HeapType::Representation>(struct_type_index)}) {
-    ValueType rtt1 = ValueType::Rtt(HeapType(heap), 1);
+    ValueType rtt1 =
+        ValueType::Rtt(HeapType(heap), heap == HeapType::kAny ? 0 : 1);
     FunctionSig sig1(1, 0, &rtt1);
     ExpectValidates(&sig1, {WASM_RTT_CANON(rtt1.heap_type().code() & 0x7F)});
 
-    ValueType rtt2 = ValueType::Rtt(HeapType(heap), 2);
+    // rtt.canon should fail for incorrect depth.
+    ValueType rtt2 =
+        ValueType::Rtt(HeapType(heap), heap == HeapType::kAny ? 1 : 2);
     FunctionSig sig2(1, 0, &rtt2);
     ExpectFailure(&sig2, {WASM_RTT_CANON(rtt2.heap_type().code() & 0x7F)},
                   kAppendEnd, "type error in merge[0]");
@@ -4182,10 +4246,47 @@ TEST_F(FunctionBodyDecoderTest, RttSub) {
                     {WASM_RTT_SUB(kFuncRefCode, WASM_RTT_CANON(kFuncRefCode))});
   }
 
+  {
+    // Can build an rtt.sub from a generic type with itself.
+    ValueType type = ValueType::Rtt(HeapType::kAny, 1);
+    FunctionSig sig(1, 0, &type);
+    ExpectValidates(&sig,
+                    {WASM_RTT_SUB(kAnyRefCode, WASM_RTT_CANON(kAnyRefCode))});
+  }
+
+  // Can build an rtt.sub between related generic types.
+  {
+    ValueType type = ValueType::Rtt(HeapType::kFunc, 1);
+    FunctionSig sig(1, 0, &type);
+    ExpectValidates(&sig,
+                    {WASM_RTT_SUB(kFuncRefCode, WASM_RTT_CANON(kAnyRefCode))});
+  }
+  {
+    ValueType type = ValueType::Rtt(HeapType::kEq, 1);
+    FunctionSig sig(1, 0, &type);
+    ExpectValidates(&sig,
+                    {WASM_RTT_SUB(kEqRefCode, WASM_RTT_CANON(kAnyRefCode))});
+  }
+  {
+    ValueType type = ValueType::Rtt(HeapType::kI31, 2);
+    FunctionSig sig(1, 0, &type);
+    ExpectValidates(&sig,
+                    {WASM_RTT_SUB(kI31RefCode, WASM_RTT_CANON(kEqRefCode))});
+  }
+
+  // Cannot build an rtt.sub between unrelated generic types.
+  {
+    ValueType type = ValueType::Rtt(HeapType::kFunc, 2);
+    FunctionSig sig(1, 0, &type);
+    ExpectFailure(
+        &sig, {WASM_RTT_SUB(kFuncRefCode, WASM_RTT_CANON(kI31RefCode))},
+        kAppendEnd, "rtt.sub[0] expected rtt for a supertype of type func");
+  }
+
   // Trivial type error.
-  ExpectFailure(sigs.v_v(),
-                {WASM_RTT_SUB(kFuncRefCode, WASM_I32V(42)), kExprDrop},
-                kAppendEnd, "rtt.sub requires a supertype rtt on stack");
+  ExpectFailure(
+      sigs.v_v(), {WASM_RTT_SUB(kFuncRefCode, WASM_I32V(42)), kExprDrop},
+      kAppendEnd, "rtt.sub[0] expected rtt for a supertype of type func");
 
   {
     ValueType type = ValueType::Rtt(array_type_index, 2);
@@ -4200,7 +4301,7 @@ TEST_F(FunctionBodyDecoderTest, RttSub) {
     ExpectFailure(
         sigs.v_v(),
         {WASM_RTT_SUB(kEqRefCode, WASM_RTT_CANON(array_type_index)), kExprDrop},
-        kAppendEnd, "rtt.sub requires a supertype rtt on stack");
+        kAppendEnd, "rtt.sub[0] expected rtt for a supertype of type eq");
   }
 
   {
@@ -4217,11 +4318,13 @@ TEST_F(FunctionBodyDecoderTest, RttSub) {
     ExpectFailure(sigs.v_v(),
                   {WASM_RTT_SUB(super_struct_type_index,
                                 WASM_RTT_CANON(array_type_index))},
-                  kAppendEnd, "rtt.sub requires a supertype rtt on stack");
+                  kAppendEnd,
+                  "rtt.sub[0] expected rtt for a supertype of type 1");
     ExpectFailure(sigs.v_v(),
                   {WASM_RTT_SUB(super_struct_type_index,
                                 WASM_RTT_CANON(sub_struct_type_index))},
-                  kAppendEnd, "rtt.sub requires a supertype rtt on stack");
+                  kAppendEnd,
+                  "rtt.sub[0] expected rtt for a supertype of type 1");
   }
 
   {
@@ -4254,10 +4357,10 @@ TEST_F(FunctionBodyDecoderTest, RefTestCast) {
 
   // Passing/failing tests due to static subtyping.
   std::pair<HeapType::Representation, HeapType::Representation> valid_pairs[] =
-      {{HeapType::kEq, HeapType::kI31},
-       {HeapType::kFunc, HeapType::kFunc},
-       {HeapType::kEq, array_heap},
-       {HeapType::kEq, super_struct_heap},
+      {{HeapType::kAny, HeapType::kI31},    {HeapType::kAny, HeapType::kFunc},
+       {HeapType::kAny, array_heap},        {HeapType::kAny, super_struct_heap},
+       {HeapType::kEq, HeapType::kI31},     {HeapType::kFunc, HeapType::kFunc},
+       {HeapType::kEq, array_heap},         {HeapType::kEq, super_struct_heap},
        {super_struct_heap, sub_struct_heap}};
 
   for (auto pair : valid_pairs) {
@@ -4270,19 +4373,19 @@ TEST_F(FunctionBodyDecoderTest, RefTestCast) {
     FunctionSig cast_sig(1, 1, cast_reps);
     ExpectValidates(&test_sig,
                     {WASM_REF_TEST(WASM_HEAP_TYPE(from_heap),
-                                   WASM_HEAP_TYPE(to_heap), WASM_GET_LOCAL(0),
+                                   WASM_HEAP_TYPE(to_heap), WASM_LOCAL_GET(0),
                                    WASM_RTT_CANON(WASM_HEAP_TYPE(to_heap)))});
     ExpectValidates(&cast_sig,
                     {WASM_REF_CAST(WASM_HEAP_TYPE(from_heap),
-                                   WASM_HEAP_TYPE(to_heap), WASM_GET_LOCAL(0),
+                                   WASM_HEAP_TYPE(to_heap), WASM_LOCAL_GET(0),
                                    WASM_RTT_CANON(WASM_HEAP_TYPE(to_heap)))});
   }
 
   std::pair<HeapType::Representation, HeapType::Representation>
-      invalid_pairs[] = {{HeapType::kI31, HeapType::kEq},
-                         {array_heap, super_struct_heap},
-                         {array_heap, HeapType::kEq},
-                         {HeapType::kExtern, HeapType::kExn}};
+      invalid_pairs[] = {
+          {array_heap, HeapType::kAny},    {HeapType::kEq, HeapType::kAny},
+          {HeapType::kI31, HeapType::kEq}, {array_heap, super_struct_heap},
+          {array_heap, HeapType::kEq},     {HeapType::kExtern, HeapType::kExn}};
 
   for (auto pair : invalid_pairs) {
     HeapType from_heap = HeapType(pair.first);
@@ -4294,16 +4397,14 @@ TEST_F(FunctionBodyDecoderTest, RefTestCast) {
     FunctionSig cast_sig(1, 1, cast_reps);
     ExpectFailure(&test_sig,
                   {WASM_REF_TEST(WASM_HEAP_TYPE(from_heap),
-                                 WASM_HEAP_TYPE(to_heap), WASM_GET_LOCAL(0),
+                                 WASM_HEAP_TYPE(to_heap), WASM_LOCAL_GET(0),
                                  WASM_RTT_CANON(WASM_HEAP_TYPE(to_heap)))},
-                  kAppendEnd,
-                  "ref.test: rtt type must be subtype of object type");
+                  kAppendEnd, "is not a subtype of immediate object type");
     ExpectFailure(&cast_sig,
                   {WASM_REF_CAST(WASM_HEAP_TYPE(from_heap),
-                                 WASM_HEAP_TYPE(to_heap), WASM_GET_LOCAL(0),
+                                 WASM_HEAP_TYPE(to_heap), WASM_LOCAL_GET(0),
                                  WASM_RTT_CANON(WASM_HEAP_TYPE(to_heap)))},
-                  kAppendEnd,
-                  "ref.cast: rtt type must be subtype of object type");
+                  kAppendEnd, "is not a subtype of immediate object type");
   }
 
   // Trivial type error.
@@ -4327,18 +4428,32 @@ TEST_F(FunctionBodyDecoderTest, RefTestCast) {
     ExpectFailure(
         &sig,
         {WASM_REF_TEST(kEqRefCode, static_cast<byte>(array_heap),
-                       WASM_GET_LOCAL(0), WASM_RTT_CANON(kI31RefCode)),
+                       WASM_LOCAL_GET(0), WASM_RTT_CANON(kI31RefCode)),
          kExprDrop},
-        kAppendEnd, "ref.test: expected rtt for type 0 but got (rtt 1 i31)");
+        kAppendEnd,
+        "ref.test[1] expected rtt for type 0, found rtt.canon of type (rtt 1 "
+        "i31)");
     ExpectFailure(
         &sig,
         {WASM_REF_CAST(kEqRefCode, static_cast<byte>(array_heap),
-                       WASM_GET_LOCAL(0), WASM_RTT_CANON(kI31RefCode)),
+                       WASM_LOCAL_GET(0), WASM_RTT_CANON(kI31RefCode)),
          kExprDrop},
-        kAppendEnd, "ref.cast: expected rtt for type 0 but got (rtt 1 i31)");
+        kAppendEnd,
+        "ref.cast[1] expected rtt for type 0, found rtt.canon of type (rtt 1 "
+        "i31)");
   }
 }
 
+// This tests that num_locals_ in decoder remains consistent, even if we fail
+// mid-DecodeLocals().
+TEST_F(FunctionBodyDecoderTest, Regress_1154439) {
+  WASM_FEATURE_SCOPE(reftypes);
+  WASM_FEATURE_SCOPE(typed_funcref);
+  AddLocals(kWasmI32, 1);
+  AddLocals(kWasmI64, 1000000);
+  ExpectFailure(sigs.v_v(), {}, kAppendEnd, "local count too large");
+}
+
 class BranchTableIteratorTest : public TestWithZone {
  public:
   BranchTableIteratorTest() : TestWithZone() {}
@@ -4459,12 +4574,12 @@ TEST_F(WasmOpcodeLengthTest, Statements) {
   ExpectLength(1, kExprElse);
   ExpectLength(1, kExprEnd);
   ExpectLength(1, kExprSelect);
-  ExpectLength(1, kExprCatch);
-  ExpectLength(1, kExprRethrow);
+  ExpectLength(2, kExprCatch);
+  ExpectLength(2, kExprDelegate);
+  ExpectLength(2, kExprRethrow);
   ExpectLength(2, kExprBr);
   ExpectLength(2, kExprBrIf);
   ExpectLength(2, kExprThrow);
-  ExpectLength(3, kExprBrOnExn);
   ExpectLength(2, kExprBlock, kI32Code);
   ExpectLength(2, kExprLoop, kI32Code);
   ExpectLength(2, kExprIf, kI32Code);
@@ -4611,18 +4726,20 @@ TEST_F(WasmOpcodeLengthTest, PrefixedOpcodesLEB) {
 
 class TypeReaderTest : public TestWithZone {
  public:
-  ValueType DecodeValueType(const byte* start, const byte* end) {
+  ValueType DecodeValueType(const byte* start, const byte* end,
+                            const WasmModule* module) {
     Decoder decoder(start, end);
     uint32_t length;
     return value_type_reader::read_value_type<Decoder::kFullValidation>(
-        &decoder, start, &length, enabled_features_);
+        &decoder, start, &length, module, enabled_features_);
   }
 
-  HeapType DecodeHeapType(const byte* start, const byte* end) {
+  HeapType DecodeHeapType(const byte* start, const byte* end,
+                          const WasmModule* module) {
     Decoder decoder(start, end);
     uint32_t length;
     return value_type_reader::read_heap_type<Decoder::kFullValidation>(
-        &decoder, start, &length, enabled_features_);
+        &decoder, start, &length, module, enabled_features_);
   }
 
   // This variable is modified by WASM_FEATURE_SCOPE.
@@ -4640,34 +4757,34 @@ TEST_F(TypeReaderTest, HeapTypeDecodingTest) {
   // 1- to 5-byte representation of kFuncRefCode.
   {
     const byte data[] = {kFuncRefCode};
-    HeapType result = DecodeHeapType(data, data + sizeof(data));
+    HeapType result = DecodeHeapType(data, data + sizeof(data), nullptr);
     EXPECT_TRUE(result == heap_func);
   }
   {
     const byte data[] = {kFuncRefCode | 0x80, 0x7F};
-    HeapType result = DecodeHeapType(data, data + sizeof(data));
+    HeapType result = DecodeHeapType(data, data + sizeof(data), nullptr);
     EXPECT_EQ(result, heap_func);
   }
   {
     const byte data[] = {kFuncRefCode | 0x80, 0xFF, 0x7F};
-    HeapType result = DecodeHeapType(data, data + sizeof(data));
+    HeapType result = DecodeHeapType(data, data + sizeof(data), nullptr);
     EXPECT_EQ(result, heap_func);
   }
   {
     const byte data[] = {kFuncRefCode | 0x80, 0xFF, 0xFF, 0x7F};
-    HeapType result = DecodeHeapType(data, data + sizeof(data));
+    HeapType result = DecodeHeapType(data, data + sizeof(data), nullptr);
     EXPECT_EQ(result, heap_func);
   }
   {
     const byte data[] = {kFuncRefCode | 0x80, 0xFF, 0xFF, 0xFF, 0x7F};
-    HeapType result = DecodeHeapType(data, data + sizeof(data));
+    HeapType result = DecodeHeapType(data, data + sizeof(data), nullptr);
     EXPECT_EQ(result, heap_func);
   }
 
   {
     // Some negative number.
     const byte data[] = {0xB4, 0x7F};
-    HeapType result = DecodeHeapType(data, data + sizeof(data));
+    HeapType result = DecodeHeapType(data, data + sizeof(data), nullptr);
     EXPECT_EQ(result, heap_bottom);
   }
 
@@ -4676,7 +4793,7 @@ TEST_F(TypeReaderTest, HeapTypeDecodingTest) {
     // range. This should therefore NOT be decoded as HeapType::kFunc and
     // instead fail.
     const byte data[] = {kFuncRefCode | 0x80, 0x6F};
-    HeapType result = DecodeHeapType(data, data + sizeof(data));
+    HeapType result = DecodeHeapType(data, data + sizeof(data), nullptr);
     EXPECT_EQ(result, heap_bottom);
   }
 }
@@ -4698,7 +4815,9 @@ class LocalDeclDecoderTest : public TestWithZone {
 
   bool DecodeLocalDecls(BodyLocalDecls* decls, const byte* start,
                         const byte* end) {
-    return i::wasm::DecodeLocalDecls(enabled_features_, decls, start, end);
+    WasmModule module;
+    return i::wasm::DecodeLocalDecls(enabled_features_, decls, &module, start,
+                                     end);
   }
 };
 
@@ -4825,6 +4944,20 @@ TEST_F(LocalDeclDecoderTest, ExnRef) {
   EXPECT_EQ(type, map[0]);
 }
 
+TEST_F(LocalDeclDecoderTest, InvalidTypeIndex) {
+  WASM_FEATURE_SCOPE(reftypes);
+  WASM_FEATURE_SCOPE(typed_funcref);
+
+  const byte* data = nullptr;
+  const byte* end = nullptr;
+  LocalDeclEncoder local_decls(zone());
+
+  local_decls.AddLocals(1, ValueType::Ref(0, kNullable));
+  BodyLocalDecls decls(zone());
+  bool result = DecodeLocalDecls(&decls, data, end);
+  EXPECT_FALSE(result);
+}
+
 class BytecodeIteratorTest : public TestWithZone {};
 
 TEST_F(BytecodeIteratorTest, SimpleForeach) {
@@ -4903,25 +5036,60 @@ TEST_F(BytecodeIteratorTest, WithLocalDecls) {
  * Memory64 tests
  ******************************************************************************/
 
-TEST_F(FunctionBodyDecoderTest, IndexTypesOn32BitMemory) {
-  builder.InitializeMemory(kMemory32);
-  ExpectValidates(sigs.i_v(), {WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)});
-  ExpectFailure(sigs.i_v(), {WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO64)});
-  ExpectValidates(sigs.v_v(),
-                  {WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO, WASM_ZERO)});
-  ExpectFailure(sigs.v_v(),
-                {WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO64, WASM_ZERO)});
-}
+class FunctionBodyDecoderTestOnBothMemoryTypes
+    : public FunctionBodyDecoderTestBase<::testing::TestWithParam<MemoryType>> {
+ public:
+  bool is_memory64() const { return GetParam() == kMemory64; }
+};
 
-TEST_F(FunctionBodyDecoderTest, IndexTypesOn64BitMemory) {
-  builder.InitializeMemory(kMemory64);
-  ExpectFailure(sigs.i_v(), {WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)});
-  ExpectValidates(sigs.i_v(),
-                  {WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO64)});
-  ExpectFailure(sigs.v_v(),
-                {WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO, WASM_ZERO)});
-  ExpectValidates(sigs.v_v(), {WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO64,
-                                              WASM_ZERO)});
+std::string PrintMemoryType(::testing::TestParamInfo<MemoryType> info) {
+  switch (info.param) {
+    case kMemory32:
+      return "kMemory32";
+    case kMemory64:
+      return "kMemory64";
+  }
+  UNREACHABLE();
+}
+
+INSTANTIATE_TEST_SUITE_P(MemoryTypes, FunctionBodyDecoderTestOnBothMemoryTypes,
+                         ::testing::Values(kMemory32, kMemory64),
+                         PrintMemoryType);
+
+TEST_P(FunctionBodyDecoderTestOnBothMemoryTypes, IndexTypes) {
+  builder.InitializeMemory(GetParam());
+  Validate(!is_memory64(), sigs.i_v(),
+           {WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO)});
+  Validate(is_memory64(), sigs.i_v(),
+           {WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO64)});
+  Validate(!is_memory64(), sigs.v_v(),
+           {WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO, WASM_ZERO)});
+  Validate(is_memory64(), sigs.v_v(),
+           {WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO64, WASM_ZERO)});
+}
+
+TEST_P(FunctionBodyDecoderTestOnBothMemoryTypes, 64BitOffset) {
+  builder.InitializeMemory(GetParam());
+  // Macro for defining a zero constant of the right type. Explicitly use
+  // {uint8_t} to make MSVC happy.
+#define ZERO_FOR_TYPE \
+  WASM_SEQ(is_memory64() ? uint8_t{kExprI64Const} : uint8_t{kExprI32Const}, 0)
+  // Offset is zero encoded in 5 bytes (works always).
+  Validate(
+      true, sigs.i_v(),
+      {WASM_LOAD_MEM_OFFSET(MachineType::Int32(), U64V_5(0), ZERO_FOR_TYPE)});
+  // Offset is zero encoded in 6 bytes (works only in memory64).
+  Validate(
+      is_memory64(), sigs.i_v(),
+      {WASM_LOAD_MEM_OFFSET(MachineType::Int32(), U64V_6(0), ZERO_FOR_TYPE)});
+  // Same with store.
+  Validate(true, sigs.v_v(),
+           {WASM_STORE_MEM_OFFSET(MachineType::Int32(), U64V_5(0),
+                                  ZERO_FOR_TYPE, WASM_ZERO)});
+  Validate(is_memory64(), sigs.v_v(),
+           {WASM_STORE_MEM_OFFSET(MachineType::Int32(), U64V_6(0),
+                                  ZERO_FOR_TYPE, WASM_ZERO)});
+#undef ZERO_FOR_TYPE
 }
 
 #undef B1
diff --git a/deps/v8/test/unittests/wasm/loop-assignment-analysis-unittest.cc b/deps/v8/test/unittests/wasm/loop-assignment-analysis-unittest.cc
index c1c98830bc6c1b..f8ce7e641610b9 100644
--- a/deps/v8/test/unittests/wasm/loop-assignment-analysis-unittest.cc
+++ b/deps/v8/test/unittests/wasm/loop-assignment-analysis-unittest.cc
@@ -18,7 +18,7 @@ namespace v8 {
 namespace internal {
 namespace wasm {
 
-#define WASM_SET_ZERO(i) WASM_SET_LOCAL(i, WASM_ZERO)
+#define WASM_SET_ZERO(i) WASM_LOCAL_SET(i, WASM_ZERO)
 
 class WasmLoopAssignmentAnalyzerTest : public TestWithZone {
  public:
@@ -34,7 +34,7 @@ class WasmLoopAssignmentAnalyzerTest : public TestWithZone {
 TEST_F(WasmLoopAssignmentAnalyzerTest, Empty0) {
   byte code[] = { 0 };
   BitVector* assigned = Analyze(code, code);
-  CHECK_NULL(assigned);
+  EXPECT_EQ(assigned, nullptr);
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, Empty1) {
@@ -42,7 +42,7 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, Empty1) {
   for (int i = 0; i < 5; i++) {
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
-      CHECK_EQ(false, assigned->Contains(j));
+      EXPECT_FALSE(assigned->Contains(j));
     }
     num_locals++;
   }
@@ -54,7 +54,7 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, One) {
     byte code[] = {WASM_LOOP(WASM_SET_ZERO(i))};
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
-      CHECK_EQ(j == i, assigned->Contains(j));
+      EXPECT_EQ(j == i, assigned->Contains(j));
     }
   }
 }
@@ -62,10 +62,10 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, One) {
 TEST_F(WasmLoopAssignmentAnalyzerTest, TeeOne) {
   num_locals = 5;
   for (int i = 0; i < 5; i++) {
-    byte code[] = {WASM_LOOP(WASM_TEE_LOCAL(i, WASM_ZERO))};
+    byte code[] = {WASM_LOOP(WASM_LOCAL_TEE(i, WASM_ZERO))};
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
-      CHECK_EQ(j == i, assigned->Contains(j));
+      EXPECT_EQ(j == i, assigned->Contains(j));
     }
   }
 }
@@ -76,7 +76,7 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, OneBeyond) {
     byte code[] = {WASM_LOOP(WASM_SET_ZERO(i)), WASM_SET_ZERO(1)};
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
-      CHECK_EQ(j == i, assigned->Contains(j));
+      EXPECT_EQ(j == i, assigned->Contains(j));
     }
   }
 }
@@ -89,7 +89,7 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, Two) {
       BitVector* assigned = Analyze(code, code + arraysize(code));
       for (int k = 0; k < assigned->length(); k++) {
         bool expected = k == i || k == j;
-        CHECK_EQ(expected, assigned->Contains(k));
+        EXPECT_EQ(expected, assigned->Contains(k));
       }
     }
   }
@@ -103,7 +103,7 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, NestedIf) {
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
       bool expected = i == j || j == 0 || j == 1;
-      CHECK_EQ(expected, assigned->Contains(j));
+      EXPECT_EQ(expected, assigned->Contains(j));
     }
   }
 }
@@ -116,7 +116,7 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, BigLocal) {
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
       bool expected = i == j;
-      CHECK_EQ(expected, assigned->Contains(j));
+      EXPECT_EQ(expected, assigned->Contains(j));
     }
   }
 }
@@ -124,13 +124,13 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, BigLocal) {
 TEST_F(WasmLoopAssignmentAnalyzerTest, Break) {
   num_locals = 3;
   byte code[] = {
-      WASM_LOOP(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_SET_ZERO(1)))),
+      WASM_LOOP(WASM_IF(WASM_LOCAL_GET(0), WASM_BRV(1, WASM_SET_ZERO(1)))),
       WASM_SET_ZERO(0)};
 
   BitVector* assigned = Analyze(code, code + arraysize(code));
   for (int j = 0; j < assigned->length(); j++) {
     bool expected = j == 1;
-    CHECK_EQ(expected, assigned->Contains(j));
+    EXPECT_EQ(expected, assigned->Contains(j));
   }
 }
 
@@ -138,15 +138,15 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, Loop1) {
   num_locals = 5;
   byte code[] = {
       WASM_LOOP(WASM_IF(
-          WASM_GET_LOCAL(0),
-          WASM_BRV(0, WASM_SET_LOCAL(3, WASM_I32_SUB(WASM_GET_LOCAL(0),
+          WASM_LOCAL_GET(0),
+          WASM_BRV(0, WASM_LOCAL_SET(3, WASM_I32_SUB(WASM_LOCAL_GET(0),
                                                      WASM_I32V_1(1)))))),
-      WASM_GET_LOCAL(0)};
+      WASM_LOCAL_GET(0)};
 
   BitVector* assigned = Analyze(code, code + arraysize(code));
   for (int j = 0; j < assigned->length(); j++) {
     bool expected = j == 3;
-    CHECK_EQ(expected, assigned->Contains(j));
+    EXPECT_EQ(expected, assigned->Contains(j));
   }
 }
 
@@ -157,21 +157,21 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, Loop2) {
 
   byte code[] = {WASM_BLOCK(
       WASM_WHILE(
-          WASM_GET_LOCAL(kIter),
+          WASM_LOCAL_GET(kIter),
           WASM_BLOCK(
-              WASM_SET_LOCAL(
-                  kSum, WASM_F32_ADD(WASM_GET_LOCAL(kSum),
+              WASM_LOCAL_SET(
+                  kSum, WASM_F32_ADD(WASM_LOCAL_GET(kSum),
                                      WASM_LOAD_MEM(MachineType::Float32(),
-                                                   WASM_GET_LOCAL(kIter)))),
-              WASM_SET_LOCAL(
-                  kIter, WASM_I32_SUB(WASM_GET_LOCAL(kIter), WASM_I32V_1(4))))),
-      WASM_STORE_MEM(MachineType::Float32(), WASM_ZERO, WASM_GET_LOCAL(kSum)),
-      WASM_GET_LOCAL(kIter))};
+                                                   WASM_LOCAL_GET(kIter)))),
+              WASM_LOCAL_SET(
+                  kIter, WASM_I32_SUB(WASM_LOCAL_GET(kIter), WASM_I32V_1(4))))),
+      WASM_STORE_MEM(MachineType::Float32(), WASM_ZERO, WASM_LOCAL_GET(kSum)),
+      WASM_LOCAL_GET(kIter))};
 
   BitVector* assigned = Analyze(code + 2, code + arraysize(code));
   for (int j = 0; j < assigned->length(); j++) {
     bool expected = j == kIter || j == kSum;
-    CHECK_EQ(expected, assigned->Contains(j));
+    EXPECT_EQ(expected, assigned->Contains(j));
   }
 }
 
@@ -180,7 +180,13 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, Malformed) {
                  'e',       'l',       'l',         'o',          ',',  ' ',
                  'w',       'o',       'r',         'l',          'd',  '!'};
   BitVector* assigned = Analyze(code, code + arraysize(code));
-  CHECK_NULL(assigned);
+  EXPECT_EQ(assigned, nullptr);
+}
+
+TEST_F(WasmLoopAssignmentAnalyzerTest, InvalidOpcode) {
+  byte code[] = {WASM_LOOP(0xFF)};
+  BitVector* assigned = Analyze(code, code + arraysize(code));
+  EXPECT_EQ(assigned, nullptr);
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, regress_642867) {
@@ -191,6 +197,39 @@ TEST_F(WasmLoopAssignmentAnalyzerTest, regress_642867) {
   Analyze(code, code + arraysize(code));
 }
 
+TEST_F(WasmLoopAssignmentAnalyzerTest, LetInLoopAssigned) {
+  num_locals = 5;
+  static const byte code[] = {
+      WASM_LOOP(WASM_LET_1_V(kI32Code, WASM_I32V_1(42), WASM_SET_ZERO(3)))};
+  BitVector* assigned = Analyze(code, code + arraysize(code));
+  for (uint32_t i = 0; i <= num_locals; i++) {
+    EXPECT_EQ(assigned->Contains(i), i == 2);
+  }
+}
+
+TEST_F(WasmLoopAssignmentAnalyzerTest, LetInLoopNotAssigned) {
+  num_locals = 2;
+  static const byte code[] = {WASM_LOOP(
+      WASM_LET_1_V(kI32Code, WASM_I32V_1(42),
+                   WASM_LET_1_V(kI32Code, WASM_I32V_1(42), WASM_SET_ZERO(0),
+                                WASM_SET_ZERO(1))))};
+  BitVector* assigned = Analyze(code, code + arraysize(code));
+  for (uint32_t i = 0; i <= num_locals; i++) {
+    EXPECT_FALSE(assigned->Contains(i));
+  }
+}
+
+TEST_F(WasmLoopAssignmentAnalyzerTest, AssignmentOutsideOfLet) {
+  num_locals = 5;
+  static const byte code[] = {
+      WASM_LOOP(WASM_LET_1_V(kI32Code, WASM_I32V_1(42), WASM_SET_ZERO(3)),
+                WASM_SET_ZERO(4))};
+  BitVector* assigned = Analyze(code, code + arraysize(code));
+  for (uint32_t i = 0; i <= num_locals; i++) {
+    EXPECT_EQ(assigned->Contains(i), i == 2 || i == 4);
+  }
+}
+
 #undef WASM_SET_ZERO
 
 }  // namespace wasm
diff --git a/deps/v8/test/unittests/wasm/module-decoder-unittest.cc b/deps/v8/test/unittests/wasm/module-decoder-unittest.cc
index a7635dcb592693..15fcff6852a81b 100644
--- a/deps/v8/test/unittests/wasm/module-decoder-unittest.cc
+++ b/deps/v8/test/unittests/wasm/module-decoder-unittest.cc
@@ -32,7 +32,7 @@ namespace module_decoder_unittest {
 #define WASM_INIT_EXPR_EXTERN_REF_NULL WASM_REF_NULL(kExternRefCode), kExprEnd
 #define WASM_INIT_EXPR_FUNC_REF_NULL WASM_REF_NULL(kFuncRefCode), kExprEnd
 #define WASM_INIT_EXPR_REF_FUNC(val) WASM_REF_FUNC(val), kExprEnd
-#define WASM_INIT_EXPR_GLOBAL(index) WASM_GET_GLOBAL(index), kExprEnd
+#define WASM_INIT_EXPR_GLOBAL(index) WASM_GLOBAL_GET(index), kExprEnd
 
 #define REF_NULL_ELEMENT kExprRefNull, kFuncRefCode, kExprEnd
 #define REF_FUNC_ELEMENT(v) kExprRefFunc, U32V_1(v), kExprEnd
@@ -540,7 +540,7 @@ TEST_F(WasmModuleVerifyTest, GlobalInitializer) {
       SECTION(Global, ENTRY_COUNT(1),         // --
               kI32Code,                       // type
               1,                              // mutable
-              WASM_GET_GLOBAL(42), kExprEnd)  // init value
+              WASM_GLOBAL_GET(42), kExprEnd)  // init value
   };
   EXPECT_FAILURE_WITH_MSG(referencing_out_of_bounds_global,
                           "global index is out of bounds");
@@ -549,7 +549,7 @@ TEST_F(WasmModuleVerifyTest, GlobalInitializer) {
       SECTION(Global, ENTRY_COUNT(2),        // --
               kI32Code,                      // type
               0,                             // mutable
-              WASM_GET_GLOBAL(1), kExprEnd,  // init value
+              WASM_GLOBAL_GET(1), kExprEnd,  // init value
               kI32Code,                      // type
               0,                             // mutable
               WASM_I32V(0), kExprEnd)        // init value
@@ -566,7 +566,7 @@ TEST_F(WasmModuleVerifyTest, GlobalInitializer) {
                 WASM_RTT(2, kFuncRefCode),               // type
                 0,                                       // mutable
                 WASM_RTT_SUB(kFuncRefCode,               // init value
-                             WASM_GET_GLOBAL(1)),        // --
+                             WASM_GLOBAL_GET(1)),        // --
                 kExprEnd,                                // --
                 WASM_RTT(1, kFuncRefCode),               // type
                 0,                                       // mutable
@@ -583,7 +583,7 @@ TEST_F(WasmModuleVerifyTest, GlobalInitializer) {
               WASM_I32V(1), kExprEnd,        // init value
               kI32Code,                      // type
               0,                             // mutable
-              WASM_GET_GLOBAL(0), kExprEnd)  // init value
+              WASM_GLOBAL_GET(0), kExprEnd)  // init value
   };
   EXPECT_FAILURE_WITH_MSG(
       referencing_mutable_global,
@@ -598,7 +598,7 @@ TEST_F(WasmModuleVerifyTest, GlobalInitializer) {
       SECTION(Global, ENTRY_COUNT(1),          // --
               kI32Code,                        // type
               0,                               // mutable
-              WASM_GET_GLOBAL(0), kExprEnd)    // init value
+              WASM_GLOBAL_GET(0), kExprEnd)    // init value
   };
   EXPECT_FAILURE_WITH_MSG(
       referencing_mutable_imported_global,
@@ -613,7 +613,7 @@ TEST_F(WasmModuleVerifyTest, GlobalInitializer) {
       SECTION(Global, ENTRY_COUNT(1),          // --
               kI32Code,                        // type
               0,                               // mutable
-              WASM_GET_GLOBAL(0), kExprEnd)    // init value
+              WASM_GLOBAL_GET(0), kExprEnd)    // init value
   };
   EXPECT_VERIFIES(referencing_immutable_imported_global);
 
@@ -624,7 +624,7 @@ TEST_F(WasmModuleVerifyTest, GlobalInitializer) {
               WASM_I32V(1), kExprEnd,        // init value
               kI32Code,                      // type
               0,                             // mutable
-              WASM_GET_GLOBAL(0), kExprEnd)  // init value
+              WASM_GLOBAL_GET(0), kExprEnd)  // init value
   };
   EXPECT_FAILURE_WITH_MSG(
       referencing_local_global,
@@ -864,7 +864,7 @@ TEST_F(WasmModuleVerifyTest, GlobalRttSubOfGlobal) {
               WASM_RTT(1, kEqRefCode),  // type
               0),                       // mutability
       SECTION(Global, ENTRY_COUNT(1), WASM_RTT(2, kI31RefCode), 1,
-              WASM_RTT_SUB(kI31RefCode, WASM_GET_GLOBAL(0)), kExprEnd)};
+              WASM_RTT_SUB(kI31RefCode, WASM_GLOBAL_GET(0)), kExprEnd)};
   ModuleResult result = DecodeModule(data, data + sizeof(data));
   WasmInitExpr expected =
       WasmInitExpr::RttSub(HeapType::kI31, WasmInitExpr::GlobalGet(0));
@@ -885,7 +885,7 @@ TEST_F(WasmModuleVerifyTest, GlobalRttSubOfGlobalTypeError) {
               kI32Code,         // type
               0),               // mutability
       SECTION(Global, ENTRY_COUNT(1), WASM_RTT(2, kExternRefCode), 1,
-              WASM_RTT_SUB(kExternRefCode, WASM_GET_GLOBAL(0)), kExprEnd)};
+              WASM_RTT_SUB(kExternRefCode, WASM_GLOBAL_GET(0)), kExprEnd)};
   ModuleResult result = DecodeModule(data, data + sizeof(data));
   EXPECT_NOT_OK(result, "rtt.sub requires a supertype rtt on stack");
 }
@@ -2872,8 +2872,8 @@ TEST_F(WasmInitExprDecodeTest, InitExpr_ExternRef) {
 
 TEST_F(WasmInitExprDecodeTest, InitExpr_illegal) {
   EXPECT_INIT_EXPR_FAIL(WASM_I32V_1(0), WASM_I32V_1(0));
-  EXPECT_INIT_EXPR_FAIL(WASM_GET_LOCAL(0));
-  EXPECT_INIT_EXPR_FAIL(WASM_SET_LOCAL(0, WASM_I32V_1(0)));
+  EXPECT_INIT_EXPR_FAIL(WASM_LOCAL_GET(0));
+  EXPECT_INIT_EXPR_FAIL(WASM_LOCAL_SET(0, WASM_I32V_1(0)));
   EXPECT_INIT_EXPR_FAIL(WASM_I32_ADD(WASM_I32V_1(0), WASM_I32V_1(0)));
   EXPECT_INIT_EXPR_FAIL(WASM_IF_ELSE(WASM_ZERO, WASM_ZERO, WASM_ZERO));
 }
@@ -3282,6 +3282,32 @@ TEST_F(WasmModuleVerifyTest, IllegalPackedFields) {
   EXPECT_NOT_OK(result, "invalid value type");
 }
 
+TEST_F(WasmModuleVerifyTest, Memory64DataSegment) {
+  WASM_FEATURE_SCOPE(memory64);
+  for (bool enable_memory64 : {false, true}) {
+    for (bool use_memory64 : {false, true}) {
+      byte const_opcode = use_memory64 ? kExprI64Const : kExprI32Const;
+      const byte data[] = {
+          SECTION(Memory, ENTRY_COUNT(1),
+                  enable_memory64 ? kMemory64WithMaximum : kWithMaximum, 28,
+                  28),
+          SECTION(Data, ENTRY_COUNT(1), LINEAR_MEMORY_INDEX_0,  // -
+                  const_opcode, 0, kExprEnd,                    // dest addr
+                  U32V_1(3),                                    // source size
+                  'a', 'b', 'c')                                // data bytes
+      };
+
+      if (enable_memory64 == use_memory64) {
+        EXPECT_VERIFIES(data);
+      } else if (enable_memory64) {
+        EXPECT_FAILURE_WITH_MSG(data, "expected i64, got i32");
+      } else {
+        EXPECT_FAILURE_WITH_MSG(data, "expected i32, got i64");
+      }
+    }
+  }
+}
+
 #undef EXPECT_INIT_EXPR
 #undef EXPECT_INIT_EXPR_FAIL
 #undef WASM_INIT_EXPR_I32V_1
diff --git a/deps/v8/test/unittests/wasm/streaming-decoder-unittest.cc b/deps/v8/test/unittests/wasm/streaming-decoder-unittest.cc
index f3e18196b3a016..4f5811f8f61a31 100644
--- a/deps/v8/test/unittests/wasm/streaming-decoder-unittest.cc
+++ b/deps/v8/test/unittests/wasm/streaming-decoder-unittest.cc
@@ -58,6 +58,7 @@ class MockStreamingProcessor : public StreamingProcessor {
 
   bool ProcessCodeSectionHeader(int num_functions, uint32_t offset,
                                 std::shared_ptr<WireBytesStorage>,
+                                int code_section_start,
                                 int code_section_length) override {
     return true;
   }
diff --git a/deps/v8/test/unittests/wasm/subtyping-unittest.cc b/deps/v8/test/unittests/wasm/subtyping-unittest.cc
index 5b439244938d14..ec6e30ac7591c4 100644
--- a/deps/v8/test/unittests/wasm/subtyping-unittest.cc
+++ b/deps/v8/test/unittests/wasm/subtyping-unittest.cc
@@ -57,9 +57,9 @@ TEST_F(WasmSubtypingTest, Subtyping) {
 
   ValueType numeric_types[] = {kWasmI32, kWasmI64, kWasmF32, kWasmF64,
                                kWasmS128};
-  ValueType ref_types[] = {kWasmExternRef, kWasmFuncRef, kWasmExnRef,
-                           kWasmEqRef,     kWasmI31Ref,  optRef(0),
-                           ref(0),         optRef(2),    ref(2)};
+  ValueType ref_types[] = {
+      kWasmExternRef, kWasmFuncRef, kWasmExnRef, kWasmEqRef, kWasmI31Ref,
+      kWasmAnyRef,    optRef(0),    ref(0),      optRef(2),  ref(2)};
 
   // Type judgements across modules should work the same as within one module.
   for (WasmModule* module : {module1, module2}) {
@@ -81,12 +81,17 @@ TEST_F(WasmSubtypingTest, Subtyping) {
 
     for (ValueType ref_type : ref_types) {
       // Concrete reference types and i31ref are subtypes of eqref,
-      // exnref/externref/funcref are not.
+      // exnref/externref/funcref/anyref are not.
       CHECK_EQ(IsSubtypeOf(ref_type, kWasmEqRef, module1, module),
                ref_type != kWasmFuncRef && ref_type != kWasmExternRef &&
-                   ref_type != kWasmExnRef);
+                   ref_type != kWasmExnRef && ref_type != kWasmAnyRef);
       // Each reference type is a subtype of itself.
       CHECK(IsSubtypeOf(ref_type, ref_type, module1, module));
+      // Each reference type is a subtype of anyref.
+      CHECK(IsSubtypeOf(ref_type, kWasmAnyRef, module1, module));
+      // Only anyref is a subtype of anyref.
+      CHECK_EQ(IsSubtypeOf(kWasmAnyRef, ref_type, module1, module),
+               ref_type == kWasmAnyRef);
     }
 
     // The rest of ref. types are unrelated.
diff --git a/deps/v8/test/unittests/wasm/wasm-gdbserver-unittest.cc b/deps/v8/test/unittests/wasm/wasm-gdbserver-unittest.cc
index ef81a441cea269..20044086263a30 100644
--- a/deps/v8/test/unittests/wasm/wasm-gdbserver-unittest.cc
+++ b/deps/v8/test/unittests/wasm/wasm-gdbserver-unittest.cc
@@ -167,7 +167,6 @@ class MockTransport : public TransportBase {
   MOCK_METHOD(bool, AcceptConnection, (), (override));
   MOCK_METHOD(bool, Read, (char*, int32_t), (override));
   MOCK_METHOD(bool, Write, (const char*, int32_t), (override));
-  MOCK_METHOD(bool, IsDataAvailable, (), (override));
   MOCK_METHOD(bool, IsDataAvailable, (), (const, override));
   MOCK_METHOD(void, Disconnect, (), (override));
   MOCK_METHOD(void, Close, (), (override));
diff --git a/deps/v8/test/unittests/wasm/wasm-macro-gen-unittest.cc b/deps/v8/test/unittests/wasm/wasm-macro-gen-unittest.cc
index 850001c1ccaf1d..a83eb6bc489a9d 100644
--- a/deps/v8/test/unittests/wasm/wasm-macro-gen-unittest.cc
+++ b/deps/v8/test/unittests/wasm/wasm-macro-gen-unittest.cc
@@ -52,9 +52,9 @@ TEST_F(WasmMacroGenTest, Statements) {
   EXPECT_SIZE(1, WASM_NOP);
   EXPECT_SIZE(1, WASM_END);
 
-  EXPECT_SIZE(4, WASM_SET_LOCAL(0, WASM_ZERO));
+  EXPECT_SIZE(4, WASM_LOCAL_SET(0, WASM_ZERO));
 
-  EXPECT_SIZE(4, WASM_SET_GLOBAL(0, WASM_ZERO));
+  EXPECT_SIZE(4, WASM_GLOBAL_SET(0, WASM_ZERO));
 
   EXPECT_SIZE(7, WASM_STORE_MEM(MachineType::Int32(), WASM_ZERO, WASM_ZERO));
 
@@ -99,12 +99,12 @@ TEST_F(WasmMacroGenTest, BrTable) {
 }
 
 TEST_F(WasmMacroGenTest, Expressions) {
-  EXPECT_SIZE(2, WASM_GET_LOCAL(0));
-  EXPECT_SIZE(2, WASM_GET_LOCAL(1));
-  EXPECT_SIZE(2, WASM_GET_LOCAL(12));
-  EXPECT_SIZE(2, WASM_GET_GLOBAL(0));
-  EXPECT_SIZE(2, WASM_GET_GLOBAL(1));
-  EXPECT_SIZE(2, WASM_GET_GLOBAL(12));
+  EXPECT_SIZE(2, WASM_LOCAL_GET(0));
+  EXPECT_SIZE(2, WASM_LOCAL_GET(1));
+  EXPECT_SIZE(2, WASM_LOCAL_GET(12));
+  EXPECT_SIZE(2, WASM_GLOBAL_GET(0));
+  EXPECT_SIZE(2, WASM_GLOBAL_GET(1));
+  EXPECT_SIZE(2, WASM_GLOBAL_GET(12));
   EXPECT_SIZE(5, WASM_LOAD_MEM(MachineType::Int32(), WASM_ZERO));
   EXPECT_SIZE(5, WASM_LOAD_MEM(MachineType::Float64(), WASM_ZERO));
   EXPECT_SIZE(5, WASM_LOAD_MEM(MachineType::Float32(), WASM_ZERO));
@@ -296,7 +296,7 @@ TEST_F(WasmMacroGenTest, LoadsAndStores) {
     EXPECT_SIZE(5, WASM_LOAD_MEM(kMemTypes[i], WASM_ZERO));
   }
   for (size_t i = 0; i < arraysize(kMemTypes); i++) {
-    EXPECT_SIZE(7, WASM_STORE_MEM(kMemTypes[i], WASM_ZERO, WASM_GET_LOCAL(0)));
+    EXPECT_SIZE(7, WASM_STORE_MEM(kMemTypes[i], WASM_ZERO, WASM_LOCAL_GET(0)));
   }
 }
 
@@ -306,7 +306,7 @@ TEST_F(WasmMacroGenTest, LoadsAndStoresWithOffset) {
   }
   for (size_t i = 0; i < arraysize(kMemTypes); i++) {
     EXPECT_SIZE(7, WASM_STORE_MEM_OFFSET(kMemTypes[i], 13, WASM_ZERO,
-                                         WASM_GET_LOCAL(0)));
+                                         WASM_LOCAL_GET(0)));
   }
 }
 
diff --git a/deps/v8/test/wasm-api-tests/callbacks.cc b/deps/v8/test/wasm-api-tests/callbacks.cc
index 5e96648ee37e47..fc321e96dc73a9 100644
--- a/deps/v8/test/wasm-api-tests/callbacks.cc
+++ b/deps/v8/test/wasm-api-tests/callbacks.cc
@@ -44,7 +44,7 @@ class WasmCapiCallbacksTest : public WasmCapiTest {
     // int32 stage1(int32 arg0) { return stage2(arg0); }
     uint32_t stage2_index =
         builder()->AddImport(CStrVector("stage2"), wasm_i_i_sig());
-    byte code[] = {WASM_CALL_FUNCTION(stage2_index, WASM_GET_LOCAL(0))};
+    byte code[] = {WASM_CALL_FUNCTION(stage2_index, WASM_LOCAL_GET(0))};
     AddExportedFunction(CStrVector("stage1"), code, sizeof(code));
 
     stage2_ = Func::make(store(), cpp_i_i_sig(), Stage2, this);
@@ -82,7 +82,7 @@ TEST_F(WasmCapiCallbacksTest, GC) {
   // int32 stage3_to4(int32 arg0) { return stage4(arg0); }
   uint32_t stage4_index =
       builder()->AddImport(CStrVector("stage4"), wasm_i_i_sig());
-  byte code[] = {WASM_CALL_FUNCTION(stage4_index, WASM_GET_LOCAL(0))};
+  byte code[] = {WASM_CALL_FUNCTION(stage4_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("stage3_to4"), code, sizeof(code));
 
   i::Isolate* isolate =
@@ -136,15 +136,15 @@ TEST_F(WasmCapiTest, Recursion) {
   uint32_t fibo_c_index =
       builder()->AddImport(CStrVector("fibonacci_c"), wasm_i_i_sig());
   byte code_fibo[] = {
-      WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_ZERO),
+      WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_ZERO),
               WASM_RETURN1(WASM_ZERO)),
-      WASM_IF(WASM_I32_EQ(WASM_GET_LOCAL(0), WASM_ONE), WASM_RETURN1(WASM_ONE)),
+      WASM_IF(WASM_I32_EQ(WASM_LOCAL_GET(0), WASM_ONE), WASM_RETURN1(WASM_ONE)),
       // Muck with the parameter to ensure callers don't depend on its value.
-      WASM_SET_LOCAL(0, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_ONE)),
+      WASM_LOCAL_SET(0, WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_ONE)),
       WASM_RETURN1(WASM_I32_ADD(
-          WASM_CALL_FUNCTION(fibo_c_index, WASM_GET_LOCAL(0)),
+          WASM_CALL_FUNCTION(fibo_c_index, WASM_LOCAL_GET(0)),
           WASM_CALL_FUNCTION(fibo_c_index,
-                             WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_ONE))))};
+                             WASM_I32_SUB(WASM_LOCAL_GET(0), WASM_ONE))))};
   AddExportedFunction(CStrVector("fibonacci_wasm"), code_fibo,
                       sizeof(code_fibo), wasm_i_i_sig());
 
diff --git a/deps/v8/test/wasm-api-tests/finalize.cc b/deps/v8/test/wasm-api-tests/finalize.cc
index 93da85460e1960..5d4ba867f22902 100644
--- a/deps/v8/test/wasm-api-tests/finalize.cc
+++ b/deps/v8/test/wasm-api-tests/finalize.cc
@@ -65,7 +65,7 @@ void RunInStore(Store* store, ZoneBuffer* wire_bytes, int iterations) {
 
 TEST_F(WasmCapiTest, InstanceFinalization) {
   // Add a dummy function: f(x) { return x; }
-  byte code[] = {WASM_RETURN1(WASM_GET_LOCAL(0))};
+  byte code[] = {WASM_RETURN1(WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("f"), code, sizeof(code), wasm_i_i_sig());
   Compile();
   g_instances_finalized = 0;
diff --git a/deps/v8/test/wasm-api-tests/globals.cc b/deps/v8/test/wasm-api-tests/globals.cc
index a41cf4c9bce8c5..e606eed1e6d826 100644
--- a/deps/v8/test/wasm-api-tests/globals.cc
+++ b/deps/v8/test/wasm-api-tests/globals.cc
@@ -47,45 +47,45 @@ TEST_F(WasmCapiTest, Globals) {
   ValueType i64_type[] = {kWasmI64};
   FunctionSig return_f32(1, 0, f32_type);
   FunctionSig return_i64(1, 0, i64_type);
-  byte gcfi[] = {WASM_GET_GLOBAL(cfi_index)};
+  byte gcfi[] = {WASM_GLOBAL_GET(cfi_index)};
   AddExportedFunction(CStrVector("get const f32 import"), gcfi, sizeof(gcfi),
                       &return_f32);
-  byte gcii[] = {WASM_GET_GLOBAL(cii_index)};
+  byte gcii[] = {WASM_GLOBAL_GET(cii_index)};
   AddExportedFunction(CStrVector("get const i64 import"), gcii, sizeof(gcii),
                       &return_i64);
-  byte gvfi[] = {WASM_GET_GLOBAL(vfi_index)};
+  byte gvfi[] = {WASM_GLOBAL_GET(vfi_index)};
   AddExportedFunction(CStrVector("get var f32 import"), gvfi, sizeof(gvfi),
                       &return_f32);
-  byte gvii[] = {WASM_GET_GLOBAL(vii_index)};
+  byte gvii[] = {WASM_GLOBAL_GET(vii_index)};
   AddExportedFunction(CStrVector("get var i64 import"), gvii, sizeof(gvii),
                       &return_i64);
 
-  byte gcfe[] = {WASM_GET_GLOBAL(cfe_index)};
+  byte gcfe[] = {WASM_GLOBAL_GET(cfe_index)};
   AddExportedFunction(CStrVector("get const f32 export"), gcfe, sizeof(gcfe),
                       &return_f32);
-  byte gcie[] = {WASM_GET_GLOBAL(cie_index)};
+  byte gcie[] = {WASM_GLOBAL_GET(cie_index)};
   AddExportedFunction(CStrVector("get const i64 export"), gcie, sizeof(gcie),
                       &return_i64);
-  byte gvfe[] = {WASM_GET_GLOBAL(vfe_index)};
+  byte gvfe[] = {WASM_GLOBAL_GET(vfe_index)};
   AddExportedFunction(CStrVector("get var f32 export"), gvfe, sizeof(gvfe),
                       &return_f32);
-  byte gvie[] = {WASM_GET_GLOBAL(vie_index)};
+  byte gvie[] = {WASM_GLOBAL_GET(vie_index)};
   AddExportedFunction(CStrVector("get var i64 export"), gvie, sizeof(gvie),
                       &return_i64);
 
   // Define functions for manipulating globals.
   FunctionSig param_f32(0, 1, f32_type);
   FunctionSig param_i64(0, 1, i64_type);
-  byte svfi[] = {WASM_SET_GLOBAL(vfi_index, WASM_GET_LOCAL(0))};
+  byte svfi[] = {WASM_GLOBAL_SET(vfi_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("set var f32 import"), svfi, sizeof(svfi),
                       &param_f32);
-  byte svii[] = {WASM_SET_GLOBAL(vii_index, WASM_GET_LOCAL(0))};
+  byte svii[] = {WASM_GLOBAL_SET(vii_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("set var i64 import"), svii, sizeof(svii),
                       &param_i64);
-  byte svfe[] = {WASM_SET_GLOBAL(vfe_index, WASM_GET_LOCAL(0))};
+  byte svfe[] = {WASM_GLOBAL_SET(vfe_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("set var f32 export"), svfe, sizeof(svfe),
                       &param_f32);
-  byte svie[] = {WASM_SET_GLOBAL(vie_index, WASM_GET_LOCAL(0))};
+  byte svie[] = {WASM_GLOBAL_SET(vie_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("set var i64 export"), svie, sizeof(svie),
                       &param_i64);
 
diff --git a/deps/v8/test/wasm-api-tests/hostref.cc b/deps/v8/test/wasm-api-tests/hostref.cc
index e61a7c655df633..d75f0e8ab7a681 100644
--- a/deps/v8/test/wasm-api-tests/hostref.cc
+++ b/deps/v8/test/wasm-api-tests/hostref.cc
@@ -39,20 +39,20 @@ TEST_F(WasmCapiTest, HostRef) {
       CStrVector("global"));
   uint32_t table_index = builder()->AddTable(kWasmExternRef, 10);
   builder()->AddExport(CStrVector("table"), kExternalTable, table_index);
-  byte global_set_code[] = {WASM_SET_GLOBAL(global_index, WASM_GET_LOCAL(0))};
+  byte global_set_code[] = {WASM_GLOBAL_SET(global_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("global.set"), global_set_code,
                       sizeof(global_set_code), &v_r_sig);
-  byte global_get_code[] = {WASM_GET_GLOBAL(global_index)};
+  byte global_get_code[] = {WASM_GLOBAL_GET(global_index)};
   AddExportedFunction(CStrVector("global.get"), global_get_code,
                       sizeof(global_get_code), &r_v_sig);
   byte table_set_code[] = {
-      WASM_TABLE_SET(table_index, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
+      WASM_TABLE_SET(table_index, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))};
   AddExportedFunction(CStrVector("table.set"), table_set_code,
                       sizeof(table_set_code), &v_ir_sig);
-  byte table_get_code[] = {WASM_TABLE_GET(table_index, WASM_GET_LOCAL(0))};
+  byte table_get_code[] = {WASM_TABLE_GET(table_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("table.get"), table_get_code,
                       sizeof(table_get_code), &r_i_sig);
-  byte func_call_code[] = {WASM_CALL_FUNCTION(func_index, WASM_GET_LOCAL(0))};
+  byte func_call_code[] = {WASM_CALL_FUNCTION(func_index, WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("func.call"), func_call_code,
                       sizeof(func_call_code), &r_r_sig);
 
diff --git a/deps/v8/test/wasm-api-tests/memory.cc b/deps/v8/test/wasm-api-tests/memory.cc
index 131bdb96e3173f..3b0ccc08402e0b 100644
--- a/deps/v8/test/wasm-api-tests/memory.cc
+++ b/deps/v8/test/wasm-api-tests/memory.cc
@@ -23,11 +23,11 @@ TEST_F(WasmCapiTest, Memory) {
   byte size_code[] = {WASM_MEMORY_SIZE};
   AddExportedFunction(CStrVector("size"), size_code, sizeof(size_code),
                       &return_i32);
-  byte load_code[] = {WASM_LOAD_MEM(MachineType::Int8(), WASM_GET_LOCAL(0))};
+  byte load_code[] = {WASM_LOAD_MEM(MachineType::Int8(), WASM_LOCAL_GET(0))};
   AddExportedFunction(CStrVector("load"), load_code, sizeof(load_code),
                       &param_i32_return_i32);
-  byte store_code[] = {WASM_STORE_MEM(MachineType::Int8(), WASM_GET_LOCAL(0),
-                                      WASM_GET_LOCAL(1))};
+  byte store_code[] = {WASM_STORE_MEM(MachineType::Int8(), WASM_LOCAL_GET(0),
+                                      WASM_LOCAL_GET(1))};
   AddExportedFunction(CStrVector("store"), store_code, sizeof(store_code),
                       &param_i32_i32);
 
diff --git a/deps/v8/test/wasm-api-tests/multi-return.cc b/deps/v8/test/wasm-api-tests/multi-return.cc
index 2cd624d05346f4..d2eda0d204e7c9 100644
--- a/deps/v8/test/wasm-api-tests/multi-return.cc
+++ b/deps/v8/test/wasm-api-tests/multi-return.cc
@@ -28,9 +28,9 @@ TEST_F(WasmCapiTest, MultiReturn) {
                       kWasmI32, kWasmI64, kWasmI64, kWasmI32};
   FunctionSig sig(4, 4, reps);
   uint32_t func_index = builder()->AddImport(CStrVector("f"), &sig);
-  byte code[] = {WASM_CALL_FUNCTION(func_index, WASM_GET_LOCAL(0),
-                                    WASM_GET_LOCAL(2), WASM_GET_LOCAL(1),
-                                    WASM_GET_LOCAL(3))};
+  byte code[] = {WASM_CALL_FUNCTION(func_index, WASM_LOCAL_GET(0),
+                                    WASM_LOCAL_GET(2), WASM_LOCAL_GET(1),
+                                    WASM_LOCAL_GET(3))};
   AddExportedFunction(CStrVector("g"), code, sizeof(code), &sig);
 
   ownvec<ValType> types =
diff --git a/deps/v8/test/wasm-api-tests/table.cc b/deps/v8/test/wasm-api-tests/table.cc
index 5f6faaed249375..fea6140c06ad8f 100644
--- a/deps/v8/test/wasm-api-tests/table.cc
+++ b/deps/v8/test/wasm-api-tests/table.cc
@@ -44,10 +44,10 @@ TEST_F(WasmCapiTest, Table) {
   ValueType reps[] = {kWasmI32, kWasmI32, kWasmI32};
   FunctionSig call_sig(1, 2, reps);
   byte call_code[] = {
-      WASM_CALL_INDIRECT(sig_i_i_index, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))};
+      WASM_CALL_INDIRECT(sig_i_i_index, WASM_LOCAL_GET(0), WASM_LOCAL_GET(1))};
   AddExportedFunction(CStrVector("call_indirect"), call_code, sizeof(call_code),
                       &call_sig);
-  byte f_code[] = {WASM_GET_LOCAL(0)};
+  byte f_code[] = {WASM_LOCAL_GET(0)};
   AddExportedFunction(CStrVector("f"), f_code, sizeof(f_code), wasm_i_i_sig());
   byte g_code[] = {WASM_I32V_1(42)};
   AddExportedFunction(CStrVector("g"), g_code, sizeof(g_code), wasm_i_i_sig());
diff --git a/deps/v8/test/wasm-api-tests/threads.cc b/deps/v8/test/wasm-api-tests/threads.cc
index 5fb4309c4be89e..7f80ca1e66cb03 100644
--- a/deps/v8/test/wasm-api-tests/threads.cc
+++ b/deps/v8/test/wasm-api-tests/threads.cc
@@ -66,7 +66,7 @@ TEST_F(WasmCapiTest, Threads) {
       builder()->AddGlobalImport(CStrVector("id"), kWasmI32, false);
 
   byte code[] = {
-      WASM_CALL_FUNCTION(callback_index, WASM_GET_GLOBAL(global_index))};
+      WASM_CALL_FUNCTION(callback_index, WASM_GLOBAL_GET(global_index))};
   FunctionSig empty_sig(0, 0, nullptr);
   AddExportedFunction(CStrVector("run"), code, sizeof(code), &empty_sig);
   Compile();
diff --git a/deps/v8/test/wasm-js/tests.tar.gz.sha1 b/deps/v8/test/wasm-js/tests.tar.gz.sha1
index c96c9a8ac24f8b..05f7ebb2b7de26 100644
--- a/deps/v8/test/wasm-js/tests.tar.gz.sha1
+++ b/deps/v8/test/wasm-js/tests.tar.gz.sha1
@@ -1 +1 @@
-331d0b45c9b1fe5872b5b27a7eff2c889cecb495
\ No newline at end of file
+31c11a41026c56be3c6d6470755d476840ce0132
\ No newline at end of file
diff --git a/deps/v8/test/wasm-spec-tests/tests.tar.gz.sha1 b/deps/v8/test/wasm-spec-tests/tests.tar.gz.sha1
index 291812527db26c..dd94a6715ae749 100644
--- a/deps/v8/test/wasm-spec-tests/tests.tar.gz.sha1
+++ b/deps/v8/test/wasm-spec-tests/tests.tar.gz.sha1
@@ -1 +1 @@
-a58223f93f7c7489abd950f322f970caac3c2cad
\ No newline at end of file
+38edac624024750d4d35619df1bbdc7902f9cb7c
\ No newline at end of file
diff --git a/deps/v8/test/wasm-spec-tests/wasm-spec-tests.status b/deps/v8/test/wasm-spec-tests/wasm-spec-tests.status
index d3b37e8aa0f5bf..85850dd9677640 100644
--- a/deps/v8/test/wasm-spec-tests/wasm-spec-tests.status
+++ b/deps/v8/test/wasm-spec-tests/wasm-spec-tests.status
@@ -9,7 +9,10 @@
   'binary': [FAIL],
   'proposals/bulk-memory-operations/binary': [FAIL],
   # TODO(v8:10994): Failing spec test after update.
-  'proposals/reference-types/br_table': [FAIL],
+  'proposals/simd/binary': [FAIL],
+  'proposals/simd/data': [FAIL],
+  'proposals/js-types/data': [FAIL],
+  'proposals/reference-types/binary': [FAIL],
 
   # TODO(v8:9144): The MVP behavior when bounds-checking segments changed in
   # the bulk-memory proposal. Since we've enabled bulk-memory by default, we
@@ -32,6 +35,7 @@
   'proposals/tail-call/imports': [FAIL],
   'proposals/tail-call/linking': [FAIL],
   'proposals/tail-call/type': [FAIL],
+  'proposals/tail-call/unreached-invalid': [FAIL],
 
   # This test requires the reftypes flag to be disabled.
   'proposals/bulk-memory-operations/imports': [FAIL],
diff --git a/deps/v8/third_party/binutils/.gitignore b/deps/v8/third_party/binutils/.gitignore
deleted file mode 100644
index 5605b2f711759c..00000000000000
--- a/deps/v8/third_party/binutils/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-binutils-*
-*-chroot-*
-output-*
-Linux_ia32/*stamp*
-Linux_ia32/*tar.bz2
-Linux_x64/*stamp*
-Linux_x64/*tar.bz2
-*/Release
diff --git a/deps/v8/third_party/binutils/Linux_ia32/binutils.tar.bz2.sha1 b/deps/v8/third_party/binutils/Linux_ia32/binutils.tar.bz2.sha1
deleted file mode 100644
index aaed4ddbadf2b7..00000000000000
--- a/deps/v8/third_party/binutils/Linux_ia32/binutils.tar.bz2.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c956d54d404eb1d35b3a4d88b7bfd34f2f06f7af
\ No newline at end of file
diff --git a/deps/v8/third_party/binutils/Linux_x64/binutils.tar.bz2.sha1 b/deps/v8/third_party/binutils/Linux_x64/binutils.tar.bz2.sha1
deleted file mode 100644
index dfa4fefbd5e38a..00000000000000
--- a/deps/v8/third_party/binutils/Linux_x64/binutils.tar.bz2.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69bedb1192a03126687f75cb6cf1717758a1a59f
\ No newline at end of file
diff --git a/deps/v8/third_party/binutils/OWNERS b/deps/v8/third_party/binutils/OWNERS
deleted file mode 100644
index 09e0096a2ee4cd..00000000000000
--- a/deps/v8/third_party/binutils/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../INFRA_OWNERS
diff --git a/deps/v8/third_party/binutils/detect_v8_host_arch.py b/deps/v8/third_party/binutils/detect_v8_host_arch.py
deleted file mode 100644
index 32587746922aba..00000000000000
--- a/deps/v8/third_party/binutils/detect_v8_host_arch.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2014 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of Google Inc. nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Outputs host CPU architecture in format recognized by gyp."""
-
-
-from __future__ import print_function
-import platform
-import re
-import sys
-
-
-def main():
-  print(DoMain([]))
-  return 0
-
-def DoMain(_):
-  return DetectHostArch();
-
-def DetectHostArch():
-  """Hook to be called from gyp without starting a separate python
-  interpreter."""
-  host_arch = platform.machine()
-  host_system = platform.system();
-
-  # Convert machine type to format recognized by gyp.
-  if re.match(r'i.86', host_arch) or host_arch == 'i86pc':
-    host_arch = 'ia32'
-  elif host_arch in ['x86_64', 'amd64']:
-    host_arch = 'x64'
-  elif host_arch.startswith('arm'):
-    host_arch = 'arm'
-  elif host_arch == 'aarch64':
-    host_arch = 'arm64'
-  elif host_arch == 'mips64':
-    host_arch = 'mips64el'
-  elif host_arch.startswith('mips'):
-    host_arch = 'mipsel'
-
-  # Under AIX the value returned by platform.machine is not
-  # the best indicator of the host architecture
-  # AIX 6.1 which is the lowest level supported only provides
-  # a 64 bit kernel
-  if host_system == 'AIX':
-    host_arch = 'ppc64'
-
-  # platform.machine is based on running kernel. It's possible to use 64-bit
-  # kernel with 32-bit userland, e.g. to give linker slightly more memory.
-  # Distinguish between different userland bitness by querying
-  # the python binary.
-  if host_arch == 'x64' and platform.architecture()[0] == '32bit':
-    host_arch = 'ia32'
-
-  return host_arch
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/deps/v8/third_party/binutils/download.py b/deps/v8/third_party/binutils/download.py
deleted file mode 100755
index 7e8df8a51d3d27..00000000000000
--- a/deps/v8/third_party/binutils/download.py
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2014 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.
-# vim: set ts=2 sw=2 et sts=2 ai:
-
-"""Minimal tool to download binutils from Google storage.
-
-TODO(mithro): Replace with generic download_and_extract tool.
-"""
-
-
-from __future__ import print_function
-import os
-import platform
-import re
-import shutil
-import subprocess
-import sys
-from detect_v8_host_arch import DetectHostArch
-
-
-BINUTILS_DIR = os.path.abspath(os.path.dirname(__file__))
-BINUTILS_FILE = 'binutils.tar.bz2'
-BINUTILS_TOOLS = ['bin/ld.gold', 'bin/objcopy', 'bin/objdump']
-BINUTILS_OUT = 'Release'
-
-
-def ReadFile(filename):
-  with open(filename, 'r') as f:
-    return f.read().strip()
-
-
-def WriteFile(filename, content):
-  assert not os.path.exists(filename)
-  with open(filename, 'w') as f:
-    f.write(content)
-    f.write('\n')
-
-
-def FetchAndExtract(arch):
-  archdir = os.path.join(BINUTILS_DIR, 'Linux_' + arch)
-  tarball = os.path.join(archdir, BINUTILS_FILE)
-  outdir = os.path.join(archdir, BINUTILS_OUT)
-
-  sha1file = tarball + '.sha1'
-  if not os.path.exists(sha1file):
-    print("WARNING: No binutils found for your architecture (%s)!" % arch)
-    return 0
-
-  checksum = ReadFile(sha1file)
-
-  stampfile = tarball + '.stamp'
-  if os.path.exists(stampfile):
-    if (os.path.exists(tarball) and
-        os.path.exists(outdir) and
-        checksum == ReadFile(stampfile)):
-      return 0
-    else:
-      os.unlink(stampfile)
-
-  print("Downloading", tarball)
-  subprocess.check_call([
-      'download_from_google_storage',
-      '--no_resume',
-      '--no_auth',
-      '--bucket', 'chromium-binutils',
-      '-s', sha1file])
-  assert os.path.exists(tarball)
-
-  if os.path.exists(outdir):
-    shutil.rmtree(outdir)
-  assert not os.path.exists(outdir)
-  os.makedirs(outdir)
-  assert os.path.exists(outdir)
-
-  print("Extracting", tarball)
-  subprocess.check_call(['tar', 'axf', tarball], cwd=outdir)
-
-  for tool in BINUTILS_TOOLS:
-    assert os.path.exists(os.path.join(outdir, tool))
-
-  WriteFile(stampfile, checksum)
-  return 0
-
-
-def main(args):
-  if not sys.platform.startswith('linux'):
-    return 0
-
-  arch = DetectHostArch()
-  if arch == 'x64':
-    return FetchAndExtract(arch)
-  if arch == 'ia32':
-    ret = FetchAndExtract(arch)
-    if ret != 0:
-      return ret
-    # Fetch the x64 toolchain as well for official bots with 64-bit kernels.
-    return FetchAndExtract('x64')
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main(sys.argv))
diff --git a/deps/v8/third_party/inspector_protocol/README.v8 b/deps/v8/third_party/inspector_protocol/README.v8
index f29217b448b071..97bc1c34147364 100644
--- a/deps/v8/third_party/inspector_protocol/README.v8
+++ b/deps/v8/third_party/inspector_protocol/README.v8
@@ -2,7 +2,7 @@ Name: inspector protocol
 Short Name: inspector_protocol
 URL: https://chromium.googlesource.com/deps/inspector_protocol/
 Version: 0
-Revision: 22455bf37cd7a1913918e626a1997cbe77f32d1a
+Revision: 94298cef795ec994106bdaff002c41182911b767
 License: BSD
 License File: LICENSE
 Security Critical: no
diff --git a/deps/v8/third_party/inspector_protocol/crdtp/json.cc b/deps/v8/third_party/inspector_protocol/crdtp/json.cc
index 0cf46aeda51126..ed27d72e90b27c 100644
--- a/deps/v8/third_party/inspector_protocol/crdtp/json.cc
+++ b/deps/v8/third_party/inspector_protocol/crdtp/json.cc
@@ -162,7 +162,7 @@ class JSONEncoder : public ParserHandler {
         Emit("\\r");
       } else if (ch == '\t') {
         Emit("\\t");
-      } else if (ch >= 32 && ch <= 126) {
+      } else if (ch >= 32 && ch <= 127) {
         Emit(ch);
       } else {
         Emit("\\u");
@@ -193,7 +193,7 @@ class JSONEncoder : public ParserHandler {
         Emit("\\r");
       } else if (c == '\t') {
         Emit("\\t");
-      } else if (c >= 32 && c <= 126) {
+      } else if (c >= 32 && c <= 127) {
         Emit(c);
       } else if (c < 32) {
         Emit("\\u");
@@ -287,7 +287,7 @@ class JSONEncoder : public ParserHandler {
     }
     // If |value| is a scalar, emit it as an int. Taken from json_writer.cc in
     // Chromium.
-    if (value <= std::numeric_limits<int64_t>::max() &&
+    if (value < static_cast<double>(std::numeric_limits<int64_t>::max()) &&
         value >= std::numeric_limits<int64_t>::min() &&
         std::floor(value) == value) {
       Emit(std::to_string(static_cast<int64_t>(value)));
diff --git a/deps/v8/third_party/inspector_protocol/crdtp/json_test.cc b/deps/v8/third_party/inspector_protocol/crdtp/json_test.cc
index eb6c3579aacd3e..4dce7e89bb4d95 100644
--- a/deps/v8/third_party/inspector_protocol/crdtp/json_test.cc
+++ b/deps/v8/third_party/inspector_protocol/crdtp/json_test.cc
@@ -118,6 +118,30 @@ TEST(JsonEncoder, EscapesFFFF) {
   EXPECT_EQ("\"abc\\uffffd\"", out);
 }
 
+TEST(JsonEncoder, Passes0x7FString8) {
+  std::vector<uint8_t> chars = {'a', 0x7f, 'b'};
+  std::string out;
+  Status status;
+  std::unique_ptr<ParserHandler> writer = NewJSONEncoder(&out, &status);
+  writer->HandleString8(span<uint8_t>(chars.data(), chars.size()));
+  EXPECT_EQ(
+      "\"a\x7f"
+      "b\"",
+      out);
+}
+
+TEST(JsonEncoder, Passes0x7FString16) {
+  std::vector<uint16_t> chars16 = {'a', 0x7f, 'b'};
+  std::string out;
+  Status status;
+  std::unique_ptr<ParserHandler> writer = NewJSONEncoder(&out, &status);
+  writer->HandleString16(span<uint16_t>(chars16.data(), chars16.size()));
+  EXPECT_EQ(
+      "\"a\x7f"
+      "b\"",
+      out);
+}
+
 TEST(JsonEncoder, IncompleteUtf8Sequence) {
   std::string out;
   Status status;
diff --git a/deps/v8/third_party/inspector_protocol/lib/Forward_h.template b/deps/v8/third_party/inspector_protocol/lib/Forward_h.template
index 57961185d1e1bd..54f25e1c9c0705 100644
--- a/deps/v8/third_party/inspector_protocol/lib/Forward_h.template
+++ b/deps/v8/third_party/inspector_protocol/lib/Forward_h.template
@@ -64,6 +64,10 @@ struct ArrayTypedef<double> { typedef std::vector<double> type; };
 
 template <>
 struct ArrayTypedef<bool> { typedef std::vector<bool> type; };
+
+template <>
+struct ArrayTypedef<Binary> { typedef std::vector<Binary> type; };
+
 }  // namespace detail
 
 template <typename T>
diff --git a/deps/v8/third_party/inspector_protocol/lib/base_string_adapter_h.template b/deps/v8/third_party/inspector_protocol/lib/base_string_adapter_h.template
index 183ee3550203bd..8c28ab033e26e6 100644
--- a/deps/v8/third_party/inspector_protocol/lib/base_string_adapter_h.template
+++ b/deps/v8/third_party/inspector_protocol/lib/base_string_adapter_h.template
@@ -107,6 +107,11 @@ struct ProtocolTypeTraits<{{"::".join(config.protocol.namespace)}}::Binary> {
   static void Serialize(const {{"::".join(config.protocol.namespace)}}::Binary& value, std::vector<uint8_t>* bytes);
 };
 
+template <>
+struct {{config.crdtp.namespace}}::detail::MaybeTypedef<{{"::".join(config.protocol.namespace)}}::Binary> {
+  typedef ValueMaybe<{{"::".join(config.protocol.namespace)}}::Binary> type;
+};
+
 }  // {{config.crdtp.namespace}}
 
 #endif // !defined({{"_".join(config.protocol.namespace)}}_BASE_STRING_ADAPTER_H)
diff --git a/deps/v8/third_party/jinja2/DIR_METADATA b/deps/v8/third_party/jinja2/DIR_METADATA
new file mode 100644
index 00000000000000..8487e4070db2b7
--- /dev/null
+++ b/deps/v8/third_party/jinja2/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail: {
+  component: "Blink>Bindings"
+}
+team_email: "platform-architecture-dev@chromium.org"
diff --git a/deps/v8/third_party/jinja2/OWNERS b/deps/v8/third_party/jinja2/OWNERS
index 8861ff8cb3e902..8edbdf893c25b4 100644
--- a/deps/v8/third_party/jinja2/OWNERS
+++ b/deps/v8/third_party/jinja2/OWNERS
@@ -1,6 +1,3 @@
 timloh@chromium.org
 haraken@chromium.org
 nbarth@chromium.org
-
-# TEAM: platform-architecture-dev@chromium.org
-# COMPONENT: Blink>Bindings
diff --git a/deps/v8/third_party/zlib/BUILD.gn b/deps/v8/third_party/zlib/BUILD.gn
index 34d8c0a61f73c6..d64cb38bcdab4f 100644
--- a/deps/v8/third_party/zlib/BUILD.gn
+++ b/deps/v8/third_party/zlib/BUILD.gn
@@ -428,12 +428,17 @@ if (build_with_chromium) {
       "contrib/tests/infcover.h",
       "contrib/tests/run_all_unittests.cc",
       "contrib/tests/utils_unittest.cc",
-      "google/compression_utils_portable.cc",
-      "google/compression_utils_portable.h",
+      "google/compression_utils_unittest.cc",
+      "google/zip_reader_unittest.cc",
+      "google/zip_unittest.cc",
     ]
 
+    data = [ "google/test/data/" ]
+
     deps = [
       ":zlib",
+      "google:compression_utils",
+      "google:zip",
       "//base/test:test_support",
       "//testing/gtest",
     ]
diff --git a/deps/v8/third_party/zlib/DIR_METADATA b/deps/v8/third_party/zlib/DIR_METADATA
new file mode 100644
index 00000000000000..d366dc732137cd
--- /dev/null
+++ b/deps/v8/third_party/zlib/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail: {
+  component: "Internals"
+}
diff --git a/deps/v8/third_party/zlib/OWNERS b/deps/v8/third_party/zlib/OWNERS
index 22f4d8938efbc1..632b3f9f435ce9 100644
--- a/deps/v8/third_party/zlib/OWNERS
+++ b/deps/v8/third_party/zlib/OWNERS
@@ -3,5 +3,3 @@ cavalcantii@chromium.org
 cblume@chromium.org
 mtklein@google.com
 scroggo@google.com
-
-# COMPONENT: Internals
diff --git a/deps/v8/third_party/zlib/google/BUILD.gn b/deps/v8/third_party/zlib/google/BUILD.gn
index a49b8c81b2aff3..c29e8927806235 100644
--- a/deps/v8/third_party/zlib/google/BUILD.gn
+++ b/deps/v8/third_party/zlib/google/BUILD.gn
@@ -28,10 +28,10 @@ if (build_with_chromium) {
       "compression_utils.h",
     ]
     deps = [
-      ":compression_utils_portable",
       "//base",
       "//third_party/zlib",
     ]
+    public_deps = [ ":compression_utils_portable" ]
   }
 }
 
diff --git a/deps/v8/third_party/zlib/google/zip_reader.cc b/deps/v8/third_party/zlib/google/zip_reader.cc
index 8b4bb4aee782bf..96e9ff07fbc32c 100644
--- a/deps/v8/third_party/zlib/google/zip_reader.cc
+++ b/deps/v8/third_party/zlib/google/zip_reader.cc
@@ -10,10 +10,9 @@
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "build/build_config.h"
 #include "third_party/zlib/google/zip_internal.h"
 
@@ -296,11 +295,11 @@ void ZipReader::ExtractCurrentEntryToFilePathAsync(
   // If this is a directory, just create it and return.
   if (current_entry_info()->is_directory()) {
     if (base::CreateDirectory(output_file_path)) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
+      base::SequencedTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, std::move(success_callback));
     } else {
       DVLOG(1) << "Unzip failed: unable to create directory.";
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
+      base::SequencedTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, std::move(failure_callback));
     }
     return;
@@ -308,16 +307,16 @@ void ZipReader::ExtractCurrentEntryToFilePathAsync(
 
   if (unzOpenCurrentFile(zip_file_) != UNZ_OK) {
     DVLOG(1) << "Unzip failed: unable to open current zip entry.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                  std::move(failure_callback));
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
   base::FilePath output_dir_path = output_file_path.DirName();
   if (!base::CreateDirectory(output_dir_path)) {
     DVLOG(1) << "Unzip failed: unable to create containing directory.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                  std::move(failure_callback));
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
@@ -327,12 +326,12 @@ void ZipReader::ExtractCurrentEntryToFilePathAsync(
   if (!output_file.IsValid()) {
     DVLOG(1) << "Unzip failed: unable to create platform file at "
              << output_file_path.value();
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                  std::move(failure_callback));
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
                      Passed(std::move(output_file)),
@@ -434,7 +433,7 @@ void ZipReader::ExtractChunk(base::File output_file,
 
     progress_callback.Run(current_progress);
 
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
                        Passed(std::move(output_file)),
diff --git a/deps/v8/tools/clusterfuzz/BUILD.gn b/deps/v8/tools/clusterfuzz/BUILD.gn
index d75e6f96874dc1..54e4fded96f9c8 100644
--- a/deps/v8/tools/clusterfuzz/BUILD.gn
+++ b/deps/v8/tools/clusterfuzz/BUILD.gn
@@ -16,7 +16,7 @@ if (v8_correctness_fuzzer) {
       "v8_mock.js",
       "v8_mock_archs.js",
       "v8_mock_webassembly.js",
-      "v8_sanity_checks.js",
+      "v8_smoke_tests.js",
       "v8_suppressions.js",
       "v8_suppressions.py",
     ]
diff --git a/deps/v8/tools/clusterfuzz/js_fuzzer/README.md b/deps/v8/tools/clusterfuzz/js_fuzzer/README.md
index a537ad7a62c899..71a1140fe19933 100644
--- a/deps/v8/tools/clusterfuzz/js_fuzzer/README.md
+++ b/deps/v8/tools/clusterfuzz/js_fuzzer/README.md
@@ -14,8 +14,11 @@ contained binary) out of this.
 You need to intall nodejs and npm. Run `npm install` in this directory.
 
 ## Fuzzing DB
-This fuzzer requires a fuzzing DB. To build one, get the latest web_tests.zip
-from `gs://clusterfuzz-data/web_tests.zip` and run:
+This fuzzer requires a fuzzing DB. To build one, get the latest `web_tests.zip`
+from [gs://clusterfuzz-data/web_tests.zip](
+https://storage.cloud.google.com/clusterfuzz-data/web_tests.zip) and unzip it
+(note https://crbug.com/v8/10891 for making this data publicly available).
+Then run:
 
 ```bash
 $ mkdir db
@@ -90,7 +93,7 @@ $ workdir/output
 
 The `app_dir` folder can be a symlink or should contain the bundled
 version of `d8` with all files required for execution.
-The copy the packaged `ochang_js_fuzzer` executable and the `db` folder
+Copy the packaged `ochang_js_fuzzer` executable and the `db` folder
 to the `fuzzer` directory or use a symlink.
 The `input` directory is the root folder of the corpus, i.e. pointing
 to the unzipped data of `gs://clusterfuzz-data/web_tests.zip`.
diff --git a/deps/v8/tools/clusterfuzz/js_fuzzer/exceptions.js b/deps/v8/tools/clusterfuzz/js_fuzzer/exceptions.js
index 41255aa4d97c19..f981b82efce22d 100644
--- a/deps/v8/tools/clusterfuzz/js_fuzzer/exceptions.js
+++ b/deps/v8/tools/clusterfuzz/js_fuzzer/exceptions.js
@@ -113,6 +113,7 @@ const DISALLOWED_FLAGS = [
 
     // Disallowed due to false positives.
     '--check-handle-count',
+    '--correctness-fuzzer-suppressions',
     '--expose-debug-as',
     '--expose-natives-as',
     '--expose-trigger-failure',
diff --git a/deps/v8/tools/clusterfuzz/js_fuzzer/run.js b/deps/v8/tools/clusterfuzz/js_fuzzer/run.js
index 3712172d9f7467..29049e326c5fc0 100644
--- a/deps/v8/tools/clusterfuzz/js_fuzzer/run.js
+++ b/deps/v8/tools/clusterfuzz/js_fuzzer/run.js
@@ -163,9 +163,11 @@ function main() {
     app_name = app_name.substr(0, app_name.length - 4);
   }
 
-  if (app_name === 'd8' || app_name === 'v8_foozzie.py') {
-    // V8 supports running the raw d8 executable or the differential fuzzing
-    // harness 'foozzie'.
+  if (app_name === 'd8' ||
+      app_name === 'v8_simple_inspector_fuzzer' ||
+      app_name === 'v8_foozzie.py') {
+    // V8 supports running the raw d8 executable, the inspector fuzzer or
+    // the differential fuzzing harness 'foozzie'.
     settings.engine = 'V8';
   } else if (app_name === 'ch') {
     settings.engine = 'chakra';
diff --git a/deps/v8/tools/clusterfuzz/js_fuzzer/tools/run_one.py b/deps/v8/tools/clusterfuzz/js_fuzzer/tools/run_one.py
index 7762cb2c944da8..7886c30b95642c 100644
--- a/deps/v8/tools/clusterfuzz/js_fuzzer/tools/run_one.py
+++ b/deps/v8/tools/clusterfuzz/js_fuzzer/tools/run_one.py
@@ -22,6 +22,8 @@
 FOOZZIE = os.path.join(BASE_PATH, 'workdir', 'app_dir', 'v8_foozzie.py')
 TEST_CASES = os.path.join(BASE_PATH, 'workdir', 'output')
 
+assert os.path.exists(FOOZZIE)
+
 # Output pattern from foozzie.py when it finds a failure.
 FAILURE_RE = re.compile(
     r'# V8 correctness failure.'
diff --git a/deps/v8/tools/clusterfuzz/js_fuzzer/tools/workbench.py b/deps/v8/tools/clusterfuzz/js_fuzzer/tools/workbench.py
index 52a84bfca394a9..ee371f54829b64 100644
--- a/deps/v8/tools/clusterfuzz/js_fuzzer/tools/workbench.py
+++ b/deps/v8/tools/clusterfuzz/js_fuzzer/tools/workbench.py
@@ -37,8 +37,11 @@
 
 os.chdir(BASE_PATH)
 
-assert not os.path.exists(TEST_CASES)
-os.makedirs(TEST_CASES)
+if os.path.exists(TEST_CASES):
+  if not os.path.isdir(TEST_CASES) or os.listdir(TEST_CASES):
+    sys.exit("'output' must be an empty directory")
+else:
+  os.mkdir(TEST_CASES)
 
 # Use ~40000 for 24 hours of fuzzing on a modern work station.
 RUNS = 8
diff --git a/deps/v8/tools/clusterfuzz/testdata/sanity_check_output.txt b/deps/v8/tools/clusterfuzz/testdata/smoke_test_output.txt
similarity index 96%
rename from deps/v8/tools/clusterfuzz/testdata/sanity_check_output.txt
rename to deps/v8/tools/clusterfuzz/testdata/smoke_test_output.txt
index ea6b8a946641a5..4a41f9cbb5ad23 100644
--- a/deps/v8/tools/clusterfuzz/testdata/sanity_check_output.txt
+++ b/deps/v8/tools/clusterfuzz/testdata/smoke_test_output.txt
@@ -1,7 +1,7 @@
 #
 # V8 correctness failure
 # V8 correctness configs: x64,ignition:x64,ignition_turbo
-# V8 correctness sources: sanity check failed
+# V8 correctness sources: smoke test failed
 # V8 correctness suppression: 
 #
 # CHECK
diff --git a/deps/v8/tools/clusterfuzz/v8_foozzie.py b/deps/v8/tools/clusterfuzz/v8_foozzie.py
index 558145973dede6..9f3810c9f5b893 100755
--- a/deps/v8/tools/clusterfuzz/v8_foozzie.py
+++ b/deps/v8/tools/clusterfuzz/v8_foozzie.py
@@ -96,10 +96,10 @@
 RETURN_FAIL = 2
 
 BASE_PATH = os.path.dirname(os.path.abspath(__file__))
-SANITY_CHECKS = os.path.join(BASE_PATH, 'v8_sanity_checks.js')
+SMOKE_TESTS = os.path.join(BASE_PATH, 'v8_smoke_tests.js')
 
 # Timeout for one d8 run.
-SANITY_CHECK_TIMEOUT_SEC = 1
+SMOKE_TEST_TIMEOUT_SEC = 1
 TEST_TIMEOUT_SEC = 3
 
 SUPPORTED_ARCHS = ['ia32', 'x64', 'arm', 'arm64']
@@ -243,6 +243,10 @@ def __init__(self, options, label):
   def flags(self):
     return self.command.flags
 
+  @property
+  def is_error_simulation(self):
+    return '--simulate-errors' in self.flags
+
 
 def parse_args():
   first_config_arguments = ExecutionArgumentsConfig('first')
@@ -253,8 +257,8 @@ def parse_args():
     '--random-seed', type=int, required=True,
     help='random seed passed to both runs')
   parser.add_argument(
-      '--skip-sanity-checks', default=False, action='store_true',
-      help='skip sanity checks for testing purposes')
+      '--skip-smoke-tests', default=False, action='store_true',
+      help='skip smoke tests for testing purposes')
   parser.add_argument(
       '--skip-suppressions', default=False, action='store_true',
       help='skip suppressions to reproduce known issues')
@@ -384,7 +388,7 @@ def run_comparisons(suppress, execution_configs, test_case, timeout,
     timeout: Timeout in seconds for one run.
     verbose: Prints the executed commands.
     ignore_crashes: Typically we ignore crashes during fuzzing as they are
-        frequent. However, when running sanity checks we should not crash
+        frequent. However, when running smoke tests we should not crash
         and immediately flag crashes as a failure.
     source_key: A fixed source key. If not given, it will be inferred from the
         output.
@@ -396,11 +400,13 @@ def run_comparisons(suppress, execution_configs, test_case, timeout,
   baseline_config = execution_configs[0]
   baseline_output = run_test_case(baseline_config)
   has_crashed = baseline_output.HasCrashed()
+  simulated = baseline_config.is_error_simulation
 
   # Iterate over the remaining configurations, run and compare.
   for comparison_config in execution_configs[1:]:
     comparison_output = run_test_case(comparison_config)
     has_crashed = has_crashed or comparison_output.HasCrashed()
+    simulated = simulated or comparison_config.is_error_simulation
     difference, source = suppress.diff(baseline_output, comparison_output)
 
     if difference:
@@ -421,10 +427,11 @@ def run_comparisons(suppress, execution_configs, test_case, timeout,
       # detected. This is only for the statistics during experiments.
       raise PassException('# V8 correctness - C-R-A-S-H')
     else:
-      # Subsume unexpected crashes (e.g. during sanity checks) with one failure
-      # state.
+      # Subsume simulated and unexpected crashes (e.g. during smoke tests)
+      # with one failure state.
+      crash_state = '_simulated_crash_' if simulated else '_unexpected_crash_'
       raise FailException(FAILURE_HEADER_TEMPLATE % dict(
-          configs='', source_key='', suppression='unexpected crash'))
+          configs='', source_key='', suppression=crash_state))
 
 
 def main():
@@ -451,18 +458,18 @@ def main():
 
   # First, run some fixed smoke tests in all configs to ensure nothing
   # is fundamentally wrong, in order to prevent bug flooding.
-  if not options.skip_sanity_checks:
+  if not options.skip_smoke_tests:
     run_comparisons(
         suppress, execution_configs,
-        test_case=SANITY_CHECKS,
-        timeout=SANITY_CHECK_TIMEOUT_SEC,
+        test_case=SMOKE_TESTS,
+        timeout=SMOKE_TEST_TIMEOUT_SEC,
         verbose=False,
-        # Don't accept crashes during sanity checks. A crash would hint at
+        # Don't accept crashes during smoke tests. A crash would hint at
         # a flag that might be incompatible or a broken test file.
         ignore_crashes=False,
-        # Special source key for sanity checks so that clusterfuzz dedupes all
+        # Special source key for smoke tests so that clusterfuzz dedupes all
         # cases on this in case it's hit.
-        source_key = 'sanity check failed',
+        source_key = 'smoke test failed',
     )
 
   # Second, run all configs against the fuzz test case.
diff --git a/deps/v8/tools/clusterfuzz/v8_foozzie_test.py b/deps/v8/tools/clusterfuzz/v8_foozzie_test.py
index 8bb568cb604bfc..eb8322ce6223b1 100755
--- a/deps/v8/tools/clusterfuzz/v8_foozzie_test.py
+++ b/deps/v8/tools/clusterfuzz/v8_foozzie_test.py
@@ -270,7 +270,7 @@ class SystemTest(unittest.TestCase):
     build3: As build1 but with an architecture difference as well.
   """
   def testSyntaxErrorDiffPass(self):
-    stdout = run_foozzie('build1', '--skip-sanity-checks')
+    stdout = run_foozzie('build1', '--skip-smoke-tests')
     self.assertEqual('# V8 correctness - pass\n',
                      cut_verbose_output(stdout, 3))
     # Default comparison includes suppressions.
@@ -283,7 +283,7 @@ def testDifferentOutputFail(self):
     with open(os.path.join(TEST_DATA, 'failure_output.txt')) as f:
       expected_output = f.read()
     with self.assertRaises(subprocess.CalledProcessError) as ctx:
-      run_foozzie('build2', '--skip-sanity-checks',
+      run_foozzie('build2', '--skip-smoke-tests',
                   '--first-config-extra-flags=--flag1',
                   '--first-config-extra-flags=--flag2=0',
                   '--second-config-extra-flags=--flag3')
@@ -291,8 +291,8 @@ def testDifferentOutputFail(self):
     self.assertEqual(v8_foozzie.RETURN_FAIL, e.returncode)
     self.assertEqual(expected_output, cut_verbose_output(e.output, 2))
 
-  def testSanityCheck(self):
-    with open(os.path.join(TEST_DATA, 'sanity_check_output.txt')) as f:
+  def testSmokeTest(self):
+    with open(os.path.join(TEST_DATA, 'smoke_test_output.txt')) as f:
       expected_output = f.read()
     with self.assertRaises(subprocess.CalledProcessError) as ctx:
       run_foozzie('build2')
@@ -305,7 +305,7 @@ def testDifferentArch(self):
     we use executables with different architectures.
     """
     # Build 3 simulates x86, while the baseline is x64.
-    stdout = run_foozzie('build3', '--skip-sanity-checks')
+    stdout = run_foozzie('build3', '--skip-smoke-tests')
     lines = stdout.split('\n')
     # TODO(machenbach): Don't depend on the command-lines being printed in
     # particular lines.
@@ -315,7 +315,7 @@ def testDifferentArch(self):
   def testJitless(self):
     """Test that webassembly is mocked out when comparing with jitless."""
     stdout = run_foozzie(
-        'build1', '--skip-sanity-checks', second_config='jitless')
+        'build1', '--skip-smoke-tests', second_config='jitless')
     lines = stdout.split('\n')
     # TODO(machenbach): Don't depend on the command-lines being printed in
     # particular lines.
@@ -328,14 +328,14 @@ def testSkipSuppressions(self):
     """
     # Compare baseline with baseline. This passes as there is no difference.
     stdout = run_foozzie(
-        'baseline', '--skip-sanity-checks', '--skip-suppressions')
+        'baseline', '--skip-smoke-tests', '--skip-suppressions')
     self.assertNotIn('v8_suppressions.js', stdout)
 
     # Compare with a build that usually suppresses a difference. Now we fail
     # since we skip suppressions.
     with self.assertRaises(subprocess.CalledProcessError) as ctx:
       run_foozzie(
-          'build1', '--skip-sanity-checks', '--skip-suppressions')
+          'build1', '--skip-smoke-tests', '--skip-suppressions')
     e = ctx.exception
     self.assertEqual(v8_foozzie.RETURN_FAIL, e.returncode)
     self.assertNotIn('v8_suppressions.js', e.output)
diff --git a/deps/v8/tools/clusterfuzz/v8_fuzz_flags.json b/deps/v8/tools/clusterfuzz/v8_fuzz_flags.json
index 71ab2c29e5683d..e3a6ef4066b920 100644
--- a/deps/v8/tools/clusterfuzz/v8_fuzz_flags.json
+++ b/deps/v8/tools/clusterfuzz/v8_fuzz_flags.json
@@ -30,5 +30,6 @@
   [0.1, "--no-enable-popcnt"],
   [0.25, "--no-lazy-feedback-allocation"],
   [0.1, "--no-lazy-feedback-allocation --interrupt-budget=100"],
-  [0.05, "--budget-for-feedback-vector-allocation=0"]
+  [0.05, "--budget-for-feedback-vector-allocation=0"],
+  [0.0001, "--simulate-errors"]
 ]
\ No newline at end of file
diff --git a/deps/v8/tools/clusterfuzz/v8_sanity_checks.js b/deps/v8/tools/clusterfuzz/v8_smoke_tests.js
similarity index 96%
rename from deps/v8/tools/clusterfuzz/v8_sanity_checks.js
rename to deps/v8/tools/clusterfuzz/v8_smoke_tests.js
index c2f0b2a4d9efaa..39eb2d4e219de3 100644
--- a/deps/v8/tools/clusterfuzz/v8_sanity_checks.js
+++ b/deps/v8/tools/clusterfuzz/v8_smoke_tests.js
@@ -31,7 +31,7 @@ print("https://crbug.com/985154");
   print(Object.getOwnPropertyNames(foo().bar));
 })();
 
-print("Suppresses sensitive natives");
+print("Sensitive runtime functions are neutered");
 (function () {
   function foo() {}
   %PrepareFunctionForOptimization(foo);
diff --git a/deps/v8/tools/clusterfuzz/v8_suppressions.py b/deps/v8/tools/clusterfuzz/v8_suppressions.py
index 71c69fb6b2a893..18f9de7ac1d8ff 100644
--- a/deps/v8/tools/clusterfuzz/v8_suppressions.py
+++ b/deps/v8/tools/clusterfuzz/v8_suppressions.py
@@ -57,6 +57,8 @@
 IGNORE_OUTPUT = {
   'crbug.com/689877':
       re.compile(r'^.*SyntaxError: .*Stack overflow$', re.M),
+  '_fake_difference_':
+      re.compile(r'^.*___fake_difference___$', re.M),
 }
 
 # Lines matching any of the following regular expressions will be ignored
@@ -70,7 +72,6 @@
 # Lines matching any of the following regular expressions will be ignored.
 # Use uncompiled regular expressions - they'll be compiled later.
 IGNORE_LINES = [
-  r'^Warning: unknown flag .*$',
   r'^Warning: .+ is deprecated.*$',
   r'^Try --help for options$',
 
diff --git a/deps/v8/tools/codemap.mjs b/deps/v8/tools/codemap.mjs
index 245b6ba42eb54d..4986fbd3b05ed0 100644
--- a/deps/v8/tools/codemap.mjs
+++ b/deps/v8/tools/codemap.mjs
@@ -266,6 +266,7 @@ export class CodeMap {
  * @param {number} size Code entry size in bytes.
  * @param {string} opt_name Code entry name.
  * @param {string} opt_type Code entry type, e.g. SHARED_LIB, CPP.
+ * @param {object} source Optional source position information
  * @constructor
  */
 export class CodeEntry {
@@ -274,6 +275,7 @@ export class CodeEntry {
     this.name = opt_name || '';
     this.type = opt_type || '';
     this.nameUpdated_ = false;
+    this.source = undefined;
   }
 
   getName() {
@@ -283,6 +285,10 @@ export class CodeEntry {
   toString() {
     return this.name + ': ' + this.size.toString(16);
   }
+
+  getSourceCode() {
+    return '';
+  }
 }
 
 class NameGenerator {
diff --git a/deps/v8/tools/consarray.mjs b/deps/v8/tools/consarray.mjs
index 1dc2afe886be35..b212eb720a9488 100644
--- a/deps/v8/tools/consarray.mjs
+++ b/deps/v8/tools/consarray.mjs
@@ -36,49 +36,47 @@
  *
  * @constructor
  */
-export function ConsArray() {
-  this.tail_ = new ConsArray.Cell(null, null);
-  this.currCell_ = this.tail_;
-  this.currCellPos_ = 0;
-};
-
-
-/**
- * Concatenates another array for iterating. Empty arrays are ignored.
- * This operation can be safely performed during ongoing ConsArray
- * iteration.
- *
- * @param {Array} arr Array to concatenate.
- */
-ConsArray.prototype.concat = function(arr) {
-  if (arr.length > 0) {
-    this.tail_.data = arr;
-    this.tail_ = this.tail_.next = new ConsArray.Cell(null, null);
+export class ConsArray {
+  constructor() {
+    this.tail_ = new ConsArrayCell(null, null);
+    this.currCell_ = this.tail_;
+    this.currCellPos_ = 0;
+  }
+  /**
+   * Concatenates another array for iterating. Empty arrays are ignored.
+   * This operation can be safely performed during ongoing ConsArray
+   * iteration.
+   *
+   * @param {Array} arr Array to concatenate.
+   */
+  concat(arr) {
+    if (arr.length > 0) {
+      this.tail_.data = arr;
+      this.tail_ = this.tail_.next = new ConsArrayCell(null, null);
+    }
   }
-};
-
-
-/**
- * Whether the end of iteration is reached.
- */
-ConsArray.prototype.atEnd = function() {
-  return this.currCell_ === null ||
-      this.currCell_.data === null ||
-      this.currCellPos_ >= this.currCell_.data.length;
-};
 
+  /**
+   * Whether the end of iteration is reached.
+   */
+  atEnd() {
+    return this.currCell_ === null ||
+        this.currCell_.data === null ||
+        this.currCellPos_ >= this.currCell_.data.length;
+  }
 
-/**
- * Returns the current item, moves to the next one.
- */
-ConsArray.prototype.next = function() {
-  const result = this.currCell_.data[this.currCellPos_++];
-  if (this.currCellPos_ >= this.currCell_.data.length) {
-    this.currCell_ = this.currCell_.next;
-    this.currCellPos_ = 0;
+  /**
+   * Returns the current item, moves to the next one.
+   */
+  next() {
+    const result = this.currCell_.data[this.currCellPos_++];
+    if (this.currCellPos_ >= this.currCell_.data.length) {
+      this.currCell_ = this.currCell_.next;
+      this.currCellPos_ = 0;
+    }
+    return result;
   }
-  return result;
-};
+}
 
 
 /**
@@ -86,7 +84,9 @@ ConsArray.prototype.next = function() {
  *
  * @constructor
  */
-ConsArray.Cell = function(data, next) {
-  this.data = data;
-  this.next = next;
-};
+class ConsArrayCell {
+  constructor(data, next) {
+    this.data = data;
+    this.next = next;
+  }
+}
diff --git a/deps/v8/tools/csvparser.mjs b/deps/v8/tools/csvparser.mjs
index e027d47384d57b..c43ee4c4fcf9b2 100644
--- a/deps/v8/tools/csvparser.mjs
+++ b/deps/v8/tools/csvparser.mjs
@@ -62,7 +62,11 @@ export class CsvParser {
         }
         // Convert the selected escape sequence to a single character.
         let escapeChars = string.substring(pos, nextPos);
-        result += String.fromCharCode(parseInt(escapeChars, 16));
+        if (escapeChars === '2C') {
+            result += ',';
+        } else {
+          result += String.fromCharCode(parseInt(escapeChars, 16));
+        }
       }
 
       // Continue looking for the next escape sequence.
diff --git a/deps/v8/tools/debug_helper/get-object-properties.cc b/deps/v8/tools/debug_helper/get-object-properties.cc
index 181c58dbf083af..a6ebcc0761ac46 100644
--- a/deps/v8/tools/debug_helper/get-object-properties.cc
+++ b/deps/v8/tools/debug_helper/get-object-properties.cc
@@ -413,6 +413,8 @@ class ReadStringVisitor : public TqObjectVisitor {
       that_->index_ += index_adjust_;
       that_->limit_ += limit_adjust_;
     }
+    IndexModifier(const IndexModifier&) = delete;
+    IndexModifier& operator=(const IndexModifier&) = delete;
     ~IndexModifier() {
       that_->index_ -= index_adjust_;
       that_->limit_ -= limit_adjust_;
@@ -422,7 +424,6 @@ class ReadStringVisitor : public TqObjectVisitor {
     ReadStringVisitor* that_;
     int32_t index_adjust_;
     int32_t limit_adjust_;
-    DISALLOW_COPY_AND_ASSIGN(IndexModifier);
   };
 
   static constexpr int kMaxCharacters = 80;  // How many characters to print.
diff --git a/deps/v8/tools/deprecation_stats.py b/deps/v8/tools/deprecation_stats.py
index 628eebc7793b39..56b26c39ad2685 100755
--- a/deps/v8/tools/deprecation_stats.py
+++ b/deps/v8/tools/deprecation_stats.py
@@ -11,11 +11,13 @@
 import re
 import subprocess
 import sys
+from os import path
 
 RE_GITHASH = re.compile(r"^[0-9a-f]{40}")
 RE_AUTHOR_TIME = re.compile(r"^author-time (\d+)$")
 RE_FILENAME = re.compile(r"^filename (.+)$")
 
+
 def GetBlame(file_path):
   result = subprocess.check_output(
       ['git', 'blame', '-t', '--line-porcelain', file_path])
@@ -43,66 +45,78 @@ def GetBlame(file_path):
   blame_list.append(current_blame)
   return blame_list
 
-RE_MACRO_END = re.compile(r"\);");
+
+RE_MACRO_END = re.compile(r"\);")
 RE_DEPRECATE_MACRO = re.compile(r"\(.*?,(.*)\);", re.MULTILINE)
 
-def FilterAndPrint(blame_list, macro, before):
+
+def FilterAndPrint(blame_list, macro, options):
+  before = options.before
   index = 0
   re_macro = re.compile(macro)
   deprecated = list()
   while index < len(blame_list):
     blame = blame_list[index]
-    match = re_macro.search(blame['content'])
-    if match and blame['time'] < before:
-      line = blame['content']
-      time = blame['time']
+    time = blame['time']
+    if time >= before:
+      index += 1
+      continue
+    line = blame['content']
+    match = re_macro.search(line)
+    if match:
       pos = match.end()
       start = -1
       parens = 0
-      quotes = 0
       while True:
         if pos >= len(line):
           # extend to next line
           index = index + 1
           blame = blame_list[index]
-          if line.endswith(','):
-            # add whitespace when breaking line due to comma
-            line = line + ' '
           line = line + blame['content']
         if line[pos] == '(':
           parens = parens + 1
         elif line[pos] == ')':
           parens = parens - 1
           if parens == 0:
+            # Exclud closing ")
+            pos = pos - 2
             break
-        elif line[pos] == '"':
-          quotes = quotes + 1
-        elif line[pos] == ',' and quotes % 2 == 0 and start == -1:
+        elif line[pos] == '"' and start == -1:
           start = pos + 1
         pos = pos + 1
-      deprecated.append([index + 1, time, line[start:pos].strip()])
+      # Extract content and replace double quotes from merged lines
+      content = line[start:pos].strip().replace('""', '')
+      deprecated.append([index + 1, time, content])
     index = index + 1
   print("Marked as " + macro + ": " + str(len(deprecated)))
   for linenumber, time, content in deprecated:
-    print(str(linenumber).rjust(8) + " : " + str(time) + " : " + content)
+    print("   " + (options.v8_header + ":" +
+                   str(linenumber)).rjust(len(options.v8_header) + 5) + "\t" +
+          str(time) + "\t" + content)
   return len(deprecated)
 
+
 def ParseOptions(args):
-  parser = argparse.ArgumentParser(description="Collect deprecation statistics")
-  parser.add_argument("file_path", help="Path to v8.h")
+  parser = argparse.ArgumentParser(
+      description="Collect deprecation statistics")
+  parser.add_argument("v8_header", nargs='?', help="Path to v8.h")
   parser.add_argument("--before", help="Filter by date")
   options = parser.parse_args(args)
   if options.before:
     options.before = datetime.strptime(options.before, '%Y-%m-%d')
   else:
     options.before = datetime.now()
+  if options.v8_header is None:
+    options.v8_header = path.join(path.dirname(__file__), '..', 'include', 'v8.h')
   return options
 
+
 def Main(args):
   options = ParseOptions(args)
-  blame_list = GetBlame(options.file_path)
-  FilterAndPrint(blame_list, "V8_DEPRECATE_SOON", options.before)
-  FilterAndPrint(blame_list, "V8_DEPRECATED", options.before)
+  blame_list = GetBlame(options.v8_header)
+  FilterAndPrint(blame_list, "V8_DEPRECATE_SOON", options)
+  FilterAndPrint(blame_list, "V8_DEPRECATED", options)
+
 
 if __name__ == "__main__":
   Main(sys.argv[1:])
diff --git a/deps/v8/tools/dumpcpp.mjs b/deps/v8/tools/dumpcpp.mjs
index be2dd996e41be8..9deab5d2aae0af 100644
--- a/deps/v8/tools/dumpcpp.mjs
+++ b/deps/v8/tools/dumpcpp.mjs
@@ -5,10 +5,9 @@
 import { LogReader, parseString } from "./logreader.mjs";
 import { CodeMap, CodeEntry } from "./codemap.mjs";
 export {
-    ArgumentsProcessor, UnixCppEntriesProvider, 
+    ArgumentsProcessor, UnixCppEntriesProvider,
     WindowsCppEntriesProvider, MacCppEntriesProvider,
   } from  "./tickprocessor.mjs";
-  import { inherits } from  "./tickprocessor.mjs";
 
 
 export class CppProcessor extends LogReader {
@@ -29,7 +28,7 @@ export class CppProcessor extends LogReader {
    */
   printError(str) {
     print(str);
-  };
+  }
 
   processLogFile(fileName) {
     this.lastLogFileName_ = fileName;
@@ -37,14 +36,14 @@ export class CppProcessor extends LogReader {
     while (line = readline()) {
       this.processLogLine(line);
     }
-  };
+  }
 
   processLogFileInTest(fileName) {
     // Hack file name to avoid dealing with platform specifics.
     this.lastLogFileName_ = 'v8.log';
     const contents = readFile(fileName);
     this.processLogChunk(contents);
-  };
+  }
 
   processSharedLibrary(name, startAddr, endAddr, aslrSlide) {
     const self = this;
@@ -53,7 +52,7 @@ export class CppProcessor extends LogReader {
       const entry = new CodeEntry(fEnd - fStart, fName, 'CPP');
       self.codeMap_.addStaticCode(fStart, entry);
     });
-  };
+  }
 
   dumpCppSymbols() {
     const staticEntries = this.codeMap_.getAllStaticEntriesWithAddresses();
diff --git a/deps/v8/tools/gcmole/BUILD.gn b/deps/v8/tools/gcmole/BUILD.gn
index 9767acbf5a1a48..558766487d17d2 100644
--- a/deps/v8/tools/gcmole/BUILD.gn
+++ b/deps/v8/tools/gcmole/BUILD.gn
@@ -8,12 +8,10 @@ group("v8_run_gcmole") {
   testonly = true
 
   data = [
-    "gccause.lua",
     "GCMOLE.gn",
-    "gcmole.lua",
+    "gcmole.py",
     "gcmole-test.cc",
     "gcmole-tools/",
-    "parallel.py",
     "run-gcmole.py",
     "suspects.whitelist",
     "ignored_files",
diff --git a/deps/v8/tools/gcmole/README b/deps/v8/tools/gcmole/README
index 46b4717e3c1b1a..1d2acd3b1a0010 100644
--- a/deps/v8/tools/gcmole/README
+++ b/deps/v8/tools/gcmole/README
@@ -35,9 +35,9 @@ simply to store it as a Handle.
 
 PREREQUISITES -----------------------------------------------------------------
 
-(1) Install Lua 5.1
+(1) Install Python
 
-    $ sudo apt-get install lua5.1
+    $ sudo apt-get install python
 
 (2) Get LLVM 8.0 and Clang 8.0 sources and build them.
 
@@ -62,14 +62,14 @@ PREREQUISITES -----------------------------------------------------------------
 
 USING GCMOLE ------------------------------------------------------------------
 
-gcmole consists of driver script written in Lua and Clang plugin that does
+gcmole consists of driver script written in Python and Clang plugin that does
 C++ AST processing. Plugin (libgcmole.so) is expected to be in the same
-folder as driver (gcmole.lua).
+folder as driver (gcmole.py).
 
 To start analysis cd into the root of v8 checkout and execute the following
 command:
 
-CLANG_BIN=<path-to-clang-bin-folder> lua tools/gcmole/gcmole.lua [<arch>]
+CLANG_BIN=<path-to-clang-bin-folder> python tools/gcmole/gcmole.py [<arch>]
 
 where arch should be one of architectures supported by V8 (arm, ia32, x64).
 
@@ -89,7 +89,7 @@ If any errors were found driver exits with non-zero status.
 
 TESTING -----------------------------------------------------------------------
 
-Tests are automatically run by the main lua runner. Expectations are in
+Tests are automatically run by the main python runner. Expectations are in
 test-expectations.txt and need to be updated whenever the sources of the tests
 in gcmole-test.cc are modified (line numbers also count).
 
diff --git a/deps/v8/tools/gcmole/bootstrap.sh b/deps/v8/tools/gcmole/bootstrap.sh
index 05ab1cbb8eb61c..a0386a80546b64 100755
--- a/deps/v8/tools/gcmole/bootstrap.sh
+++ b/deps/v8/tools/gcmole/bootstrap.sh
@@ -33,14 +33,11 @@
 # that the resulting binary is easier transferable between different
 # environments.
 
-CLANG_RELEASE=8.0
+LLVM_RELEASE=9.0.1
 
 THIS_DIR="$(readlink -f "$(dirname "${0}")")"
-LLVM_DIR="${THIS_DIR}/../../third_party/llvm"
-CLANG_DIR="${THIS_DIR}/../../third_party/clang"
-BUILD_DIR="${THIS_DIR}/../../third_party/llvm+clang-build"
-
-LLVM_REPO_URL=${LLVM_URL:-https://llvm.org/svn/llvm-project}
+LLVM_PROJECT_DIR="${THIS_DIR}/bootstrap/llvm"
+BUILD_DIR="${THIS_DIR}/bootstrap/build"
 
 # Die if any command dies.
 set -e
@@ -72,59 +69,59 @@ if [[ "${OS}" = "Darwin" ]] && xcodebuild -version | grep -q 'Xcode 3.2' ; then
   fi
 fi
 
-echo Getting LLVM release "${CLANG_RELEASE}" in "${LLVM_DIR}"
-if ! svn co --force \
-    "${LLVM_REPO_URL}/llvm/branches/release_${CLANG_RELEASE/./}" \
-    "${LLVM_DIR}"; then
-  echo Checkout failed, retrying
-  rm -rf "${LLVM_DIR}"
-  svn co --force \
-      "${LLVM_REPO_URL}/llvm/branches/release_${CLANG_RELEASE/./}" \
-      "${LLVM_DIR}"
+echo Getting LLVM release "${LLVM_RELEASE}" in "${LLVM_PROJECT_DIR}"
+if ! [ -d "${LLVM_PROJECT_DIR}" ] || ! git -C "${LLVM_PROJECT_DIR}" remote get-url origin | grep -q -F "https://github.com/llvm/llvm-project.git" ; then
+  rm -rf "${LLVM_PROJECT_DIR}"
+  git clone --depth=1 --branch "llvmorg-${LLVM_RELEASE}" "https://github.com/llvm/llvm-project.git" "${LLVM_PROJECT_DIR}"
+else
+  git -C "${LLVM_PROJECT_DIR}" fetch --depth=1 origin "llvmorg-${LLVM_RELEASE}"
+  git -C "${LLVM_PROJECT_DIR}" checkout FETCH_HEAD
 fi
 
-echo Getting clang release "${CLANG_RELEASE}" in "${CLANG_DIR}"
-svn co --force \
-    "${LLVM_REPO_URL}/cfe/branches/release_${CLANG_RELEASE/./}" \
-    "${CLANG_DIR}"
-
 # Echo all commands
 set -x
 
 NUM_JOBS=3
 if [[ "${OS}" = "Linux" ]]; then
-  NUM_JOBS="$(grep -c "^processor" /proc/cpuinfo)"
+  if [[ -e "/proc/cpuinfo" ]]; then
+    NUM_JOBS="$(grep -c "^processor" /proc/cpuinfo)"
+  else
+    # Hack when running in chroot
+    NUM_JOBS="32"
+  fi
 elif [ "${OS}" = "Darwin" ]; then
   NUM_JOBS="$(sysctl -n hw.ncpu)"
 fi
 
 # Build clang.
-if [ ! -e "${BUILD_DIR}" ]; then
-  mkdir "${BUILD_DIR}"
-fi
-cd "${BUILD_DIR}"
-cmake -DCMAKE_CXX_FLAGS="-static-libstdc++" -DLLVM_ENABLE_TERMINFO=OFF \
-    -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang "${LLVM_DIR}"
-MACOSX_DEPLOYMENT_TARGET=10.5 make -j"${NUM_JOBS}"
-
-# Strip the clang binary.
-STRIP_FLAGS=
-if [ "${OS}" = "Darwin" ]; then
-  # See http://crbug.com/256342
-  STRIP_FLAGS=-x
-fi
-strip ${STRIP_FLAGS} bin/clang
-cd -
+# if [ ! -e "${BUILD_DIR}" ]; then
+#   mkdir "${BUILD_DIR}"
+# fi
+# cd "${BUILD_DIR}"
+# cmake -GNinja -DCMAKE_CXX_FLAGS="-static-libstdc++" -DLLVM_ENABLE_TERMINFO=OFF \
+#     -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang \
+#     -DLLVM_ENABLE_Z3_SOLVER=OFF "${LLVM_PROJECT_DIR}/llvm"
+# MACOSX_DEPLOYMENT_TARGET=10.5 ninja -j"${NUM_JOBS}"
+# 
+# # Strip the clang binary.
+# STRIP_FLAGS=
+# if [ "${OS}" = "Darwin" ]; then
+#   # See http://crbug.com/256342
+#   STRIP_FLAGS=-x
+# fi
+# strip ${STRIP_FLAGS} bin/clang
+# cd -
 
 # Build libgcmole.so
 make -C "${THIS_DIR}" clean
-make -C "${THIS_DIR}" LLVM_SRC_ROOT="${LLVM_DIR}" \
-    CLANG_SRC_ROOT="${CLANG_DIR}" BUILD_ROOT="${BUILD_DIR}" libgcmole.so
+make -C "${THIS_DIR}" LLVM_SRC_ROOT="${LLVM_PROJECT_DIR}/llvm" \
+    CLANG_SRC_ROOT="${LLVM_PROJECT_DIR}/clang" \
+    BUILD_ROOT="${BUILD_DIR}" libgcmole.so
 
 set +x
 
 echo
 echo You can now run gcmole using this command:
 echo
-echo CLANG_BIN=\"third_party/llvm+clang-build/bin\" lua tools/gcmole/gcmole.lua
+echo CLANG_BIN=\"tools/gcmole/gcmole-tools/bin\" python tools/gcmole/gcmole.py
 echo
diff --git a/deps/v8/tools/gcmole/gccause.lua b/deps/v8/tools/gcmole/gccause.lua
deleted file mode 100644
index b9891767de390e..00000000000000
--- a/deps/v8/tools/gcmole/gccause.lua
+++ /dev/null
@@ -1,62 +0,0 @@
--- Copyright 2011 the V8 project authors. All rights reserved.
--- Redistribution and use in source and binary forms, with or without
--- modification, are permitted provided that the following conditions are
--- met:
---
---     * Redistributions of source code must retain the above copyright
---       notice, this list of conditions and the following disclaimer.
---     * Redistributions in binary form must reproduce the above
---       copyright notice, this list of conditions and the following
---       disclaimer in the documentation and/or other materials provided
---       with the distribution.
---     * Neither the name of Google Inc. nor the names of its
---       contributors may be used to endorse or promote products derived
---       from this software without specific prior written permission.
---
--- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--- This is an auxiliary tool that reads gccauses file generated by
--- gcmole.lua and prints tree of the calls that can potentially cause a GC
--- inside a given function.
---
--- Usage: lua tools/gcmole/gccause.lua <function-name-pattern>
---
-
-assert(loadfile "gccauses")()
-
-local P = ...
-
-local T = {}
-
-local function TrackCause(name, lvl)
-   io.write(("  "):rep(lvl or 0), name, "\n")
-   if GC[name] then
-      local causes = GC[name]
-      for i = 1, #causes do
-	 local f = causes[i]
-	 if not T[f] then
-	    T[f] = true
-	    TrackCause(f, (lvl or 0) + 1)
-	 end
-
-	 if f == '<GC>' then break end
-      end
-   end
-end
-
-for name, _ in pairs(GC) do
-   if name:match(P) then
-      T = {}
-      TrackCause(name)
-   end
-end
diff --git a/deps/v8/tools/gcmole/gcmole-test.cc b/deps/v8/tools/gcmole/gcmole-test.cc
index 8512d7ab4cd4fb..038a514189e2f6 100644
--- a/deps/v8/tools/gcmole/gcmole-test.cc
+++ b/deps/v8/tools/gcmole/gcmole-test.cc
@@ -5,6 +5,7 @@
 #include "src/execution/isolate.h"
 #include "src/handles/handles-inl.h"
 #include "src/handles/handles.h"
+#include "src/heap/local-heap.h"
 #include "src/objects/foreign-inl.h"
 #include "src/objects/managed.h"
 #include "src/objects/maybe-object.h"
@@ -15,6 +16,8 @@ namespace internal {
 
 // ------- Test simple argument evaluation order problems ---------
 
+void Safepoint() { LocalHeap::Current()->Safepoint(); }
+
 Handle<Object> CauseGC(Handle<Object> obj, Isolate* isolate) {
   isolate->heap()->CollectGarbage(OLD_SPACE, GarbageCollectionReason::kTesting);
 
@@ -161,70 +164,187 @@ void TestDeadVarAnalysis(Isolate* isolate) {
   raw_obj.Print();
 }
 
+void TestDeadVarBecauseOfSafepointAnalysis(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  Safepoint();
+
+  // Should cause warning.
+  raw_obj.Print();
+}
+
 void TestGuardedDeadVarAnalysis(Isolate* isolate) {
   JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
 
-  // Note: having DisallowHeapAllocation with the same function as CauseGC
-  // normally doesn't make sense, but we want to test whether the gurads
+  // Note: having DisableGCMole with the same function as CauseGC
+  // normally doesn't make sense, but we want to test whether the guards
   // are recognized by GCMole.
-  DisallowHeapAllocation no_gc;
+  DisableGCMole no_gc_mole;
   CauseGCRaw(raw_obj, isolate);
 
   // Shouldn't cause warning.
   raw_obj.Print();
 }
 
-void TestGuardedDeadVarAnalysisNotOnStack(Isolate* isolate) {
+void TestGuardedDeadVarAnalysis2(Isolate* isolate) {
   JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
 
-  // {DisallowHeapAccess} has a {DisallowHeapAllocation} embedded as a member
-  // field, so both are treated equally by gcmole.
-  DisallowHeapAccess no_gc;
+  // Note: having DisallowGarbageCollection with the same function as CauseGC
+  // normally doesn't make sense, but we want to test whether the guards
+  // are recognized by GCMole.
+  DisallowGarbageCollection no_gc;
   CauseGCRaw(raw_obj, isolate);
 
+  // Should cause warning.
+  raw_obj.Print();
+}
+
+void TestGuardedAgainstSafepointDeadVarAnalysis(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+
+  // Note: having DisableGCMole with the same function as CauseGC
+  // normally doesn't make sense, but we want to test whether the guards
+  // are recognized by GCMole.
+  DisableGCMole no_gc_mole;
+  Safepoint();
+
   // Shouldn't cause warning.
   raw_obj.Print();
 }
 
-void TestGuardedDeadVarAnalysisNested(JSObject raw_obj, Isolate* isolate) {
+void TestGuardedAgainstSafepointDeadVarAnalysis2(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+
+  // Note: having DisallowGarbageCollection with the same function as CauseGC
+  // normally doesn't make sense, but we want to test whether the guards
+  // are recognized by GCMole.
+  DisallowGarbageCollection no_gc;
+  Safepoint();
+
+  // Should cause warning.
+  raw_obj.Print();
+}
+
+void TestGuardedAgainstSafepointDeadVarAnalysis3(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  // Note: having DisallowGarbageCollection with the same function as CauseGC
+  // normally doesn't make sense, but we want to test whether the guards
+  // are recognized by GCMole.
+  DisallowGarbageCollection no_gc;
+  Safepoint();
+  // Should cause warning.
+  raw_obj.Print();
+  {
+    DisableGCMole no_gc_mole;
+    // Shouldn't cause warning.
+    raw_obj.Print();
+  }
+  // Should cause warning.
+  raw_obj.Print();
+}
+
+void TestOnlyHeapGuardedDeadVarAnalysisInCompound(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  // {DisallowHeapAccess} has a {DisallowHeapAllocation}, but no
+  // {DisallowSafepoints}, so it could see objects move due to safepoints.
+  DisallowHeapAccess no_gc;
   CauseGCRaw(raw_obj, isolate);
+  // Should cause warning.
+  raw_obj.Print();
+}
+
+void TestOnlyHeapGuardedDeadVarAnalysisInCompound2(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  // {DisallowHeapAccess} has a {DisallowHeapAllocation}, but no
+  // {DisallowSafepoints}, so it could see objects move due to safepoints.
+  DisallowHeapAccess no_gc;
+  CauseGCRaw(raw_obj, isolate);
+  // Should cause warning.
+  raw_obj.Print();
+  DisableGCMole no_gc_mole;
+  // Should cause warning.
+  raw_obj.Print();
+}
 
+void TestGuardedDeadVarAnalysisNested(JSObject raw_obj, Isolate* isolate) {
+  CauseGCRaw(raw_obj, isolate);
   // Should cause warning.
   raw_obj.Print();
 }
 
 void TestGuardedDeadVarAnalysisCaller(Isolate* isolate) {
-  DisallowHeapAccess no_gc;
+  DisableGCMole no_gc_mole;
   JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  TestGuardedDeadVarAnalysisNested(raw_obj, isolate);
+  // Shouldn't cause warning.
+  raw_obj.Print();
+}
 
+void TestGuardedDeadVarAnalysisCaller2(Isolate* isolate) {
+  DisallowGarbageCollection no_gc;
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
   TestGuardedDeadVarAnalysisNested(raw_obj, isolate);
+  // Should cause warning.
+  raw_obj.Print();
+}
 
-  // Shouldn't cause warning.
+void TestGuardedDeadVarAnalysisCaller3(Isolate* isolate) {
+  DisallowHeapAccess no_gc;
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  TestGuardedDeadVarAnalysisNested(raw_obj, isolate);
+  // Should cause warning.
+  raw_obj.Print();
+}
+
+void TestGuardedDeadVarAnalysisCaller4(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  TestGuardedDeadVarAnalysisNested(raw_obj, isolate);
+  // Should cause warning.
   raw_obj.Print();
 }
 
 JSObject GuardedAllocation(Isolate* isolate) {
-  DisallowHeapAllocation no_gc;
+  DisallowGarbageCollection no_gc;
+  return *isolate->factory()->NewJSObjectWithNullProto();
+}
+
+JSObject GuardedAllocation2(Isolate* isolate) {
+  DisableGCMole no_gc_mole;
   return *isolate->factory()->NewJSObjectWithNullProto();
 }
 
 void TestNestedDeadVarAnalysis(Isolate* isolate) {
   JSObject raw_obj = GuardedAllocation(isolate);
   CauseGCRaw(raw_obj, isolate);
-
   // Should cause warning.
   raw_obj.Print();
 }
 
+void TestNestedDeadVarAnalysis2(Isolate* isolate) {
+  DisableGCMole no_gc_mole;
+  JSObject raw_obj = GuardedAllocation(isolate);
+  CauseGCRaw(raw_obj, isolate);
+  // Shouldn't cause warning.
+  raw_obj.Print();
+}
+
 // Test that putting a guard in the middle of the function doesn't
 // mistakenly cover the whole scope of the raw variable.
 void TestGuardedDeadVarAnalysisMidFunction(Isolate* isolate) {
   JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
-
   CauseGCRaw(raw_obj, isolate);
+  // Guarding the rest of the function from triggering a GC.
+  DisallowGarbageCollection no_gc;
+  // Should cause warning.
+  raw_obj.Print();
+}
 
+// Test that putting a guard in the middle of the function doesn't
+// mistakenly cover the whole scope of the raw variable.
+void TestGuardedDeadVarAnalysisMidFunction2(Isolate* isolate) {
+  JSObject raw_obj = *isolate->factory()->NewJSObjectWithNullProto();
+  CauseGCRaw(raw_obj, isolate);
   // Guarding the rest of the function from triggering a GC.
-  DisallowHeapAllocation no_gc;
+  DisableGCMole no_gc_mole;
   // Should cause warning.
   raw_obj.Print();
 }
diff --git a/deps/v8/tools/gcmole/gcmole-tools.tar.gz.sha1 b/deps/v8/tools/gcmole/gcmole-tools.tar.gz.sha1
index 84b3657c6cc412..4e18bae7093065 100644
--- a/deps/v8/tools/gcmole/gcmole-tools.tar.gz.sha1
+++ b/deps/v8/tools/gcmole/gcmole-tools.tar.gz.sha1
@@ -1 +1 @@
-7e31d257a711b1a77823633e4f19152c3e0718f4
+165dd133e7dff1583a6b6611e3d5a8382bcd0893
diff --git a/deps/v8/tools/gcmole/gcmole.cc b/deps/v8/tools/gcmole/gcmole.cc
index 7b32f6c7fd1ab3..3dc4baa72280e0 100644
--- a/deps/v8/tools/gcmole/gcmole.cc
+++ b/deps/v8/tools/gcmole/gcmole.cc
@@ -27,22 +27,23 @@
 
 // This is clang plugin used by gcmole tool. See README for more details.
 
+#include <bitset>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <set>
+#include <stack>
+
 #include "clang/AST/AST.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/Mangle.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/Frontend/FrontendPluginRegistry.h"
+#include "clang/Basic/FileManager.h"
 #include "clang/Frontend/CompilerInstance.h"
+#include "clang/Frontend/FrontendPluginRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include <bitset>
-#include <fstream>
-#include <iostream>
-#include <map>
-#include <set>
-#include <stack>
-
 namespace {
 
 bool g_tracing_enabled = false;
@@ -228,8 +229,9 @@ class CalleesPrinter : public clang::RecursiveASTVisitor<CalleesPrinter> {
   virtual bool VisitDeclRefExpr(clang::DeclRefExpr* expr) {
     // If function mentions EXTERNAL VMState add artificial garbage collection
     // mark.
-    if (IsExternalVMState(expr->getDecl()))
+    if (IsExternalVMState(expr->getDecl())) {
       AddCallee("CollectGarbage", "CollectGarbage");
+    }
     return true;
   }
 
@@ -684,17 +686,13 @@ class FunctionAnalyzer {
   FunctionAnalyzer(clang::MangleContext* ctx, clang::CXXRecordDecl* object_decl,
                    clang::CXXRecordDecl* maybe_object_decl,
                    clang::CXXRecordDecl* smi_decl,
-                   clang::CXXRecordDecl* no_gc_decl,
-                   clang::CXXRecordDecl* no_gc_or_safepoint_decl,
-                   clang::CXXRecordDecl* no_heap_access_decl,
+                   clang::CXXRecordDecl* no_gc_mole_decl,
                    clang::DiagnosticsEngine& d, clang::SourceManager& sm)
       : ctx_(ctx),
         object_decl_(object_decl),
         maybe_object_decl_(maybe_object_decl),
         smi_decl_(smi_decl),
-        no_gc_decl_(no_gc_decl),
-        no_gc_or_safepoint_decl_(no_gc_or_safepoint_decl),
-        no_heap_access_decl_(no_heap_access_decl),
+        no_gc_mole_decl_(no_gc_mole_decl),
         d_(d),
         sm_(sm),
         block_(NULL) {}
@@ -1281,9 +1279,7 @@ class FunctionAnalyzer {
   DECL_VISIT_STMT(ForStmt) {
     Block block (VisitStmt(stmt->getInit(), env), this);
     do {
-      block.Loop(stmt->getCond(),
-                 stmt->getBody(),
-                 stmt->getInc());
+      block.Loop(stmt->getCond(), stmt->getBody(), stmt->getInc());
     } while (block.changed());
     return block.out();
   }
@@ -1338,25 +1334,15 @@ class FunctionAnalyzer {
 
   const clang::CXXRecordDecl* GetDefinitionOrNull(
       const clang::CXXRecordDecl* record) {
-    if (record == NULL) {
-      return NULL;
-    }
-
+    if (record == NULL) return NULL;
     if (!InV8Namespace(record)) return NULL;
-
-    if (!record->hasDefinition()) {
-      return NULL;
-    }
-
+    if (!record->hasDefinition()) return NULL;
     return record->getDefinition();
   }
 
   bool IsDerivedFromInternalPointer(const clang::CXXRecordDecl* record) {
     const clang::CXXRecordDecl* definition = GetDefinitionOrNull(record);
-    if (!definition) {
-      return false;
-    }
-
+    if (!definition) return false;
     bool result = (IsDerivedFrom(record, object_decl_) &&
                    !IsDerivedFrom(record, smi_decl_)) ||
                   IsDerivedFrom(record, maybe_object_decl_);
@@ -1381,13 +1367,9 @@ class FunctionAnalyzer {
   // such. For V8 that means Object and MaybeObject instances.
   bool RepresentsRawPointerType(clang::QualType qtype) {
     // Not yet assigned pointers can't get moved by the GC.
-    if (qtype.isNull()) {
-      return false;
-    }
+    if (qtype.isNull()) return false;
     // nullptr can't get moved by the GC.
-    if (qtype->isNullPtrType()) {
-      return false;
-    }
+    if (qtype->isNullPtrType()) return false;
 
     const clang::PointerType* pointer_type =
         llvm::dyn_cast_or_null<clang::PointerType>(qtype.getTypePtrOrNull());
@@ -1399,25 +1381,15 @@ class FunctionAnalyzer {
   }
 
   bool IsGCGuard(clang::QualType qtype) {
-    if (qtype.isNull()) {
-      return false;
-    }
-    if (qtype->isNullPtrType()) {
-      return false;
-    }
+    if (!no_gc_mole_decl_) return false;
+    if (qtype.isNull()) return false;
+    if (qtype->isNullPtrType()) return false;
 
     const clang::CXXRecordDecl* record = qtype->getAsCXXRecordDecl();
     const clang::CXXRecordDecl* definition = GetDefinitionOrNull(record);
 
-    if (!definition) {
-      return false;
-    }
-
-    return (no_gc_decl_ && IsDerivedFrom(definition, no_gc_decl_)) ||
-           (no_gc_or_safepoint_decl_ &&
-            IsDerivedFrom(definition, no_gc_or_safepoint_decl_)) ||
-           (no_heap_access_decl_ &&
-            IsDerivedFrom(definition, no_heap_access_decl_));
+    if (!definition) return false;
+    return no_gc_mole_decl_ == definition;
   }
 
   Environment VisitDecl(clang::Decl* decl, Environment& env) {
@@ -1501,8 +1473,7 @@ class FunctionAnalyzer {
   clang::CXXRecordDecl* object_decl_;
   clang::CXXRecordDecl* maybe_object_decl_;
   clang::CXXRecordDecl* smi_decl_;
-  clang::CXXRecordDecl* no_gc_decl_;
-  clang::CXXRecordDecl* no_gc_or_safepoint_decl_;
+  clang::CXXRecordDecl* no_gc_mole_decl_;
   clang::CXXRecordDecl* no_heap_access_decl_;
 
   clang::DiagnosticsEngine& d_;
@@ -1567,58 +1538,38 @@ class ProblemsFinder : public clang::ASTConsumer,
   }
 
   virtual void HandleTranslationUnit(clang::ASTContext &ctx) {
-    if (TranslationUnitIgnored()) {
-      return;
-    }
+    if (TranslationUnitIgnored()) return;
 
     Resolver r(ctx);
 
-    // It is a valid situation that no_gc_decl == NULL when the
-    // DisallowHeapAllocation is not included and can't be resolved.
-    // This is gracefully handled in the FunctionAnalyzer later.
-    clang::CXXRecordDecl* no_gc_decl =
-        r.ResolveNamespace("v8")
-            .ResolveNamespace("internal")
-            .ResolveTemplate("DisallowHeapAllocation");
-
-    clang::CXXRecordDecl* no_gc_or_safepoint_decl =
-        r.ResolveNamespace("v8")
-            .ResolveNamespace("internal")
-            .ResolveTemplate("DisallowGarbageCollection");
-
-    clang::CXXRecordDecl* no_heap_access_decl =
-        r.ResolveNamespace("v8")
-            .ResolveNamespace("internal")
-            .Resolve<clang::CXXRecordDecl>("DisallowHeapAccess");
+    // It is a valid situation that no_gc_mole_decl == NULL when DisableGCMole
+    // is not included and can't be resolved. This is gracefully handled in the
+    // FunctionAnalyzer later.
+    auto v8_internal = r.ResolveNamespace("v8").ResolveNamespace("internal");
+    clang::CXXRecordDecl* no_gc_mole_decl =
+        v8_internal.ResolveTemplate("DisableGCMole");
 
     clang::CXXRecordDecl* object_decl =
-        r.ResolveNamespace("v8").ResolveNamespace("internal").
-            Resolve<clang::CXXRecordDecl>("Object");
+        v8_internal.Resolve<clang::CXXRecordDecl>("Object");
 
     clang::CXXRecordDecl* maybe_object_decl =
-        r.ResolveNamespace("v8")
-            .ResolveNamespace("internal")
-            .Resolve<clang::CXXRecordDecl>("MaybeObject");
+        v8_internal.Resolve<clang::CXXRecordDecl>("MaybeObject");
 
     clang::CXXRecordDecl* smi_decl =
-        r.ResolveNamespace("v8").ResolveNamespace("internal").
-            Resolve<clang::CXXRecordDecl>("Smi");
+        v8_internal.Resolve<clang::CXXRecordDecl>("Smi");
 
     if (object_decl != NULL) object_decl = object_decl->getDefinition();
 
-    if (maybe_object_decl != NULL)
+    if (maybe_object_decl != NULL) {
       maybe_object_decl = maybe_object_decl->getDefinition();
+    }
 
     if (smi_decl != NULL) smi_decl = smi_decl->getDefinition();
 
-    if (no_heap_access_decl != NULL)
-      no_heap_access_decl = no_heap_access_decl->getDefinition();
-
     if (object_decl != NULL && smi_decl != NULL && maybe_object_decl != NULL) {
       function_analyzer_ = new FunctionAnalyzer(
           clang::ItaniumMangleContext::create(ctx, d_), object_decl,
-          maybe_object_decl, smi_decl, no_gc_decl, no_gc_or_safepoint_decl,
-          no_heap_access_decl, d_, sm_);
+          maybe_object_decl, smi_decl, no_gc_mole_decl, d_, sm_);
       TraverseDecl(ctx.getTranslationUnitDecl());
     } else {
       if (object_decl == NULL) {
diff --git a/deps/v8/tools/gcmole/gcmole.lua b/deps/v8/tools/gcmole/gcmole.lua
deleted file mode 100644
index 9705165d36b736..00000000000000
--- a/deps/v8/tools/gcmole/gcmole.lua
+++ /dev/null
@@ -1,532 +0,0 @@
--- Copyright 2011 the V8 project authors. All rights reserved.
--- Redistribution and use in source and binary forms, with or without
--- modification, are permitted provided that the following conditions are
--- met:
---
---     * Redistributions of source code must retain the above copyright
---       notice, this list of conditions and the following disclaimer.
---     * Redistributions in binary form must reproduce the above
---       copyright notice, this list of conditions and the following
---       disclaimer in the documentation and/or other materials provided
---       with the distribution.
---     * Neither the name of Google Inc. nor the names of its
---       contributors may be used to endorse or promote products derived
---       from this software without specific prior written permission.
---
--- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--- This is main driver for gcmole tool. See README for more details.
--- Usage: CLANG_BIN=clang-bin-dir lua tools/gcmole/gcmole.lua [arm|ia32|x64]
-
-local DIR = arg[0]:match("^(.+)/[^/]+$")
-
-local FLAGS = {
-   -- Do not build gcsuspects file and reuse previously generated one.
-   reuse_gcsuspects = false;
-
-   -- Don't use parallel python runner.
-   sequential = false;
-
-   -- Print commands to console before executing them.
-   verbose = false;
-
-   -- Perform dead variable analysis.
-   dead_vars = true;
-
-   -- Enable verbose tracing from the plugin itself.
-   verbose_trace = false;
-
-   -- When building gcsuspects whitelist certain functions as if they
-   -- can be causing GC. Currently used to reduce number of false
-   -- positives in dead variables analysis. See TODO for WHITELIST
-   -- below.
-   whitelist = true;
-}
-local ARGS = {}
-
-for i = 1, #arg do
-   local flag = arg[i]:match "^%-%-([%w_-]+)$"
-   if flag then
-      local no, real_flag = flag:match "^(no)([%w_-]+)$"
-      if real_flag then flag = real_flag end
-
-      flag = flag:gsub("%-", "_")
-      if FLAGS[flag] ~= nil then
-         FLAGS[flag] = (no ~= "no")
-      else
-         error("Unknown flag: " .. flag)
-      end
-   else
-      table.insert(ARGS, arg[i])
-   end
-end
-
-local ARCHS = ARGS[1] and { ARGS[1] } or { 'ia32', 'arm', 'x64', 'arm64' }
-
-local io = require "io"
-local os = require "os"
-
-function log(...)
-   io.stderr:write(string.format(...))
-   io.stderr:write "\n"
-end
-
--------------------------------------------------------------------------------
--- Clang invocation
-
-local CLANG_BIN = os.getenv "CLANG_BIN"
-local CLANG_PLUGINS = os.getenv "CLANG_PLUGINS"
-
-if not CLANG_BIN or CLANG_BIN == "" then
-   error "CLANG_BIN not set"
-end
-
-if not CLANG_PLUGINS or CLANG_PLUGINS == "" then
-   CLANG_PLUGINS = DIR
-end
-
-local function MakeClangCommandLine(
-      plugin, plugin_args, triple, arch_define, arch_options)
-   if plugin_args then
-     for i = 1, #plugin_args do
-        plugin_args[i] = "-Xclang -plugin-arg-" .. plugin
-           .. " -Xclang " .. plugin_args[i]
-     end
-     plugin_args = " " .. table.concat(plugin_args, " ")
-   end
-   return CLANG_BIN .. "/clang++ -std=c++14 -c"
-      .. " -Xclang -load -Xclang " .. CLANG_PLUGINS .. "/libgcmole.so"
-      .. " -Xclang -plugin -Xclang "  .. plugin
-      .. (plugin_args or "")
-      .. " -Xclang -triple -Xclang " .. triple
-      .. " -fno-exceptions"
-      .. " -D" .. arch_define
-      .. " -DENABLE_DEBUGGER_SUPPORT"
-      .. " -DV8_INTL_SUPPORT"
-      .. " -I./"
-      .. " -Iinclude/"
-      .. " -Iout/build/gen"
-      .. " -Ithird_party/icu/source/common"
-      .. " -Ithird_party/icu/source/i18n"
-      .. " " .. arch_options
-end
-
-local function IterTable(t)
-  return coroutine.wrap(function ()
-    for i, v in ipairs(t) do
-      coroutine.yield(v)
-    end
-  end)
-end
-
-local function SplitResults(lines, func)
-   -- Splits the output of parallel.py and calls func on each result.
-   -- Bails out in case of an error in one of the executions.
-   local current = {}
-   local filename = ""
-   for line in lines do
-      local new_file = line:match "^______________ (.*)$"
-      local code = line:match "^______________ finish (%d+) ______________$"
-      if code then
-         if tonumber(code) > 0 then
-            log(table.concat(current, "\n"))
-            log("Failed to examine " .. filename)
-            return false
-         end
-         log("-- %s", filename)
-         func(filename, IterTable(current))
-      elseif new_file then
-         filename = new_file
-         current = {}
-      else
-         table.insert(current, line)
-      end
-   end
-   return true
-end
-
-function InvokeClangPluginForEachFile(filenames, cfg, func)
-   local cmd_line = MakeClangCommandLine(cfg.plugin,
-                                         cfg.plugin_args,
-                                         cfg.triple,
-                                         cfg.arch_define,
-                                         cfg.arch_options)
-   if FLAGS.sequential then
-      log("** Sequential execution.")
-      for _, filename in ipairs(filenames) do
-         log("-- %s", filename)
-         local action = cmd_line .. " " .. filename .. " 2>&1"
-         if FLAGS.verbose then print('popen ', action) end
-         local pipe = io.popen(action)
-         func(filename, pipe:lines())
-         local success = pipe:close()
-         if not success then error("Failed to run: " .. action) end
-      end
-   else
-      log("** Parallel execution.")
-      local action = "python tools/gcmole/parallel.py \""
-         .. cmd_line .. "\" " .. table.concat(filenames, " ")
-      if FLAGS.verbose then print('popen ', action) end
-      local pipe = io.popen(action)
-      local success = SplitResults(pipe:lines(), func)
-      local closed = pipe:close()
-      if not (success and closed) then error("Failed to run: " .. action) end
-   end
-end
-
--------------------------------------------------------------------------------
-
-local function ParseGNFile(for_test)
-   local result = {}
-   local gn_files
-   if for_test then
-      gn_files = {
-         { "tools/gcmole/GCMOLE.gn",             '"([^"]-%.cc)"',      ""         }
-      }
-   else
-      gn_files = {
-         { "BUILD.gn",             '"([^"]-%.cc)"',      ""         },
-         { "test/cctest/BUILD.gn", '"(test-[^"]-%.cc)"', "test/cctest/" }
-      }
-   end
-
-   for i = 1, #gn_files do
-      local filename = gn_files[i][1]
-      local pattern = gn_files[i][2]
-      local prefix = gn_files[i][3]
-      local gn_file = assert(io.open(filename), "failed to open GN file")
-      local gn = gn_file:read('*a')
-      for condition, sources in
-         gn:gmatch "### gcmole%((.-)%) ###(.-)%]" do
-         if result[condition] == nil then result[condition] = {} end
-         for file in sources:gmatch(pattern) do
-            table.insert(result[condition], prefix .. file)
-         end
-      end
-      gn_file:close()
-   end
-
-   return result
-end
-
-local function EvaluateCondition(cond, props)
-   if cond == 'all' then return true end
-
-   local p, v = cond:match "(%w+):(%w+)"
-
-   assert(p and v, "failed to parse condition: " .. cond)
-   assert(props[p] ~= nil, "undefined configuration property: " .. p)
-
-   return props[p] == v
-end
-
-local function BuildFileList(sources, props)
-   local list = {}
-   for condition, files in pairs(sources) do
-      if EvaluateCondition(condition, props) then
-         for i = 1, #files do table.insert(list, files[i]) end
-      end
-   end
-   return list
-end
-
-
-local gn_sources = ParseGNFile(false)
-local gn_test_sources = ParseGNFile(true)
-
-local function FilesForArch(arch)
-   return BuildFileList(gn_sources, { os = 'linux',
-                                      arch = arch,
-                                      mode = 'debug',
-                                      simulator = ''})
-end
-
-local function FilesForTest(arch)
-   return BuildFileList(gn_test_sources, { os = 'linux',
-                                      arch = arch,
-                                      mode = 'debug',
-                                      simulator = ''})
-end
-
-local mtConfig = {}
-
-mtConfig.__index = mtConfig
-
-local function config (t) return setmetatable(t, mtConfig) end
-
-function mtConfig:extend(t)
-   local e = {}
-   for k, v in pairs(self) do e[k] = v end
-   for k, v in pairs(t) do e[k] = v end
-   return config(e)
-end
-
-local ARCHITECTURES = {
-   ia32 = config { triple = "i586-unknown-linux",
-                   arch_define = "V8_TARGET_ARCH_IA32",
-                   arch_options = "-m32" },
-   arm = config { triple = "i586-unknown-linux",
-                  arch_define = "V8_TARGET_ARCH_ARM",
-                  arch_options = "-m32" },
-   x64 = config { triple = "x86_64-unknown-linux",
-                  arch_define = "V8_TARGET_ARCH_X64",
-                  arch_options = "" },
-   arm64 = config { triple = "x86_64-unknown-linux",
-                    arch_define = "V8_TARGET_ARCH_ARM64",
-                    arch_options = "" },
-}
-
--------------------------------------------------------------------------------
--- GCSuspects Generation
-
-local gc, gc_caused, funcs
-
--- Note that the gcsuspects file lists functions in the form:
---  mangled_name,unmangled_function_name
---
--- This means that we can match just the function name by matching only
--- after a comma.
-local WHITELIST = {
-   -- The following functions call CEntryStub which is always present.
-   "MacroAssembler.*,CallRuntime",
-   "CompileCallLoadPropertyWithInterceptor",
-   "CallIC.*,GenerateMiss",
-
-   -- DirectCEntryStub is a special stub used on ARM.
-   -- It is pinned and always present.
-   "DirectCEntryStub.*,GenerateCall",
-
-   -- TODO GCMole currently is sensitive enough to understand that certain
-   --      functions only cause GC and return Failure simulataneously.
-   --      Callsites of such functions are safe as long as they are properly
-   --      check return value and propagate the Failure to the caller.
-   --      It should be possible to extend GCMole to understand this.
-   "Heap.*,TryEvacuateObject",
-
-   -- Ignore all StateTag methods.
-   "StateTag",
-
-   -- Ignore printing of elements transition.
-   "PrintElementsTransition",
-
-   -- CodeCreateEvent receives AbstractCode (a raw ptr) as an argument.
-   "CodeCreateEvent",
-   "WriteField",
-};
-
-local function AddCause(name, cause)
-   local t = gc_caused[name]
-   if not t then
-      t = {}
-      gc_caused[name] = t
-   end
-   table.insert(t, cause)
-end
-
-local function resolve(name)
-   local f = funcs[name]
-
-   if not f then
-      f = {}
-      funcs[name] = f
-
-      if name:match ",.*Collect.*Garbage" then
-         gc[name] = true
-         AddCause(name, "<GC>")
-      end
-
-      if FLAGS.whitelist then
-         for i = 1, #WHITELIST do
-            if name:match(WHITELIST[i]) then
-               gc[name] = false
-            end
-         end
-      end
-   end
-
-    return f
-end
-
-local function parse (filename, lines)
-   local scope
-
-   for funcname in lines do
-      if funcname:sub(1, 1) ~= '\t' then
-         resolve(funcname)
-         scope = funcname
-      else
-         local name = funcname:sub(2)
-         resolve(name)[scope] = true
-      end
-   end
-end
-
-local function propagate ()
-   log "** Propagating GC information"
-
-   local function mark(from, callers)
-      for caller, _ in pairs(callers) do
-         if gc[caller] == nil then
-            gc[caller] = true
-            mark(caller, funcs[caller])
-         end
-         AddCause(caller, from)
-      end
-   end
-
-   for funcname, callers in pairs(funcs) do
-      if gc[funcname] then mark(funcname, callers) end
-   end
-end
-
-local function GenerateGCSuspects(arch, files, cfg)
-   -- Reset the global state.
-   gc, gc_caused, funcs = {}, {}, {}
-
-   log ("** Building GC Suspects for %s", arch)
-   InvokeClangPluginForEachFile (files,
-                                 cfg:extend { plugin = "dump-callees" },
-                                 parse)
-
-   propagate()
-
-   local out = assert(io.open("gcsuspects", "w"))
-   for name, value in pairs(gc) do if value then out:write (name, '\n') end end
-   out:close()
-
-   local out = assert(io.open("gccauses", "w"))
-   out:write "GC = {"
-   for name, causes in pairs(gc_caused) do
-      out:write("['", name, "'] = {")
-      for i = 1, #causes do out:write ("'", causes[i], "';") end
-      out:write("};\n")
-   end
-   out:write "}"
-   out:close()
-
-   log ("** GCSuspects generated for %s", arch)
-end
-
---------------------------------------------------------------------------------
--- Analysis
-
-local function CheckCorrectnessForArch(arch, for_test)
-   local files
-   if for_test then
-      files = FilesForTest(arch)
-   else
-      files = FilesForArch(arch)
-   end
-   local cfg = ARCHITECTURES[arch]
-
-   if not FLAGS.reuse_gcsuspects then
-      GenerateGCSuspects(arch, files, cfg)
-   end
-
-   local processed_files = 0
-   local errors_found = false
-   local output = ""
-   local function SearchForErrors(filename, lines)
-      processed_files = processed_files + 1
-      for l in lines do
-         errors_found = errors_found or
-            l:match "^[^:]+:%d+:%d+:" or
-            l:match "error" or
-            l:match "warning"
-         if for_test then
-            output = output.."\n"..l
-         else
-            print(l)
-         end
-      end
-   end
-
-   log("** Searching for evaluation order problems%s for %s",
-       FLAGS.dead_vars and " and dead variables" or "",
-       arch)
-   local plugin_args = {}
-   if FLAGS.dead_vars then table.insert(plugin_args, "--dead-vars") end
-   if FLAGS.verbose_trace then table.insert(plugin_args, '--verbose') end
-   InvokeClangPluginForEachFile(files,
-                                cfg:extend { plugin = "find-problems",
-                                             plugin_args = plugin_args },
-                                SearchForErrors)
-   log("** Done processing %d files. %s",
-       processed_files,
-       errors_found and "Errors found" or "No errors found")
-
-   return errors_found, output
-end
-
-local function SafeCheckCorrectnessForArch(arch, for_test)
-   local status, errors, output = pcall(CheckCorrectnessForArch, arch, for_test)
-   if not status then
-      print(string.format("There was an error: %s", errors))
-      errors = true
-   end
-   return errors, output
-end
-
--- Source: https://stackoverflow.com/a/41515925/1540248
-local function StringDifference(str1,str2)
-   for i = 1,#str1 do -- Loop over strings
-         -- If that character is not equal to its counterpart
-         if str1:sub(i,i) ~= str2:sub(i,i) then
-            return i --Return that index
-         end
-   end
-   return #str1+1 -- Return the index after where the shorter one ends as fallback.
-end
-
-local function TestRun()
-   local errors, output = SafeCheckCorrectnessForArch('x64', true)
-   if not errors then
-      log("** Test file should produce errors, but none were found. Output:")
-      log(output)
-      return false
-   end
-
-   local filename = "tools/gcmole/test-expectations.txt"
-   local exp_file = assert(io.open(filename), "failed to open test expectations file")
-   local expectations = exp_file:read('*all')
-
-   if output ~= expectations then
-      log("** Output mismatch from running tests. Please run them manually.")
-      local idx = StringDifference(output, expectations)
-
-      log("Difference at byte "..idx)
-      log("Expected: "..expectations:sub(idx-10,idx+10))
-      log("Actual: "..output:sub(idx-10,idx+10))
-
-      log("--- Full output ---")
-      log(output)
-      log("------")
-
-      return false
-   end
-
-   log("** Tests ran successfully")
-   return true
-end
-
-local errors = not TestRun()
-
-for _, arch in ipairs(ARCHS) do
-   if not ARCHITECTURES[arch] then
-      error("Unknown arch: " .. arch)
-   end
-
-   errors = SafeCheckCorrectnessForArch(arch, false) or errors
-end
-
-os.exit(errors and 1 or 0)
diff --git a/deps/v8/tools/gcmole/gcmole.py b/deps/v8/tools/gcmole/gcmole.py
new file mode 100644
index 00000000000000..978cd3159818d8
--- /dev/null
+++ b/deps/v8/tools/gcmole/gcmole.py
@@ -0,0 +1,575 @@
+#!/usr/bin/env python
+# Copyright 2020 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is main driver for gcmole tool. See README for more details.
+# Usage: CLANG_BIN=clang-bin-dir python tools/gcmole/gcmole.py [arm|arm64|ia32|x64]
+
+# for py2/py3 compatibility
+from __future__ import print_function
+
+import collections
+import difflib
+from multiprocessing import cpu_count
+import os
+import re
+import subprocess
+import sys
+import threading
+if sys.version_info.major > 2:
+  import queue
+else:
+  import Queue as queue
+
+ArchCfg = collections.namedtuple("ArchCfg",
+                                 ["triple", "arch_define", "arch_options"])
+
+ARCHITECTURES = {
+    "ia32":
+        ArchCfg(
+            triple="i586-unknown-linux",
+            arch_define="V8_TARGET_ARCH_IA32",
+            arch_options=["-m32"],
+        ),
+    "arm":
+        ArchCfg(
+            triple="i586-unknown-linux",
+            arch_define="V8_TARGET_ARCH_ARM",
+            arch_options=["-m32"],
+        ),
+    "x64":
+        ArchCfg(
+            triple="x86_64-unknown-linux",
+            arch_define="V8_TARGET_ARCH_X64",
+            arch_options=[]),
+    "arm64":
+        ArchCfg(
+            triple="x86_64-unknown-linux",
+            arch_define="V8_TARGET_ARCH_ARM64",
+            arch_options=[],
+        ),
+}
+
+
+def log(format, *args):
+  print(format.format(*args))
+
+
+def fatal(format, *args):
+  log(format, *args)
+  sys.exit(1)
+
+
+# -----------------------------------------------------------------------------
+# Clang invocation
+
+
+def MakeClangCommandLine(plugin, plugin_args, arch_cfg, clang_bin_dir,
+                         clang_plugins_dir):
+  prefixed_plugin_args = []
+  if plugin_args:
+    for arg in plugin_args:
+      prefixed_plugin_args += [
+          "-Xclang",
+          "-plugin-arg-{}".format(plugin),
+          "-Xclang",
+          arg,
+      ]
+
+  return ([
+      os.path.join(clang_bin_dir, "clang++"),
+      "-std=c++14",
+      "-c",
+      "-Xclang",
+      "-load",
+      "-Xclang",
+      os.path.join(clang_plugins_dir, "libgcmole.so"),
+      "-Xclang",
+      "-plugin",
+      "-Xclang",
+      plugin,
+  ] + prefixed_plugin_args + [
+      "-Xclang",
+      "-triple",
+      "-Xclang",
+      arch_cfg.triple,
+      "-fno-exceptions",
+      "-D",
+      arch_cfg.arch_define,
+      "-DENABLE_DEBUGGER_SUPPORT",
+      "-DV8_INTL_SUPPORT",
+      "-I./",
+      "-Iinclude/",
+      "-Iout/build/gen",
+      "-Ithird_party/icu/source/common",
+      "-Ithird_party/icu/source/i18n",
+  ] + arch_cfg.arch_options)
+
+
+def InvokeClangPluginForFile(filename, cmd_line, verbose):
+  if verbose:
+    print("popen ", " ".join(cmd_line + [filename]))
+  p = subprocess.Popen(
+      cmd_line + [filename], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  stdout, stderr = p.communicate()
+  return p.returncode, stdout, stderr
+
+
+def InvokeClangPluginForFilesInQueue(i, input_queue, output_queue, cancel_event,
+                                     cmd_line, verbose):
+  success = False
+  try:
+    while not cancel_event.is_set():
+      filename = input_queue.get_nowait()
+      ret, stdout, stderr = InvokeClangPluginForFile(filename, cmd_line,
+                                                     verbose)
+      output_queue.put_nowait((filename, ret, stdout.decode('utf-8'), stderr.decode('utf-8')))
+      if ret != 0:
+        break
+  except KeyboardInterrupt:
+    log("-- [{}] Interrupting", i)
+  except queue.Empty:
+    success = True
+  finally:
+    # Emit a success bool so that the reader knows that there was either an
+    # error or all files were processed.
+    output_queue.put_nowait(success)
+
+
+def InvokeClangPluginForEachFile(
+    filenames,
+    plugin,
+    plugin_args,
+    arch_cfg,
+    flags,
+    clang_bin_dir,
+    clang_plugins_dir,
+):
+  cmd_line = MakeClangCommandLine(plugin, plugin_args, arch_cfg, clang_bin_dir,
+                                  clang_plugins_dir)
+  verbose = flags["verbose"]
+  if flags["sequential"]:
+    log("** Sequential execution.")
+    for filename in filenames:
+      log("-- {}", filename)
+      returncode, stdout, stderr = InvokeClangPluginForFile(
+          filename, cmd_line, verbose)
+      if returncode != 0:
+        sys.stderr.write(stderr)
+        sys.exit(returncode)
+      yield filename, stdout, stderr
+  else:
+    log("** Parallel execution.")
+    cpus = cpu_count()
+    input_queue = queue.Queue()
+    output_queue = queue.Queue()
+    threads = []
+    try:
+      for filename in filenames:
+        input_queue.put(filename)
+
+      cancel_event = threading.Event()
+
+      for i in range(min(len(filenames), cpus)):
+        threads.append(
+            threading.Thread(
+                target=InvokeClangPluginForFilesInQueue,
+                args=(i, input_queue, output_queue, cancel_event, cmd_line,
+                      verbose)))
+
+      for t in threads:
+        t.start()
+
+      num_finished = 0
+      while num_finished < len(threads):
+        output = output_queue.get()
+        if type(output) == bool:
+          if output:
+            num_finished += 1
+            continue
+          else:
+            break
+        filename, returncode, stdout, stderr = output
+        log("-- {}", filename)
+        if returncode != 0:
+          sys.stderr.write(stderr)
+          sys.exit(returncode)
+        yield filename, stdout, stderr
+
+    finally:
+      cancel_event.set()
+      for t in threads:
+        t.join()
+
+
+# -----------------------------------------------------------------------------
+
+
+def ParseGNFile(for_test):
+  result = {}
+  if for_test:
+    gn_files = [("tools/gcmole/GCMOLE.gn", re.compile('"([^"]*?\.cc)"'), "")]
+  else:
+    gn_files = [
+        ("BUILD.gn", re.compile('"([^"]*?\.cc)"'), ""),
+        ("test/cctest/BUILD.gn", re.compile('"(test-[^"]*?\.cc)"'),
+         "test/cctest/"),
+    ]
+
+  for filename, pattern, prefix in gn_files:
+    with open(filename) as gn_file:
+      gn = gn_file.read()
+      for condition, sources in re.findall("### gcmole\((.*?)\) ###(.*?)\]", gn,
+                                           re.MULTILINE | re.DOTALL):
+        if condition not in result:
+          result[condition] = []
+        for file in pattern.findall(sources):
+          result[condition].append(prefix + file)
+
+  return result
+
+
+def EvaluateCondition(cond, props):
+  if cond == "all":
+    return True
+
+  m = re.match("(\w+):(\w+)", cond)
+  if m is None:
+    fatal("failed to parse condition: {}", cond)
+  p, v = m.groups()
+  if p not in props:
+    fatal("undefined configuration property: {}", p)
+
+  return props[p] == v
+
+
+def BuildFileList(sources, props):
+  ret = []
+  for condition, files in sources.items():
+    if EvaluateCondition(condition, props):
+      ret += files
+  return ret
+
+
+gn_sources = ParseGNFile(for_test=False)
+gn_test_sources = ParseGNFile(for_test=True)
+
+
+def FilesForArch(arch):
+  return BuildFileList(gn_sources, {
+      "os": "linux",
+      "arch": arch,
+      "mode": "debug",
+      "simulator": ""
+  })
+
+
+def FilesForTest(arch):
+  return BuildFileList(gn_test_sources, {
+      "os": "linux",
+      "arch": arch,
+      "mode": "debug",
+      "simulator": ""
+  })
+
+
+# -----------------------------------------------------------------------------
+# GCSuspects Generation
+
+# Note that the gcsuspects file lists functions in the form:
+#  mangled_name,unmangled_function_name
+#
+# This means that we can match just the function name by matching only
+# after a comma.
+ALLOWLIST = [
+    # The following functions call CEntryStub which is always present.
+    "MacroAssembler.*,CallRuntime",
+    "CompileCallLoadPropertyWithInterceptor",
+    "CallIC.*,GenerateMiss",
+    # DirectCEntryStub is a special stub used on ARM.
+    # It is pinned and always present.
+    "DirectCEntryStub.*,GenerateCall",
+    # TODO GCMole currently is sensitive enough to understand that certain
+    #    functions only cause GC and return Failure simulataneously.
+    #    Callsites of such functions are safe as long as they are properly
+    #    check return value and propagate the Failure to the caller.
+    #    It should be possible to extend GCMole to understand this.
+    "Heap.*,TryEvacuateObject",
+    # Ignore all StateTag methods.
+    "StateTag",
+    # Ignore printing of elements transition.
+    "PrintElementsTransition",
+    # CodeCreateEvent receives AbstractCode (a raw ptr) as an argument.
+    "CodeCreateEvent",
+    "WriteField",
+]
+
+GC_PATTERN = ",.*Collect.*Garbage"
+SAFEPOINT_PATTERN = ",EnterSafepoint"
+ALLOWLIST_PATTERN = "|".join("(?:%s)" % p for p in ALLOWLIST)
+
+
+def MergeRegexp(pattern_dict):
+  return re.compile("|".join(
+      "(?P<%s>%s)" % (key, value) for (key, value) in pattern_dict.items()))
+
+
+IS_SPECIAL_WITHOUT_ALLOW_LIST = MergeRegexp({
+    "gc": GC_PATTERN,
+    "safepoint": SAFEPOINT_PATTERN
+})
+IS_SPECIAL_WITH_ALLOW_LIST = MergeRegexp({
+    "gc": GC_PATTERN,
+    "safepoint": SAFEPOINT_PATTERN,
+    "allow": ALLOWLIST_PATTERN
+})
+
+
+class GCSuspectsCollector:
+
+  def __init__(self, flags):
+    self.gc = {}
+    self.gc_caused = collections.defaultdict(lambda: [])
+    self.funcs = {}
+    self.current_caller = None
+    self.allowlist = flags["allowlist"]
+    self.is_special = IS_SPECIAL_WITH_ALLOW_LIST if self.allowlist else IS_SPECIAL_WITHOUT_ALLOW_LIST
+
+  def AddCause(self, name, cause):
+    self.gc_caused[name].append(cause)
+
+  def Parse(self, lines):
+    for funcname in lines:
+      if not funcname:
+        continue
+
+      if funcname[0] != "\t":
+        self.Resolve(funcname)
+        self.current_caller = funcname
+      else:
+        name = funcname[1:]
+        callers_for_name = self.Resolve(name)
+        callers_for_name.add(self.current_caller)
+
+  def Resolve(self, name):
+    if name not in self.funcs:
+      self.funcs[name] = set()
+      m = self.is_special.search(name)
+      if m:
+        if m.group("gc"):
+          self.gc[name] = True
+          self.AddCause(name, "<GC>")
+        elif m.group("safepoint"):
+          self.gc[name] = True
+          self.AddCause(name, "<Safepoint>")
+        elif m.group("allow"):
+          self.gc[name] = False
+
+    return self.funcs[name]
+
+  def Propagate(self):
+    log("** Propagating GC information")
+
+    def mark(funcname, callers):
+      for caller in callers:
+        if caller not in self.gc:
+          self.gc[caller] = True
+          mark(caller, self.funcs[caller])
+
+        self.AddCause(caller, funcname)
+
+    for funcname, callers in self.funcs.items():
+      if self.gc.get(funcname, False):
+        mark(funcname, callers)
+
+
+def GenerateGCSuspects(arch, files, arch_cfg, flags, clang_bin_dir,
+                       clang_plugins_dir):
+  # Reset the global state.
+  collector = GCSuspectsCollector(flags)
+
+  log("** Building GC Suspects for {}", arch)
+  for filename, stdout, stderr in InvokeClangPluginForEachFile(
+      files, "dump-callees", [], arch_cfg, flags, clang_bin_dir,
+      clang_plugins_dir):
+    collector.Parse(stdout.splitlines())
+
+  collector.Propagate()
+
+  with open("gcsuspects", "w") as out:
+    for name, value in collector.gc.items():
+      if value:
+        out.write(name + "\n")
+
+  with open("gccauses", "w") as out:
+    out.write("GC = {\n")
+    for name, causes in collector.gc_caused.items():
+      out.write("  '{}': [\n".format(name))
+      for cause in causes:
+        out.write("    '{}',\n".format(cause))
+      out.write("  ],\n")
+    out.write("}\n")
+
+  log("** GCSuspects generated for {}", arch)
+
+
+# ------------------------------------------------------------------------------
+# Analysis
+
+
+def CheckCorrectnessForArch(arch, for_test, flags, clang_bin_dir,
+                            clang_plugins_dir):
+  if for_test:
+    files = FilesForTest(arch)
+  else:
+    files = FilesForArch(arch)
+  arch_cfg = ARCHITECTURES[arch]
+
+  if not flags["reuse_gcsuspects"]:
+    GenerateGCSuspects(arch, files, arch_cfg, flags, clang_bin_dir,
+                       clang_plugins_dir)
+  else:
+    log("** Reusing GCSuspects for {}", arch)
+
+  processed_files = 0
+  errors_found = False
+  output = ""
+
+  log(
+      "** Searching for evaluation order problems{} for {}",
+      " and dead variables" if flags["dead_vars"] else "",
+      arch,
+  )
+  plugin_args = []
+  if flags["dead_vars"]:
+    plugin_args.append("--dead-vars")
+  if flags["verbose_trace"]:
+    plugin_args.append("--verbose")
+  for filename, stdout, stderr in InvokeClangPluginForEachFile(
+      files,
+      "find-problems",
+      plugin_args,
+      arch_cfg,
+      flags,
+      clang_bin_dir,
+      clang_plugins_dir,
+  ):
+    processed_files = processed_files + 1
+    if not errors_found:
+      errors_found = re.search("^[^:]+:\d+:\d+: (warning|error)", stderr,
+                               re.MULTILINE) is not None
+    if for_test:
+      output = output + stderr
+    else:
+      sys.stdout.write(stderr)
+
+  log(
+      "** Done processing {} files. {}",
+      processed_files,
+      "Errors found" if errors_found else "No errors found",
+  )
+
+  return errors_found, output
+
+
+def TestRun(flags, clang_bin_dir, clang_plugins_dir):
+  log("** Test Run")
+  errors_found, output = CheckCorrectnessForArch("x64", True, flags,
+                                                 clang_bin_dir,
+                                                 clang_plugins_dir)
+  if not errors_found:
+    log("** Test file should produce errors, but none were found. Output:")
+    log(output)
+    return False
+
+  filename = "tools/gcmole/test-expectations.txt"
+  with open(filename) as exp_file:
+    expectations = exp_file.read()
+
+  if output != expectations:
+    log("** Output mismatch from running tests. Please run them manually.")
+
+    for line in difflib.unified_diff(
+        expectations.splitlines(),
+        output.splitlines(),
+        fromfile=filename,
+        tofile="output",
+        lineterm="",
+    ):
+      log("{}", line)
+
+    log("------")
+    log("--- Full output ---")
+    log(output)
+    log("------")
+
+    return False
+
+  log("** Tests ran successfully")
+  return True
+
+
+def main(args):
+  DIR = os.path.dirname(args[0])
+
+  clang_bin_dir = os.getenv("CLANG_BIN")
+  clang_plugins_dir = os.getenv("CLANG_PLUGINS")
+
+  if not clang_bin_dir or clang_bin_dir == "":
+    fatal("CLANG_BIN not set")
+
+  if not clang_plugins_dir or clang_plugins_dir == "":
+    clang_plugins_dir = DIR
+
+  flags = {
+      #: not build gcsuspects file and reuse previously generated one.
+      "reuse_gcsuspects": False,
+      #:n't use parallel python runner.
+      "sequential": False,
+      # Print commands to console before executing them.
+      "verbose": True,
+      # Perform dead variable analysis.
+      "dead_vars": True,
+      # Enable verbose tracing from the plugin itself.
+      "verbose_trace": False,
+      # When building gcsuspects allowlist certain functions as if they can be
+      # causing GC. Currently used to reduce number of false positives in dead
+      # variables analysis. See TODO for ALLOWLIST
+      "allowlist": True,
+  }
+  pos_args = []
+
+  flag_regexp = re.compile("^--(no[-_]?)?([\w\-_]+)$")
+  for arg in args[1:]:
+    m = flag_regexp.match(arg)
+    if m:
+      no, flag = m.groups()
+      flag = flag.replace("-", "_")
+      if flag in flags:
+        flags[flag] = no is None
+      else:
+        fatal("Unknown flag: {}", flag)
+    else:
+      pos_args.append(arg)
+
+  archs = pos_args if len(pos_args) > 0 else ["ia32", "arm", "x64", "arm64"]
+
+  any_errors_found = False
+  if not TestRun(flags, clang_bin_dir, clang_plugins_dir):
+    any_errors_found = True
+  else:
+    for arch in archs:
+      if not ARCHITECTURES[arch]:
+        fatal("Unknown arch: {}", arch)
+
+      errors_found, output = CheckCorrectnessForArch(arch, False, flags,
+                                                     clang_bin_dir,
+                                                     clang_plugins_dir)
+      any_errors_found = any_errors_found or errors_found
+
+  sys.exit(1 if any_errors_found else 0)
+
+
+if __name__ == "__main__":
+  main(sys.argv)
diff --git a/deps/v8/tools/gcmole/package.sh b/deps/v8/tools/gcmole/package.sh
index 6206e7bb2e498c..7178de5c113a92 100755
--- a/deps/v8/tools/gcmole/package.sh
+++ b/deps/v8/tools/gcmole/package.sh
@@ -10,14 +10,22 @@
 
 THIS_DIR="$(readlink -f "$(dirname "${0}")")"
 
-PACKAGE_DIR="${THIS_DIR}/../../tools/gcmole/gcmole-tools"
-PACKAGE_FILE="${THIS_DIR}/../../tools/gcmole/gcmole-tools.tar.gz"
-PACKAGE_SUM="${THIS_DIR}/../../tools/gcmole/gcmole-tools.tar.gz.sha1"
-BUILD_DIR="${THIS_DIR}/../../third_party/llvm+clang-build"
+PACKAGE_DIR="${THIS_DIR}/gcmole-tools"
+PACKAGE_FILE="${THIS_DIR}/gcmole-tools.tar.gz"
+PACKAGE_SUM="${THIS_DIR}/gcmole-tools.tar.gz.sha1"
+BUILD_DIR="${THIS_DIR}/bootstrap/build"
 
 # Echo all commands
 set -x
 
+# Clean out any old files
+if [ -e "${PACKAGE_DIR:?}/bin" ] ; then
+  rm -rf "${PACKAGE_DIR:?}/bin"
+fi
+if [ -e "${PACKAGE_DIR:?}/lib" ] ; then
+  rm -rf "${PACKAGE_DIR:?}/lib"
+fi
+
 # Copy all required files
 mkdir -p "${PACKAGE_DIR}/bin"
 cp "${BUILD_DIR}/bin/clang++" "${PACKAGE_DIR}/bin"
@@ -39,7 +47,22 @@ echo You can find a packaged version of gcmole here:
 echo
 echo $(readlink -f "${PACKAGE_FILE}")
 echo
+echo Upload the update package to the chrome infra:
+echo
+echo 'gsutil.py cp tools/gcmole/gcmole-tools.tar.gz gs://chrome-v8-gcmole/$(cat tools/gcmole/gcmole-tools.tar.gz.sha1)'
+echo
+echo Run bootstrap.sh in chroot if glibc versions mismatch with bots:
+echo '# Create chroot'
+echo 'mkdir -p $CHROOT_DIR'
+echo 'sudo debootstrap $DEBIAN_VERSION $CHROOT_DIR'
+echo 'sudo chroot $CHROOT_DIR apt install g++ cmake python git'
+echo '# Mount ./depot_tools and ./v8 dirs in the chroot:'
+echo 'sudo chroot $CHROOT_DIR mkdir /docs'
+echo 'sudo mount --bind /path/to/workspace /docs'
+echo '# Build gcmole'
+echo "sudo chroot \$CHROOT_DIR bash -c 'PATH=/docs/depot_tools:\$PATH; /docs/v8/v8/tools/gcmole/bootstrap.sh'"
+echo
 echo You can now run gcmole using this command:
 echo
-echo CLANG_BIN="tools/gcmole/gcmole-tools/bin" lua tools/gcmole/gcmole.lua
+echo CLANG_BIN=\"tools/gcmole/gcmole-tools/bin\" python tools/gcmole/gcmole.py
 echo
diff --git a/deps/v8/tools/gcmole/parallel.py b/deps/v8/tools/gcmole/parallel.py
deleted file mode 100755
index 7ff95ccadc61ee..00000000000000
--- a/deps/v8/tools/gcmole/parallel.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2015 the V8 project authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-This script calls the first argument for each of the following arguments in
-parallel. E.g.
-parallel.py "clang --opt" file1 file2
-calls
-clang --opt file1
-clang --opt file2
-
-The output (stdout and stderr) is concatenated sequentially in the form:
-______________ file1
-<output of clang --opt file1>
-______________ finish <exit code of clang --opt file1> ______________
-______________ file2
-<output of clang --opt file2>
-______________ finish <exit code of clang --opt file2> ______________
-"""
-
-# for py2/py3 compatibility
-from __future__ import print_function
-
-import itertools
-import multiprocessing
-import subprocess
-import sys
-
-def invoke(cmdline):
-  try:
-    return (subprocess.check_output(
-        cmdline, shell=True, stderr=subprocess.STDOUT), 0)
-  except subprocess.CalledProcessError as e:
-    return (e.output, e.returncode)
-
-if __name__ == '__main__':
-  assert len(sys.argv) > 2
-  processes = multiprocessing.cpu_count()
-  pool = multiprocessing.Pool(processes=processes)
-  cmdlines = ["%s %s" % (sys.argv[1], filename) for filename in sys.argv[2:]]
-  for filename, result in itertools.izip(
-      sys.argv[2:], pool.imap(invoke, cmdlines)):
-    print("______________ %s" % filename)
-    print(result[0])
-    print("______________ finish %d ______________" % result[1])
diff --git a/deps/v8/tools/gcmole/run-gcmole.py b/deps/v8/tools/gcmole/run-gcmole.py
index 02174b218a627a..cfcb2dd4107fa0 100755
--- a/deps/v8/tools/gcmole/run-gcmole.py
+++ b/deps/v8/tools/gcmole/run-gcmole.py
@@ -15,19 +15,18 @@
 GCMOLE_PATH = os.path.dirname(os.path.abspath(__file__))
 CLANG_BIN = os.path.join(GCMOLE_PATH, 'gcmole-tools', 'bin')
 CLANG_PLUGINS = os.path.join(GCMOLE_PATH, 'gcmole-tools')
-LUA = os.path.join(GCMOLE_PATH, 'gcmole-tools', 'lua52')
-DRIVER = os.path.join(GCMOLE_PATH, 'gcmole.lua')
+DRIVER = os.path.join(GCMOLE_PATH, 'gcmole.py')
 BASE_PATH = os.path.dirname(os.path.dirname(GCMOLE_PATH))
 
-assert len(sys.argv) == 2
+assert len(sys.argv) >= 2
 
 if not os.path.isfile("out/build/gen/torque-generated/builtin-definitions.h"):
   print("Expected generated headers in out/build/gen.")
-  print("Either build v8 in out/build or change gcmole.lua:115")
+  print("Either build v8 in out/build or change the 'out/build/gen' location in gcmole.py")
   sys.exit(-1)
 
 proc = subprocess.Popen(
-    [LUA, DRIVER, sys.argv[1]],
+    [sys.executable, DRIVER] + sys.argv[1:],
     env={'CLANG_BIN': CLANG_BIN, 'CLANG_PLUGINS': CLANG_PLUGINS},
     cwd=BASE_PATH,
 )
diff --git a/deps/v8/tools/gcmole/test-expectations.txt b/deps/v8/tools/gcmole/test-expectations.txt
index f6c04e4a6c6c1d..92256b3e184ad1 100644
--- a/deps/v8/tools/gcmole/test-expectations.txt
+++ b/deps/v8/tools/gcmole/test-expectations.txt
@@ -1,38 +1,73 @@
-
-tools/gcmole/gcmole-test.cc:27:10: warning: Possibly dead variable.
+tools/gcmole/gcmole-test.cc:30:10: warning: Possibly dead variable.
   return obj;
          ^
-tools/gcmole/gcmole-test.cc:45:3: warning: Possible problem with evaluation order.
+tools/gcmole/gcmole-test.cc:48:3: warning: Possible problem with evaluation order.
   TwoArgumentsFunction(*CauseGC(obj1, isolate), *CauseGC(obj2, isolate));
   ^
-tools/gcmole/gcmole-test.cc:57:3: warning: Possible problem with evaluation order.
+tools/gcmole/gcmole-test.cc:60:3: warning: Possible problem with evaluation order.
   TwoSizeTArgumentsFunction(sizeof(*CauseGC(obj1, isolate)),
   ^
-tools/gcmole/gcmole-test.cc:82:7: warning: Possible problem with evaluation order.
+tools/gcmole/gcmole-test.cc:85:7: warning: Possible problem with evaluation order.
   so->Method(*CauseGC(obj1, isolate));
       ^
-tools/gcmole/gcmole-test.cc:84:7: warning: Possible problem with evaluation order.
+tools/gcmole/gcmole-test.cc:87:7: warning: Possible problem with evaluation order.
   so->Method(CauseGCRaw(*obj1, isolate));
       ^
-tools/gcmole/gcmole-test.cc:128:14: warning: Possible problem with evaluation order.
+tools/gcmole/gcmole-test.cc:131:14: warning: Possible problem with evaluation order.
   so_handle->Method(*derived.VirtualCauseGC(obj1, isolate));
              ^
-tools/gcmole/gcmole-test.cc:130:14: warning: Possible problem with evaluation order.
+tools/gcmole/gcmole-test.cc:133:14: warning: Possible problem with evaluation order.
   so_handle->Method(*base->VirtualCauseGC(obj1, isolate));
              ^
-tools/gcmole/gcmole-test.cc:151:14: warning: Possible problem with evaluation order.
+tools/gcmole/gcmole-test.cc:154:14: warning: Possible problem with evaluation order.
   so_handle->Method(*SomeClass::StaticCauseGC(obj1, isolate));
              ^
-tools/gcmole/gcmole-test.cc:161:3: warning: Possibly dead variable.
+tools/gcmole/gcmole-test.cc:164:3: warning: Possibly dead variable.
   raw_obj.Print();
   ^
-tools/gcmole/gcmole-test.cc:193:3: warning: Possibly dead variable.
+tools/gcmole/gcmole-test.cc:172:3: warning: Possibly dead variable.
   raw_obj.Print();
   ^
-tools/gcmole/gcmole-test.cc:216:3: warning: Possibly dead variable.
+tools/gcmole/gcmole-test.cc:198:3: warning: Possibly dead variable.
   raw_obj.Print();
   ^
-tools/gcmole/gcmole-test.cc:229:3: warning: Possibly dead variable.
+tools/gcmole/gcmole-test.cc:224:3: warning: Possibly dead variable.
   raw_obj.Print();
   ^
-12 warnings generated.
+tools/gcmole/gcmole-test.cc:235:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:242:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:252:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:262:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:265:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:271:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:287:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:295:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:302:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:319:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:338:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+tools/gcmole/gcmole-test.cc:349:3: warning: Possibly dead variable.
+  raw_obj.Print();
+  ^
+24 warnings generated.
diff --git a/deps/v8/tools/heap-stats/categories.js b/deps/v8/tools/heap-stats/categories.js
index 2bd08fad02dfc8..d3aa8480dc0646 100644
--- a/deps/v8/tools/heap-stats/categories.js
+++ b/deps/v8/tools/heap-stats/categories.js
@@ -94,8 +94,6 @@ export const CATEGORIES = new Map([
       'SYMBOL_TYPE',
       'THIN_ONE_BYTE_STRING_TYPE',
       'THIN_STRING_TYPE',
-      'UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE',
-      'UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE',
       'UNCACHED_EXTERNAL_ONE_BYTE_STRING_TYPE',
       'UNCACHED_EXTERNAL_STRING_TYPE',
       'WASM_INSTANCE_OBJECT_TYPE',
diff --git a/deps/v8/tools/ic-processor-driver.mjs b/deps/v8/tools/ic-processor-driver.mjs
index ef6d83e1e44409..c8042736b0347c 100644
--- a/deps/v8/tools/ic-processor-driver.mjs
+++ b/deps/v8/tools/ic-processor-driver.mjs
@@ -78,11 +78,7 @@ const accumulator = {
   StoreInArrayLiteralIC: 0, 
 }
 for (const ic of processor.icTimeline.all) {
-  print(
-      ic.type + ' (' + ic.oldState + '->' + ic.newState + ic.modifier + ') at ' +
-      ic.filePosition + ' ' + ic.key +
-      ' (map 0x' + ic.map.toString(16) + ')' +
-      (ic.reason ? ` ${ic.reason}` : '') + ' time: ' + ic.time);
+  print(Object.values(ic));
   accumulator[ic.type]++;
 }
 
diff --git a/deps/v8/tools/logreader.mjs b/deps/v8/tools/logreader.mjs
index 1bd9a4ba02e92a..a46c4bc87dfced 100644
--- a/deps/v8/tools/logreader.mjs
+++ b/deps/v8/tools/logreader.mjs
@@ -28,9 +28,13 @@
 /**
  * @fileoverview Log Reader is used to process log file produced by V8.
  */
- 
  import { CsvParser } from "./csvparser.mjs";
 
+
+// Parses dummy variable for readability;
+export const parseString = 'parse-string';
+export const parseVarArgs = 'parse-var-args';
+
 /**
  * Base class for processing log files.
  *
@@ -41,206 +45,200 @@
  *     markers.
  * @constructor
  */
-export function LogReader(dispatchTable, timedRange, pairwiseTimedRange) {
-  /**
-   * @type {Array.<Object>}
-   */
-  this.dispatchTable_ = dispatchTable;
+export class LogReader {
+  constructor (dispatchTable, timedRange, pairwiseTimedRange) {
+    /**
+     * @type {Array.<Object>}
+     */
+    this.dispatchTable_ = dispatchTable;
+
+    /**
+     * @type {boolean}
+     */
+    this.timedRange_ = timedRange;
+
+    /**
+     * @type {boolean}
+     */
+    this.pairwiseTimedRange_ = pairwiseTimedRange;
+    if (pairwiseTimedRange) {
+      this.timedRange_ = true;
+    }
+
+    /**
+     * Current line.
+     * @type {number}
+     */
+    this.lineNum_ = 0;
+
+    /**
+     * CSV lines parser.
+     * @type {CsvParser}
+     */
+    this.csvParser_ = new CsvParser();
+
+    /**
+     * Keeps track of whether we've seen a "current-time" tick yet.
+     * @type {boolean}
+     */
+    this.hasSeenTimerMarker_ = false;
+
+    /**
+     * List of log lines seen since last "current-time" tick.
+     * @type {Array.<String>}
+     */
+    this.logLinesSinceLastTimerMarker_ = [];
+  }
 
   /**
-   * @type {boolean}
+   * Used for printing error messages.
+   *
+   * @param {string} str Error message.
    */
-  this.timedRange_ = timedRange;
+  printError(str) {
+    // Do nothing.
+  }
 
   /**
-   * @type {boolean}
+   * Processes a portion of V8 profiler event log.
+   *
+   * @param {string} chunk A portion of log.
    */
-  this.pairwiseTimedRange_ = pairwiseTimedRange;
-  if (pairwiseTimedRange) {
-    this.timedRange_ = true;
+  processLogChunk(chunk) {
+    this.processLog_(chunk.split('\n'));
   }
 
   /**
-   * Current line.
-   * @type {number}
+   * Processes a line of V8 profiler event log.
+   *
+   * @param {string} line A line of log.
    */
-  this.lineNum_ = 0;
+  processLogLine(line) {
+    if (!this.timedRange_) {
+      this.processLogLine_(line);
+      return;
+    }
+    if (line.startsWith("current-time")) {
+      if (this.hasSeenTimerMarker_) {
+        this.processLog_(this.logLinesSinceLastTimerMarker_);
+        this.logLinesSinceLastTimerMarker_ = [];
+        // In pairwise mode, a "current-time" line ends the timed range.
+        if (this.pairwiseTimedRange_) {
+          this.hasSeenTimerMarker_ = false;
+        }
+      } else {
+        this.hasSeenTimerMarker_ = true;
+      }
+    } else {
+      if (this.hasSeenTimerMarker_) {
+        this.logLinesSinceLastTimerMarker_.push(line);
+      } else if (!line.startsWith("tick")) {
+        this.processLogLine_(line);
+      }
+    }
+  }
 
   /**
-   * CSV lines parser.
-   * @type {CsvParser}
+   * Processes stack record.
+   *
+   * @param {number} pc Program counter.
+   * @param {number} func JS Function.
+   * @param {Array.<string>} stack String representation of a stack.
+   * @return {Array.<number>} Processed stack.
    */
-  this.csvParser_ = new CsvParser();
+  processStack(pc, func, stack) {
+    const fullStack = func ? [pc, func] : [pc];
+    let prevFrame = pc;
+    for (let i = 0, n = stack.length; i < n; ++i) {
+      const frame = stack[i];
+      const firstChar = frame.charAt(0);
+      if (firstChar == '+' || firstChar == '-') {
+        // An offset from the previous frame.
+        prevFrame += parseInt(frame, 16);
+        fullStack.push(prevFrame);
+      // Filter out possible 'overflow' string.
+      } else if (firstChar != 'o') {
+        fullStack.push(parseInt(frame, 16));
+      } else {
+        this.printError(`dropping: ${frame}`);
+      }
+    }
+    return fullStack;
+  }
 
   /**
-   * Keeps track of whether we've seen a "current-time" tick yet.
-   * @type {boolean}
+   * Returns whether a particular dispatch must be skipped.
+   *
+   * @param {!Object} dispatch Dispatch record.
+   * @return {boolean} True if dispatch must be skipped.
    */
-  this.hasSeenTimerMarker_ = false;
+  skipDispatch(dispatch) {
+    return false;
+  }
 
   /**
-   * List of log lines seen since last "current-time" tick.
-   * @type {Array.<String>}
+   * Does a dispatch of a log record.
+   *
+   * @param {Array.<string>} fields Log record.
+   * @private
    */
-  this.logLinesSinceLastTimerMarker_ = [];
-};
-
-
-/**
- * Used for printing error messages.
- *
- * @param {string} str Error message.
- */
-LogReader.prototype.printError = function(str) {
-  // Do nothing.
-};
-
-
-/**
- * Processes a portion of V8 profiler event log.
- *
- * @param {string} chunk A portion of log.
- */
-LogReader.prototype.processLogChunk = function(chunk) {
-  this.processLog_(chunk.split('\n'));
-};
-
-
-/**
- * Processes a line of V8 profiler event log.
- *
- * @param {string} line A line of log.
- */
-LogReader.prototype.processLogLine = function(line) {
-  if (!this.timedRange_) {
-    this.processLogLine_(line);
-    return;
-  }
-  if (line.startsWith("current-time")) {
-    if (this.hasSeenTimerMarker_) {
-      this.processLog_(this.logLinesSinceLastTimerMarker_);
-      this.logLinesSinceLastTimerMarker_ = [];
-      // In pairwise mode, a "current-time" line ends the timed range.
-      if (this.pairwiseTimedRange_) {
-        this.hasSeenTimerMarker_ = false;
-      }
-    } else {
-      this.hasSeenTimerMarker_ = true;
+  dispatchLogRow_(fields) {
+    // Obtain the dispatch.
+    const command = fields[0];
+    const dispatch = this.dispatchTable_[command];
+    if (dispatch === undefined) return;
+    if (dispatch === null || this.skipDispatch(dispatch)) {
+      return;
     }
-  } else {
-    if (this.hasSeenTimerMarker_) {
-      this.logLinesSinceLastTimerMarker_.push(line);
-    } else if (!line.startsWith("tick")) {
-      this.processLogLine_(line);
-    }
-  }
-};
 
-
-/**
- * Processes stack record.
- *
- * @param {number} pc Program counter.
- * @param {number} func JS Function.
- * @param {Array.<string>} stack String representation of a stack.
- * @return {Array.<number>} Processed stack.
- */
-LogReader.prototype.processStack = function(pc, func, stack) {
-  const fullStack = func ? [pc, func] : [pc];
-  let prevFrame = pc;
-  for (let i = 0, n = stack.length; i < n; ++i) {
-    const frame = stack[i];
-    const firstChar = frame.charAt(0);
-    if (firstChar == '+' || firstChar == '-') {
-      // An offset from the previous frame.
-      prevFrame += parseInt(frame, 16);
-      fullStack.push(prevFrame);
-    // Filter out possible 'overflow' string.
-    } else if (firstChar != 'o') {
-      fullStack.push(parseInt(frame, 16));
-    } else {
-      this.printError(`dropping: ${frame}`);
+    // Parse fields.
+    const parsedFields = [];
+    for (let i = 0; i < dispatch.parsers.length; ++i) {
+      const parser = dispatch.parsers[i];
+      if (parser === parseString) {
+        parsedFields.push(fields[1 + i]);
+      } else if (typeof parser == 'function') {
+        parsedFields.push(parser(fields[1 + i]));
+      } else if (parser === parseVarArgs) {
+        // var-args
+        parsedFields.push(fields.slice(1 + i));
+        break;
+      } else {
+        throw new Error(`Invalid log field parser: ${parser}`);
+      }
     }
-  }
-  return fullStack;
-};
 
-
-/**
- * Returns whether a particular dispatch must be skipped.
- *
- * @param {!Object} dispatch Dispatch record.
- * @return {boolean} True if dispatch must be skipped.
- */
-LogReader.prototype.skipDispatch = dispatch => false;
-
-// Parses dummy variable for readability;
-export const parseString = 'parse-string';
-export const parseVarArgs = 'parse-var-args';
-
-/**
- * Does a dispatch of a log record.
- *
- * @param {Array.<string>} fields Log record.
- * @private
- */
-LogReader.prototype.dispatchLogRow_ = function(fields) {
-  // Obtain the dispatch.
-  const command = fields[0];
-  const dispatch = this.dispatchTable_[command];
-  if (dispatch === undefined) return;
-  if (dispatch === null || this.skipDispatch(dispatch)) {
-    return;
+    // Run the processor.
+    dispatch.processor.apply(this, parsedFields);
   }
 
-  // Parse fields.
-  const parsedFields = [];
-  for (let i = 0; i < dispatch.parsers.length; ++i) {
-    const parser = dispatch.parsers[i];
-    if (parser === parseString) {
-      parsedFields.push(fields[1 + i]);
-    } else if (typeof parser == 'function') {
-      parsedFields.push(parser(fields[1 + i]));
-    } else if (parser === parseVarArgs) {
-      // var-args
-      parsedFields.push(fields.slice(1 + i));
-      break;
-    } else {
-      throw new Error(`Invalid log field parser: ${parser}`);
+  /**
+   * Processes log lines.
+   *
+   * @param {Array.<string>} lines Log lines.
+   * @private
+   */
+  processLog_(lines) {
+    for (let i = 0, n = lines.length; i < n; ++i) {
+      this.processLogLine_(lines[i]);
     }
   }
 
-  // Run the processor.
-  dispatch.processor.apply(this, parsedFields);
-};
-
-
-/**
- * Processes log lines.
- *
- * @param {Array.<string>} lines Log lines.
- * @private
- */
-LogReader.prototype.processLog_ = function(lines) {
-  for (let i = 0, n = lines.length; i < n; ++i) {
-    this.processLogLine_(lines[i]);
-  }
-}
-
-/**
- * Processes a single log line.
- *
- * @param {String} a log line
- * @private
- */
-LogReader.prototype.processLogLine_ = function(line) {
-  if (line.length > 0) {
-    try {
-      const fields = this.csvParser_.parseLine(line);
-      this.dispatchLogRow_(fields);
-    } catch (e) {
-      this.printError(`line ${this.lineNum_ + 1}: ${e.message || e}\n${e.stack}`);
+  /**
+   * Processes a single log line.
+   *
+   * @param {String} a log line
+   * @private
+   */
+  processLogLine_(line) {
+    if (line.length > 0) {
+      try {
+        const fields = this.csvParser_.parseLine(line);
+        this.dispatchLogRow_(fields);
+      } catch (e) {
+        this.printError(`line ${this.lineNum_ + 1}: ${e.message || e}\n${e.stack}`);
+      }
     }
+    this.lineNum_++;
   }
-  this.lineNum_++;
-};
+}
diff --git a/deps/v8/tools/memory/asan/blacklist_win.txt b/deps/v8/tools/memory/asan/blacklist_win.txt
deleted file mode 100644
index 2bb1aa9714f13c..00000000000000
--- a/deps/v8/tools/memory/asan/blacklist_win.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# The rules in this file are only applied at compile time. If you can modify the
-# source in question, consider function attributes to disable instrumentation.
-#
-# Please think twice before you add or remove these rules.
\ No newline at end of file
diff --git a/deps/v8/tools/memory/asan/blacklist.txt b/deps/v8/tools/memory/asan/blocklist_win.txt
similarity index 100%
rename from deps/v8/tools/memory/asan/blacklist.txt
rename to deps/v8/tools/memory/asan/blocklist_win.txt
diff --git a/deps/v8/tools/parse-processor.mjs b/deps/v8/tools/parse-processor.mjs
index f78c4c0261cf3a..debde686650de6 100644
--- a/deps/v8/tools/parse-processor.mjs
+++ b/deps/v8/tools/parse-processor.mjs
@@ -40,7 +40,7 @@ function BYTES(bytes, total) {
     unitIndex++;
   }
   let result = formatNumber(value).padStart(10) + ' ' + units[unitIndex];
-  if (total !== void 0 && total != 0) {
+  if (total !== undefined && total != 0) {
     result += PERCENT(bytes, total).padStart(5);
   }
   return result;
@@ -161,7 +161,7 @@ class CompilationUnit {
 class Script extends CompilationUnit {
   constructor(id) {
     super();
-    if (id === void 0 || id <= 0) {
+    if (id === undefined || id <= 0) {
       throw new Error(`Invalid id=${id} for script`);
     }
     this.file = '';
@@ -214,7 +214,7 @@ class Script extends CompilationUnit {
   addMissingFunktions(list) {
     if (this.finalized) throw 'script is finalized!';
     list.forEach(fn => {
-      if (this.funktions[fn.start] === void 0) {
+      if (this.funktions[fn.start] === undefined) {
         this.addFunktion(fn);
       }
     });
@@ -222,8 +222,8 @@ class Script extends CompilationUnit {
 
   addFunktion(fn) {
     if (this.finalized) throw 'script is finalized!';
-    if (fn.start === void 0) throw "Funktion has no start position";
-    if (this.funktions[fn.start] !== void 0) {
+    if (fn.start === undefined) throw "Funktion has no start position";
+    if (this.funktions[fn.start] !== undefined) {
       fn.print();
       throw "adding same function twice to script";
     }
@@ -441,7 +441,7 @@ class Script extends CompilationUnit {
       for (let i = 1; i < metricProperties.length; i += kMetricIncrement) {
         let timestampPropertyName = metricProperties[i];
         let timestamp = funktionOrScript[timestampPropertyName];
-        if (timestamp === void 0) continue;
+        if (timestamp === undefined) continue;
         if (timestamp < start || end < timestamp) continue;
         timestamp -= start;
         let index = Math.floor(timestamp / delta);
@@ -906,7 +906,7 @@ export class ParseProcessor extends LogReader {
     }
     let script = this.lookupScript(scriptId);
     let funktion = script.getFunktionAtStartPosition(startPosition);
-    if (funktion === void 0) {
+    if (funktion === undefined) {
       funktion = new Funktion(functionName, startPosition, endPosition, script);
     }
     return funktion;
diff --git a/deps/v8/tools/profile.mjs b/deps/v8/tools/profile.mjs
index b2e953f2472477..f443740324f9cc 100644
--- a/deps/v8/tools/profile.mjs
+++ b/deps/v8/tools/profile.mjs
@@ -28,6 +28,7 @@
 import { CodeMap, CodeEntry } from "./codemap.mjs";
 import { ConsArray } from "./consarray.mjs";
 
+// Used to associate log entries with source positions in scripts.
 // TODO: move to separate modules
 export class SourcePosition {
   constructor(script, line, column) {
@@ -36,19 +37,43 @@ export class SourcePosition {
     this.column = column;
     this.entries = [];
   }
+
   addEntry(entry) {
     this.entries.push(entry);
   }
+
+  toString() {
+   return `${this.script.name}:${this.line}:${this.column}`;
+  }
+
+  toStringLong() {
+    return this.toString();
+  }
 }
 
 export class Script {
-  constructor(id, name, source) {
+  name;
+  source;
+  // Map<line, Map<column, SourcePosition>>
+  lineToColumn = new Map();
+  _entries = [];
+
+  constructor(id) {
     this.id = id;
+    this.sourcePositions = [];
+  }
+
+  update(name, source) {
     this.name = name;
     this.source = source;
-    this.sourcePositions = [];
-    // Map<line, Map<column, SourcePosition>>
-    this.lineToColumn = new Map();
+  }
+
+  get length() {
+    return this.source.length;
+  }
+
+  get entries() {
+    return this._entries;
   }
 
   addSourcePosition(line, column, entry) {
@@ -58,6 +83,7 @@ export class Script {
       this._addSourcePosition(line, column, sourcePosition);
     }
     sourcePosition.addEntry(entry);
+    this._entries.push(entry);
     return sourcePosition;
   }
 
@@ -72,6 +98,42 @@ export class Script {
     this.sourcePositions.push(sourcePosition);
     columnToSourcePosition.set(column, sourcePosition);
   }
+
+  toString() {
+    return `Script(${this.id}): ${this.name}`;
+  }
+
+  toStringLong() {
+    return this.source;
+  }
+}
+
+
+class SourceInfo {
+   script;
+   start;
+   end;
+   positions;
+   inlined ;
+   fns;
+   disassemble;
+
+  setSourcePositionInfo(script, startPos, endPos, sourcePositionTable, inliningPositions, inlinedFunctions) {
+    this.script = script;
+    this.start = startPos;
+    this.end = endPos;
+    this.positions = sourcePositionTable;
+    this.inlined = inliningPositions;
+    this.fns = inlinedFunctions;
+  }
+
+  setDisassemble(code) {
+    this.disassemble = code;
+  }
+
+  getSourceCode() {
+    return this.script.source?.substring(this.start, this.end);
+  }
 }
 
 /**
@@ -118,8 +180,44 @@ export class Profile {
    */
   static CodeState = {
     COMPILED: 0,
-    OPTIMIZABLE: 1,
-    OPTIMIZED: 2
+    IGNITION: 1,
+    NATIVE_CONTEXT_INDEPENDENT: 2,
+    TURBOPROP: 3,
+    TURBOFAN: 4,
+  }
+
+  /**
+   * Parser for dynamic code optimization state.
+   */
+  static parseState(s) {
+    switch (s) {
+      case '':
+        return this.CodeState.COMPILED;
+      case '~':
+        return this.CodeState.IGNITION;
+      case '-':
+        return this.CodeState.NATIVE_CONTEXT_INDEPENDENT;
+      case '+':
+        return this.CodeState.TURBOPROP;
+      case '*':
+        return this.CodeState.TURBOFAN;
+    }
+    throw new Error(`unknown code state: ${s}`);
+  }
+
+  static getKindFromState(state) {
+    if (state === this.CodeState.COMPILED) {
+      return "Builtin";
+    } else if (state === this.CodeState.IGNITION) {
+      return "Unopt";
+    } else if (state === this.CodeState.NATIVE_CONTEXT_INDEPENDENT) {
+      return "NCI";
+    } else if (state === this.CodeState.TURBOPROP) {
+      return "Turboprop";
+    } else if (state === this.CodeState.TURBOFAN) {
+      return "Opt";
+    }
+    throw new Error(`unknown code state: ${state}`);
   }
 
   /**
@@ -228,7 +326,7 @@ export class Profile {
     }
   }
 
-  deoptCode(  timestamp, code, inliningId, scriptOffset, bailoutType,
+  deoptCode(timestamp, code, inliningId, scriptOffset, bailoutType,
     sourcePositionText, deoptReasonText) {
   }
 
@@ -248,23 +346,59 @@ export class Profile {
   /**
    * Adds source positions for given code.
    */
-  addSourcePositions(start, script, startPos, endPos, sourcePositions,
+  addSourcePositions(start, scriptId, startPos, endPos, sourcePositionTable,
         inliningPositions, inlinedFunctions) {
-    // CLI does not need source code => ignore.
+    const script = this.getOrCreateScript(scriptId);
+    const entry = this.codeMap_.findDynamicEntryByStartAddress(start);
+    if (!entry) return;
+    // Resolve the inlined functions list.
+    if (inlinedFunctions.length > 0) {
+      inlinedFunctions = inlinedFunctions.substring(1).split("S");
+      for (let i = 0; i < inlinedFunctions.length; i++) {
+        const funcAddr = parseInt(inlinedFunctions[i]);
+        const func = this.codeMap_.findDynamicEntryByStartAddress(funcAddr);
+        if (!func || func.funcId === undefined) {
+          // TODO: fix
+          console.warn(`Could not find function ${inlinedFunctions[i]}`);
+          inlinedFunctions[i] = null;
+        } else {
+          inlinedFunctions[i] = func.funcId;
+        }
+      }
+    } else {
+      inlinedFunctions = [];
+    }
+
+    this.getOrCreateSourceInfo(entry).setSourcePositionInfo(
+          script, startPos, endPos, sourcePositionTable, inliningPositions,
+          inlinedFunctions);
+  }
+
+  addDisassemble(start, kind, disassemble) {
+    const entry = this.codeMap_.findDynamicEntryByStartAddress(start);
+    if (!entry) return;
+    this.getOrCreateSourceInfo(entry).setDisassemble(disassemble);
+  }
+
+  getOrCreateSourceInfo(entry) {
+    return entry.source ?? (entry.source = new SourceInfo());
   }
 
-  /**
-   * Adds script source code.
-   */
   addScriptSource(id, url, source) {
-    const script = new Script(id, url, source);
-    this.scripts_[id] = script;
+    const script = this.getOrCreateScript(id);
+    script.update(url, source);
     this.urlToScript_.set(url, script);
   }
 
-  /**
-   * Adds script source code.
-   */
+  getOrCreateScript(id) {
+    let script = this.scripts_[id];
+    if (!script) {
+      script = new Script(id);
+      this.scripts_[id] = script;
+    }
+    return script;
+  }
+
   getScript(url) {
     return this.urlToScript_.get(url);
   }
@@ -547,10 +681,19 @@ class DynamicFuncCodeEntry extends CodeEntry {
   constructor(size, type, func, state) {
     super(size, '', type);
     this.func = func;
+    func.addDynamicCode(this);
     this.state = state;
   }
 
-  static STATE_PREFIX = ["", "~", "*"];
+  get functionName() {
+    return this.func.functionName;
+  }
+
+  getSourceCode() {
+    return this.source?.getSourceCode();
+  }
+
+  static STATE_PREFIX = ["", "~", "-", "+", "*"];
   getState() {
     return DynamicFuncCodeEntry.STATE_PREFIX[this.state];
   }
@@ -583,8 +726,26 @@ class DynamicFuncCodeEntry extends CodeEntry {
  * @constructor
  */
 class FunctionEntry extends CodeEntry {
+  
+  // Contains the list of generated code for this function.
+  _codeEntries = new Set();
+
   constructor(name) {
     super(0, name);
+    const index = name.lastIndexOf(' ');
+    this.functionName = 1 <= index ? name.substring(0, index) : '<anonymous>';
+  }
+
+  addDynamicCode(code) {
+    if (code.func != this) {
+      throw new Error("Adding dynamic code to wrong function");
+    }
+    this._codeEntries.add(code);
+  }
+
+  getSourceCode() {
+    // All code entries should map to the same source positions.
+    return this._codeEntries.values().next().value.getSourceCode();
   }
 
   /**
@@ -593,10 +754,10 @@ class FunctionEntry extends CodeEntry {
   getName() {
     let name = this.name;
     if (name.length == 0) {
-      name = '<anonymous>';
+       return '<anonymous>';
     } else if (name.charAt(0) == ' ') {
       // An anonymous function with location: " aaa.js:10".
-      name = `<anonymous>${name}`;
+      return `<anonymous>${name}`;
     }
     return name;
   }
@@ -947,13 +1108,7 @@ JsonProfile.prototype.addFuncCode = function (
 
     this.functionEntries_[func.funcId].codes.push(entry.codeId);
 
-    if (state === 0) {
-      kind = "Builtin";
-    } else if (state === 1) {
-      kind = "Unopt";
-    } else if (state === 2) {
-      kind = "Opt";
-    }
+    kind = Profile.getKindFromState(state);
 
     this.codeEntries_.push({
       name: entry.name,
diff --git a/deps/v8/tools/profview/index.html b/deps/v8/tools/profview/index.html
index 8695a41e3a0264..64f4e512c3c876 100644
--- a/deps/v8/tools/profview/index.html
+++ b/deps/v8/tools/profview/index.html
@@ -47,6 +47,25 @@ <h3 style="margin-top: 2px;">
   To view the profile, click the <i>Choose file</i> button above and choose
   the file in the dialog box.
 
+  <br>
+  <br>
+  For recording a profile from Chrome use:
+  <pre>
+    --no-sandbox --js-flags=--prof
+  </pre>
+
+  If running on Android use also use --single-process:
+  <pre>
+    --single-process --no-sandbox --js-flags=--prof
+  </pre>
+
+  If the profile is from Android pass the unstripped Chrome library to
+  resolve C++ symbols when processing the file using linux-tick-processor.
+  <pre>
+  &lt;v8-dir>/tools/linux-tick-processor --preprocess --apk-embedded-library=./out/Release/lib.unstripped/libchrome.so v8.log > v8.json
+  </pre>
+
+  More detailed instructions for Android here: https://v8.dev/docs/profile-chromium#android
 </div>
 
 <div id="timeline" style="display : none">
@@ -112,7 +131,7 @@ <h3 style="margin-top: 2px;">
 <br>
 <br>
 <br>
-Copyright the V8 Authors - Last change to this page: 2018/08/13
+Copyright the V8 Authors - Last change to this page: 2020/12/04
 </p>
 
 </body>
diff --git a/deps/v8/tools/profview/profile-utils.js b/deps/v8/tools/profview/profile-utils.js
index 4be55893dd683c..9007855ea9be9d 100644
--- a/deps/v8/tools/profview/profile-utils.js
+++ b/deps/v8/tools/profview/profile-utils.js
@@ -19,7 +19,9 @@ let codeKinds = [
     "BUILTIN",
     "REGEXP",
     "JSOPT",
-    "JSUNOPT"
+    "JSUNOPT",
+    "JSNCI",
+    "JSTURBOPROP"
 ];
 
 function resolveCodeKind(code) {
@@ -55,6 +57,10 @@ function resolveCodeKind(code) {
       return "JSOPT";
     } else if (code.kind === "Unopt") {
       return "JSUNOPT";
+    } else if (code.kind === "NCI") {
+      return "JSNCI";
+    } else if (code.kind === "Turboprop") {
+      return "JSTURBOPROP";
     }
   }
   console.log("Unknown code type '" + type + "'.");
@@ -264,6 +270,8 @@ function buildCategoryTreeAndLookup() {
     root.children.push(n);
   }
   addCategory("JS Optimized", [ "JSOPT" ]);
+  addCategory("JS NCI", [ "JSNCI" ]);
+  addCategory("JS Turboprop", [ "JSTURBOPROP" ]);
   addCategory("JS Unoptimized", [ "JSUNOPT", "BC" ]);
   addCategory("IC", [ "IC" ]);
   addCategory("RegExp", [ "REGEXP" ]);
@@ -526,11 +534,15 @@ function computeOptimizationStats(file,
 
   let functionCount = 0;
   let optimizedFunctionCount = 0;
+  let turbopropOptimizedFunctionCount = 0;
   let deoptimizedFunctionCount = 0;
   let optimizations = newCollection();
+  let turbopropOptimizations = newCollection();
   let eagerDeoptimizations = newCollection();
   let softDeoptimizations = newCollection();
   let lazyDeoptimizations = newCollection();
+  let softBailouts = newCollection();
+  let eagerBailouts = newCollection();
 
   for (let i = 0; i < file.functions.length; i++) {
     let f = file.functions[i];
@@ -541,6 +553,7 @@ function computeOptimizationStats(file,
 
     functionCount++;
     let optimized = false;
+    let turboprop_optimized = false;
     let deoptimized = false;
 
     for (let j = 0; j < f.codes.length; j++) {
@@ -552,19 +565,33 @@ function computeOptimizationStats(file,
           addToCollection(optimizations, code);
         }
       }
+      if (code.kind === "Turboprop") {
+        turboprop_optimized = true;
+        if (code.tm >= timeStart && code.tm <= timeEnd) {
+          addToCollection(turbopropOptimizations, code);
+        }
+      }
       if (code.deopt) {
-        deoptimized = true;
+        if (code.deopt.bailoutType === "deopt-lazy" || code.deopt.bailoutType === "deopt-eager" || code.deopt.bailoutType === "deopt-lazy") {
+          deoptimized = true;
+        }
         if (code.deopt.tm >= timeStart && code.deopt.tm <= timeEnd) {
           switch (code.deopt.bailoutType) {
-            case "lazy":
+            case "deopt-lazy":
               addToCollection(lazyDeoptimizations, code);
               break;
-            case "eager":
+            case "deopt-eager":
               addToCollection(eagerDeoptimizations, code);
               break;
-            case "soft":
+            case "deopt-soft":
               addToCollection(softDeoptimizations, code);
               break;
+            case "bailout-soft":
+              addToCollection(softBailouts, code);
+              break;
+            case "bailout":
+              addToCollection(eagerBailouts, code);
+              break;
           }
         }
       }
@@ -572,6 +599,9 @@ function computeOptimizationStats(file,
     if (optimized) {
       optimizedFunctionCount++;
     }
+    if (turboprop_optimized) {
+      turbopropOptimizedFunctionCount++;
+    }
     if (deoptimized) {
       deoptimizedFunctionCount++;
     }
@@ -586,15 +616,20 @@ function computeOptimizationStats(file,
   sortCollection(lazyDeoptimizations);
   sortCollection(softDeoptimizations);
   sortCollection(optimizations);
+  sortCollection(turbopropOptimizations);
 
   return {
     functionCount,
     optimizedFunctionCount,
+    turbopropOptimizedFunctionCount,
     deoptimizedFunctionCount,
     optimizations,
+    turbopropOptimizations,
     eagerDeoptimizations,
     lazyDeoptimizations,
     softDeoptimizations,
+    softBailouts,
+    eagerBailouts,
   };
 }
 
diff --git a/deps/v8/tools/profview/profview.js b/deps/v8/tools/profview/profview.js
index 210cec76180094..248146f99f8a01 100644
--- a/deps/v8/tools/profview/profview.js
+++ b/deps/v8/tools/profview/profview.js
@@ -216,6 +216,14 @@ const bucketDescriptors =
         color : "#64dd17",
         backgroundColor : "#80e27e",
         text : "JS Optimized" },
+      { kinds : [ "JSNCI" ],
+        color : "#3289a8",
+        backgroundColor : "#3289a8",
+        text : "JS NCI" },
+      { kinds : [ "JSTURBOPROP" ],
+        color : "#693eb8",
+        backgroundColor : "#a6c452",
+        text : "JS Turboprop" },
       { kinds : [ "JSUNOPT", "BC" ],
         color : "#dd2c00",
         backgroundColor : "#ff9e80",
@@ -308,6 +316,10 @@ function codeTypeToText(type) {
       return "RegExp";
     case "JSOPT":
       return "JS opt";
+    case "JSNCI":
+      return "JS NCI";
+    case "JSTURBOPROP":
+      return "JS Turboprop";
     case "JSUNOPT":
       return "JS unopt";
   }
@@ -1275,15 +1287,27 @@ class SummaryView {
 
     addRow("Total function count:", stats.functionCount);
     addRow("Optimized function count:", stats.optimizedFunctionCount, 1);
+    if (stats.turbopropOptimizedFunctionCount != 0) {
+      addRow("Turboprop optimized function count:", stats.turbopropOptimizedFunctionCount, 1);
+    }
     addRow("Deoptimized function count:", stats.deoptimizedFunctionCount, 2);
 
     addExpandableRow("Optimization count:", stats.optimizations, 0, "opt");
+    if (stats.turbopropOptimizedFunctionCount != 0) {
+      addExpandableRow("Turboprop Optimization count:", stats.turbopropOptimizations, 0, "tp");
+    }
     let deoptCount = stats.eagerDeoptimizations.count +
         stats.softDeoptimizations.count + stats.lazyDeoptimizations.count;
     addRow("Deoptimization count:", deoptCount);
     addExpandableRow("Eager:", stats.eagerDeoptimizations, 1, "eager");
     addExpandableRow("Lazy:", stats.lazyDeoptimizations, 1, "lazy");
     addExpandableRow("Soft:", stats.softDeoptimizations, 1, "soft");
+    if (stats.softBailouts.count != 0) {
+      addExpandableRow("SoftBailout:", stats.softBailouts, 1, "softbailout");
+    }
+    if (stats.eagerBailouts.count != 0) {
+      addExpandableRow("EagerBailout:", stats.eagerBailouts, 1, "eagerbailout");
+    }
 
     table.appendChild(rows);
     this.element.appendChild(table);
@@ -1369,6 +1393,7 @@ class SourceData {
     for (let i = 0; i < file.scripts.length; i++) {
       const scriptBlock = file.scripts[i];
       if (scriptBlock === null) continue; // Array may be sparse.
+      if (scriptBlock.source === undefined) continue;
       let source = scriptBlock.source.split("\n");
       this.scripts.set(i, source);
     }
diff --git a/deps/v8/tools/splaytree.mjs b/deps/v8/tools/splaytree.mjs
index eaba4e4b57debe..d942d1f463bcd9 100644
--- a/deps/v8/tools/splaytree.mjs
+++ b/deps/v8/tools/splaytree.mjs
@@ -34,274 +34,250 @@
  *
  * @constructor
  */
-export function SplayTree() {
-};
-
-
-/**
- * Pointer to the root node of the tree.
- *
- * @type {SplayTree.Node}
- * @private
- */
-SplayTree.prototype.root_ = null;
-
-
-/**
- * @return {boolean} Whether the tree is empty.
- */
-SplayTree.prototype.isEmpty = function() {
-  return !this.root_;
-};
-
-
-
-/**
- * Inserts a node into the tree with the specified key and value if
- * the tree does not already contain a node with the specified key. If
- * the value is inserted, it becomes the root of the tree.
- *
- * @param {number} key Key to insert into the tree.
- * @param {*} value Value to insert into the tree.
- */
-SplayTree.prototype.insert = function(key, value) {
-  if (this.isEmpty()) {
-    this.root_ = new SplayTree.Node(key, value);
-    return;
+export class SplayTree {
+
+  /**
+   * Pointer to the root node of the tree.
+   *
+   * @type {SplayTreeNode}
+   * @private
+   */
+  root_ = null;
+
+
+  /**
+   * @return {boolean} Whether the tree is empty.
+   */
+  isEmpty() {
+    return !this.root_;
   }
-  // Splay on the key to move the last node on the search path for
-  // the key to the root of the tree.
-  this.splay_(key);
-  if (this.root_.key == key) {
-    return;
-  }
-  const node = new SplayTree.Node(key, value);
-  if (key > this.root_.key) {
-    node.left = this.root_;
-    node.right = this.root_.right;
-    this.root_.right = null;
-  } else {
-    node.right = this.root_;
-    node.left = this.root_.left;
-    this.root_.left = null;
-  }
-  this.root_ = node;
-};
 
+  /**
+   * Inserts a node into the tree with the specified key and value if
+   * the tree does not already contain a node with the specified key. If
+   * the value is inserted, it becomes the root of the tree.
+   *
+   * @param {number} key Key to insert into the tree.
+   * @param {*} value Value to insert into the tree.
+   */
+  insert(key, value) {
+    if (this.isEmpty()) {
+      this.root_ = new SplayTreeNode(key, value);
+      return;
+    }
+    // Splay on the key to move the last node on the search path for
+    // the key to the root of the tree.
+    this.splay_(key);
+    if (this.root_.key == key) return;
 
-/**
- * Removes a node with the specified key from the tree if the tree
- * contains a node with this key. The removed node is returned. If the
- * key is not found, an exception is thrown.
- *
- * @param {number} key Key to find and remove from the tree.
- * @return {SplayTree.Node} The removed node.
- */
-SplayTree.prototype.remove = function(key) {
-  if (this.isEmpty()) {
-    throw Error(`Key not found: ${key}`);
-  }
-  this.splay_(key);
-  if (this.root_.key != key) {
-    throw Error(`Key not found: ${key}`);
+    const node = new SplayTreeNode(key, value);
+    if (key > this.root_.key) {
+      node.left = this.root_;
+      node.right = this.root_.right;
+      this.root_.right = null;
+    } else {
+      node.right = this.root_;
+      node.left = this.root_.left;
+      this.root_.left = null;
+    }
+    this.root_ = node;
   }
-  const removed = this.root_;
-  if (!this.root_.left) {
-    this.root_ = this.root_.right;
-  } else {
-    const { right } = this.root_;
-    this.root_ = this.root_.left;
-    // Splay to make sure that the new root has an empty right child.
+
+  /**
+   * Removes a node with the specified key from the tree if the tree
+   * contains a node with this key. The removed node is returned. If the
+   * key is not found, an exception is thrown.
+   *
+   * @param {number} key Key to find and remove from the tree.
+   * @return {SplayTreeNode} The removed node.
+   */
+  remove(key) {
+    if (this.isEmpty()) {
+      throw Error(`Key not found: ${key}`);
+    }
     this.splay_(key);
-    // Insert the original right child as the right child of the new
-    // root.
-    this.root_.right = right;
+    if (this.root_.key != key) {
+      throw Error(`Key not found: ${key}`);
+    }
+    const removed = this.root_;
+    if (!this.root_.left) {
+      this.root_ = this.root_.right;
+    } else {
+      const { right } = this.root_;
+      this.root_ = this.root_.left;
+      // Splay to make sure that the new root has an empty right child.
+      this.splay_(key);
+      // Insert the original right child as the right child of the new
+      // root.
+      this.root_.right = right;
+    }
+    return removed;
   }
-  return removed;
-};
 
-
-/**
- * Returns the node having the specified key or null if the tree doesn't contain
- * a node with the specified key.
- *
- * @param {number} key Key to find in the tree.
- * @return {SplayTree.Node} Node having the specified key.
- */
-SplayTree.prototype.find = function(key) {
-  if (this.isEmpty()) {
-    return null;
+  /**
+   * Returns the node having the specified key or null if the tree doesn't contain
+   * a node with the specified key.
+   *
+   * @param {number} key Key to find in the tree.
+   * @return {SplayTreeNode} Node having the specified key.
+   */
+  find(key) {
+    if (this.isEmpty()) return null;
+    this.splay_(key);
+    return this.root_.key == key ? this.root_ : null;
   }
-  this.splay_(key);
-  return this.root_.key == key ? this.root_ : null;
-};
-
 
-/**
- * @return {SplayTree.Node} Node having the minimum key value.
- */
-SplayTree.prototype.findMin = function() {
-  if (this.isEmpty()) {
-    return null;
-  }
-  let current = this.root_;
-  while (current.left) {
-    current = current.left;
+  /**
+   * @return {SplayTreeNode} Node having the minimum key value.
+   */
+  findMin() {
+    if (this.isEmpty()) return null;
+    let current = this.root_;
+    while (current.left) {
+      current = current.left;
+    }
+    return current;
   }
-  return current;
-};
-
 
-/**
- * @return {SplayTree.Node} Node having the maximum key value.
- */
-SplayTree.prototype.findMax = function(opt_startNode) {
-  if (this.isEmpty()) {
-    return null;
-  }
-  let current = opt_startNode || this.root_;
-  while (current.right) {
-    current = current.right;
+  /**
+   * @return {SplayTreeNode} Node having the maximum key value.
+   */
+  findMax(opt_startNode) {
+    if (this.isEmpty()) return null;
+    let current = opt_startNode || this.root_;
+    while (current.right) {
+      current = current.right;
+    }
+    return current;
   }
-  return current;
-};
 
-
-/**
- * @return {SplayTree.Node} Node having the maximum key value that
- *     is less or equal to the specified key value.
- */
-SplayTree.prototype.findGreatestLessThan = function(key) {
-  if (this.isEmpty()) {
-    return null;
-  }
-  // Splay on the key to move the node with the given key or the last
-  // node on the search path to the top of the tree.
-  this.splay_(key);
-  // Now the result is either the root node or the greatest node in
-  // the left subtree.
-  if (this.root_.key <= key) {
-    return this.root_;
-  } else if (this.root_.left) {
-    return this.findMax(this.root_.left);
-  } else {
-    return null;
+  /**
+   * @return {SplayTreeNode} Node having the maximum key value that
+   *     is less or equal to the specified key value.
+   */
+  findGreatestLessThan(key) {
+    if (this.isEmpty()) return null;
+    // Splay on the key to move the node with the given key or the last
+    // node on the search path to the top of the tree.
+    this.splay_(key);
+    // Now the result is either the root node or the greatest node in
+    // the left subtree.
+    if (this.root_.key <= key) {
+      return this.root_;
+    } else if (this.root_.left) {
+      return this.findMax(this.root_.left);
+    } else {
+      return null;
+    }
   }
-};
-
-
-/**
- * @return {Array<*>} An array containing all the values of tree's nodes paired
- *     with keys.
- */
-SplayTree.prototype.exportKeysAndValues = function() {
-  const result = [];
-  this.traverse_(function(node) { result.push([node.key, node.value]); });
-  return result;
-};
-
-
-/**
- * @return {Array<*>} An array containing all the values of tree's nodes.
- */
-SplayTree.prototype.exportValues = function() {
-  const result = [];
-  this.traverse_(function(node) { result.push(node.value); });
-  return result;
-};
 
+  /**
+   * @return {Array<*>} An array containing all the values of tree's nodes paired
+   *     with keys.
+   */
+  exportKeysAndValues() {
+    const result = [];
+    this.traverse_(function(node) { result.push([node.key, node.value]); });
+    return result;
+  }
 
-/**
- * Perform the splay operation for the given key. Moves the node with
- * the given key to the top of the tree.  If no node has the given
- * key, the last node on the search path is moved to the top of the
- * tree. This is the simplified top-down splaying algorithm from:
- * "Self-adjusting Binary Search Trees" by Sleator and Tarjan
- *
- * @param {number} key Key to splay the tree on.
- * @private
- */
-SplayTree.prototype.splay_ = function(key) {
-  if (this.isEmpty()) {
-    return;
+  /**
+   * @return {Array<*>} An array containing all the values of tree's nodes.
+   */
+  exportValues() {
+    const result = [];
+    this.traverse_(function(node) { result.push(node.value); });
+    return result;
   }
-  // Create a dummy node.  The use of the dummy node is a bit
-  // counter-intuitive: The right child of the dummy node will hold
-  // the L tree of the algorithm.  The left child of the dummy node
-  // will hold the R tree of the algorithm.  Using a dummy node, left
-  // and right will always be nodes and we avoid special cases.
-  let dummy, left, right;
-  dummy = left = right = new SplayTree.Node(null, null);
-  let current = this.root_;
-  while (true) {
-    if (key < current.key) {
-      if (!current.left) {
-        break;
-      }
-      if (key < current.left.key) {
-        // Rotate right.
-        const tmp = current.left;
-        current.left = tmp.right;
-        tmp.right = current;
-        current = tmp;
+
+  /**
+   * Perform the splay operation for the given key. Moves the node with
+   * the given key to the top of the tree.  If no node has the given
+   * key, the last node on the search path is moved to the top of the
+   * tree. This is the simplified top-down splaying algorithm from:
+   * "Self-adjusting Binary Search Trees" by Sleator and Tarjan
+   *
+   * @param {number} key Key to splay the tree on.
+   * @private
+   */
+  splay_(key) {
+    if (this.isEmpty()) return;
+    // Create a dummy node.  The use of the dummy node is a bit
+    // counter-intuitive: The right child of the dummy node will hold
+    // the L tree of the algorithm.  The left child of the dummy node
+    // will hold the R tree of the algorithm.  Using a dummy node, left
+    // and right will always be nodes and we avoid special cases.
+    let dummy, left, right;
+    dummy = left = right = new SplayTreeNode(null, null);
+    let current = this.root_;
+    while (true) {
+      if (key < current.key) {
         if (!current.left) {
           break;
         }
-      }
-      // Link right.
-      right.left = current;
-      right = current;
-      current = current.left;
-    } else if (key > current.key) {
-      if (!current.right) {
-        break;
-      }
-      if (key > current.right.key) {
-        // Rotate left.
-        const tmp = current.right;
-        current.right = tmp.left;
-        tmp.left = current;
-        current = tmp;
+        if (key < current.left.key) {
+          // Rotate right.
+          const tmp = current.left;
+          current.left = tmp.right;
+          tmp.right = current;
+          current = tmp;
+          if (!current.left) {
+            break;
+          }
+        }
+        // Link right.
+        right.left = current;
+        right = current;
+        current = current.left;
+      } else if (key > current.key) {
         if (!current.right) {
           break;
         }
+        if (key > current.right.key) {
+          // Rotate left.
+          const tmp = current.right;
+          current.right = tmp.left;
+          tmp.left = current;
+          current = tmp;
+          if (!current.right) {
+            break;
+          }
+        }
+        // Link left.
+        left.right = current;
+        left = current;
+        current = current.right;
+      } else {
+        break;
       }
-      // Link left.
-      left.right = current;
-      left = current;
-      current = current.right;
-    } else {
-      break;
     }
+    // Assemble.
+    left.right = current.left;
+    right.left = current.right;
+    current.left = dummy.right;
+    current.right = dummy.left;
+    this.root_ = current;
   }
-  // Assemble.
-  left.right = current.left;
-  right.left = current.right;
-  current.left = dummy.right;
-  current.right = dummy.left;
-  this.root_ = current;
-};
-
 
-/**
- * Performs a preorder traversal of the tree.
- *
- * @param {function(SplayTree.Node)} f Visitor function.
- * @private
- */
-SplayTree.prototype.traverse_ = function(f) {
-  const nodesToVisit = [this.root_];
-  while (nodesToVisit.length > 0) {
-    const node = nodesToVisit.shift();
-    if (node == null) {
-      continue;
+  /**
+   * Performs a preorder traversal of the tree.
+   *
+   * @param {function(SplayTreeNode)} f Visitor function.
+   * @private
+   */
+  traverse_(f) {
+    const nodesToVisit = [this.root_];
+    while (nodesToVisit.length > 0) {
+      const node = nodesToVisit.shift();
+      if (node == null) {
+        continue;
+      }
+      f(node);
+      nodesToVisit.push(node.left);
+      nodesToVisit.push(node.right);
     }
-    f(node);
-    nodesToVisit.push(node.left);
-    nodesToVisit.push(node.right);
   }
-};
-
+}
 
 /**
  * Constructs a Splay tree node.
@@ -309,19 +285,17 @@ SplayTree.prototype.traverse_ = function(f) {
  * @param {number} key Key.
  * @param {*} value Value.
  */
-SplayTree.Node = function(key, value) {
-  this.key = key;
-  this.value = value;
-};
-
-
-/**
- * @type {SplayTree.Node}
- */
-SplayTree.Node.prototype.left = null;
-
-
-/**
- * @type {SplayTree.Node}
- */
-SplayTree.Node.prototype.right = null;
+class SplayTreeNode {
+  constructor(key, value) {
+    this.key = key;
+    this.value = value;
+    /**
+     * @type {SplayTreeNode}
+     */
+    this.left = null;
+    /**
+     * @type {SplayTreeNode}
+     */
+    this.right = null;
+  }
+};
\ No newline at end of file
diff --git a/deps/v8/tools/system-analyzer/app-model.mjs b/deps/v8/tools/system-analyzer/app-model.mjs
index a0b176c1708f45..5d558e248b511a 100644
--- a/deps/v8/tools/system-analyzer/app-model.mjs
+++ b/deps/v8/tools/system-analyzer/app-model.mjs
@@ -9,17 +9,22 @@ class State {
   _selectedMapLogEntries;
   _selectedIcLogEntries;
   _selectedDeoptLogEntries;
+  _selecteCodeLogEntries;
   _selectedSourcePositions;
   _nofChunks;
   _chunks;
   _icTimeline;
   _mapTimeline;
   _deoptTimeline;
+  _codeTimeline;
+  _apiTimeline;
   _minStartTime = Number.POSITIVE_INFINITY;
   _maxEndTime = Number.NEGATIVE_INFINITY;
+
   get minStartTime() {
     return this._minStartTime;
   }
+
   get maxEndTime() {
     return this._maxEndTime;
   }
@@ -27,46 +32,68 @@ class State {
   selectTimeRange(start, end) {
     this.timeSelection.start = start;
     this.timeSelection.end = end;
-    this._icTimeline.selectTimeRange(start, end);
-    this._mapTimeline.selectTimeRange(start, end);
-    this._deoptTimeline.selectTimeRange(start, end);
+    if (start == 0 && end == Infinity) {
+      this.timelines.forEach(each => each.clearSelection());
+    } else {
+      this.timelines.forEach(each => each.selectTimeRange(start, end));
+    }
   }
 
-  _updateTimeRange(timeline) {
-    this._minStartTime = Math.min(this._minStartTime, timeline.startTime);
-    this._maxEndTime = Math.max(this._maxEndTime, timeline.endTime);
-    timeline.startTime = this._minStartTime;
-    timeline.endTime = this._maxEndTime;
+  setTimelines(
+      mapTimeline, icTimeline, deoptTimeline, codeTimeline, apiTimeline) {
+    this._mapTimeline = mapTimeline;
+    this._icTimeline = icTimeline;
+    this._deoptTimeline = deoptTimeline;
+    this._codeTimeline = codeTimeline;
+    this._apiTimeline = apiTimeline;
+    for (let timeline of arguments) {
+      if (timeline === undefined) return;
+      this._minStartTime = Math.min(this._minStartTime, timeline.startTime);
+      this._maxEndTime = Math.max(this._maxEndTime, timeline.endTime);
+    }
+    for (let timeline of arguments) {
+      timeline.startTime = this._minStartTime;
+      timeline.endTime = this._maxEndTime;
+    }
   }
+
   get mapTimeline() {
     return this._mapTimeline;
   }
-  set mapTimeline(timeline) {
-    this._updateTimeRange(timeline);
-    this._mapTimeline = timeline;
-  }
+
   get icTimeline() {
     return this._icTimeline;
   }
-  set icTimeline(timeline) {
-    this._updateTimeRange(timeline);
-    this._icTimeline = timeline;
-  }
+
   get deoptTimeline() {
     return this._deoptTimeline;
   }
-  set deoptTimeline(timeline) {
-    this._updateTimeRange(timeline);
-    this._deoptTimeline = timeline;
+
+  get codeTimeline() {
+    return this._codeTimeline;
   }
+
+  get apiTimeline() {
+    return this._apiTimeline;
+  }
+
+  get timelines() {
+    return [
+      this._mapTimeline, this._icTimeline, this._deoptTimeline,
+      this._codeTimeline, this._apiTimeline
+    ];
+  }
+
   set chunks(value) {
     // TODO(zcankara) split up between maps and ics, and every timeline track
     this._chunks = value;
   }
+
   get chunks() {
     // TODO(zcankara) split up between maps and ics, and every timeline track
     return this._chunks;
   }
+
   get nofChunks() {
     return this._nofChunks;
   }
diff --git a/deps/v8/tools/system-analyzer/events.mjs b/deps/v8/tools/system-analyzer/events.mjs
deleted file mode 100644
index 69529233b46db7..00000000000000
--- a/deps/v8/tools/system-analyzer/events.mjs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-class SelectionEvent extends CustomEvent {
-  // TODO: turn into static class fields once Safari supports it.
-  static get name() {
-    return 'showentries';
-  }
-  constructor(entries) {
-    super(SelectionEvent.name, {bubbles: true, composed: true});
-    if (!Array.isArray(entries) || entries.length == 0) {
-      throw new Error('No valid entries selected!');
-    }
-    this.entries = entries;
-  }
-}
-
-class FocusEvent extends CustomEvent {
-  static get name() {
-    return 'showentrydetail';
-  }
-  constructor(entry) {
-    super(FocusEvent.name, {bubbles: true, composed: true});
-    this.entry = entry;
-  }
-}
-
-class SelectTimeEvent extends CustomEvent {
-  static get name() {
-    return 'timerangeselect';
-  }
-  constructor(start, end) {
-    super(SelectTimeEvent.name, {bubbles: true, composed: true});
-    this.start = start;
-    this.end = end;
-  }
-}
-
-class SynchronizeSelectionEvent extends CustomEvent {
-  static get name() {
-    return 'syncselection';
-  }
-  constructor(start, end) {
-    super(SynchronizeSelectionEvent.name, {bubbles: true, composed: true});
-    this.start = start;
-    this.end = end;
-  }
-}
-
-export {SelectionEvent, FocusEvent, SelectTimeEvent, SynchronizeSelectionEvent};
diff --git a/deps/v8/tools/system-analyzer/helper.mjs b/deps/v8/tools/system-analyzer/helper.mjs
index 854a51fcf383a1..1eccfbdc93e6e5 100644
--- a/deps/v8/tools/system-analyzer/helper.mjs
+++ b/deps/v8/tools/system-analyzer/helper.mjs
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-const KB = 1024;
-const MB = KB * KB;
-const GB = MB * KB;
-const kMillis2Seconds = 1 / 1000;
+export const KB = 1024;
+export const MB = KB * KB;
+export const GB = MB * KB;
+export const kMicro2Milli = 1 / 1000;
 
-function formatBytes(bytes) {
+export function formatBytes(bytes) {
   const units = ['B', 'KiB', 'MiB', 'GiB'];
   const divisor = 1024;
   let index = 0;
@@ -18,230 +18,57 @@ function formatBytes(bytes) {
   return bytes.toFixed(2) + units[index];
 }
 
-function formatSeconds(millis) {
-  return (millis * kMillis2Seconds).toFixed(2) + 's';
+export function formatMicroSeconds(millis) {
+  return (millis * kMicro2Milli).toFixed(1) + 'ms';
 }
 
-class CSSColor {
-  static getColor(name) {
-    const style = getComputedStyle(document.body);
-    return style.getPropertyValue(`--${name}`);
-  }
-  static get backgroundColor() {
-    return CSSColor.getColor('backgroud-color');
-  }
-  static get surfaceColor() {
-    return CSSColor.getColor('surface-color');
-  }
-  static get primaryColor() {
-    return CSSColor.getColor('primary-color');
-  }
-  static get secondaryColor() {
-    return CSSColor.getColor('secondary-color');
-  }
-  static get onSurfaceColor() {
-    return CSSColor.getColor('on-surface-color');
-  }
-  static get onBackgroundColor() {
-    return CSSColor.getColor('on-background-color');
-  }
-  static get onPrimaryColor() {
-    return CSSColor.getColor('on-primary-color');
-  }
-  static get onSecondaryColor() {
-    return CSSColor.getColor('on-secondary-color');
-  }
-  static get defaultColor() {
-    return CSSColor.getColor('default-color');
-  }
-  static get errorColor() {
-    return CSSColor.getColor('error-color');
-  }
-  static get mapBackgroundColor() {
-    return CSSColor.getColor('map-background-color');
-  }
-  static get timelineBackgroundColor() {
-    return CSSColor.getColor('timeline-background-color');
-  }
-  static get red() {
-    return CSSColor.getColor('red');
-  }
-  static get green() {
-    return CSSColor.getColor('green');
-  }
-  static get yellow() {
-    return CSSColor.getColor('yellow');
-  }
-  static get blue() {
-    return CSSColor.getColor('blue');
-  }
-  static get orange() {
-    return CSSColor.getColor('orange');
-  }
-  static get violet() {
-    return CSSColor.getColor('violet');
-  }
-}
-
-function typeToColor(type) {
-  switch (type) {
-    case 'new':
-      return CSSColor.green;
-    case 'Normalize':
-      return CSSColor.violet;
-    case 'SlowToFast':
-      return CSSColor.orange;
-    case 'InitialMap':
-      return CSSColor.yellow;
-    case 'Transition':
-      return CSSColor.primaryColor;
-    case 'ReplaceDescriptors':
-      return CSSColor.red;
-    case 'LoadGlobalIC':
-      return CSSColor.green;
-    case 'LoadIC':
-      return CSSColor.primaryColor;
-    case 'StoreInArrayLiteralIC':
-      return CSSColor.violet;
-    case 'StoreGlobalIC':
-      return CSSColor.blue;
-    case 'StoreIC':
-      return CSSColor.orange;
-    case 'KeyedLoadIC':
-      return CSSColor.red;
-    case 'KeyedStoreIC':
-      return CSSColor.yellow;
-  }
-  return CSSColor.secondaryColor;
-}
-
-class DOM {
-  static div(classes) {
-    const node = document.createElement('div');
-    if (classes !== void 0) {
-      if (typeof classes === 'string') {
-        node.classList.add(classes);
-      } else {
-        classes.forEach(cls => node.classList.add(cls));
-      }
-    }
-    return node;
-  }
-
-  static table(className) {
-    const node = document.createElement('table');
-    if (className) node.classList.add(className);
-    return node;
-  }
-
-  static td(textOrNode, className) {
-    const node = document.createElement('td');
-    if (typeof textOrNode === 'object') {
-      node.appendChild(textOrNode);
-    } else if (textOrNode) {
-      node.innerText = textOrNode;
-    }
-    if (className) node.classList.add(className);
-    return node;
-  }
-
-  static tr(className) {
-    const node = document.createElement('tr');
-    if (className) node.classList.add(className);
-    return node;
-  }
-
-  static text(string) {
-    return document.createTextNode(string);
-  }
-
-  static removeAllChildren(node) {
-    let range = document.createRange();
-    range.selectNodeContents(node);
-    range.deleteContents();
-  }
-
-  static defineCustomElement(path, generator) {
-    let name = path.substring(path.lastIndexOf('/') + 1, path.length);
-    path = path + '-template.html';
-    fetch(path)
-        .then(stream => stream.text())
-        .then(
-            templateText =>
-                customElements.define(name, generator(templateText)));
-  }
-}
-
-function $(id) {
-  return document.querySelector(id)
+export function delay(time) {
+  return new Promise(resolver => setTimeout(resolver, time));
 }
 
-class V8CustomElement extends HTMLElement {
-  _updateTimeoutId;
-  _updateCallback = this._update.bind(this);
-
-  constructor(templateText) {
-    super();
-    const shadowRoot = this.attachShadow({mode: 'open'});
-    shadowRoot.innerHTML = templateText;
-  }
-
-  $(id) {
-    return this.shadowRoot.querySelector(id);
+export class Group {
+  constructor(key, id, parentTotal, entries) {
+    this.key = key;
+    this.id = id;
+    this.count = 1;
+    this.entries = entries;
+    this.parentTotal = parentTotal;
   }
 
-  querySelectorAll(query) {
-    return this.shadowRoot.querySelectorAll(query);
+  get percent() {
+    return this.count / this.parentTotal * 100;
   }
 
-  update() {
-    // Use timeout tasks to asynchronously update the UI without blocking.
-    clearTimeout(this._updateTimeoutId);
-    const kDelayMs = 5;
-    this._updateTimeoutId = setTimeout(this._updateCallback, kDelayMs);
+  add() {
+    this.count++;
   }
 
-  _update() {
-    throw Error('Subclass responsibility');
+  addEntry(entry) {
+    this.count++;
+    this.entries.push(entry);
   }
 }
 
-class LazyTable {
-  constructor(table, rowData, rowElementCreator) {
-    this._table = table;
-    this._rowData = rowData;
-    this._rowElementCreator = rowElementCreator;
-    const tbody = table.querySelector('tbody');
-    table.replaceChild(document.createElement('tbody'), tbody);
-    table.querySelector('tfoot td').onclick = (e) => this._addMoreRows();
-    this._addMoreRows();
-  }
-
-  _nextRowDataSlice() {
-    return this._rowData.splice(0, 100);
-  }
-
-  _addMoreRows() {
-    const fragment = new DocumentFragment();
-    for (let row of this._nextRowDataSlice()) {
-      const tr = this._rowElementCreator(row);
-      fragment.appendChild(tr);
+export function groupBy(array, keyFunction, collect = false) {
+  if (array.length === 0) return [];
+  if (keyFunction === undefined) keyFunction = each => each;
+  const keyToGroup = new Map();
+  const groups = [];
+  let id = 0;
+  // This is performance critical, resorting to for-loop
+  for (let each of array) {
+    const key = keyFunction(each);
+    let group = keyToGroup.get(key);
+    if (group !== undefined) {
+      collect ? group.addEntry(each) : group.add();
+      continue;
     }
-    this._table.querySelector('tbody').appendChild(fragment);
-  }
-}
-
-function delay(time) {
-  return new Promise(resolver => setTimeout(resolver, time));
-}
-
-export {
-  DOM,
-  $,
-  V8CustomElement,
-  formatBytes,
-  typeToColor,
-  CSSColor,
-  delay,
-  LazyTable,
-};
+    let entries = undefined;
+    if (collect) entries = [each];
+    group = new Group(key, id++, array.length, entries);
+    groups.push(group);
+    keyToGroup.set(key, group);
+  }
+  // Sort by count
+  return groups.sort((a, b) => b.count - a.count);
+}
\ No newline at end of file
diff --git a/deps/v8/tools/system-analyzer/ic-model.mjs b/deps/v8/tools/system-analyzer/ic-model.mjs
deleted file mode 100644
index 2bb40b6853a816..00000000000000
--- a/deps/v8/tools/system-analyzer/ic-model.mjs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import {IcLogEntry} from './log/ic.mjs';
-
-// For compatibility with console scripts:
-print = console.log;
-
-export class Group {
-  constructor(property, key, entry) {
-    this.property = property;
-    this.key = key;
-    this.count = 1;
-    this.entries = [entry];
-    this.percentage = undefined;
-    this.groups = undefined;
-  }
-
-  add(entry) {
-    this.count++;
-    this.entries.push(entry)
-  }
-
-  createSubGroups() {
-    // TODO: use Map
-    this.groups = {};
-    for (const propertyName of IcLogEntry.propertyNames) {
-      if (this.property == propertyName) continue;
-      this.groups[propertyName] = Group.groupBy(this.entries, propertyName);
-    }
-  }
-
-  static groupBy(entries, property) {
-    let accumulator = Object.create(null);
-    let length = entries.length;
-    for (let i = 0; i < length; i++) {
-      let entry = entries[i];
-      let key = entry[property];
-      if (accumulator[key] == undefined) {
-        accumulator[key] = new Group(property, key, entry);
-      } else {
-        let group = accumulator[key];
-        if (group.entries == undefined) console.log([group, entry]);
-        group.add(entry)
-      }
-    }
-    let result = [];
-    for (let key in accumulator) {
-      let group = accumulator[key];
-      group.percentage = Math.round(group.count / length * 100 * 100) / 100;
-      result.push(group);
-    }
-    result.sort((a, b) => {return b.count - a.count});
-    return result;
-  }
-}
diff --git a/deps/v8/tools/system-analyzer/ic-panel-template.html b/deps/v8/tools/system-analyzer/ic-panel-template.html
deleted file mode 100644
index ee08901fb02c56..00000000000000
--- a/deps/v8/tools/system-analyzer/ic-panel-template.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- Copyright 2020 the V8 project authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file. -->
-
-<head>
-  <link href="./index.css" rel="stylesheet">
-</head>
-<style>
-  .count {
-    text-align: right;
-    width: 5em;
-  }
-
-  .percentage {
-    text-align: right;
-    width: 5em;
-  }
-
-  .key {
-    padding-left: 1em;
-  }
-
-  .drilldown-group-title {
-    font-weight: bold;
-    padding: 0.5em 0 0.2em 0;
-  }
-
-  .toggle {
-    width: 1em;
-    text-align: center;
-    cursor: -webkit-zoom-in;
-    color: rgba(var(--border-color), 1);
-  }
-  .toggle::before {
-    content: "▶";
-  }
-  .open .toggle::before {
-    content: "▼";
-  }
-
-  .panel {
-    position: relative;
-    min-height: 200px;
-  }
-
-  #legend {
-    position: absolute;
-    right: 10px;
-    top: 10px;
-    background-color: var(--surface-color);
-    border-radius: 5px;
-    border: 3px solid rgba(var(--border-color), 0.2);
-    padding: 0 10px 0 10px;
-  }
-
-  #legend dt  {
-    font-family: monospace;
-  }
-  #legend h3 {
-    margin-top: 10px;
-  }
-  .scroller {
-    max-height: 800px;
-    overflow-y: scroll;
-  }
-</style>
-<div class="panel">
-  <h2>IC Panel <span id="count"></span></h2>
-  <div id="legend">
-    <h3>Legend</h3>
-    <dl>
-      <dt>0</dt>
-      <dd>uninitialized</dd>
-      <dt>X</dt>
-      <dd>no feedback</dd>
-      <dt>1</dt>
-      <dd>monomorphic</dd>
-      <dt>^</dt>
-      <dd>recompute handler</dd>
-      <dt>P</dt>
-      <dd>polymorphic</dd>
-      <dt>N</dt>
-      <dd>megamorphic</dd>
-      <dt>G</dt>
-      <dd>generic</dd>
-    </dl>
-  </div>
-  <p>
-    Group by IC-property: 
-    <select id="group-key"></select>
-  </p>
-  <div class="panelBody">
-    <table id="table" width="100%">
-      <tbody id="table-body">
-      </tbody>
-    </table>
-  </div>
-</div>
diff --git a/deps/v8/tools/system-analyzer/ic-panel.mjs b/deps/v8/tools/system-analyzer/ic-panel.mjs
deleted file mode 100644
index d81d06d0d6df54..00000000000000
--- a/deps/v8/tools/system-analyzer/ic-panel.mjs
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import {FocusEvent, SelectionEvent, SelectTimeEvent} from './events.mjs';
-import {delay, DOM, V8CustomElement} from './helper.mjs';
-import {Group} from './ic-model.mjs';
-import {IcLogEntry} from './log/ic.mjs';
-import {MapLogEntry} from './log/map.mjs';
-
-DOM.defineCustomElement(
-    'ic-panel', (templateText) => class ICPanel extends V8CustomElement {
-      _selectedLogEntries;
-      _timeline;
-      constructor() {
-        super(templateText);
-        this.initGroupKeySelect();
-        this.groupKey.addEventListener('change', e => this.updateTable(e));
-      }
-      set timeline(value) {
-        console.assert(value !== undefined, 'timeline undefined!');
-        this._timeline = value;
-        this.selectedLogEntries = this._timeline.all;
-        this.update();
-      }
-      get groupKey() {
-        return this.$('#group-key');
-      }
-
-      get table() {
-        return this.$('#table');
-      }
-
-      get tableBody() {
-        return this.$('#table-body');
-      }
-
-      get count() {
-        return this.$('#count');
-      }
-
-      get spanSelectAll() {
-        return this.querySelectorAll('span');
-      }
-
-      set selectedLogEntries(value) {
-        this._selectedLogEntries = value;
-        this.update();
-      }
-
-      _update() {
-        this._updateCount();
-        this._updateTable();
-      }
-
-      _updateCount() {
-        this.count.innerHTML = `length=${this._selectedLogEntries.length}`;
-      }
-
-      _updateTable(event) {
-        let select = this.groupKey;
-        let key = select.options[select.selectedIndex].text;
-        DOM.removeAllChildren(this.tableBody);
-        let groups = Group.groupBy(this._selectedLogEntries, key, true);
-        this._render(groups, this.tableBody);
-      }
-
-      escapeHtml(unsafe) {
-        if (!unsafe) return '';
-        return unsafe.toString()
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;')
-            .replace(/"/g, '&quot;')
-            .replace(/'/g, '&#039;');
-      }
-
-      handleMapClick(e) {
-        const group = e.target.parentNode.entry;
-        const id = group.key;
-        const selectedMapLogEntries =
-            this.searchIcLogEntryToMapLogEntry(id, group.entries);
-        this.dispatchEvent(new SelectionEvent(selectedMapLogEntries));
-      }
-
-      searchIcLogEntryToMapLogEntry(id, icLogEntries) {
-        // searches for mapLogEntries using the id, time
-        const selectedMapLogEntriesSet = new Set();
-        for (const icLogEntry of icLogEntries) {
-          const selectedMap = MapLogEntry.get(id, icLogEntry.time);
-          selectedMapLogEntriesSet.add(selectedMap);
-        }
-        return Array.from(selectedMapLogEntriesSet);
-      }
-
-      // TODO(zcankara) Handle in the processor for events with source
-      // positions.
-      handleFilePositionClick(e) {
-        const tr = e.target.parentNode;
-        const sourcePosition = tr.group.entries[0].sourcePosition;
-        this.dispatchEvent(new FocusEvent(sourcePosition));
-      }
-
-      _render(groups, parent) {
-        const fragment = document.createDocumentFragment();
-        const max = Math.min(1000, groups.length)
-        const detailsClickHandler = this.handleDetailsClick.bind(this);
-        const mapClickHandler = this.handleMapClick.bind(this);
-        const fileClickHandler = this.handleFilePositionClick.bind(this);
-        for (let i = 0; i < max; i++) {
-          const group = groups[i];
-          const tr = DOM.tr();
-          tr.group = group;
-          const details = tr.appendChild(DOM.td('', 'toggle'));
-          details.onclick = detailsClickHandler;
-          tr.appendChild(DOM.td(group.percentage + '%', 'percentage'));
-          tr.appendChild(DOM.td(group.count, 'count'));
-          const valueTd = tr.appendChild(DOM.td(group.key, 'key'));
-          if (group.property === 'map') {
-            valueTd.onclick = mapClickHandler;
-            valueTd.classList.add('clickable');
-          } else if (group.property == 'filePosition') {
-            valueTd.classList.add('clickable');
-            valueTd.onclick = fileClickHandler;
-          }
-          fragment.appendChild(tr);
-        }
-        const omitted = groups.length - max;
-        if (omitted > 0) {
-          const tr = DOM.tr();
-          const tdNode = tr.appendChild(DOM.td(`Omitted ${omitted} entries.`));
-          tdNode.colSpan = 4;
-          fragment.appendChild(tr);
-        }
-        parent.appendChild(fragment);
-      }
-
-      handleDetailsClick(event) {
-        const tr = event.target.parentNode;
-        const group = tr.group;
-        // Create subgroup in-place if the don't exist yet.
-        if (group.groups === undefined) {
-          group.createSubGroups();
-          this.renderDrilldown(group, tr);
-        }
-        let detailsTr = tr.nextSibling;
-        if (tr.classList.contains('open')) {
-          tr.classList.remove('open');
-          detailsTr.style.display = 'none';
-        } else {
-          tr.classList.add('open');
-          detailsTr.style.display = 'table-row';
-        }
-      }
-
-      renderDrilldown(group, previousSibling) {
-        let tr = DOM.tr('entry-details');
-        tr.style.display = 'none';
-        // indent by one td.
-        tr.appendChild(DOM.td());
-        let td = DOM.td();
-        td.colSpan = 3;
-        for (let key in group.groups) {
-          this.renderDrilldownGroup(td, group.groups[key], key);
-        }
-        tr.appendChild(td);
-        // Append the new TR after previousSibling.
-        previousSibling.parentNode.insertBefore(tr, previousSibling.nextSibling)
-      }
-
-      renderDrilldownGroup(td, children, key) {
-        const max = 20;
-        const div = DOM.div('drilldown-group-title');
-        div.textContent =
-            `Grouped by ${key} [top ${max} out of ${children.length}]`;
-        td.appendChild(div);
-        const table = DOM.table();
-        this._render(children.slice(0, max), table, false)
-        td.appendChild(table);
-      }
-
-      initGroupKeySelect() {
-        const select = this.groupKey;
-        select.options.length = 0;
-        for (const propertyName of IcLogEntry.propertyNames) {
-          const option = document.createElement('option');
-          option.text = propertyName;
-          select.add(option);
-        }
-      }
-    });
diff --git a/deps/v8/tools/system-analyzer/index.css b/deps/v8/tools/system-analyzer/index.css
index 5b55182f68177a..27b07531bf6721 100644
--- a/deps/v8/tools/system-analyzer/index.css
+++ b/deps/v8/tools/system-analyzer/index.css
@@ -18,7 +18,8 @@
   --blue: #6e77dc;
   --orange: #dc9b6e;
   --violet: #d26edc;
-  --border-color: 128, 128, 128;
+  --border-color-rgb: 128, 128, 128;
+  --border-color: rgba(var(--border-color-rgb), 0.2);
 }
 
 [data-theme="light"] {
@@ -110,19 +111,62 @@ dd {
 .panel {
   background-color: var(--surface-color);
   color: var(--on-surface-color);
-  padding: 10px 10px 10px 10px;
+  padding: 10px;
   border-radius: 10px;
-  border: 3px solid rgba(var(--border-color), 0.2);
+  border: 3px solid var(--border-color);
+  overflow: hidden;
 }
 
 .panelBody {
+  position: relative;
   max-height: 800px;
   overflow-y: scroll;
   margin: 0 -10px -10px 0;
 }
 
-.panel > h2 {
-  margin-top: 5px;
+.panel > h2, .panelTitle {
+  margin: -10px -10px 0 -10px;
+  padding: 5px 10px 5px 10px;
+  background-color: var(--border-color);
+  border-radius: 7px 7px 0 0;
+  font-weight: 400;
+}
+
+.panel > select{
+  width: calc(100% + 20px);
+  margin: 0 -10px 10px -10px;
+}
+
+.panel > .selection {
+  display: flex;
+  margin: 0 -10px 0 -10px;
+}
+.panel > .selection input {
+  display: none;
+}
+
+.panel > .selection label {
+  flex: 1;
+  padding: 5px;
+  cursor: pointer;
+  background-color: var( --surface-color);
+  font-weight: normal;
+  text-align: center;
+}
+.panel > .selection label ~ label {
+  border-left: 2px var(--border-color) solid;
+}
+
+.panel > .selection label:hover {
+  background-color: var(--primary-color);
+}
+.panel > .selection [type=radio]:checked + label {
+  background-color: var(--border-color);
+}
+
+.panel > .selection  select {
+  flex: 1;
+  width: 50%;
 }
 
 button {
@@ -133,17 +177,18 @@ select,
 button {
   background-color: var(--surface-color);
   color: var(--on-surface-color);
-  border: 2px solid rgba(var(--border-color), 0.4);
+  border: 2px solid rgba(var(--border-color-rgb), 0.4);
   border-radius: 5px;
   padding: 2px;
 }
 input:hover,
 select:hover,
 button:hover {
-  border: 2px solid rgba(var(--border-color), 0.6);
+  border: 2px solid rgba(var(--border-color-rgb), 0.6);
 }
 
 .colorbox {
+  display: inline-block;
   width: 10px;
   height: 10px;
   border: 1px var(--background-color) solid;
@@ -192,6 +237,8 @@ button:hover {
   background-color: var(--primary-color);
   color: var(--on-primary-color);
 }
+
+button:hover,
 .clickable:hover,
 .mark:hover,
 .clickable:active,
@@ -199,4 +246,48 @@ button:hover {
   background-color: var(--primary-color);
   color: var(--on-primary-color);
   cursor: pointer;
+}
+
+
+.legend {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  background-color: var(--surface-color);
+  border-radius: 5px;
+  border: 3px solid var(--border-color);
+  padding: 0 10px 0 10px;
+}
+.legend dt  {
+  font-family: monospace;
+}
+.legend h3 {
+  margin-top: 10px;
+}
+
+
+.panelCloserLabel {
+  float: left;
+  cursor: zoom-out;
+  margin: 0 10px 0 0;
+  transition: transform 0.2s ease-out;
+  user-select: none;
+}
+.panelCloserInput {
+  display: none;
+}
+.panel .panelCloserInput:checked ~ .panelCloserLabel,
+.panelCloserInput:checked ~ .panelCloserLabel {
+  cursor: zoom-in;
+  transform: rotate(-90deg);
+  display: inherit;
+}
+.panel .panelCloserInput:checked ~ h2 {
+  display: inherit;
+  border-radius: 7px;
+  margin-bottom: -20px;
+  padding-bottom: 10px;
+}
+.panelCloserInput:checked ~ * {
+  display: none;
 }
\ No newline at end of file
diff --git a/deps/v8/tools/system-analyzer/index.html b/deps/v8/tools/system-analyzer/index.html
index a861300f91014c..fa098302403c9c 100644
--- a/deps/v8/tools/system-analyzer/index.html
+++ b/deps/v8/tools/system-analyzer/index.html
@@ -8,33 +8,27 @@
   <title>Indicium</title>
   <!-- <link rel="icon" type="image/png" href="/images/favicon.png"/> -->
 
-  <link rel="modulepreload" href="./log-file-reader.mjs" >
   <link rel="modulepreload" href="./helper.mjs" >
-  <link rel="preload" href="./log-file-reader-template.html" as="fetch" crossorigin="anonymous">
+  <link rel="modulepreload" href="./view/log-file-reader.mjs" >
+  <link rel="modulepreload" href="./view/helper.mjs" >
+  <link rel="preload" href="./view/log-file-reader-template.html" as="fetch" crossorigin="anonymous">
   <script type="module">
     // Force instatiating the log-reader before anything else.
-    import "./log-file-reader.mjs";
+    import "./view/log-file-reader.mjs";
     // Delay loading of the main App
     (async function() {
       let module = await import('./index.mjs');
-      globalThis.app = new module.App("#log-file-reader", "#map-panel", "#map-stats-panel",
-        "#timeline-panel", "#ic-panel", "#map-track", "#ic-track", "#deopt-track",
-        "#source-panel");
+      globalThis.app = new module.App();
     })();
   </script>
-
   <link rel="stylesheet" type="text/css" href="./index.css">
   <style>
-    .theme-switch-wrapper {
-      display: inline-block;
-      align-items: center;
-    }
-
     .theme-switch {
       display: inline-block;
       height: 16px;
       position: relative;
       width: 38px;
+      vertical-align: middle;
     }
 
     .theme-switch input {
@@ -75,7 +69,7 @@
       width: 100%;
     }
 
-    .panels{
+    .panels {
       display: grid;
       align-content: center;
       grid-template-columns: repeat(auto-fill, minmax(500px, 1fr));
@@ -91,31 +85,60 @@
 </head>
 
 <body>
+  <tool-tip id="tool-tip"></tool-tip>
+
   <section id="file-reader">
     <log-file-reader id="log-file-reader"></log-file-reader>
   </section>
 
   <section id="container" class="initial">
     <timeline-panel id="timeline-panel">
-      <timeline-track id="map-track"></timeline-track>
-      <timeline-track id="ic-track"></timeline-track>
-      <timeline-track id="deopt-track"></timeline-track>
+      <timeline-track id="map-track" title="Map"></timeline-track>
+      <timeline-track id="ic-track" title="IC"></timeline-track>
+      <timeline-track id="deopt-track" title="Deopt"></timeline-track>
+      <timeline-track id="code-track" title="Code"></timeline-track>
+      <timeline-track id="api-track" title="API"></timeline-track>
     </timeline-panel>
+
     <div class="panels">
       <map-panel id="map-panel"></map-panel>
-      <stats-panel id="map-stats-panel"></stats-panel>
-      <ic-panel id="ic-panel" onchange="app.handleSelectIc(event)"></ic-panel>
-      <source-panel id="source-panel"></source-panel>
+      <list-panel id="ic-list" title="IC List">
+        <div class="legend">
+          <h3>Legend</h3>
+          <dl>
+            <dt>0</dt>
+            <dd>uninitialized</dd>
+            <dt>X</dt>
+            <dd>no feedback</dd>
+            <dt>1</dt>
+            <dd>monomorphic</dd>
+            <dt>^</dt>
+            <dd>recompute handler</dd>
+            <dt>P</dt>
+            <dd>polymorphic</dd>
+            <dt>N</dt>
+            <dd>megamorphic</dd>
+            <dt>G</dt>
+            <dd>generic</dd>
+          </dl>
+        </div>
+      </list-panel>
+      <list-panel id="map-list" title="Map Events"></list-panel>
+      <list-panel id="deopt-list" title="Deopt Events"></list-panel>
+      <list-panel id="code-list" title="Code Events"></list-panel>
+      <list-panel id="api-list" title="API Events"></list-panel>
+      <script-panel id="script-panel"></script-panel>
+      <code-panel id="code-panel"></code-panel>
     </div>
   </section>
 
   <div class="panels">
     <section id="settings" class="panel">
       <h2>Settings</h2>
-      <span>Theme:</span>
-      <div class="theme-switch-wrapper">
+      <div class="panelBody">
+        <span>Theme:</span>
         <label class="theme-switch" for="theme-switch-input">
-          <input type="checkbox" id="theme-switch-input" />
+          <input type="checkbox" id="theme-switch-input" >
           <div class="slider"></div>
         </label>
       </div>
@@ -123,63 +146,96 @@ <h2>Settings</h2>
 
     <section id="instructions" class="panel">
       <h2>Instructions</h2>
-      <p>
-        Unified web interface to analyse runtime information stored in the v8 log.
-      </p>
-      For generating a v8.log file from <a href="https://v8.dev/docs/build">d8</a>:
-      <ul>
-        <li>
-          <code>/path/do/d8 --trace-maps --trace_ic --log-source-code $FILE</code>
-        </li>
-      </ul>
-      For generating a v8.log file from Chrome:
-      <ul>
-        <li>
-          <code>/path/to/chrome --user-data-dir=/var/tmp/chr$RANDOM --no-sandbox
-          --js-flags='--trace-ic --trace-maps --log-source-code’
-          $WEBSITE_URL</code>
-        </li>
-      </ul>
-
-      <h3>Log Options:</h3>
-      <dl class="d8-options">
-        <dt><code>--trace-maps</code></dt>
-        <dd>Log<a href="https://v8.dev/blog/fast-properties" target="_blank">
-            Maps</a></dd>
-        <dt><code>--trace-ic</code></dt>
-        <dd>Log
-          <a href="https://mathiasbynens.be/notes/shapes-ics" target="_blank">
-            ICs</a></dd>
-        <dt><code>--log-source-code</code></dt>
-        <dd>Log source code</dd>
-      </dl>
-
-      <h3>Keyboard Shortcuts for Navigation</h3>
-      <dl>
-        <dt><kbd>SHIFT</kbd> + <kbd>Arrow Up</kbd></dt>
-        <dd>Follow Map transition forward (first child)</dd>
-
-        <dt><kbd>SHIFT</kbd> + <kbd>Arrow Down</kbd></dt>
-        <dd>Follow Map transition backwards</dd>
-
-        <dt><kbd>Arrow Up</kbd></dt>
-        <dd>Go to previous Map chunk</dd>
-
-        <dt><kbd>Arrow Down</kbd></dt>
-        <dd>Go to next Map in chunk</dd>
-
-        <dt><kbd>Arrow Left</kbd></dt>
-        <dd>Go to previous chunk</dd>
-
-        <dt><kbd>Arrow Right</kbd></dt>
-        <dd>Go to next chunk</dd>
-
-        <dt><kbd>+</kbd></dt>
-        <dd>Timeline zoom in</dd>
-
-        <dt><kbd>-</kbd></dt>
-        <dd>Timeline zoom out</dd>
-      </dl>
+      <div class="panelBody">
+        <p>
+          Unified web interface to analyse runtime information stored in the v8 log.
+        </p>
+        For generating a v8.log file from <a href="https://v8.dev/docs/build">d8</a>:
+        <ul>
+          <li>
+            <code>/path/do/d8 $LOG_FLAGS $FILE</code>
+          </li>
+        </ul>
+        For generating a v8.log file from Chrome:
+        <ul>
+          <li>
+            <code>/path/to/chrome --user-data-dir=/var/tmp/chr$RANDOM --no-sandbox
+            --js-flags='$LOG_FLAGS’
+            $WEBSITE_URL</code>
+          </li>
+        </ul>
+
+        <h3><code>LOG_FLAGS</code>:</h3>
+        <dl class="d8-options">
+          <dt>
+            <a href="https://source.chromium.org/search?q=FLAG_log_all">
+              <code>--log-all</code>
+            </a>
+          </dt>
+          <dd>Enable all V8 logging options.</dd>
+          <dt>
+            <a href="https://source.chromium.org/search?q=FLAG_trace_maps">
+              <code>--trace-maps</code>
+            </a>
+          </dt>
+          <dd>
+              Log<a href="https://v8.dev/blog/fast-properties">Maps</a>
+          </dd>
+          <dt>
+            <a href="https://source.chromium.org/search?q=FLAG_trace_ic">
+              <code>--trace-ic</code>
+            </a>
+          </dt>
+          <dd>
+            Log <a href="https://mathiasbynens.be/notes/shapes-ics">ICs</a>
+          </dd>
+          <dt>
+            <a href="https://source.chromium.org/search?q=FLAG_log_source_code">
+              <code>--log-source-code</code>
+            </a>
+          </dt>
+          <dd>Log source code</dd>
+          <dt>
+            <a href="https://source.chromium.org/search?q=FLAG_log_code_disassemble">
+              <code>--log-code-disassemble</code>
+            </a>
+          </dt>
+          <dd>Log detailed generated generated code</dd>
+          <dt>
+            <a href="https://source.chromium.org/search?q=FLAG_log_api">
+              <code>--log-api</code>
+            </a>
+          </dt>
+          <dd>Log various API uses.</dd>
+        </dl>
+
+        <h3>Keyboard Shortcuts for Navigation</h3>
+        <dl>
+          <dt><kbd>SHIFT</kbd> + <kbd>Arrow Up</kbd></dt>
+          <dd>Follow Map transition forward (first child)</dd>
+
+          <dt><kbd>SHIFT</kbd> + <kbd>Arrow Down</kbd></dt>
+          <dd>Follow Map transition backwards</dd>
+
+          <dt><kbd>Arrow Up</kbd></dt>
+          <dd>Go to previous Map chunk</dd>
+
+          <dt><kbd>Arrow Down</kbd></dt>
+          <dd>Go to next Map in chunk</dd>
+
+          <dt><kbd>Arrow Left</kbd></dt>
+          <dd>Go to previous chunk</dd>
+
+          <dt><kbd>Arrow Right</kbd></dt>
+          <dd>Go to next chunk</dd>
+
+          <dt><kbd>+</kbd></dt>
+          <dd>Timeline zoom in</dd>
+
+          <dt><kbd>-</kbd></dt>
+          <dd>Timeline zoom out</dd>
+        </dl>
+      </div>
     </section>
   </div>
 </body>
diff --git a/deps/v8/tools/system-analyzer/index.mjs b/deps/v8/tools/system-analyzer/index.mjs
index dfc858e5d66406..531ae79138a94d 100644
--- a/deps/v8/tools/system-analyzer/index.mjs
+++ b/deps/v8/tools/system-analyzer/index.mjs
@@ -2,34 +2,46 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {SourcePosition} from '../profile.mjs';
+import {Script, SourcePosition} from '../profile.mjs';
 
 import {State} from './app-model.mjs';
-import {FocusEvent, SelectionEvent, SelectTimeEvent} from './events.mjs';
-import {$} from './helper.mjs';
+import {ApiLogEntry} from './log/api.mjs';
+import {DeoptLogEntry} from './log/code.mjs';
+import {CodeLogEntry} from './log/code.mjs';
 import {IcLogEntry} from './log/ic.mjs';
 import {MapLogEntry} from './log/map.mjs';
 import {Processor} from './processor.mjs';
+import {FocusEvent, SelectionEvent, SelectRelatedEvent, SelectTimeEvent, ToolTipEvent,} from './view/events.mjs';
+import {$, CSSColor, groupBy} from './view/helper.mjs';
 
 class App {
   _state;
   _view;
   _navigation;
   _startupPromise;
-  constructor(
-      fileReaderId, mapPanelId, mapStatsPanelId, timelinePanelId, icPanelId,
-      mapTrackId, icTrackId, deoptTrackId, sourcePanelId) {
+  constructor() {
     this._view = {
       __proto__: null,
-      logFileReader: $(fileReaderId),
-      icPanel: $(icPanelId),
-      mapPanel: $(mapPanelId),
-      mapStatsPanel: $(mapStatsPanelId),
-      timelinePanel: $(timelinePanelId),
-      mapTrack: $(mapTrackId),
-      icTrack: $(icTrackId),
-      deoptTrack: $(deoptTrackId),
-      sourcePanel: $(sourcePanelId)
+      logFileReader: $('#log-file-reader'),
+
+      timelinePanel: $('#timeline-panel'),
+      mapTrack: $('#map-track'),
+      icTrack: $('#ic-track'),
+      deoptTrack: $('#deopt-track'),
+      codeTrack: $('#code-track'),
+      apiTrack: $('#api-track'),
+
+      icList: $('#ic-list'),
+      mapList: $('#map-list'),
+      codeList: $('#code-list'),
+      deoptList: $('#deopt-list'),
+      apiList: $('#api-list'),
+
+      mapPanel: $('#map-panel'),
+      codePanel: $('#code-panel'),
+      scriptPanel: $('#script-panel'),
+
+      toolTip: $('#tool-tip'),
     };
     this.toggleSwitch = $('.theme-switch input[type="checkbox"]');
     this.toggleSwitch.addEventListener('change', (e) => this.switchTheme(e));
@@ -40,90 +52,208 @@ class App {
     this._startupPromise = this.runAsyncInitialize();
   }
 
+  static get allEventTypes() {
+    return new Set([
+      SourcePosition, MapLogEntry, IcLogEntry, ApiLogEntry, CodeLogEntry,
+      DeoptLogEntry
+    ]);
+  }
+
   async runAsyncInitialize() {
     await Promise.all([
-      import('./ic-panel.mjs'),
-      import('./timeline-panel.mjs'),
-      import('./stats-panel.mjs'),
-      import('./map-panel.mjs'),
-      import('./source-panel.mjs'),
+      import('./view/list-panel.mjs'),
+      import('./view/timeline-panel.mjs'),
+      import('./view/map-panel.mjs'),
+      import('./view/script-panel.mjs'),
+      import('./view/code-panel.mjs'),
+      import('./view/tool-tip.mjs'),
     ]);
     document.addEventListener(
         'keydown', e => this._navigation?.handleKeyDown(e));
     document.addEventListener(
-        SelectionEvent.name, e => this.handleShowEntries(e));
+        SelectRelatedEvent.name, e => this.handleSelectRelatedEntries(e));
     document.addEventListener(
-        FocusEvent.name, e => this.handleShowEntryDetail(e));
+        SelectionEvent.name, e => this.handleSelectEntries(e))
+    document.addEventListener(
+        FocusEvent.name, e => this.handleFocusLogEntryl(e));
     document.addEventListener(
         SelectTimeEvent.name, e => this.handleTimeRangeSelect(e));
+    document.addEventListener(ToolTipEvent.name, e => this.handleToolTip(e));
   }
 
-  handleShowEntries(e) {
-    if (e.entries[0] instanceof MapLogEntry) {
-      this.showMapEntries(e.entries);
-    } else if (e.entries[0] instanceof IcLogEntry) {
-      this.showIcEntries(e.entries);
-    } else if (e.entries[0] instanceof SourcePosition) {
-      this.showSourcePositionEntries(e.entries);
-    } else {
-      throw new Error('Unknown selection type!');
+  handleSelectRelatedEntries(e) {
+    e.stopImmediatePropagation();
+    this.selectRelatedEntries(e.entry);
+  }
+
+  selectRelatedEntries(entry) {
+    let entries = [entry];
+    switch (entry.constructor) {
+      case SourcePosition:
+        entries = entries.concat(entry.entries);
+        break;
+      case MapLogEntry:
+        entries = this._state.icTimeline.filter(each => each.map === entry);
+        break;
+      case IcLogEntry:
+        if (entry.map) entries.push(entry.map);
+        break;
+      case ApiLogEntry:
+        break;
+      case CodeLogEntry:
+        break;
+      case DeoptLogEntry:
+        // TODO select map + code entries
+        if (entry.fileSourcePosition) entries.push(entry.fileSourcePosition);
+        break;
+      case Script:
+        entries = entry.entries.concat(entry.sourcePositions);
+        break;
+      default:
+        throw new Error('Unknown selection type!');
+    }
+    if (entry.sourcePosition) {
+      entries.push(entry.sourcePosition);
+      // TODO: find the matching Code log entries.
+    }
+    this.selectEntries(entries);
+  }
+
+  handleSelectEntries(e) {
+    e.stopImmediatePropagation();
+    this.showEntries(e.entries);
+  }
+
+  selectEntries(entries) {
+    const missingTypes = App.allEventTypes;
+    groupBy(entries, each => each.constructor, true).forEach(group => {
+      this.selectEntriesOfSingleType(group.entries);
+      missingTypes.delete(group.key);
+    });
+    missingTypes.forEach(type => this.selectEntriesOfSingleType([], type));
+  }
+
+  selectEntriesOfSingleType(entries, type) {
+    switch (entries[0]?.constructor ?? type) {
+      case SourcePosition:
+        return this.showSourcePositions(entries);
+      case MapLogEntry:
+        return this.showMapEntries(entries);
+      case IcLogEntry:
+        return this.showIcEntries(entries);
+      case ApiLogEntry:
+        return this.showApiEntries(entries);
+      case CodeLogEntry:
+        return this.showCodeEntries(entries);
+      case DeoptLogEntry:
+        return this.showDeoptEntries(entries);
+      default:
+        throw new Error('Unknown selection type!');
     }
-    e.stopPropagation();
   }
+
   showMapEntries(entries) {
     this._state.selectedMapLogEntries = entries;
-    this._view.mapPanel.selectedMapLogEntries = entries;
-    this._view.mapStatsPanel.selectedLogEntries = entries;
+    this._view.mapPanel.selectedLogEntries = entries;
+    this._view.mapList.selectedLogEntries = entries;
   }
+
   showIcEntries(entries) {
     this._state.selectedIcLogEntries = entries;
-    this._view.icPanel.selectedLogEntries = entries;
+    this._view.icList.selectedLogEntries = entries;
   }
+
   showDeoptEntries(entries) {
     this._state.selectedDeoptLogEntries = entries;
+    this._view.deoptList.selectedLogEntries = entries;
   }
-  showSourcePositionEntries(entries) {
-    // TODO: Handle multiple source position selection events
-    this._view.sourcePanel.selectedSourcePositions = entries
+
+  showCodeEntries(entries) {
+    this._state.selectedCodeLogEntries = entries;
+    this._view.codePanel.selectedEntries = entries;
+    this._view.codeList.selectedLogEntries = entries;
+  }
+
+  showApiEntries(entries) {
+    this._state.selectedApiLogEntries = entries;
+    this._view.apiList.selectedLogEntries = entries;
+  }
+
+  showSourcePositions(entries) {
+    this._view.scriptPanel.selectedSourcePositions = entries
   }
 
   handleTimeRangeSelect(e) {
+    e.stopImmediatePropagation();
     this.selectTimeRange(e.start, e.end);
-    e.stopPropagation();
   }
 
   selectTimeRange(start, end) {
     this._state.selectTimeRange(start, end);
-    this.showMapEntries(this._state.mapTimeline.selection);
-    this.showIcEntries(this._state.icTimeline.selection);
-    this.showDeoptEntries(this._state.deoptTimeline.selection);
+    this.showMapEntries(this._state.mapTimeline.selectionOrSelf);
+    this.showIcEntries(this._state.icTimeline.selectionOrSelf);
+    this.showDeoptEntries(this._state.deoptTimeline.selectionOrSelf);
+    this.showCodeEntries(this._state.codeTimeline.selectionOrSelf);
+    this.showApiEntries(this._state.apiTimeline.selectionOrSelf);
     this._view.timelinePanel.timeSelection = {start, end};
   }
 
-  handleShowEntryDetail(e) {
-    if (e.entry instanceof MapLogEntry) {
-      this.selectMapLogEntry(e.entry);
-    } else if (e.entry instanceof IcLogEntry) {
-      this.selectICLogEntry(e.entry);
-    } else if (e.entry instanceof SourcePosition) {
-      this.selectSourcePosition(e.entry);
-    } else {
-      throw new Error('Unknown selection type!');
+  handleFocusLogEntryl(e) {
+    e.stopImmediatePropagation();
+    this.focusLogEntry(e.entry);
+  }
+
+  focusLogEntry(entry) {
+    switch (entry.constructor) {
+      case SourcePosition:
+        return this.focusSourcePosition(entry);
+      case MapLogEntry:
+        return this.focusMapLogEntry(entry);
+      case IcLogEntry:
+        return this.focusIcLogEntry(entry);
+      case ApiLogEntry:
+        return this.focusApiLogEntry(entry);
+      case CodeLogEntry:
+        return this.focusCodeLogEntry(entry);
+      case DeoptLogEntry:
+        return this.focusDeoptLogEntry(entry);
+      default:
+        throw new Error('Unknown selection type!');
     }
-    e.stopPropagation();
   }
-  selectMapLogEntry(entry) {
+
+  focusMapLogEntry(entry) {
     this._state.map = entry;
-    this._view.mapTrack.selectedEntry = entry;
+    this._view.mapTrack.focusedEntry = entry;
     this._view.mapPanel.map = entry;
   }
-  selectICLogEntry(entry) {
+
+  focusIcLogEntry(entry) {
     this._state.ic = entry;
-    this._view.icPanel.selectedLogEntries = [entry];
   }
-  selectSourcePosition(sourcePositions) {
-    if (!sourcePositions.script) return;
-    this._view.sourcePanel.selectedSourcePositions = [sourcePositions];
+
+  focusCodeLogEntry(entry) {
+    this._state.code = entry;
+    this._view.codePanel.entry = entry;
+  }
+
+  focusDeoptLogEntry(entry) {
+    this._view.deoptList.focusedLogEntry = entry;
+  }
+
+  focusApiLogEntry(entry) {
+    this._state.apiLogEntry = entry;
+    this._view.apiTrack.focusedEntry = entry;
+  }
+
+  focusSourcePosition(sourcePosition) {
+    if (!sourcePosition) return;
+    this._view.sourcePanel.focusedSourcePositions = [sourcePosition];
+  }
+
+  handleToolTip(event) {
+    this._view.toolTip.positionOrTargetNode = event.positionOrTargetNode;
+    this._view.toolTip.content = event.content;
   }
 
   handleFileUploadStart(e) {
@@ -140,22 +270,23 @@ class App {
     await this._startupPromise;
     try {
       const processor = new Processor(e.detail);
+      this._state.profile = processor.profile;
       const mapTimeline = processor.mapTimeline;
       const icTimeline = processor.icTimeline;
       const deoptTimeline = processor.deoptTimeline;
-      this._state.mapTimeline = mapTimeline;
-      this._state.icTimeline = icTimeline;
-      this._state.deoptTimeline = deoptTimeline;
-      // Transitions must be set before timeline for stats panel.
+      const codeTimeline = processor.codeTimeline;
+      const apiTimeline = processor.apiTimeline;
+      this._state.setTimelines(
+          mapTimeline, icTimeline, deoptTimeline, codeTimeline, apiTimeline);
       this._view.mapPanel.timeline = mapTimeline;
-      this._view.mapTrack.data = mapTimeline;
-      this._view.mapStatsPanel.transitions =
-          this._state.mapTimeline.transitions;
-      this._view.mapStatsPanel.timeline = mapTimeline;
-      this._view.icPanel.timeline = icTimeline;
-      this._view.icTrack.data = icTimeline;
-      this._view.deoptTrack.data = deoptTimeline;
-      this._view.sourcePanel.data = processor.scripts
+      this._view.icList.timeline = icTimeline;
+      this._view.mapList.timeline = mapTimeline;
+      this._view.deoptList.timeline = deoptTimeline;
+      this._view.codeList.timeline = codeTimeline;
+      this._view.apiList.timeline = apiTimeline;
+      this._view.scriptPanel.scripts = processor.scripts;
+      this._view.codePanel.timeline = codeTimeline;
+      this.refreshTimelineTrackView();
     } catch (e) {
       this._view.logFileReader.error = 'Log file contains errors!'
       throw (e);
@@ -169,14 +300,16 @@ class App {
     this._view.mapTrack.data = this._state.mapTimeline;
     this._view.icTrack.data = this._state.icTimeline;
     this._view.deoptTrack.data = this._state.deoptTimeline;
+    this._view.codeTrack.data = this._state.codeTimeline;
+    this._view.apiTrack.data = this._state.apiTimeline;
   }
 
   switchTheme(event) {
     document.documentElement.dataset.theme =
         event.target.checked ? 'light' : 'dark';
-    if (this.fileLoaded) {
-      this.refreshTimelineTrackView();
-    }
+    CSSColor.reset();
+    if (!this.fileLoaded) return;
+    this.refreshTimelineTrackView();
   }
 }
 
diff --git a/deps/v8/tools/system-analyzer/log/api.mjs b/deps/v8/tools/system-analyzer/log/api.mjs
new file mode 100644
index 00000000000000..760ac549148af3
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/log/api.mjs
@@ -0,0 +1,32 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import {LogEntry} from './log.mjs';
+
+export class ApiLogEntry extends LogEntry {
+  constructor(type, time, name, argument) {
+    super(type, time);
+    this._name = name;
+    this._argument = argument;
+  }
+
+  get name() {
+    return this._name;
+  }
+
+  get argument() {
+    return this._argument;
+  }
+
+  toString() {
+    return `Api(${this.type})`;
+  }
+
+  toStringLong() {
+    return `Api(${this.type}): ${this._name}`;
+  }
+
+  static get propertyNames() {
+    return ['type', 'name', 'argument'];
+  }
+}
diff --git a/deps/v8/tools/system-analyzer/log/code.mjs b/deps/v8/tools/system-analyzer/log/code.mjs
new file mode 100644
index 00000000000000..4f69f16c64ff3d
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/log/code.mjs
@@ -0,0 +1,95 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import {LogEntry} from './log.mjs';
+
+export class DeoptLogEntry extends LogEntry {
+  constructor(
+      type, time, entry, deoptReason, deoptLocation, scriptOffset,
+      instructionStart, codeSize, inliningId) {
+    super(type, time);
+    this._entry = entry;
+    this._reason = deoptReason;
+    this._location = deoptLocation;
+    this._scriptOffset = scriptOffset;
+    this._instructionStart = instructionStart;
+    this._codeSize = codeSize;
+    this._inliningId = inliningId;
+    this.fileSourcePosition = undefined;
+  }
+
+  get reason() {
+    return this._reason;
+  }
+
+  get location() {
+    return this._location;
+  }
+
+  get entry() {
+    return this._entry;
+  }
+
+  get functionName() {
+    return this._entry.functionName;
+  }
+
+  toString() {
+    return `Deopt(${this.type})`;
+  }
+
+  toStringLong() {
+    return `Deopt(${this.type})${this._reason}: ${this._location}`;
+  }
+
+  static get propertyNames() {
+    return [
+      'type', 'reason', 'functionName', 'sourcePosition',
+      'functionSourcePosition', 'script'
+    ];
+  }
+}
+
+export class CodeLogEntry extends LogEntry {
+  constructor(type, time, kind, entry) {
+    super(type, time);
+    this._kind = kind;
+    this._entry = entry;
+  }
+
+  get kind() {
+    return this._kind;
+  }
+
+  get entry() {
+    return this._entry;
+  }
+
+  get functionName() {
+    return this._entry.functionName;
+  }
+
+  get size() {
+    return this._entry.size;
+  }
+
+  get source() {
+    return this._entry?.getSourceCode() ?? '';
+  }
+
+  get disassemble() {
+    return this._entry?.source?.disassemble;
+  }
+
+  toString() {
+    return `Code(${this.type})`;
+  }
+
+  toStringLong() {
+    return `Code(${this.type}): ${this._entry.toString()}`;
+  }
+
+  static get propertyNames() {
+    return ['type', 'kind', 'functionName', 'sourcePosition', 'script'];
+  }
+}
diff --git a/deps/v8/tools/system-analyzer/log/ic.mjs b/deps/v8/tools/system-analyzer/log/ic.mjs
index b6c7ec5553778e..68078ccc68bc57 100644
--- a/deps/v8/tools/system-analyzer/log/ic.mjs
+++ b/deps/v8/tools/system-analyzer/log/ic.mjs
@@ -6,7 +6,7 @@ import {LogEntry} from './log.mjs';
 export class IcLogEntry extends LogEntry {
   constructor(
       type, fn_file, time, line, column, key, oldState, newState, map, reason,
-      script, modifier, additional) {
+      modifier, additional) {
     super(type, time);
     this.category = 'other';
     if (this.type.indexOf('Store') !== -1) {
@@ -14,11 +14,10 @@ export class IcLogEntry extends LogEntry {
     } else if (this.type.indexOf('Load') !== -1) {
       this.category = 'Load';
     }
-    let parts = fn_file.split(' ');
+    const parts = fn_file.split(' ');
     this.functionName = parts[0];
     this.file = parts[1];
     let position = line + ':' + column;
-    this.filePosition = this.file + ':' + position;
     this.oldState = oldState;
     this.newState = newState;
     this.state = this.oldState + ' → ' + this.newState;
@@ -26,10 +25,17 @@ export class IcLogEntry extends LogEntry {
     this.map = map;
     this.reason = reason;
     this.additional = additional;
-    this.script = script;
     this.modifier = modifier;
   }
 
+  toString() {
+    return `IC(${this.type})`;
+  }
+
+  toStringLong() {
+    return `IC(${this.type}):\n${this.state}`;
+  }
+
   parseMapProperties(parts, offset) {
     let next = parts[++offset];
     if (!next.startsWith('dict')) return offset;
@@ -58,8 +64,8 @@ export class IcLogEntry extends LogEntry {
 
   static get propertyNames() {
     return [
-      'type', 'category', 'functionName', 'filePosition', 'state', 'key', 'map',
-      'reason', 'file'
+      'type', 'category', 'functionName', 'script', 'sourcePosition', 'state',
+      'key', 'map', 'reason', 'file'
     ];
   }
 }
diff --git a/deps/v8/tools/system-analyzer/log/log.mjs b/deps/v8/tools/system-analyzer/log/log.mjs
index 69195d7853816a..5339d88432cea6 100644
--- a/deps/v8/tools/system-analyzer/log/log.mjs
+++ b/deps/v8/tools/system-analyzer/log/log.mjs
@@ -3,19 +3,32 @@
 // found in the LICENSE file.
 
 export class LogEntry {
-  _time;
-  _type;
   constructor(type, time) {
-    // TODO(zcankara) remove type and add empty getters to override
     this._time = time;
     this._type = type;
+    this.sourcePosition = undefined;
   }
+
   get time() {
     return this._time;
   }
+
   get type() {
     return this._type;
   }
+
+  get script() {
+    return this.sourcePosition?.script;
+  }
+
+  toString() {
+    return `${this.constructor.name}(${this._type})`;
+  }
+
+  toStringLong() {
+    return this.toString();
+  }
+
   // Returns an Array of all possible #type values.
   static get allTypes() {
     throw new Error('Not implemented.');
diff --git a/deps/v8/tools/system-analyzer/log/map.mjs b/deps/v8/tools/system-analyzer/log/map.mjs
index 4df6fb847c2a93..d97f340ca1025e 100644
--- a/deps/v8/tools/system-analyzer/log/map.mjs
+++ b/deps/v8/tools/system-analyzer/log/map.mjs
@@ -34,21 +34,34 @@ define(Array.prototype, 'last', function() {
 // Map Log Events
 
 class MapLogEntry extends LogEntry {
-  edge = void 0;
-  children = [];
-  depth = 0;
-  _isDeprecated = false;
-  deprecatedTargets = null;
-  leftId = 0;
-  rightId = 0;
-  filePosition = '';
-  script = '';
-  id = -1;
   constructor(id, time) {
     if (!time) throw new Error('Invalid time');
-    super(id, time);
-    MapLogEntry.set(id, this);
+    // Use MapLogEntry.type getter instead of property, since we only know the
+    // type lazily from the incoming transition.
+    super(undefined, time);
     this.id = id;
+    MapLogEntry.set(id, this);
+    this.edge = undefined;
+    this.children = [];
+    this.depth = 0;
+    this._isDeprecated = false;
+    this.deprecatedTargets = null;
+    this.leftId = 0;
+    this.rightId = 0;
+    this.entry = undefined;
+    this.description = '';
+  }
+
+  get functionName() {
+    return this.entry?.functionName;
+  }
+
+  toString() {
+    return `Map(${this.id})`;
+  }
+
+  toStringLong() {
+    return `Map(${this.id}):\n${this.description}`;
   }
 
   finalizeRootMap(id) {
@@ -59,9 +72,9 @@ class MapLogEntry extends LogEntry {
         console.warn('Skipping potential parent loop between maps:', current)
         continue;
       }
-      current.finalize(id)
+      current.finalize(id);
       id += 1;
-      current.children.forEach(edge => stack.push(edge.to))
+      current.children.forEach(edge => stack.push(edge.to));
       // TODO implement rightId
     }
     return id;
@@ -75,8 +88,7 @@ class MapLogEntry extends LogEntry {
   }
 
   parent() {
-    if (this.edge === void 0) return void 0;
-    return this.edge.from;
+    return this.edge?.from;
   }
 
   isDeprecated() {
@@ -88,7 +100,7 @@ class MapLogEntry extends LogEntry {
   }
 
   isRoot() {
-    return this.edge === void 0 || this.edge.from === void 0;
+    return this.edge === undefined || this.edge.from === undefined;
   }
 
   contains(map) {
@@ -111,9 +123,10 @@ class MapLogEntry extends LogEntry {
   }
 
   position(chunks) {
-    let index = this.chunkIndex(chunks);
-    let xFrom = (index + 1.5) * kChunkWidth;
-    let yFrom = kChunkHeight - chunks[index].yOffset(this);
+    const index = this.chunkIndex(chunks);
+    if (index === -1) return [0, 0];
+    const xFrom = (index + 1.5) * kChunkWidth;
+    const yFrom = kChunkHeight - chunks[index].yOffset(this);
     return [xFrom, yFrom];
   }
 
@@ -131,11 +144,19 @@ class MapLogEntry extends LogEntry {
   }
 
   get type() {
-    return this.edge === void 0 ? 'new' : this.edge.type;
+    return this.edge?.type ?? 'new';
+  }
+
+  get reason() {
+    return this.edge?.reason;
+  }
+
+  get property() {
+    return this.edge?.name;
   }
 
   isBootstrapped() {
-    return this.edge === void 0;
+    return this.edge === undefined;
   }
 
   getParents() {
@@ -150,15 +171,16 @@ class MapLogEntry extends LogEntry {
 
   static get(id, time = undefined) {
     let maps = this.cache.get(id);
-    if (maps) {
+    if (maps === undefined) return undefined;
+    if (time !== undefined) {
       for (let i = 1; i < maps.length; i++) {
         if (maps[i].time > time) {
           return maps[i - 1];
         }
       }
-      // default return the latest
-      return (maps.length > 0) ? maps[maps.length - 1] : undefined;
     }
+    // default return the latest
+    return maps[maps.length - 1];
   }
 
   static set(id, map) {
@@ -168,6 +190,13 @@ class MapLogEntry extends LogEntry {
       this.cache.set(id, [map]);
     }
   }
+
+  static get propertyNames() {
+    return [
+      'type', 'reason', 'property', 'functionName', 'sourcePosition', 'script',
+      'id'
+    ];
+  }
 }
 
 MapLogEntry.cache = new Map();
@@ -183,17 +212,29 @@ class Edge {
     this.to = to;
   }
 
+  updateFrom(edge) {
+    if (this.to !== edge.to || this.from !== edge.from) {
+      throw new Error('Invalid Edge updated', this, to);
+    }
+    this.type = edge.type;
+    this.name = edge.name;
+    this.reason = edge.reason;
+    this.time = edge.time;
+  }
+
   finishSetup() {
     const from = this.from;
-    if (from) from.addEdge(this);
     const to = this.to;
+    if (to?.time < from?.time) {
+      // This happens for map deprecation where the transition tree is converted
+      // in reverse order.
+      console.warn('Invalid time order');
+    }
+    if (from) from.addEdge(this);
     if (to === undefined) return;
     to.edge = this;
     if (from === undefined) return;
     if (to === from) throw 'From and to must be distinct.';
-    if (to.time < from.time) {
-      console.warn('invalid time order');
-    }
     let newDepth = from.depth + 1;
     if (to.depth > 0 && to.depth != newDepth) {
       console.warn('Depth has already been initialized');
diff --git a/deps/v8/tools/system-analyzer/map-panel-template.html b/deps/v8/tools/system-analyzer/map-panel-template.html
deleted file mode 100644
index 12d6ec5a14c913..00000000000000
--- a/deps/v8/tools/system-analyzer/map-panel-template.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Copyright 2020 the V8 project authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file. -->
-
-<head>
-  <link href="./index.css" rel="stylesheet">
-</head>
-<style>
-  #searchBarInput {
-    width: 200px;
-  }
-</style>
-<div class="panel">
-  <h2>Map Panel</h2>
-  <map-transitions id="map-transitions"></map-transitions>
-  <h3>Search Map by Address</h3>
-  <section id="searchBar"></section>
-  <input type="search" id="searchBarInput"></input>
-  <button id="searchBarBtn">Search</button>
-  <map-details id="map-details"></map-details>
-</div>
diff --git a/deps/v8/tools/system-analyzer/map-panel.mjs b/deps/v8/tools/system-analyzer/map-panel.mjs
deleted file mode 100644
index 1516038a2df579..00000000000000
--- a/deps/v8/tools/system-analyzer/map-panel.mjs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-import './stats-panel.mjs';
-import './map-panel/map-details.mjs';
-import './map-panel/map-transitions.mjs';
-
-import {FocusEvent} from './events.mjs';
-import {DOM, V8CustomElement} from './helper.mjs';
-import {MapLogEntry} from './log/map.mjs';
-
-DOM.defineCustomElement('map-panel',
-                        (templateText) =>
-                            class MapPanel extends V8CustomElement {
-  _map;
-  constructor() {
-    super(templateText);
-    this.searchBarBtn.addEventListener('click', e => this.handleSearchBar(e));
-    this.addEventListener(FocusEvent.name, e => this.handleUpdateMapDetails(e));
-  }
-
-  handleUpdateMapDetails(e) {
-    if (e.entry instanceof MapLogEntry) {
-      this.mapDetailsPanel.map = e.entry;
-    }
-  }
-
-  get mapTransitionsPanel() {
-    return this.$('#map-transitions');
-  }
-
-  get mapDetailsPanel() {
-    return this.$('#map-details');
-  }
-
-  get searchBarBtn() {
-    return this.$('#searchBarBtn');
-  }
-
-  get searchBar() {
-    return this.$('#searchBar');
-  }
-
-  set timeline(timeline) {
-    this._timeline = timeline;
-  }
-
-  set map(value) {
-    this._map = value;
-    this.mapTransitionsPanel.map = this._map;
-  }
-
-  handleSearchBar(e) {
-    let searchBar = this.$('#searchBarInput');
-    let searchBarInput = searchBar.value;
-    // access the map from model cache
-    let selectedMap = MapLogEntry.get(parseInt(searchBarInput));
-    if (selectedMap) {
-      searchBar.className = 'success';
-    } else {
-      searchBar.className = 'failure';
-    }
-    this.dispatchEvent(new FocusEvent(selectedMap));
-  }
-
-  set selectedMapLogEntries(list) {
-    this.mapTransitionsPanel.selectedMapLogEntries = list;
-  }
-  get selectedMapLogEntries() {
-    return this.mapTransitionsPanel.selectedMapLogEntries;
-  }
-});
diff --git a/deps/v8/tools/system-analyzer/map-panel/map-transitions.mjs b/deps/v8/tools/system-analyzer/map-panel/map-transitions.mjs
deleted file mode 100644
index 60462a1db224df..00000000000000
--- a/deps/v8/tools/system-analyzer/map-panel/map-transitions.mjs
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-import {FocusEvent, SelectionEvent} from '../events.mjs';
-import {DOM, typeToColor, V8CustomElement} from '../helper.mjs';
-
-DOM.defineCustomElement('./map-panel/map-transitions',
-                        (templateText) =>
-                            class MapTransitions extends V8CustomElement {
-  _map;
-  _selectedMapLogEntries;
-  _displayedMapsInTree;
-
-  constructor() {
-    super(templateText);
-    this.transitionView.addEventListener(
-        'mousemove', (e) => this.handleTransitionViewChange(e));
-    this.currentNode = this.transitionView;
-    this.currentMap = undefined;
-  }
-
-  get transitionView() {
-    return this.$('#transitionView');
-  }
-
-  get tooltip() {
-    return this.$('#tooltip');
-  }
-
-  get tooltipContents() {
-    return this.$('#tooltipContents');
-  }
-
-  set map(value) {
-    this._map = value;
-    this.showMap();
-  }
-
-  handleTransitionViewChange(e) {
-    this.tooltip.style.left = e.pageX + 'px';
-    this.tooltip.style.top = e.pageY + 'px';
-    const map = e.target.map;
-    if (map) {
-      this.tooltipContents.innerText = map.description;
-    }
-  }
-
-  _selectMap(map) {
-    this.dispatchEvent(new SelectionEvent([map]));
-  }
-
-  showMap() {
-    if (this.currentMap === this._map) return;
-    this.currentMap = this._map;
-    this.selectedMapLogEntries = [this._map];
-    this.update();
-  }
-
-  _update() {
-    this.transitionView.style.display = 'none';
-    DOM.removeAllChildren(this.transitionView);
-    this._displayedMapsInTree = new Set();
-    // Limit view to 200 maps for performance reasons.
-    this.selectedMapLogEntries.slice(0, 200).forEach(
-        (map) => this.addMapAndParentTransitions(map));
-    this._displayedMapsInTree = undefined;
-    this.transitionView.style.display = '';
-  }
-
-  set selectedMapLogEntries(list) {
-    this._selectedMapLogEntries = list;
-    this.update();
-  }
-
-  get selectedMapLogEntries() {
-    return this._selectedMapLogEntries;
-  }
-
-  addMapAndParentTransitions(map) {
-    if (map === void 0) return;
-    if (this._displayedMapsInTree.has(map)) return;
-    this._displayedMapsInTree.add(map);
-    this.currentNode = this.transitionView;
-    let parents = map.getParents();
-    if (parents.length > 0) {
-      this.addTransitionTo(parents.pop());
-      parents.reverse().forEach((each) => this.addTransitionTo(each));
-    }
-    let mapNode = this.addSubtransitions(map);
-    // Mark and show the selected map.
-    mapNode.classList.add('selected');
-    if (this.selectedMap == map) {
-      setTimeout(
-          () => mapNode.scrollIntoView({
-            behavior: 'smooth',
-            block: 'nearest',
-            inline: 'nearest',
-          }),
-          1);
-    }
-  }
-
-  addSubtransitions(map) {
-    let mapNode = this.addTransitionTo(map);
-    // Draw outgoing linear transition line.
-    let current = map;
-    while (current.children.length == 1) {
-      current = current.children[0].to;
-      this.addTransitionTo(current);
-    }
-    return mapNode;
-  }
-
-  addTransitionEdge(map) {
-    let classes = ['transitionEdge'];
-    let edge = DOM.div(classes);
-    edge.style.backgroundColor = typeToColor(map.edge);
-    let labelNode = DOM.div('transitionLabel');
-    labelNode.innerText = map.edge.toString();
-    edge.appendChild(labelNode);
-    return edge;
-  }
-
-  addTransitionTo(map) {
-    // transition[ transitions[ transition[...], transition[...], ...]];
-    this._displayedMapsInTree?.add(map);
-    let transition = DOM.div('transition');
-    if (map.isDeprecated()) transition.classList.add('deprecated');
-    if (map.edge) {
-      transition.appendChild(this.addTransitionEdge(map));
-    }
-    let mapNode = this.addMapNode(map);
-    transition.appendChild(mapNode);
-
-    let subtree = DOM.div('transitions');
-    transition.appendChild(subtree);
-
-    this.currentNode.appendChild(transition);
-    this.currentNode = subtree;
-
-    return mapNode;
-  }
-
-  addMapNode(map) {
-    let node = DOM.div('map');
-    if (map.edge) node.style.backgroundColor = typeToColor(map.edge);
-    node.map = map;
-    node.addEventListener('click', () => this._selectMap(map));
-    if (map.children.length > 1) {
-      node.innerText = map.children.length;
-      let showSubtree = DOM.div('showSubtransitions');
-      showSubtree.addEventListener('click', (e) => this.toggleSubtree(e, node));
-      node.appendChild(showSubtree);
-    } else if (map.children.length == 0) {
-      node.innerHTML = '&#x25CF;';
-    }
-    this.currentNode.appendChild(node);
-    return node;
-  }
-
-  toggleSubtree(event, node) {
-    let map = node.map;
-    event.target.classList.toggle('opened');
-    let transitionsNode = node.parentElement.querySelector('.transitions');
-    let subtransitionNodes = transitionsNode.children;
-    if (subtransitionNodes.length <= 1) {
-      // Add subtransitions excepth the one that's already shown.
-      let visibleTransitionMap = subtransitionNodes.length == 1 ?
-          transitionsNode.querySelector('.map').map :
-          void 0;
-      map.children.forEach((edge) => {
-        if (edge.to != visibleTransitionMap) {
-          this.currentNode = transitionsNode;
-          this.addSubtransitions(edge.to);
-        }
-      });
-    } else {
-      // remove all but the first (currently selected) subtransition
-      for (let i = subtransitionNodes.length - 1; i > 0; i--) {
-        transitionsNode.removeChild(subtransitionNodes[i]);
-      }
-    }
-  }
-});
diff --git a/deps/v8/tools/system-analyzer/processor.mjs b/deps/v8/tools/system-analyzer/processor.mjs
index 49448bb9da0a19..9685e09ad6b076 100644
--- a/deps/v8/tools/system-analyzer/processor.mjs
+++ b/deps/v8/tools/system-analyzer/processor.mjs
@@ -5,7 +5,8 @@
 import {LogReader, parseString, parseVarArgs} from '../logreader.mjs';
 import {Profile} from '../profile.mjs';
 
-import {DeoptLogEntry} from './log/deopt.mjs';
+import {ApiLogEntry} from './log/api.mjs';
+import {CodeLogEntry, DeoptLogEntry} from './log/code.mjs';
 import {IcLogEntry} from './log/ic.mjs';
 import {Edge, MapLogEntry} from './log/map.mjs';
 import {Timeline} from './timeline.mjs';
@@ -17,17 +18,28 @@ export class Processor extends LogReader {
   _mapTimeline = new Timeline();
   _icTimeline = new Timeline();
   _deoptTimeline = new Timeline();
+  _codeTimeline = new Timeline();
+  _apiTimeline = new Timeline();
   _formatPCRegexp = /(.*):[0-9]+:[0-9]+$/;
+  _lastTimestamp = 0;
+  _lastCodeLogEntry;
   MAJOR_VERSION = 7;
   MINOR_VERSION = 6;
   constructor(logString) {
     super();
-    this.propertyICParser = [
+    const propertyICParser = [
       parseInt, parseInt, parseInt, parseInt, parseString, parseString,
       parseString, parseString, parseString, parseString
     ];
     this.dispatchTable_ = {
       __proto__: null,
+      'v8-version': {
+        parsers: [
+          parseInt,
+          parseInt,
+        ],
+        processor: this.processV8Version
+      },
       'code-creation': {
         parsers: [
           parseString, parseInt, parseInt, parseInt, parseInt, parseString,
@@ -42,20 +54,28 @@ export class Processor extends LogReader {
         ],
         processor: this.processCodeDeopt
       },
-      'v8-version': {
+      'code-move':
+          {parsers: [parseInt, parseInt], processor: this.processCodeMove},
+      'code-delete': {parsers: [parseInt], processor: this.processCodeDelete},
+      'code-source-info': {
+        parsers: [
+          parseInt, parseInt, parseInt, parseInt, parseString, parseString,
+          parseString
+        ],
+        processor: this.processCodeSourceInfo
+      },
+      'code-disassemble': {
         parsers: [
           parseInt,
-          parseInt,
+          parseString,
+          parseString,
         ],
-        processor: this.processV8Version
+        processor: this.processCodeDisassemble
       },
       'script-source': {
         parsers: [parseInt, parseString, parseString],
         processor: this.processScriptSource
       },
-      'code-move':
-          {parsers: [parseInt, parseInt], processor: this.processCodeMove},
-      'code-delete': {parsers: [parseInt], processor: this.processCodeDelete},
       'sfi-move':
           {parsers: [parseInt, parseInt], processor: this.processFunctionMove},
       'map-create':
@@ -72,33 +92,37 @@ export class Processor extends LogReader {
         processor: this.processMapDetails
       },
       'LoadGlobalIC': {
-        parsers: this.propertyICParser,
+        parsers: propertyICParser,
         processor: this.processPropertyIC.bind(this, 'LoadGlobalIC')
       },
       'StoreGlobalIC': {
-        parsers: this.propertyICParser,
+        parsers: propertyICParser,
         processor: this.processPropertyIC.bind(this, 'StoreGlobalIC')
       },
       'LoadIC': {
-        parsers: this.propertyICParser,
+        parsers: propertyICParser,
         processor: this.processPropertyIC.bind(this, 'LoadIC')
       },
       'StoreIC': {
-        parsers: this.propertyICParser,
+        parsers: propertyICParser,
         processor: this.processPropertyIC.bind(this, 'StoreIC')
       },
       'KeyedLoadIC': {
-        parsers: this.propertyICParser,
+        parsers: propertyICParser,
         processor: this.processPropertyIC.bind(this, 'KeyedLoadIC')
       },
       'KeyedStoreIC': {
-        parsers: this.propertyICParser,
+        parsers: propertyICParser,
         processor: this.processPropertyIC.bind(this, 'KeyedStoreIC')
       },
       'StoreInArrayLiteralIC': {
-        parsers: this.propertyICParser,
+        parsers: propertyICParser,
         processor: this.processPropertyIC.bind(this, 'StoreInArrayLiteralIC')
       },
+      'api': {
+        parsers: [parseString, parseVarArgs],
+        processor: this.processApiEvent
+      },
     };
     if (logString) this.processString(logString);
   }
@@ -166,45 +190,56 @@ export class Processor extends LogReader {
     });
   }
 
-  /**
-   * Parser for dynamic code optimization state.
-   */
-  parseState(s) {
-    switch (s) {
-      case '':
-        return Profile.CodeState.COMPILED;
-      case '~':
-        return Profile.CodeState.OPTIMIZABLE;
-      case '*':
-        return Profile.CodeState.OPTIMIZED;
+  processV8Version(majorVersion, minorVersion) {
+    if ((majorVersion == this.MAJOR_VERSION &&
+         minorVersion <= this.MINOR_VERSION) ||
+        (majorVersion < this.MAJOR_VERSION)) {
+      window.alert(
+          `Unsupported version ${majorVersion}.${minorVersion}. \n` +
+          `Please use the matching tool for given the V8 version.`);
     }
-    throw new Error(`unknown code state: ${s}`);
   }
 
   processCodeCreation(type, kind, timestamp, start, size, name, maybe_func) {
+    this._lastTimestamp = timestamp;
+    let entry;
+    let stateName = '';
     if (maybe_func.length) {
       const funcAddr = parseInt(maybe_func[0]);
-      const state = this.parseState(maybe_func[1]);
-      this._profile.addFuncCode(
+      stateName = maybe_func[1] ?? '';
+      const state = Profile.parseState(maybe_func[1]);
+      entry = this._profile.addFuncCode(
           type, name, timestamp, start, size, funcAddr, state);
     } else {
-      this._profile.addCode(type, name, timestamp, start, size);
+      entry = this._profile.addCode(type, name, timestamp, start, size);
     }
+    this._lastCodeLogEntry =
+        new CodeLogEntry(type + stateName, timestamp, kind, entry);
+    this._codeTimeline.push(this._lastCodeLogEntry);
   }
 
   processCodeDeopt(
       timestamp, codeSize, instructionStart, inliningId, scriptOffset,
       deoptKind, deoptLocation, deoptReason) {
-    this._deoptTimeline.push(new DeoptLogEntry(deoptKind, timestamp));
-  }
-
-  processV8Version(majorVersion, minorVersion) {
-    if ((majorVersion == this.MAJOR_VERSION &&
-         minorVersion <= this.MINOR_VERSION) ||
-        (majorVersion < this.MAJOR_VERSION)) {
-      window.alert(
-          `Unsupported version ${majorVersion}.${minorVersion}. \n` +
-          `Please use the matching tool for given the V8 version.`);
+    this._lastTimestamp = timestamp;
+    const codeEntry = this._profile.findEntry(instructionStart);
+    const logEntry = new DeoptLogEntry(
+        deoptKind, timestamp, codeEntry, deoptReason, deoptLocation,
+        scriptOffset, instructionStart, codeSize, inliningId);
+    this._deoptTimeline.push(logEntry);
+    this.addSourcePosition(codeEntry, logEntry);
+    logEntry.functionSourcePosition = logEntry.sourcePosition;
+    // custom parse deopt location
+    if (deoptLocation !== '<unknown>') {
+      const colSeparator = deoptLocation.lastIndexOf(':');
+      const rowSeparator = deoptLocation.lastIndexOf(':', colSeparator - 1);
+      const script = this.getScript(deoptLocation.substring(1, rowSeparator));
+      const line =
+          parseInt(deoptLocation.substring(rowSeparator + 1, colSeparator));
+      const column = parseInt(
+          deoptLocation.substring(colSeparator + 1, deoptLocation.length - 1));
+      logEntry.sourcePosition =
+          script.addSourcePosition(line, column, logEntry);
     }
   }
 
@@ -224,111 +259,138 @@ export class Processor extends LogReader {
     this._profile.moveFunc(from, to);
   }
 
-  formatName(entry) {
-    if (!entry) return '<unknown>';
-    let name = entry.func.getName();
-    let re = /(.*):[0-9]+:[0-9]+$/;
-    let array = re.exec(name);
-    if (!array) return name;
-    return entry.getState() + array[1];
+  processCodeSourceInfo(
+      start, scriptId, startPos, endPos, sourcePositions, inliningPositions,
+      inlinedFunctions) {
+    this._profile.addSourcePositions(
+        start, scriptId, startPos, endPos, sourcePositions, inliningPositions,
+        inlinedFunctions);
+    let profileEntry = this._profile.findEntry(start);
+    if (profileEntry !== this._lastCodeLogEntry._entry) return;
+    this.addSourcePosition(profileEntry, this._lastCodeLogEntry);
+    this._lastCodeLogEntry = undefined;
+  }
+
+  addSourcePosition(profileEntry, logEntry) {
+    let script = this.getProfileEntryScript(profileEntry);
+    const parts = profileEntry.getRawName().split(':');
+    if (parts.length < 3) return;
+    const line = parseInt(parts[parts.length - 2]);
+    const column = parseInt(parts[parts.length - 1]);
+    logEntry.sourcePosition = script.addSourcePosition(line, column, logEntry);
+  }
+
+  processCodeDisassemble(start, kind, disassemble) {
+    this._profile.addDisassemble(start, kind, disassemble);
   }
 
   processPropertyIC(
-      type, pc, time, line, column, old_state, new_state, map, key, modifier,
+      type, pc, time, line, column, old_state, new_state, mapId, key, modifier,
       slow_reason) {
-    let fnName = this.functionName(pc);
-    let parts = fnName.split(' ');
-    let fileName = parts[parts.length - 1];
-    let script = this.getScript(fileName);
+    this._lastTimestamp = time;
+    const profileEntry = this._profile.findEntry(pc);
+    const fnName = this.formatProfileEntry(profileEntry);
+    const script = this.getProfileEntryScript(profileEntry);
+    const map = this.getOrCreateMapEntry(mapId, time);
     // TODO: Use SourcePosition here directly
     let entry = new IcLogEntry(
         type, fnName, time, line, column, key, old_state, new_state, map,
-        slow_reason, script, modifier);
+        slow_reason, modifier);
     if (script) {
       entry.sourcePosition = script.addSourcePosition(line, column, entry);
     }
     this._icTimeline.push(entry);
   }
 
-  functionName(pc) {
-    let entry = this._profile.findEntry(pc);
-    return this.formatName(entry);
-  }
-  formatPC(pc, line, column) {
-    let entry = this._profile.findEntry(pc);
-    if (!entry) return '<unknown>'
-      if (entry.type === 'Builtin') {
-        return entry.name;
-      }
-    let name = entry.func.getName();
-    let array = this._formatPCRegexp.exec(name);
-    if (array === null) {
-      entry = name;
-    } else {
-      entry = entry.getState() + array[1];
-    }
-    return entry + ':' + line + ':' + column;
+  formatProfileEntry(profileEntry, line, column) {
+    if (!profileEntry) return '<unknown>';
+    if (profileEntry.type === 'Builtin') return profileEntry.name;
+    const name = profileEntry.func.getName();
+    const array = this._formatPCRegexp.exec(name);
+    const formatted =
+        (array === null) ? name : profileEntry.getState() + array[1];
+    if (line === undefined || column === undefined) return formatted;
+    return `${formatted}:${line}:${column}`;
   }
 
-  processFileName(filePositionLine) {
-    if (!filePositionLine.includes(' ')) return;
-    // Try to handle urls with file positions: https://foo.bar.com/:17:330"
-    filePositionLine = filePositionLine.split(' ');
-    let parts = filePositionLine[1].split(':');
-    if (parts[0].length <= 5) return parts[0] + ':' + parts[1];
-    return parts[1];
+  getProfileEntryScript(profileEntry) {
+    if (!profileEntry) return undefined;
+    if (profileEntry.type === 'Builtin') return undefined;
+    const script = profileEntry.source?.script;
+    if (script !== undefined) return script;
+    // Slow path, try to get the script from the url:
+    const fnName = this.formatProfileEntry(profileEntry);
+    let parts = fnName.split(' ');
+    let fileName = parts[parts.length - 1];
+    return this.getScript(fileName);
   }
 
   processMap(type, time, from, to, pc, line, column, reason, name) {
-    let time_ = parseInt(time);
+    this._lastTimestamp = time;
+    const time_ = parseInt(time);
     if (type === 'Deprecate') return this.deprecateMap(type, time_, from);
-    let from_ = this.getExistingMapEntry(from, time_);
-    let to_ = this.getExistingMapEntry(to, time_);
+    // Skip normalized maps that were cached so we don't introduce multiple
+    // edges with the same source and target map.
+    if (type === 'NormalizeCached') return;
+    const from_ = this.getOrCreateMapEntry(from, time_);
+    const to_ = this.getOrCreateMapEntry(to, time_);
+    if (type === 'Normalize') {
+      // Fix a bug where we log "Normalize" transitions for maps created from
+      // the NormalizedMapCache.
+      if (to_.parent()?.id === from || to_.time < from_.time || to_.depth > 0) {
+        console.log(`Skipping transition to cached normalized map`);
+        return;
+      }
+    }
     // TODO: use SourcePosition directly.
     let edge = new Edge(type, name, reason, time, from_, to_);
-    to_.filePosition = this.formatPC(pc, line, column);
-    let fileName = this.processFileName(to_.filePosition);
-    // TODO: avoid undefined source positions.
-    if (fileName !== undefined) {
-      to_.script = this.getScript(fileName);
+    const profileEntry = this._profile.findEntry(pc)
+    to_.entry = profileEntry;
+    let script = this.getProfileEntryScript(profileEntry);
+    if (script) {
+      to_.sourcePosition = script.addSourcePosition(line, column, to_)
     }
-    if (to_.script) {
-      to_.sourcePosition = to_.script.addSourcePosition(line, column, to_)
+    if (to_.parent() !== undefined && to_.parent() === from_) {
+      // Fix bug where we double log transitions.
+      console.warn('Fixing up double transition');
+      to_.edge.updateFrom(edge);
+    } else {
+      edge.finishSetup();
     }
-    edge.finishSetup();
   }
 
   deprecateMap(type, time, id) {
-    this.getExistingMapEntry(id, time).deprecate();
+    this._lastTimestamp = time;
+    this.getOrCreateMapEntry(id, time).deprecate();
   }
 
   processMapCreate(time, id) {
     // map-create events might override existing maps if the addresses get
     // recycled. Hence we do not check for existing maps.
-    let map = this.createMapEntry(id, time);
+    this._lastTimestamp = time;
+    this.createMapEntry(id, time);
   }
 
   processMapDetails(time, id, string) {
     // TODO(cbruni): fix initial map logging.
-    let map = this.getExistingMapEntry(id, time);
+    const map = this.getOrCreateMapEntry(id, time);
     map.description = string;
   }
 
   createMapEntry(id, time) {
-    let map = new MapLogEntry(id, time);
+    this._lastTimestamp = time;
+    const map = new MapLogEntry(id, time);
     this._mapTimeline.push(map);
     return map;
   }
 
-  getExistingMapEntry(id, time) {
+  getOrCreateMapEntry(id, time) {
     if (id === '0x000000000000') return undefined;
-    let map = MapLogEntry.get(id, time);
-    if (map === undefined) {
-      console.error(`No map details provided: id=${id}`);
-      // Manually patch in a map to continue running.
-      return this.createMapEntry(id, time);
-    };
-    return map;
+    const map = MapLogEntry.get(id, time);
+    if (map !== undefined) return map;
+    console.warn(`No map details provided: id=${id}`);
+    // Manually patch in a map to continue running.
+    return this.createMapEntry(id, time);
   }
 
   getScript(url) {
@@ -340,6 +402,22 @@ export class Processor extends LogReader {
     return script;
   }
 
+  processApiEvent(type, varArgs) {
+    let name, arg1;
+    if (varArgs.length == 0) {
+      const index = type.indexOf(':');
+      if (index > 0) {
+        name = type;
+        type = type.substr(0, index);
+      }
+    } else {
+      name = varArgs[0];
+      arg1 = varArgs[1];
+    }
+    this._apiTimeline.push(
+        new ApiLogEntry(type, this._lastTimestamp, name, arg1));
+  }
+
   get icTimeline() {
     return this._icTimeline;
   }
@@ -352,7 +430,19 @@ export class Processor extends LogReader {
     return this._deoptTimeline;
   }
 
+  get codeTimeline() {
+    return this._codeTimeline;
+  }
+
+  get apiTimeline() {
+    return this._apiTimeline;
+  }
+
   get scripts() {
     return this._profile.scripts_.filter(script => script !== undefined);
   }
+
+  get profile() {
+    return this._profile;
+  }
 }
diff --git a/deps/v8/tools/system-analyzer/source-panel-template.html b/deps/v8/tools/system-analyzer/source-panel-template.html
deleted file mode 100644
index 01b777042f3d6a..00000000000000
--- a/deps/v8/tools/system-analyzer/source-panel-template.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- Copyright 2020 the V8 project authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file. -->
-
-<head>
-  <link href="./index.css" rel="stylesheet">
-</head>
-<style>
-  pre.scriptNode {
-    white-space: pre-wrap;
-  }
-
-  pre.scriptNode:before {
-    counter-reset: sourceLineCounter;
-  }
-
-  pre.scriptNode span {
-    counter-increment: sourceLineCounter;
-  }
-
-  pre.scriptNode span::before {
-    content: counter(sourceLineCounter) ": ";
-    display: inline-block;
-    width: 4em;
-    padding-left: auto;
-    margin-left: auto;
-    text-align: right;
-  }
-
-  mark {
-    width: 1ch;
-    border-radius: 2px;
-    border: 0.5px var(--background-color) solid;
-    cursor: pointer;
-    background-color: var(--primary-color);
-    color: var(--on-primary-color);
-  }
-
-  .marked {
-    background-color: var(--secondary-color);
-  }
-
-  #script-dropdown {
-    width: 100%;
-    margin-bottom: 10px;
-  }
-</style>
-<div class="panel">
-  <h2>Source Panel</h2>
-  <select id="script-dropdown"></select>
-  <div id="script" class="panelBody">
-    <pre class="scripNode"></pre>
-  </div>
-</div>
diff --git a/deps/v8/tools/system-analyzer/stats-panel-template.html b/deps/v8/tools/system-analyzer/stats-panel-template.html
deleted file mode 100644
index fb91fad1cf0050..00000000000000
--- a/deps/v8/tools/system-analyzer/stats-panel-template.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- Copyright 2020 the V8 project authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file. -->
-
-<head>
-  <link href="./index.css" rel="stylesheet">
-</head>
-<style>
-  #stats {
-    display: flex;
-    height: 250px;
-    background-color: var(--surface-color);
-    padding: 10px 10px 10px 10px;
-    margin: auto;
-  }
-
-  table {
-    flex: 1;
-    max-height: 250px;
-    display: inline-block;
-    overflow-y: scroll;
-    border-collapse: collapse;
-  }
-  table td {
-    padding: 2px;
-  }
-
-  table thead td {
-    border-bottom: 1px var(--on-surface-color) dotted;
-  }
-
-  table tbody td {
-    cursor: pointer;
-  }
-
-  #nameTable tr {
-    max-width: 200px;
-
-  }
-
-  #nameTable tr td:nth-child(1) {
-    text-align: right;
-  }
-
-  #typeTable {
-    text-align: right;
-    max-width: 380px;
-  }
-
-  #typeTable tr td:nth-child(2) {
-    text-align: left;
-  }
-</style>
-<div class="panel">
-  <h2>Map Stats</h2>
-  <section id="stats">
-    <table id="typeTable" class="statsTable">
-      <thead>
-        <tr><td></td><td>Type</td><td>Count</td><td>Percent</td></tr>
-      </thead>
-      <tbody></tbody>
-    </table>
-    <table id="nameTable">
-      <thead>
-        <tr><td>Count</td><td>Propery Name</td></tr>
-      </thead>
-      <tbody></tbody>
-      <tfoot>
-        <tr><td colspan="2" class="clickable">Show more...</td></tr>
-      </tfoo>
-    </table>
-  </section>
-</div>
diff --git a/deps/v8/tools/system-analyzer/stats-panel.mjs b/deps/v8/tools/system-analyzer/stats-panel.mjs
deleted file mode 100644
index dd0ac78489a790..00000000000000
--- a/deps/v8/tools/system-analyzer/stats-panel.mjs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-import {SelectionEvent} from './events.mjs';
-import {DOM, V8CustomElement} from './helper.mjs';
-import {delay, LazyTable} from './helper.mjs';
-
-DOM.defineCustomElement(
-    'stats-panel', (templateText) => class StatsPanel extends V8CustomElement {
-      _timeline;
-      _transitions;
-      _selectedLogEntries;
-      constructor() {
-        super(templateText);
-      }
-
-      get stats() {
-        return this.$('#stats');
-      }
-
-      set timeline(timeline) {
-        this._timeline = timeline;
-        this.selectedLogEntries = timeline.all
-      }
-
-      set selectedLogEntries(entries) {
-        this._selectedLogEntries = entries;
-        this.update();
-      }
-
-      set transitions(value) {
-        this._transitions = value;
-      }
-
-      _filterUniqueTransitions(filter) {
-        // Returns a list of Maps whose parent is not in the list.
-        return this._selectedLogEntries.filter((map) => {
-          if (filter(map) === false) return false;
-          let parent = map.parent();
-          if (parent === undefined) return true;
-          return filter(parent) === false;
-        });
-      }
-
-      _update() {
-        this._updateGeneralStats();
-        this._updateNamedTransitionsStats();
-      }
-
-      _updateGeneralStats() {
-        console.assert(this._timeline !== undefined, 'Timeline not set yet!');
-        let pairs = [
-          ['Transitions', 'primary', (e) => e.edge && e.edge.isTransition()],
-          ['Fast to Slow', 'violet', (e) => e.edge && e.edge.isFastToSlow()],
-          ['Slow to Fast', 'orange', (e) => e.edge && e.edge.isSlowToFast()],
-          ['Initial Map', 'yellow', (e) => e.edge && e.edge.isInitial()],
-          [
-            'Replace Descriptors',
-            'red',
-            (e) => e.edge && e.edge.isReplaceDescriptors(),
-          ],
-          [
-            'Copy as Prototype',
-            'red',
-            (e) => e.edge && e.edge.isCopyAsPrototype(),
-          ],
-          [
-            'Optimize as Prototype',
-            null,
-            (e) => e.edge && e.edge.isOptimizeAsPrototype(),
-          ],
-          ['Deprecated', null, (e) => e.isDeprecated()],
-          ['Bootstrapped', 'green', (e) => e.isBootstrapped()],
-          ['Total', null, (e) => true],
-        ];
-
-        let tbody = document.createElement('tbody');
-        let total = this._selectedLogEntries.length;
-        pairs.forEach(([name, color, filter]) => {
-          let row = DOM.tr();
-          if (color !== null) {
-            row.appendChild(DOM.td(DOM.div(['colorbox', color])));
-          } else {
-            row.appendChild(DOM.td(''));
-          }
-          row.classList.add('clickable');
-          row.onclick = (e) => {
-            // lazily compute the stats
-            let node = e.target.parentNode;
-            if (node.maps == undefined) {
-              node.maps = this._filterUniqueTransitions(filter);
-            }
-            this.dispatchEvent(new SelectionEvent(node.maps));
-          };
-          row.appendChild(DOM.td(name));
-          let count = this._count(filter);
-          row.appendChild(DOM.td(count));
-          let percent = Math.round((count / total) * 1000) / 10;
-          row.appendChild(DOM.td(percent.toFixed(1) + '%'));
-          tbody.appendChild(row);
-        });
-        this.$('#typeTable').replaceChild(tbody, this.$('#typeTable tbody'));
-      }
-
-      _count(filter) {
-        let count = 0;
-        for (const map of this._selectedLogEntries) {
-          if (filter(map)) count++;
-        }
-        return count;
-      }
-
-      _updateNamedTransitionsStats() {
-        let rowData = Array.from(this._transitions.entries());
-        rowData.sort((a, b) => b[1].length - a[1].length);
-        new LazyTable(this.$('#nameTable'), rowData, ([name, maps]) => {
-          let row = DOM.tr();
-          row.maps = maps;
-          row.classList.add('clickable');
-          row.addEventListener(
-              'click',
-              (e) => this.dispatchEvent(new SelectionEvent(
-                  e.target.parentNode.maps.map((map) => map.to))));
-          row.appendChild(DOM.td(maps.length));
-          row.appendChild(DOM.td(name));
-          return row;
-        });
-      }
-    });
diff --git a/deps/v8/tools/system-analyzer/timeline-panel-template.html b/deps/v8/tools/system-analyzer/timeline-panel-template.html
deleted file mode 100644
index 2641c714414190..00000000000000
--- a/deps/v8/tools/system-analyzer/timeline-panel-template.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Copyright 2020 the V8 project authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file. -->
-
-<head>
-  <link href="./index.css" rel="stylesheet">
-</head>
-<div class="panel">
-  <h2>Timeline Panel</h2>
-  <div>
-    <slot></slot>
-  </div>
-</div>
diff --git a/deps/v8/tools/system-analyzer/timeline.mjs b/deps/v8/tools/system-analyzer/timeline.mjs
index 996f108b6a456b..13e97553e6c105 100644
--- a/deps/v8/tools/system-analyzer/timeline.mjs
+++ b/deps/v8/tools/system-analyzer/timeline.mjs
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {groupBy} from './helper.mjs'
+
 class Timeline {
   // Class:
   _model;
@@ -9,13 +11,13 @@ class Timeline {
   _values;
   // Current selection, subset of #values:
   _selection;
-  _uniqueTypes;
+  _breakdown;
 
-  constructor(model) {
+  constructor(model, values = [], startTime = 0, endTime = 0) {
     this._model = model;
-    this._values = [];
-    this.startTime = 0;
-    this.endTime = 0;
+    this._values = values;
+    this.startTime = startTime;
+    this.endTime = endTime;
   }
 
   get model() {
@@ -30,21 +32,28 @@ class Timeline {
     return this._selection;
   }
 
+  get selectionOrSelf() {
+    return this._selection ?? this;
+  }
+
   set selection(value) {
     this._selection = value;
   }
 
-  selectTimeRange(start, end) {
-    this._selection = this.filter(e => e.time >= start && e.time <= end);
+  selectTimeRange(startTime, endTime) {
+    const items = this.range(startTime, endTime);
+    this._selection = new Timeline(this._model, items, startTime, endTime);
+  }
+
+  clearSelection() {
+    this._selection = undefined;
   }
 
   getChunks(windowSizeMs) {
-    // TODO(zcankara) Fill this one
     return this.chunkSizes(windowSizeMs);
   }
 
   get values() {
-    // TODO(zcankara) Not to break something delete later
     return this._values;
   }
 
@@ -94,6 +103,10 @@ class Timeline {
     return this._values.length;
   }
 
+  slice(startIndex, endIndex) {
+    return this._values.slice(startIndex, endIndex);
+  }
+
   first() {
     return this._values[0];
   }
@@ -102,17 +115,23 @@ class Timeline {
     return this._values[this._values.length - 1];
   }
 
+  * [Symbol.iterator]() {
+    yield* this._values;
+  }
+
   duration() {
+    if (this.isEmpty()) return 0;
     return this.last().time - this.first().time;
   }
 
   forEachChunkSize(count, fn) {
+    if (this.isEmpty()) return;
     const increment = this.duration() / count;
     let currentTime = this.first().time + increment;
     let index = 0;
     for (let i = 0; i < count; i++) {
-      let nextIndex = this.find(currentTime, index);
-      let nextTime = currentTime + increment;
+      const nextIndex = this.find(currentTime, index);
+      const nextTime = currentTime + increment;
       fn(index, nextIndex, currentTime, nextTime);
       index = nextIndex;
       currentTime = nextTime;
@@ -120,56 +139,55 @@ class Timeline {
   }
 
   chunkSizes(count) {
-    let chunks = [];
+    const chunks = [];
     this.forEachChunkSize(count, (start, end) => chunks.push(end - start));
     return chunks;
   }
 
-  chunks(count) {
-    let chunks = [];
+  chunks(count, predicate = undefined) {
+    const chunks = [];
     this.forEachChunkSize(count, (start, end, startTime, endTime) => {
       let items = this._values.slice(start, end);
+      if (predicate !== undefined) items = items.filter(predicate);
       chunks.push(new Chunk(chunks.length, startTime, endTime, items));
     });
     return chunks;
   }
 
-  range(start, end) {
-    const first = this.find(start);
-    if (first < 0) return [];
-    const last = this.find(end, first);
-    return this._values.slice(first, last);
+  // Return all entries in ({startTime}, {endTime}]
+  range(startTime, endTime) {
+    const firstIndex = this.find(startTime);
+    if (firstIndex < 0) return [];
+    const lastIndex = this.find(endTime, firstIndex + 1);
+    return this._values.slice(firstIndex, lastIndex);
   }
 
+  // Return the first index for the first element at {time}.
   find(time, offset = 0) {
     return this._find(this._values, each => each.time - time, offset);
   }
 
-  _find(array, cmp, offset = 0) {
-    let min = offset;
-    let max = array.length;
-    while (min < max) {
-      let mid = min + Math.floor((max - min) / 2);
-      let result = cmp(array[mid]);
-      if (result > 0) {
-        max = mid - 1;
+  // Return the first index for which compareFn(item) is >= 0;
+  _find(array, compareFn, offset = 0) {
+    let minIndex = offset;
+    let maxIndex = array.length - 1;
+    while (minIndex < maxIndex) {
+      const midIndex = minIndex + (((maxIndex - minIndex) / 2) | 0);
+      if (compareFn(array[midIndex]) < 0) {
+        minIndex = midIndex + 1;
       } else {
-        min = mid + 1;
+        maxIndex = midIndex;
       }
     }
-    return min;
+    return minIndex;
   }
 
-  initializeTypes() {
-    const types = new Map();
-    for (const entry of this.all) {
-      types.get(entry.type)?.push(entry) ?? types.set(entry.type, [entry])
+  getBreakdown(keyFunction) {
+    if (keyFunction) return groupBy(this._values, keyFunction);
+    if (this._breakdown === undefined) {
+      this._breakdown = groupBy(this._values, each => each.type);
     }
-    return this._uniqueTypes = types;
-  }
-
-  get uniqueTypes() {
-    return this._uniqueTypes ?? this.initializeTypes();
+    return this._breakdown;
   }
 
   depthHistogram() {
@@ -215,6 +233,10 @@ class Chunk {
     return this.items.length;
   }
 
+  get length() {
+    return this.items.length;
+  }
+
   yOffset(event) {
     // items[0]   == oldest event, displayed at the top of the chunk
     // items[n-1] == youngest event, displayed at the bottom of the chunk
@@ -248,17 +270,8 @@ class Chunk {
     return chunk;
   }
 
-  getBreakdown(event_fn) {
-    if (event_fn === void 0) {
-      event_fn = each => each;
-    }
-    let breakdown = {__proto__: null};
-    this.items.forEach(each => {
-      const type = event_fn(each);
-      const v = breakdown[type];
-      breakdown[type] = (v | 0) + 1;
-    });
-    return Object.entries(breakdown).sort((a, b) => a[1] - b[1]);
+  getBreakdown(keyFunction) {
+    return groupBy(this.items, keyFunction);
   }
 
   filter() {
diff --git a/deps/v8/tools/system-analyzer/timeline/timeline-track-template.html b/deps/v8/tools/system-analyzer/timeline/timeline-track-template.html
deleted file mode 100644
index e14b927e4b374e..00000000000000
--- a/deps/v8/tools/system-analyzer/timeline/timeline-track-template.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!-- Copyright 2020 the V8 project authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file. -->
-
-<head>
-  <link href="./index.css" rel="stylesheet">
-</head>
-<style>
-  #timeline {
-    position: relative;
-    height: calc(200px + 12px);
-    overflow-y: hidden;
-    overflow-x: scroll;
-    user-select: none;
-  }
-
-  #timelineLabel {
-    transform: rotate(90deg);
-    transform-origin: left bottom 0;
-    position: absolute;
-    left: 0;
-    width: 200px;
-    text-align: center;
-    font-size: 10px;
-    opacity: 0.5;
-  }
-
-  #timelineChunks {
-    height: 200px;
-    position: absolute;
-    margin-right: 100px;
-  }
-
-  #timelineCanvas {
-    height: 200px;
-    position: relative;
-    overflow: visible;
-    pointer-events: none;
-  }
-
-  .chunk {
-    width: 6px;
-    position: absolute;
-    background-size: 100% 100%;
-    image-rendering: pixelated;
-    bottom: 0px;
-    background-color: var(--on-surface-color);
-    cursor: pointer;
-  }
-  .chunk:hover {
-    border-radius: 2px 2px 0 0;
-    margin: 0 0 -2px -2px;
-    border: 2px var(--primary-color) solid;
-  }
-
-  .timestamp {
-    height: 200px;
-    width: 100px;
-    border-left: 1px var(--on-surface-color) dashed;
-    padding-left: 4px;
-    position: absolute;
-    pointer-events: none;
-    font-size: 10px;
-  }
-
-  #legend {
-    position: relative;
-    float: right;
-    width: 100%;
-    max-width: 280px;
-    padding-left: 20px;
-    padding-top: 10px;
-    border-collapse: collapse;
-  }
-
-  th,
-  td {
-    width: 200px;
-    text-align: left;
-    padding-bottom: 3px;
-  }
-
-  /* right align numbers */
-  #legend td:nth-of-type(4n+3),
-  #legend td:nth-of-type(4n+4) {
-    text-align: right;
-  }
-
-  .legendTypeColumn {
-    width: 100%;
-  }
-
-  .timeline {
-    background-color: var(--timeline-background-color);
-  }
-
-  #timeline .rightHandle,
-  #timeline .leftHandle {
-    background-color: rgba(200, 200, 200, 0.5);
-    height: 100%;
-    width: 5px;
-    position: absolute;
-    z-index: 3;
-    cursor: col-resize;
-  }
-  #timeline .leftHandle {
-    border-left: 1px solid var(--on-surface-color);
-  }
-  #timeline .rightHandle {
-    border-right: 1px solid var(--on-surface-color);
-  }
-
-  #timeline .selection {
-    background-color: rgba(133, 68, 163, 0.5);
-    height: 100%;
-    position: absolute;
-  }
-</style>
-<table id="legend" class="typeStatsTable">
-  <thead>
-    <tr>
-      <td></td>
-      <td>Type</td>
-      <td>Count</td>
-      <td>Percent</td>
-    </tr>
-  </thead>
-  <tbody id="legendContent">
-  </tbody>
-</table>
-<div id="timeline">
-  <div class="leftHandle"></div>
-  <div class="selection"></div>
-  <div class="rightHandle"></div>
-  <div id="timelineLabel">Frequency</div>
-  <div id="timelineChunks"></div>
-  <canvas id="timelineCanvas"></canvas>
-</div>
\ No newline at end of file
diff --git a/deps/v8/tools/system-analyzer/timeline/timeline-track.mjs b/deps/v8/tools/system-analyzer/timeline/timeline-track.mjs
deleted file mode 100644
index a37bcce2c56b2f..00000000000000
--- a/deps/v8/tools/system-analyzer/timeline/timeline-track.mjs
+++ /dev/null
@@ -1,518 +0,0 @@
-// Copyright 2020 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import {FocusEvent, SelectionEvent, SelectTimeEvent, SynchronizeSelectionEvent} from '../events.mjs';
-import {CSSColor, delay, DOM, V8CustomElement} from '../helper.mjs';
-import {kChunkHeight, kChunkWidth} from '../log/map.mjs';
-
-const kColors = [
-  CSSColor.green,
-  CSSColor.violet,
-  CSSColor.orange,
-  CSSColor.yellow,
-  CSSColor.primaryColor,
-  CSSColor.red,
-  CSSColor.blue,
-  CSSColor.yellow,
-  CSSColor.secondaryColor,
-];
-
-DOM.defineCustomElement('./timeline/timeline-track',
-                        (templateText) =>
-                            class TimelineTrack extends V8CustomElement {
-  // TODO turn into static field once Safari supports it.
-  static get SELECTION_OFFSET() {
-    return 10
-  };
-  _timeline;
-  _nofChunks = 400;
-  _chunks;
-  _selectedEntry;
-  _timeToPixel;
-  _timeSelection = {start: -1, end: Infinity};
-  _timeStartOffset;
-  _selectionOriginTime;
-  _typeToColor;
-  constructor() {
-    super(templateText);
-    this.timeline.addEventListener('scroll', e => this.handleTimelineScroll(e));
-    this.timeline.addEventListener(
-        'mousedown', e => this.handleTimeSelectionMouseDown(e));
-    this.timeline.addEventListener(
-        'mouseup', e => this.handleTimeSelectionMouseUp(e));
-    this.timeline.addEventListener(
-        'mousemove', e => this.handleTimeSelectionMouseMove(e));
-    this.backgroundCanvas = document.createElement('canvas');
-    this.isLocked = false;
-  }
-
-  handleTimeSelectionMouseDown(e) {
-    let xPosition = e.clientX
-    // Update origin time in case we click on a handle.
-    if (this.isOnLeftHandle(xPosition)) {
-      xPosition = this.rightHandlePosX;
-    }
-    else if (this.isOnRightHandle(xPosition)) {
-      xPosition = this.leftHandlePosX;
-    }
-    this._selectionOriginTime = this.positionToTime(xPosition);
-  }
-
-  isOnLeftHandle(posX) {
-    return (
-        Math.abs(this.leftHandlePosX - posX) <= TimelineTrack.SELECTION_OFFSET);
-  }
-
-  isOnRightHandle(posX) {
-    return (
-        Math.abs(this.rightHandlePosX - posX) <=
-        TimelineTrack.SELECTION_OFFSET);
-  }
-
-  handleTimeSelectionMouseMove(e) {
-    if (!this._isSelecting) return;
-    const currentTime = this.positionToTime(e.clientX);
-    this.dispatchEvent(new SynchronizeSelectionEvent(
-        Math.min(this._selectionOriginTime, currentTime),
-        Math.max(this._selectionOriginTime, currentTime)));
-  }
-
-  handleTimeSelectionMouseUp(e) {
-    this._selectionOriginTime = -1;
-    const delta = this._timeSelection.end - this._timeSelection.start;
-    if (delta <= 1 || isNaN(delta)) return;
-    this.dispatchEvent(new SelectTimeEvent(
-        this._timeSelection.start, this._timeSelection.end));
-  }
-
-  set timeSelection(selection) {
-    this._timeSelection.start = selection.start;
-    this._timeSelection.end = selection.end;
-    this.updateSelection();
-  }
-
-  get _isSelecting() {
-    return this._selectionOriginTime >= 0;
-  }
-
-  updateSelection() {
-    const startPosition = this.timeToPosition(this._timeSelection.start);
-    const endPosition = this.timeToPosition(this._timeSelection.end);
-    const delta = endPosition - startPosition;
-    this.leftHandle.style.left = startPosition + 'px';
-    this.selection.style.left = startPosition + 'px';
-    this.rightHandle.style.left = endPosition + 'px';
-    this.selection.style.width = delta + 'px';
-  }
-
-  get leftHandlePosX() {
-    return this.leftHandle.getBoundingClientRect().x;
-  }
-
-  get rightHandlePosX() {
-    return this.rightHandle.getBoundingClientRect().x;
-  }
-
-  // Maps the clicked x position to the x position on timeline canvas
-  positionOnTimeline(posX) {
-    let rect = this.timeline.getBoundingClientRect();
-    let posClickedX = posX - rect.left + this.timeline.scrollLeft;
-    return posClickedX;
-  }
-
-  positionToTime(posX) {
-    let posTimelineX = this.positionOnTimeline(posX) + this._timeStartOffset;
-    return posTimelineX / this._timeToPixel;
-  }
-
-  timeToPosition(time) {
-    let posX = time * this._timeToPixel;
-    posX -= this._timeStartOffset
-    return posX;
-  }
-
-  get leftHandle() {
-    return this.$('.leftHandle');
-  }
-
-  get rightHandle() {
-    return this.$('.rightHandle');
-  }
-
-  get selection() {
-    return this.$('.selection');
-  }
-
-  get timelineCanvas() {
-    return this.$('#timelineCanvas');
-  }
-
-  get timelineChunks() {
-    return this.$('#timelineChunks');
-  }
-
-  get timeline() {
-    return this.$('#timeline');
-  }
-
-  get timelineLegend() {
-    return this.$('#legend');
-  }
-
-  get timelineLegendContent() {
-    return this.$('#legendContent');
-  }
-
-  set data(value) {
-    this._timeline = value;
-    this._resetTypeToColorCache();
-    this.update();
-  }
-
-  _update() {
-    this._updateChunks();
-    this._updateTimeline();
-    this._renderLegend();
-  }
-
-  _resetTypeToColorCache() {
-    this._typeToColor = new Map();
-    let lastIndex = 0;
-    for (const type of this.data.uniqueTypes.keys()) {
-      this._typeToColor.set(type, kColors[lastIndex++]);
-    }
-  }
-
-  get data() {
-    return this._timeline;
-  }
-
-  set nofChunks(count) {
-    this._nofChunks = count;
-    this.update();
-  }
-
-  get nofChunks() {
-    return this._nofChunks;
-  }
-
-  _updateChunks() {
-    this._chunks = this.data.chunks(this.nofChunks);
-  }
-
-  get chunks() {
-    return this._chunks;
-  }
-
-  set selectedEntry(value) {
-    this._selectedEntry = value;
-    if (value.edge) this.redraw();
-  }
-
-  get selectedEntry() {
-    return this._selectedEntry;
-  }
-
-  set scrollLeft(offset) {
-    this.timeline.scrollLeft = offset;
-  }
-
-  typeToColor(type) {
-    return this._typeToColor.get(type);
-  }
-
-  _renderLegend() {
-    let timelineLegendContent = this.timelineLegendContent;
-    DOM.removeAllChildren(timelineLegendContent);
-    this._timeline.uniqueTypes.forEach((entries, type) => {
-      let row = DOM.tr('clickable');
-      row.entries = entries;
-      row.addEventListener('dblclick', e => this.handleEntryTypeDblClick(e));
-      let color = this.typeToColor(type);
-      if (color !== null) {
-        let div = DOM.div('colorbox');
-        div.style.backgroundColor = color;
-        row.appendChild(DOM.td(div));
-      } else {
-        row.appendChild(DOM.td());
-      }
-      let td = DOM.td(type);
-      row.appendChild(td);
-      row.appendChild(DOM.td(entries.length));
-      let percent = (entries.length / this.data.all.length) * 100;
-      row.appendChild(DOM.td(percent.toFixed(1) + '%'));
-      timelineLegendContent.appendChild(row);
-    });
-    // Add Total row.
-    let row = DOM.tr();
-    row.appendChild(DOM.td(''));
-    row.appendChild(DOM.td('All'));
-    row.appendChild(DOM.td(this.data.all.length));
-    row.appendChild(DOM.td('100%'));
-    timelineLegendContent.appendChild(row);
-    this.timelineLegend.appendChild(timelineLegendContent);
-  }
-
-  handleEntryTypeDblClick(e) {
-    this.dispatchEvent(new SelectionEvent(e.target.parentNode.entries));
-  }
-
-  timelineIndicatorMove(offset) {
-    this.timeline.scrollLeft += offset;
-  }
-
-  handleTimelineScroll(e) {
-    let horizontal = e.currentTarget.scrollLeft;
-    this.dispatchEvent(new CustomEvent(
-        'scrolltrack', {bubbles: true, composed: true, detail: horizontal}));
-  }
-
-  async setChunkBackgrounds(backgroundTodo) {
-    const kMaxDuration = 50;
-    let lastTime = 0;
-    for (let [chunk, node] of backgroundTodo) {
-      const current = performance.now();
-      if (current - lastTime > kMaxDuration) {
-        await delay(25);
-        lastTime = current;
-      }
-      this.setChunkBackground(chunk, node);
-    }
-  }
-
-  setChunkBackground(chunk, node) {
-    // Render the types of transitions as bar charts
-    const kHeight = chunk.height;
-    const kWidth = 1;
-    this.backgroundCanvas.width = kWidth;
-    this.backgroundCanvas.height = kHeight;
-    let ctx = this.backgroundCanvas.getContext('2d');
-    ctx.clearRect(0, 0, kWidth, kHeight);
-    let y = 0;
-    let total = chunk.size();
-    let type, count;
-    if (true) {
-      chunk.getBreakdown(map => map.type).forEach(([type, count]) => {
-        ctx.fillStyle = this.typeToColor(type);
-        let height = count / total * kHeight;
-        ctx.fillRect(0, y, kWidth, y + height);
-        y += height;
-      });
-    } else {
-      chunk.items.forEach(map => {
-        ctx.fillStyle = this.typeToColor(map.type);
-        let y = chunk.yOffset(map);
-        ctx.fillRect(0, y, kWidth, y + 1);
-      });
-    }
-
-    let imageData = this.backgroundCanvas.toDataURL('image/webp', 0.2);
-    node.style.backgroundImage = `url(${imageData})`;
-  }
-
-  _updateTimeline() {
-    let chunksNode = this.timelineChunks;
-    DOM.removeAllChildren(chunksNode);
-    let chunks = this.chunks;
-    let max = chunks.max(each => each.size());
-    let start = this.data.startTime;
-    let end = this.data.endTime;
-    let duration = end - start;
-    this._timeToPixel = chunks.length * kChunkWidth / duration;
-    this._timeStartOffset = start * this._timeToPixel;
-    let addTimestamp = (time, name) => {
-      let timeNode = DOM.div('timestamp');
-      timeNode.innerText = name;
-      timeNode.style.left = ((time - start) * this._timeToPixel) + 'px';
-      chunksNode.appendChild(timeNode);
-    };
-    let backgroundTodo = [];
-    for (let i = 0; i < chunks.length; i++) {
-      let chunk = chunks[i];
-      let height = (chunk.size() / max * kChunkHeight);
-      chunk.height = height;
-      if (chunk.isEmpty()) continue;
-      let node = DOM.div();
-      node.className = 'chunk';
-      node.style.left = ((chunks[i].start - start) * this._timeToPixel) + 'px';
-      node.style.height = height + 'px';
-      node.chunk = chunk;
-      node.addEventListener('mousemove', e => this.handleChunkMouseMove(e));
-      node.addEventListener('click', e => this.handleChunkClick(e));
-      node.addEventListener('dblclick', e => this.handleChunkDoubleClick(e));
-      backgroundTodo.push([chunk, node])
-      chunksNode.appendChild(node);
-    }
-    this.setChunkBackgrounds(backgroundTodo);
-
-    // Put a time marker roughly every 20 chunks.
-    let expected = duration / chunks.length * 20;
-    let interval = (10 ** Math.floor(Math.log10(expected)));
-    let correction = Math.log10(expected / interval);
-    correction = (correction < 0.33) ? 1 : (correction < 0.75) ? 2.5 : 5;
-    interval *= correction;
-
-    let time = start;
-    while (time < end) {
-      addTimestamp(time, ((time - start) / 1000) + ' ms');
-      time += interval;
-    }
-    this.redraw();
-  }
-
-  handleChunkMouseMove(event) {
-    if (this.isLocked) return false;
-    if (this._isSelecting) return false;
-    let chunk = event.target.chunk;
-    if (!chunk) return;
-    // topmost map (at chunk.height) == map #0.
-    let relativeIndex =
-        Math.round(event.layerY / event.target.offsetHeight * chunk.size());
-    let map = chunk.at(relativeIndex);
-    this.dispatchEvent(new FocusEvent(map));
-  }
-
-  handleChunkClick(event) {
-    this.isLocked = !this.isLocked;
-  }
-
-  handleChunkDoubleClick(event) {
-    let chunk = event.target.chunk;
-    if (!chunk) return;
-    this.dispatchEvent(new SelectTimeEvent(chunk.start, chunk.end));
-  }
-
-  redraw() {
-    let canvas = this.timelineCanvas;
-    canvas.width = (this.chunks.length + 1) * kChunkWidth;
-    canvas.height = kChunkHeight;
-    let ctx = canvas.getContext('2d');
-    ctx.clearRect(0, 0, canvas.width, kChunkHeight);
-    if (!this.selectedEntry || !this.selectedEntry.edge) return;
-    this.drawEdges(ctx);
-  }
-  setMapStyle(map, ctx) {
-    ctx.fillStyle = map.edge && map.edge.from ? CSSColor.onBackgroundColor :
-                                                CSSColor.onPrimaryColor;
-  }
-
-  setEdgeStyle(edge, ctx) {
-    let color = this.typeToColor(edge.type);
-    ctx.strokeStyle = color;
-    ctx.fillStyle = color;
-  }
-
-  markMap(ctx, map) {
-    let [x, y] = map.position(this.chunks);
-    ctx.beginPath();
-    this.setMapStyle(map, ctx);
-    ctx.arc(x, y, 3, 0, 2 * Math.PI);
-    ctx.fill();
-    ctx.beginPath();
-    ctx.fillStyle = CSSColor.onBackgroundColor;
-    ctx.arc(x, y, 2, 0, 2 * Math.PI);
-    ctx.fill();
-  }
-
-  markSelectedMap(ctx, map) {
-    let [x, y] = map.position(this.chunks);
-    ctx.beginPath();
-    this.setMapStyle(map, ctx);
-    ctx.arc(x, y, 6, 0, 2 * Math.PI);
-    ctx.strokeStyle = CSSColor.onBackgroundColor;
-    ctx.stroke();
-  }
-
-  drawEdges(ctx) {
-    // Draw the trace of maps in reverse order to make sure the outgoing
-    // transitions of previous maps aren't drawn over.
-    const kMaxOutgoingEdges = 100;
-    let nofEdges = 0;
-    let stack = [];
-    let current = this.selectedEntry;
-    while (current && nofEdges < kMaxOutgoingEdges) {
-      nofEdges += current.children.length;
-      stack.push(current);
-      current = current.parent();
-    }
-    ctx.save();
-    this.drawOutgoingEdges(ctx, this.selectedEntry, 3);
-    ctx.restore();
-
-    let labelOffset = 15;
-    let xPrev = 0;
-    while (current = stack.pop()) {
-      if (current.edge) {
-        this.setEdgeStyle(current.edge, ctx);
-        let [xTo, yTo] = this.drawEdge(ctx, current.edge, true, labelOffset);
-        if (xTo == xPrev) {
-          labelOffset += 8;
-        } else {
-          labelOffset = 15
-        }
-        xPrev = xTo;
-      }
-      this.markMap(ctx, current);
-      current = current.parent();
-      ctx.save();
-      // this.drawOutgoingEdges(ctx, current, 1);
-      ctx.restore();
-    }
-    // Mark selected map
-    this.markSelectedMap(ctx, this.selectedEntry);
-  }
-
-  drawEdge(ctx, edge, showLabel = true, labelOffset = 20) {
-    if (!edge.from || !edge.to) return [-1, -1];
-    let [xFrom, yFrom] = edge.from.position(this.chunks);
-    let [xTo, yTo] = edge.to.position(this.chunks);
-    let sameChunk = xTo == xFrom;
-    if (sameChunk) labelOffset += 8;
-
-    ctx.beginPath();
-    ctx.moveTo(xFrom, yFrom);
-    let offsetX = 20;
-    let offsetY = 20;
-    let midX = xFrom + (xTo - xFrom) / 2;
-    let midY = (yFrom + yTo) / 2 - 100;
-    if (!sameChunk) {
-      ctx.quadraticCurveTo(midX, midY, xTo, yTo);
-    } else {
-      ctx.lineTo(xTo, yTo);
-    }
-    if (!showLabel) {
-      ctx.stroke();
-    } else {
-      let centerX, centerY;
-      if (!sameChunk) {
-        centerX = (xFrom / 2 + midX + xTo / 2) / 2;
-        centerY = (yFrom / 2 + midY + yTo / 2) / 2;
-      } else {
-        centerX = xTo;
-        centerY = yTo;
-      }
-      ctx.moveTo(centerX, centerY);
-      ctx.lineTo(centerX + offsetX, centerY - labelOffset);
-      ctx.stroke();
-      ctx.textAlign = 'left';
-      ctx.fillStyle = this.typeToColor(edge.type);
-      ctx.fillText(
-          edge.toString(), centerX + offsetX + 2, centerY - labelOffset);
-    }
-    return [xTo, yTo];
-  }
-
-  drawOutgoingEdges(ctx, map, max = 10, depth = 0) {
-    if (!map) return;
-    if (depth >= max) return;
-    ctx.globalAlpha = 0.5 - depth * (0.3 / max);
-    ctx.strokeStyle = CSSColor.timelineBackgroundColor;
-    const limit = Math.min(map.children.length, 100)
-    for (let i = 0; i < limit; i++) {
-      let edge = map.children[i];
-      this.drawEdge(ctx, edge, true);
-      this.drawOutgoingEdges(ctx, edge.to, max, depth + 1);
-    }
-  }
-});
diff --git a/deps/v8/tools/system-analyzer/view/code-panel-template.html b/deps/v8/tools/system-analyzer/view/code-panel-template.html
new file mode 100644
index 00000000000000..e04c6be8c182cb
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/code-panel-template.html
@@ -0,0 +1,25 @@
+<!-- Copyright 2020 the V8 project authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file. -->
+
+<head>
+  <link href="./index.css" rel="stylesheet">
+</head>
+<style>
+  #sourceCode {
+    white-space: pre-line;
+  }
+</style>
+<div class="panel">
+  <h2>Code Panel</h2>
+  <div class="selection">
+    <select id="codeSelect"></select>
+    <button id="selectedRelatedButton">Select Related Events</button>
+  </div>
+  <div class="panelBody">
+    <h3>Disassembly</h3>
+    <pre id="disassembly"></pre>
+    <h3>Source Code</h3>
+    <pre id="sourceCode"></pre>
+  </div>
+</div>
diff --git a/deps/v8/tools/system-analyzer/view/code-panel.mjs b/deps/v8/tools/system-analyzer/view/code-panel.mjs
new file mode 100644
index 00000000000000..3b5261e03c3fd9
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/code-panel.mjs
@@ -0,0 +1,82 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import {IcLogEntry} from '../log/ic.mjs';
+import {MapLogEntry} from '../log/map.mjs';
+
+import {FocusEvent, SelectionEvent, ToolTipEvent} from './events.mjs';
+import {delay, DOM, formatBytes, formatMicroSeconds, V8CustomElement} from './helper.mjs';
+
+DOM.defineCustomElement('view/code-panel',
+                        (templateText) =>
+                            class CodePanel extends V8CustomElement {
+  _timeline;
+  _selectedEntries;
+  _entry;
+
+  constructor() {
+    super(templateText);
+    this._codeSelectNode.onchange = this._handleSelectCode.bind(this);
+    this.$('#selectedRelatedButton').onclick =
+        this._handleSelectRelated.bind(this)
+  }
+
+  set timeline(timeline) {
+    this._timeline = timeline;
+    this.$('.panel').style.display = timeline.isEmpty() ? 'none' : 'inherit';
+    this.update();
+  }
+
+  set selectedEntries(entries) {
+    this._selectedEntries = entries;
+    // TODO: add code selection dropdown
+    this._updateSelect();
+    this.entry = entries.first();
+  }
+
+  set entry(entry) {
+    this._entry = entry;
+    this.update();
+  }
+
+  get _disassemblyNode() {
+    return this.$('#disassembly');
+  }
+
+  get _sourceNode() {
+    return this.$('#sourceCode');
+  }
+
+  get _codeSelectNode() {
+    return this.$('#codeSelect');
+  }
+
+  _update() {
+    this._disassemblyNode.innerText = this._entry?.disassemble ?? '';
+    this._sourceNode.innerText = this._entry?.source ?? '';
+  }
+
+  _updateSelect() {
+    const select = this._codeSelectNode;
+    select.options.length = 0;
+    const sorted =
+        this._selectedEntries.slice().sort((a, b) => a.time - b.time);
+    for (const code of this._selectedEntries) {
+      const option = DOM.element('option');
+      option.text =
+          `${code.name}(...) t=${formatMicroSeconds(code.time)} size=${
+              formatBytes(code.size)} script=${code.script?.toString()}`;
+      option.data = code;
+      select.add(option);
+    }
+  }
+
+  _handleSelectCode() {
+    this.entry = this._codeSelectNode.selectedOptions[0].data;
+  }
+
+  _handleSelectRelated(e) {
+    if (!this._entry) return;
+    this.dispatchEvent(new SelectRelatedEvent(this._entry));
+  }
+});
\ No newline at end of file
diff --git a/deps/v8/tools/system-analyzer/view/events.mjs b/deps/v8/tools/system-analyzer/view/events.mjs
new file mode 100644
index 00000000000000..4204973f8f2027
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/events.mjs
@@ -0,0 +1,93 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+class AppEvent extends CustomEvent {
+  constructor(name) {
+    super(name, {bubbles: true, composed: true});
+  }
+}
+
+export class SelectionEvent extends AppEvent {
+  // TODO: turn into static class fields once Safari supports it.
+  static get name() {
+    return 'select';
+  }
+
+  constructor(entries) {
+    super(SelectionEvent.name);
+    if (!Array.isArray(entries) || entries.length == 0) {
+      throw new Error('No valid entries selected!');
+    }
+    this.entries = entries;
+  }
+}
+
+export class SelectRelatedEvent extends AppEvent {
+  static get name() {
+    return 'selectrelated';
+  }
+
+  constructor(entry) {
+    super(SelectRelatedEvent.name);
+    this.entry = entry;
+  }
+}
+
+export class FocusEvent extends AppEvent {
+  static get name() {
+    return 'showentrydetail';
+  }
+
+  constructor(entry) {
+    super(FocusEvent.name);
+    this.entry = entry;
+  }
+}
+
+export class SelectTimeEvent extends AppEvent {
+  static get name() {
+    return 'timerangeselect';
+  }
+
+  constructor(start = 0, end = Infinity) {
+    super(SelectTimeEvent.name);
+    this.start = start;
+    this.end = end;
+  }
+}
+
+export class SynchronizeSelectionEvent extends AppEvent {
+  static get name() {
+    return 'syncselection';
+  }
+
+  constructor(start, end) {
+    super(SynchronizeSelectionEvent.name);
+    this.start = start;
+    this.end = end;
+  }
+}
+
+export class ToolTipEvent extends AppEvent {
+  static get name() {
+    return 'showtooltip';
+  }
+
+  constructor(content, positionOrTargetNode) {
+    super(ToolTipEvent.name);
+    this._content = content;
+    if (!positionOrTargetNode && !node) {
+      throw Error('Either provide a valid position or targetNode');
+    }
+    this._positionOrTargetNode = positionOrTargetNode;
+  }
+
+  get content() {
+    return this._content;
+  }
+
+  get positionOrTargetNode() {
+    return this._positionOrTargetNode;
+  }
+}
diff --git a/deps/v8/tools/system-analyzer/view/helper.mjs b/deps/v8/tools/system-analyzer/view/helper.mjs
new file mode 100644
index 00000000000000..780864ef5a0a92
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/helper.mjs
@@ -0,0 +1,314 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+class CSSColor {
+  static _cache = new Map();
+
+  static get(name) {
+    let color = this._cache.get(name);
+    if (color !== undefined) return color;
+    const style = getComputedStyle(document.body);
+    color = style.getPropertyValue(`--${name}`);
+    if (color === undefined) {
+      throw new Error(`CSS color does not exist: ${name}`);
+    }
+    color = color.trim();
+    this._cache.set(name, color);
+    return color;
+  }
+  static reset() {
+    this._cache.clear();
+  }
+
+  static get backgroundColor() {
+    return this.get('background-color');
+  }
+  static get surfaceColor() {
+    return this.get('surface-color');
+  }
+  static get primaryColor() {
+    return this.get('primary-color');
+  }
+  static get secondaryColor() {
+    return this.get('secondary-color');
+  }
+  static get onSurfaceColor() {
+    return this.get('on-surface-color');
+  }
+  static get onBackgroundColor() {
+    return this.get('on-background-color');
+  }
+  static get onPrimaryColor() {
+    return this.get('on-primary-color');
+  }
+  static get onSecondaryColor() {
+    return this.get('on-secondary-color');
+  }
+  static get defaultColor() {
+    return this.get('default-color');
+  }
+  static get errorColor() {
+    return this.get('error-color');
+  }
+  static get mapBackgroundColor() {
+    return this.get('map-background-color');
+  }
+  static get timelineBackgroundColor() {
+    return this.get('timeline-background-color');
+  }
+  static get red() {
+    return this.get('red');
+  }
+  static get green() {
+    return this.get('green');
+  }
+  static get yellow() {
+    return this.get('yellow');
+  }
+  static get blue() {
+    return this.get('blue');
+  }
+
+  static get orange() {
+    return this.get('orange');
+  }
+
+  static get violet() {
+    return this.get('violet');
+  }
+
+  static at(index) {
+    return this.list[index % this.list.length];
+  }
+
+  static darken(hexColorString, amount = -40) {
+    if (hexColorString[0] !== '#') {
+      throw new Error(`Unsupported color: ${hexColorString}`);
+    }
+    let color = parseInt(hexColorString.substring(1), 16);
+    let b = Math.min(Math.max((color & 0xFF) + amount, 0), 0xFF);
+    let g = Math.min(Math.max(((color >> 8) & 0xFF) + amount, 0), 0xFF);
+    let r = Math.min(Math.max(((color >> 16) & 0xFF) + amount, 0), 0xFF);
+    color = (r << 16) + (g << 8) + b;
+    return `#${color.toString(16).padStart(6, '0')}`;
+  }
+
+  static get list() {
+    if (!this._colors) {
+      this._colors = [
+        this.green,
+        this.violet,
+        this.orange,
+        this.yellow,
+        this.primaryColor,
+        this.red,
+        this.blue,
+        this.yellow,
+        this.secondaryColor,
+        this.darken(this.green),
+        this.darken(this.violet),
+        this.darken(this.orange),
+        this.darken(this.yellow),
+        this.darken(this.primaryColor),
+        this.darken(this.red),
+        this.darken(this.blue),
+        this.darken(this.yellow),
+        this.darken(this.secondaryColor),
+      ];
+    }
+    return this._colors;
+  }
+}
+
+class DOM {
+  static element(type, classes) {
+    const node = document.createElement(type);
+    if (classes === undefined) return node;
+    if (typeof classes === 'string') {
+      node.className = classes;
+    } else {
+      classes.forEach(cls => node.classList.add(cls));
+    }
+    return node;
+  }
+
+  static text(string) {
+    return document.createTextNode(string);
+  }
+
+  static div(classes) {
+    return this.element('div', classes);
+  }
+
+  static span(classes) {
+    return this.element('span', classes);
+  }
+
+  static table(classes) {
+    return this.element('table', classes);
+  }
+
+  static tbody(classes) {
+    return this.element('tbody', classes);
+  }
+
+  static td(textOrNode, className) {
+    const node = this.element('td');
+    if (typeof textOrNode === 'object') {
+      node.appendChild(textOrNode);
+    } else if (textOrNode) {
+      node.innerText = textOrNode;
+    }
+    if (className) node.className = className;
+    return node;
+  }
+
+  static tr(classes) {
+    return this.element('tr', classes);
+  }
+
+  static removeAllChildren(node) {
+    let range = document.createRange();
+    range.selectNodeContents(node);
+    range.deleteContents();
+  }
+
+  static defineCustomElement(path, generator) {
+    let name = path.substring(path.lastIndexOf('/') + 1, path.length);
+    path = path + '-template.html';
+    fetch(path)
+        .then(stream => stream.text())
+        .then(
+            templateText =>
+                customElements.define(name, generator(templateText)));
+  }
+}
+
+function $(id) {
+  return document.querySelector(id)
+}
+
+class V8CustomElement extends HTMLElement {
+  _updateTimeoutId;
+  _updateCallback = this._update.bind(this);
+
+  constructor(templateText) {
+    super();
+    const shadowRoot = this.attachShadow({mode: 'open'});
+    shadowRoot.innerHTML = templateText;
+    this._updateCallback = this._update.bind(this);
+  }
+
+  $(id) {
+    return this.shadowRoot.querySelector(id);
+  }
+
+  querySelectorAll(query) {
+    return this.shadowRoot.querySelectorAll(query);
+  }
+
+  update(useAnimation = false) {
+    if (useAnimation) {
+      window.cancelAnimationFrame(this._updateTimeoutId);
+      this._updateTimeoutId =
+          window.requestAnimationFrame(this._updateCallback);
+    } else {
+      // Use timeout tasks to asynchronously update the UI without blocking.
+      clearTimeout(this._updateTimeoutId);
+      const kDelayMs = 5;
+      this._updateTimeoutId = setTimeout(this._updateCallback, kDelayMs);
+    }
+  }
+
+  _update() {
+    throw Error('Subclass responsibility');
+  }
+}
+
+class Chunked {
+  constructor(iterable, limit) {
+    this._iterator = iterable[Symbol.iterator]();
+    this._limit = limit;
+  }
+
+  * next(limit = undefined) {
+    for (let i = 0; i < (limit ?? this._limit); i++) {
+      const {value, done} = this._iterator.next();
+      if (done) {
+        this._iterator = undefined;
+        return;
+      };
+      yield value;
+    }
+  }
+
+  get hasMore() {
+    return this._iterator !== undefined;
+  }
+}
+
+class LazyTable {
+  constructor(table, rowData, rowElementCreator, limit = 100) {
+    this._table = table;
+    this._chunkedRowData = new Chunked(rowData, limit);
+    this._rowElementCreator = rowElementCreator;
+    if (table.tBodies.length == 0) {
+      table.appendChild(DOM.tbody());
+    } else {
+      table.replaceChild(DOM.tbody(), table.tBodies[0]);
+    }
+    if (!table.tFoot) {
+      const td = table.appendChild(DOM.element('tfoot'))
+                     .appendChild(DOM.tr())
+                     .appendChild(DOM.td());
+      for (let count of [10, 100]) {
+        const button = DOM.element('button');
+        button.innerText = `+${count}`;
+        button.onclick = (e) => this._addMoreRows(count);
+        td.appendChild(button);
+      }
+      td.setAttribute('colspan', 100);
+    }
+    table.tFoot.addEventListener('click', this._clickHandler);
+    this._addMoreRows();
+  }
+
+  _addMoreRows(count = undefined) {
+    const fragment = new DocumentFragment();
+    for (let row of this._chunkedRowData.next(count)) {
+      const tr = this._rowElementCreator(row);
+      fragment.appendChild(tr);
+    }
+    this._table.tBodies[0].appendChild(fragment);
+    if (!this._chunkedRowData.hasMore) {
+      DOM.removeAllChildren(this._table.tFoot);
+    }
+  }
+}
+
+export function gradientStopsFromGroups(
+    totalLength, maxHeight, groups, colorFn) {
+  const kMaxHeight = maxHeight === '%' ? 100 : maxHeight;
+  const kUnit = maxHeight === '%' ? '%' : 'px';
+  let increment = 0;
+  let lastHeight = 0.0;
+  const stops = [];
+  for (let group of groups) {
+    const color = colorFn(group.key);
+    increment += group.count;
+    let height = (increment / totalLength * kMaxHeight) | 0;
+    stops.push(`${color} ${lastHeight}${kUnit} ${height}${kUnit}`)
+    lastHeight = height;
+  }
+  return stops;
+}
+
+export * from '../helper.mjs';
+export {
+  DOM,
+  $,
+  V8CustomElement,
+  CSSColor,
+  LazyTable,
+};
diff --git a/deps/v8/tools/system-analyzer/view/list-panel-template.html b/deps/v8/tools/system-analyzer/view/list-panel-template.html
new file mode 100644
index 00000000000000..4714f97c02f8c8
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/list-panel-template.html
@@ -0,0 +1,78 @@
+<!-- Copyright 2020 the V8 project authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file. -->
+
+<head>
+  <link href="./index.css" rel="stylesheet">
+</head>
+<style>
+  .count {
+    text-align: right;
+    width: 5em;
+  }
+
+  .percentage {
+    text-align: right;
+    width: 4em;
+  }
+
+  .key {
+    padding-left: 1em;
+  }
+
+  .drilldown-group-title {
+    font-weight: bold;
+    padding: 0.5em 0 0.2em 0;
+  }
+
+  .toggle {
+    width: 1em;
+    text-align: left;
+    cursor: -webkit-zoom-in;
+    color: rgba(var(--border-color), 1);
+  }
+
+  .toggle::before {
+    content: "▶";
+  }
+  .open .toggle::before {
+    content: "▼";
+  }
+
+  .panel {
+    position: relative;
+  }
+
+  .panelBody {
+    height: 400px;
+  }
+
+  .scroller {
+    max-height: 800px;
+    overflow-y: scroll;
+  }
+
+  .legend {
+    top: 40px;
+  }
+</style>
+
+<div class="panel">
+  <input type="checkbox" id="closer" class="panelCloserInput">
+  <label class="panelCloserLabel" for="closer">▼</label>
+  <h2 id="title"></h2>
+  <div class="selection">
+    <input type="radio" id="show-all" name="selectionType" value="all">
+    <label for="show-all">All</label>
+    <input type="radio" id="show-timerange" name="selectionType" value="timerange">
+    <label for="show-timerange">Time Range</label>
+    <input type="radio" id="show-selection" name="selectionType" value="selection">
+    <label for="show-selection">Last Selection</label>
+  </div>
+  <select id="group-key"></select>
+  <div id="content" class="panelBody">
+    <slot></slot>
+    <table id="table" width="100%">
+    </table>
+  </div>
+</div>
diff --git a/deps/v8/tools/system-analyzer/view/list-panel.mjs b/deps/v8/tools/system-analyzer/view/list-panel.mjs
new file mode 100644
index 00000000000000..85e3cd47e28f36
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/list-panel.mjs
@@ -0,0 +1,198 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {Script, SourcePosition} from '../../profile.mjs';
+import {LogEntry} from '../log/log.mjs';
+
+import {FocusEvent} from './events.mjs';
+import {groupBy, LazyTable} from './helper.mjs';
+import {DOM, V8CustomElement} from './helper.mjs';
+
+DOM.defineCustomElement('view/list-panel',
+                        (templateText) =>
+                            class ListPanel extends V8CustomElement {
+  _selectedLogEntries = [];
+  _displayedLogEntries = [];
+  _timeline;
+
+  _detailsClickHandler = this._handleDetailsClick.bind(this);
+  _logEntryClickHandler = this._handleLogEntryClick.bind(this);
+
+  constructor() {
+    super(templateText);
+    this.groupKey.addEventListener('change', e => this.update());
+    this.showAllRadio.onclick = _ => this._showEntries(this._timeline);
+    this.showTimerangeRadio.onclick = _ =>
+        this._showEntries(this._timeline.selectionOrSelf);
+    this.showSelectionRadio.onclick = _ =>
+        this._showEntries(this._selectedLogEntries);
+  }
+
+  static get observedAttributes() {
+    return ['title'];
+  }
+
+  attributeChangedCallback(name, oldValue, newValue) {
+    if (name == 'title') {
+      this.$('#title').innerHTML = newValue;
+    }
+  }
+
+  set timeline(timeline) {
+    console.assert(timeline !== undefined, 'timeline undefined!');
+    this._timeline = timeline;
+    this.$('.panel').style.display = timeline.isEmpty() ? 'none' : 'inherit';
+    this._initGroupKeySelect();
+  }
+
+  set selectedLogEntries(entries) {
+    if (entries === this._timeline) {
+      this.showAllRadio.click();
+    } else if (entries === this._timeline.selection) {
+      this.showTimerangeRadio.click();
+    } else {
+      this._selectedLogEntries = entries;
+      this.showSelectionRadio.click();
+    }
+  }
+
+  get entryClass() {
+    return this._timeline.at(0)?.constructor;
+  }
+
+  get groupKey() {
+    return this.$('#group-key');
+  }
+
+  get table() {
+    return this.$('#table');
+  }
+
+  get showAllRadio() {
+    return this.$('#show-all');
+  }
+  get showTimerangeRadio() {
+    return this.$('#show-timerange');
+  }
+  get showSelectionRadio() {
+    return this.$('#show-selection');
+  }
+
+  get _propertyNames() {
+    return this.entryClass?.propertyNames ?? [];
+  }
+
+  _initGroupKeySelect() {
+    const select = this.groupKey;
+    select.options.length = 0;
+    for (const propertyName of this._propertyNames) {
+      const option = DOM.element('option');
+      option.text = propertyName;
+      select.add(option);
+    }
+  }
+
+  _showEntries(entries) {
+    this._displayedLogEntries = entries;
+    this.update();
+  }
+
+  _update() {
+    if (this._timeline.isEmpty()) return;
+    DOM.removeAllChildren(this.table);
+    if (this._displayedLogEntries.length == 0) return;
+    const propertyName = this.groupKey.selectedOptions[0].text;
+    const groups =
+        groupBy(this._displayedLogEntries, each => each[propertyName], true);
+    this._render(groups, this.table);
+  }
+
+  createSubgroups(group) {
+    const map = new Map();
+    for (let propertyName of this._propertyNames) {
+      map.set(
+          propertyName,
+          groupBy(group.entries, each => each[propertyName], true));
+    }
+    return map;
+  }
+
+  _handleLogEntryClick(e) {
+    const group = e.currentTarget.group;
+    this.dispatchEvent(new FocusEvent(group.key));
+  }
+
+  _handleDetailsClick(event) {
+    event.stopPropagation();
+    const tr = event.target.parentNode;
+    const group = tr.group;
+    // Create subgroup in-place if the don't exist yet.
+    if (tr.groups === undefined) {
+      const groups = tr.groups = this.createSubgroups(group);
+      this.renderDrilldown(groups, tr);
+    }
+    const detailsTr = tr.nextSibling;
+    if (tr.classList.contains('open')) {
+      tr.classList.remove('open');
+      detailsTr.style.display = 'none';
+    } else {
+      tr.classList.add('open');
+      detailsTr.style.display = 'table-row';
+    }
+  }
+
+  renderDrilldown(groups, previousSibling) {
+    const tr = DOM.tr('entry-details');
+    tr.style.display = 'none';
+    // indent by one td.
+    tr.appendChild(DOM.td());
+    const td = DOM.td();
+    td.colSpan = 3;
+    groups.forEach((group, key) => {
+      this.renderDrilldownGroup(td, group, key);
+    });
+    tr.appendChild(td);
+    // Append the new TR after previousSibling.
+    previousSibling.parentNode.insertBefore(tr, previousSibling.nextSibling);
+  }
+
+  renderDrilldownGroup(td, groups, key) {
+    const div = DOM.div('drilldown-group-title');
+    div.textContent = `Grouped by ${key}: ${groups[0]?.parentTotal ?? 0}#`;
+    td.appendChild(div);
+    const table = DOM.table();
+    this._render(groups, table, false)
+    td.appendChild(table);
+  }
+
+  _render(groups, table) {
+    let last;
+    new LazyTable(table, groups, group => {
+      if (last && last.count < group.count) {
+        console.log(last, group);
+      }
+      last = group;
+      const tr = DOM.tr();
+      tr.group = group;
+      const details = tr.appendChild(DOM.td('', 'toggle'));
+      details.onclick = this._detailsClickHandler;
+      tr.appendChild(DOM.td(`${group.percent.toFixed(2)}%`, 'percentage'));
+      tr.appendChild(DOM.td(group.count, 'count'));
+      const valueTd = tr.appendChild(DOM.td(`${group.key}`, 'key'));
+      if (this._isClickable(group.key)) {
+        tr.onclick = this._logEntryClickHandler;
+        valueTd.classList.add('clickable');
+      }
+      return tr;
+    }, 10);
+  }
+
+  _isClickable(object) {
+    if (typeof object !== 'object') return false;
+    if (object instanceof LogEntry) return true;
+    if (object instanceof SourcePosition) return true;
+    if (object instanceof Script) return true;
+    return false;
+  }
+});
diff --git a/deps/v8/tools/system-analyzer/log-file-reader-template.html b/deps/v8/tools/system-analyzer/view/log-file-reader-template.html
similarity index 100%
rename from deps/v8/tools/system-analyzer/log-file-reader-template.html
rename to deps/v8/tools/system-analyzer/view/log-file-reader-template.html
diff --git a/deps/v8/tools/system-analyzer/log-file-reader.mjs b/deps/v8/tools/system-analyzer/view/log-file-reader.mjs
similarity index 97%
rename from deps/v8/tools/system-analyzer/log-file-reader.mjs
rename to deps/v8/tools/system-analyzer/view/log-file-reader.mjs
index c46d792d0062d4..fd935f2f836353 100644
--- a/deps/v8/tools/system-analyzer/log-file-reader.mjs
+++ b/deps/v8/tools/system-analyzer/view/log-file-reader.mjs
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 import {DOM, V8CustomElement} from './helper.mjs';
 
-DOM.defineCustomElement('log-file-reader',
+DOM.defineCustomElement('view/log-file-reader',
                         (templateText) =>
                             class LogFileReader extends V8CustomElement {
   constructor() {
diff --git a/deps/v8/tools/system-analyzer/view/map-panel-template.html b/deps/v8/tools/system-analyzer/view/map-panel-template.html
new file mode 100644
index 00000000000000..8a2b23ee3d4b00
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/map-panel-template.html
@@ -0,0 +1,36 @@
+<!-- Copyright 2020 the V8 project authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file. -->
+
+<head>
+  <link href="./index.css" rel="stylesheet">
+</head>
+<style>
+  #searchBarInput {
+    width: 200px;
+  }
+</style>
+<div class="panel">
+  <input type="checkbox" id="closer" class="panelCloserInput">
+  <label class="panelCloserLabel" for="closer">▼</label>
+  <h2>Map Panel</h2>
+  <div class="selection">
+    <input type="radio" id="show-all" name="selectionType" value="all">
+    <label for="show-all">All</label>
+    <input type="radio" id="show-timerange" name="selectionType" value="timerange">
+    <label for="show-timerange">Time Range</label>
+    <input type="radio" id="show-selection" name="selectionType" value="selection">
+    <label for="show-selection">Last Selection</label>
+  </div>
+  <h3>All Transitions</h3>
+  <map-transitions id="map-transitions"></map-transitions>
+  <h3>Search Map by Address</h3>
+  <section id="searchBar"></section>
+  <input type="search" id="searchBarInput"></input>
+  <button id="searchBarBtn">Search</button>
+
+  <h3>Details Transitions</h3>
+  <map-transitions id="map-details-transitions"></map-transitions>
+  <h3>Details</h3>
+  <map-details id="map-details"></map-details>
+</div>
diff --git a/deps/v8/tools/system-analyzer/view/map-panel.mjs b/deps/v8/tools/system-analyzer/view/map-panel.mjs
new file mode 100644
index 00000000000000..7ee2325f34c4a8
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/map-panel.mjs
@@ -0,0 +1,106 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import './map-panel/map-details.mjs';
+import './map-panel/map-transitions.mjs';
+
+import {MapLogEntry} from '../log/map.mjs';
+
+import {FocusEvent} from './events.mjs';
+import {DOM, V8CustomElement} from './helper.mjs';
+
+DOM.defineCustomElement(
+    'view/map-panel', (templateText) => class MapPanel extends V8CustomElement {
+      _map;
+      _timeline;
+      _selectedLogEntries = [];
+      _displayedLogEntries = [];
+
+      constructor() {
+        super(templateText);
+        this.searchBarBtn.addEventListener('click', e => this._handleSearch(e));
+        this.showAllRadio.onclick = _ => this._showEntries(this._timeline);
+        this.showTimerangeRadio.onclick = _ =>
+            this._showEntries(this._timeline.selectionOrSelf);
+        this.showSelectionRadio.onclick = _ =>
+            this._showEntries(this._selectedLogEntries);
+      }
+
+      get showAllRadio() {
+        return this.$('#show-all');
+      }
+      get showTimerangeRadio() {
+        return this.$('#show-timerange');
+      }
+      get showSelectionRadio() {
+        return this.$('#show-selection');
+      }
+
+      get mapTransitionsPanel() {
+        return this.$('#map-transitions');
+      }
+
+      get mapDetailsTransitionsPanel() {
+        return this.$('#map-details-transitions');
+      }
+
+      get mapDetailsPanel() {
+        return this.$('#map-details');
+      }
+
+      get searchBarBtn() {
+        return this.$('#searchBarBtn');
+      }
+
+      get searchBar() {
+        return this.$('#searchBar');
+      }
+
+      set timeline(timeline) {
+        console.assert(timeline !== undefined, 'timeline undefined!');
+        this._timeline = timeline;
+        this.$('.panel').style.display =
+            timeline.isEmpty() ? 'none' : 'inherit';
+        this.mapTransitionsPanel.timeline = timeline;
+        this.mapDetailsTransitionsPanel.timeline = timeline;
+      }
+
+      set selectedLogEntries(entries) {
+        if (entries === this._timeline.selection) {
+          this.showTimerangeRadio.click();
+        } else if (entries == this._timeline) {
+          this.showAllRadio.click();
+        } else {
+          this._selectedLogEntries = entries;
+          this.showSelectionRadio.click();
+        }
+      }
+
+      set map(map) {
+        this._map = map;
+        this.mapDetailsTransitionsPanel.selectedLogEntries = [map];
+        this.mapDetailsPanel.map = map;
+      }
+
+      _showEntries(entries) {
+        this._displayedLogEntries = entries;
+        this.mapTransitionsPanel.selectedLogEntries = entries;
+      }
+
+      update() {
+        // nothing to do
+      }
+
+      _handleSearch(e) {
+        let searchBar = this.$('#searchBarInput');
+        let searchBarInput = searchBar.value;
+        // access the map from model cache
+        let selectedMap = MapLogEntry.get(searchBarInput);
+        if (selectedMap) {
+          searchBar.className = 'success';
+          this.dispatchEvent(new FocusEvent(selectedMap));
+        } else {
+          searchBar.className = 'failure';
+        }
+      }
+    });
diff --git a/deps/v8/tools/system-analyzer/map-panel/map-details-template.html b/deps/v8/tools/system-analyzer/view/map-panel/map-details-template.html
similarity index 54%
rename from deps/v8/tools/system-analyzer/map-panel/map-details-template.html
rename to deps/v8/tools/system-analyzer/view/map-panel/map-details-template.html
index 6d1b268c5dd412..b109d4c8ac7bbb 100644
--- a/deps/v8/tools/system-analyzer/map-panel/map-details-template.html
+++ b/deps/v8/tools/system-analyzer/view/map-panel/map-details-template.html
@@ -8,16 +8,12 @@
 <style>
   #mapDetails,
   #filePositionNode {
-    overflow-x: scroll;
+    overflow: scroll;
   }
-
-  #mapDetails::-webkit-scrollbar {
-    width: 0;
-    background-color: transparent;
+  #mapDetails {
+    font-family: monospace;
+    white-space: pre;
   }
 </style>
-<div class="panel">
-  <h4>Map Details</h4>
-  <section id="filePositionNode"></section>
-  <section id="mapDetails"></section>
-</div>
+<section id="filePositionNode"></section>
+<section id="mapDetails"></section>
diff --git a/deps/v8/tools/system-analyzer/map-panel/map-details.mjs b/deps/v8/tools/system-analyzer/view/map-panel/map-details.mjs
similarity index 97%
rename from deps/v8/tools/system-analyzer/map-panel/map-details.mjs
rename to deps/v8/tools/system-analyzer/view/map-panel/map-details.mjs
index bcf8f9c9aa1867..446475a5b088cf 100644
--- a/deps/v8/tools/system-analyzer/map-panel/map-details.mjs
+++ b/deps/v8/tools/system-analyzer/view/map-panel/map-details.mjs
@@ -5,7 +5,7 @@ import {FocusEvent} from '../events.mjs';
 import {DOM, V8CustomElement} from '../helper.mjs';
 
 DOM.defineCustomElement(
-    './map-panel/map-details',
+    './view/map-panel/map-details',
     (templateText) => class MapDetails extends V8CustomElement {
       _map;
 
diff --git a/deps/v8/tools/system-analyzer/map-panel/map-transitions-template.html b/deps/v8/tools/system-analyzer/view/map-panel/map-transitions-template.html
similarity index 93%
rename from deps/v8/tools/system-analyzer/map-panel/map-transitions-template.html
rename to deps/v8/tools/system-analyzer/view/map-panel/map-transitions-template.html
index c4cab2bf46aae7..d5dcca07a78a2b 100644
--- a/deps/v8/tools/system-analyzer/map-panel/map-transitions-template.html
+++ b/deps/v8/tools/system-analyzer/view/map-panel/map-transitions-template.html
@@ -137,12 +137,4 @@
     padding-bottom: 10px;
   }
 </style>
-<div class="panel">
-  <div id="title">
-    <h4>Transitions</h4>
-  </div>
-  <section id="transitionView"></section>
-  <div id="tooltip">
-    <div id="tooltipContents"></div>
-  </div>
-</div>
+<section id="transitionView"></section>
diff --git a/deps/v8/tools/system-analyzer/view/map-panel/map-transitions.mjs b/deps/v8/tools/system-analyzer/view/map-panel/map-transitions.mjs
new file mode 100644
index 00000000000000..f60bd37d3929b7
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/map-panel/map-transitions.mjs
@@ -0,0 +1,181 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import {FocusEvent, SelectRelatedEvent, ToolTipEvent} from '../events.mjs';
+import {CSSColor} from '../helper.mjs';
+import {DOM, V8CustomElement} from '../helper.mjs';
+
+DOM.defineCustomElement(
+    './view/map-panel/map-transitions',
+    (templateText) => class MapTransitions extends V8CustomElement {
+      _timeline;
+      _map;
+      _edgeToColor = new Map();
+      _selectedLogEntries;
+      _displayedMapsInTree;
+      _toggleSubtreeHandler = this._handleToggleSubtree.bind(this);
+      _mapClickHandler = this._handleMapClick.bind(this);
+      _mapDoubleClickHandler = this._handleMapDoubleClick.bind(this);
+      _mouseoverMapHandler = this._handleMouseoverMap.bind(this);
+
+      constructor() {
+        super(templateText);
+        this.currentNode = this.transitionView;
+      }
+
+      get transitionView() {
+        return this.$('#transitionView');
+      }
+
+      set timeline(timeline) {
+        this._timeline = timeline;
+        this._edgeToColor.clear();
+        timeline.getBreakdown().forEach(breakdown => {
+          this._edgeToColor.set(breakdown.key, CSSColor.at(breakdown.id));
+        });
+      }
+
+      set selectedLogEntries(list) {
+        this._selectedLogEntries = list;
+        this.update();
+      }
+
+      _update() {
+        this.transitionView.style.display = 'none';
+        DOM.removeAllChildren(this.transitionView);
+        if (this._selectedLogEntries.length == 0) return;
+        this._displayedMapsInTree = new Set();
+        // Limit view to 200 maps for performance reasons.
+        this._selectedLogEntries.slice(0, 200).forEach(
+            (map) => this._addMapAndParentTransitions(map));
+        this._displayedMapsInTree = undefined;
+        this.transitionView.style.display = '';
+      }
+
+      _addMapAndParentTransitions(map) {
+        if (map === undefined) return;
+        if (this._displayedMapsInTree.has(map)) return;
+        this._displayedMapsInTree.add(map);
+        this.currentNode = this.transitionView;
+        let parents = map.getParents();
+        if (parents.length > 0) {
+          this._addTransitionTo(parents.pop());
+          parents.reverse().forEach((each) => this._addTransitionTo(each));
+        }
+        let mapNode = this._addSubtransitions(map);
+        // Mark and show the selected map.
+        mapNode.classList.add('selected');
+        if (this.selectedMap == map) {
+          setTimeout(
+              () => mapNode.scrollIntoView({
+                behavior: 'smooth',
+                block: 'nearest',
+                inline: 'nearest',
+              }),
+              1);
+        }
+      }
+
+      _addSubtransitions(map) {
+        let mapNode = this._addTransitionTo(map);
+        // Draw outgoing linear transition line.
+        let current = map;
+        while (current.children.length == 1) {
+          current = current.children[0].to;
+          this._addTransitionTo(current);
+        }
+        return mapNode;
+      }
+
+      _addTransitionEdge(map) {
+        let classes = ['transitionEdge'];
+        let edge = DOM.div(classes);
+        edge.style.backgroundColor = this._edgeToColor.get(map.edge.type);
+        let labelNode = DOM.div('transitionLabel');
+        labelNode.innerText = map.edge.toString();
+        edge.appendChild(labelNode);
+        return edge;
+      }
+
+      _addTransitionTo(map) {
+        // transition[ transitions[ transition[...], transition[...], ...]];
+        this._displayedMapsInTree?.add(map);
+        let transition = DOM.div('transition');
+        if (map.isDeprecated()) transition.classList.add('deprecated');
+        if (map.edge) {
+          transition.appendChild(this._addTransitionEdge(map));
+        }
+        let mapNode = this._addMapNode(map);
+        transition.appendChild(mapNode);
+
+        let subtree = DOM.div('transitions');
+        transition.appendChild(subtree);
+
+        this.currentNode.appendChild(transition);
+        this.currentNode = subtree;
+
+        return mapNode;
+      }
+
+      _addMapNode(map) {
+        let node = DOM.div('map');
+        if (map.edge)
+          node.style.backgroundColor = this._edgeToColor.get(map.edge.type);
+        node.map = map;
+        node.onclick = this._mapClickHandler
+        node.ondblclick = this._mapDoubleClickHandler
+        node.onmouseover = this._mouseoverMapHandler
+        if (map.children.length > 1) {
+          node.innerText = map.children.length;
+          const showSubtree = DOM.div('showSubtransitions');
+          showSubtree.onclick = this._toggleSubtreeHandler
+          node.appendChild(showSubtree);
+        }
+        else if (map.children.length == 0) {
+          node.innerHTML = '&#x25CF;';
+        }
+        this.currentNode.appendChild(node);
+        return node;
+      }
+
+      _handleMapClick(event) {
+        const map = event.currentTarget.map;
+        this.dispatchEvent(new FocusEvent(map));
+      }
+
+      _handleMapDoubleClick(event) {
+        this.dispatchEvent(new SelectRelatedEvent(event.currentTarget.map));
+      }
+
+      _handleMouseoverMap(event) {
+        this.dispatchEvent(new ToolTipEvent(
+            event.currentTarget.map.toStringLong(), event.currentTarget));
+      }
+
+      _handleToggleSubtree(event) {
+        event.preventDefault();
+        const node = event.currentTarget.parentElement;
+        let map = node.map;
+        event.target.classList.toggle('opened');
+        let transitionsNode = node.parentElement.querySelector('.transitions');
+        let subtransitionNodes = transitionsNode.children;
+        if (subtransitionNodes.length <= 1) {
+          // Add subtransitions except the one that's already shown.
+          let visibleTransitionMap = subtransitionNodes.length == 1 ?
+              transitionsNode.querySelector('.map').map :
+              undefined;
+          map.children.forEach((edge) => {
+            if (edge.to != visibleTransitionMap) {
+              this.currentNode = transitionsNode;
+              this._addSubtransitions(edge.to);
+            }
+          });
+        } else {
+          // remove all but the first (currently selected) subtransition
+          for (let i = subtransitionNodes.length - 1; i > 0; i--) {
+            transitionsNode.removeChild(subtransitionNodes[i]);
+          }
+        }
+        return false;
+      }
+    });
diff --git a/deps/v8/tools/system-analyzer/view/script-panel-template.html b/deps/v8/tools/system-analyzer/view/script-panel-template.html
new file mode 100644
index 00000000000000..27fd3d83eb6e31
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/script-panel-template.html
@@ -0,0 +1,72 @@
+<!-- Copyright 2020 the V8 project authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file. -->
+
+<head>
+  <link href="./index.css" rel="stylesheet">
+</head>
+<style>
+  .scriptNode {
+    font-family: Consolas, monospace;
+  }
+
+  .scriptNode:before {
+    counter-reset: sourceLineCounter;
+  }
+
+  .scriptNode span {
+    counter-increment: sourceLineCounter 1;
+    text-indent: -3.5em;
+    padding-left: 3.5em;
+    display: block;
+  }
+
+  .scriptNode span::before {
+    content: counter(sourceLineCounter) ": ";
+    width: 3.5em;
+    display: inline-block;
+    white-space: pre;
+    text-align: right;
+  }
+
+  mark {
+    width: 1ch;
+    border-radius: 2px;
+    border: 0.5px var(--background-color) solid;
+    cursor: pointer;
+    background-color: var(--primary-color);
+    color: var(--on-primary-color);
+  }
+
+  .marked {
+    background-color: var(--secondary-color);
+  }
+
+  @keyframes pulse {
+    0% {
+      box-shadow: 0px 0px 0px 0px var(--secondary-color);
+    }
+    5% {
+      box-shadow: 0px 0px 0px 10px var(--secondary-color);
+    }
+    10% {
+      box-shadow: 0px 0px 0px 0px var(--secondary-color);
+    }
+    15% {
+      box-shadow: 0px 0px 0px 10px var(--secondary-color);
+    }
+    20% {
+      box-shadow: 0px 0px 0px 0px var(--secondary-color);
+    }
+  }
+</style>
+<div class="panel">
+  <h2>Source Panel</h2>
+  <div class="selection">
+    <select id="script-dropdown"></select>
+    <button id="selectedRelatedButton">Select Related Events</button>
+  </div>
+  <div id="script" class="panelBody">
+    <div class="scriptNode"></div>
+  </div>
+</div>
diff --git a/deps/v8/tools/system-analyzer/source-panel.mjs b/deps/v8/tools/system-analyzer/view/script-panel.mjs
similarity index 67%
rename from deps/v8/tools/system-analyzer/source-panel.mjs
rename to deps/v8/tools/system-analyzer/view/script-panel.mjs
index a4dc07fb451cab..b0dac6960c3a46 100644
--- a/deps/v8/tools/system-analyzer/source-panel.mjs
+++ b/deps/v8/tools/system-analyzer/view/script-panel.mjs
@@ -1,22 +1,26 @@
 // Copyright 2020 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-import {FocusEvent, SelectionEvent} from './events.mjs';
-import {delay, DOM, formatBytes, V8CustomElement} from './helper.mjs';
-import {IcLogEntry} from './log/ic.mjs';
-import {MapLogEntry} from './log/map.mjs';
+import {groupBy} from '../helper.mjs';
+import {App} from '../index.mjs'
 
-DOM.defineCustomElement('source-panel',
+import {SelectRelatedEvent, ToolTipEvent} from './events.mjs';
+import {CSSColor, delay, DOM, formatBytes, gradientStopsFromGroups, V8CustomElement} from './helper.mjs';
+
+DOM.defineCustomElement('view/script-panel',
                         (templateText) =>
                             class SourcePanel extends V8CustomElement {
   _selectedSourcePositions = [];
-  _sourcePositionsToMarkNodes;
+  _sourcePositionsToMarkNodes = [];
   _scripts = [];
   _script;
+
   constructor() {
     super(templateText);
     this.scriptDropdown.addEventListener(
         'change', e => this._handleSelectScript(e));
+    this.$('#selectedRelatedButton').onclick =
+        this._handleSelectRelated.bind(this);
   }
 
   get script() {
@@ -41,7 +45,11 @@ DOM.defineCustomElement('source-panel',
     this._focusSelectedMarkers();
   }
 
-  set data(scripts) {
+  set focusedSourcePositions(sourcePositions) {
+    this.selectedSourcePositions = sourcePositions;
+  }
+
+  set scripts(scripts) {
     this._scripts = scripts;
     this._initializeScriptDropdown();
   }
@@ -71,13 +79,13 @@ DOM.defineCustomElement('source-panel',
     let scriptNode;
     if (this._script) {
       await delay(1);
-      const builder =
-          new LineBuilder(this, this._script, this._selectedSourcePositions);
+      const builder = new LineBuilder(this, this._script);
       scriptNode = builder.createScriptNode();
       this._sourcePositionsToMarkNodes = builder.sourcePositionToMarkers;
     } else {
-      scriptNode = document.createElement('pre');
+      scriptNode = DOM.div();
       this._selectedMarkNodes = undefined;
+      this._sourcePositionsToMarkNodes = new Map();
     }
     const oldScriptNode = this.script.childNodes[1];
     this.script.replaceChild(scriptNode, oldScriptNode);
@@ -90,9 +98,15 @@ DOM.defineCustomElement('source-panel',
       markNode.className = '';
     }
     for (let sourcePosition of this._selectedSourcePositions) {
+      if (sourcePosition.script !== this._script) continue;
       this._sourcePositionsToMarkNodes.get(sourcePosition).className = 'marked';
     }
-    const sourcePosition = this._selectedSourcePositions[0];
+    this._scrollToFirstSourcePosition()
+  }
+
+  _scrollToFirstSourcePosition() {
+    const sourcePosition = this._selectedSourcePositions.find(
+        each => each.script === this._script);
     if (!sourcePosition) return;
     const markNode = this._sourcePositionsToMarkNodes.get(sourcePosition);
     markNode.scrollIntoView(
@@ -103,29 +117,32 @@ DOM.defineCustomElement('source-panel',
     const option =
         this.scriptDropdown.options[this.scriptDropdown.selectedIndex];
     this.script = option.script;
-    this.selectLogEntries(this._script.entries());
+  }
+
+  _handleSelectRelated(e) {
+    if (!this._script) return;
+    this.dispatchEvent(new SelectRelatedEvent(this._script));
   }
 
   handleSourcePositionClick(e) {
-    this.selectLogEntries(e.target.sourcePosition.entries)
-  }
-
-  selectLogEntries(logEntries) {
-    let icLogEntries = [];
-    let mapLogEntries = [];
-    for (const entry of logEntries) {
-      if (entry instanceof MapLogEntry) {
-        mapLogEntries.push(entry);
-      } else if (entry instanceof IcLogEntry) {
-        icLogEntries.push(entry);
-      }
-    }
-    if (icLogEntries.length > 0) {
-      this.dispatchEvent(new SelectionEvent(icLogEntries));
-    }
-    if (mapLogEntries.length > 0) {
-      this.dispatchEvent(new SelectionEvent(mapLogEntries));
-    }
+    const sourcePosition = e.target.sourcePosition;
+    this.dispatchEvent(new SelectRelatedEvent(sourcePosition));
+  }
+
+  handleSourcePositionMouseOver(e) {
+    const entries = e.target.sourcePosition.entries;
+    let text = groupBy(entries, each => each.constructor, true)
+                   .map(group => {
+                     let text = `${group.key.name}: ${group.count}\n`
+                     text += groupBy(group.entries, each => each.type, true)
+                                 .map(group => {
+                                   return `  - ${group.key}: ${group.count}`;
+                                 })
+                                 .join('\n');
+                     return text;
+                   })
+                   .join('\n');
+    this.dispatchEvent(new ToolTipEvent(text, e.target));
   }
 });
 
@@ -177,16 +194,28 @@ function* lineIterator(source) {
 }
 
 class LineBuilder {
+  static _colorMap = (function() {
+    const map = new Map();
+    let i = 0;
+    for (let type of App.allEventTypes) {
+      map.set(type, CSSColor.at(i++));
+    }
+    return map;
+  })();
+  static get colorMap() {
+    return this._colorMap;
+  }
+
   _script;
   _clickHandler;
+  _mouseoverHandler;
   _sourcePositions;
-  _selection;
   _sourcePositionToMarkers = new Map();
 
-  constructor(panel, script, highlightPositions) {
+  constructor(panel, script) {
     this._script = script;
-    this._selection = new Set(highlightPositions);
     this._clickHandler = panel.handleSourcePositionClick.bind(panel);
+    this._mouseoverHandler = panel.handleSourcePositionMouseOver.bind(panel);
     // TODO: sort on script finalization.
     script.sourcePositions.sort((a, b) => {
       if (a.line === b.line) return a.column - b.column;
@@ -200,8 +229,7 @@ class LineBuilder {
   }
 
   createScriptNode() {
-    const scriptNode = document.createElement('pre');
-    scriptNode.classList.add('scriptNode');
+    const scriptNode = DOM.div('scriptNode');
     for (let [lineIndex, line] of lineIterator(this._script.source)) {
       scriptNode.appendChild(this._createLineNode(lineIndex, line));
     }
@@ -209,7 +237,7 @@ class LineBuilder {
   }
 
   _createLineNode(lineIndex, line) {
-    const lineNode = document.createElement('span');
+    const lineNode = DOM.span();
     let columnIndex = 0;
     for (const sourcePosition of this._sourcePositions.forLine(lineIndex)) {
       const nextColumnIndex = sourcePosition.column - 1;
@@ -232,6 +260,14 @@ class LineBuilder {
     marker.textContent = text;
     marker.sourcePosition = sourcePosition;
     marker.onclick = this._clickHandler;
+    marker.onmouseover = this._mouseoverHandler;
+
+    const entries = sourcePosition.entries;
+    const stops = gradientStopsFromGroups(
+        entries.length, '%', groupBy(entries, entry => entry.constructor),
+        type => LineBuilder.colorMap.get(type));
+    marker.style.backgroundImage = `linear-gradient(0deg,${stops.join(',')})`
+
     return marker;
   }
-}
\ No newline at end of file
+}
diff --git a/deps/v8/tools/system-analyzer/view/timeline-panel-template.html b/deps/v8/tools/system-analyzer/view/timeline-panel-template.html
new file mode 100644
index 00000000000000..da0ce26380907c
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/timeline-panel-template.html
@@ -0,0 +1,29 @@
+<!-- Copyright 2020 the V8 project authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file. -->
+
+<head>
+  <link href="./index.css" rel="stylesheet">
+  <style>
+    .panel {
+      padding-bottom: 0px;
+      position: relative;
+    }
+    .titleBackground {
+      position: absolute;
+      left: 0px;
+      top: 34px;
+      border-radius: 0 0 0 7px;
+      height: calc(100% - 34px);
+      width: 30px;
+      background-color: var(--border-color);
+    }
+  </style>
+</head>
+<div class="panel">
+  <h2>Timeline Panel</h2>
+  <div class="titleBackground"></div>
+  <div>
+    <slot></slot>
+  </div>
+</div>
diff --git a/deps/v8/tools/system-analyzer/timeline-panel.mjs b/deps/v8/tools/system-analyzer/view/timeline-panel.mjs
similarity index 98%
rename from deps/v8/tools/system-analyzer/timeline-panel.mjs
rename to deps/v8/tools/system-analyzer/view/timeline-panel.mjs
index a61d2efc90570b..331db401e96db9 100644
--- a/deps/v8/tools/system-analyzer/timeline-panel.mjs
+++ b/deps/v8/tools/system-analyzer/view/timeline-panel.mjs
@@ -8,7 +8,7 @@ import {SynchronizeSelectionEvent} from './events.mjs';
 import {DOM, V8CustomElement} from './helper.mjs';
 
 DOM.defineCustomElement(
-    'timeline-panel',
+    'view/timeline-panel',
     (templateText) => class TimelinePanel extends V8CustomElement {
       constructor() {
         super(templateText);
diff --git a/deps/v8/tools/system-analyzer/view/timeline/timeline-track-template.html b/deps/v8/tools/system-analyzer/view/timeline/timeline-track-template.html
new file mode 100644
index 00000000000000..b27ad66b59a7d0
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/timeline/timeline-track-template.html
@@ -0,0 +1,205 @@
+<!-- Copyright 2020 the V8 project authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file. -->
+
+<head>
+  <link href="./index.css" rel="stylesheet">
+</head>
+<style>
+  #timeline {
+    position: relative;
+    height: calc(200px + 12px);
+    overflow-y: hidden;
+    overflow-x: scroll;
+    user-select: none;
+  }
+
+  #timelineLabel {
+    transform: rotate(90deg);
+    transform-origin: left bottom 0;
+    position: absolute;
+    left: 0;
+    width: 200px;
+    text-align: center;
+    font-size: 10px;
+    opacity: 0.5;
+  }
+
+  #timelineChunks {
+    height: 200px;
+    position: absolute;
+    margin-right: 100px;
+  }
+
+  #timelineCanvas {
+    height: 200px;
+    position: relative;
+    overflow: visible;
+    pointer-events: none;
+  }
+
+  .chunk {
+    width: 6px;
+    position: absolute;
+    background-size: 100% 100%;
+    image-rendering: pixelated;
+    bottom: 0px;
+    background-color: var(--on-surface-color);
+    cursor: pointer;
+  }
+  .chunk:hover {
+    border-radius: 2px 2px 0 0;
+    margin: 0 0 -2px -2px;
+    border: 2px var(--primary-color) solid;
+  }
+
+  .timestamp {
+    height: 200px;
+    width: 100px;
+    border-left: 1px var(--on-surface-color) dashed;
+    padding-left: 4px;
+    position: absolute;
+    pointer-events: none;
+    font-size: 10px;
+  }
+
+  .title {
+    position: relative;
+    float: left;
+    width: 20px;
+    writing-mode: vertical-rl;
+    text-orientation: mixed;
+    margin: 20px 0 0 -10px;
+    padding: 5px 5px 0px 5px;
+    overflow: hidden;
+    border-radius: 7px;
+    font-weight: 400;
+  }
+
+  .panelCloserInput:checked ~ h3 { 
+    display: inherit;
+    flex: 1;
+    writing-mode: unset;
+    text-orientation: unset;
+    background-color: var(--border-color);
+    border-radius: 0px;
+    padding: 5px;
+    margin: 0 -10px 0 20px;
+  }
+
+  .timelineLegend {
+    position: relative;
+    float: right;
+    height: calc(200px + 12px);
+    overflow-y: scroll;
+    margin-right: -10px;
+    padding-right: 2px;
+  }
+
+  #legendTable {
+    width: 280px;
+    border-collapse: collapse;
+  }
+
+  th,
+  td {
+    padding: 1px 3px 2px 3px;
+  }
+
+  /* Center colors */
+  #legendTable td:nth-of-type(4n+1) {
+    text-align: center;
+    padding-top: 3px;
+  }
+  /* Left align text*/
+  #legendTable td:nth-of-type(4n+2) {
+    text-align: left;
+    width: 100%;
+  }
+  /* right align numbers */
+  #legendTable td:nth-of-type(4n+3),
+  #legendTable td:nth-of-type(4n+4) {
+    text-align: right;
+  }
+
+  .timeline {
+    background-color: var(--timeline-background-color);
+  }
+
+  #selection {
+    display: none;
+  }
+
+  #rightHandle,
+  #leftHandle {
+    background-color: rgba(200, 200, 200, 0.5);
+    height: 100%;
+    width: 5px;
+    position: absolute;
+    z-index: 3;
+    cursor: col-resize;
+  }
+  #leftHandle {
+    border-left: 1px solid var(--on-surface-color);
+  }
+  #rightHandle {
+    border-right: 1px solid var(--on-surface-color);
+  }
+
+  #selectionBackground {
+    background-color: rgba(133, 68, 163, 0.5);
+    height: 100%;
+    position: absolute;
+  }
+
+
+  .content {
+    display: flex;
+    position: relative;
+  }
+  .panelCloserLabel {
+    position: absolute;
+    top: 5px;
+    left: 0px;
+  }
+  .title {
+    flex: initial;
+  }
+  #timeline {
+    flex: 1;
+  }
+  .legend {
+    flex: initial;
+  }
+
+</style>
+
+<div class="content">
+  <input type="checkbox" id="closer" class="panelCloserInput">
+  <label class="panelCloserLabel" for="closer">▼</label>
+  <h3 class="title" id="title"></h3>
+
+  <div id="timeline">
+    <div id="selection">
+      <div id="leftHandle"></div>
+      <div id="selectionBackground"></div>
+      <div id="rightHandle"></div>
+    </div>
+    <div id="timelineLabel">Frequency</div>
+    <div id="timelineChunks"></div>
+    <canvas id="timelineCanvas"></canvas>
+  </div>
+
+  <div class="timelineLegend">
+    <table id="legendTable">
+      <thead>
+        <tr>
+          <td>Type</td>
+          <td>Count</td>
+          <td>Percent</td>
+        </tr>
+      </thead>
+      <tbody></tbody>
+    </table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/deps/v8/tools/system-analyzer/view/timeline/timeline-track.mjs b/deps/v8/tools/system-analyzer/view/timeline/timeline-track.mjs
new file mode 100644
index 00000000000000..60216af2eef4b7
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/timeline/timeline-track.mjs
@@ -0,0 +1,605 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {kChunkHeight, kChunkWidth} from '../../log/map.mjs';
+import {MapLogEntry} from '../../log/map.mjs';
+import {FocusEvent, SelectionEvent, SelectTimeEvent, SynchronizeSelectionEvent, ToolTipEvent,} from '../events.mjs';
+import {CSSColor, DOM, gradientStopsFromGroups, V8CustomElement} from '../helper.mjs';
+
+DOM.defineCustomElement('view/timeline/timeline-track',
+                        (templateText) =>
+                            class TimelineTrack extends V8CustomElement {
+  _timeline;
+  _nofChunks = 400;
+  _chunks;
+  _selectedEntry;
+  _timeToPixel;
+  _timeStartOffset;
+  _legend;
+
+  _chunkMouseMoveHandler = this._handleChunkMouseMove.bind(this);
+  _chunkClickHandler = this._handleChunkClick.bind(this);
+  _chunkDoubleClickHandler = this._handleChunkDoubleClick.bind(this);
+
+  constructor() {
+    super(templateText);
+    this._selectionHandler = new SelectionHandler(this);
+    this._legend = new Legend(this.$('#legendTable'));
+    this._legend.onFilter = (type) => this._handleFilterTimeline();
+    this.timelineNode.addEventListener(
+        'scroll', e => this._handleTimelineScroll(e));
+    this.timelineNode.ondblclick = (e) =>
+        this._selectionHandler.clearSelection();
+    this.isLocked = false;
+  }
+
+  static get observedAttributes() {
+    return ['title'];
+  }
+
+  attributeChangedCallback(name, oldValue, newValue) {
+    if (name == 'title') {
+      this.$('#title').innerHTML = newValue;
+    }
+  }
+
+  _handleFilterTimeline(type) {
+    this._updateChunks();
+  }
+
+  set data(timeline) {
+    this._timeline = timeline;
+    this._legend.timeline = timeline;
+    this.$('.content').style.display = timeline.isEmpty() ? 'none' : 'relative';
+    this._updateChunks();
+  }
+
+  set timeSelection(selection) {
+    this._selectionHandler.timeSelection = selection;
+    this.updateSelection();
+  }
+
+  updateSelection() {
+    this._selectionHandler.update();
+    this._legend.update();
+  }
+
+  // Maps the clicked x position to the x position on timeline canvas
+  positionOnTimeline(posX) {
+    let rect = this.timelineNode.getBoundingClientRect();
+    let posClickedX = posX - rect.left + this.timelineNode.scrollLeft;
+    return posClickedX;
+  }
+
+  positionToTime(posX) {
+    let posTimelineX = this.positionOnTimeline(posX) + this._timeStartOffset;
+    return posTimelineX / this._timeToPixel;
+  }
+
+  timeToPosition(time) {
+    let posX = time * this._timeToPixel;
+    posX -= this._timeStartOffset;
+    return posX;
+  }
+
+  get timelineCanvas() {
+    return this.$('#timelineCanvas');
+  }
+
+  get timelineChunks() {
+    return this.$('#timelineChunks');
+  }
+
+  get timelineNode() {
+    return this.$('#timeline');
+  }
+
+  _update() {
+    this._updateTimeline();
+    this._legend.update();
+  }
+
+  set nofChunks(count) {
+    this._nofChunks = count;
+    this._updateChunks();
+  }
+
+  get nofChunks() {
+    return this._nofChunks;
+  }
+
+  _updateChunks() {
+    this._chunks =
+        this._timeline.chunks(this.nofChunks, this._legend.filterPredicate);
+    this.update();
+  }
+
+  get chunks() {
+    return this._chunks;
+  }
+
+  set selectedEntry(value) {
+    this._selectedEntry = value;
+    if (value.edge) this.redraw();
+  }
+
+  get selectedEntry() {
+    return this._selectedEntry;
+  }
+
+  set scrollLeft(offset) {
+    this.timelineNode.scrollLeft = offset;
+  }
+
+  handleEntryTypeDoubleClick(e) {
+    this.dispatchEvent(new SelectionEvent(e.target.parentNode.entries));
+  }
+
+  timelineIndicatorMove(offset) {
+    this.timelineNode.scrollLeft += offset;
+  }
+
+  _handleTimelineScroll(e) {
+    let horizontal = e.currentTarget.scrollLeft;
+    this.dispatchEvent(new CustomEvent(
+        'scrolltrack', {bubbles: true, composed: true, detail: horizontal}));
+  }
+
+  _createBackgroundImage(chunk) {
+    const stops = gradientStopsFromGroups(
+        chunk.length, chunk.height, chunk.getBreakdown(event => event.type),
+        type => this._legend.colorForType(type));
+    return `linear-gradient(0deg,${stops.join(',')})`;
+  }
+
+  _updateTimeline() {
+    const reusableNodes = Array.from(this.timelineChunks.childNodes).reverse();
+    let fragment = new DocumentFragment();
+    let chunks = this.chunks;
+    let max = chunks.max(each => each.size());
+    let start = this._timeline.startTime;
+    let end = this._timeline.endTime;
+    let duration = end - start;
+    this._timeToPixel = chunks.length * kChunkWidth / duration;
+    this._timeStartOffset = start * this._timeToPixel;
+    for (let i = 0; i < chunks.length; i++) {
+      let chunk = chunks[i];
+      let height = (chunk.size() / max * kChunkHeight);
+      chunk.height = height;
+      if (chunk.isEmpty()) continue;
+      let node = reusableNodes[reusableNodes.length - 1];
+      let reusedNode = false;
+      if (node?.className == 'chunk') {
+        reusableNodes.pop();
+        reusedNode = true;
+      } else {
+        node = DOM.div('chunk');
+        node.onmousemove = this._chunkMouseMoveHandler;
+        node.onclick = this._chunkClickHandler;
+        node.ondblclick = this._chunkDoubleClickHandler;
+      }
+      const style = node.style;
+      style.left = `${((chunk.start - start) * this._timeToPixel) | 0}px`;
+      style.height = `${height | 0}px`;
+      style.backgroundImage = this._createBackgroundImage(chunk);
+      node.chunk = chunk;
+      if (!reusedNode) fragment.appendChild(node);
+    }
+
+    // Put a time marker roughly every 20 chunks.
+    let expected = duration / chunks.length * 20;
+    let interval = (10 ** Math.floor(Math.log10(expected)));
+    let correction = Math.log10(expected / interval);
+    correction = (correction < 0.33) ? 1 : (correction < 0.75) ? 2.5 : 5;
+    interval *= correction;
+
+    let time = start;
+    while (time < end) {
+      let timeNode = DOM.div('timestamp');
+      timeNode.innerText = `${((time - start) / 1000) | 0} ms`;
+      timeNode.style.left = `${((time - start) * this._timeToPixel) | 0}px`;
+      fragment.appendChild(timeNode);
+      time += interval;
+    }
+
+    // Remove superfluos nodes lazily, for Chrome this is a very expensive
+    // operation.
+    if (reusableNodes.length > 0) {
+      for (const node of reusableNodes) {
+        node.style.display = 'none';
+      }
+      setTimeout(() => {
+        const range = document.createRange();
+        const first = reusableNodes[reusableNodes.length - 1];
+        const last = reusableNodes[0];
+        range.setStartBefore(first);
+        range.setEndAfter(last);
+        range.deleteContents();
+      }, 100);
+    }
+    this.timelineChunks.appendChild(fragment);
+    this.redraw();
+  }
+
+  _handleChunkMouseMove(event) {
+    if (this.isLocked) return false;
+    if (this._selectionHandler.isSelecting) return false;
+    let chunk = event.target.chunk;
+    if (!chunk) return;
+    if (chunk.isEmpty()) return;
+    // topmost map (at chunk.height) == map #0.
+    let relativeIndex = Math.round(
+        event.layerY / event.target.offsetHeight * (chunk.size() - 1));
+    let logEntry = chunk.at(relativeIndex);
+    this.dispatchEvent(new FocusEvent(logEntry));
+    this.dispatchEvent(new ToolTipEvent(logEntry.toStringLong(), event.target));
+  }
+
+  _handleChunkClick(event) {
+    this.isLocked = !this.isLocked;
+  }
+
+  _handleChunkDoubleClick(event) {
+    let chunk = event.target.chunk;
+    if (!chunk) return;
+    event.stopPropagation();
+    this.dispatchEvent(new SelectTimeEvent(chunk.start, chunk.end));
+  }
+
+  redraw() {
+    window.requestAnimationFrame(() => this._redraw());
+  }
+
+  _redraw() {
+    if (!(this._timeline.at(0) instanceof MapLogEntry)) return;
+    let canvas = this.timelineCanvas;
+    let width = (this.chunks.length + 1) * kChunkWidth;
+    if (width > 32767) width = 32767;
+    canvas.width = width;
+    canvas.height = kChunkHeight;
+    let ctx = canvas.getContext('2d');
+    ctx.clearRect(0, 0, canvas.width, kChunkHeight);
+    if (!this.selectedEntry || !this.selectedEntry.edge) return;
+    this.drawEdges(ctx);
+  }
+
+  setMapStyle(map, ctx) {
+    ctx.fillStyle = map.edge && map.edge.from ? CSSColor.onBackgroundColor :
+                                                CSSColor.onPrimaryColor;
+  }
+
+  setEdgeStyle(edge, ctx) {
+    let color = this._legend.colorForType(edge.type);
+    ctx.strokeStyle = color;
+    ctx.fillStyle = color;
+  }
+
+  markMap(ctx, map) {
+    let [x, y] = map.position(this.chunks);
+    ctx.beginPath();
+    this.setMapStyle(map, ctx);
+    ctx.arc(x, y, 3, 0, 2 * Math.PI);
+    ctx.fill();
+    ctx.beginPath();
+    ctx.fillStyle = CSSColor.onBackgroundColor;
+    ctx.arc(x, y, 2, 0, 2 * Math.PI);
+    ctx.fill();
+  }
+
+  markSelectedMap(ctx, map) {
+    let [x, y] = map.position(this.chunks);
+    ctx.beginPath();
+    this.setMapStyle(map, ctx);
+    ctx.arc(x, y, 6, 0, 2 * Math.PI);
+    ctx.strokeStyle = CSSColor.onBackgroundColor;
+    ctx.stroke();
+  }
+
+  drawEdges(ctx) {
+    // Draw the trace of maps in reverse order to make sure the outgoing
+    // transitions of previous maps aren't drawn over.
+    const kMaxOutgoingEdges = 100;
+    let nofEdges = 0;
+    let stack = [];
+    let current = this.selectedEntry;
+    while (current && nofEdges < kMaxOutgoingEdges) {
+      nofEdges += current.children.length;
+      stack.push(current);
+      current = current.parent();
+    }
+    ctx.save();
+    this.drawOutgoingEdges(ctx, this.selectedEntry, 3);
+    ctx.restore();
+
+    let labelOffset = 15;
+    let xPrev = 0;
+    while (current = stack.pop()) {
+      if (current.edge) {
+        this.setEdgeStyle(current.edge, ctx);
+        let [xTo, yTo] = this.drawEdge(ctx, current.edge, true, labelOffset);
+        if (xTo == xPrev) {
+          labelOffset += 8;
+        } else {
+          labelOffset = 15
+        }
+        xPrev = xTo;
+      }
+      this.markMap(ctx, current);
+      current = current.parent();
+      ctx.save();
+      // this.drawOutgoingEdges(ctx, current, 1);
+      ctx.restore();
+    }
+    // Mark selected map
+    this.markSelectedMap(ctx, this.selectedEntry);
+  }
+
+  drawEdge(ctx, edge, showLabel = true, labelOffset = 20) {
+    if (!edge.from || !edge.to) return [-1, -1];
+    let [xFrom, yFrom] = edge.from.position(this.chunks);
+    let [xTo, yTo] = edge.to.position(this.chunks);
+    let sameChunk = xTo == xFrom;
+    if (sameChunk) labelOffset += 8;
+
+    ctx.beginPath();
+    ctx.moveTo(xFrom, yFrom);
+    let offsetX = 20;
+    let offsetY = 20;
+    let midX = xFrom + (xTo - xFrom) / 2;
+    let midY = (yFrom + yTo) / 2 - 100;
+    if (!sameChunk) {
+      ctx.quadraticCurveTo(midX, midY, xTo, yTo);
+    } else {
+      ctx.lineTo(xTo, yTo);
+    }
+    if (!showLabel) {
+      ctx.stroke();
+    } else {
+      let centerX, centerY;
+      if (!sameChunk) {
+        centerX = (xFrom / 2 + midX + xTo / 2) / 2;
+        centerY = (yFrom / 2 + midY + yTo / 2) / 2;
+      } else {
+        centerX = xTo;
+        centerY = yTo;
+      }
+      ctx.moveTo(centerX, centerY);
+      ctx.lineTo(centerX + offsetX, centerY - labelOffset);
+      ctx.stroke();
+      ctx.textAlign = 'left';
+      ctx.fillStyle = this._legend.colorForType(edge.type);
+      ctx.fillText(
+          edge.toString(), centerX + offsetX + 2, centerY - labelOffset);
+    }
+    return [xTo, yTo];
+  }
+
+  drawOutgoingEdges(ctx, map, max = 10, depth = 0) {
+    if (!map) return;
+    if (depth >= max) return;
+    ctx.globalAlpha = 0.5 - depth * (0.3 / max);
+    ctx.strokeStyle = CSSColor.timelineBackgroundColor;
+    const limit = Math.min(map.children.length, 100)
+    for (let i = 0; i < limit; i++) {
+      let edge = map.children[i];
+      this.drawEdge(ctx, edge, true);
+      this.drawOutgoingEdges(ctx, edge.to, max, depth + 1);
+    }
+  }
+});
+
+class SelectionHandler {
+  // TODO turn into static field once Safari supports it.
+  static get SELECTION_OFFSET() {
+    return 10
+  };
+
+  _timeSelection = {start: -1, end: Infinity};
+  _selectionOriginTime = -1;
+
+  constructor(timeline) {
+    this._timeline = timeline;
+    this._timelineNode.addEventListener(
+        'mousedown', e => this._handleTimeSelectionMouseDown(e));
+    this._timelineNode.addEventListener(
+        'mouseup', e => this._handleTimeSelectionMouseUp(e));
+    this._timelineNode.addEventListener(
+        'mousemove', e => this._handleTimeSelectionMouseMove(e));
+  }
+
+  update() {
+    if (!this.hasSelection) {
+      this._selectionNode.style.display = 'none';
+      return;
+    }
+    this._selectionNode.style.display = 'inherit';
+    const startPosition = this.timeToPosition(this._timeSelection.start);
+    const endPosition = this.timeToPosition(this._timeSelection.end);
+    this._leftHandleNode.style.left = startPosition + 'px';
+    this._rightHandleNode.style.left = endPosition + 'px';
+    const delta = endPosition - startPosition;
+    const selectionNode = this._selectionBackgroundNode;
+    selectionNode.style.left = startPosition + 'px';
+    selectionNode.style.width = delta + 'px';
+  }
+
+  set timeSelection(selection) {
+    this._timeSelection.start = selection.start;
+    this._timeSelection.end = selection.end;
+  }
+
+  clearSelection() {
+    this._timeline.dispatchEvent(new SelectTimeEvent());
+  }
+
+  timeToPosition(posX) {
+    return this._timeline.timeToPosition(posX);
+  }
+
+  positionToTime(posX) {
+    return this._timeline.positionToTime(posX);
+  }
+
+  get isSelecting() {
+    return this._selectionOriginTime >= 0;
+  }
+
+  get hasSelection() {
+    return this._timeSelection.start >= 0 &&
+        this._timeSelection.end != Infinity;
+  }
+
+  get _timelineNode() {
+    return this._timeline.$('#timeline');
+  }
+
+  get _selectionNode() {
+    return this._timeline.$('#selection');
+  }
+
+  get _selectionBackgroundNode() {
+    return this._timeline.$('#selectionBackground');
+  }
+
+  get _leftHandleNode() {
+    return this._timeline.$('#leftHandle');
+  }
+
+  get _rightHandleNode() {
+    return this._timeline.$('#rightHandle');
+  }
+
+  get _leftHandlePosX() {
+    return this._leftHandleNode.getBoundingClientRect().x;
+  }
+
+  get _rightHandlePosX() {
+    return this._rightHandleNode.getBoundingClientRect().x;
+  }
+
+  _isOnLeftHandle(posX) {
+    return Math.abs(this._leftHandlePosX - posX) <=
+        SelectionHandler.SELECTION_OFFSET;
+  }
+
+  _isOnRightHandle(posX) {
+    return Math.abs(this._rightHandlePosX - posX) <=
+        SelectionHandler.SELECTION_OFFSET;
+  }
+
+  _handleTimeSelectionMouseDown(e) {
+    let xPosition = e.clientX
+    // Update origin time in case we click on a handle.
+    if (this._isOnLeftHandle(xPosition)) {
+      xPosition = this._rightHandlePosX;
+    }
+    else if (this._isOnRightHandle(xPosition)) {
+      xPosition = this._leftHandlePosX;
+    }
+    this._selectionOriginTime = this.positionToTime(xPosition);
+  }
+
+  _handleTimeSelectionMouseMove(e) {
+    if (!this.isSelecting) return;
+    const currentTime = this.positionToTime(e.clientX);
+    this._timeline.dispatchEvent(new SynchronizeSelectionEvent(
+        Math.min(this._selectionOriginTime, currentTime),
+        Math.max(this._selectionOriginTime, currentTime)));
+  }
+
+  _handleTimeSelectionMouseUp(e) {
+    this._selectionOriginTime = -1;
+    const delta = this._timeSelection.end - this._timeSelection.start;
+    if (delta <= 1 || isNaN(delta)) return;
+    this._timeline.dispatchEvent(new SelectTimeEvent(
+        this._timeSelection.start, this._timeSelection.end));
+  }
+}
+
+class Legend {
+  _timeline;
+  _typesFilters = new Map();
+  _typeClickHandler = this._handleTypeClick.bind(this);
+  _filterPredicate = this.filter.bind(this);
+  onFilter = () => {};
+
+  constructor(table) {
+    this._table = table;
+  }
+
+  set timeline(timeline) {
+    this._timeline = timeline;
+    const groups = timeline.getBreakdown();
+    this._typesFilters = new Map(groups.map(each => [each.key, true]));
+    this._colors =
+        new Map(groups.map(each => [each.key, CSSColor.at(each.id)]));
+  }
+
+  get selection() {
+    return this._timeline.selectionOrSelf;
+  }
+
+  get filterPredicate() {
+    for (let visible of this._typesFilters.values()) {
+      if (!visible) return this._filterPredicate;
+    }
+    return undefined;
+  }
+
+  colorForType(type) {
+    return this._colors.get(type);
+  }
+
+  filter(logEntry) {
+    return this._typesFilters.get(logEntry.type);
+  }
+
+  update() {
+    const tbody = DOM.tbody();
+    const missingTypes = new Set(this._typesFilters.keys());
+    this.selection.getBreakdown().forEach(group => {
+      tbody.appendChild(this._addTypeRow(group));
+      missingTypes.delete(group.key);
+    });
+    missingTypes.forEach(key => tbody.appendChild(this._row('', key, 0, '0%')));
+    if (this._timeline.selection) {
+      tbody.appendChild(
+          this._row('', 'Selection', this.selection.length, '100%'));
+    }
+    tbody.appendChild(this._row('', 'All', this._timeline.length, ''));
+    this._table.tBodies[0].replaceWith(tbody);
+  }
+
+  _row(color, type, count, percent) {
+    const row = DOM.tr();
+    row.appendChild(DOM.td(color));
+    row.appendChild(DOM.td(type));
+    row.appendChild(DOM.td(count.toString()));
+    row.appendChild(DOM.td(percent));
+    return row
+  }
+
+  _addTypeRow(group) {
+    const color = this.colorForType(group.key);
+    const colorDiv = DOM.div('colorbox');
+    if (this._typesFilters.get(group.key)) {
+      colorDiv.style.backgroundColor = color;
+    } else {
+      colorDiv.style.borderColor = color;
+      colorDiv.style.backgroundColor = CSSColor.backgroundImage;
+    }
+    let percent = `${(group.count / this.selection.length * 100).toFixed(1)}%`;
+    const row = this._row(colorDiv, group.key, group.count, percent);
+    row.className = 'clickable';
+    row.onclick = this._typeClickHandler;
+    row.data = group.key;
+    return row;
+  }
+
+  _handleTypeClick(e) {
+    const type = e.currentTarget.data;
+    this._typesFilters.set(type, !this._typesFilters.get(type));
+    this.onFilter(type);
+  }
+}
\ No newline at end of file
diff --git a/deps/v8/tools/system-analyzer/view/tool-tip-template.html b/deps/v8/tools/system-analyzer/view/tool-tip-template.html
new file mode 100644
index 00000000000000..b0e9c72c45cdf6
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/tool-tip-template.html
@@ -0,0 +1,81 @@
+<!-- Copyright 2020 the V8 project authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file. -->
+<head>
+  <link href="./index.css" rel="stylesheet">
+</head>
+<style>
+  :host {
+    position: absolute;
+    z-index: 100;
+  }
+
+  #content {
+    background-color: var(--surface-color);
+    border: 3px var(--primary-color) solid;
+    border-radius: 10px;
+    min-width: 100px;
+    min-height: 100px;
+    padding: 10px;
+    box-shadow: 0px 0px 10px rgba(0,0,0,0.5);
+    width: auto;
+  }
+
+  .textContent {
+    font-family: monospace;
+    white-space: pre;
+    overflow-x: hidden;
+    max-width: 500px;
+  }
+
+  #body {
+    display: none;
+    position: absolute;
+    --tip-offset: 10px;
+    --tip-width: 10px;
+    --tip-height: 15px;
+  }
+
+  #body.top {
+    bottom: var(--tip-height);
+  }
+  #body.bottom {
+    top: var(--tip-height);
+  }
+  #body.left {
+    right: calc(var(--tip-offset) * -1 - var(--tip-width));
+  }
+  #body.right {
+    left: calc(var(--tip-offset) * -1 - var(--tip-width));
+  }
+
+  .tip {
+    width: 0;
+    height: 0;
+    border-style: solid;
+    position: absolute;
+    border-width: var(--tip-height) var(--tip-width) 0 var(--tip-width);
+    border-color:  var(--primary-color) transparent transparent transparent;
+    pointer-events: none;
+  }
+
+  .top > .tip {
+    bottom: calc(var(--tip-height) * -1);
+  }
+  .bottom > .tip {
+    top: calc(var(--tip-height) * -1);
+    transform: scaleY(-1);
+  }
+  .left > .tip {
+    right: var(--tip-offset);
+  }
+  .right > .tip {
+    left: var(--tip-offset);
+  }
+</style>
+
+<div id="body">
+  <div id="content">
+  </div>
+  <div class="tip"></div>
+</div>
diff --git a/deps/v8/tools/system-analyzer/view/tool-tip.mjs b/deps/v8/tools/system-analyzer/view/tool-tip.mjs
new file mode 100644
index 00000000000000..896c04dd29857f
--- /dev/null
+++ b/deps/v8/tools/system-analyzer/view/tool-tip.mjs
@@ -0,0 +1,110 @@
+// Copyright 2020 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import {DOM, V8CustomElement} from './helper.mjs';
+
+DOM.defineCustomElement(
+    'view/tool-tip', (templateText) => class Tooltip extends V8CustomElement {
+      _targetNode;
+      _content;
+      _isHidden = true;
+      constructor() {
+        super(templateText);
+        this._intersectionObserver = new IntersectionObserver((entries) => {
+          if (entries[0].intersectionRatio <= 0) {
+            this.hide();
+          } else {
+            this.show();
+            this.update(true);
+          }
+        });
+      }
+
+      _update() {
+        if (!this._targetNode || this._isHidden) return;
+        const rect = this._targetNode.getBoundingClientRect();
+        rect.x += rect.width / 2;
+        let atRight = this._useRight(rect.x);
+        let atBottom = this._useBottom(rect.y);
+        if (atBottom) {
+          rect.y += rect.height;
+        }
+        this._setPosition(rect, atRight, atBottom);
+        this.update(true);
+      }
+
+      set positionOrTargetNode(positionOrTargetNode) {
+        if (positionOrTargetNode.nodeType === undefined) {
+          this.position = positionOrTargetNode;
+        } else {
+          this.targetNode = positionOrTargetNode;
+        }
+      }
+
+      set targetNode(targetNode) {
+        this._intersectionObserver.disconnect();
+        this._targetNode = targetNode;
+        if (targetNode) {
+          this._intersectionObserver.observe(targetNode);
+          this.update(true);
+        }
+      }
+
+      set position(position) {
+        this._targetNode = undefined;
+        this._setPosition(
+            position, this._useRight(position.x), this._useBottom(position.y));
+      }
+
+      _setPosition(viewportPosition, atRight, atBottom) {
+        const horizontalMode = atRight ? 'right' : 'left';
+        const verticalMode = atBottom ? 'bottom' : 'top';
+        this.bodyNode.className = horizontalMode + ' ' + verticalMode;
+        const pageX = viewportPosition.x + window.scrollX;
+        this.style.left = `${pageX}px`;
+        const pageY = viewportPosition.y + window.scrollY;
+        this.style.top = `${pageY}px`;
+      }
+
+      _useBottom(viewportY) {
+        return viewportY <= 400;
+      }
+
+      _useRight(viewportX) {
+        return viewportX < document.documentElement.clientWidth / 2;
+      }
+
+      set content(content) {
+        if (!content) return this.hide();
+        this.show();
+        if (typeof content === 'string') {
+          this.contentNode.innerHTML = content;
+          this.contentNode.className = 'textContent';
+        } else {
+          const newContent = DOM.div();
+          newContent.appendChild(content);
+          this.contentNode.replaceWith(newContent);
+          newContent.id = 'content';
+        }
+      }
+
+      hide() {
+        this._isHidden = true;
+        this.bodyNode.style.display = 'none';
+        this.targetNode = undefined;
+      }
+
+      show() {
+        this.bodyNode.style.display = 'block';
+        this._isHidden = false;
+      }
+
+      get bodyNode() {
+        return this.$('#body');
+      }
+
+      get contentNode() {
+        return this.$('#content');
+      }
+    });
diff --git a/deps/v8/tools/testrunner/base_runner.py b/deps/v8/tools/testrunner/base_runner.py
index d3674a4f8b9ff8..54a9e61b160a92 100644
--- a/deps/v8/tools/testrunner/base_runner.py
+++ b/deps/v8/tools/testrunner/base_runner.py
@@ -351,9 +351,6 @@ def _add_parser_default_options(self, parser):
                       help="Path to a file for storing json results.")
     parser.add_option('--slow-tests-cutoff', type="int", default=100,
                       help='Collect N slowest tests')
-    parser.add_option("--junitout", help="File name of the JUnit output")
-    parser.add_option("--junittestsuite", default="v8tests",
-                      help="The testsuite name in the JUnit output file")
     parser.add_option("--exit-after-n-failures", type="int", default=100,
                       help="Exit after the first N failures instead of "
                            "running all tests. Pass 0 to disable this feature.")
@@ -760,9 +757,6 @@ def _get_shard_info(self, options):
 
   def _create_progress_indicators(self, test_count, options):
     procs = [PROGRESS_INDICATORS[options.progress]()]
-    if options.junitout:
-      procs.append(progress.JUnitTestProgressIndicator(options.junitout,
-                                                       options.junittestsuite))
     if options.json_test_results:
       procs.append(progress.JsonTestProgressIndicator(self.framework_name))
 
diff --git a/deps/v8/tools/testrunner/local/junit_output.py b/deps/v8/tools/testrunner/local/junit_output.py
deleted file mode 100644
index 52f31ec422a69b..00000000000000
--- a/deps/v8/tools/testrunner/local/junit_output.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2013 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of Google Inc. nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-import xml.etree.ElementTree as xml
-
-
-class JUnitTestOutput:
-  def __init__(self, test_suite_name):
-    self.root = xml.Element("testsuite")
-    self.root.attrib["name"] = test_suite_name
-
-  def HasRunTest(self, test_name, test_cmd, test_duration, test_failure):
-    testCaseElement = xml.Element("testcase")
-    testCaseElement.attrib["name"] = test_name
-    testCaseElement.attrib["cmd"] = test_cmd
-    testCaseElement.attrib["time"] = str(round(test_duration, 3))
-    if len(test_failure):
-      failureElement = xml.Element("failure")
-      failureElement.text = test_failure
-      testCaseElement.append(failureElement)
-    self.root.append(testCaseElement)
-
-  def FinishAndWrite(self, f):
-    xml.ElementTree(self.root).write(f, "UTF-8")
diff --git a/deps/v8/tools/testrunner/local/utils.py b/deps/v8/tools/testrunner/local/utils.py
index a6b92dc7566189..8fdc16b4bb736d 100644
--- a/deps/v8/tools/testrunner/local/utils.py
+++ b/deps/v8/tools/testrunner/local/utils.py
@@ -90,7 +90,8 @@ def GuessOS():
     return 'solaris'
   elif system == 'NetBSD':
     return 'netbsd'
-  elif system == 'AIX':
+  elif system in ['AIX', 'OS400']:
+    # OS400 runs an AIX emulator called PASE
     return 'aix'
   else:
     return None
diff --git a/deps/v8/tools/testrunner/local/variants.py b/deps/v8/tools/testrunner/local/variants.py
index 4236c1678a0882..69ca853de3f91f 100644
--- a/deps/v8/tools/testrunner/local/variants.py
+++ b/deps/v8/tools/testrunner/local/variants.py
@@ -53,12 +53,14 @@
 # implications defined in flag-definitions.h.
 INCOMPATIBLE_FLAGS_PER_VARIANT = {
   "assert_types": ["--no-assert-types"],
-  "jitless": ["--opt", "--liftoff", "--track-field-types", "--validate-asm"],
+  "jitless": ["--opt", "--always-opt", "--liftoff", "--track-field-types", "--validate-asm"],
   "no_wasm_traps": ["--wasm-trap-handler"],
-  "nooptimization": ["--opt", "--no-liftoff", "--predictable", "--wasm-tier-up"],
+  "nooptimization": ["--opt", "--always-opt", "--no-liftoff", "--wasm-tier-up"],
   "slow_path": ["--no-force-slow-path"],
+  "stress_concurrent_allocation": ["--single-threaded-gc", "--predictable"],
   "stress_incremental_marking": ["--no-stress-incremental-marking"],
-  "stress_js_bg_compile_wasm_code_gc": ["--no-stress-background-compile"],
+  "future": ["--parallel-compile-tasks"],
+  "stress_js_bg_compile_wasm_code_gc": ["--no-stress-background-compile", "--parallel-compile-tasks"],
   "stress": ["--no-stress-opt", "--always-opt", "--no-always-opt", "--liftoff", "--max-inlined-bytecode-size=*",
              "--max-inlined-bytecode-size-cumulative=*", "--stress-inline"],
   "turboprop": ["--interrupt-budget=*", "--no-turboprop"],
@@ -77,7 +79,8 @@
                + INCOMPATIBLE_FLAGS_PER_VARIANT["jitless"],
   "predictable": ["--liftoff", "--parallel-compile-tasks",
                   "--concurrent-recompilation",
-                  "--wasm-num-compilation-tasks=*"],
+                  "--wasm-num-compilation-tasks=*",
+                  "--stress-concurrent-allocation"],
 }
 
 # Flags that lead to a contradiction when a certain extra-flag is present.
@@ -92,7 +95,9 @@
   "--no-enable-sse3": ["--enable-sse3"],
   "--no-enable-sse4-1": ["--enable-sse4-1"],
   "--optimize-for-size": ["--max-semi-space-size=*"],
+  "--stress_concurrent_allocation": ["--single-threaded-gc", "--predictable"],
   "--stress-flush-bytecode": ["--no-stress-flush-bytecode"],
+  "--future": ["--parallel-compile-tasks"],
   "--stress-incremental-marking": INCOMPATIBLE_FLAGS_PER_VARIANT["stress_incremental_marking"],
 }
 
diff --git a/deps/v8/tools/testrunner/testproc/progress.py b/deps/v8/tools/testrunner/testproc/progress.py
index 634ef7c2f2e3c0..9ff943a5c2b4bd 100644
--- a/deps/v8/tools/testrunner/testproc/progress.py
+++ b/deps/v8/tools/testrunner/testproc/progress.py
@@ -15,7 +15,6 @@
 
 from . import base
 from . import util
-from ..local import junit_output
 
 
 def print_failure_header(test):
@@ -349,45 +348,6 @@ def _clear_line(self, last_length):
     print(("\r" + (" " * last_length) + "\r"), end='')
 
 
-class JUnitTestProgressIndicator(ProgressIndicator):
-  def __init__(self, junitout, junittestsuite):
-    super(JUnitTestProgressIndicator, self).__init__()
-    self._requirement = base.DROP_PASS_STDOUT
-
-    self.outputter = junit_output.JUnitTestOutput(junittestsuite)
-    if junitout:
-      self.outfile = open(junitout, "w")
-    else:
-      self.outfile = sys.stdout
-
-  def _on_result_for(self, test, result):
-    # TODO(majeski): Support for dummy/grouped results
-    fail_text = ""
-    output = result.output
-    if result.has_unexpected_output:
-      stdout = output.stdout.strip()
-      if len(stdout):
-        fail_text += "stdout:\n%s\n" % stdout
-      stderr = output.stderr.strip()
-      if len(stderr):
-        fail_text += "stderr:\n%s\n" % stderr
-      fail_text += "Command: %s" % result.cmd.to_string()
-      if output.HasCrashed():
-        fail_text += "exit code: %d\n--- CRASHED ---" % output.exit_code
-      if output.HasTimedOut():
-        fail_text += "--- TIMEOUT ---"
-    self.outputter.HasRunTest(
-        test_name=str(test),
-        test_cmd=result.cmd.to_string(relative=True),
-        test_duration=output.duration,
-        test_failure=fail_text)
-
-  def finished(self):
-    self.outputter.FinishAndWrite(self.outfile)
-    if self.outfile != sys.stdout:
-      self.outfile.close()
-
-
 class JsonTestProgressIndicator(ProgressIndicator):
   def __init__(self, framework_name):
     super(JsonTestProgressIndicator, self).__init__()
diff --git a/deps/v8/tools/tickprocessor.mjs b/deps/v8/tools/tickprocessor.mjs
index 5b746d943a5adc..54c37e68e0a0ec 100644
--- a/deps/v8/tools/tickprocessor.mjs
+++ b/deps/v8/tools/tickprocessor.mjs
@@ -31,11 +31,6 @@ import { Profile, JsonProfile } from "./profile.mjs";
 import { ViewBuilder } from "./profile_view.mjs";
 
 
-export function inherits(childCtor, parentCtor) {
-  childCtor.prototype.__proto__ = parentCtor.prototype;
-};
-
-
 class V8Profile extends Profile {
   static IC_RE =
       /^(LoadGlobalIC: )|(Handler: )|(?:CallIC|LoadIC|StoreIC)|(?:Builtin: (?:Keyed)?(?:Load|Store)IC_)/;
@@ -75,20 +70,8 @@ export function readFile(fileName) {
 }
 
 
-/**
- * Parser for dynamic code optimization state.
- */
-function parseState(s) {
-  switch (s) {
-  case "": return Profile.CodeState.COMPILED;
-  case "~": return Profile.CodeState.OPTIMIZABLE;
-  case "*": return Profile.CodeState.OPTIMIZED;
-  }
-  throw new Error(`unknown code state: ${s}`);
-}
-
-
-export function TickProcessor(
+export class TickProcessor extends LogReader {
+  constructor( 
     cppEntriesProvider,
     separateIc,
     separateBytecodes,
@@ -105,8 +88,10 @@ export function TickProcessor(
     onlySummary,
     runtimeTimerFilter,
     preprocessJson) {
-  this.preprocessJson = preprocessJson;
-  LogReader.call(this, {
+  super({},
+      timedRange,
+      pairwiseTimedRange);
+  this.dispatchTable_ = {
       'shared-library': { parsers: [parseString, parseInt, parseInt, parseInt],
           processor: this.processSharedLibrary },
       'code-creation': {
@@ -155,10 +140,10 @@ export function TickProcessor(
       // Obsolete row types.
       'code-allocate': null,
       'begin-code-region': null,
-      'end-code-region': null },
-      timedRange,
-      pairwiseTimedRange);
+      'end-code-region': null
+    };
 
+  this.preprocessJson = preprocessJson;
   this.cppEntriesProvider_ = cppEntriesProvider;
   this.callGraphSize_ = callGraphSize;
   this.ignoreUnknown_ = ignoreUnknown;
@@ -214,11 +199,10 @@ export function TickProcessor(
   this.generation_ = 1;
   this.currentProducerProfile_ = null;
   this.onlySummary_ = onlySummary;
-};
-inherits(TickProcessor, LogReader);
+}
 
 
-TickProcessor.VmStates = {
+static VmStates = {
   JS: 0,
   GC: 1,
   PARSER: 2,
@@ -230,7 +214,7 @@ TickProcessor.VmStates = {
 };
 
 
-TickProcessor.CodeTypes = {
+static CodeTypes = {
   CPP: 0,
   SHARED_LIB: 1
 };
@@ -238,56 +222,56 @@ TickProcessor.CodeTypes = {
 // codeTypes_ map because there can be zillions of them.
 
 
-TickProcessor.CALL_PROFILE_CUTOFF_PCT = 1.0;
+static CALL_PROFILE_CUTOFF_PCT = 1.0;
 
-TickProcessor.CALL_GRAPH_SIZE = 5;
+static CALL_GRAPH_SIZE = 5;
 
 /**
  * @override
  */
-TickProcessor.prototype.printError = function(str) {
+printError(str) {
   printErr(str);
-};
+}
 
 
-TickProcessor.prototype.setCodeType = function(name, type) {
+setCodeType(name, type) {
   this.codeTypes_[name] = TickProcessor.CodeTypes[type];
-};
+}
 
 
-TickProcessor.prototype.isSharedLibrary = function(name) {
+isSharedLibrary(name) {
   return this.codeTypes_[name] == TickProcessor.CodeTypes.SHARED_LIB;
-};
+}
 
 
-TickProcessor.prototype.isCppCode = function(name) {
+isCppCode(name) {
   return this.codeTypes_[name] == TickProcessor.CodeTypes.CPP;
-};
+}
 
 
-TickProcessor.prototype.isJsCode = function(name) {
+isJsCode(name) {
   return name !== "UNKNOWN" && !(name in this.codeTypes_);
-};
+}
 
 
-TickProcessor.prototype.processLogFile = function(fileName) {
+processLogFile(fileName) {
   this.lastLogFileName_ = fileName;
   let line;
   while (line = readline()) {
     this.processLogLine(line);
   }
-};
+}
 
 
-TickProcessor.prototype.processLogFileInTest = function(fileName) {
+processLogFileInTest(fileName) {
    // Hack file name to avoid dealing with platform specifics.
   this.lastLogFileName_ = 'v8.log';
   const contents = readFile(fileName);
   this.processLogChunk(contents);
-};
+}
 
 
-TickProcessor.prototype.processSharedLibrary = function(
+processSharedLibrary(
     name, startAddr, endAddr, aslrSlide) {
   const entry = this.profile_.addLibrary(name, startAddr, endAddr, aslrSlide);
   this.setCodeType(entry.getName(), 'SHARED_LIB');
@@ -298,67 +282,67 @@ TickProcessor.prototype.processSharedLibrary = function(
     self.profile_.addStaticCode(fName, fStart, fEnd);
     self.setCodeType(fName, 'CPP');
   });
-};
+}
 
 
-TickProcessor.prototype.processCodeCreation = function(
+processCodeCreation(
     type, kind, timestamp, start, size, name, maybe_func) {
   if (maybe_func.length) {
     const funcAddr = parseInt(maybe_func[0]);
-    const state = parseState(maybe_func[1]);
+    const state = Profile.parseState(maybe_func[1]);
     this.profile_.addFuncCode(type, name, timestamp, start, size, funcAddr, state);
   } else {
     this.profile_.addCode(type, name, timestamp, start, size);
   }
-};
+}
 
 
-TickProcessor.prototype.processCodeDeopt = function(
+processCodeDeopt(
     timestamp, size, code, inliningId, scriptOffset, bailoutType,
     sourcePositionText, deoptReasonText) {
   this.profile_.deoptCode(timestamp, code, inliningId, scriptOffset,
       bailoutType, sourcePositionText, deoptReasonText);
-};
+}
 
 
-TickProcessor.prototype.processCodeMove = function(from, to) {
+processCodeMove(from, to) {
   this.profile_.moveCode(from, to);
-};
+}
 
-TickProcessor.prototype.processCodeDelete = function(start) {
+processCodeDelete(start) {
   this.profile_.deleteCode(start);
-};
+}
 
-TickProcessor.prototype.processCodeSourceInfo = function(
+processCodeSourceInfo(
     start, script, startPos, endPos, sourcePositions, inliningPositions,
     inlinedFunctions) {
   this.profile_.addSourcePositions(start, script, startPos,
     endPos, sourcePositions, inliningPositions, inlinedFunctions);
-};
+}
 
-TickProcessor.prototype.processScriptSource = function(script, url, source) {
+processScriptSource(script, url, source) {
   this.profile_.addScriptSource(script, url, source);
-};
+}
 
-TickProcessor.prototype.processFunctionMove = function(from, to) {
+processFunctionMove(from, to) {
   this.profile_.moveFunc(from, to);
-};
+}
 
 
-TickProcessor.prototype.includeTick = function(vmState) {
+includeTick(vmState) {
   if (this.stateFilter_ !== null) {
     return this.stateFilter_ == vmState;
   } else if (this.runtimeTimerFilter_ !== null) {
     return this.currentRuntimeTimer == this.runtimeTimerFilter_;
   }
   return true;
-};
+}
 
-TickProcessor.prototype.processRuntimeTimerEvent = function(name) {
+processRuntimeTimerEvent(name) {
   this.currentRuntimeTimer = name;
 }
 
-TickProcessor.prototype.processTick = function(pc,
+processTick(pc,
                                                ns_since_start,
                                                is_external_callback,
                                                tos_or_external_callback,
@@ -394,21 +378,21 @@ TickProcessor.prototype.processTick = function(pc,
   this.profile_.recordTick(
       ns_since_start, vmState,
       this.processStack(pc, tos_or_external_callback, stack));
-};
+}
 
 
-TickProcessor.prototype.advanceDistortion = function() {
+advanceDistortion() {
   this.distortion += this.distortion_per_entry;
 }
 
 
-TickProcessor.prototype.processHeapSampleBegin = function(space, state, ticks) {
+processHeapSampleBegin(space, state, ticks) {
   if (space != 'Heap') return;
   this.currentProducerProfile_ = new CallTree();
-};
+}
 
 
-TickProcessor.prototype.processHeapSampleEnd = function(space, state) {
+processHeapSampleEnd(space, state) {
   if (space != 'Heap' || !this.currentProducerProfile_) return;
 
   print(`Generation ${this.generation_}:`);
@@ -423,10 +407,10 @@ TickProcessor.prototype.processHeapSampleEnd = function(space, state) {
 
   this.currentProducerProfile_ = null;
   this.generation_++;
-};
+}
 
 
-TickProcessor.prototype.printStatistics = function() {
+printStatistics() {
   if (this.preprocessJson) {
     this.profile_.writeJson();
     return;
@@ -505,29 +489,16 @@ TickProcessor.prototype.printStatistics = function() {
             (rec2.internalFuncName < rec1.internalFuncName ? -1 : 1) );
     this.printHeavyProfile(heavyView.head.children);
   }
-};
-
-
-function padLeft(s, len) {
-  s = s.toString();
-  if (s.length < len) {
-    const padLength = len - s.length;
-    if (!(padLength in padLeft)) {
-      padLeft[padLength] = new Array(padLength + 1).join(' ');
-    }
-    s = padLeft[padLength] + s;
-  }
-  return s;
-};
+}
 
 
-TickProcessor.prototype.printHeader = function(headerTitle) {
+printHeader(headerTitle) {
   print(`\n [${headerTitle}]:`);
   print('   ticks  total  nonlib   name');
-};
+}
 
 
-TickProcessor.prototype.printLine = function(
+printLine(
     entry, ticks, totalTicks, nonLibTicks) {
   const pct = ticks * 100 / totalTicks;
   const nonLibPct = nonLibTicks != null
@@ -539,7 +510,7 @@ TickProcessor.prototype.printLine = function(
         entry);
 }
 
-TickProcessor.prototype.printHeavyProfHeader = function() {
+printHeavyProfHeader() {
   print('\n [Bottom up (heavy) profile]:');
   print('  Note: percentage shows a share of a particular caller in the ' +
         'total\n' +
@@ -548,10 +519,10 @@ TickProcessor.prototype.printHeavyProfHeader = function() {
         TickProcessor.CALL_PROFILE_CUTOFF_PCT.toFixed(1) +
         '% are not shown.\n');
   print('   ticks parent  name');
-};
+}
 
 
-TickProcessor.prototype.processProfile = function(
+processProfile(
     profile, filterP, func) {
   for (let i = 0, n = profile.length; i < n; ++i) {
     const rec = profile[i];
@@ -562,7 +533,7 @@ TickProcessor.prototype.processProfile = function(
   }
 };
 
-TickProcessor.prototype.getLineAndColumn = function(name) {
+getLineAndColumn(name) {
   const re = /:([0-9]+):([0-9]+)$/;
   const array = re.exec(name);
   if (!array) {
@@ -571,12 +542,12 @@ TickProcessor.prototype.getLineAndColumn = function(name) {
   return {line: array[1], column: array[2]};
 }
 
-TickProcessor.prototype.hasSourceMap = function() {
+hasSourceMap() {
   return this.sourceMap != null;
-};
+}
 
 
-TickProcessor.prototype.formatFunctionName = function(funcName) {
+formatFunctionName(funcName) {
   if (!this.hasSourceMap()) {
     return funcName;
   }
@@ -593,9 +564,9 @@ TickProcessor.prototype.formatFunctionName = function(funcName) {
   const sourceColumn = entry[4] + 1;
 
   return sourceFile + ':' + sourceLine + ':' + sourceColumn + ' -> ' + funcName;
-};
+}
 
-TickProcessor.prototype.printEntries = function(
+printEntries(
     profile, totalTicks, nonLibTicks, filterP, callback, printAllTicks) {
   const that = this;
   this.processProfile(profile, filterP, function (rec) {
@@ -606,10 +577,9 @@ TickProcessor.prototype.printEntries = function(
       that.printLine(funcName, rec.selfTime, totalTicks, nonLibTicks);
     }
   });
-};
-
+}
 
-TickProcessor.prototype.printHeavyProfile = function(profile, opt_indent) {
+  printHeavyProfile(profile, opt_indent) {
   const self = this;
   const indent = opt_indent || 0;
   const indentStr = padLeft('', indent);
@@ -629,14 +599,27 @@ TickProcessor.prototype.printHeavyProfile = function(profile, opt_indent) {
       print('');
     }
   });
-};
+}
+}
 
 
-function CppEntriesProvider() {
+
+function padLeft(s, len) {
+  s = s.toString();
+  if (s.length < len) {
+    const padLength = len - s.length;
+    if (!(padLength in padLeft)) {
+      padLeft[padLength] = new Array(padLength + 1).join(' ');
+    }
+    s = padLeft[padLength] + s;
+  }
+  return s;
 };
 
 
-CppEntriesProvider.prototype.parseVmSymbols = function(
+class CppEntriesProvider {
+
+parseVmSymbols(
     libName, libStart, libEnd, libASLRSlide, processorFunc) {
   this.loadSymbols(libName);
 
@@ -699,17 +682,20 @@ CppEntriesProvider.prototype.parseVmSymbols = function(
     addEntry(funcInfo);
   }
   addEntry({name: '', start: libEnd});
-};
+}
 
 
-CppEntriesProvider.prototype.loadSymbols = function(libName) {
-};
+loadSymbols(libName) {
+}
 
+parseNextLine() { return false }
 
-CppEntriesProvider.prototype.parseNextLine = () => false;
+}
 
 
-export function UnixCppEntriesProvider(nmExec, objdumpExec, targetRootFS, apkEmbeddedLibrary) {
+export class UnixCppEntriesProvider extends CppEntriesProvider {
+  constructor(nmExec, objdumpExec, targetRootFS, apkEmbeddedLibrary) {
+    super();
   this.symbols = [];
   // File offset of a symbol minus the virtual address of a symbol found in
   // the symbol table.
@@ -720,11 +706,10 @@ export function UnixCppEntriesProvider(nmExec, objdumpExec, targetRootFS, apkEmb
   this.targetRootFS = targetRootFS;
   this.apkEmbeddedLibrary = apkEmbeddedLibrary;
   this.FUNC_RE = /^([0-9a-fA-F]{8,16}) ([0-9a-fA-F]{8,16} )?[tTwW] (.*)$/;
-};
-inherits(UnixCppEntriesProvider, CppEntriesProvider);
+}
 
 
-UnixCppEntriesProvider.prototype.loadSymbols = function(libName) {
+loadSymbols(libName) {
   this.parsePos = 0;
   if (this.apkEmbeddedLibrary && libName.endsWith('.apk')) {
     libName = this.apkEmbeddedLibrary;
@@ -750,10 +735,10 @@ UnixCppEntriesProvider.prototype.loadSymbols = function(libName) {
     // If the library cannot be found on this system let's not panic.
     this.symbols = ['', ''];
   }
-};
+}
 
 
-UnixCppEntriesProvider.prototype.parseNextLine = function() {
+parseNextLine() {
   if (this.symbols.length == 0) {
     return false;
   }
@@ -775,18 +760,18 @@ UnixCppEntriesProvider.prototype.parseNextLine = function() {
     }
   }
   return funcInfo;
-};
-
+}
+}
 
-export function MacCppEntriesProvider(nmExec, objdumpExec, targetRootFS, apkEmbeddedLibrary) {
-  UnixCppEntriesProvider.call(this, nmExec, objdumpExec, targetRootFS, apkEmbeddedLibrary);
+export class MacCppEntriesProvider extends UnixCppEntriesProvider {
+  constructor(nmExec, objdumpExec, targetRootFS, apkEmbeddedLibrary) {
+  super(nmExec, objdumpExec, targetRootFS, apkEmbeddedLibrary);
   // Note an empty group. It is required, as UnixCppEntriesProvider expects 3 groups.
   this.FUNC_RE = /^([0-9a-fA-F]{8,16})() (.*)$/;
-};
-inherits(MacCppEntriesProvider, UnixCppEntriesProvider);
+}
 
 
-MacCppEntriesProvider.prototype.loadSymbols = function(libName) {
+loadSymbols(libName) {
   this.parsePos = 0;
   libName = this.targetRootFS + libName;
 
@@ -798,34 +783,36 @@ MacCppEntriesProvider.prototype.loadSymbols = function(libName) {
     // If the library cannot be found on this system let's not panic.
     this.symbols = '';
   }
-};
+}
+}
 
 
-export function WindowsCppEntriesProvider(_ignored_nmExec, _ignored_objdumpExec, targetRootFS,
+export class WindowsCppEntriesProvider extends CppEntriesProvider {
+  constructor(_ignored_nmExec, _ignored_objdumpExec, targetRootFS,
                                    _ignored_apkEmbeddedLibrary) {
+  super();
   this.targetRootFS = targetRootFS;
   this.symbols = '';
   this.parsePos = 0;
 };
-inherits(WindowsCppEntriesProvider, CppEntriesProvider);
 
 
-WindowsCppEntriesProvider.FILENAME_RE = /^(.*)\.([^.]+)$/;
+static FILENAME_RE = /^(.*)\.([^.]+)$/;
 
 
-WindowsCppEntriesProvider.FUNC_RE =
+static FUNC_RE =
     /^\s+0001:[0-9a-fA-F]{8}\s+([_\?@$0-9a-zA-Z]+)\s+([0-9a-fA-F]{8}).*$/;
 
 
-WindowsCppEntriesProvider.IMAGE_BASE_RE =
+static IMAGE_BASE_RE =
     /^\s+0000:00000000\s+___ImageBase\s+([0-9a-fA-F]{8}).*$/;
 
 
 // This is almost a constant on Windows.
-WindowsCppEntriesProvider.EXE_IMAGE_BASE = 0x00400000;
+static EXE_IMAGE_BASE = 0x00400000;
 
 
-WindowsCppEntriesProvider.prototype.loadSymbols = function(libName) {
+loadSymbols(libName) {
   libName = this.targetRootFS + libName;
   const fileNameFields = libName.match(WindowsCppEntriesProvider.FILENAME_RE);
   if (!fileNameFields) return;
@@ -840,7 +827,7 @@ WindowsCppEntriesProvider.prototype.loadSymbols = function(libName) {
 };
 
 
-WindowsCppEntriesProvider.prototype.parseNextLine = function() {
+parseNextLine() {
   const lineEndPos = this.symbols.indexOf('\r\n', this.parsePos);
   if (lineEndPos == -1) {
     return false;
@@ -875,14 +862,15 @@ WindowsCppEntriesProvider.prototype.parseNextLine = function() {
  *
  *   ?LookupInDescriptor@JSObject@internal@v8@@...arguments info...
  */
-WindowsCppEntriesProvider.prototype.unmangleName = function(name) {
+  unmangleName(name) {
   // Empty or non-mangled name.
   if (name.length < 1 || name.charAt(0) != '?') return name;
   const nameEndPos = name.indexOf('@@');
   const components = name.substring(1, nameEndPos).split('@');
   components.reverse();
   return components.join('::');
-};
+}
+}
 
 
 export class ArgumentsProcessor extends BaseArgumentsProcessor {
diff --git a/deps/v8/tools/v8heapconst.py b/deps/v8/tools/v8heapconst.py
index 0dd31d4ad259fc..cfd41e6bbd19d1 100644
--- a/deps/v8/tools/v8heapconst.py
+++ b/deps/v8/tools/v8heapconst.py
@@ -11,8 +11,6 @@
   2: "EXTERNAL_INTERNALIZED_STRING_TYPE",
   8: "ONE_BYTE_INTERNALIZED_STRING_TYPE",
   10: "EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE",
-  18: "UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE",
-  26: "UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE",
   32: "STRING_TYPE",
   33: "CONS_STRING_TYPE",
   34: "EXTERNAL_STRING_TYPE",
@@ -77,294 +75,301 @@
   113: "WASM_EXPORTED_FUNCTION_DATA_TYPE",
   114: "WASM_INDIRECT_FUNCTION_TABLE_TYPE",
   115: "WASM_JS_FUNCTION_DATA_TYPE",
-  116: "WASM_VALUE_TYPE",
-  117: "FIXED_ARRAY_TYPE",
-  118: "HASH_TABLE_TYPE",
-  119: "EPHEMERON_HASH_TABLE_TYPE",
-  120: "GLOBAL_DICTIONARY_TYPE",
-  121: "NAME_DICTIONARY_TYPE",
-  122: "NUMBER_DICTIONARY_TYPE",
-  123: "ORDERED_HASH_MAP_TYPE",
-  124: "ORDERED_HASH_SET_TYPE",
-  125: "ORDERED_NAME_DICTIONARY_TYPE",
-  126: "SIMPLE_NUMBER_DICTIONARY_TYPE",
-  127: "CLOSURE_FEEDBACK_CELL_ARRAY_TYPE",
-  128: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
-  129: "SCOPE_INFO_TYPE",
-  130: "SCRIPT_CONTEXT_TABLE_TYPE",
-  131: "BYTE_ARRAY_TYPE",
-  132: "BYTECODE_ARRAY_TYPE",
-  133: "FIXED_DOUBLE_ARRAY_TYPE",
-  134: "INTERNAL_CLASS_WITH_SMI_ELEMENTS_TYPE",
-  135: "SLOPPY_ARGUMENTS_ELEMENTS_TYPE",
-  136: "AWAIT_CONTEXT_TYPE",
-  137: "BLOCK_CONTEXT_TYPE",
-  138: "CATCH_CONTEXT_TYPE",
-  139: "DEBUG_EVALUATE_CONTEXT_TYPE",
-  140: "EVAL_CONTEXT_TYPE",
-  141: "FUNCTION_CONTEXT_TYPE",
-  142: "MODULE_CONTEXT_TYPE",
-  143: "NATIVE_CONTEXT_TYPE",
-  144: "SCRIPT_CONTEXT_TYPE",
-  145: "WITH_CONTEXT_TYPE",
-  146: "EXPORTED_SUB_CLASS_BASE_TYPE",
-  147: "EXPORTED_SUB_CLASS_TYPE",
-  148: "EXPORTED_SUB_CLASS2_TYPE",
-  149: "SMALL_ORDERED_HASH_MAP_TYPE",
-  150: "SMALL_ORDERED_HASH_SET_TYPE",
-  151: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
-  152: "DESCRIPTOR_ARRAY_TYPE",
-  153: "STRONG_DESCRIPTOR_ARRAY_TYPE",
-  154: "SOURCE_TEXT_MODULE_TYPE",
-  155: "SYNTHETIC_MODULE_TYPE",
-  156: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
-  157: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
-  158: "WEAK_FIXED_ARRAY_TYPE",
-  159: "TRANSITION_ARRAY_TYPE",
-  160: "CELL_TYPE",
-  161: "CODE_TYPE",
-  162: "CODE_DATA_CONTAINER_TYPE",
-  163: "COVERAGE_INFO_TYPE",
-  164: "EMBEDDER_DATA_ARRAY_TYPE",
-  165: "FEEDBACK_METADATA_TYPE",
-  166: "FEEDBACK_VECTOR_TYPE",
-  167: "FILLER_TYPE",
-  168: "FREE_SPACE_TYPE",
-  169: "INTERNAL_CLASS_TYPE",
-  170: "INTERNAL_CLASS_WITH_STRUCT_ELEMENTS_TYPE",
-  171: "MAP_TYPE",
-  172: "ON_HEAP_BASIC_BLOCK_PROFILER_DATA_TYPE",
-  173: "PREPARSE_DATA_TYPE",
-  174: "PROPERTY_ARRAY_TYPE",
-  175: "PROPERTY_CELL_TYPE",
-  176: "SHARED_FUNCTION_INFO_TYPE",
-  177: "SMI_BOX_TYPE",
-  178: "SMI_PAIR_TYPE",
-  179: "SORT_STATE_TYPE",
-  180: "WASM_ARRAY_TYPE",
-  181: "WASM_CAPI_FUNCTION_DATA_TYPE",
-  182: "WASM_STRUCT_TYPE",
-  183: "WEAK_ARRAY_LIST_TYPE",
-  184: "WEAK_CELL_TYPE",
-  185: "JS_PROXY_TYPE",
+  116: "FIXED_ARRAY_TYPE",
+  117: "HASH_TABLE_TYPE",
+  118: "EPHEMERON_HASH_TABLE_TYPE",
+  119: "GLOBAL_DICTIONARY_TYPE",
+  120: "NAME_DICTIONARY_TYPE",
+  121: "NUMBER_DICTIONARY_TYPE",
+  122: "ORDERED_HASH_MAP_TYPE",
+  123: "ORDERED_HASH_SET_TYPE",
+  124: "ORDERED_NAME_DICTIONARY_TYPE",
+  125: "SIMPLE_NUMBER_DICTIONARY_TYPE",
+  126: "CLOSURE_FEEDBACK_CELL_ARRAY_TYPE",
+  127: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
+  128: "SCOPE_INFO_TYPE",
+  129: "SCRIPT_CONTEXT_TABLE_TYPE",
+  130: "BYTE_ARRAY_TYPE",
+  131: "BYTECODE_ARRAY_TYPE",
+  132: "FIXED_DOUBLE_ARRAY_TYPE",
+  133: "INTERNAL_CLASS_WITH_SMI_ELEMENTS_TYPE",
+  134: "SLOPPY_ARGUMENTS_ELEMENTS_TYPE",
+  135: "AWAIT_CONTEXT_TYPE",
+  136: "BLOCK_CONTEXT_TYPE",
+  137: "CATCH_CONTEXT_TYPE",
+  138: "DEBUG_EVALUATE_CONTEXT_TYPE",
+  139: "EVAL_CONTEXT_TYPE",
+  140: "FUNCTION_CONTEXT_TYPE",
+  141: "MODULE_CONTEXT_TYPE",
+  142: "NATIVE_CONTEXT_TYPE",
+  143: "SCRIPT_CONTEXT_TYPE",
+  144: "WITH_CONTEXT_TYPE",
+  145: "EXPORTED_SUB_CLASS_BASE_TYPE",
+  146: "EXPORTED_SUB_CLASS_TYPE",
+  147: "EXPORTED_SUB_CLASS2_TYPE",
+  148: "SMALL_ORDERED_HASH_MAP_TYPE",
+  149: "SMALL_ORDERED_HASH_SET_TYPE",
+  150: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
+  151: "DESCRIPTOR_ARRAY_TYPE",
+  152: "STRONG_DESCRIPTOR_ARRAY_TYPE",
+  153: "SOURCE_TEXT_MODULE_TYPE",
+  154: "SYNTHETIC_MODULE_TYPE",
+  155: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
+  156: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
+  157: "WEAK_FIXED_ARRAY_TYPE",
+  158: "TRANSITION_ARRAY_TYPE",
+  159: "CELL_TYPE",
+  160: "CODE_TYPE",
+  161: "CODE_DATA_CONTAINER_TYPE",
+  162: "COVERAGE_INFO_TYPE",
+  163: "EMBEDDER_DATA_ARRAY_TYPE",
+  164: "FEEDBACK_METADATA_TYPE",
+  165: "FEEDBACK_VECTOR_TYPE",
+  166: "FILLER_TYPE",
+  167: "FREE_SPACE_TYPE",
+  168: "INTERNAL_CLASS_TYPE",
+  169: "INTERNAL_CLASS_WITH_STRUCT_ELEMENTS_TYPE",
+  170: "MAP_TYPE",
+  171: "ON_HEAP_BASIC_BLOCK_PROFILER_DATA_TYPE",
+  172: "PREPARSE_DATA_TYPE",
+  173: "PROPERTY_ARRAY_TYPE",
+  174: "PROPERTY_CELL_TYPE",
+  175: "SHARED_FUNCTION_INFO_TYPE",
+  176: "SMI_BOX_TYPE",
+  177: "SMI_PAIR_TYPE",
+  178: "SORT_STATE_TYPE",
+  179: "WASM_ARRAY_TYPE",
+  180: "WASM_CAPI_FUNCTION_DATA_TYPE",
+  181: "WASM_STRUCT_TYPE",
+  182: "WEAK_ARRAY_LIST_TYPE",
+  183: "WEAK_CELL_TYPE",
+  184: "JS_PROXY_TYPE",
   1057: "JS_OBJECT_TYPE",
-  186: "JS_GLOBAL_OBJECT_TYPE",
-  187: "JS_GLOBAL_PROXY_TYPE",
-  188: "JS_MODULE_NAMESPACE_TYPE",
+  185: "JS_GLOBAL_OBJECT_TYPE",
+  186: "JS_GLOBAL_PROXY_TYPE",
+  187: "JS_MODULE_NAMESPACE_TYPE",
   1040: "JS_SPECIAL_API_OBJECT_TYPE",
   1041: "JS_PRIMITIVE_WRAPPER_TYPE",
-  1042: "JS_MAP_KEY_ITERATOR_TYPE",
-  1043: "JS_MAP_KEY_VALUE_ITERATOR_TYPE",
-  1044: "JS_MAP_VALUE_ITERATOR_TYPE",
-  1045: "JS_SET_KEY_VALUE_ITERATOR_TYPE",
-  1046: "JS_SET_VALUE_ITERATOR_TYPE",
-  1047: "JS_GENERATOR_OBJECT_TYPE",
-  1048: "JS_ASYNC_FUNCTION_OBJECT_TYPE",
-  1049: "JS_ASYNC_GENERATOR_OBJECT_TYPE",
-  1050: "JS_DATA_VIEW_TYPE",
-  1051: "JS_TYPED_ARRAY_TYPE",
-  1052: "JS_MAP_TYPE",
-  1053: "JS_SET_TYPE",
-  1054: "JS_WEAK_MAP_TYPE",
-  1055: "JS_WEAK_SET_TYPE",
+  1042: "JS_ARRAY_ITERATOR_PROTOTYPE_TYPE",
+  1043: "JS_ITERATOR_PROTOTYPE_TYPE",
+  1044: "JS_MAP_ITERATOR_PROTOTYPE_TYPE",
+  1045: "JS_OBJECT_PROTOTYPE_TYPE",
+  1046: "JS_PROMISE_PROTOTYPE_TYPE",
+  1047: "JS_REG_EXP_PROTOTYPE_TYPE",
+  1048: "JS_SET_ITERATOR_PROTOTYPE_TYPE",
+  1049: "JS_SET_PROTOTYPE_TYPE",
+  1050: "JS_STRING_ITERATOR_PROTOTYPE_TYPE",
+  1051: "JS_TYPED_ARRAY_PROTOTYPE_TYPE",
+  1052: "JS_GENERATOR_OBJECT_TYPE",
+  1053: "JS_ASYNC_FUNCTION_OBJECT_TYPE",
+  1054: "JS_ASYNC_GENERATOR_OBJECT_TYPE",
+  1055: "JS_ARGUMENTS_OBJECT_TYPE",
   1056: "JS_API_OBJECT_TYPE",
-  1058: "JS_ARGUMENTS_OBJECT_TYPE",
-  1059: "JS_ARRAY_TYPE",
-  1060: "JS_ARRAY_BUFFER_TYPE",
-  1061: "JS_ARRAY_ITERATOR_TYPE",
-  1062: "JS_ASYNC_FROM_SYNC_ITERATOR_TYPE",
-  1063: "JS_COLLATOR_TYPE",
-  1064: "JS_CONTEXT_EXTENSION_OBJECT_TYPE",
-  1065: "JS_DATE_TYPE",
-  1066: "JS_DATE_TIME_FORMAT_TYPE",
-  1067: "JS_DISPLAY_NAMES_TYPE",
-  1068: "JS_ERROR_TYPE",
-  1069: "JS_FINALIZATION_REGISTRY_TYPE",
-  1070: "JS_LIST_FORMAT_TYPE",
-  1071: "JS_LOCALE_TYPE",
-  1072: "JS_MESSAGE_OBJECT_TYPE",
-  1073: "JS_NUMBER_FORMAT_TYPE",
-  1074: "JS_PLURAL_RULES_TYPE",
-  1075: "JS_PROMISE_TYPE",
-  1076: "JS_REG_EXP_TYPE",
-  1077: "JS_REG_EXP_STRING_ITERATOR_TYPE",
-  1078: "JS_RELATIVE_TIME_FORMAT_TYPE",
-  1079: "JS_SEGMENT_ITERATOR_TYPE",
-  1080: "JS_SEGMENTER_TYPE",
-  1081: "JS_SEGMENTS_TYPE",
-  1082: "JS_STRING_ITERATOR_TYPE",
-  1083: "JS_V8_BREAK_ITERATOR_TYPE",
-  1084: "JS_WEAK_REF_TYPE",
-  1085: "WASM_EXCEPTION_OBJECT_TYPE",
-  1086: "WASM_GLOBAL_OBJECT_TYPE",
-  1087: "WASM_INSTANCE_OBJECT_TYPE",
-  1088: "WASM_MEMORY_OBJECT_TYPE",
-  1089: "WASM_MODULE_OBJECT_TYPE",
-  1090: "WASM_TABLE_OBJECT_TYPE",
-  1091: "JS_BOUND_FUNCTION_TYPE",
-  1092: "JS_FUNCTION_TYPE",
+  1058: "JS_MAP_KEY_ITERATOR_TYPE",
+  1059: "JS_MAP_KEY_VALUE_ITERATOR_TYPE",
+  1060: "JS_MAP_VALUE_ITERATOR_TYPE",
+  1061: "JS_SET_KEY_VALUE_ITERATOR_TYPE",
+  1062: "JS_SET_VALUE_ITERATOR_TYPE",
+  1063: "JS_DATA_VIEW_TYPE",
+  1064: "JS_TYPED_ARRAY_TYPE",
+  1065: "JS_MAP_TYPE",
+  1066: "JS_SET_TYPE",
+  1067: "JS_BOUND_FUNCTION_TYPE",
+  1068: "JS_FUNCTION_TYPE",
+  1069: "JS_WEAK_MAP_TYPE",
+  1070: "JS_WEAK_SET_TYPE",
+  1071: "JS_ARRAY_TYPE",
+  1072: "JS_ARRAY_BUFFER_TYPE",
+  1073: "JS_ARRAY_ITERATOR_TYPE",
+  1074: "JS_ASYNC_FROM_SYNC_ITERATOR_TYPE",
+  1075: "JS_COLLATOR_TYPE",
+  1076: "JS_CONTEXT_EXTENSION_OBJECT_TYPE",
+  1077: "JS_DATE_TYPE",
+  1078: "JS_DATE_TIME_FORMAT_TYPE",
+  1079: "JS_DISPLAY_NAMES_TYPE",
+  1080: "JS_ERROR_TYPE",
+  1081: "JS_FINALIZATION_REGISTRY_TYPE",
+  1082: "JS_LIST_FORMAT_TYPE",
+  1083: "JS_LOCALE_TYPE",
+  1084: "JS_MESSAGE_OBJECT_TYPE",
+  1085: "JS_NUMBER_FORMAT_TYPE",
+  1086: "JS_PLURAL_RULES_TYPE",
+  1087: "JS_PROMISE_TYPE",
+  1088: "JS_REG_EXP_TYPE",
+  1089: "JS_REG_EXP_STRING_ITERATOR_TYPE",
+  1090: "JS_RELATIVE_TIME_FORMAT_TYPE",
+  1091: "JS_SEGMENT_ITERATOR_TYPE",
+  1092: "JS_SEGMENTER_TYPE",
+  1093: "JS_SEGMENTS_TYPE",
+  1094: "JS_STRING_ITERATOR_TYPE",
+  1095: "JS_V8_BREAK_ITERATOR_TYPE",
+  1096: "JS_WEAK_REF_TYPE",
+  1097: "WASM_EXCEPTION_OBJECT_TYPE",
+  1098: "WASM_GLOBAL_OBJECT_TYPE",
+  1099: "WASM_INSTANCE_OBJECT_TYPE",
+  1100: "WASM_MEMORY_OBJECT_TYPE",
+  1101: "WASM_MODULE_OBJECT_TYPE",
+  1102: "WASM_TABLE_OBJECT_TYPE",
 }
 
 # List of known V8 maps.
 KNOWN_MAPS = {
-  ("read_only_space", 0x02115): (171, "MetaMap"),
+  ("read_only_space", 0x02115): (170, "MetaMap"),
   ("read_only_space", 0x0213d): (67, "NullMap"),
-  ("read_only_space", 0x02165): (153, "StrongDescriptorArrayMap"),
-  ("read_only_space", 0x0218d): (158, "WeakFixedArrayMap"),
+  ("read_only_space", 0x02165): (152, "StrongDescriptorArrayMap"),
+  ("read_only_space", 0x0218d): (157, "WeakFixedArrayMap"),
   ("read_only_space", 0x021cd): (96, "EnumCacheMap"),
-  ("read_only_space", 0x02201): (117, "FixedArrayMap"),
+  ("read_only_space", 0x02201): (116, "FixedArrayMap"),
   ("read_only_space", 0x0224d): (8, "OneByteInternalizedStringMap"),
-  ("read_only_space", 0x02299): (168, "FreeSpaceMap"),
-  ("read_only_space", 0x022c1): (167, "OnePointerFillerMap"),
-  ("read_only_space", 0x022e9): (167, "TwoPointerFillerMap"),
+  ("read_only_space", 0x02299): (167, "FreeSpaceMap"),
+  ("read_only_space", 0x022c1): (166, "OnePointerFillerMap"),
+  ("read_only_space", 0x022e9): (166, "TwoPointerFillerMap"),
   ("read_only_space", 0x02311): (67, "UninitializedMap"),
   ("read_only_space", 0x02389): (67, "UndefinedMap"),
   ("read_only_space", 0x023cd): (66, "HeapNumberMap"),
   ("read_only_space", 0x02401): (67, "TheHoleMap"),
   ("read_only_space", 0x02461): (67, "BooleanMap"),
-  ("read_only_space", 0x02505): (131, "ByteArrayMap"),
-  ("read_only_space", 0x0252d): (117, "FixedCOWArrayMap"),
-  ("read_only_space", 0x02555): (118, "HashTableMap"),
+  ("read_only_space", 0x02505): (130, "ByteArrayMap"),
+  ("read_only_space", 0x0252d): (116, "FixedCOWArrayMap"),
+  ("read_only_space", 0x02555): (117, "HashTableMap"),
   ("read_only_space", 0x0257d): (64, "SymbolMap"),
   ("read_only_space", 0x025a5): (40, "OneByteStringMap"),
-  ("read_only_space", 0x025cd): (129, "ScopeInfoMap"),
-  ("read_only_space", 0x025f5): (176, "SharedFunctionInfoMap"),
-  ("read_only_space", 0x0261d): (161, "CodeMap"),
-  ("read_only_space", 0x02645): (160, "CellMap"),
-  ("read_only_space", 0x0266d): (175, "GlobalPropertyCellMap"),
+  ("read_only_space", 0x025cd): (128, "ScopeInfoMap"),
+  ("read_only_space", 0x025f5): (175, "SharedFunctionInfoMap"),
+  ("read_only_space", 0x0261d): (160, "CodeMap"),
+  ("read_only_space", 0x02645): (159, "CellMap"),
+  ("read_only_space", 0x0266d): (174, "GlobalPropertyCellMap"),
   ("read_only_space", 0x02695): (70, "ForeignMap"),
-  ("read_only_space", 0x026bd): (159, "TransitionArrayMap"),
+  ("read_only_space", 0x026bd): (158, "TransitionArrayMap"),
   ("read_only_space", 0x026e5): (45, "ThinOneByteStringMap"),
-  ("read_only_space", 0x0270d): (166, "FeedbackVectorMap"),
-  ("read_only_space", 0x0273d): (67, "ArgumentsMarkerMap"),
-  ("read_only_space", 0x0279d): (67, "ExceptionMap"),
-  ("read_only_space", 0x027f9): (67, "TerminationExceptionMap"),
-  ("read_only_space", 0x02861): (67, "OptimizedOutMap"),
-  ("read_only_space", 0x028c1): (67, "StaleRegisterMap"),
-  ("read_only_space", 0x02921): (130, "ScriptContextTableMap"),
-  ("read_only_space", 0x02949): (127, "ClosureFeedbackCellArrayMap"),
-  ("read_only_space", 0x02971): (165, "FeedbackMetadataArrayMap"),
-  ("read_only_space", 0x02999): (117, "ArrayListMap"),
-  ("read_only_space", 0x029c1): (65, "BigIntMap"),
-  ("read_only_space", 0x029e9): (128, "ObjectBoilerplateDescriptionMap"),
-  ("read_only_space", 0x02a11): (132, "BytecodeArrayMap"),
-  ("read_only_space", 0x02a39): (162, "CodeDataContainerMap"),
-  ("read_only_space", 0x02a61): (163, "CoverageInfoMap"),
-  ("read_only_space", 0x02a89): (133, "FixedDoubleArrayMap"),
-  ("read_only_space", 0x02ab1): (120, "GlobalDictionaryMap"),
-  ("read_only_space", 0x02ad9): (97, "ManyClosuresCellMap"),
-  ("read_only_space", 0x02b01): (117, "ModuleInfoMap"),
-  ("read_only_space", 0x02b29): (121, "NameDictionaryMap"),
-  ("read_only_space", 0x02b51): (97, "NoClosuresCellMap"),
-  ("read_only_space", 0x02b79): (122, "NumberDictionaryMap"),
-  ("read_only_space", 0x02ba1): (97, "OneClosureCellMap"),
-  ("read_only_space", 0x02bc9): (123, "OrderedHashMapMap"),
-  ("read_only_space", 0x02bf1): (124, "OrderedHashSetMap"),
-  ("read_only_space", 0x02c19): (125, "OrderedNameDictionaryMap"),
-  ("read_only_space", 0x02c41): (173, "PreparseDataMap"),
-  ("read_only_space", 0x02c69): (174, "PropertyArrayMap"),
-  ("read_only_space", 0x02c91): (93, "SideEffectCallHandlerInfoMap"),
-  ("read_only_space", 0x02cb9): (93, "SideEffectFreeCallHandlerInfoMap"),
-  ("read_only_space", 0x02ce1): (93, "NextCallSideEffectFreeCallHandlerInfoMap"),
-  ("read_only_space", 0x02d09): (126, "SimpleNumberDictionaryMap"),
-  ("read_only_space", 0x02d31): (149, "SmallOrderedHashMapMap"),
-  ("read_only_space", 0x02d59): (150, "SmallOrderedHashSetMap"),
-  ("read_only_space", 0x02d81): (151, "SmallOrderedNameDictionaryMap"),
-  ("read_only_space", 0x02da9): (154, "SourceTextModuleMap"),
-  ("read_only_space", 0x02dd1): (155, "SyntheticModuleMap"),
-  ("read_only_space", 0x02df9): (157, "UncompiledDataWithoutPreparseDataMap"),
-  ("read_only_space", 0x02e21): (156, "UncompiledDataWithPreparseDataMap"),
-  ("read_only_space", 0x02e49): (71, "WasmTypeInfoMap"),
-  ("read_only_space", 0x02e71): (183, "WeakArrayListMap"),
-  ("read_only_space", 0x02e99): (119, "EphemeronHashTableMap"),
-  ("read_only_space", 0x02ec1): (164, "EmbedderDataArrayMap"),
-  ("read_only_space", 0x02ee9): (184, "WeakCellMap"),
-  ("read_only_space", 0x02f11): (32, "StringMap"),
-  ("read_only_space", 0x02f39): (41, "ConsOneByteStringMap"),
-  ("read_only_space", 0x02f61): (33, "ConsStringMap"),
-  ("read_only_space", 0x02f89): (37, "ThinStringMap"),
-  ("read_only_space", 0x02fb1): (35, "SlicedStringMap"),
-  ("read_only_space", 0x02fd9): (43, "SlicedOneByteStringMap"),
-  ("read_only_space", 0x03001): (34, "ExternalStringMap"),
-  ("read_only_space", 0x03029): (42, "ExternalOneByteStringMap"),
-  ("read_only_space", 0x03051): (50, "UncachedExternalStringMap"),
-  ("read_only_space", 0x03079): (0, "InternalizedStringMap"),
-  ("read_only_space", 0x030a1): (2, "ExternalInternalizedStringMap"),
-  ("read_only_space", 0x030c9): (10, "ExternalOneByteInternalizedStringMap"),
-  ("read_only_space", 0x030f1): (18, "UncachedExternalInternalizedStringMap"),
-  ("read_only_space", 0x03119): (26, "UncachedExternalOneByteInternalizedStringMap"),
-  ("read_only_space", 0x03141): (58, "UncachedExternalOneByteStringMap"),
-  ("read_only_space", 0x03169): (67, "SelfReferenceMarkerMap"),
-  ("read_only_space", 0x03191): (67, "BasicBlockCountersMarkerMap"),
-  ("read_only_space", 0x031d5): (87, "ArrayBoilerplateDescriptionMap"),
-  ("read_only_space", 0x032bd): (99, "InterceptorInfoMap"),
-  ("read_only_space", 0x053c9): (72, "PromiseFulfillReactionJobTaskMap"),
-  ("read_only_space", 0x053f1): (73, "PromiseRejectReactionJobTaskMap"),
-  ("read_only_space", 0x05419): (74, "CallableTaskMap"),
-  ("read_only_space", 0x05441): (75, "CallbackTaskMap"),
-  ("read_only_space", 0x05469): (76, "PromiseResolveThenableJobTaskMap"),
-  ("read_only_space", 0x05491): (79, "FunctionTemplateInfoMap"),
-  ("read_only_space", 0x054b9): (80, "ObjectTemplateInfoMap"),
-  ("read_only_space", 0x054e1): (81, "AccessCheckInfoMap"),
-  ("read_only_space", 0x05509): (82, "AccessorInfoMap"),
-  ("read_only_space", 0x05531): (83, "AccessorPairMap"),
-  ("read_only_space", 0x05559): (84, "AliasedArgumentsEntryMap"),
-  ("read_only_space", 0x05581): (85, "AllocationMementoMap"),
-  ("read_only_space", 0x055a9): (88, "AsmWasmDataMap"),
-  ("read_only_space", 0x055d1): (89, "AsyncGeneratorRequestMap"),
-  ("read_only_space", 0x055f9): (90, "BreakPointMap"),
-  ("read_only_space", 0x05621): (91, "BreakPointInfoMap"),
-  ("read_only_space", 0x05649): (92, "CachedTemplateObjectMap"),
-  ("read_only_space", 0x05671): (94, "ClassPositionsMap"),
-  ("read_only_space", 0x05699): (95, "DebugInfoMap"),
-  ("read_only_space", 0x056c1): (98, "FunctionTemplateRareDataMap"),
-  ("read_only_space", 0x056e9): (100, "InterpreterDataMap"),
-  ("read_only_space", 0x05711): (101, "ModuleRequestMap"),
-  ("read_only_space", 0x05739): (102, "PromiseCapabilityMap"),
-  ("read_only_space", 0x05761): (103, "PromiseReactionMap"),
-  ("read_only_space", 0x05789): (104, "PropertyDescriptorObjectMap"),
-  ("read_only_space", 0x057b1): (105, "PrototypeInfoMap"),
-  ("read_only_space", 0x057d9): (106, "ScriptMap"),
-  ("read_only_space", 0x05801): (107, "SourceTextModuleInfoEntryMap"),
-  ("read_only_space", 0x05829): (108, "StackFrameInfoMap"),
-  ("read_only_space", 0x05851): (109, "StackTraceFrameMap"),
-  ("read_only_space", 0x05879): (110, "TemplateObjectDescriptionMap"),
-  ("read_only_space", 0x058a1): (111, "Tuple2Map"),
-  ("read_only_space", 0x058c9): (112, "WasmExceptionTagMap"),
-  ("read_only_space", 0x058f1): (113, "WasmExportedFunctionDataMap"),
-  ("read_only_space", 0x05919): (114, "WasmIndirectFunctionTableMap"),
-  ("read_only_space", 0x05941): (115, "WasmJSFunctionDataMap"),
-  ("read_only_space", 0x05969): (116, "WasmValueMap"),
-  ("read_only_space", 0x05991): (135, "SloppyArgumentsElementsMap"),
-  ("read_only_space", 0x059b9): (152, "DescriptorArrayMap"),
-  ("read_only_space", 0x059e1): (172, "OnHeapBasicBlockProfilerDataMap"),
-  ("read_only_space", 0x05a09): (181, "WasmCapiFunctionDataMap"),
-  ("read_only_space", 0x05a31): (169, "InternalClassMap"),
-  ("read_only_space", 0x05a59): (178, "SmiPairMap"),
-  ("read_only_space", 0x05a81): (177, "SmiBoxMap"),
-  ("read_only_space", 0x05aa9): (146, "ExportedSubClassBaseMap"),
-  ("read_only_space", 0x05ad1): (147, "ExportedSubClassMap"),
-  ("read_only_space", 0x05af9): (68, "AbstractInternalClassSubclass1Map"),
-  ("read_only_space", 0x05b21): (69, "AbstractInternalClassSubclass2Map"),
-  ("read_only_space", 0x05b49): (134, "InternalClassWithSmiElementsMap"),
-  ("read_only_space", 0x05b71): (170, "InternalClassWithStructElementsMap"),
-  ("read_only_space", 0x05b99): (148, "ExportedSubClass2Map"),
-  ("read_only_space", 0x05bc1): (179, "SortStateMap"),
-  ("read_only_space", 0x05be9): (86, "AllocationSiteWithWeakNextMap"),
-  ("read_only_space", 0x05c11): (86, "AllocationSiteWithoutWeakNextMap"),
-  ("read_only_space", 0x05c39): (77, "LoadHandler1Map"),
-  ("read_only_space", 0x05c61): (77, "LoadHandler2Map"),
-  ("read_only_space", 0x05c89): (77, "LoadHandler3Map"),
-  ("read_only_space", 0x05cb1): (78, "StoreHandler0Map"),
-  ("read_only_space", 0x05cd9): (78, "StoreHandler1Map"),
-  ("read_only_space", 0x05d01): (78, "StoreHandler2Map"),
-  ("read_only_space", 0x05d29): (78, "StoreHandler3Map"),
+  ("read_only_space", 0x0270d): (165, "FeedbackVectorMap"),
+  ("read_only_space", 0x02749): (67, "ArgumentsMarkerMap"),
+  ("read_only_space", 0x027a9): (67, "ExceptionMap"),
+  ("read_only_space", 0x02805): (67, "TerminationExceptionMap"),
+  ("read_only_space", 0x0286d): (67, "OptimizedOutMap"),
+  ("read_only_space", 0x028cd): (67, "StaleRegisterMap"),
+  ("read_only_space", 0x0292d): (129, "ScriptContextTableMap"),
+  ("read_only_space", 0x02955): (126, "ClosureFeedbackCellArrayMap"),
+  ("read_only_space", 0x0297d): (164, "FeedbackMetadataArrayMap"),
+  ("read_only_space", 0x029a5): (116, "ArrayListMap"),
+  ("read_only_space", 0x029cd): (65, "BigIntMap"),
+  ("read_only_space", 0x029f5): (127, "ObjectBoilerplateDescriptionMap"),
+  ("read_only_space", 0x02a1d): (131, "BytecodeArrayMap"),
+  ("read_only_space", 0x02a45): (161, "CodeDataContainerMap"),
+  ("read_only_space", 0x02a6d): (162, "CoverageInfoMap"),
+  ("read_only_space", 0x02a95): (132, "FixedDoubleArrayMap"),
+  ("read_only_space", 0x02abd): (119, "GlobalDictionaryMap"),
+  ("read_only_space", 0x02ae5): (97, "ManyClosuresCellMap"),
+  ("read_only_space", 0x02b0d): (116, "ModuleInfoMap"),
+  ("read_only_space", 0x02b35): (120, "NameDictionaryMap"),
+  ("read_only_space", 0x02b5d): (97, "NoClosuresCellMap"),
+  ("read_only_space", 0x02b85): (121, "NumberDictionaryMap"),
+  ("read_only_space", 0x02bad): (97, "OneClosureCellMap"),
+  ("read_only_space", 0x02bd5): (122, "OrderedHashMapMap"),
+  ("read_only_space", 0x02bfd): (123, "OrderedHashSetMap"),
+  ("read_only_space", 0x02c25): (124, "OrderedNameDictionaryMap"),
+  ("read_only_space", 0x02c4d): (172, "PreparseDataMap"),
+  ("read_only_space", 0x02c75): (173, "PropertyArrayMap"),
+  ("read_only_space", 0x02c9d): (93, "SideEffectCallHandlerInfoMap"),
+  ("read_only_space", 0x02cc5): (93, "SideEffectFreeCallHandlerInfoMap"),
+  ("read_only_space", 0x02ced): (93, "NextCallSideEffectFreeCallHandlerInfoMap"),
+  ("read_only_space", 0x02d15): (125, "SimpleNumberDictionaryMap"),
+  ("read_only_space", 0x02d3d): (148, "SmallOrderedHashMapMap"),
+  ("read_only_space", 0x02d65): (149, "SmallOrderedHashSetMap"),
+  ("read_only_space", 0x02d8d): (150, "SmallOrderedNameDictionaryMap"),
+  ("read_only_space", 0x02db5): (153, "SourceTextModuleMap"),
+  ("read_only_space", 0x02ddd): (154, "SyntheticModuleMap"),
+  ("read_only_space", 0x02e05): (71, "WasmTypeInfoMap"),
+  ("read_only_space", 0x02e2d): (182, "WeakArrayListMap"),
+  ("read_only_space", 0x02e55): (118, "EphemeronHashTableMap"),
+  ("read_only_space", 0x02e7d): (163, "EmbedderDataArrayMap"),
+  ("read_only_space", 0x02ea5): (183, "WeakCellMap"),
+  ("read_only_space", 0x02ecd): (32, "StringMap"),
+  ("read_only_space", 0x02ef5): (41, "ConsOneByteStringMap"),
+  ("read_only_space", 0x02f1d): (33, "ConsStringMap"),
+  ("read_only_space", 0x02f45): (37, "ThinStringMap"),
+  ("read_only_space", 0x02f6d): (35, "SlicedStringMap"),
+  ("read_only_space", 0x02f95): (43, "SlicedOneByteStringMap"),
+  ("read_only_space", 0x02fbd): (34, "ExternalStringMap"),
+  ("read_only_space", 0x02fe5): (42, "ExternalOneByteStringMap"),
+  ("read_only_space", 0x0300d): (50, "UncachedExternalStringMap"),
+  ("read_only_space", 0x03035): (0, "InternalizedStringMap"),
+  ("read_only_space", 0x0305d): (2, "ExternalInternalizedStringMap"),
+  ("read_only_space", 0x03085): (10, "ExternalOneByteInternalizedStringMap"),
+  ("read_only_space", 0x030ad): (58, "UncachedExternalOneByteStringMap"),
+  ("read_only_space", 0x030d5): (67, "SelfReferenceMarkerMap"),
+  ("read_only_space", 0x030fd): (67, "BasicBlockCountersMarkerMap"),
+  ("read_only_space", 0x03141): (87, "ArrayBoilerplateDescriptionMap"),
+  ("read_only_space", 0x03229): (99, "InterceptorInfoMap"),
+  ("read_only_space", 0x05355): (72, "PromiseFulfillReactionJobTaskMap"),
+  ("read_only_space", 0x0537d): (73, "PromiseRejectReactionJobTaskMap"),
+  ("read_only_space", 0x053a5): (74, "CallableTaskMap"),
+  ("read_only_space", 0x053cd): (75, "CallbackTaskMap"),
+  ("read_only_space", 0x053f5): (76, "PromiseResolveThenableJobTaskMap"),
+  ("read_only_space", 0x0541d): (79, "FunctionTemplateInfoMap"),
+  ("read_only_space", 0x05445): (80, "ObjectTemplateInfoMap"),
+  ("read_only_space", 0x0546d): (81, "AccessCheckInfoMap"),
+  ("read_only_space", 0x05495): (82, "AccessorInfoMap"),
+  ("read_only_space", 0x054bd): (83, "AccessorPairMap"),
+  ("read_only_space", 0x054e5): (84, "AliasedArgumentsEntryMap"),
+  ("read_only_space", 0x0550d): (85, "AllocationMementoMap"),
+  ("read_only_space", 0x05535): (88, "AsmWasmDataMap"),
+  ("read_only_space", 0x0555d): (89, "AsyncGeneratorRequestMap"),
+  ("read_only_space", 0x05585): (90, "BreakPointMap"),
+  ("read_only_space", 0x055ad): (91, "BreakPointInfoMap"),
+  ("read_only_space", 0x055d5): (92, "CachedTemplateObjectMap"),
+  ("read_only_space", 0x055fd): (94, "ClassPositionsMap"),
+  ("read_only_space", 0x05625): (95, "DebugInfoMap"),
+  ("read_only_space", 0x0564d): (98, "FunctionTemplateRareDataMap"),
+  ("read_only_space", 0x05675): (100, "InterpreterDataMap"),
+  ("read_only_space", 0x0569d): (101, "ModuleRequestMap"),
+  ("read_only_space", 0x056c5): (102, "PromiseCapabilityMap"),
+  ("read_only_space", 0x056ed): (103, "PromiseReactionMap"),
+  ("read_only_space", 0x05715): (104, "PropertyDescriptorObjectMap"),
+  ("read_only_space", 0x0573d): (105, "PrototypeInfoMap"),
+  ("read_only_space", 0x05765): (106, "ScriptMap"),
+  ("read_only_space", 0x0578d): (107, "SourceTextModuleInfoEntryMap"),
+  ("read_only_space", 0x057b5): (108, "StackFrameInfoMap"),
+  ("read_only_space", 0x057dd): (109, "StackTraceFrameMap"),
+  ("read_only_space", 0x05805): (110, "TemplateObjectDescriptionMap"),
+  ("read_only_space", 0x0582d): (111, "Tuple2Map"),
+  ("read_only_space", 0x05855): (112, "WasmExceptionTagMap"),
+  ("read_only_space", 0x0587d): (113, "WasmExportedFunctionDataMap"),
+  ("read_only_space", 0x058a5): (114, "WasmIndirectFunctionTableMap"),
+  ("read_only_space", 0x058cd): (115, "WasmJSFunctionDataMap"),
+  ("read_only_space", 0x058f5): (134, "SloppyArgumentsElementsMap"),
+  ("read_only_space", 0x0591d): (151, "DescriptorArrayMap"),
+  ("read_only_space", 0x05945): (156, "UncompiledDataWithoutPreparseDataMap"),
+  ("read_only_space", 0x0596d): (155, "UncompiledDataWithPreparseDataMap"),
+  ("read_only_space", 0x05995): (171, "OnHeapBasicBlockProfilerDataMap"),
+  ("read_only_space", 0x059bd): (180, "WasmCapiFunctionDataMap"),
+  ("read_only_space", 0x059e5): (168, "InternalClassMap"),
+  ("read_only_space", 0x05a0d): (177, "SmiPairMap"),
+  ("read_only_space", 0x05a35): (176, "SmiBoxMap"),
+  ("read_only_space", 0x05a5d): (145, "ExportedSubClassBaseMap"),
+  ("read_only_space", 0x05a85): (146, "ExportedSubClassMap"),
+  ("read_only_space", 0x05aad): (68, "AbstractInternalClassSubclass1Map"),
+  ("read_only_space", 0x05ad5): (69, "AbstractInternalClassSubclass2Map"),
+  ("read_only_space", 0x05afd): (133, "InternalClassWithSmiElementsMap"),
+  ("read_only_space", 0x05b25): (169, "InternalClassWithStructElementsMap"),
+  ("read_only_space", 0x05b4d): (147, "ExportedSubClass2Map"),
+  ("read_only_space", 0x05b75): (178, "SortStateMap"),
+  ("read_only_space", 0x05b9d): (86, "AllocationSiteWithWeakNextMap"),
+  ("read_only_space", 0x05bc5): (86, "AllocationSiteWithoutWeakNextMap"),
+  ("read_only_space", 0x05bed): (77, "LoadHandler1Map"),
+  ("read_only_space", 0x05c15): (77, "LoadHandler2Map"),
+  ("read_only_space", 0x05c3d): (77, "LoadHandler3Map"),
+  ("read_only_space", 0x05c65): (78, "StoreHandler0Map"),
+  ("read_only_space", 0x05c8d): (78, "StoreHandler1Map"),
+  ("read_only_space", 0x05cb5): (78, "StoreHandler2Map"),
+  ("read_only_space", 0x05cdd): (78, "StoreHandler3Map"),
   ("map_space", 0x02115): (1057, "ExternalMap"),
-  ("map_space", 0x0213d): (1072, "JSMessageObjectMap"),
-  ("map_space", 0x02165): (182, "WasmRttEqrefMap"),
-  ("map_space", 0x0218d): (182, "WasmRttExternrefMap"),
-  ("map_space", 0x021b5): (182, "WasmRttFuncrefMap"),
-  ("map_space", 0x021dd): (182, "WasmRttI31refMap"),
+  ("map_space", 0x0213d): (1084, "JSMessageObjectMap"),
+  ("map_space", 0x02165): (181, "WasmRttEqrefMap"),
+  ("map_space", 0x0218d): (181, "WasmRttAnyrefMap"),
+  ("map_space", 0x021b5): (181, "WasmRttExternrefMap"),
+  ("map_space", 0x021dd): (181, "WasmRttFuncrefMap"),
+  ("map_space", 0x02205): (181, "WasmRttI31refMap"),
 }
 
 # List of known V8 objects.
@@ -383,37 +388,37 @@
   ("read_only_space", 0x024c9): "FalseValue",
   ("read_only_space", 0x024f9): "empty_string",
   ("read_only_space", 0x02735): "EmptyScopeInfo",
-  ("read_only_space", 0x02765): "ArgumentsMarker",
-  ("read_only_space", 0x027c5): "Exception",
-  ("read_only_space", 0x02821): "TerminationException",
-  ("read_only_space", 0x02889): "OptimizedOut",
-  ("read_only_space", 0x028e9): "StaleRegister",
-  ("read_only_space", 0x031b9): "EmptyPropertyArray",
-  ("read_only_space", 0x031c1): "EmptyByteArray",
-  ("read_only_space", 0x031c9): "EmptyObjectBoilerplateDescription",
-  ("read_only_space", 0x031fd): "EmptyArrayBoilerplateDescription",
-  ("read_only_space", 0x03209): "EmptyClosureFeedbackCellArray",
-  ("read_only_space", 0x03211): "EmptySlowElementDictionary",
-  ("read_only_space", 0x03235): "EmptyOrderedHashMap",
-  ("read_only_space", 0x03249): "EmptyOrderedHashSet",
-  ("read_only_space", 0x0325d): "EmptyFeedbackMetadata",
-  ("read_only_space", 0x03269): "EmptyPropertyCell",
-  ("read_only_space", 0x0327d): "EmptyPropertyDictionary",
-  ("read_only_space", 0x032a5): "EmptyOrderedPropertyDictionary",
-  ("read_only_space", 0x032e5): "NoOpInterceptorInfo",
-  ("read_only_space", 0x0330d): "EmptyWeakArrayList",
-  ("read_only_space", 0x03319): "InfinityValue",
-  ("read_only_space", 0x03325): "MinusZeroValue",
-  ("read_only_space", 0x03331): "MinusInfinityValue",
-  ("read_only_space", 0x0333d): "SelfReferenceMarker",
-  ("read_only_space", 0x0337d): "BasicBlockCountersMarker",
-  ("read_only_space", 0x033c1): "OffHeapTrampolineRelocationInfo",
-  ("read_only_space", 0x033cd): "TrampolineTrivialCodeDataContainer",
-  ("read_only_space", 0x033d9): "TrampolinePromiseRejectionCodeDataContainer",
-  ("read_only_space", 0x033e5): "GlobalThisBindingScopeInfo",
-  ("read_only_space", 0x0341d): "EmptyFunctionScopeInfo",
-  ("read_only_space", 0x03445): "NativeScopeInfo",
-  ("read_only_space", 0x03461): "HashSeed",
+  ("read_only_space", 0x02771): "ArgumentsMarker",
+  ("read_only_space", 0x027d1): "Exception",
+  ("read_only_space", 0x0282d): "TerminationException",
+  ("read_only_space", 0x02895): "OptimizedOut",
+  ("read_only_space", 0x028f5): "StaleRegister",
+  ("read_only_space", 0x03125): "EmptyPropertyArray",
+  ("read_only_space", 0x0312d): "EmptyByteArray",
+  ("read_only_space", 0x03135): "EmptyObjectBoilerplateDescription",
+  ("read_only_space", 0x03169): "EmptyArrayBoilerplateDescription",
+  ("read_only_space", 0x03175): "EmptyClosureFeedbackCellArray",
+  ("read_only_space", 0x0317d): "EmptySlowElementDictionary",
+  ("read_only_space", 0x031a1): "EmptyOrderedHashMap",
+  ("read_only_space", 0x031b5): "EmptyOrderedHashSet",
+  ("read_only_space", 0x031c9): "EmptyFeedbackMetadata",
+  ("read_only_space", 0x031d5): "EmptyPropertyCell",
+  ("read_only_space", 0x031e9): "EmptyPropertyDictionary",
+  ("read_only_space", 0x03211): "EmptyOrderedPropertyDictionary",
+  ("read_only_space", 0x03251): "NoOpInterceptorInfo",
+  ("read_only_space", 0x03279): "EmptyWeakArrayList",
+  ("read_only_space", 0x03285): "InfinityValue",
+  ("read_only_space", 0x03291): "MinusZeroValue",
+  ("read_only_space", 0x0329d): "MinusInfinityValue",
+  ("read_only_space", 0x032a9): "SelfReferenceMarker",
+  ("read_only_space", 0x032e9): "BasicBlockCountersMarker",
+  ("read_only_space", 0x0332d): "OffHeapTrampolineRelocationInfo",
+  ("read_only_space", 0x03339): "TrampolineTrivialCodeDataContainer",
+  ("read_only_space", 0x03345): "TrampolinePromiseRejectionCodeDataContainer",
+  ("read_only_space", 0x03351): "GlobalThisBindingScopeInfo",
+  ("read_only_space", 0x03389): "EmptyFunctionScopeInfo",
+  ("read_only_space", 0x033b1): "NativeScopeInfo",
+  ("read_only_space", 0x033cd): "HashSeed",
   ("old_space", 0x02115): "ArgumentsIteratorAccessor",
   ("old_space", 0x02159): "ArrayLengthAccessor",
   ("old_space", 0x0219d): "BoundFunctionLengthAccessor",
@@ -427,49 +432,49 @@
   ("old_space", 0x023bd): "RegExpResultIndicesAccessor",
   ("old_space", 0x02401): "StringLengthAccessor",
   ("old_space", 0x02445): "InvalidPrototypeValidityCell",
-  ("old_space", 0x024cd): "EmptyScript",
-  ("old_space", 0x0250d): "ManyClosuresCell",
-  ("old_space", 0x02519): "ArrayConstructorProtector",
-  ("old_space", 0x0252d): "NoElementsProtector",
-  ("old_space", 0x02541): "IsConcatSpreadableProtector",
-  ("old_space", 0x02555): "ArraySpeciesProtector",
-  ("old_space", 0x02569): "TypedArraySpeciesProtector",
-  ("old_space", 0x0257d): "PromiseSpeciesProtector",
-  ("old_space", 0x02591): "RegExpSpeciesProtector",
-  ("old_space", 0x025a5): "StringLengthProtector",
-  ("old_space", 0x025b9): "ArrayIteratorProtector",
-  ("old_space", 0x025cd): "ArrayBufferDetachingProtector",
-  ("old_space", 0x025e1): "PromiseHookProtector",
-  ("old_space", 0x025f5): "PromiseResolveProtector",
-  ("old_space", 0x02609): "MapIteratorProtector",
-  ("old_space", 0x0261d): "PromiseThenProtector",
-  ("old_space", 0x02631): "SetIteratorProtector",
-  ("old_space", 0x02645): "StringIteratorProtector",
-  ("old_space", 0x02659): "SingleCharacterStringCache",
-  ("old_space", 0x02a61): "StringSplitCache",
-  ("old_space", 0x02e69): "RegExpMultipleCache",
-  ("old_space", 0x03271): "BuiltinsConstantsTable",
-  ("old_space", 0x03651): "AsyncFunctionAwaitRejectSharedFun",
-  ("old_space", 0x03679): "AsyncFunctionAwaitResolveSharedFun",
-  ("old_space", 0x036a1): "AsyncGeneratorAwaitRejectSharedFun",
-  ("old_space", 0x036c9): "AsyncGeneratorAwaitResolveSharedFun",
-  ("old_space", 0x036f1): "AsyncGeneratorYieldResolveSharedFun",
-  ("old_space", 0x03719): "AsyncGeneratorReturnResolveSharedFun",
-  ("old_space", 0x03741): "AsyncGeneratorReturnClosedRejectSharedFun",
-  ("old_space", 0x03769): "AsyncGeneratorReturnClosedResolveSharedFun",
-  ("old_space", 0x03791): "AsyncIteratorValueUnwrapSharedFun",
-  ("old_space", 0x037b9): "PromiseAllResolveElementSharedFun",
-  ("old_space", 0x037e1): "PromiseAllSettledResolveElementSharedFun",
-  ("old_space", 0x03809): "PromiseAllSettledRejectElementSharedFun",
-  ("old_space", 0x03831): "PromiseAnyRejectElementSharedFun",
-  ("old_space", 0x03859): "PromiseCapabilityDefaultRejectSharedFun",
-  ("old_space", 0x03881): "PromiseCapabilityDefaultResolveSharedFun",
-  ("old_space", 0x038a9): "PromiseCatchFinallySharedFun",
-  ("old_space", 0x038d1): "PromiseGetCapabilitiesExecutorSharedFun",
-  ("old_space", 0x038f9): "PromiseThenFinallySharedFun",
-  ("old_space", 0x03921): "PromiseThrowerFinallySharedFun",
-  ("old_space", 0x03949): "PromiseValueThunkFinallySharedFun",
-  ("old_space", 0x03971): "ProxyRevokeSharedFun",
+  ("old_space", 0x02531): "EmptyScript",
+  ("old_space", 0x02571): "ManyClosuresCell",
+  ("old_space", 0x0257d): "ArrayConstructorProtector",
+  ("old_space", 0x02591): "NoElementsProtector",
+  ("old_space", 0x025a5): "IsConcatSpreadableProtector",
+  ("old_space", 0x025b9): "ArraySpeciesProtector",
+  ("old_space", 0x025cd): "TypedArraySpeciesProtector",
+  ("old_space", 0x025e1): "PromiseSpeciesProtector",
+  ("old_space", 0x025f5): "RegExpSpeciesProtector",
+  ("old_space", 0x02609): "StringLengthProtector",
+  ("old_space", 0x0261d): "ArrayIteratorProtector",
+  ("old_space", 0x02631): "ArrayBufferDetachingProtector",
+  ("old_space", 0x02645): "PromiseHookProtector",
+  ("old_space", 0x02659): "PromiseResolveProtector",
+  ("old_space", 0x0266d): "MapIteratorProtector",
+  ("old_space", 0x02681): "PromiseThenProtector",
+  ("old_space", 0x02695): "SetIteratorProtector",
+  ("old_space", 0x026a9): "StringIteratorProtector",
+  ("old_space", 0x026bd): "SingleCharacterStringCache",
+  ("old_space", 0x02ac5): "StringSplitCache",
+  ("old_space", 0x02ecd): "RegExpMultipleCache",
+  ("old_space", 0x032d5): "BuiltinsConstantsTable",
+  ("old_space", 0x036bd): "AsyncFunctionAwaitRejectSharedFun",
+  ("old_space", 0x036e1): "AsyncFunctionAwaitResolveSharedFun",
+  ("old_space", 0x03705): "AsyncGeneratorAwaitRejectSharedFun",
+  ("old_space", 0x03729): "AsyncGeneratorAwaitResolveSharedFun",
+  ("old_space", 0x0374d): "AsyncGeneratorYieldResolveSharedFun",
+  ("old_space", 0x03771): "AsyncGeneratorReturnResolveSharedFun",
+  ("old_space", 0x03795): "AsyncGeneratorReturnClosedRejectSharedFun",
+  ("old_space", 0x037b9): "AsyncGeneratorReturnClosedResolveSharedFun",
+  ("old_space", 0x037dd): "AsyncIteratorValueUnwrapSharedFun",
+  ("old_space", 0x03801): "PromiseAllResolveElementSharedFun",
+  ("old_space", 0x03825): "PromiseAllSettledResolveElementSharedFun",
+  ("old_space", 0x03849): "PromiseAllSettledRejectElementSharedFun",
+  ("old_space", 0x0386d): "PromiseAnyRejectElementSharedFun",
+  ("old_space", 0x03891): "PromiseCapabilityDefaultRejectSharedFun",
+  ("old_space", 0x038b5): "PromiseCapabilityDefaultResolveSharedFun",
+  ("old_space", 0x038d9): "PromiseCatchFinallySharedFun",
+  ("old_space", 0x038fd): "PromiseGetCapabilitiesExecutorSharedFun",
+  ("old_space", 0x03921): "PromiseThenFinallySharedFun",
+  ("old_space", 0x03945): "PromiseThrowerFinallySharedFun",
+  ("old_space", 0x03969): "PromiseValueThunkFinallySharedFun",
+  ("old_space", 0x0398d): "ProxyRevokeSharedFun",
 }
 
 # Lower 32 bits of first page addresses for various heap spaces.
diff --git a/deps/v8/tools/v8windbg/src/object-inspection.cc b/deps/v8/tools/v8windbg/src/object-inspection.cc
index b206dfa792f85d..b682f5b1b9e7e0 100644
--- a/deps/v8/tools/v8windbg/src/object-inspection.cc
+++ b/deps/v8/tools/v8windbg/src/object-inspection.cc
@@ -17,6 +17,7 @@ V8CachedObject::V8CachedObject(Location location,
       uncompressed_type_name_(std::move(uncompressed_type_name)),
       context_(std::move(context)),
       is_compressed_(is_compressed) {}
+
 HRESULT V8CachedObject::Create(IModelObject* p_v8_object_instance,
                                IV8CachedObject** result) {
   Location location;
@@ -25,15 +26,16 @@ HRESULT V8CachedObject::Create(IModelObject* p_v8_object_instance,
   WRL::ComPtr<IDebugHostContext> context;
   RETURN_IF_FAIL(p_v8_object_instance->GetContext(&context));
 
+  WRL::ComPtr<IDebugHostType> sp_type;
+  _bstr_t type_name;
+  RETURN_IF_FAIL(p_v8_object_instance->GetTypeInfo(&sp_type));
+  RETURN_IF_FAIL(sp_type->GetName(type_name.GetAddress()));
+
   // If the object is of type v8::internal::TaggedValue, and this build uses
   // compressed pointers, then the value is compressed. Other types such as
   // v8::internal::Object represent uncompressed tagged values.
-  WRL::ComPtr<IDebugHostType> sp_type;
-  _bstr_t type_name;
   bool is_compressed =
       COMPRESS_POINTERS_BOOL &&
-      SUCCEEDED(p_v8_object_instance->GetTypeInfo(&sp_type)) &&
-      SUCCEEDED(sp_type->GetName(type_name.GetAddress())) &&
       static_cast<const char*>(type_name) == std::string(kTaggedValue);
 
   const char* uncompressed_type_name =
@@ -44,6 +46,7 @@ HRESULT V8CachedObject::Create(IModelObject* p_v8_object_instance,
                 .Detach();
   return S_OK;
 }
+
 V8CachedObject::V8CachedObject(V8HeapObject heap_object)
     : heap_object_(std::move(heap_object)), heap_object_initialized_(true) {}
 
diff --git a/deps/v8/tools/v8windbg/src/v8-debug-helper-interop.cc b/deps/v8/tools/v8windbg/src/v8-debug-helper-interop.cc
index 74d0a9df2646ce..443303423776fb 100644
--- a/deps/v8/tools/v8windbg/src/v8-debug-helper-interop.cc
+++ b/deps/v8/tools/v8windbg/src/v8-debug-helper-interop.cc
@@ -16,7 +16,7 @@ namespace d = v8::debug_helper;
 
 // We need a plain C function pointer for interop with v8_debug_helper. We can
 // use this to get one as long as we never need two at once.
-class MemReaderScope {
+class V8_NODISCARD MemReaderScope {
  public:
   explicit MemReaderScope(WRL::ComPtr<IDebugHostContext> sp_context)
       : sp_context_(sp_context) {
diff --git a/deps/v8/tools/v8windbg/test/v8windbg-test.cc b/deps/v8/tools/v8windbg/test/v8windbg-test.cc
index 59414f341da97b..6b40af0ff17813 100644
--- a/deps/v8/tools/v8windbg/test/v8windbg-test.cc
+++ b/deps/v8/tools/v8windbg/test/v8windbg-test.cc
@@ -20,7 +20,7 @@ namespace {
 
 // Loads a named extension library upon construction and unloads it upon
 // destruction.
-class LoadExtensionScope {
+class V8_NODISCARD LoadExtensionScope {
  public:
   LoadExtensionScope(WRL::ComPtr<IDebugControl4> p_debug_control,
                      std::wstring extension_path)
@@ -49,7 +49,7 @@ class LoadExtensionScope {
 };
 
 // Initializes COM upon construction and uninitializes it upon destruction.
-class ComScope {
+class V8_NODISCARD ComScope {
  public:
   ComScope() { hr_ = CoInitializeEx(nullptr, COINIT_MULTITHREADED); }
   ~ComScope() {
diff --git a/deps/v8/tools/wasm/update-wasm-fuzzers.sh b/deps/v8/tools/wasm/update-wasm-fuzzers.sh
index ffd7e016330be5..d85b86700bd5f4 100755
--- a/deps/v8/tools/wasm/update-wasm-fuzzers.sh
+++ b/deps/v8/tools/wasm/update-wasm-fuzzers.sh
@@ -3,40 +3,29 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-set -e
+set -ex
 
-TOOLS_WASM_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+cd ../..
 
-cd ${TOOLS_WASM_DIR}/../..
+BUILD_DIR=out/mk_wasm_fuzzer_corpus
+CORPUS_DIR=test/fuzzer/wasm_corpus
 
-rm -rf test/fuzzer/wasm_corpus
+rm -rf $BUILD_DIR $CORPUS_DIR
+mkdir -p $CORPUS_DIR
 
-tools/dev/gm.py x64.release all
+# Build optdebug such that the --dump-wasm-module flag is available.
+gn gen $BUILD_DIR --args='is_debug=true v8_optimized_debug=true target_cpu="x64" use_goma=true'
+autoninja -C $BUILD_DIR
 
-mkdir -p test/fuzzer/wasm_corpus
+./tools/run-tests.py --outdir=$BUILD_DIR --extra-flags="--dump-wasm-module \
+  --dump-wasm-module-path=./$CORPUS_DIR/"
 
-# wasm
-./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
-  --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
-  --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" unittests
-./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
-  --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
-  --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" wasm-spec-tests/*
-./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
-  --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
-  --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" mjsunit/wasm/*
-./tools/run-tests.py -j8 --variants=default --timeout=10 --arch=x64 \
-  --mode=release --no-presubmit --extra-flags="--dump-wasm-module \
-  --dump-wasm-module-path=./test/fuzzer/wasm_corpus/" \
-  $(cd test/; ls cctest/wasm/test-*.cc | \
-  sed -es/wasm\\///g | sed -es/[.]cc/\\/\\*/g)
+rm -rf $BUILD_DIR
 
 # Delete items over 20k.
-for x in $(find ./test/fuzzer/wasm_corpus/ -type f -size +20k)
-do
-  rm $x
-done
+find $CORPUS_DIR -type f -size +20k | xargs rm
 
 # Upload changes.
-cd test/fuzzer
+cd $CORPUS_DIR/..
 upload_to_google_storage.py -a -b v8-wasm-fuzzer wasm_corpus
diff --git a/deps/v8/tools/whitespace.txt b/deps/v8/tools/whitespace.txt
index d6024b5b7d94ce..8fcce8dda7f238 100644
--- a/deps/v8/tools/whitespace.txt
+++ b/deps/v8/tools/whitespace.txt
@@ -8,7 +8,7 @@ The doubles heard this and started to unbox.
 The Smi looked at them when a crazy v8-autoroll account showed up...
 The autoroller bought a round of Himbeerbrause. Suddenly.....
 The bartender starts to shake the bottles........................
-I can't add trailing whitespaces, so I'm adding this line.......
+I can't add trailing whitespaces, so I'm adding this line...........
 I'm starting to think that just adding trailing whitespaces might not be bad.
 
 Because whitespaces are not that funny.....
diff --git a/deps/v8/tools/windows-tick-processor.bat b/deps/v8/tools/windows-tick-processor.bat
index 56637e051cb3b3..ae74df95359d6c 100755
--- a/deps/v8/tools/windows-tick-processor.bat
+++ b/deps/v8/tools/windows-tick-processor.bat
@@ -27,4 +27,4 @@ IF NOT %arg8:~0,2% == 8 (IF NOT %arg8:~0,2% == 8- SET log_file=%8)
 SET arg9=9%9
 IF NOT %arg9:~0,2% == 9 (IF NOT %arg9:~0,2% == 9- SET log_file=%9)
 
-type %log_file% | %D8_PATH%\d8 --module %tools_dir%tickprocessor-driver.js -- --windows %*
+type %log_file% | %D8_PATH%\d8 --module %tools_dir%tickprocessor-driver.mjs -- --windows %*
diff --git a/deps/v8/tools/wpr.wprp b/deps/v8/tools/wpr.wprp
new file mode 100644
index 00000000000000..a6282490a8354b
--- /dev/null
+++ b/deps/v8/tools/wpr.wprp
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WindowsPerformanceRecorder Version="1.0">
+  <!--
+Note: The following utilities are usually installed to: "C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit"
+See https://docs.microsoft.com/en-us/windows-hardware/test/wpt/ for an overview of the tools.
+
+Start and stop the trace:
+
+  wpr -start wpr.wprp!V8js
+...run scenario...
+  wpr -stop v8js.etl
+
+You can also run "wpr -status collectors details" while recording to check on status.
+
+Note: If you have issues with the command line, run WRPUI, and load this profile via the dialog.
+
+Run the below to open the trace:
+
+  wpa v8js.etl
+
+Set _NT_SYMBOL_PATH to a value such as "C:\src\v8\v8\out.gn\x64.debug;srv*c:\symbols*https://msdl.microsoft.com/download/symbols" first.
+Append "-symcacheonly" on the WPA command to save it trying to reload prior failed symbols on subsequent runs.
+
+For details on editing this file, see https://docs.microsoft.com/en-us/windows-hardware/test/wpt/authoring-recording-profiles
+  -->
+  <Profiles>
+    <SystemCollector Id="SystemCollector" Name="NT Kernel Logger">
+      <BufferSize Value="1024"/>
+      <Buffers Value="384"/>
+    </SystemCollector>
+    <EventCollector Id="EventCollector_V8js" Name="V8js Event Collector">
+      <BufferSize Value="1024"/>
+      <Buffers Value="256"/>
+    </EventCollector>
+    <SystemProvider Id="SystemProvider">
+      <Keywords>
+        <Keyword Value="ProcessThread"/>
+        <Keyword Value="Loader"/>
+        <Keyword Value="SampledProfile"/>
+        <Keyword Value="ReadyThread"/>
+        <Keyword Value="CSwitch"/>
+        <Keyword Value="DiskIOInit"/>
+        <Keyword Value="FileIOInit"/>
+        <Keyword Value="HardFaults"/>
+      </Keywords>
+      <Stacks>
+        <!-- See https://docs.microsoft.com/en-us/windows-hardware/test/wpt/stack-wpa for options -->
+        <Stack Value="SampledProfile"/>
+        <Stack Value="ReadyThread"/>
+        <Stack Value="CSwitch"/>
+      </Stacks>
+    </SystemProvider>
+    <EventProvider Id="Provider_V8js" Name="57277741-3638-4A4B-BDBA-0AC6E45DA56C" Level="5" Stack="true"></EventProvider>
+    <Profile Id="V8js.Verbose.File" Name="V8js" DetailLevel="Verbose" LoggingMode="File" Description="V8.js profile">
+      <Collectors>
+        <SystemCollectorId Value="SystemCollector">
+          <SystemProviderId Value="SystemProvider"></SystemProviderId>
+        </SystemCollectorId>
+        <EventCollectorId Value="EventCollector_V8js">
+          <EventProviders>
+            <EventProviderId Value="Provider_V8js"></EventProviderId>
+          </EventProviders>
+        </EventCollectorId>
+      </Collectors>
+    </Profile>
+    <Profile Id="V8js.Verbose.Memory" Base="V8js.Verbose.File" Name="V8js" DetailLevel="Verbose" LoggingMode="Memory" Description="V8.js profile"></Profile>
+  </Profiles>
+</WindowsPerformanceRecorder>