summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--standalone/combined.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/standalone/combined.h b/standalone/combined.h
index 8080d677d7b..5eac56dc933 100644
--- a/standalone/combined.h
+++ b/standalone/combined.h
@@ -643,7 +643,7 @@ public:
if (ClassId) {
resizeTaggedChunk(reinterpret_cast<uptr>(OldTaggedPtr) + OldSize,
reinterpret_cast<uptr>(OldTaggedPtr) + NewSize,
- NewSize, BlockEnd);
+ NewSize, untagPointer(BlockEnd));
storePrimaryAllocationStackMaybe(Options, OldPtr);
} else {
storeSecondaryAllocationStackMaybe(Options, OldPtr, NewSize);
@@ -1156,6 +1156,7 @@ private:
// address tags against chunks. To allow matching in this case we store the
// address tag in the first byte of the chunk.
void storeEndMarker(uptr End, uptr Size, uptr BlockEnd) {
+ DCHECK_EQ(BlockEnd, untagPointer(BlockEnd));
uptr UntaggedEnd = untagPointer(End);
if (UntaggedEnd != BlockEnd) {
storeTag(UntaggedEnd);