RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-10 19:50:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ObjC][ARC] Convert the retainRV marker that is passed as a named

Browse Source 
metadata into a module flag in the auto-upgrader and make the ARC
contract pass read the marker as a module flag.

This is needed to fix a bug where ARC contract wasn't inserting the
retainRV marker when LTO was enabled, which caused objects returned
from a function to be auto-released.

rdar://problem/49464214

Differential Revision: https://reviews.llvm.org/D60303

llvm-svn: 358047
This commit is contained in:
Akira Hatanaka 2019-04-10 06:20:20 +00:00
parent dfee30d5eb
commit 5564068261
6 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/IR/AutoUpgrade.cpp
View File

@ -3765,8 +3765,8 @@ bool llvm::UpgradeDebugInfo(Module &M) {
bool llvm::UpgradeRetainReleaseMarker(Module &M) { bool llvm::UpgradeRetainReleaseMarker(Module &M) {
bool Changed = false; bool Changed = false;
NamedMDNode *ModRetainReleaseMarker = const char *MarkerKey = "clang.arc.retainAutoreleasedReturnValueMarker";
M.getNamedMetadata("clang.arc.retainAutoreleasedReturnValueMarker"); NamedMDNode *ModRetainReleaseMarker = M.getNamedMetadata(MarkerKey);
if (ModRetainReleaseMarker) { if (ModRetainReleaseMarker) {
MDNode *Op = ModRetainReleaseMarker->getOperand(0); MDNode *Op = ModRetainReleaseMarker->getOperand(0);
if (Op) { if (Op) {
@ -3776,11 +3776,11 @@ bool llvm::UpgradeRetainReleaseMarker(Module &M) {
ID->getString().split(ValueComp, "#"); ID->getString().split(ValueComp, "#");
if (ValueComp.size() == 2) { if (ValueComp.size() == 2) {
std::string NewValue = ValueComp[0].str() + ";" + ValueComp[1].str(); std::string NewValue = ValueComp[0].str() + ";" + ValueComp[1].str();
Metadata *Ops[1] = {MDString::get(M.getContext(), NewValue)}; ID = MDString::get(M.getContext(), NewValue);
ModRetainReleaseMarker->setOperand(0,
MDNode::get(M.getContext(), Ops));
Changed = true;
} }
M.addModuleFlag(Module::Error, MarkerKey, ID);
M.eraseNamedMetadata(ModRetainReleaseMarker);
Changed = true;
} }
} }
} }

11
lib/Transforms/ObjCARC/ObjCARCContract.cpp
View File

@ -744,15 +744,8 @@ bool ObjCARCContract::doInitialization(Module &M) {
EP.init(&M); EP.init(&M);
// Initialize RVInstMarker. // Initialize RVInstMarker.
RVInstMarker = nullptr; const char *MarkerKey = "clang.arc.retainAutoreleasedReturnValueMarker";
if (NamedMDNode *NMD = RVInstMarker = dyn_cast_or_null<MDString>(M.getModuleFlag(MarkerKey));
M.getNamedMetadata("clang.arc.retainAutoreleasedReturnValueMarker"))
if (NMD->getNumOperands() == 1) {
const MDNode *N = NMD->getOperand(0);
if (N->getNumOperands() == 1)
if (const MDString *S = dyn_cast<MDString>(N->getOperand(0)))
RVInstMarker = S;
}
return false; return false;
} }

4
test/Bitcode/upgrade-objcretainrelease.ll
View File

@ -2,5 +2,5 @@
; ;
; RUN: llvm-dis < %s.bc | FileCheck %s ; RUN: llvm-dis < %s.bc | FileCheck %s
; CHECK: "mov\09fp, fp\09\09; marker for objc_retainAutoreleaseReturnValue" ; CHECK: !llvm.module.flags = !{!0}
; CHECK: !0 = !{i32 1, !"clang.arc.retainAutoreleasedReturnValueMarker", !"mov\09fp, fp\09\09; marker for objc_retainAutoreleaseReturnValue"}

5
test/Transforms/ObjCARC/contract-marker-funclet.ll
View File

@ -48,8 +48,9 @@ declare dllimport i8* @llvm.objc.retainAutoreleasedReturnValue(i8*)
declare dllimport void @llvm.objc.release(i8*) declare dllimport void @llvm.objc.release(i8*)
!clang.arc.retainAutoreleasedReturnValueMarker = !{!0} !llvm.module.flags = !{!0}
!0 = !{!"movl\09%ebp, %ebp\09\09// marker for objc_retainAutoreleaseReturnValue"}
!0 = !{i32 1, !"clang.arc.retainAutoreleasedReturnValueMarker", !"movl\09%ebp, %ebp\09\09// marker for objc_retainAutoreleaseReturnValue"}
; CHECK-LABEL: catch ; CHECK-LABEL: catch
; CHECK: call void asm sideeffect "movl{{.*}}%ebp, %ebp{{.*}}", ""() [ "funclet"(token %1) ] ; CHECK: call void asm sideeffect "movl{{.*}}%ebp, %ebp{{.*}}", ""() [ "funclet"(token %1) ]

4
test/Transforms/ObjCARC/contract-marker.ll
View File

@ -38,8 +38,8 @@ declare i8* @llvm.objc.retainAutoreleasedReturnValue(i8*)
declare i8* @llvm.objc.unsafeClaimAutoreleasedReturnValue(i8*) declare i8* @llvm.objc.unsafeClaimAutoreleasedReturnValue(i8*)
declare void @bar(i8*) declare void @bar(i8*)
!clang.arc.retainAutoreleasedReturnValueMarker = !{!0} !llvm.module.flags = !{!0}
!0 = !{!"mov\09r7, r7\09\09@ marker for return value optimization"} !0 = !{i32 1, !"clang.arc.retainAutoreleasedReturnValueMarker", !"mov\09r7, r7\09\09@ marker for return value optimization"}
; CHECK: attributes [[NUW]] = { nounwind } ; CHECK: attributes [[NUW]] = { nounwind }

4
test/Transforms/ObjCARC/contract-testcases.ll
View File

@ -87,9 +87,9 @@ lpad: ; preds = %entry
resume { i8*, i32 } undef resume { i8*, i32 } undef
} }
!clang.arc.retainAutoreleasedReturnValueMarker = !{!0} !llvm.module.flags = !{!0}
!0 = !{!"mov\09r7, r7\09\09@ marker for objc_retainAutoreleaseReturnValue"} !0 = !{i32 1, !"clang.arc.retainAutoreleasedReturnValueMarker", !"mov\09r7, r7\09\09@ marker for objc_retainAutoreleaseReturnValue"}
; CHECK: attributes #0 = { optsize } ; CHECK: attributes #0 = { optsize }
; CHECK: attributes [[NUW]] = { nounwind } ; CHECK: attributes [[NUW]] = { nounwind }