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

git apple-llvm automerger · git apple-llvm automerger · commit ea7f4bac10e3 · 2021-10-27T16:02:52.000-07:00
diff --git a/compiler-rt/lib/orc/macho_platform.cpp b/compiler-rt/lib/orc/macho_platform.cpp
@@ -112,10 +112,10 @@ Error registerObjCSelectors(
     if (auto Err = validatePointerSectionExtent("__objc_selrefs", ObjCSelRefs))
       return Err;
 
-    for (uintptr_t SelEntry : ObjCSelRefs.toSpan<uintptr_t>()) {
+    for (uintptr_t &SelEntry : ObjCSelRefs.toSpan<uintptr_t>()) {
       const char *SelName = reinterpret_cast<const char *>(SelEntry);
       auto Sel = sel_registerName(SelName);
-      *reinterpret_cast<SEL *>(SelEntry) = Sel;
+      *reinterpret_cast<SEL *>(&SelEntry) = Sel;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,10 @@ Error registerObjCSelectors(`
`112`	`112`	`if (auto Err = validatePointerSectionExtent("__objc_selrefs", ObjCSelRefs))`
`113`	`113`	`return Err;`
`114`	`114`
`115`		`- for (uintptr_t SelEntry : ObjCSelRefs.toSpan<uintptr_t>()) {`
	`115`	`+ for (uintptr_t &SelEntry : ObjCSelRefs.toSpan<uintptr_t>()) {`
`116`	`116`	`const char SelName = reinterpret_cast<const char >(SelEntry);`
`117`	`117`	`auto Sel = sel_registerName(SelName);`
`118`		`- reinterpret_cast<SEL >(SelEntry) = Sel;`
	`118`	`+ reinterpret_cast<SEL >(&SelEntry) = Sel;`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`