Skip to content

MemAccessUtils: change the interface of getProjectionPath to Optional value #18926

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 23, 2018
Merged

MemAccessUtils: change the interface of getProjectionPath to Optional value #18926

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
11 changes: 7 additions & 4 deletions include/swift/SIL/MemAccessUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ class ObjectProjection {

const Projection &getProjection() const { return proj; }

const ProjectionPath getProjectionPath() const {
const Optional<ProjectionPath> getProjectionPath() const {
return ProjectionPath::getProjectionPath(stripBorrow(REA->getOperand()),
REA)
.getValue();
REA);
}

bool operator==(const ObjectProjection &other) const {
Expand Down Expand Up @@ -284,7 +283,11 @@ class AccessedStorage {
}
auto projPath = getObjectProjection().getProjectionPath();
auto otherProjPath = other.getObjectProjection().getProjectionPath();
return projPath.hasNonEmptySymmetricDifference(otherProjPath);
if (!projPath.hasValue() || !otherProjPath.hasValue()) {
return false;
}
return projPath.getValue().hasNonEmptySymmetricDifference(
otherProjPath.getValue());
}

/// Returns the ValueDecl for the underlying storage, if it can be
Expand Down