[MERGE chakra-core#3322 @suwc] OS12507864: Correct assertion introduced in PR#3211

Suwei Chen · Suwei Chen · commit b6a9d9dd3677 · 2017-07-12T10:18:55.000-07:00
Merge pull request chakra-core#3322 from suwc:build/suwc/OS12507864 The assertions are intended to future-proof the assumption that isInlineSegment being true implies segment swap. chakra-core#3211
diff --git a/lib/Runtime/Library/JavascriptArray.inl b/lib/Runtime/Library/JavascriptArray.inl
@@ -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);
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ SECOND_PASS:`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`startSeg = current;`
`869`		`- Assert(startSeg == oldStartSeg \|\| isInlineSegment);`
	`869`	`+ Assert(startSeg != oldStartSeg \|\| !isInlineSegment); // ensure isInlineSegment implies startSeg != oldStartSeg`
`870`	`870`	`if (isInlineSegment)`
`871`	`871`	`{`
`872`	`872`	`this->ClearElements(oldStartSeg, 0);`
`@@ -955,7 +955,7 @@ SECOND_PASS:`
`955`	`955`	`}`
`956`	`956`	`}`
`957`	`957`
`958`		`- Assert(oldCurrent == current \|\| isInlineSegment);`
	`958`	`+ Assert(oldCurrent != current \|\| !isInlineSegment); // ensure isInlineSegment implies oldCurrent != current`
`959`	`959`	`if (isInlineSegment)`
`960`	`960`	`{`
`961`	`961`	`this->ClearElements(oldCurrent, 0);`