summaryrefslogtreecommitdiff
path: root/source/slang/slang-check-overload.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang/slang-check-overload.cpp')
-rw-r--r--source/slang/slang-check-overload.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index b944d2bf4..b75f95f9a 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -1675,6 +1675,15 @@ int SemanticsVisitor::CompareOverloadCandidates(OverloadCandidate* left, Overloa
if (itemDiff)
return itemDiff;
+ // If one candidate is an implicit conversion, and other candidate is not,
+ // then we should prefer the implicit conversion.
+ int leftIsImplicitConversion =
+ left->item.declRef.getDecl()->findModifier<ImplicitConversionModifier>() ? 1 : 0;
+ int rightIsImplicitConversion =
+ right->item.declRef.getDecl()->findModifier<ImplicitConversionModifier>() ? 1 : 0;
+ if (leftIsImplicitConversion != rightIsImplicitConversion)
+ return rightIsImplicitConversion - leftIsImplicitConversion;
+
auto specificityDiff = compareOverloadCandidateSpecificity(left->item, right->item);
if (specificityDiff)
return specificityDiff;