Skip to content

Commit

Permalink
[heap] Restore method inlining
Browse files Browse the repository at this point in the history
crrev.com/c/4652188 accidentally removed V8_INLINE from
VisitYoungObjectViaSlot. This CL restores inlining to what it used to be.

Bug: chromium:1462941
Change-Id: I5431908eca8f3ac97f6d96cd5dbdbf442487e8a8
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4681765
Commit-Queue: Omer Katz <omerkatz@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Auto-Submit: Omer Katz <omerkatz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#89026}
  • Loading branch information
omerktz authored and V8 LUCI CQ committed Jul 19, 2023
1 parent 564cfa4 commit 960a4be
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/heap/concurrent-marking.cc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class YoungGenerationConcurrentMarkingVisitor final
}

template <typename TSlot>
bool VisitObjectViaSlotInRemeberedSet(TSlot slot) {
V8_INLINE bool VisitObjectViaSlotInRemeberedSet(TSlot slot) {
return VisitYoungObjectViaSlot<ObjectVisitationMode::kPushToWorklist,
SlotTreatmentMode::kReadOnly>(this, slot);
}
Expand Down
2 changes: 1 addition & 1 deletion src/heap/marking-visitor-utility-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ enum class SlotTreatmentMode {
template <ObjectVisitationMode visitation_mode,
SlotTreatmentMode slot_treatment_mode, typename Visitor,
typename TSlot>
bool VisitYoungObjectViaSlot(Visitor* visitor, TSlot slot) {
V8_INLINE bool VisitYoungObjectViaSlot(Visitor* visitor, TSlot slot) {
typename TSlot::TObject target;
if constexpr (Visitor::EnableConcurrentVisitation()) {
target = slot.Relaxed_Load(visitor->cage_base());
Expand Down
3 changes: 2 additions & 1 deletion src/heap/minor-mark-sweep-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ void YoungGenerationMainMarkingVisitor::VisitPointersImpl(HeapObject host,
}

template <typename TSlot>
bool YoungGenerationMainMarkingVisitor::VisitObjectViaSlotInRemeberedSet(
V8_INLINE bool
YoungGenerationMainMarkingVisitor::VisitObjectViaSlotInRemeberedSet(
TSlot slot) {
return VisitYoungObjectViaSlot<ObjectVisitationMode::kVisitDirectly,
SlotTreatmentMode::kReadWrite>(this, slot);
Expand Down
2 changes: 1 addition & 1 deletion src/heap/minor-mark-sweep.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class YoungGenerationMainMarkingVisitor final
V8_INLINE void IncrementLiveBytesCached(MemoryChunk* chunk, intptr_t by);

template <typename TSlot>
bool VisitObjectViaSlotInRemeberedSet(TSlot slot);
V8_INLINE bool VisitObjectViaSlotInRemeberedSet(TSlot slot);

V8_INLINE bool ShortCutStrings(HeapObjectSlot slot, HeapObject* heap_object);

Expand Down

0 comments on commit 960a4be

Please sign in to comment.