averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sema: Feed argument label and constraint locator info from key path subscript components into getCalleeDeclAndArgs.

Browse Source 
Fixes SR-5189 | rdar://problem/32713662.
This commit is contained in:
Joe Groff
2017-07-10 14:55:08 -07:00
parent d84e4b4de1
commit 6ad01d63f6
8 changed files with 107 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/Sema/CSSimplify.cpp
View File

@@ -520,27 +520,55 @@ getCalleeDeclAndArgs(ConstraintSystem &cs,
if (!path.empty() &&
!(path.size() == 1 &&
(path.back().getKind() == ConstraintLocator::ApplyArgument ||
path.back().getKind() == ConstraintLocator::SubscriptIndex)))
path.back().getKind() == ConstraintLocator::SubscriptIndex ||
path.back().getKind() == ConstraintLocator::KeyPathComponent)))
return std::make_tuple(nullptr, 0, argLabels, hasTrailingClosure);
// Dig out the callee.
Expr *calleeExpr;
ConstraintLocator *targetLocator;
if (auto call = dyn_cast<CallExpr>(callExpr)) {
calleeExpr = call->getDirectCallee();
targetLocator = cs.getConstraintLocator(call->getDirectCallee());
argLabels = call->getArgumentLabels();
hasTrailingClosure = call->hasTrailingClosure();
} else if (auto unresolved = dyn_cast<UnresolvedMemberExpr>(callExpr)) {
calleeExpr = callExpr;
targetLocator = cs.getConstraintLocator(callExpr);
argLabels = unresolved->getArgumentLabels();
hasTrailingClosure = unresolved->hasTrailingClosure();
} else if (auto subscript = dyn_cast<SubscriptExpr>(callExpr)) {
calleeExpr = callExpr;
targetLocator = cs.getConstraintLocator(callExpr);
argLabels = subscript->getArgumentLabels();
hasTrailingClosure = subscript->hasTrailingClosure();
} else if (auto dynSubscript = dyn_cast<DynamicSubscriptExpr>(callExpr)) {
calleeExpr = callExpr;
targetLocator = cs.getConstraintLocator(callExpr);
argLabels = dynSubscript->getArgumentLabels();
hasTrailingClosure = dynSubscript->hasTrailingClosure();
} else if (auto keyPath = dyn_cast<KeyPathExpr>(callExpr)) {
if (path.empty()
|| path.back().getKind() != ConstraintLocator::KeyPathComponent)
return std::make_tuple(nullptr, 0, argLabels, hasTrailingClosure);
auto componentIndex = path.back().getValue();
if (componentIndex >= keyPath->getComponents().size())
return std::make_tuple(nullptr, 0, argLabels, hasTrailingClosure);
auto &component = keyPath->getComponents()[componentIndex];
switch (component.getKind()) {
case KeyPathExpr::Component::Kind::Subscript:
case KeyPathExpr::Component::Kind::UnresolvedSubscript:
targetLocator = cs.getConstraintLocator(keyPath, path.back());
argLabels = component.getSubscriptLabels();
hasTrailingClosure = false; // key paths don't support trailing closures
break;
case KeyPathExpr::Component::Kind::Invalid:
case KeyPathExpr::Component::Kind::UnresolvedProperty:
case KeyPathExpr::Component::Kind::Property:
case KeyPathExpr::Component::Kind::OptionalForce:
case KeyPathExpr::Component::Kind::OptionalChain:
case KeyPathExpr::Component::Kind::OptionalWrap:
return std::make_tuple(nullptr, 0, argLabels, hasTrailingClosure);
}
} else {
if (auto apply = dyn_cast<ApplyExpr>(callExpr)) {
argLabels = apply->getArgumentLabels(argLabelsScratch);
@@ -552,11 +580,6 @@ getCalleeDeclAndArgs(ConstraintSystem &cs,
return std::make_tuple(nullptr, 0, argLabels, hasTrailingClosure);
}
// Determine the target locator.
// FIXME: Check whether the callee is of an expression kind that
// could describe a declaration. This is an optimization.
ConstraintLocator *targetLocator = cs.getConstraintLocator(calleeExpr);
// Find the overload choice corresponding to the callee locator.
// FIXME: This linearly walks the list of resolved overloads, which is
// potentially very expensive.