Skip to content

[ConstraintSystem] Revert new disjunction favoring algorithm #79128

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.

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 72 commits into from
Feb 13, 2025

Conversation

xedin
Copy link
Contributor

@xedin xedin commented Feb 4, 2025

No description provided.

@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test

@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test source compatibility

@xedin xedin requested a review from DougGregor as a code owner February 4, 2025 17:26
@xedin xedin force-pushed the revert-solver-perf branch from 1a8a67e to 276be15 Compare February 4, 2025 17:28
@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test

@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test source compatibility

@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test

@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test compiler performance

@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test source compatibility

xedin added 12 commits February 4, 2025 10:29
…ling with unapplied disjunctions"

This reverts commit 72340f3.
… whether disjunction is supported"

This reverts commit 6bc23b5.
…s that come from implicit imports"

This reverts commit aa4a2b9.
…ed literal array handling"

This reverts commit cfd34e5.
@xavgru12
Copy link

xavgru12 commented Feb 4, 2025

What is the reason for reverting?

@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

It breaks source compatibility in a few situations. I'm planning to re-land this once I figure out how to fix it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we keep this regression test? This behavior should be preserved regardless of algorithm, so I don't want to lose it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll bring all of the test-cases back, yeah.

xedin added a commit to xedin/swift-source-compat-suite that referenced this pull request Feb 4, 2025
The constraint solver performance changes are reverted
via swiftlang/swift#79128 which
means that Doggie tests are going to fail again.
@xedin xedin force-pushed the revert-solver-perf branch from 4c6dd36 to 875a23a Compare February 4, 2025 19:30
@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test

@xedin xedin force-pushed the revert-solver-perf branch from 875a23a to 41fd4de Compare February 4, 2025 21:11
@xedin
Copy link
Contributor Author

xedin commented Feb 4, 2025

@swift-ci please test

@xedin
Copy link
Contributor Author

xedin commented Feb 5, 2025

Let's give this another chance.

@xedin xedin closed this Feb 5, 2025
@xedin
Copy link
Contributor Author

xedin commented Feb 12, 2025

I attempted to fix the problems in #79309 but this is still running into issues because of how other things like conversion restrictions are used in the solver at the moment.

@xedin xedin reopened this Feb 12, 2025
@xedin
Copy link
Contributor Author

xedin commented Feb 12, 2025

@swift-ci please test Windows platform

@xedin
Copy link
Contributor Author

xedin commented Feb 13, 2025

Doggie failure in Debug mode is expected since this is something that changes in question resolved.

@xedin
Copy link
Contributor Author

xedin commented Feb 13, 2025

@swift-ci please test Windows platform

1 similar comment
@xedin
Copy link
Contributor Author

xedin commented Feb 13, 2025

@swift-ci please test Windows platform

@xedin xedin merged commit 725bd91 into swiftlang:main Feb 13, 2025
6 of 8 checks passed
xedin added a commit to xedin/swift that referenced this pull request Feb 17, 2025
xedin added a commit to xedin/swift that referenced this pull request Feb 18, 2025
xedin added a commit to xedin/swift that referenced this pull request Feb 20, 2025
xedin added a commit to xedin/swift that referenced this pull request Feb 20, 2025
xedin added a commit to xedin/swift that referenced this pull request Mar 1, 2025
xedin added a commit to xedin/swift that referenced this pull request Mar 11, 2025
xedin added a commit to xedin/swift that referenced this pull request Mar 15, 2025
xedin added a commit to xedin/swift that referenced this pull request Apr 21, 2025
xedin added a commit to xedin/swift that referenced this pull request Apr 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants