Skip to content

Return expression types from the constraint system type map. #6220

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
Dec 12, 2016
Merged

Return expression types from the constraint system type map. #6220

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
14 changes: 4 additions & 10 deletions lib/Sema/ConstraintSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,16 +1287,10 @@ class ConstraintSystem {

/// Get the type for an expression.
Type getType(Expr *E) {
// FIXME: Ideally this would be enabled but there are currently
// cases where we ask for types that are not set.

// assert(ExprTypes.find(E) != ExprTypes.end() &&
// "Expected type to have been set!");

// FIXME: Temporary until all references to expression types are
// updated.
// return ExprTypes[E];
return E->getType();
assert(hasType(E) && "Expected type to have been set!");
assert(ExprTypes[E]->isEqual(E->getType()) &&
"Expected type in map to be the same type in expression!");
return ExprTypes[E];
}

/// Cache the type of the expression argument and return that same
Expand Down