Windows executables: only load imported DLLs from System32 (dotnet#89311)

AustinWise · web-flow · commit 9c3f8b3727d9 · 2023-08-29T14:18:48.000-07:00
By using the /DEPENDENTLOADFLAG link.exe flag, we can tell the Windows loader to only look for referenced DLLs in the System32 directory.

The application of PGO is commented out until updated PGO files are available.
diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
@@ -56,6 +56,9 @@ add_compile_definitions("$<$<OR:$<CONFIG:RELEASE>,$<CONFIG:RELWITHDEBINFO>>:NDEB
 if (MSVC)
   add_linker_flag(/guard:cf)
 
+  # Load all imported DLLs from the System32 directory.
+  add_linker_flag(/DEPENDENTLOADFLAG:0x800)
+
   # Linker flags
   #
   set (WINDOWS_SUBSYSTEM_VERSION 6.01)
diff --git a/eng/native/ijw/IJW.cmake b/eng/native/ijw/IJW.cmake
@@ -70,6 +70,10 @@ if (CLR_CMAKE_HOST_WIN32)
   remove_ijw_incompatible_options("${dirCompileOptions}" dirCompileOptions)
   set_directory_properties(PROPERTIES COMPILE_OPTIONS "${dirCompileOptions}")
 
+  # IJW tests needs to load DLLs from somewhere other than System32
+  string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+  string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+
   set(CLR_SDK_REF_PACK_OUTPUT "")
   set(CLR_SDK_REF_PACK_DISCOVERY_ERROR "")
   set(CLR_SDK_REF_PACK_DISCOVERY_RESULT 0)
diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd
@@ -428,6 +428,10 @@ if %__BuildNative% EQU 1 (
         goto ExitWithCode
     )
 
+    @REM Temporarily disabling PGO until updated files with new linker flag are available.
+    @REM https://github.com/dotnet/runtime/pull/89311
+    GOTO :SkipNativeBuild
+
     if %__EnforcePgo% EQU 1 (
         set PgoCheckCmd="!PYTHON!" "!__ProjectDir!\scripts\pgocheck.py" "!__BinDir!\coreclr.dll" "!__BinDir!\clrjit.dll"
         echo !PgoCheckCmd!
diff --git a/src/coreclr/pgosupport.cmake b/src/coreclr/pgosupport.cmake
@@ -59,9 +59,11 @@ function(add_pgo TargetName)
             message("Cannot use PGO optimization built with Ninja from MSBuild. Re-run build with Ninja to apply PGO information")
         else(NOT EXISTS ${ProfilePath})
             if(CLR_CMAKE_HOST_WIN32)
-                set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE        " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
-                set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
-                add_compile_definitions(WITH_NATIVE_PGO)
+                # Temporarily disabling PGO until updated files with new linker flag are available.
+                # https://github.com/dotnet/runtime/pull/89311
+                # set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE        " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
+                # set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
+                # add_compile_definitions(WITH_NATIVE_PGO)
             else(CLR_CMAKE_HOST_WIN32)
                 if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
                     if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16))

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ add_compile_definitions("$<$<OR:$<CONFIG:RELEASE>,$<CONFIG:RELWITHDEBINFO>>:NDEB`
`56`	`56`	`if (MSVC)`
`57`	`57`	`add_linker_flag(/guard:cf)`
`58`	`58`
	`59`	`+ # Load all imported DLLs from the System32 directory.`
	`60`	`+ add_linker_flag(/DEPENDENTLOADFLAG:0x800)`
	`61`	`+`
`59`	`62`	`# Linker flags`
`60`	`63`	`#`
`61`	`64`	`set (WINDOWS_SUBSYSTEM_VERSION 6.01)`