Merge commit '9de972e3e1ec' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit ddd69b4d77ed · 2024-09-05T12:35:12.000-07:00
diff --git a/clang/lib/CodeGen/CGCall.h b/clang/lib/CodeGen/CGCall.h
@@ -449,12 +449,12 @@ inline FnInfoOpts operator&(FnInfoOpts A, FnInfoOpts B) {
                                  llvm::to_underlying(B));
 }
 
-inline FnInfoOpts operator|=(FnInfoOpts A, FnInfoOpts B) {
+inline FnInfoOpts &operator|=(FnInfoOpts &A, FnInfoOpts B) {
   A = A | B;
   return A;
 }
 
-inline FnInfoOpts operator&=(FnInfoOpts A, FnInfoOpts B) {
+inline FnInfoOpts &operator&=(FnInfoOpts &A, FnInfoOpts B) {
   A = A & B;
   return A;
 }

Original file line number	Diff line number	Diff line change
`@@ -449,12 +449,12 @@ inline FnInfoOpts operator&(FnInfoOpts A, FnInfoOpts B) {`
`449`	`449`	`llvm::to_underlying(B));`
`450`	`450`	`}`
`451`	`451`
`452`		`-inline FnInfoOpts operator\|=(FnInfoOpts A, FnInfoOpts B) {`
	`452`	`+inline FnInfoOpts &operator\|=(FnInfoOpts &A, FnInfoOpts B) {`
`453`	`453`	`A = A \| B;`
`454`	`454`	`return A;`
`455`	`455`	`}`
`456`	`456`
`457`		`-inline FnInfoOpts operator&=(FnInfoOpts A, FnInfoOpts B) {`
	`457`	`+inline FnInfoOpts &operator&=(FnInfoOpts &A, FnInfoOpts B) {`
`458`	`458`	`A = A & B;`
`459`	`459`	`return A;`
`460`	`460`	`}`