Commit 34c215c 1 parent 67a2a64 commit 34c215c Copy full SHA for 34c215c
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 37
37
38
38
# Reset this number to 0 on major V8 upgrades.
39
39
# Increment by one for each non-official patch applied to deps/v8.
40
- 'v8_embedder_string' : '-node.3 ' ,
40
+ 'v8_embedder_string' : '-node.4 ' ,
41
41
42
42
##### V8 defaults for Node.js #####
43
43
Original file line number Diff line number Diff line change @@ -864,7 +864,7 @@ ElementAccessFeedback const& JSHeapBroker::ProcessFeedbackMapsForElementAccess(
864
864
Tagged<Map> transition_target;
865
865
866
866
// Don't generate elements kind transitions from stable maps.
867
- if (!map.is_stable ()) {
867
+ if (!map.is_stable () && possible_transition_targets. begin () != possible_transition_targets. end () ) {
868
868
// The lock is needed for UnusedPropertyFields (called deep inside
869
869
// FindElementsKindTransitionedMap).
870
870
MapUpdaterGuardIfNeeded mumd_scope (this );
Original file line number Diff line number Diff line change @@ -1274,11 +1274,11 @@ class WasmFrame : public TypedFrame {
1274
1274
void Summarize (std::vector<FrameSummary>* frames) const override ;
1275
1275
1276
1276
static WasmFrame* cast (StackFrame* frame) {
1277
- DCHECK (frame->is_wasm ()
1278
1277
#ifdef V8_ENABLE_DRUMBRAKE
1279
- && !frame->is_wasm_interpreter_entry ()
1278
+ DCHECK (frame->is_wasm () && !frame->is_wasm_interpreter_entry ());
1279
+ #else
1280
+ DCHECK (frame->is_wasm ());
1280
1281
#endif // V8_ENABLE_DRUMBRAKE
1281
- );
1282
1282
return static_cast <WasmFrame*>(frame);
1283
1283
}
1284
1284
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 @@ -2595,15 +2595,21 @@ Handle<WasmExportedFunction> WasmExportedFunction::New(
2595
2595
DirectHandle<WasmFuncRef> func_ref,
2596
2596
DirectHandle<WasmInternalFunction> internal_function, int arity,
2597
2597
DirectHandle<Code> export_wrapper) {
2598
+ #if V8_ENABLE_DRUMBRAKE
2598
2599
DCHECK (CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind () ||
2599
2600
(export_wrapper->is_builtin () &&
2600
2601
(export_wrapper->builtin_id () == Builtin::kJSToWasmWrapper ||
2601
- #if V8_ENABLE_DRUMBRAKE
2602
2602
export_wrapper->builtin_id () ==
2603
2603
Builtin::kGenericJSToWasmInterpreterWrapper ||
2604
- #endif // V8_ENABLE_DRUMBRAKE
2605
2604
export_wrapper->builtin_id () == Builtin::kWasmPromising ||
2606
2605
export_wrapper->builtin_id () == Builtin::kWasmStressSwitch )));
2606
+ #else
2607
+ DCHECK (CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind () ||
2608
+ (export_wrapper->is_builtin () &&
2609
+ (export_wrapper->builtin_id () == Builtin::kJSToWasmWrapper ||
2610
+ export_wrapper->builtin_id () == Builtin::kWasmPromising ||
2611
+ export_wrapper->builtin_id () == Builtin::kWasmStressSwitch )));
2612
+ #endif // V8_ENABLE_DRUMBRAKE
2607
2613
int func_index = internal_function->function_index ();
2608
2614
Factory* factory = isolate->factory ();
2609
2615
DirectHandle<Map> rtt;
You can’t perform that action at this time.
0 commit comments