summaryrefslogtreecommitdiff
path: root/source/slang/slang-check-overload.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2020-07-24 18:12:41 -0700
committerGitHub <noreply@github.com>2020-07-24 18:12:41 -0700
commit87940a649e3b4f757905015de95225d57ec2f27c (patch)
tree189ec1c515bd1180822e8887817c0f235a51c617 /source/slang/slang-check-overload.cpp
parent261fe7587d7413070a4e0f29e1a1bb7b0d2b5429 (diff)
Fix bugs related to mutating implementations of interface methods (#1461)
There are two main bug fixes here: * We were failing to diagnose when code calls a `[mutating]` method on a value that doesn't support mutation (that is an r-value instead of an l-value). * We had a bug in the synthesis logic for interface requirements where we used the *result* type of the requirement in place of each of the *parameter* types. The second bug made synthesis often produce incorrect signatures with `void` parameters. The first bug meant that even though a `[mutating]` method should not be able to satisfy a non-`[mutating]` method (and we had code to enforce this for the "exact match" case), when we go on to try and synthesize a non-`[mutating]` method that satisfies the requirement by delegating to the user-written one, it would end up succeeding, because nothing was stopping a non-`[mutating]` method from calling a `[mutating]` one. In each case this code adds a fix and a test case to confirm it.
Diffstat (limited to 'source/slang/slang-check-overload.cpp')
-rw-r--r--source/slang/slang-check-overload.cpp49
1 files changed, 46 insertions, 3 deletions
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index 69baf9f75..0a1294965 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -358,11 +358,54 @@ namespace Slang
return true;
}
+ bool isEffectivelyMutating(CallableDecl* decl)
+ {
+ if(decl->hasModifier<MutatingAttribute>())
+ return true;
+
+ if(decl->hasModifier<NonmutatingAttribute>())
+ return false;
+
+ if(as<SetterDecl>(decl))
+ return true;
+
+ return false;
+ }
+
bool SemanticsVisitor::TryCheckOverloadCandidateDirections(
- OverloadResolveContext& /*context*/,
- OverloadCandidate const& /*candidate*/)
+ OverloadResolveContext& context,
+ OverloadCandidate const& candidate)
{
- // TODO(tfoley): check `in` and `out` markers, as needed.
+ if(candidate.flavor != OverloadCandidate::Flavor::Func)
+ return true;
+
+ auto funcDeclRef = candidate.item.declRef.as<CallableDecl>();
+ SLANG_ASSERT(funcDeclRef);
+
+ // Note: This operation was originally introduced as
+ // a place to add checking around l-value-ness of arguments
+ // and parameters, but currently that checking is being
+ // done in other places.
+ //
+ // For now we will only use this step to check the
+ // mutability of the `this` parameter where necessary.
+ //
+ if(!isEffectivelyStatic(funcDeclRef.getDecl()))
+ {
+ if(isEffectivelyMutating(funcDeclRef.getDecl()))
+ {
+ if(context.baseExpr && !context.baseExpr->type.isLeftValue)
+ {
+ if(context.mode == OverloadResolveContext::Mode::ForReal)
+ {
+ getSink()->diagnose(context.loc, Diagnostics::mutatingMethodOnImmutableValue, funcDeclRef.getName());
+ maybeDiagnoseThisNotLValue(context.baseExpr);
+ }
+ return false;
+ }
+ }
+ }
+
return true;
}