Skip to content

[QoI] Cleanup AST after trying to shrink constraint system of invalid expression #6780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2017
Merged

[QoI] Cleanup AST after trying to shrink constraint system of invalid expression #6780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/Sema/CSSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1453,6 +1453,7 @@ bool ConstraintSystem::Candidate::solve() {
// because it would assign types to expressions, which
// might interfere with solving higher-level expressions.
ExprCleaner cleaner(E);
CleanupIllFormedExpressionRAII cleanup(TC.Context, E);

// Allocate new constraint system for sub-expression.
ConstraintSystem cs(TC, DC, None);
Expand Down Expand Up @@ -1495,6 +1496,18 @@ bool ConstraintSystem::Candidate::solve() {

// Record found solutions as suggestions.
this->applySolutions(solutions);

// Solution application is going to modify AST, so we need to avoid
// clean-up, but let's double-check if we have any implicit
// expressions with type variables and nullify their types.
cleanup.disable();
E->forEachChildExpr([&](Expr *childExpr) -> Expr * {
Type type = childExpr->getType();
if (childExpr->isImplicit() && type && type->hasTypeVariable())
childExpr->setType(Type());
return childExpr;
});

return false;
}

Expand Down
3 changes: 1 addition & 2 deletions ...uted-at-swift-lib-ast-type-cpp-3771.swift → ...uted-at-swift-lib-ast-type-cpp-3771.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
[{_=#keyPath(t>w
3 changes: 1 addition & 2 deletions ...tupletypeelt-swift-astcontext-const.swift → ...tupletypeelt-swift-astcontext-const.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
f#keyPath(n&_==a>c{{{{{{{{{{{{{{{{{_=b:{{{{c{{{{{{d
3 changes: 1 addition & 2 deletions ...uted-at-swift-lib-ast-type-cpp-1130.swift → ...uted-at-swift-lib-ast-type-cpp-1130.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
[{{{{{{{{{{{{{{0=#keyPath(n&_=d
3 changes: 1 addition & 2 deletions ...uted-at-swift-lib-ast-type-cpp-1130.swift → ...uted-at-swift-lib-ast-type-cpp-1130.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// REQUIRES: asserts
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir

{func a>
print(a==#keyPath(a{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{
4 changes: 1 addition & 3 deletions ...tupletypeelt-swift-astcontext-const.swift → ...tupletypeelt-swift-astcontext-const.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
func a|Set(#keyPath(t>a>a{
3 changes: 1 addition & 2 deletions ...uted-at-swift-lib-ast-type-cpp-1337.swift → ...uted-at-swift-lib-ast-type-cpp-1337.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
print([{#keyPath(a}(t>A
3 changes: 1 addition & 2 deletions ...tupletypeelt-swift-astcontext-const.swift → ...tupletypeelt-swift-astcontext-const.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
protocol a func a|Set(#keyPath(t>a{
3 changes: 1 addition & 2 deletions ...s/28641-result-case-not-implemented.swift → ...d/28641-result-case-not-implemented.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// REQUIRES: asserts
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{let β=b&[{{{#keyPath(n&[{{{{{{{{{{{{{{{{{{{{{{{{{{a{{{{s
3 changes: 1 addition & 2 deletions ...2-swift-optionaltype-get-swift-type.swift → ...2-swift-optionaltype-get-swift-type.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
Array(_==#keyPath(t>Void!
3 changes: 1 addition & 2 deletions ...ion-ref-swift-type-swift-type-const.swift → ...ion-ref-swift-type-swift-type-const.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
(.n).h.n&[(#keyPath(t>A
3 changes: 1 addition & 2 deletions ...646-swift-lvaluetype-get-swift-type.swift → ...646-swift-lvaluetype-get-swift-type.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: deterministic-behavior
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
#keyPath(a
print(Int
print(_=#keyPath(a
Expand Down