Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
[Merge chakra-core/ChakraCore@57edc7bfc1] [1.7>master] [1.6>1.7] [MER…
Browse files Browse the repository at this point in the history
…GE #3322 @suwc] OS12507864: Correct assertion introduced in PR#3211

Merge pull request #3322 from suwc:build/suwc/OS12507864

The assertions are intended to future-proof the assumption that
isInlineSegment being true implies segment swap.
chakra-core/ChakraCore#3211
  • Loading branch information
chakrabot committed Jul 13, 2017
1 parent 3ee0b9b commit 07ed6df
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions deps/chakrashim/core/lib/Runtime/Library/JavascriptArray.inl
Expand Up @@ -866,7 +866,7 @@ SECOND_PASS:
}

startSeg = current;
Assert(startSeg == oldStartSeg || isInlineSegment);
Assert(startSeg != oldStartSeg || !isInlineSegment); // ensure isInlineSegment implies startSeg != oldStartSeg
if (isInlineSegment)
{
this->ClearElements(oldStartSeg, 0);
Expand Down Expand Up @@ -955,7 +955,7 @@ SECOND_PASS:
}
}

Assert(oldCurrent == current || isInlineSegment);
Assert(oldCurrent != current || !isInlineSegment); // ensure isInlineSegment implies oldCurrent != current
if (isInlineSegment)
{
this->ClearElements(oldCurrent, 0);
Expand Down

0 comments on commit 07ed6df

Please sign in to comment.