Skip to content

Commit 9c76c69

Browse files
targosBethGriggs
targos
authored and
BethGriggs
committed
deps: patch V8 to 9.3.345.19
Refs: v8/v8@9.3.345.16...9.3.345.19 PR-URL: #40108 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 588257c commit 9c76c69

4 files changed

Lines changed: 32 additions & 20 deletions

File tree

‎deps/v8/include/v8-version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 9
1212
#define V8_MINOR_VERSION 3
1313
#define V8_BUILD_NUMBER 345
14-
#define V8_PATCH_LEVEL 16
14+
#define V8_PATCH_LEVEL 19
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

‎deps/v8/src/compiler/js-native-context-specialization.cc‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,12 @@ Reduction JSNativeContextSpecialization::ReduceGlobalAccess(
825825
return NoChange();
826826
} else if (property_cell_type == PropertyCellType::kUndefined) {
827827
return NoChange();
828+
} else if (property_cell_type == PropertyCellType::kConstantType) {
829+
// We rely on stability further below.
830+
if (property_cell_value.IsHeapObject() &&
831+
!property_cell_value.AsHeapObject().map().is_stable()) {
832+
return NoChange();
833+
}
828834
}
829835
} else if (access_mode == AccessMode::kHas) {
830836
DCHECK_EQ(receiver, lookup_start_object);
@@ -943,17 +949,7 @@ Reduction JSNativeContextSpecialization::ReduceGlobalAccess(
943949
if (property_cell_value.IsHeapObject()) {
944950
MapRef property_cell_value_map =
945951
property_cell_value.AsHeapObject().map();
946-
if (property_cell_value_map.is_stable()) {
947-
dependencies()->DependOnStableMap(property_cell_value_map);
948-
} else {
949-
// The value's map is already unstable. If this store were to go
950-
// through the C++ runtime, it would transition the PropertyCell to
951-
// kMutable. We don't want to change the cell type from generated
952-
// code (to simplify concurrent heap access), however, so we keep
953-
// it as kConstantType and do the store anyways (if the new value's
954-
// map matches). This is safe because it merely prolongs the limbo
955-
// state that we are in already.
956-
}
952+
dependencies()->DependOnStableMap(property_cell_value_map);
957953

958954
// Check that the {value} is a HeapObject.
959955
value = effect = graph()->NewNode(simplified()->CheckHeapObject(),

‎deps/v8/testing/gmock/BUILD.gn‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ source_set("gmock") {
1515
"include/gmock/gmock-matchers.h",
1616
"include/gmock/gmock.h",
1717
]
18-
deps = [ "//third_party/googletest:gmock" ]
19-
20-
public_configs = [
21-
"//third_party/googletest:gmock_config",
22-
"//third_party/googletest:gtest_config",
23-
]
18+
public_deps = [ "//third_party/googletest:gmock" ]
2419
}
2520

2621
# The file/directory layout of Google Test is not yet considered stable. Until

‎deps/v8/tools/mb/mb.py‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,25 @@ def cmp(x, y): # pylint: disable=redefined-builtin
5353
return (x > y) - (x < y)
5454

5555

56+
def _v8_builder_fallback(builder, builder_group):
57+
"""Fallback to V8 builder names before splitting builder/tester.
58+
59+
This eases splitting builders and testers on release branches and
60+
can be removed as soon as all builder have been split and all MB configs
61+
exist on all branches.
62+
"""
63+
builders = [builder]
64+
if builder.endswith(' - builder'):
65+
builders.append(builder[:-len(' - builder')])
66+
elif builder.endswith(' builder'):
67+
builders.append(builder[:-len(' builder')])
68+
69+
for builder in builders:
70+
if builder in builder_group:
71+
return builder_group[builder]
72+
return None
73+
74+
5675
def main(args):
5776
mbw = MetaBuildWrapper()
5877
return mbw.Main(args)
@@ -651,12 +670,14 @@ def ConfigFromArgs(self):
651670
raise MBErr('Builder groups name "%s" not found in "%s"' %
652671
(self.args.builder_group, self.args.config_file))
653672

654-
if not self.args.builder in self.builder_groups[self.args.builder_group]:
673+
config = _v8_builder_fallback(
674+
self.args.builder, self.builder_groups[self.args.builder_group])
675+
676+
if not config:
655677
raise MBErr(
656678
'Builder name "%s" not found under builder_groups[%s] in "%s"' %
657679
(self.args.builder, self.args.builder_group, self.args.config_file))
658680

659-
config = self.builder_groups[self.args.builder_group][self.args.builder]
660681
if isinstance(config, dict):
661682
if self.args.phase is None:
662683
raise MBErr('Must specify a build --phase for %s on %s' %

0 commit comments

Comments
 (0)