Changes for building using VS2015

CMakeLists.txt

@@ -236,7 +236,6 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "") # do not link against standard win32 libs i
 # Linker flags
 #
 # Disable the following line for UNIX altjit on Windows
-set(CMAKE_SHARED_LINKER_FLAGS "/NODEFAULTLIB") #do not use default libraries when resolving external references
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") #Do not create Side-by-Side Assembly Manifest
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.00") #windows subsystem
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") # can handle addresses larger than 2 gigabytes

src/ToolBox/SOS/Strike/util.cpp

@@ -4801,7 +4801,7 @@ typedef enum
 DacpGcHeapData *g_pHeapData = NULL;
 DacpGcHeapData g_HeapData;
 
-inline BOOL InitializeHeapData()
+BOOL InitializeHeapData()
 {
     if (g_pHeapData == NULL)
     {        

src/gc/gc.cpp

@@ -19820,7 +19820,9 @@ void gc_heap::realloc_plan_generation_start (generation* gen, generation* consin
     }
 
     dprintf (1, ("plan re-alloc gen%d start at %Ix (ptr: %Ix, limit: %Ix)", gen->gen_num, 
-        generation_allocation_pointer (consing_gen), generation_allocation_limit (consing_gen))); 
+		generation_plan_allocation_start (consing_gen),
+        generation_allocation_pointer (consing_gen), 
+		generation_allocation_limit (consing_gen))); 
 }
 
 void gc_heap::plan_generation_starts (generation*& consing_gen)
@@ -28476,7 +28478,7 @@ void gc_heap::realloc_plug (size_t last_plug_size, BYTE*& last_plug,
             }
 #endif //SHORT_PLUGS
 
-            dprintf (3, ("ra plug %Ix was shortened, adjusting plug size to %Ix", last_plug_size))
+            dprintf (3, ("ra plug %Ix was shortened, adjusting plug size to %Ix", last_plug, last_plug_size))
         }
 
 #ifdef SHORT_PLUGS
