Merge commit '7e30ce9528d9' from llvm.org/release/17.x into stable/20230725

git apple-llvm automerger · git apple-llvm automerger · commit f7a5a8e8ef8d · 2023-11-27T08:30:03.000+01:00
diff --git a/llvm/lib/ExecutionEngine/JITLink/aarch32.cpp b/llvm/lib/ExecutionEngine/JITLink/aarch32.cpp
@@ -173,7 +173,7 @@ bool checkRegister(const ThumbRelocation &R, HalfWords Reg) {
 }
 
 template <EdgeKind_aarch32 Kind>
-bool writeRegister(WritableThumbRelocation &R, HalfWords Reg) {
+void writeRegister(WritableThumbRelocation &R, HalfWords Reg) {
   static constexpr HalfWords Mask = FixupInfo<Kind>::RegMask;
   assert((Mask.Hi & Reg.Hi) == Reg.Hi && (Mask.Hi & Reg.Hi) == Reg.Hi &&
          "Value bits exceed bit range of given mask");

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ bool checkRegister(const ThumbRelocation &R, HalfWords Reg) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`template <EdgeKind_aarch32 Kind>`
`176`		`-bool writeRegister(WritableThumbRelocation &R, HalfWords Reg) {`
	`176`	`+void writeRegister(WritableThumbRelocation &R, HalfWords Reg) {`
`177`	`177`	`static constexpr HalfWords Mask = FixupInfo<Kind>::RegMask;`
`178`	`178`	`assert((Mask.Hi & Reg.Hi) == Reg.Hi && (Mask.Hi & Reg.Hi) == Reg.Hi &&`
`179`	`179`	`"Value bits exceed bit range of given mask");`