Merge commit 'f29f1112f5cc' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit d9f1accbdfaa · 2025-10-01T11:07:37.000+10:00
diff --git a/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp b/llvm/lib/ExecutionEngine/JITLink/MachO_arm64.cpp
@@ -599,8 +599,7 @@ Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromMachOObject_arm64(
 }
 
 static Error applyPACSigningToModInitPointers(LinkGraph &G) {
-  assert(G.getTargetTriple().getSubArch() == Triple::AArch64SubArch_arm64e &&
-         "PAC signing only valid for arm64e");
+  assert(G.getTargetTriple().isArm64e() && "PAC signing only valid for arm64e");
 
   if (auto *ModInitSec = G.findSectionByName("__DATA,__mod_init_func")) {
     for (auto *B : ModInitSec->blocks()) {

Original file line number	Diff line number	Diff line change
`@@ -599,8 +599,7 @@ Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromMachOObject_arm64(`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`static Error applyPACSigningToModInitPointers(LinkGraph &G) {`
`602`		`- assert(G.getTargetTriple().getSubArch() == Triple::AArch64SubArch_arm64e &&`
`603`		`- "PAC signing only valid for arm64e");`
	`602`	`+ assert(G.getTargetTriple().isArm64e() && "PAC signing only valid for arm64e");`
`604`	`603`
`605`	`604`	`if (auto *ModInitSec = G.findSectionByName("__DATA,__mod_init_func")) {`
`606`	`605`	`for (auto *B : ModInitSec->blocks()) {`