diff options
Diffstat (limited to 'source/slang/slang-check-decl.cpp')
| -rw-r--r-- | source/slang/slang-check-decl.cpp | 186 |
1 files changed, 0 insertions, 186 deletions
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index f60fbcc2c..7140d541a 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -903,14 +903,6 @@ namespace Slang // If `decl` is a container, then we want to ensure its children. if(auto containerDecl = as<ContainerDecl>(decl)) { - bool trackDiffTypes = (as<GenericDecl>(decl) != nullptr); - if (trackDiffTypes) - { - // Add a context to track differentiable types. - DifferentiableTypeSemanticContext subDiffTypeContext; - visitor->getShared()->pushDiffTypeContext(&subDiffTypeContext); - } - // NOTE! We purposefully do not iterate with the for(auto childDecl : containerDecl->members) here, // because the visitor may add to `members` whilst iteration takes place, invalidating the iterator // and likely a crash. @@ -932,22 +924,6 @@ namespace Slang _ensureAllDeclsRec(visitor, childDecl, state); } - - if (trackDiffTypes) - { - auto subDiffTypeContext = visitor->getShared()->popDiffTypeContext(); - - // If there were any differentiable types used in differentiable - // methods, generate a dictionary with the required info. - // - if (subDiffTypeContext->isDictionaryRequired()) - { - auto diffTypeDict = subDiffTypeContext->makeDifferentiableTypeDictionaryNode(visitor->getASTBuilder()); - diffTypeDict->parentDecl = containerDecl; - containerDecl->members.add(diffTypeDict); - containerDecl->invalidateMemberDictionary(); - } - } } // Note: the "inner" declaration of a `GenericDecl` is currently @@ -1541,49 +1517,6 @@ namespace Slang return false; } - void SemanticsVisitor::tryAddDifferentiableConformanceToContext(Decl* decl, DifferentiableTypeSemanticContext*) - { - // If the autodiff core library (diff.meta.slang) has not been loaded yet, ignore any - // request to check differentiable types. - // - if (!m_astBuilder->isDifferentiableInterfaceAvailable()) - return; - - auto diffInterface = m_astBuilder->getDifferentiableInterface(); - - DeclRefType* type = nullptr; - - if (auto extensionDecl = as<ExtensionDecl>(decl)) - { - // If this is an extension, use the provided target type. - type = as<DeclRefType>(extensionDecl->targetType.type); - } - else - { - // If this is a type declaration, create a decl ref without - // any substitutions. - // - auto declRef = makeDeclRef(decl); - - // TODO: Strip substitutions from the declreftype - type = DeclRefType::create(m_astBuilder, declRef); - } - - // Skip if the declaration is the interface itself. - if (type->declRef == diffInterface) - return; - - // If the DeclRefType conforms to IDifferentiable, register it with the top-level - // context. - // - if (auto witness = as<SubtypeWitness>(tryGetInterfaceConformanceWitness(type, diffInterface))) - { - // TODO: Temporarily disabled to move to new system. Fix later. - // context->registerDifferentiableType(type, witness); - } - - } - void SemanticsDeclHeaderVisitor::visitGenericTypeConstraintDecl(GenericTypeConstraintDecl* decl) { // TODO: are there any other validations we can do at this point? @@ -1637,23 +1570,6 @@ namespace Slang ensureDecl(constraint, DeclCheckState::ReadyForReference); } } - - // TODO(sai): Is this the right checking stage to be doing this? - DifferentiableTypeSemanticContext diffTypeContext; - - for (Index i = 0; i < members.getCount(); ++i) - { - Decl* m = members[i]; - - if (auto typeParam = as<GenericTypeParamDecl>(m)) - { - tryAddDifferentiableConformanceToContext(typeParam, &diffTypeContext); - } - } - - auto diffTypeDictionaryNode = diffTypeContext.makeDifferentiableTypeDictionaryNode(m_astBuilder); - diffTypeDictionaryNode->parentDecl = genericDecl; - genericDecl->members.add(diffTypeDictionaryNode); } void SemanticsDeclBasesVisitor::visitInheritanceDecl(InheritanceDecl* inheritanceDecl) @@ -1689,7 +1605,6 @@ namespace Slang void visitAggTypeDecl(AggTypeDecl* aggTypeDecl) { checkAggTypeConformance(aggTypeDecl); - tryAddDifferentiableConformanceToContext(aggTypeDecl, getShared()->getDiffTypeContext()); } // Conformances can also come via `extension` declarations, and @@ -1698,7 +1613,6 @@ namespace Slang void visitExtensionDecl(ExtensionDecl* extensionDecl) { checkExtensionConformance(extensionDecl); - tryAddDifferentiableConformanceToContext(extensionDecl, getShared()->getDiffTypeContext()); } }; @@ -1855,32 +1769,6 @@ namespace Slang // Furthermore, because a fully checked function will have checked // its body, this also means that all function bodies and the // declarations they contain should be fully checked. - - // Generate a dictionary node to hold information about all - // available differentiable types in scope (including imports and stdlib) - // - if (getShared()->getDiffTypeContext()->isDictionaryRequired()) - finishDifferentiableTypeDictionary(moduleDecl); - } - - void SemanticsVisitor::finishDifferentiableTypeDictionary(ModuleDecl* moduleDecl) - { - // Grab the differentiable type information from imported modules. - for(auto importedModule : getShared()->importedModulesList) - { - this->getShared()->getDiffTypeContext()->addImportedModule(importedModule); - } - - // Grad the differentiable type information from the standard library modules. - for (auto stdLibModule : this->getSession()->stdlibModules) - { - this->getShared()->getDiffTypeContext()->addImportedModule(stdLibModule->getModuleDecl()); - } - - auto diffTypeDictNode = this->getShared()->getDiffTypeContext()->makeDifferentiableTypeDictionaryNode(m_astBuilder); - diffTypeDictNode->parentDecl = moduleDecl; - - moduleDecl->members.add(diffTypeDictNode); } bool SemanticsVisitor::doesSignatureMatchRequirement( @@ -5374,11 +5262,6 @@ namespace Slang void SemanticsDeclHeaderVisitor::checkCallableDeclCommon(CallableDecl* decl) { - if (decl->findModifier<DifferentiableAttribute>()) - { - this->getShared()->getDiffTypeContext()->requireDifferentiableTypeDictionary(); - } - for(auto paramDecl : decl->getParameters()) { ensureDecl(paramDecl, DeclCheckState::ReadyForReference); @@ -6249,75 +6132,6 @@ namespace Slang m_mapTypeDeclToCandidateExtensions.Clear(); } - void DifferentiableTypeSemanticContext::registerDifferentiableType(DeclRefType* type, SubtypeWitness* witness) - { - // Need to generate a type dictionary since we have a declaration that works with - // a differentiable type. - // - this->requireDifferentiableTypeDictionary(); - - m_mapTypeToIDifferentiableWitness.AddIfNotExists(DeclRefTypeKey(type), witness); - } - - List<KeyValuePair<DeclRefType*, SubtypeWitness*>> DifferentiableTypeSemanticContext::getDifferentiableTypeConformanceList() - { - List<KeyValuePair<DeclRefType*, SubtypeWitness*>> diffConformances; - for (auto entry : m_mapTypeToIDifferentiableWitness) - { - diffConformances.add(KeyValuePair<DeclRefType*, SubtypeWitness*>(entry.Key.type, entry.Value)); - } - - return diffConformances; - } - - DifferentiableTypeDictionary* DifferentiableTypeSemanticContext::makeDifferentiableTypeDictionaryNode( - ASTBuilder* builder) - { - auto dictionary = builder->create<DifferentiableTypeDictionary>(); - - for (auto item : m_mapTypeToIDifferentiableWitness) - { - auto entry = builder->create<DifferentiableTypeDictionaryItem>(); - entry->baseType = item.Key.type; - entry->confWitness = item.Value; - entry->parentDecl = dictionary; - - dictionary->members.add(entry); - } - - for (auto item : m_importedDictionaries) - { - auto entry = builder->create<DifferentiableTypeDictionaryImportItem>(); - entry->dictionaryRef = item; - entry->parentDecl = dictionary; - - dictionary->members.add(entry); - } - - return dictionary; - } - - void DifferentiableTypeSemanticContext::addImportedModule(ModuleDecl* importedModuleDecl) - { - // TODO: This is a terribly slow way to find the diff type dictionary. - // Switch to lookUp() when possible (this might involve naming the dictionary something) - // - for (auto diffTypeDict : importedModuleDecl->getMembersOfType<DifferentiableTypeDictionary>()) - { - m_importedDictionaries.add(makeDeclRef(diffTypeDict)); - } - } - - void DifferentiableTypeSemanticContext::requireDifferentiableTypeDictionary() - { - this->m_isTypeDictionaryRequired = true; - } - - bool DifferentiableTypeSemanticContext::isDictionaryRequired() - { - return this->m_isTypeDictionaryRequired; - } - void SharedSemanticsContext::_addCandidateExtensionsFromModule(ModuleDecl* moduleDecl) { for( auto& entry : moduleDecl->mapTypeToCandidateExtensions ) |