From 109ee8aae399042fba6ea71e43e5ee2d441288dd Mon Sep 17 00:00:00 2001 From: Yong He Date: Fri, 24 Nov 2017 11:55:54 -0500 Subject: Fix substitution mechanism to remove special cases for global params (#297) Add a new function: `substituteSubstitutions(Substitutions * substHead, Substitutions subst, int * ioDiff)` This function substitutes the type arguments referenced in a linked list of substitutions headed at `substHead` using the substitutions specified by `subst`. If the linked list `substHead` does not contain `GlobalGenericParamSubstitution` entries, they will be added to the bottom (outter most) of the linked list. Note that this function should be called when `substHead` is known to be the head of substitution linked list because the existance of `GlobalGenericPaaramSubstitution` is detected assuming the linked lists starts at `substHead`. If a substitution that is not the head of a substitution linked list is passed in, duplicate `GlobalGenericParamSubstitution`s could be appended to the linked list. This means that this function should *not* be called in places like `GenericSubstitution::SubstitutionImpl()` for its outer substitutions, because `outer` is obviously not the head of the linked list. Instead, use this function to substitution the substitution lists of `DeclRef` etc. instead of calling `declRef.substitutions->SubstituteImpl()` where the head to the linked list is known as a member of that class. With this function, IRSpecContext::maybeCloneType() is simplified down to `originalType->Substitute(subst)` Updates `DeclRefBase::SubstituteImpl` and `DeclRefType::SubstituteImpl` to call `substituteSubstitutions` instead of making direct `substitutions->SubstituteImpl` call. Providing actual implementation of `GlobalGenericParamSubstitution::SubstituteImpl` instead of just returning `this` to deal with potential situations where a true substitution is needed. --- source/slang/syntax.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'source/slang/syntax.h') diff --git a/source/slang/syntax.h b/source/slang/syntax.h index f3690d9ae..e6a010a4a 100644 --- a/source/slang/syntax.h +++ b/source/slang/syntax.h @@ -1162,6 +1162,23 @@ namespace Slang void removeSubstitution(DeclRefBase & declRef, RefPtr subst); bool hasGenericSubstitutions(RefPtr subst); RefPtr getGenericSubstitution(RefPtr subst); + + // This function substitutes the type arguments referenced in a linked list of substitutions + // which head is at `substHead` using the substitutions specified by `subst`. If the linked + // list `substHead` does not contain `GlobalGenericParamSubstitution` entries, they will be + // added to the bottom(outter most) of the linked list. + // Note that this function should be called when `substHead` is known to be the head of + // substitution linked list because the existance of `GlobalGenericPaaramSubstitution` is + // detected assuming the linked lists starts at `substHead`. If a substitution that is not + // the head of a substitution linked list is passed in, duplicate + // `GlobalGenericParamSubstitution`s could be appended to the linked list. + // This means that this function should * not* be called in places like + // `GenericSubstitution::SubstitutionImpl()` for its outer substitutions, because `outer` is + // obviously not the head of the linked list. Instead, use this function to substitution the + // substitution lists of `DeclRef` etc. to replace the call of + // `declRef.substitutions->SubstituteImpl()`, because the head to the linked list is known as a + // member of that class there. + RefPtr substituteSubstitutions(RefPtr oldSubst, Substitutions * subst, int * ioDiff); } // namespace Slang #endif \ No newline at end of file -- cgit v1.2.3