Address feedback by @janvorli

dotnet · Sep 4, 2019 · 9d873d6 · 9d873d6
1 parent ec4b2c5
commit 9d873d6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/src/coreclr/hosts/CMakeLists.txt b/src/coreclr/hosts/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(inc)
-include_directories(../../inc)
 
 if(WIN32)
   add_subdirectory(corerun)

diff --git a/src/md/CMakeLists.txt b/src/md/CMakeLists.txt
@@ -1,7 +1,3 @@
-if(NOT DEFINED ENV{ROOTFS_DIR})
-  include_directories(SYSTEM /usr/local/include)
-endif()
-
 add_subdirectory(compiler)
 add_subdirectory(runtime)
 add_subdirectory(enc)

diff --git a/src/pal/src/loader/module.cpp b/src/pal/src/loader/module.cpp
@@ -767,7 +767,7 @@ PVOID
 PALAPI
 PAL_LOADLoadPEFile(HANDLE hFile, size_t offset)
 {
-    ENTRY("PAL_LOADLoadPEFile (hFile=%p, offset=%x)\n", hFile, offset);
+    ENTRY("PAL_LOADLoadPEFile (hFile=%p, offset=%zx)\n", hFile, offset);
 
     void * loadedBase = MAPMapPEFile(hFile, offset);
 

diff --git a/src/pal/src/map/map.cpp b/src/pal/src/map/map.cpp
@@ -1090,7 +1090,7 @@ CorUnix::InternalMapViewOfFile(
     CFileMappingImmutableData *pImmutableData = NULL;
     CFileMappingProcessLocalData *pProcessLocalData = NULL;
     IDataLock *pProcessLocalDataLock = NULL;
-    INT64 offset = (INT64)dwFileOffsetHigh | (INT64)dwFileOffsetLow;
+    INT64 offset = ((INT64)dwFileOffsetHigh << 32) | (INT64)dwFileOffsetLow;
 
 #if ONE_SHARED_MAPPING_PER_FILEREGION_PER_PROCESS
     PMAPPED_VIEW_LIST pReusedMapping = NULL;
@@ -2218,7 +2218,7 @@ void * MAPMapPEFile(HANDLE hFile, off_t offset)
     char* envVar;
 #endif
 
-    ENTRY("MAPMapPEFile (hFile=%p offset=%x)\n", hFile, offset);
+    ENTRY("MAPMapPEFile (hFile=%p offset=%zx)\n", hFile, offset);
 
     //Step 0: Verify values, find internal pal data structures.
     if (INVALID_HANDLE_VALUE == hFile)

diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp
@@ -1820,7 +1820,7 @@ void SystemDomain::Init()
         sizeof(MethodDesc),
         sizeof(FieldDesc),
         sizeof(Module)
-        ));
+    ));
 #endif // _DEBUG
 
     // The base domain is initialized in SystemDomain::Attach()

diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp
@@ -274,7 +274,7 @@ HRESULT InitializeEE(COINITIEE flags, const BundleInfo* bundleInfo)
 {
     WRAPPER_NO_CONTRACT;
 #ifdef FEATURE_EVENT_TRACE
-    if(!g_fEEComActivatedStartup)
+    if (!g_fEEComActivatedStartup)
         g_fEEOtherStartup = TRUE;
 #endif // FEATURE_EVENT_TRACE
     return EnsureEEStarted(flags, bundleInfo);