Remove remaining CRT PAL wrappers and enable including standard headers in the CoreCLR build

eng/native/configurecompiler.cmake

@@ -26,10 +26,11 @@ if (CLR_CMAKE_HOST_UNIX)
     add_compile_options(-Wall)
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         add_compile_options(-Wno-null-conversion)
+        add_compile_options(-Wno-null-arithmetic)
         add_compile_options(-glldb)
     else()
-        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Werror=conversion-null>)
         add_compile_options(-g)
+        add_compile_options(-Wno-error=conversion-null)
     endif()
 endif()
 

eng/native/functions.cmake

@@ -220,6 +220,12 @@ endfunction(convert_to_absolute_path)
 function(preprocess_file inputFilename outputFilename)
   get_compile_definitions(PREPROCESS_DEFINITIONS)
   get_include_directories(PREPROCESS_INCLUDE_DIRECTORIES)
+  get_source_file_property(SOURCE_FILE_DEFINITIONS ${inputFilename} COMPILE_DEFINITIONS)
+
+  foreach(DEFINITION IN LISTS SOURCE_FILE_DEFINITIONS)
+    list(APPEND PREPROCESS_DEFINITIONS -D${DEFINITION})
+  endforeach()
+
   if (MSVC)
     add_custom_command(
         OUTPUT ${outputFilename}

src/coreclr/CMakeLists.txt

@@ -202,12 +202,6 @@ if(CLR_CMAKE_HOST_UNIX)
     add_subdirectory(debug/createdump)
   endif(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))
 
-  # Include the dummy c++ include files
-  include_directories("pal/inc/rt/cpp")
-
-  # This prevents inclusion of standard C compiler headers
-  add_compile_options(-nostdinc)
-
   set (NATIVE_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nativeresources)
   include_directories(${NATIVE_RESOURCE_DIR})
   set (PROCESS_RC_SCRIPT ${NATIVE_RESOURCE_DIR}/processrc.sh)
@@ -218,7 +212,7 @@ if(CLR_CMAKE_HOST_UNIX)
   # given Windows .rc file. The target C++ file path is returned in the
   # variable specified by the TARGET_FILE parameter.
   function(build_resources SOURCE TARGET_NAME TARGET_FILE)
-
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_DEFINITIONS "RC_INVOKED")
     set(PREPROCESSED_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}.rc.i)
 
     preprocess_file(${SOURCE} ${PREPROCESSED_SOURCE})

src/coreclr/binder/assemblyname.cpp

@@ -11,10 +11,10 @@
 //
 // ============================================================
 
+#include "common.h"
 #include "assemblyname.hpp"
 #include "assemblybindercommon.hpp"
 
-#include "common.h"
 #include "utils.hpp"
 
 #include "textualidentityparser.hpp"

src/coreclr/debug/di/rspriv.h

@@ -3975,9 +3975,9 @@ class CordbProcess :
 
     // CORDB_ADDRESS's are UINT_PTR's (64 bit under HOST_64BIT, 32 bit otherwise)
 #if defined(TARGET_64BIT)
-#define MAX_ADDRESS     (_UI64_MAX)
+#define MAX_ADDRESS     (UINT64_MAX)
 #else
-#define MAX_ADDRESS     (_UI32_MAX)
+#define MAX_ADDRESS     (UINT32_MAX)
 #endif
 #define MIN_ADDRESS     (0x0)
     CORDB_ADDRESS       m_minPatchAddr; //smallest patch in table

src/coreclr/debug/di/shimcallback.cpp

@@ -1408,7 +1408,7 @@ HRESULT ShimProxyCallback::DataBreakpoint(ICorDebugProcess* pProcess, ICorDebugT
             this->m_pThread.Assign(pThread);
 
             _ASSERTE(contextSize == sizeof(CONTEXT));
-            this->m_contextSize = min(contextSize, sizeof(CONTEXT));
+            this->m_contextSize = min(contextSize, (ULONG32)sizeof(CONTEXT));
             memcpy(&(this->m_context), pContext, this->m_contextSize);
         }
 

