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

[AST] Allocate GenericSignature(Builders) in the arena

Browse Source 
Opaque result type archetypes can involve type variables, which
then get introduced into GenericSignatureBuilders and the
generated GenericSignatures. Allocate them in the proper arena
So we don’t end up with use-after-free errors.

Fixes rdar://problem/50309503.
This commit is contained in:
Doug Gregor
2019-05-06 22:47:13 -07:00
parent 2bf9bfa584
commit 24d24c0e63
5 changed files with 106 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/AST/GenericSignatureBuilder.cpp
View File

@@ -5404,9 +5404,15 @@ namespace {
ArrayRef<Constraint<T>> constraints,
llvm::function_ref<bool(const Constraint<T> &)>
isSuitableRepresentative) {
Optional<Constraint<T>> fallbackConstraint;
// Find a representative constraint.
Optional<Constraint<T>> representativeConstraint;
for (const auto &constraint : constraints) {
// Make sure we have a constraint to fall back on.
if (!fallbackConstraint)
fallbackConstraint = constraint;
// If this isn't a suitable representative constraint, ignore it.
if (!isSuitableRepresentative(constraint))
continue;
@@ -5457,7 +5463,8 @@ namespace {
representativeConstraint = constraint;
}
return representativeConstraint;
return representativeConstraint ? representativeConstraint
: fallbackConstraint;
}
} // end anonymous namespace
@@ -6996,9 +7003,11 @@ void GenericSignatureBuilder::checkConcreteTypeConstraints(
if (concreteType->isEqual(equivClass->concreteType))
return ConstraintRelation::Redundant;
// If either has a type parameter, call them unrelated.
// If either has a type parameter or type variable, call them unrelated.
if (concreteType->hasTypeParameter() ||
equivClass->concreteType->hasTypeParameter())
equivClass->concreteType->hasTypeParameter() ||
concreteType->hasTypeVariable() ||
equivClass->concreteType->hasTypeVariable())
return ConstraintRelation::Unrelated;
return ConstraintRelation::Conflicting;