Skip to content

AST: Allow substitution limits >= 32767 and increase limit #83834

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 2 commits into from
Aug 21, 2025
+4 −4
Merged

AST: Allow substitution limits >= 32767 and increase limit #83834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36c49ea
AST: Allow substitution limits >= 32767
slavapestov Aug 20, 2025
d80ad91
AST: Tweak substitution limits again
slavapestov Aug 20, 2025
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
4 changes: 2 additions & 2 deletions include/swift/AST/InFlightSubstitution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class InFlightSubstitution {
LookupConformanceFn BaselineLookupConformance;
SubstOptions Options;
RecursiveTypeProperties Props;
unsigned RemainingCount : 15;
unsigned RemainingCount : 31;
unsigned InitLimit : 1;
unsigned RemainingDepth : 15;
unsigned RemainingDepth : 31;
unsigned LimitReached : 1;

struct ActivePackExpansion {
Expand Down
4 changes: 2 additions & 2 deletions include/swift/Basic/LangOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,11 @@ namespace swift {

/// Maximum nesting depth for type substitution operations, to prevent
/// runaway recursion.
unsigned MaxSubstitutionDepth = 1000;
unsigned MaxSubstitutionDepth = 500;

/// Maximum step count for type substitution operations, to prevent
/// runaway recursion.
unsigned MaxSubstitutionCount = 32000;
unsigned MaxSubstitutionCount = 120000;

/// Enable implicit lifetime dependence for ~Escapable return types.
bool EnableExperimentalLifetimeDependenceInference = false;
Expand Down