diff options
| author | Yong He <yonghe@outlook.com> | 2024-08-28 22:32:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-28 22:32:04 -0700 |
| commit | 6e32976de513d4e039c5a2b492cb8ea78f43c321 (patch) | |
| tree | b2e0e588d42561d1a0a2a4bebecb68e7f9b3f5a0 /source | |
| parent | b85792f0f0525fe29e1ab38877a2abf412b4415c (diff) | |
Fix partial inference of variadic generic functions. (#4956)
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/core.meta.slang | 4 | ||||
| -rw-r--r-- | source/slang/slang-check-overload.cpp | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang index 919c21473..67fb201fe 100644 --- a/source/slang/core.meta.slang +++ b/source/slang/core.meta.slang @@ -156,6 +156,8 @@ interface IInteger : IArithmetic, ILogical int64_t toInt64(); uint toUInt(); uint64_t toUInt64(); + __init(int val); + __init(int64_t val); } interface IFloat : IArithmetic, IDifferentiable @@ -220,7 +222,7 @@ interface __BuiltinSignedArithmeticType : __BuiltinArithmeticType {} /// A type that can represent integers [sealed] [builtin] -interface __BuiltinIntegerType : __BuiltinArithmeticType +interface __BuiltinIntegerType : __BuiltinArithmeticType, IInteger {} /// A type that can represent non-integers diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp index 743d518af..6d376dba3 100644 --- a/source/slang/slang-check-overload.cpp +++ b/source/slang/slang-check-overload.cpp @@ -466,8 +466,22 @@ namespace Slang Val* val = nullptr; if (aa >= matchedArgs.getCount()) { - // If we run out of matched args, we will just create an empty pack. - val = m_astBuilder->getTypePack(ArrayView<Type*>()); + if (allowPartialGenericApp) + { + // If we have run out of arguments and the decl allows + // partial specialization, then we don't apply any more + // checks at this step. We will instead attempt to + // *infer* an argument at this position at a later + // stage. + // + candidate.flags |= OverloadCandidate::Flag::IsPartiallyAppliedGeneric; + break; + } + else + { + // Otherwise, we will just create an empty pack. + val = m_astBuilder->getTypePack(ArrayView<Type*>()); + } } else { |