Merge commit '4da745a0f4fa' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit e735598f0aee · 2025-08-07T11:27:15.000+03:00
diff --git a/bolt/unittests/Core/CMakeLists.txt b/bolt/unittests/Core/CMakeLists.txt
@@ -11,6 +11,11 @@ add_bolt_unittest(CoreTests
   MemoryMaps.cpp
   DynoStats.cpp
 
+  # FIXME CoreTests uses `llvm::detail::TakeError(llvm::Error)`, but linking
+  #       to LLVMTestingSupport introduces a transitive dependency on the
+  #       dynamic LLVM library when LLVM_LINK_LLVM_DYLIB is ON.
+  ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support/Error.cpp
+
   DISABLE_LLVM_LINK_LLVM_DYLIB
   )
 
@@ -20,7 +25,6 @@ target_link_libraries(CoreTests
   LLVMBOLTRewrite
   LLVMBOLTProfile
   LLVMBOLTUtils
-  LLVMTestingSupport
   )
 
 foreach (tgt ${BOLT_TARGETS_TO_BUILD})
diff --git a/bolt/unittests/Profile/CMakeLists.txt b/bolt/unittests/Profile/CMakeLists.txt
@@ -16,7 +16,6 @@ target_link_libraries(ProfileTests
   LLVMBOLTCore
   LLVMBOLTProfile
   LLVMTargetParser
-  LLVMTestingSupport
   )
 
 foreach (tgt ${BOLT_TARGETS_TO_BUILD})

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ target_link_libraries(ProfileTests`
`16`	`16`	`LLVMBOLTCore`
`17`	`17`	`LLVMBOLTProfile`
`18`	`18`	`LLVMTargetParser`
`19`		`- LLVMTestingSupport`
`20`	`19`	`)`
`21`	`20`
`22`	`21`	`foreach (tgt ${BOLT_TARGETS_TO_BUILD})`