src/coreclr/debug/di/stdafx.h

@@ -10,6 +10,9 @@
 #include <stdio.h>
 #include <windows.h>
 #include <winnt.h>
+#include <algorithm>
+using std::min;
+using std::max;
 
 #include <dbgtargetcontext.h>
 

src/coreclr/debug/ee/debugger.cpp

@@ -3029,7 +3029,7 @@ HRESULT Debugger::GetILToNativeMappingIntoArrays(
     if (pDJI == NULL)
         return E_FAIL;
 
-    ULONG32 cMap = min(cMapMax, pDJI->GetSequenceMapCount());
+    ULONG32 cMap = min((ULONG32)cMapMax, pDJI->GetSequenceMapCount());
     DebuggerILToNativeMap * rgMapInt = pDJI->GetSequenceMap();
 
     NewArrayHolder<UINT> rguiILOffsetTemp = new (nothrow) UINT[cMap];

src/coreclr/debug/ee/funceval.cpp

@@ -2806,7 +2806,7 @@ void PackArgumentArray(DebuggerEval *pDE,
 
 #ifdef FEATURE_HFA
         // The buffer for HFAs has to be always ENREGISTERED_RETURNTYPE_MAXSIZE
-        size = max(size, ENREGISTERED_RETURNTYPE_MAXSIZE);
+        size = max(size, (unsigned)ENREGISTERED_RETURNTYPE_MAXSIZE);
 #endif
 
         BYTE * pTemp = new (interopsafe) BYTE[ALIGN_UP(sizeof(ValueClassInfo), 8) + size];

src/coreclr/debug/ee/stdafx.h

@@ -12,6 +12,7 @@
 #include <stdint.h>
 #include <wchar.h>
 #include <stdio.h>
+#include <algorithm>
 
 #include <windows.h>
 

src/coreclr/debug/inc/dbgipcevents.h

@@ -768,7 +768,7 @@ class MSLAYOUT VMPTR_Base
     //
     // Operators to emulate Pointer semantics.
     //
-    bool IsNull() { SUPPORTS_DAC; return m_addr == NULL; }
+    bool IsNull() { SUPPORTS_DAC; return m_addr == (TADDR)NULL; }
 
     static VMPTR_This NullPtr()
     {

src/coreclr/debug/shared/dbgtransportsession.cpp

@@ -1949,7 +1949,7 @@ void DbgTransportSession::TransportWorker()
                     DWORD   cbBytesToRead = sReceiveHeader.TypeSpecificData.MemoryAccess.m_cbLeftSideBuffer;
                     while (cbBytesToRead)
                     {
-                        DWORD cbTransfer = min(cbBytesToRead, sizeof(rgDummy));
+                        DWORD cbTransfer = min(cbBytesToRead, (DWORD)sizeof(rgDummy));
                         if (!ReceiveBlock(rgDummy, cbTransfer))
                             HANDLE_TRANSIENT_ERROR();
                         cbBytesToRead -= cbTransfer;

src/coreclr/dlls/mscordac/mscordac_unixexports.src

@@ -22,15 +22,10 @@ nativeStringResourceTable_mscorrc
 ; All the # exports are prefixed with DAC_
 #PAL_CatchHardwareExceptionHolderEnter
 #PAL_CatchHardwareExceptionHolderExit
-#PAL_bsearch
 #PAL_CopyModuleData
-#PAL_errno
-#PAL_free
 #PAL_GetLogicalCpuCountFromOS
 #PAL_GetTotalCpuCount
 #PAL_GetUnwindInfoSize
-#PAL_stdout
-#PAL_stderr
 #PAL_GetApplicationGroupId
 #PAL_GetTransportName
 #PAL_GetCurrentThread
@@ -47,9 +42,6 @@ nativeStringResourceTable_mscorrc
 #PAL_ReadProcessMemory
 #PAL_ProbeMemory
 #PAL_Random
-#PAL_malloc
-#PAL_realloc
-#PAL_qsort
 #PAL__wcstoui64
 #PAL_wcstoul
 #PAL_wcstod

src/coreclr/dlls/mscorpe/stdafx.h

@@ -11,6 +11,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stddef.h>
+#include <algorithm>
 
 #define FEATURE_NO_HOST     // Do not use host interface
 #include <utilcode.h>
@@ -21,3 +22,6 @@
 #include "ceegen.h"
 #include "ceefilegenwriter.h"
 #include "ceesectionstring.h"
+
+using std::min;
+using std::max;

src/coreclr/gc/env/common.h

@@ -25,6 +25,9 @@
 #include <math.h>
 
 #include <new>
+#include <type_traits>
+#include <limits>
+#include <algorithm>
 
 #ifdef TARGET_UNIX
 #include <pthread.h>

src/coreclr/gc/gc.cpp

@@ -51,6 +51,14 @@ class gc_rand
 
 uint64_t gc_rand::x = 0;
 
+// Define min/max as macros
+#ifndef min
+#define min(_a, _b) ((_a) < (_b) ? (_a) : (_b))
+#endif
+#ifndef max
+#define max(_a, _b) ((_a) < (_b) ? (_b) : (_a))
+#endif
+
 #if defined(BACKGROUND_GC) && defined(FEATURE_EVENT_TRACE)
 BOOL bgc_heap_walk_for_etw_p = FALSE;
 #endif //BACKGROUND_GC && FEATURE_EVENT_TRACE

src/coreclr/gc/vxsort/defs.h

@@ -45,45 +45,8 @@
 #define NOINLINE __attribute__((noinline))
 #endif
 
-namespace std {
-template <class _Ty>
-class numeric_limits {
-   public:
-    static constexpr _Ty Max() { static_assert(sizeof(_Ty) != sizeof(_Ty), "func must be specialized!"); return _Ty(); }
-    static constexpr _Ty Min() { static_assert(sizeof(_Ty) != sizeof(_Ty), "func must be specialized!"); return _Ty(); }
-};
-
-template <>
-class numeric_limits<int32_t> {
-public:
-    static constexpr int32_t Max() { return 0x7fffffff; }
-    static constexpr int32_t Min() { return -0x7fffffff - 1; }
-};
-
-template <>
-class numeric_limits<uint32_t> {
-public:
-    static constexpr uint32_t Max() { return 0xffffffff; }
-    static constexpr uint32_t Min() { return 0; }
-};
-
-template <>
-class numeric_limits<int64_t> {
-   public:
-    static constexpr int64_t Max() { return 0x7fffffffffffffffi64; }
-
-    static constexpr int64_t Min() { return -0x7fffffffffffffffi64 - 1; }
-};
-}  // namespace std
-
-#ifndef max
-template <typename T>
-T max(T a, T b) {
-    if (a > b)
-        return a;
-    else
-        return b;
-}
-#endif
-
+#undef max
+#undef min
+using std::max;
+using std::min;
 #endif  // VXSORT_DEFS_H

src/coreclr/gc/vxsort/machine_traits.avx2.h

@@ -123,7 +123,7 @@ class vxsort_machine_traits<int64_t, AVX2> {
 
     template <int Shift>
     static constexpr bool can_pack(T span) {
-        const auto PACK_LIMIT = (((TU) std::numeric_limits<uint32_t>::Max() + 1)) << Shift;
+        const auto PACK_LIMIT = (((TU) std::numeric_limits<uint32_t>::max() + 1)) << Shift;
         return ((TU) span) < PACK_LIMIT;
     }
 

src/coreclr/gc/vxsort/machine_traits.avx512.h

@@ -92,7 +92,7 @@ class vxsort_machine_traits<int64_t, AVX512> {
 
     template <int Shift>
     static constexpr bool can_pack(T span) {
-        const auto PACK_LIMIT = (((TU) std::numeric_limits<uint32_t>::Max() + 1)) << Shift;
+        const auto PACK_LIMIT = (((TU) std::numeric_limits<uint32_t>::max() + 1)) << Shift;
         return ((TU) span) < PACK_LIMIT;
     }
 

src/coreclr/gc/vxsort/packer.h

@@ -56,7 +56,7 @@ class packer {
    public:
 
     static void pack(TFrom *mem, size_t len, TFrom base) {
-        TFrom offset = MT::template shift_n_sub<Shift>(base, (TFrom) std::numeric_limits<TTo>::Min());
+        TFrom offset = MT::template shift_n_sub<Shift>(base, (TFrom) std::numeric_limits<TTo>::min());
         auto baseVec = MT::broadcast(offset);
 
         auto pre_aligned_mem = reinterpret_cast<TFrom *>(reinterpret_cast<size_t>(mem) & ~ALIGN_MASK);
@@ -156,7 +156,7 @@ class packer {
 
 
     static void unpack(TTo *mem, size_t len, TFrom base) {
-        TFrom offset = MT::template shift_n_sub<Shift>(base, (TFrom) std::numeric_limits<TTo>::Min());
+        TFrom offset = MT::template shift_n_sub<Shift>(base, (TFrom) std::numeric_limits<TTo>::min());
         auto baseVec = MT::broadcast(offset);
 
         auto mem_read = mem + len;

src/coreclr/gc/vxsort/smallsort/bitonic_sort.AVX2.int32_t.generated.h

@@ -39,7 +39,7 @@ extern "C" const uint8_t mask_table_8[M8_SIZE];
 
 template<> struct bitonic<int32_t, AVX2> {
     static const int N = 8;
-    static constexpr int32_t MAX = std::numeric_limits<int32_t>::Max();
+    static constexpr int32_t MAX = std::numeric_limits<int32_t>::max();
 public:
 
     static INLINE void sort_01v_ascending(__m256i& d01) {

src/coreclr/gc/vxsort/smallsort/bitonic_sort.AVX2.int64_t.generated.h

@@ -39,7 +39,7 @@ extern "C" const uint8_t mask_table_8[M8_SIZE];
 
 template<> struct bitonic<int64_t, AVX2> {
     static const int N = 4;
-    static constexpr int64_t MAX = std::numeric_limits<int64_t>::Max();
+    static constexpr int64_t MAX = std::numeric_limits<int64_t>::max();
 public:
 
     static INLINE void sort_01v_ascending(__m256i& d01) {

src/coreclr/gc/vxsort/smallsort/bitonic_sort.AVX512.int32_t.generated.h

@@ -36,7 +36,7 @@ namespace vxsort {
 namespace smallsort {
 template<> struct bitonic<int32_t, AVX512> {
     static const int N = 16;
-    static constexpr int32_t MAX = std::numeric_limits<int32_t>::Max();
+    static constexpr int32_t MAX = std::numeric_limits<int32_t>::max();
 public:
 
     static INLINE void sort_01v_ascending(__m512i& d01) {

src/coreclr/gc/vxsort/smallsort/bitonic_sort.AVX512.int64_t.generated.h

@@ -36,7 +36,7 @@ namespace vxsort {
 namespace smallsort {
 template<> struct bitonic<int64_t, AVX512> {
     static const int N = 8;
-    static constexpr int64_t MAX = std::numeric_limits<int64_t>::Max();
+    static constexpr int64_t MAX = std::numeric_limits<int64_t>::max();
 public:
 
     static INLINE void sort_01v_ascending(__m512i& d01) {

src/coreclr/gc/vxsort/smallsort/codegen/avx2.py

@@ -303,7 +303,7 @@ def generate_prologue(self, f):
 
 template<> struct bitonic<{t}, AVX2> {{
     static const int N = {self.vector_size()};
-    static constexpr {t} MAX = std::numeric_limits<{t}>::Max();
+    static constexpr {t} MAX = std::numeric_limits<{t}>::max();
 public:
 """
         print(s, file=f)

src/coreclr/gc/vxsort/smallsort/codegen/avx512.py

@@ -299,7 +299,7 @@ def generate_prologue(self, f):
 namespace smallsort {{
 template<> struct bitonic<{t}, AVX512> {{
     static const int N = {self.vector_size()};
-    static constexpr {t} MAX = std::numeric_limits<{t}>::Max();
+    static constexpr {t} MAX = std::numeric_limits<{t}>::max();
 public:
 """
         print(s, file=f)

src/coreclr/gc/vxsort/vxsort.h

@@ -374,7 +374,7 @@ class vxsort {
         auto pivot = *right;
         // We do this here just in case we need to pre-align to the right
         // We end up
-        *right = std::numeric_limits<T>::Max();
+        *right = std::numeric_limits<T>::max();
 
         // Broadcast the selected pivot
         const TV P = MT::broadcast(pivot);
@@ -617,8 +617,8 @@ class vxsort {
      *        larger-than than all values contained within the provided array.
      */
     NOINLINE void sort(T* left, T* right,
-                       T left_hint = std::numeric_limits<T>::Min(),
-                       T right_hint = std::numeric_limits<T>::Max())
+                       T left_hint = std::numeric_limits<T>::min(),
+                       T right_hint = std::numeric_limits<T>::max())
     {
 //        init_isa_detection();
 

src/coreclr/ildasm/dasm.cpp

@@ -1914,7 +1914,7 @@ BYTE* PrettyPrintCABlobValue(PCCOR_SIGNATURE &typePtr,
                 for(n=0; n < numElements; n++)
                 {
                     if(n) appendStr(out," ");
-                    _gcvt_s(str,64,*((float*)dataPtr), 8);
+                    sprintf_s(str, 64, "%.*g", 8, (double)(*((float*)dataPtr)));
                     float df = (float)atof(str);
                     // Must compare as underlying bytes, not floating point otherwise optimizer will
                     // try to enregister and compare 80-bit precision number with 32-bit precision number!!!!
@@ -1933,7 +1933,7 @@ BYTE* PrettyPrintCABlobValue(PCCOR_SIGNATURE &typePtr,
                 {
                     if(n) appendStr(out," ");
                     char *pch;
-                    _gcvt_s(str,64,*((double*)dataPtr), 17);
+                    sprintf_s(str, 64, "%.*g", 17, *((double*)dataPtr));
                     double df = strtod(str, &pch);
                     // Must compare as underlying bytes, not floating point otherwise optimizer will
                     // try to enregister and compare 80-bit precision number with 64-bit precision number!!!!
@@ -2605,7 +2605,7 @@ void DumpDefaultValue(mdToken tok, __inout __nullterminated char* szString, void
         case ELEMENT_TYPE_R4:
             {
                 char szf[32];
-                _gcvt_s(szf,32,MDDV.m_fltValue, 8);
+                sprintf_s(szf, 32, "%.*g", 8, (double)MDDV.m_fltValue);
                 float df = (float)atof(szf);
                 // Must compare as underlying bytes, not floating point otherwise optimizer will
                 // try to enregister and compare 80-bit precision number with 32-bit precision number!!!!
@@ -2619,7 +2619,7 @@ void DumpDefaultValue(mdToken tok, __inout __nullterminated char* szString, void
         case ELEMENT_TYPE_R8:
             {
                 char szf[32], *pch;
-                _gcvt_s(szf,32,MDDV.m_dblValue, 17);
+                sprintf_s(szf, 32, "%.*g", 17, MDDV.m_dblValue);
                 double df = strtod(szf, &pch); //atof(szf);
                 szf[31]=0;
                 // Must compare as underlying bytes, not floating point otherwise optimizer will