diff options
| author | Yong He <yonghe@outlook.com> | 2017-12-28 07:18:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 07:18:27 -0500 |
| commit | bcfe8366d2f094bfabccc0014c7248bc46dbf514 (patch) | |
| tree | 73ea3653ef9b9c98b1bc286e904d037c77d63074 /source/slang | |
| parent | 7e340c29dfc0ca2f9ebb0189b698a9987da9c50c (diff) | |
| parent | d46aeb030fa76854d2e7e64a25849b887defe4da (diff) | |
Merge pull request #340 from csyonghe/struct-in-generic
Fix NameExprType returning deleted canonical type when it's in a generic parent
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/syntax-base-defs.h | 1 | ||||
| -rw-r--r-- | source/slang/syntax.cpp | 6 | ||||
| -rw-r--r-- | source/slang/type-defs.h | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/source/slang/syntax-base-defs.h b/source/slang/syntax-base-defs.h index fdb2694a9..1853125a8 100644 --- a/source/slang/syntax-base-defs.h +++ b/source/slang/syntax-base-defs.h @@ -121,6 +121,7 @@ protected: virtual Type* CreateCanonicalType() = 0; Type* canonicalType = nullptr; + RefPtr<Type> canonicalTypeRefPtr; Session* session = nullptr; ) diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp index 9ca2dc827..ca66e2110 100644 --- a/source/slang/syntax.cpp +++ b/source/slang/syntax.cpp @@ -189,6 +189,8 @@ void Type::accept(IValVisitor* visitor, void* extra) { // TODO(tfoley): worry about thread safety here? et->canonicalType = et->CreateCanonicalType(); + if (dynamic_cast<Type*>(et->canonicalType) != this) + et->canonicalTypeRefPtr = et->canonicalType; SLANG_ASSERT(et->canonicalType); } return et->canonicalType; @@ -861,7 +863,9 @@ void Type::accept(IValVisitor* visitor, void* extra) Type* NamedExpressionType::CreateCanonicalType() { - return GetType(declRef)->GetCanonicalType(); + if (!innerType) + innerType = GetType(declRef); + return innerType->GetCanonicalType(); } int NamedExpressionType::GetHashCode() diff --git a/source/slang/type-defs.h b/source/slang/type-defs.h index d0b2ebac1..e7310768a 100644 --- a/source/slang/type-defs.h +++ b/source/slang/type-defs.h @@ -420,9 +420,10 @@ END_SYNTAX_CLASS() // A type alias of some kind (e.g., via `typedef`) SYNTAX_CLASS(NamedExpressionType, Type) - DECL_FIELD(DeclRef<TypeDefDecl>, declRef) +DECL_FIELD(DeclRef<TypeDefDecl>, declRef) RAW( + RefPtr<Type> innerType; NamedExpressionType() {} NamedExpressionType( |