Commit dc5d320 2 people authored and committed
1 parent 8598f9e commit dc5d320 Copy full SHA for dc5d320
File tree 5 files changed +13
-9
lines changed
5 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 36
36
37
37
# Reset this number to 0 on major V8 upgrades.
38
38
# Increment by one for each non-official patch applied to deps/v8.
39
- 'v8_embedder_string' : '-node.3 ' ,
39
+ 'v8_embedder_string' : '-node.4 ' ,
40
40
41
41
##### V8 defaults for Node.js #####
42
42
Original file line number Diff line number Diff line change @@ -879,7 +879,7 @@ ElementAccessFeedback const& JSHeapBroker::ProcessFeedbackMapsForElementAccess(
879
879
Tagged<Map> transition_target;
880
880
881
881
// Don't generate elements kind transitions from stable maps.
882
- if (!map.is_stable ()) {
882
+ if (!map.is_stable () && possible_transition_targets. begin () != possible_transition_targets. end () ) {
883
883
// The lock is needed for UnusedPropertyFields (called deep inside
884
884
// FindElementsKindTransitionedMap).
885
885
MapUpdaterGuardIfNeeded mumd_scope (this );
Original file line number Diff line number Diff line change @@ -1292,11 +1292,11 @@ class WasmFrame : public TypedFrame {
1292
1292
FrameSummaries Summarize () const override ;
1293
1293
1294
1294
static WasmFrame* cast (StackFrame* frame) {
1295
- DCHECK (frame->is_wasm ()
1296
1295
#ifdef V8_ENABLE_DRUMBRAKE
1297
- && !frame->is_wasm_interpreter_entry ()
1296
+ DCHECK (frame->is_wasm () && !frame->is_wasm_interpreter_entry ());
1297
+ #else
1298
+ DCHECK (frame->is_wasm ());
1298
1299
#endif // V8_ENABLE_DRUMBRAKE
1299
- );
1300
1300
return static_cast <WasmFrame*>(frame);
1301
1301
}
1302
1302
Original file line number Diff line number Diff line change @@ -121,12 +121,10 @@ static_assert(sizeof(UnalignedDoubleMember) == sizeof(double));
121
121
#define FLEXIBLE_ARRAY_MEMBER (Type, name ) \
122
122
using FlexibleDataReturnType = Type[0 ]; \
123
123
FlexibleDataReturnType& name () { \
124
- static_assert (alignof (Type) <= alignof (decltype (*this ))); \
125
124
using ReturnType = Type[0 ]; \
126
125
return reinterpret_cast <ReturnType&>(*(this + 1 )); \
127
126
} \
128
127
const FlexibleDataReturnType& name () const { \
129
- static_assert (alignof (Type) <= alignof (decltype (*this ))); \
130
128
using ReturnType = Type[0 ]; \
131
129
return reinterpret_cast <const ReturnType&>(*(this + 1 )); \
132
130
} \
Original file line number Diff line number Diff line change @@ -2712,15 +2712,21 @@ Handle<WasmExportedFunction> WasmExportedFunction::New(
2712
2712
DirectHandle<WasmFuncRef> func_ref,
2713
2713
DirectHandle<WasmInternalFunction> internal_function, int arity,
2714
2714
DirectHandle<Code> export_wrapper) {
2715
+ #if V8_ENABLE_DRUMBRAKE
2715
2716
DCHECK (CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind () ||
2716
2717
(export_wrapper->is_builtin () &&
2717
2718
(export_wrapper->builtin_id () == Builtin::kJSToWasmWrapper ||
2718
- #if V8_ENABLE_DRUMBRAKE
2719
2719
export_wrapper->builtin_id () ==
2720
2720
Builtin::kGenericJSToWasmInterpreterWrapper ||
2721
- #endif // V8_ENABLE_DRUMBRAKE
2722
2721
export_wrapper->builtin_id () == Builtin::kWasmPromising ||
2723
2722
export_wrapper->builtin_id () == Builtin::kWasmStressSwitch )));
2723
+ #else
2724
+ DCHECK (CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind () ||
2725
+ (export_wrapper->is_builtin () &&
2726
+ (export_wrapper->builtin_id () == Builtin::kJSToWasmWrapper ||
2727
+ export_wrapper->builtin_id () == Builtin::kWasmPromising ||
2728
+ export_wrapper->builtin_id () == Builtin::kWasmStressSwitch )));
2729
+ #endif // V8_ENABLE_DRUMBRAKE
2724
2730
int func_index = internal_function->function_index ();
2725
2731
Factory* factory = isolate->factory ();
2726
2732
DirectHandle<Map> rtt;
You can’t perform that action at this time.
0 commit comments