diff options
| author | Yong He <yonghe@outlook.com> | 2022-10-04 15:21:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 15:21:17 -0700 |
| commit | 364e43264b9f69957ddaed8890392d82fb25c822 (patch) | |
| tree | aa4d9b6a90ddf398c12f7cce6499e3946d8ffeb1 /source/slang | |
| parent | 8b1daa68a5ff1398cdf130aacad32d2e5646d1eb (diff) | |
Fix `ApplyExtensionToType` on own type being extended. (#2430)
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/slang-check-decl.cpp | 10 | ||||
| -rw-r--r-- | source/slang/slang.natvis | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index a7cd768b1..b18e1c4da 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -5226,9 +5226,17 @@ namespace Slang constraints.loc = extDecl->loc; constraints.genericDecl = extGenericDecl; + // Inside the body of an extension declaration, we may end up trying to apply that + // extension to its own target type. + // If we see that we are in that case, we can apply the extension declaration as - is, + // without any additional substitutions. + if (extDecl->targetType->equals(type)) + { + return extDeclRef; + } + if (!TryUnifyTypes(constraints, extDecl->targetType.Ptr(), type)) return DeclRef<ExtensionDecl>(); - auto constraintSubst = trySolveConstraintSystem(&constraints, DeclRef<Decl>(extGenericDecl, nullptr).as<GenericDecl>()); if (!constraintSubst) { diff --git a/source/slang/slang.natvis b/source/slang/slang.natvis index 6c8f15ec9..ee868be62 100644 --- a/source/slang/slang.natvis +++ b/source/slang/slang.natvis @@ -282,6 +282,8 @@ <DisplayString Condition="nameAndLoc.name!=0">{nameAndLoc.name->text}: {astNodeType}</DisplayString> <DisplayString Condition="nameAndLoc.name==0">{astNodeType}</DisplayString> <Expand> + <Item Name="[Name]" Condition="nameAndLoc.name!=0">nameAndLoc.name->text</Item> + <Item Name="[Parent]">parentDecl</Item> <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::ContainerDecl">(Slang::ContainerDecl*)&astNodeType</ExpandedItem> <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::ExtensionDecl">(Slang::ExtensionDecl*)&astNodeType</ExpandedItem> <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::StructDecl">(Slang::StructDecl*)&astNodeType</ExpandedItem> @@ -322,6 +324,7 @@ <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::EmptyDecl">(Slang::EmptyDecl*)&astNodeType</ExpandedItem> <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::SyntaxDecl">(Slang::SyntaxDecl*)&astNodeType</ExpandedItem> <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::DeclGroup">(Slang::DeclGroup*)&astNodeType</ExpandedItem> + <Item Name="Decl">(Slang::DeclBase*)this,nd</Item> </Expand> </Type> @@ -369,7 +372,7 @@ <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::EmptyDecl">(Slang::EmptyDecl*)&astNodeType</ExpandedItem> <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::SyntaxDecl">(Slang::SyntaxDecl*)&astNodeType</ExpandedItem> <ExpandedItem Condition="astNodeType == Slang::ASTNodeType::DeclGroup">(Slang::DeclGroup*)&astNodeType</ExpandedItem> - <Item Name="Decl">(Slang::DeclBase*)this,nd</Item> + <Item Name="Decl">(Slang::Decl*)this,nd</Item> </Expand> </Type> @@ -473,8 +476,6 @@ <Type Name="Slang::AggTypeDecl"> <DisplayString>{nameAndLoc.name}: {astNodeType}</DisplayString> <Expand> - <Item Name="[Name]">nameAndLoc.name</Item> - <Item Name="[Parent]">parentDecl</Item> <Item Name="[Members]">members</Item> </Expand> </Type> |