averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

RequirementMachine: Tighten up RewriteSystem::verifyRewriteRules()

Browse Source
This commit is contained in:
Slava Pestov
2022-01-26 21:57:51 -05:00
parent ad9c701152
commit d70945a31a
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/AST/RequirementMachine/RewriteSystem.cpp
View File

@@ -643,9 +643,6 @@ void RewriteSystem::verifyRewriteRules(ValidityPolicy policy) const {
}
for (const auto &rule : Rules) {
if (rule.isSimplified() || rule.isPermanent())
continue;
const auto &lhs = rule.getLHS();
const auto &rhs = rule.getRHS();
@@ -661,7 +658,10 @@ void RewriteSystem::verifyRewriteRules(ValidityPolicy policy) const {
ASSERT_RULE(symbol.getKind() != Symbol::Kind::GenericParam);
}
if (index != 0 && index != lhs.size() - 1) {
// Completion can produce rules like [P:T].[Q].[R] => [P:T].[Q]
// which are immediately simplified away.
if (!rule.isSimplified() &&
index != 0 && index != lhs.size() - 1) {
ASSERT_RULE(symbol.getKind() != Symbol::Kind::Protocol);
}
}
@@ -669,11 +669,16 @@ void RewriteSystem::verifyRewriteRules(ValidityPolicy policy) const {
for (unsigned index : indices(rhs)) {
auto symbol = rhs[index];
// This is only true if the input requirements were valid.
if (policy == DisallowInvalidRequirements) {
ASSERT_RULE(symbol.getKind() != Symbol::Kind::Name);
} else {
// FIXME: Assert that we diagnosed an error
// Permanent rules contain name symbols at the end, like
// [P].T => [P:T].
if (!rule.isSimplified() &&
(!rule.isPermanent() || index == rhs.size() - 1)) {
// This is only true if the input requirements were valid.
if (policy == DisallowInvalidRequirements) {
ASSERT_RULE(symbol.getKind() != Symbol::Kind::Name);
} else {
// FIXME: Assert that we diagnosed an error
}
}
ASSERT_RULE(symbol.getKind() != Symbol::Kind::Layout);
@@ -681,6 +686,12 @@ void RewriteSystem::verifyRewriteRules(ValidityPolicy policy) const {
if (index != 0) {
ASSERT_RULE(symbol.getKind() != Symbol::Kind::GenericParam);
}
// Completion can produce rules like [P:T].[Q].[R] => [P:T].[Q]
// which are immediately simplified away.
if (!rule.isSimplified() &&
index != 0) {
ASSERT_RULE(symbol.getKind() != Symbol::Kind::Protocol);
}
}