averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Full IRGen support for begin_access [no_nested_conflict].

Browse Source 
Suppress generation of the endAccess runtime call when the
begin_access was a "non-tracking" access.
This commit is contained in:
Andrew Trick
2018-03-31 16:40:01 -07:00
parent 6af333f307
commit 02e4429dba
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/IRGen/IRGenSIL.cpp
View File

@@ -4260,8 +4260,8 @@ static SILAccessEnforcement getEffectiveEnforcement(IRGenFunction &IGF,
return enforcement; return enforcement;
} }
template <class Inst> template <class BeginAccessInst>
static ExclusivityFlags getExclusivityFlags(Inst *i) { static ExclusivityFlags getExclusivityFlags(BeginAccessInst *i) {
return getExclusivityFlags(i->getModule(), i->getAccessKind(), return getExclusivityFlags(i->getModule(), i->getAccessKind(),
i->hasNoNestedConflict()); i->hasNoNestedConflict());
} }
@@ -4363,6 +4363,9 @@ void IRGenSILFunction::visitEndAccessInst(EndAccessInst *i) {
return; return;
case SILAccessEnforcement::Dynamic: { case SILAccessEnforcement::Dynamic: {
if (access->hasNoNestedConflict())
return;
auto scratch = getLoweredDynamicEnforcementScratchBuffer(access); auto scratch = getLoweredDynamicEnforcementScratchBuffer(access);
auto call = Builder.CreateCall(IGM.getEndAccessFn(), { scratch }); auto call = Builder.CreateCall(IGM.getEndAccessFn(), { scratch });

1
test/IRGen/access_markers.sil
View File

@@ -155,6 +155,7 @@ bb0(%0 : $A):
// CHECK: call void @swift_beginAccess(i8* %{{.*}}, [[BUFFER]]* %{{.*}}, [[SIZE]] 0, i8* null) // CHECK: call void @swift_beginAccess(i8* %{{.*}}, [[BUFFER]]* %{{.*}}, [[SIZE]] 0, i8* null)
%3 = begin_access [read] [dynamic] [no_nested_conflict] %2 : $*Int %3 = begin_access [read] [dynamic] [no_nested_conflict] %2 : $*Int
copy_addr %3 to [initialization] %1 : $*Int copy_addr %3 to [initialization] %1 : $*Int
// CHECK-NOT: end_access
end_access %3 : $*Int end_access %3 : $*Int
%9 = alloc_stack $Builtin.UnsafeValueBuffer %9 = alloc_stack $Builtin.UnsafeValueBuffer
// CHECK: call void @swift_beginAccess(i8* %{{.*}}, [[BUFFER]]* %{{.*}}, [[SIZE]] 0, i8* null) // CHECK: call void @swift_beginAccess(i8* %{{.*}}, [[BUFFER]]* %{{.*}}, [[SIZE]] 0, i8* null)