@@ -30549,7 +30551,7 @@ void gc_heap::should_check_bgc_mark (heap_segment* seg,
         // FALSE if the address is the same as reserved.
         if ((seg->flags & heap_segment_flags_swept) || (current_sweep_pos == heap_segment_reserved (seg)))
         {
-            dprintf (3, ("seg %Ix is already swept by bgc"));
+            dprintf (3, ("seg %Ix is already swept by bgc", seg));
         }
         else
         {

src/inc/msodw.h

@@ -188,7 +188,7 @@
 
 // shared reg values between DW and DW COM EXE
 #define DEFAULT_SUBPATH L"Microsoft\\PCHealth\\ErrorReporting\\DW"
-#define QUEUE_REG_SUBPATH  L"Software\\"DEFAULT_SUBPATH
+#define QUEUE_REG_SUBPATH  L"Software\\" DEFAULT_SUBPATH
 #define QUEUE_REG_OKTOREPORT_VALUE L"OkToReportFromTheseQueues"
 #define WATSON_INSTALLED_REG_SUBPATH QUEUE_REG_SUBPATH L"\\Installed"
 #define WATSON_INSTALLED_REG_SUBPATH_IA64 L"Software\\Wow6432Node\\"DEFAULT_SUBPATH L"\\Installed"

src/inc/warningcontrol.h

@@ -42,6 +42,9 @@
 #pragma warning(3               :4212)   // function declaration used ellipsis
 #pragma warning(error           :4259)   // pure virtual function was not defined
 #pragma warning(disable         :4291)   // delete not defined for new, c++ exception may cause leak
+#pragma warning(disable         :4302)   // truncation from '%$S' to '%$S'
+#pragma warning(disable         :4311)   // pointer truncation from '%$S' to '%$S'
+#pragma warning(disable         :4312)	 // '<function-style-cast>' : conversion from '%$S' to '%$S' of greater size
 #pragma warning(disable :4334)   // result of 32-bit shift implicitly converted to 64 bits
 #pragma warning(disable :4345)   // behavior change: an object of POD type constructed with an initializer of the form () will be default-initialized
 #pragma warning(disable :4430)   // missing type specifier: C++ doesn't support default-int

src/jit/ee_il_dll.cpp

@@ -109,7 +109,11 @@ void __stdcall sxsJitStartup(CoreClrCallbacks const & cccallbacks)
 /*****************************************************************************/
 
 // placement new is normally hidden but just use it this once...
-void *__cdecl operator new(size_t, void *_P);
+static void *__cdecl operator new(size_t, void *_P)
+{
+	return _P;
+}
+
 ICorJitCompiler* g_realJitCompiler = nullptr;
 
 ICorJitCompiler* __stdcall getJit()

src/jit/valuenum.cpp

@@ -1952,7 +1952,7 @@ float ValueNumStore::EvalOpIntegral<float>(VNFunc vnf, float v0, float v1, Value
     switch (oper)
     {
     case GT_MOD:
-        return fmod(v0, v1);
+        return (float)fmod(v0, v1);
     default:
         // For any other values of 'oper', we will assert and return 0.0f
         break;

src/tools/crossgen/CMakeLists.txt

@@ -9,6 +9,7 @@ include_directories(../../pal/prebuilt/corerror)
 set(crossgen_SOURCES crossgen.cpp ../util/consoleargs.cpp)
 if(WIN32)
     set(crossgen_RESOURCES Native.rc)
+    add_definitions(-D_CRT_NON_CONFORMING_WCSTOK)
 endif()
 
 add_definitions(-DFX_VER_INTERNALNAME_STR=crossgen.exe)

src/utilcode/jitperf.cpp

@@ -8,6 +8,7 @@
 #include "perflog.h"
 #include "clrhost.h"
 #include "contract.h"
+#include "utilcode.h"
 
 //=============================================================================
 // ALL THE JIT PERF STATS GATHERING CODE IS COMPILED ONLY IF THE ENABLE_JIT_PERF WAS DEFINED.

src/vm/amd64/InstantiatingStub.asm

@@ -12,9 +12,7 @@
 include <AsmMacros.inc>
 include AsmConstants.inc
 
-SHF_GETMETHODFRAMEVPTR              equ ?GetMethodFrameVPtr@StubHelperFrame@@SA_KXZ
-
-extern SHF_GETMETHODFRAMEVPTR:proc
+extern s_pStubHelperFrameVPtr:qword
 extern JIT_FailFast:proc
 extern s_gsCookie:qword
 
@@ -84,7 +82,7 @@ NESTED_ENTRY InstantiatingMethodStubWorker, _TEXT
         ;
         ; fully initialize the StubHelperFrame
         ;
-        call    SHF_GETMETHODFRAMEVPTR
+        mov		rax, s_pStubHelperFrameVPtr
         mov     [rbp + OFFSETOF_FRAME], rax
 
         mov     rax, s_gsCookie

src/vm/amd64/UMThunkStub.asm

@@ -30,8 +30,10 @@ extern g_TrapReturningThreads:dword
 extern UM2MDoADCallBack:proc
 extern ReverseEnterRuntimeHelper:proc
 extern ReverseLeaveRuntimeHelper:proc
+ifdef FEATURE_INCLUDE_ALL_INTERFACES
 extern gfHostConfig:dword
 extern NDirect__IsHostHookEnabled:proc
+endif
 extern UMThunkStubRareDisableWorker:proc
 
 

src/vm/amd64/cgenamd64.cpp

@@ -79,6 +79,9 @@ void TransitionFrame::UpdateRegDisplay(const PREGDISPLAY pRD)
 
 #ifndef DACCESS_COMPILE
 
+extern "C" TADDR s_pStubHelperFrameVPtr;
+TADDR s_pStubHelperFrameVPtr = StubHelperFrame::GetMethodFrameVPtr();
+
 void TailCallFrame::InitFromContext(T_CONTEXT * pContext)
 {
     WRAPPER_NO_CONTRACT;

src/vm/rcwwalker.cpp

@@ -25,6 +25,7 @@
 #include "cominterfacemarshaler.h"
 #include "excep.h"
 #include "finalizerthread.h"
+#include "interoputil.inl"
 
 const IID IID_ICLRServices = __uuidof(ICLRServices);