Skip to content
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

Fix call resolution search order for forwarded proc as method #26650

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Fix call resolution search order for forwarded proc as method #26650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27f942
Test forwarded method candidates are treated as last resort
riftEmber Feb 5, 2025
f2111bd
Fix recursion in resolving forwarded proc as method
riftEmber Feb 4, 2025
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
3 changes: 2 additions & 1 deletion frontend/include/chpl/resolution/resolution-queries.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,8 @@ CallResolutionResult resolveCall(ResolutionContext* rc,
const uast::Call* call,
const CallInfo& ci,
const CallScopeInfo& inScopes,
std::vector<ApplicabilityResult>* rejected=nullptr);
std::vector<ApplicabilityResult>* rejected=nullptr,
bool skipForwarding = false);

/**
Similar to resolveCall, but handles the implicit scope provided by a method.
Expand Down
28 changes: 18 additions & 10 deletions frontend/lib/resolution/resolution-queries.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4872,7 +4872,8 @@ gatherAndFilterCandidates(ResolutionContext* rc,
const CallScopeInfo& inScopes,
size_t& firstPoiCandidate,
bool& outRejectedPossibleIteratorCandidates,
std::vector<ApplicabilityResult>* rejected) {
std::vector<ApplicabilityResult>* rejected,
bool skipForwarding = false) {
Context* context = rc->context();
CandidatesAndForwardingInfo candidates;
LastResortCandidateGroups lrcGroups;
Expand Down Expand Up @@ -4912,7 +4913,8 @@ gatherAndFilterCandidates(ResolutionContext* rc,
}

// If no candidates were found and it's a method, try forwarding
if (candidates.empty() && ci.isMethodCall() && ci.numActuals() >= 1) {
if (candidates.empty() && ci.isMethodCall() && ci.numActuals() >= 1 &&
!skipForwarding) {
const Type* receiverType = ci.actual(0).type().type();

// TODO: Should this information come as a boolean argument set by the
Expand Down Expand Up @@ -5021,14 +5023,16 @@ resolveFnCallFilterAndFindMostSpecific(ResolutionContext* rc,
const CallScopeInfo& inScopes,
PoiInfo& poiInfo,
bool& outRejectedPossibleIteratorCandidates,
std::vector<ApplicabilityResult>* rejected) {
std::vector<ApplicabilityResult>* rejected,
bool skipForwarding = false) {
// search for candidates at each POI until we have found candidate(s)
size_t firstPoiCandidate = 0;
auto candidates = gatherAndFilterCandidates(rc, astContext, call, ci,
inScopes,
firstPoiCandidate,
outRejectedPossibleIteratorCandidates,
rejected);
rejected,
skipForwarding);
// * find most specific candidates / disambiguate
// * check signatures
// * gather POI info
Expand Down Expand Up @@ -5165,7 +5169,8 @@ resolveFnCall(ResolutionContext* rc,
const Call* call,
const CallInfo& ci,
const CallScopeInfo& inScopes,
std::vector<ApplicabilityResult>* rejected) {
std::vector<ApplicabilityResult>* rejected,
bool skipForwarding = false) {
Context* context = rc->context();
PoiInfo poiInfo;
MostSpecificCandidates mostSpecific;
Expand All @@ -5191,7 +5196,8 @@ resolveFnCall(ResolutionContext* rc,
inScopes,
poiInfo,
rejectedPossibleIteratorCandidates,
rejected);
rejected,
skipForwarding);
}

// fully resolve each candidate function and gather poiScopesUsed.
Expand Down Expand Up @@ -5356,7 +5362,8 @@ CallResolutionResult resolveCall(ResolutionContext* rc,
const Call* call,
const CallInfo& ci,
const CallScopeInfo& inScopes,
std::vector<ApplicabilityResult>* rejected) {
std::vector<ApplicabilityResult>* rejected,
bool skipForwarding) {
Context* context = rc->context();
if (call->isFnCall() || call->isOpCall()) {
// see if the call is handled directly by the compiler
Expand All @@ -5374,7 +5381,7 @@ CallResolutionResult resolveCall(ResolutionContext* rc,
}

// otherwise do regular call resolution
return resolveFnCall(rc, call, call, ci, inScopes, rejected);
return resolveFnCall(rc, call, call, ci, inScopes, rejected, skipForwarding);
} else if (auto prim = call->toPrimCall()) {
return resolvePrimCall(rc, prim, ci, inScopes.callScope(), inScopes.poiScope());
} else if (auto tuple = call->toTuple()) {
Expand Down Expand Up @@ -5409,13 +5416,14 @@ resolveCallInMethod(ResolutionContext* rc,
CallResolutionResult asMethod;
if (shouldAttemptImplicitReceiver(ci, implicitReceiver)) {
auto methodCi = CallInfo::createWithReceiver(ci, implicitReceiver);
asMethod = resolveCall(rc, call, methodCi, inScopes, rejected);
bool skipForwarding = asFunction.mostSpecific().foundCandidates();
asMethod = resolveCall(rc, call, methodCi, inScopes, rejected, skipForwarding);
}
if (asMethod.mostSpecific().foundCandidates() && asFunction.mostSpecific().foundCandidates()) {
ID methodId = asMethod.mostSpecific().only().fn()->id();
ID functionId = asFunction.mostSpecific().only().fn()->id();
CHPL_REPORT(rc->context(), AmbiguousCall, call, methodId, functionId);
}
}
if (asMethod.mostSpecific().foundCandidates()) {
return asMethod;
} else {
Expand Down
36 changes: 36 additions & 0 deletions frontend/test/resolution/testForwarding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,41 @@ static void test8() {
assert(guard.realizeErrors() == 0);
}

// Ensure we don't search for forwarded candidates after finding non-forwarded
// ones, even if the forwarded candidates are methods.
static void test9() {
printf("test9\n");

auto context = buildStdContext();
ErrorGuard guard(context);

const char* contents =
R""""(
module M {
class Bar {
proc getVal() : real do return 4;
}

proc getVal() : int do return 3;

class Foo {
var b : owned Bar = new Bar();
forwarding b;

proc doSomething() do return getVal();
}

var f : Foo = new Foo();
var x = f.doSomething();
}
)"""";

auto qt = resolveQualifiedTypeOfX(context, contents);
assert(qt.type()->isIntType());

assert(guard.realizeErrors() == 0);
}


int main() {
test1();
Expand All @@ -525,6 +560,7 @@ int main() {
// TODO: forwarding with only, except

test8();
test9();

return 0;
}
Expand Down