summaryrefslogtreecommitdiff
path: root/source/slang/slang-check-overload.cpp
diff options
context:
space:
mode:
authorkaizhangNV <149626564+kaizhangNV@users.noreply.github.com>2024-04-23 18:39:15 -0700
committerGitHub <noreply@github.com>2024-04-23 18:39:15 -0700
commitc6b9a91253bce6d450efc281b3f86617b3eef633 (patch)
tree4cfaaf2f298611495601b6287ef2d143420cbcc6 /source/slang/slang-check-overload.cpp
parentf1de1817ca10e34ec6a844100f10f0de3340c9f2 (diff)
Do not diagnose error when a symbols is defined as 'extern' and 'export' (#4010)
Fix the issue (#3999). For a function is defined as extern and export at the same time, don't report error, we can use the 'export' function to overload the 'extern' function.
Diffstat (limited to 'source/slang/slang-check-overload.cpp')
-rw-r--r--source/slang/slang-check-overload.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index 7a38b08c0..6180ccda8 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -1141,6 +1141,15 @@ namespace Slang
return 0;
}
+ int getExportRank(DeclRef<Decl> left, DeclRef<Decl> right)
+ {
+ if (left.getDecl() && left.getDecl()->hasModifier<ExternModifier>())
+ {
+ return (right.getDecl() && right.getDecl()->hasModifier<HLSLExportModifier>()) ? -1 : 0;
+ }
+ return 0;
+ }
+
int SemanticsVisitor::CompareOverloadCandidates(
OverloadCandidate* left,
OverloadCandidate* right)
@@ -1214,6 +1223,11 @@ namespace Slang
if(specificityDiff)
return specificityDiff;
+ // `export` function is more flavored than `extern` function. But other modifiers are not considered.
+ auto externExportDiff = getExportRank(left->item.declRef, right->item.declRef);
+ if (externExportDiff)
+ return externExportDiff;
+
// If we reach here, we will attempt to use overload rank to break the ties.
auto overloadRankDiff = getOverloadRank(right->item.declRef) - getOverloadRank(left->item.declRef);
if (overloadRankDiff)