Skip to content

[5.3] TempRValueOpt: fix a compile time crash in tryOptimizeStoreIntoTemp #31268

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
Apr 24, 2020
Merged

[5.3] TempRValueOpt: fix a compile time crash in tryOptimizeStoreIntoTemp #31268

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions lib/SILOptimizer/Transforms/TempRValueElimination.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,16 @@ TempRValueOptPass::tryOptimizeStoreIntoTemp(StoreInst *si) {
// We pass in SILValue() since we do not have a source address.
if (!collectLoads(useOper, user, tempObj, SILValue(), loadInsts))
return {std::next(si->getIterator()), false};

// Bail if there is any kind of user which is not handled in the code below.
switch (user->getKind()) {
case SILInstructionKind::CopyAddrInst:
case SILInstructionKind::FixLifetimeInst:
case SILInstructionKind::MarkDependenceInst:
continue;
default:
return {std::next(si->getIterator()), false};
}
}

// Since store is always a consuming operation, we do not need to worry about
Expand Down
19 changes: 19 additions & 0 deletions test/SILOptimizer/temp_rvalue_opt_ossa.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,3 +1159,22 @@ bb0(%0 : $*Klass):
%9999 = tuple()
return %9999 : $()
}

// Check that we don't crash with this.
// CHECK-LABEL: sil [ossa] @unhandled_user : $@convention(thin) (@owned Klass) -> @owned Klass {
// CHECK: alloc_stack
// CHECK: store
// CHECK: begin_access
// CHECK: load
// CHECK: } // end sil function 'unhandled_user'
sil [ossa] @unhandled_user : $@convention(thin) (@owned Klass) -> @owned Klass {
bb0(%0 : @owned $Klass):
%5 = alloc_stack $Klass
store %0 to [init] %5 : $*Klass
%104 = begin_access [read] [static] %5 : $*Klass
%105 = load [take] %104 : $*Klass
end_access %104 : $*Klass
dealloc_stack %5 : $*Klass
return %105 : $Klass
}