Commit b0fd211f authored by Michael Lippautz's avatar Michael Lippautz Committed by Commit Bot

[oilpan] LargeObject payload fix

No-try: true
Bug: chromium:853055, chromium:847679, chromium:852980
Change-Id: I019eea9d101cbd8e368607e6309a99b0e9779cc2
Reviewed-on: https://chromium-review.googlesource.com/1101605
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567561}
parent d204c6df
...@@ -933,8 +933,7 @@ NO_SANITIZE_ADDRESS inline size_t HeapObjectHeader::PayloadSize() { ...@@ -933,8 +933,7 @@ NO_SANITIZE_ADDRESS inline size_t HeapObjectHeader::PayloadSize() {
size_t size = encoded_ & kHeaderSizeMask; size_t size = encoded_ & kHeaderSizeMask;
if (UNLIKELY(size == kLargeObjectSizeInHeader)) { if (UNLIKELY(size == kLargeObjectSizeInHeader)) {
DCHECK(PageFromObject(this)->IsLargeObjectPage()); DCHECK(PageFromObject(this)->IsLargeObjectPage());
return static_cast<LargeObjectPage*>(PageFromObject(this))->PayloadSize() - return static_cast<LargeObjectPage*>(PageFromObject(this))->PayloadSize();
sizeof(HeapObjectHeader);
} }
DCHECK(!PageFromObject(this)->IsLargeObjectPage()); DCHECK(!PageFromObject(this)->IsLargeObjectPage());
return size - sizeof(HeapObjectHeader); return size - sizeof(HeapObjectHeader);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment