summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-check-conformance.cpp
diff options
context:
space:
mode:
authorJulius Ikkala <julius.ikkala@gmail.com>2025-06-28 05:39:24 +0300
committerGitHub <noreply@github.com>2025-06-28 02:39:24 +0000
commit7349dc5cff49cf22c82eb912813e47f30cd7a757 (patch)
tree4d7b3e14f119e7bb48623e52c890b461fd3d9701 /source/slang/slang-check-conformance.cpp
parenta13dda4f214274a10d39f37c79622fc3e62da310 (diff)
Minimal optional constraints (#7422)
* Parse optional witness syntax * Allow failing optional constraint * Make `is` work with optional constraint * Allow using optional constraint in checked if statements * Fix tests * Make it work with structs * Fix MSVC build error * Disallow using `as` with optional constraints * Update test to match split is/as errors * Add tests * Fix uninitialized variables in tests * Add tests of incorrect uses & fix related bugs * Mention optional constraints in docs * format code * Fix type unification with NoneWitness * Fix formatting --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> Co-authored-by: Nathan V. Morrical <natemorrical@gmail.com>
Diffstat (limited to 'source/slang/slang-check-conformance.cpp')
-rw-r--r--source/slang/slang-check-conformance.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/source/slang/slang-check-conformance.cpp b/source/slang/slang-check-conformance.cpp
index 71b87f447..ba1b8ea55 100644
--- a/source/slang/slang-check-conformance.cpp
+++ b/source/slang/slang-check-conformance.cpp
@@ -122,6 +122,8 @@ SubtypeWitness* SemanticsVisitor::checkAndConstructSubtypeWitness(
ensureDecl(superDeclRefType->getDeclRef().getDecl(), DeclCheckState::ReadyForLookup);
}
+ SubtypeWitness* failureWitness = nullptr;
+
// In the common case, we can use the pre-computed inheritance information for `subType`
// to enumerate all the types it transitively inherits from.
//
@@ -148,9 +150,19 @@ SubtypeWitness* SemanticsVisitor::checkAndConstructSubtypeWitness(
// If the `superType` appears in the flattened inheritance list
// for the `subType`, then we know that the subtype relationship
- // holds. Conveniently, the `facet` stores a pre-computed witness
- // for the subtype relationship, which we can return here.
- //
+ // holds.
+
+ // If the witness is optional, we should only return it if no certain
+ // witness was found.
+ auto declWitness = as<DeclaredSubtypeWitness>(facet->subtypeWitness);
+ if (declWitness && declWitness->isOptional())
+ {
+ failureWitness = facet->subtypeWitness;
+ continue;
+ }
+
+ // Conveniently, the `facet` stores a pre-computed witness for the
+ // subtype relationship, which we can use here.
return facet->subtypeWitness;
}
//
@@ -271,7 +283,7 @@ SubtypeWitness* SemanticsVisitor::checkAndConstructSubtypeWitness(
return m_astBuilder->getEachSubtypeWitness(subType, superType, elementWitness);
}
// default is failure
- return nullptr;
+ return failureWitness;
}
bool SemanticsVisitor::isValidGenericConstraintType(Type* type)