Skip to content

[AccessEnforcementOpts] Fix an iterator invalidation issue #18890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2018
Merged

[AccessEnforcementOpts] Fix an iterator invalidation issue #18890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 59 additions & 41 deletions lib/SILOptimizer/Transforms/AccessEnforcementOpts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,25 +638,31 @@ void AccessConflictAndMergeAnalysis::visitBeginAccess(
}
SILAccessKind beginAccessKind = beginAccess->getAccessKind();
// check the current in-scope accesses for conflicts:
for (auto pair : info.getInScopeAccesses()) {
auto *outerBeginAccess = pair.second;
// If both are reads, keep the mapped access.
if (!accessKindMayConflict(beginAccessKind,
outerBeginAccess->getAccessKind())) {
continue;
}
bool changed = false;
do {
changed = false;
for (auto pair : info.getInScopeAccesses()) {
auto *outerBeginAccess = pair.second;
// If both are reads, keep the mapped access.
if (!accessKindMayConflict(beginAccessKind,
outerBeginAccess->getAccessKind())) {
continue;
}

auto &outerAccessInfo = result.getAccessInfo(outerBeginAccess);
// If there is no potential conflict, leave the outer access mapped.
if (!outerAccessInfo.isDistinctFrom(beginAccessInfo))
continue;
auto &outerAccessInfo = result.getAccessInfo(outerBeginAccess);
// If there is no potential conflict, leave the outer access mapped.
if (!outerAccessInfo.isDistinctFrom(beginAccessInfo))
continue;

LLVM_DEBUG(beginAccessInfo.dump(); llvm::dbgs() << " may conflict with:\n";
outerAccessInfo.dump());
LLVM_DEBUG(beginAccessInfo.dump();
llvm::dbgs() << " may conflict with:\n";
outerAccessInfo.dump());

recordConflict(info, outerAccessInfo);
break;
}
recordConflict(info, outerAccessInfo);
changed = true;
break;
}
} while (changed);

// Record the current access to InScopeAccesses.
// It can potentially be folded
Expand Down Expand Up @@ -691,22 +697,27 @@ void AccessConflictAndMergeAnalysis::detectApplyConflicts(
const swift::FunctionAccessedStorage &callSiteAccesses,
const DenseAccessMap &conflictFreeSet,
const swift::FullApplySite &fullApply, RegionInfo &info) {
for (auto pair : conflictFreeSet) {
auto *outerBeginAccess = pair.second;
// If there is no potential conflict, leave the outer access mapped.
SILAccessKind accessKind = outerBeginAccess->getAccessKind();
AccessInfo &outerAccessInfo = result.getAccessInfo(outerBeginAccess);
if (!callSiteAccesses.mayConflictWith(accessKind, outerAccessInfo))
continue;
bool changed = false;
do {
changed = false;
for (auto pair : conflictFreeSet) {
auto *outerBeginAccess = pair.second;
// If there is no potential conflict, leave the outer access mapped.
SILAccessKind accessKind = outerBeginAccess->getAccessKind();
AccessInfo &outerAccessInfo = result.getAccessInfo(outerBeginAccess);
if (!callSiteAccesses.mayConflictWith(accessKind, outerAccessInfo))
continue;

LLVM_DEBUG(
llvm::dbgs() << *fullApply.getInstruction() << " call site access: ";
callSiteAccesses.dump(); llvm::dbgs() << " may conflict with:\n";
outerAccessInfo.dump());
LLVM_DEBUG(
llvm::dbgs() << *fullApply.getInstruction() << " call site access: ";
callSiteAccesses.dump(); llvm::dbgs() << " may conflict with:\n";
outerAccessInfo.dump());

recordConflict(info, outerAccessInfo);
break;
}
recordConflict(info, outerAccessInfo);
changed = true;
break;
}
} while (changed);
}

void AccessConflictAndMergeAnalysis::visitFullApply(FullApplySite fullApply,
Expand Down Expand Up @@ -761,18 +772,25 @@ void AccessConflictAndMergeAnalysis::mergePredAccesses(
void AccessConflictAndMergeAnalysis::visitSetForConflicts(
const DenseAccessMap &accessSet, RegionInfo &info,
AccessConflictAndMergeAnalysis::AccessedStorageSet &loopStorage) {
for (auto pair : accessSet) {
BeginAccessInst *beginAccess = pair.second;
AccessInfo &accessInfo = result.getAccessInfo(beginAccess);

for (auto loopAccess : loopStorage) {
if (loopAccess.isDistinctFrom(accessInfo) && !info.unidentifiedAccess)
continue;

recordConflict(info, loopAccess);
break;
bool changed = false;
do {
changed = false;
for (auto pair : accessSet) {
BeginAccessInst *beginAccess = pair.second;
AccessInfo &accessInfo = result.getAccessInfo(beginAccess);

for (auto loopAccess : loopStorage) {
if (loopAccess.isDistinctFrom(accessInfo) && !info.unidentifiedAccess)
continue;

recordConflict(info, loopAccess);
changed = true;
break;
}
if (changed)
break;
}
}
} while (changed);
}

void AccessConflictAndMergeAnalysis::detectConflictsInLoop(
Expand Down