diff options
| author | Yong He <yonghe@outlook.com> | 2017-11-07 19:09:40 -0500 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-11-07 16:09:40 -0800 |
| commit | 6e591ada0eb652c320bba4bd8a46cd579946df01 (patch) | |
| tree | 768229fb26204b6b0a89201d9b14c32e9203c098 /source/slang/syntax.cpp | |
| parent | 939688e963fde7a0485f210ef2674c27692021a4 (diff) | |
Support generic interface methods (#251)
* improve diagnostic messages and prevent fatal errors from crashing the compiler.
* fix top level exception catching.
* spelling fix
* change wording of invalidSwizzleExpr diagnostic
* add speculative GenericsApp expr parsing
* add new test case of cascading generics call.
* Fixing bugs in compiling cascaded generic function calls.
Add implementation of DeclaredSubTypeWitness::SubstituteImpl()
This is not needed by the type checker, but needed by IR specialization. When input source contains cascading generic function call, the arguments to `specialize` instruction is currently represented as a substitution. The arg values of this subsittution can be a `DeclaredSubTypeWitness` when a generic function uses one of its generic parameter to specialize another generic function. When the top level generics function is being specialized, this substitution argument, which is a `DeclaredSubTypeWitness`, needs to be substituted with the witness that used to specialize the top level function in the specialized specialize instruction as well.
* add a test case for cascading generic function call.
* parser bug fix
* fixes #255
* add test case for issue #255
* Generate missing `specialize` instruction when calling a generic method from an interface constraint.
When calling a generic method via an interface, we should be generating the following ir:
...
f = lookup_interface_method(...)
f_s = specailize(f, declRef)
...
This commit fixes this `emitFuncRef` function to emit the needed `specialize` instruction.
* fixes #260
This fix follows the second apporach in the disucssion. It generated mangled name for specialized functions by appending new substitution type names to the original mangled name.
* Disabling removing and re-inserting specailized functions in getSpecalizeFunc()
I am not sure why it is needed, it seems HLSL and GLSL backends are generating forward declarations anyways, so the order of functions in IRModule shouldn't matter.
* cleanup and complete test cases.
* fix warnings
Diffstat (limited to 'source/slang/syntax.cpp')
| -rw-r--r-- | source/slang/syntax.cpp | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp index 9025c545a..4e1778e6e 100644 --- a/source/slang/syntax.cpp +++ b/source/slang/syntax.cpp @@ -1527,6 +1527,61 @@ void Type::accept(IValVisitor* visitor, void* extra) && declRef.Equals(otherWitness->declRef); } + RefPtr<Val> DeclaredSubtypeWitness::SubstituteImpl(Substitutions* subst, int * ioDiff) + { + DeclRef<GenericTypeParamDecl> genParamDeclRef; + if (auto subDeclRefType = this->sub.As<DeclRefType>()) + { + genParamDeclRef = subDeclRefType->declRef.As<GenericTypeParamDecl>(); + } + if (!genParamDeclRef) + return this; + auto genParamDecl = genParamDeclRef.getDecl(); + // search for a substitution that might apply to us + for (auto s = subst; s; s = s->outer.Ptr()) + { + if (auto genericSubst = dynamic_cast<GenericSubstitution*>(s)) + { + // the generic decl associated with the substitution list must be + // the generic decl that declared this parameter + auto genericDecl = genericSubst->genericDecl; + if (genericDecl != genParamDecl->ParentDecl) + continue; + bool found = false; + int index = 0; + for (auto m : genericDecl->Members) + { + if (m.Ptr() == genParamDecl) + { + // We've found it, so return the corresponding specialization argument + (*ioDiff)++; + found = true; + break; + } + else if (auto typeParam = m.As<GenericTypeParamDecl>()) + { + index++; + } + else if (auto valParam = m.As<GenericValueParamDecl>()) + { + index++; + } + else + { + } + } + if (found) + { + auto ordinaryParamCount = genericDecl->getMembersOfType<GenericTypeParamDecl>().Count() + + genericDecl->getMembersOfType<GenericValueParamDecl>().Count(); + SLANG_ASSERT(ordinaryParamCount + index < genericSubst->args.Count()); + return genericSubst->args[ordinaryParamCount + index]; + } + } + } + return this; + } + String DeclaredSubtypeWitness::ToString() { StringBuilder sb; @@ -1655,4 +1710,16 @@ void Type::accept(IValVisitor* visitor, void* extra) return false; } + RefPtr<GenericSubstitution> getGenericSubstitution(RefPtr<Substitutions> subst) + { + auto p = subst.Ptr(); + while (p) + { + if (auto genSubst = dynamic_cast<GenericSubstitution*>(p)) + return genSubst; + p = p->outer.Ptr(); + } + return nullptr; + } + } |
