fix some 17-06 build breaks and CI copyright check failure

Jianchun Xu · Jianchun Xu · commit 86b66eefa6e4 · 2017-06-15T11:24:41.000-07:00
diff --git a/lib/Common/CommonDefines.h b/lib/Common/CommonDefines.h
@@ -8,13 +8,6 @@
 #include "Warnings.h"
 #include "ChakraCoreVersion.h"
 
-#if defined(NTBUILD) && defined(_CHAKRACOREBUILD)
-#error NTBUILD and _CHAKRACOREBUILD cannot be both defined
-#endif
-#if !defined(NTBUILD) && !defined(_CHAKRACOREBUILD)
-#error Either NTBUILD or _CHAKRACOREBUILD must be defined
-#endif
-
 //----------------------------------------------------------------------------------------------------
 // Default debug/fretest/release flags values
 //  - Set the default values of debug/fretest/release flags if it is not set by the command line
diff --git a/lib/Runtime/Library/JavascriptArray.cpp b/lib/Runtime/Library/JavascriptArray.cpp
@@ -5253,6 +5253,7 @@ namespace Js
 
         if (hasInlineSegment)
         {
+            AnalysisAssert(array->head);
             SparseArraySegment<T>* newHeadSeg = array->ReallocNonLeafSegment((SparseArraySegment<T>*)PointerValue(array->head), array->head->next);
             array->head = newHeadSeg;
         }
@@ -5274,6 +5275,7 @@ namespace Js
 
         if (SparseArraySegmentBase::IsLeafSegment(lastSeg, recycler))
         {
+            AnalysisAssert(lastSeg);
             arr->ReallocNonLeafSegment((SparseArraySegment<T>*)lastSeg, lastSeg->next, true /*forceNonLeaf*/);
         }
     }
diff --git a/lib/Runtime/Library/JavascriptArray.inl b/lib/Runtime/Library/JavascriptArray.inl
@@ -110,7 +110,7 @@ namespace Js
         Recycler *recycler = this->GetScriptContext()->GetRecycler();
         if (forceNonLeaf)
         {
-            newSeg = SparseArraySegment<T>::AllocateSegmentImpl<false /*isLeaf*/>(recycler, seg->left, seg->length, nextSeg);
+            newSeg = SparseArraySegment<T>::template AllocateSegmentImpl<false /*isLeaf*/>(recycler, seg->left, seg->length, nextSeg);
         }
         else
         {
diff --git a/test/LetConst/shadowedsetter.js b/test/LetConst/shadowedsetter.js
@@ -1,3 +1,8 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
 evaluate = WScript.LoadScript;
 
 __defineSetter__("x", function () { });

Original file line number	Diff line number	Diff line change
`@@ -5253,6 +5253,7 @@ namespace Js`
`5253`	`5253`
`5254`	`5254`	`if (hasInlineSegment)`
`5255`	`5255`	`{`
	`5256`	`+ AnalysisAssert(array->head);`
`5256`	`5257`	`SparseArraySegment<T>* newHeadSeg = array->ReallocNonLeafSegment((SparseArraySegment<T>*)PointerValue(array->head), array->head->next);`
`5257`	`5258`	`array->head = newHeadSeg;`
`5258`	`5259`	`}`
`@@ -5274,6 +5275,7 @@ namespace Js`
`5274`	`5275`
`5275`	`5276`	`if (SparseArraySegmentBase::IsLeafSegment(lastSeg, recycler))`
`5276`	`5277`	`{`
	`5278`	`+ AnalysisAssert(lastSeg);`
`5277`	`5279`	`arr->ReallocNonLeafSegment((SparseArraySegment<T>)lastSeg, lastSeg->next, true /forceNonLeaf*/);`
`5278`	`5280`	`}`
`5279`	`5281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ namespace Js`
`110`	`110`	`Recycler *recycler = this->GetScriptContext()->GetRecycler();`
`111`	`111`	`if (forceNonLeaf)`
`112`	`112`	`{`
`113`		`- newSeg = SparseArraySegment<T>::AllocateSegmentImpl<false /isLeaf/>(recycler, seg->left, seg->length, nextSeg);`
	`113`	`+ newSeg = SparseArraySegment<T>::template AllocateSegmentImpl<false /isLeaf/>(recycler, seg->left, seg->length, nextSeg);`
`114`	`114`	`}`
`115`	`115`	`else`
`116`	`116`	`{`