diff options
Diffstat (limited to 'source/slang/slang-check-conversion.cpp')
| -rw-r--r-- | source/slang/slang-check-conversion.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/slang/slang-check-conversion.cpp b/source/slang/slang-check-conversion.cpp index 506abc1be..6456dbe98 100644 --- a/source/slang/slang-check-conversion.cpp +++ b/source/slang/slang-check-conversion.cpp @@ -419,6 +419,9 @@ bool SemanticsVisitor::createInvokeExprForSynthesizedCtor( if (!structDecl) return false; + if (!structDecl->checkState.isBeingChecked()) + ensureDecl(structDecl, DeclCheckState::AttributesChecked); + HashSet<Type*> isVisit; bool isCStyle = false; if (!_getSynthesizedConstructor( @@ -656,8 +659,8 @@ bool SemanticsVisitor::_readAggregateValueFromInitializerList( auto toMakeArrayFromElementExpr = m_astBuilder->create<MakeArrayFromElementExpr>(); toMakeArrayFromElementExpr->loc = fromInitializerListExpr->loc; toMakeArrayFromElementExpr->type = QualType(toType); - - *outToExpr = toMakeArrayFromElementExpr; + if (outToExpr) + *outToExpr = toMakeArrayFromElementExpr; return true; } for (UInt ee = 0; ee < elementCount; ++ee) @@ -748,8 +751,8 @@ bool SemanticsVisitor::_readAggregateValueFromInitializerList( auto defaultConstructExpr = m_astBuilder->create<DefaultConstructExpr>(); defaultConstructExpr->loc = fromInitializerListExpr->loc; defaultConstructExpr->type = QualType(toType); - - *outToExpr = defaultConstructExpr; + if (outToExpr) + *outToExpr = defaultConstructExpr; return true; } |