AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[ptr-compr] stack walker: don't decompress spill slots

Browse Source 
When walking the stack and visiting compressed spill slots, maintain
their compressedness so that generated code can rely on spilled values
not magically changing.
Tested manually using the benchmark in the associated bug, as I'm not
sure how to create a fast, reliable regression test for this.

Fixed: v8:13216
Change-Id: Iebd1fb513975d9ee2567f7141f3ab18a04b0f4e1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3854507
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Igor Sheludko <ishell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#82705}
This commit is contained in:
Jakob Kummerow 2022-08-24 19:10:01 +02:00 committed by V8 LUCI CQ
parent adb5e163ac
commit 850d7980f4
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/execution/frames.cc
View File

@ -1080,6 +1080,7 @@ void VisitSpillSlot(Isolate* isolate, RootVisitor* v,
FullObjectSlot spill_slot) { FullObjectSlot spill_slot) {
#ifdef V8_COMPRESS_POINTERS #ifdef V8_COMPRESS_POINTERS
PtrComprCageBase cage_base(isolate); PtrComprCageBase cage_base(isolate);
bool was_compressed = false;
// Spill slots may contain compressed values in which case the upper // Spill slots may contain compressed values in which case the upper
// 32-bits will contain zeros. In order to simplify handling of such // 32-bits will contain zeros. In order to simplify handling of such
@ -1106,6 +1107,7 @@ void VisitSpillSlot(Isolate* isolate, RootVisitor* v,
Address value = *spill_slot.location(); Address value = *spill_slot.location();
if (!HAS_SMI_TAG(value) && value <= 0xffffffff) { if (!HAS_SMI_TAG(value) && value <= 0xffffffff) {
// We don't need to update smi values or full pointers. // We don't need to update smi values or full pointers.
was_compressed = true;
*spill_slot.location() = *spill_slot.location() =
DecompressTaggedPointer(cage_base, static_cast<Tagged_t>(value)); DecompressTaggedPointer(cage_base, static_cast<Tagged_t>(value));
if (DEBUG_BOOL) { if (DEBUG_BOOL) {
@ -1124,13 +1126,22 @@ void VisitSpillSlot(Isolate* isolate, RootVisitor* v,
CHECK(BasicMemoryChunk::FromHeapObject(forwarded) CHECK(BasicMemoryChunk::FromHeapObject(forwarded)
->InNewLargeObjectSpace()); ->InNewLargeObjectSpace());
} else { } else {
CHECK(forwarded.map(cage_base).IsMap(cage_base)); HeapObject forwarded_map = forwarded.map(cage_base);
// The map might be forwarded as well.
MapWord fwd_map_map_word =
forwarded_map.map_word(cage_base, kRelaxedLoad);
if (fwd_map_map_word.IsForwardingAddress()) {
forwarded_map = fwd_map_map_word.ToForwardingAddress();
}
CHECK(forwarded_map.IsMap(cage_base));
} }
} }
} }
} else { } else {
Tagged_t compressed_value = static_cast<Tagged_t>(*spill_slot.location()); Address slot_contents = *spill_slot.location();
Tagged_t compressed_value = static_cast<Tagged_t>(slot_contents);
if (!HAS_SMI_TAG(compressed_value)) { if (!HAS_SMI_TAG(compressed_value)) {
was_compressed = slot_contents <= 0xFFFFFFFF;
// We don't need to update smi values. // We don't need to update smi values.
*spill_slot.location() = *spill_slot.location() =
DecompressTaggedPointer(cage_base, compressed_value); DecompressTaggedPointer(cage_base, compressed_value);
@ -1138,6 +1149,13 @@ void VisitSpillSlot(Isolate* isolate, RootVisitor* v,
} }
#endif #endif
v->VisitRootPointer(Root::kStackRoots, nullptr, spill_slot); v->VisitRootPointer(Root::kStackRoots, nullptr, spill_slot);
#if V8_COMPRESS_POINTERS
if (was_compressed) {
// Restore compression. Generated code should be able to trust that
// compressed spill slots remain compressed.
*spill_slot.location() = CompressTagged(*spill_slot.location());
}
#endif
} }
SafepointEntry GetSafepointEntryFromCodeCache( SafepointEntry GetSafepointEntryFromCodeCache(