Merge branch 'master' into feat-optional-chaining

Author: ShortDevelopment

lib/Common/Memory/Allocator.h

@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 #pragma once
@@ -448,6 +449,8 @@ void AssertValue(void * mem, T value, uint byteCount)
 #define NO_EXPORT(x) x
 #endif
 
+#if defined(_MSC_VER) && !defined(__clang__)
+
 // For the debugger extension, we don't need the placement news
 #ifndef __PLACEMENT_NEW_INLINE
 #define __PLACEMENT_NEW_INLINE
@@ -473,6 +476,14 @@ void * previousAllocation               // Previously allocated memory
 
 #endif
 
+#else
+
+// Use std inline placement new instead of custom
+// See PR #7009
+#include <new>
+
+#endif
+
 //----------------------------------------
 // throwing operator new overrides
 //----------------------------------------

lib/Runtime/Base/Constants.cpp

@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 #include "RuntimeBasePch.h"
@@ -29,7 +30,7 @@ const char16 Constants::StringMatch[] = _u("String.prototype.match");
 const uint64 Constants::ExponentMask = 0x3FF0000000000000;
 const uint64 Constants::MantissaMask = 0x000FFFFFFFFFFFFF;
 
-#ifdef _M_AMD64
+#ifdef TARGET_64
 const size_t Constants::StackLimitForScriptInterrupt = 0x7fffffffffffffff;
 #else
 const size_t Constants::StackLimitForScriptInterrupt = 0x7fffffff;