Skip to content

Revert "[semantic-arc] Rename isWrittenTo -> isLoadGuaranteedByStorage." #26959

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 30, 2019
Merged

Revert "[semantic-arc] Rename isWrittenTo -> isLoadGuaranteedByStorage." #26959

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
13 changes: 5 additions & 8 deletions lib/SILOptimizer/Mandatory/SemanticARCOpts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,7 @@ struct SemanticARCOptVisitor
bool visitBeginBorrowInst(BeginBorrowInst *bbi);
bool visitLoadInst(LoadInst *li);

/// Return true if all of load insts destroy_value users are within the
/// guaranteed lifetime of the storage that is being loaded from.
bool isLoadGuaranteedByStorage(LoadInst *li);
bool isWrittenTo(LoadInst *li);

bool processWorklist();

Expand Down Expand Up @@ -716,7 +714,7 @@ class StorageGuaranteesLoadVisitor
};
} // namespace

bool SemanticARCOptVisitor::isLoadGuaranteedByStorage(LoadInst *load) {
bool SemanticARCOptVisitor::isWrittenTo(LoadInst *load) {
StorageGuaranteesLoadVisitor visitor(*this, load);
return visitor.doIt();
}
Expand All @@ -738,10 +736,9 @@ bool SemanticARCOptVisitor::visitLoadInst(LoadInst *li) {
if (!isDeadLiveRange(li, destroyValues))
return false;

// Then check if our address is guaranteed to never be written to within the
// lifetime of our loaded value. If so, we can convert the loaded value to be
// at +0 instead of +1.
if (isLoadGuaranteedByStorage(li))
// Then check if our address is ever written to. If it is, then we
// can not use the load_borrow.
if (isWrittenTo(li))
return false;

// Ok, we can perform our optimization. Convert the load [copy] into a
Expand Down