@@ -879,18 +879,21 @@ class CallSiteBuilder {
879879 // framework and library code, and stack depth tends to be more than
880880 // a dozen frames, so we over-allocate a bit here to avoid growing
881881 // the elements array in the common case.
882- elements_ = isolate->factory ()->NewFixedArray (std::min (64u , limit));
882+ elements_ = isolate->factory ()->NewFixedArray (CallSiteInfo::Fields::kCount *
883+ std::min (64u , limit_));
883884 }
884885
885886 void SetPrevFrameAsConstructCall () {
886887 if (skipped_prev_frame_) return ;
887888 DCHECK_GT (index_, 0 );
888- Tagged<CallSiteInfo> info =
889- Tagged<CallSiteInfo>::cast (elements_->get (index_ - 1 ));
889+ int base_index = (index_ - 1 ) * CallSiteInfo::Fields::kCount ;
890+ int flags =
891+ Smi::ToInt (elements_->get (base_index + CallSiteInfo::Fields::kFlags ));
890892#if V8_ENABLE_WEBASSEMBLY
891- if (info-> IsWasm () ) return ;
893+ if (flags & CallSiteInfo:: kIsWasm ) return ;
892894#endif
893- info->set_flags (info->flags () | CallSiteInfo::kIsConstructor );
895+ elements_->set (base_index + CallSiteInfo::Fields::kFlags ,
896+ Smi::FromInt (flags | CallSiteInfo::kIsConstructor ));
894897 }
895898
896899 bool Visit (FrameSummary const & summary) {
@@ -1036,7 +1039,8 @@ class CallSiteBuilder {
10361039 bool Full () { return index_ >= limit_; }
10371040
10381041 Handle<FixedArray> Build () {
1039- return FixedArray::RightTrimOrEmpty (isolate_, elements_, index_);
1042+ return FixedArray::RightTrimOrEmpty (isolate_, elements_,
1043+ CallSiteInfo::Fields::kCount * index_);
10401044 }
10411045
10421046 private:
@@ -1101,16 +1105,42 @@ class CallSiteBuilder {
11011105
11021106 void AppendFrame (DirectHandle<UnionOf<JSAny, Hole>> receiver_or_instance,
11031107 DirectHandle<UnionOf<Smi, JSFunction>> function,
1104- DirectHandle<Union<Code, BytecodeArray, Undefined>> code ,
1108+ DirectHandle<Union<Code, BytecodeArray, Undefined>> code_obj ,
11051109 int offset, int flags) {
11061110 if (IsTheHole (*receiver_or_instance, isolate_)) {
11071111 // TODO(jgruber): Fix all cases in which frames give us a hole value
11081112 // (e.g. the receiver in RegExp constructor frames).
11091113 receiver_or_instance = isolate_->factory ()->undefined_value ();
11101114 }
1111- auto info = isolate_->factory ()->NewCallSiteInfo (
1112- Cast<JSAny>(receiver_or_instance), function, code, offset, flags);
1113- elements_ = FixedArray::SetAndGrow (isolate_, elements_, index_++, info);
1115+
1116+ int base_index = index_ * CallSiteInfo::Fields::kCount ;
1117+
1118+ // Set the last field first and grow the array if needed.
1119+ static_assert (CallSiteInfo::Fields::kFlags ==
1120+ CallSiteInfo::Fields::kCount - 1 );
1121+ elements_ = FixedArray::SetAndGrow (
1122+ isolate_, elements_, base_index + CallSiteInfo::Fields::kFlags ,
1123+ Smi::FromInt (flags));
1124+
1125+ elements_->set (base_index + CallSiteInfo::Fields::kReceiver ,
1126+ *receiver_or_instance);
1127+ elements_->set (base_index + CallSiteInfo::Fields::kFunction , *function);
1128+
1129+ if (DirectHandle<Code> code; TryCast (code_obj, &code)) {
1130+ elements_->set (base_index + CallSiteInfo::Fields::kCode , code->wrapper ());
1131+ } else if (DirectHandle<BytecodeArray> bytecode;
1132+ TryCast (code_obj, &bytecode)) {
1133+ elements_->set (base_index + CallSiteInfo::Fields::kCode ,
1134+ bytecode->wrapper ());
1135+ } else {
1136+ elements_->set (base_index + CallSiteInfo::Fields::kCode ,
1137+ *isolate_->factory ()->undefined_value ());
1138+ }
1139+
1140+ elements_->set (base_index + CallSiteInfo::Fields::kOffset ,
1141+ Smi::FromInt (offset));
1142+
1143+ index_++;
11141144 skipped_prev_frame_ = false ;
11151145 }
11161146
@@ -1423,15 +1453,18 @@ Handle<FixedArray> CaptureSimpleStackTrace(Isolate* isolate, int limit,
14231453}
14241454
14251455DirectHandle<StackTraceInfo> GetDetailedStackTraceFromCallSiteInfos (
1426- Isolate* isolate, DirectHandle<FixedArray> call_site_infos ,
1456+ Isolate* isolate, DirectHandle<FixedArray> raw_data_for_call_site_infos ,
14271457 uint32_t limit) {
1428- uint32_t call_site_infos_len = call_site_infos->ulength ().value ();
1458+ uint32_t call_site_infos_len =
1459+ raw_data_for_call_site_infos->ulength ().value () /
1460+ CallSiteInfo::Fields::kCount ;
14291461 auto frames =
14301462 isolate->factory ()->NewFixedArray (std::min (limit, call_site_infos_len));
14311463 uint32_t index = 0 ;
14321464 for (uint32_t i = 0 ; i < call_site_infos_len && index < limit; ++i) {
1433- DirectHandle<CallSiteInfo> call_site_info (
1434- Cast<CallSiteInfo>(call_site_infos->get (i)), isolate);
1465+ DirectHandle<CallSiteInfo> call_site_info =
1466+ CallSiteInfo::ConstructFromRawData (isolate,
1467+ raw_data_for_call_site_infos, i);
14351468 if (call_site_info->IsAsync ()) {
14361469 break ;
14371470 }
@@ -1502,18 +1535,20 @@ MaybeDirectHandle<JSObject> Isolate::CaptureAndSetErrorStack(
15021535 stack_trace_for_uncaught_exceptions_frame_limit_,
15031536 stack_trace_for_uncaught_exceptions_options_);
15041537 } else {
1505- auto call_site_infos =
1538+ auto raw_data_for_call_site_infos =
15061539 Cast<FixedArray>(call_site_infos_or_formatted_stack);
15071540 DCHECK_GE (stack_trace_for_uncaught_exceptions_frame_limit_, 0 );
15081541 stack_trace = GetDetailedStackTraceFromCallSiteInfos (
1509- this , call_site_infos ,
1542+ this , raw_data_for_call_site_infos ,
15101543 static_cast <uint32_t >(
15111544 stack_trace_for_uncaught_exceptions_frame_limit_));
15121545 DCHECK_GE (stack_trace_limit, 0 );
1513- if (static_cast <uint32_t >(stack_trace_limit) <
1514- call_site_infos->ulength ().value ()) {
1546+ if (static_cast <uint32_t >(stack_trace_limit) *
1547+ CallSiteInfo::Fields::kCount <
1548+ raw_data_for_call_site_infos->ulength ().value ()) {
15151549 call_site_infos_or_formatted_stack = FixedArray::RightTrimOrEmpty (
1516- this , call_site_infos, stack_trace_limit);
1550+ this , raw_data_for_call_site_infos,
1551+ stack_trace_limit * CallSiteInfo::Fields::kCount );
15171552 }
15181553 // Notify the debugger.
15191554 OnStackTraceCaptured (stack_trace);
@@ -1543,17 +1578,27 @@ Handle<FixedArray> Isolate::GetSimpleStackTrace(
15431578 ErrorUtils::StackPropertyLookupResult lookup =
15441579 ErrorUtils::GetErrorStackProperty (this , maybe_error_object);
15451580
1581+ Handle<FixedArray> raw_data;
15461582 if (IsFixedArray (*lookup.error_stack )) {
1547- return Cast<FixedArray>(lookup.error_stack );
1548- }
1549- if (!IsErrorStackData (*lookup.error_stack )) {
1583+ raw_data = Cast<FixedArray>(lookup.error_stack );
1584+ } else if (IsErrorStackData (*lookup.error_stack )) {
1585+ auto error_stack_data = Cast<ErrorStackData>(lookup.error_stack );
1586+ if (!error_stack_data->HasRawDataForCallSiteInfos ()) {
1587+ return factory ()->empty_fixed_array ();
1588+ }
1589+ raw_data = handle (error_stack_data->raw_data_for_call_site_infos (), this );
1590+ } else {
15501591 return factory ()->empty_fixed_array ();
15511592 }
1552- auto error_stack_data = Cast<ErrorStackData>(lookup.error_stack );
1553- if (!error_stack_data->HasCallSiteInfos ()) {
1554- return factory ()->empty_fixed_array ();
1593+
1594+ int frame_count = raw_data->ulength ().value () / CallSiteInfo::Fields::kCount ;
1595+ Handle<FixedArray> call_site_infos = factory ()->NewFixedArray (frame_count);
1596+ for (int i = 0 ; i < frame_count; ++i) {
1597+ DirectHandle<CallSiteInfo> call_site_info =
1598+ CallSiteInfo::ConstructFromRawData (this , raw_data, i);
1599+ call_site_infos->set (i, *call_site_info);
15551600 }
1556- return handle (error_stack_data-> call_site_infos (), this ) ;
1601+ return call_site_infos;
15571602}
15581603
15591604Address Isolate::GetAbstractPC (int * line, int * column) {
@@ -3219,9 +3264,11 @@ void Isolate::PrintCurrentStackTrace(
32193264 SKIP_NONE , factory ()->undefined_value ());
32203265
32213266 IncrementalStringBuilder builder (this );
3222- uint32_t frames_len = frames->ulength ().value ();
3223- for (uint32_t i = 0 ; i < frames_len; ++i) {
3224- DirectHandle<CallSiteInfo> frame (Cast<CallSiteInfo>(frames->get (i)), this );
3267+ uint32_t frame_count =
3268+ frames->ulength ().value () / CallSiteInfo::Fields::kCount ;
3269+ for (uint32_t i = 0 ; i < frame_count; ++i) {
3270+ DirectHandle<CallSiteInfo> frame =
3271+ CallSiteInfo::ConstructFromRawData (this , frames, i);
32253272
32263273 if (should_include_frame_callback) {
32273274 Tagged<Object> raw_script_name = frame->GetScriptNameOrSourceURL ();
@@ -3245,7 +3292,7 @@ void Isolate::PrintCurrentStackTrace(
32453292 SerializeCallSiteInfo (this , frame, &builder);
32463293 }
32473294
3248- if (i != frames_len - 1 ) builder.AppendCharacter (' \n ' );
3295+ if (i != frame_count - 1 ) builder.AppendCharacter (' \n ' );
32493296 }
32503297
32513298 DirectHandle<String> stack_trace = builder.Finish ().ToHandleChecked ();
@@ -3315,8 +3362,8 @@ bool Isolate::ComputeLocationFromSimpleStackTrace(
33153362 }
33163363 DirectHandle<FixedArray> call_site_infos =
33173364 GetSimpleStackTrace (Cast<JSReceiver>(exception));
3318- uint32_t call_site_infos_len = call_site_infos->ulength ().value ();
3319- for (uint32_t i = 0 ; i < call_site_infos_len ; ++i) {
3365+ uint32_t call_site_infos_count = call_site_infos->ulength ().value ();
3366+ for (uint32_t i = 0 ; i < call_site_infos_count ; ++i) {
33203367 DirectHandle<CallSiteInfo> call_site_info (
33213368 Cast<CallSiteInfo>(call_site_infos->get (i)), this );
33223369 if (CallSiteInfo::ComputeLocation (call_site_info, target)) {
0 commit comments