Commit 2ca9061 1 parent 4583bd8 commit 2ca9061 Copy full SHA for 2ca9061
File tree 5 files changed +12
-9
lines changed
5 files changed +12
-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 @@ -861,7 +861,7 @@ ElementAccessFeedback const& JSHeapBroker::ProcessFeedbackMapsForElementAccess(
861
861
Tagged<Map> transition_target;
862
862
863
863
// Don't generate elements kind transitions from stable maps.
864
- if (!map.is_stable ()) {
864
+ if (!map.is_stable () && possible_transition_targets. begin () != possible_transition_targets. end () ) {
865
865
// The lock is needed for UnusedPropertyFields (called deep inside
866
866
// FindElementsKindTransitionedMap).
867
867
MapUpdaterGuardIfNeeded mumd_scope (this );
Original file line number Diff line number Diff line change @@ -1260,11 +1260,11 @@ class WasmFrame : public TypedFrame {
1260
1260
void Summarize (std::vector<FrameSummary>* frames) const override ;
1261
1261
1262
1262
static WasmFrame* cast (StackFrame* frame) {
1263
- DCHECK (frame->is_wasm ()
1264
1263
#ifdef V8_ENABLE_DRUMBRAKE
1265
- && !frame->is_wasm_interpreter_entry ()
1264
+ DCHECK (frame->is_wasm () && !frame->is_wasm_interpreter_entry ());
1265
+ #else
1266
+ DCHECK (frame->is_wasm ());
1266
1267
#endif // V8_ENABLE_DRUMBRAKE
1267
- );
1268
1268
return static_cast <WasmFrame*>(frame);
1269
1269
}
1270
1270
Original file line number Diff line number Diff line change @@ -101,12 +101,10 @@ static_assert(sizeof(UnalignedDoubleMember) == sizeof(double));
101
101
#define FLEXIBLE_ARRAY_MEMBER (Type, name ) \
102
102
using FlexibleDataReturnType = Type[0 ]; \
103
103
FlexibleDataReturnType& name () { \
104
- static_assert (alignof (Type) <= alignof (decltype (*this ))); \
105
104
using ReturnType = Type[0 ]; \
106
105
return reinterpret_cast <ReturnType&>(*(this + 1 )); \
107
106
} \
108
107
const FlexibleDataReturnType& name () const { \
109
- static_assert (alignof (Type) <= alignof (decltype (*this ))); \
110
108
using ReturnType = Type[0 ]; \
111
109
return reinterpret_cast <const ReturnType&>(*(this + 1 )); \
112
110
} \
Original file line number Diff line number Diff line change @@ -2578,14 +2578,19 @@ Handle<WasmExportedFunction> WasmExportedFunction::New(
2578
2578
DirectHandle<WasmFuncRef> func_ref,
2579
2579
DirectHandle<WasmInternalFunction> internal_function, int arity,
2580
2580
DirectHandle<Code> export_wrapper) {
2581
+ #if V8_ENABLE_DRUMBRAKE
2581
2582
DCHECK (CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind () ||
2582
2583
(export_wrapper->is_builtin () &&
2583
2584
(export_wrapper->builtin_id () == Builtin::kJSToWasmWrapper ||
2584
- #if V8_ENABLE_DRUMBRAKE
2585
2585
export_wrapper->builtin_id () ==
2586
2586
Builtin::kGenericJSToWasmInterpreterWrapper ||
2587
- #endif // V8_ENABLE_DRUMBRAKE
2588
2587
export_wrapper->builtin_id () == Builtin::kWasmPromising )));
2588
+ #else
2589
+ DCHECK (CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind () ||
2590
+ (export_wrapper->is_builtin () &&
2591
+ (export_wrapper->builtin_id () == Builtin::kJSToWasmWrapper ||
2592
+ export_wrapper->builtin_id () == Builtin::kWasmPromising )));
2593
+ #endif // V8_ENABLE_DRUMBRAKE
2589
2594
int func_index = internal_function->function_index ();
2590
2595
Factory* factory = isolate->factory ();
2591
2596
const wasm::WasmModule* module = instance_data->module ();
You can’t perform that action at this time.
0 commit comments