Skip to content

Commit 461eaff

Browse files
xedinxedin
committed
[ConstraintSystem] NFC: Move ConstraintSystem.h to include/swift/Sema 
1 parent 6ba7ecb commit 461eaff

33 files changed

+31
-35
lines changed

‎lib/Sema/ConstraintSolverStats.def renamed to ‎include/swift/Sema/ConstraintSolverStats.def

File renamed without changes.

‎lib/Sema/ConstraintSystem.h renamed to ‎include/swift/Sema/ConstraintSystem.h

File renamed without changes.

‎lib/Sema/BuilderTransform.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//
1616
//===----------------------------------------------------------------------===//
1717

18-
#include "ConstraintSystem.h"
1918
#include "MiscDiagnostics.h"
2019
#include "TypeChecker.h"
2120
#include "TypeCheckAvailability.h"
@@ -27,6 +26,7 @@
2726
#include "swift/AST/NameLookupRequests.h"
2827
#include "swift/AST/ParameterList.h"
2928
#include "swift/AST/TypeCheckRequests.h"
29+
#include "swift/Sema/ConstraintSystem.h"
3030
#include "swift/Sema/SolutionResult.h"
3131
#include "llvm/ADT/DenseMap.h"
3232
#include "llvm/ADT/SmallVector.h"

‎lib/Sema/CSApply.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
//
1717
//===----------------------------------------------------------------------===//
1818

19-
#include "ConstraintSystem.h"
2019
#include "CodeSynthesis.h"
2120
#include "CSDiagnostics.h"
2221
#include "MiscDiagnostics.h"
@@ -33,6 +32,7 @@
3332
#include "swift/AST/ProtocolConformance.h"
3433
#include "swift/AST/SubstitutionMap.h"
3534
#include "swift/Basic/StringExtras.h"
35+
#include "swift/Sema/ConstraintSystem.h"
3636
#include "swift/Sema/SolutionResult.h"
3737
#include "llvm/ADT/APFloat.h"
3838
#include "llvm/ADT/APInt.h"

‎lib/Sema/CSBindings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// This file implements selection of bindings for type variables.
1414
//
1515
//===----------------------------------------------------------------------===//
16-
#include "ConstraintSystem.h"
1716
#include "TypeChecker.h"
1817
#include "swift/Sema/ConstraintGraph.h"
18+
#include "swift/Sema/ConstraintSystem.h"
1919
#include "llvm/ADT/SetVector.h"
2020
#include <tuple>
2121

‎lib/Sema/CSClosure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
//
1717
//===----------------------------------------------------------------------===//
1818

19-
#include "ConstraintSystem.h"
2019
#include "TypeChecker.h"
20+
#include "swift/Sema/ConstraintSystem.h"
2121

2222
using namespace swift;
2323
using namespace swift::constraints;

‎lib/Sema/CSDiagnostics.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
#include "CSDiagnostics.h"
18-
#include "ConstraintSystem.h"
1918
#include "MiscDiagnostics.h"
2019
#include "TypeCheckProtocol.h"
2120
#include "TypoCorrection.h"

‎lib/Sema/CSDiagnostics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#ifndef SWIFT_SEMA_CSDIAGNOSTICS_H
1717
#define SWIFT_SEMA_CSDIAGNOSTICS_H
1818

19-
#include "ConstraintSystem.h"
2019
#include "TypeChecker.h"
2120
#include "swift/AST/ASTContext.h"
2221
#include "swift/AST/ASTNode.h"
@@ -27,6 +26,7 @@
2726
#include "swift/AST/OperatorNameLookup.h"
2827
#include "swift/AST/Types.h"
2928
#include "swift/Basic/SourceLoc.h"
29+
#include "swift/Sema/ConstraintSystem.h"
3030
#include "swift/Sema/OverloadChoice.h"
3131
#include "llvm/ADT/ArrayRef.h"
3232
#include <tuple>

‎lib/Sema/CSFix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
//===----------------------------------------------------------------------===//
1818

1919
#include "CSDiagnostics.h"
20-
#include "ConstraintSystem.h"
2120
#include "swift/AST/Expr.h"
2221
#include "swift/AST/ParameterList.h"
2322
#include "swift/AST/Type.h"
2423
#include "swift/AST/Types.h"
2524
#include "swift/Basic/SourceManager.h"
2625
#include "swift/Sema/ConstraintLocator.h"
26+
#include "swift/Sema/ConstraintSystem.h"
2727
#include "swift/Sema/CSFix.h"
2828
#include "swift/Sema/OverloadChoice.h"
2929
#include "llvm/ADT/SmallString.h"

‎lib/Sema/CSGen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// This file implements constraint generation for the type checker.
1414
//
1515
//===----------------------------------------------------------------------===//
16-
#include "ConstraintSystem.h"
1716
#include "TypeCheckType.h"
1817
#include "TypeChecker.h"
1918
#include "swift/AST/ASTVisitor.h"
@@ -25,6 +24,7 @@
2524
#include "swift/AST/SubstitutionMap.h"
2625
#include "swift/AST/TypeCheckRequests.h"
2726
#include "swift/Sema/ConstraintGraph.h"
27+
#include "swift/Sema/ConstraintSystem.h"
2828
#include "swift/Sema/IDETypeChecking.h"
2929
#include "swift/Subsystems.h"
3030
#include "llvm/ADT/APInt.h"

‎lib/Sema/CSRanking.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
// constraint-based type checker.
1515
//
1616
//===----------------------------------------------------------------------===//
17-
#include "ConstraintSystem.h"
1817
#include "TypeChecker.h"
1918
#include "swift/AST/GenericSignature.h"
2019
#include "swift/AST/ParameterList.h"
2120
#include "swift/AST/ProtocolConformance.h"
2221
#include "swift/AST/TypeCheckRequests.h"
22+
#include "swift/Sema/ConstraintSystem.h"
2323
#include "llvm/ADT/Statistic.h"
2424
#include "llvm/Support/Compiler.h"
2525

‎lib/Sema/CSSimplify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
//===----------------------------------------------------------------------===//
1717

1818
#include "CSDiagnostics.h"
19-
#include "ConstraintSystem.h"
2019
#include "swift/AST/ExistentialLayout.h"
2120
#include "swift/AST/GenericEnvironment.h"
2221
#include "swift/AST/GenericSignature.h"
@@ -27,6 +26,7 @@
2726
#include "swift/AST/ProtocolConformance.h"
2827
#include "swift/Basic/StringExtras.h"
2928
#include "swift/ClangImporter/ClangModule.h"
29+
#include "swift/Sema/ConstraintSystem.h"
3030
#include "swift/Sema/CSFix.h"
3131
#include "swift/Sema/IDETypeChecking.h"
3232
#include "llvm/ADT/SetVector.h"

‎lib/Sema/CSSolver.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616
#include "CSStep.h"
17-
#include "ConstraintSystem.h"
1817
#include "TypeCheckType.h"
1918
#include "TypeChecker.h"
2019
#include "swift/AST/ParameterList.h"
2120
#include "swift/AST/TypeWalker.h"
2221
#include "swift/Sema/ConstraintGraph.h"
22+
#include "swift/Sema/ConstraintSystem.h"
2323
#include "swift/Sema/SolutionResult.h"
2424
#include "llvm/ADT/STLExtras.h"
2525
#include "llvm/ADT/SetVector.h"
@@ -45,13 +45,13 @@ STATISTIC(TotalNumTypeVariables, "# of type variables created");
4545

4646
#define CS_STATISTIC(Name, Description) \
4747
STATISTIC(Overall##Name, Description);
48-
#include "ConstraintSolverStats.def"
48+
#include "swift/Sema/ConstraintSolverStats.def"
4949

5050
#undef DEBUG_TYPE
5151
#define DEBUG_TYPE "Constraint solver largest system"
5252
#define CS_STATISTIC(Name, Description) \
5353
STATISTIC(Largest##Name, Description);
54-
#include "ConstraintSolverStats.def"
54+
#include "swift/Sema/ConstraintSolverStats.def"
5555
STATISTIC(LargestSolutionAttemptNumber, "# of the largest solution attempt");
5656

5757
TypeVariableType *ConstraintSystem::createTypeVariable(
@@ -445,7 +445,7 @@ ConstraintSystem::SolverState::~SolverState() {
445445

446446
// Write our local statistics back to the overall statistics.
447447
#define CS_STATISTIC(Name, Description) JOIN2(Overall,Name) += Name;
448-
#include "ConstraintSolverStats.def"
448+
#include "swift/Sema/ConstraintSolverStats.def"
449449

450450
#if LLVM_ENABLE_STATS
451451
// Update the "largest" statistics if this system is larger than the
@@ -457,7 +457,7 @@ ConstraintSystem::SolverState::~SolverState() {
457457
#define CS_STATISTIC(Name, Description) \
458458
JOIN2(Largest,Name) = Name-1; \
459459
++JOIN2(Largest,Name);
460-
#include "ConstraintSolverStats.def"
460+
#include "swift/Sema/ConstraintSolverStats.def"
461461
}
462462
#endif
463463
}

‎lib/Sema/CSStep.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
//===----------------------------------------------------------------------===//
1717

1818
#include "CSStep.h"
19-
#include "ConstraintSystem.h"
2019
#include "swift/AST/Types.h"
20+
#include "swift/Sema/ConstraintSystem.h"
2121
#include "llvm/ADT/ArrayRef.h"
2222
#include "llvm/ADT/SmallVector.h"
2323
#include "llvm/ADT/STLExtras.h"

‎lib/Sema/CSStep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#ifndef SWIFT_SEMA_CSSTEP_H
1919
#define SWIFT_SEMA_CSSTEP_H
2020

21-
#include "ConstraintSystem.h"
2221
#include "swift/AST/Types.h"
2322
#include "swift/Sema/Constraint.h"
2423
#include "swift/Sema/ConstraintGraph.h"
24+
#include "swift/Sema/ConstraintSystem.h"
2525
#include "llvm/ADT/ArrayRef.h"
2626
#include "llvm/ADT/Optional.h"
2727
#include "llvm/ADT/STLExtras.h"

‎lib/Sema/CodeSynthesis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "CodeSynthesis.h"
1818

19-
#include "ConstraintSystem.h"
2019
#include "TypeChecker.h"
2120
#include "TypeCheckDecl.h"
2221
#include "TypeCheckObjC.h"
@@ -33,6 +32,7 @@
3332
#include "swift/AST/TypeCheckRequests.h"
3433
#include "swift/Basic/Defer.h"
3534
#include "swift/ClangImporter/ClangModule.h"
35+
#include "swift/Sema/ConstraintSystem.h"
3636
#include "llvm/ADT/SmallString.h"
3737
#include "llvm/ADT/StringExtras.h"
3838
using namespace swift;

‎lib/Sema/Constraint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
// constraint that must be solved.
1616
//
1717
//===----------------------------------------------------------------------===//
18-
#include "ConstraintSystem.h"
1918
#include "swift/AST/Types.h"
2019
#include "swift/Basic/Compiler.h"
2120
#include "swift/Sema/Constraint.h"
21+
#include "swift/Sema/ConstraintSystem.h"
2222
#include "llvm/Support/Compiler.h"
2323
#include "llvm/Support/raw_ostream.h"
2424
#include <algorithm>

‎lib/Sema/ConstraintGraph.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
//
1616
//===----------------------------------------------------------------------===//
1717

18-
#include "ConstraintSystem.h"
1918
#include "swift/Basic/Statistic.h"
2019
#include "swift/Sema/ConstraintGraph.h"
2120
#include "swift/Sema/ConstraintGraphScope.h"
21+
#include "swift/Sema/ConstraintSystem.h"
2222
#include "llvm/ADT/SetVector.h"
2323
#include "llvm/Support/Debug.h"
2424
#include "llvm/Support/SaveAndRestore.h"

‎lib/Sema/ConstraintLocator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
// a particular constraint was derived.
1616
//
1717
//===----------------------------------------------------------------------===//
18-
#include "ConstraintSystem.h"
1918
#include "swift/AST/Decl.h"
2019
#include "swift/AST/Expr.h"
2120
#include "swift/AST/Types.h"
2221
#include "swift/Sema/ConstraintLocator.h"
22+
#include "swift/Sema/ConstraintSystem.h"
2323
#include "llvm/ADT/StringExtras.h"
2424
#include "llvm/Support/raw_ostream.h"
2525

‎lib/Sema/ConstraintSystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// inference for expressions.
1616
//
1717
//===----------------------------------------------------------------------===//
18-
#include "ConstraintSystem.h"
1918
#include "CSDiagnostics.h"
2019
#include "TypeChecker.h"
2120
#include "TypeCheckType.h"
@@ -26,6 +25,7 @@
2625
#include "swift/Basic/Statistic.h"
2726
#include "swift/Sema/CSFix.h"
2827
#include "swift/Sema/ConstraintGraph.h"
28+
#include "swift/Sema/ConstraintSystem.h"
2929
#include "swift/Sema/SolutionResult.h"
3030
#include "llvm/ADT/SetVector.h"
3131
#include "llvm/ADT/SmallSet.h"

‎lib/Sema/IDETypeCheckingRequests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#include "swift/AST/NameLookup.h"
1616
#include "swift/Basic/SourceManager.h"
1717
#include "swift/Frontend/Frontend.h"
18+
#include "swift/Sema/ConstraintSystem.h"
1819
#include "swift/Sema/IDETypeCheckingRequests.h"
1920
#include "swift/Subsystems.h"
2021
#include "TypeChecker.h"
21-
#include "ConstraintSystem.h"
2222

2323
using namespace swift;
2424

‎lib/Sema/MiscDiagnostics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
#include "MiscDiagnostics.h"
18-
#include "ConstraintSystem.h"
1918
#include "TypeCheckAvailability.h"
2019
#include "TypeCheckConcurrency.h"
2120
#include "TypeChecker.h"
@@ -29,6 +28,7 @@
2928
#include "swift/Basic/StringExtras.h"
3029
#include "swift/Parse/Lexer.h"
3130
#include "swift/Parse/Parser.h"
31+
#include "swift/Sema/ConstraintSystem.h"
3232
#include "swift/Sema/IDETypeChecking.h"
3333
#include "llvm/ADT/MapVector.h"
3434
#include "llvm/ADT/StringSwitch.h"

‎lib/Sema/PreCheckExpr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//
1616
//===----------------------------------------------------------------------===//
1717

18-
#include "ConstraintSystem.h"
1918
#include "TypeChecker.h"
2019
#include "TypeCheckType.h"
2120
#include "TypoCorrection.h"
@@ -31,6 +30,7 @@
3130
#include "swift/AST/TypeCheckRequests.h"
3231
#include "swift/Parse/Confusables.h"
3332
#include "swift/Parse/Lexer.h"
33+
#include "swift/Sema/ConstraintSystem.h"
3434
#include "llvm/ADT/SmallPtrSet.h"
3535
#include "llvm/ADT/SmallVector.h"
3636

@@ -1899,4 +1899,4 @@ bool ConstraintSystem::preCheckExpression(Expr *&expr, DeclContext *dc,
18991899
return false;
19001900
}
19011901
return true;
1902-
}
1902+
}

‎lib/Sema/TypeCheckCodeCompletion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
#include "swift/Subsystems.h"
18-
#include "ConstraintSystem.h"
1918
#include "TypeChecker.h"
2019
#include "TypeCheckObjC.h"
2120
#include "TypeCheckType.h"
@@ -42,6 +41,7 @@
4241
#include "swift/Parse/Lexer.h"
4342
#include "swift/Sema/IDETypeChecking.h"
4443
#include "swift/Sema/CodeCompletionTypeChecking.h"
44+
#include "swift/Sema/ConstraintSystem.h"
4545
#include "swift/Strings.h"
4646
#include "llvm/ADT/DenseMap.h"
4747
#include "llvm/ADT/PointerUnion.h"

‎lib/Sema/TypeCheckConstraints.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
//
1717
//===----------------------------------------------------------------------===//
1818

19-
#include "ConstraintSystem.h"
2019
#include "MiscDiagnostics.h"
2120
#include "TypeChecker.h"
2221
#include "swift/AST/ASTVisitor.h"
@@ -29,6 +28,7 @@
2928
#include "swift/AST/TypeCheckRequests.h"
3029
#include "swift/Basic/Statistic.h"
3130
#include "swift/Sema/CodeCompletionTypeChecking.h"
31+
#include "swift/Sema/ConstraintSystem.h"
3232
#include "swift/Sema/SolutionResult.h"
3333
#include "llvm/ADT/DenseMap.h"
3434
#include "llvm/ADT/SmallPtrSet.h"

‎lib/Sema/TypeCheckDeclPrimary.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
//===----------------------------------------------------------------------===//
1818

1919
#include "CodeSynthesis.h"
20-
#include "ConstraintSystem.h"
2120
#include "DerivedConformances.h"
2221
#include "TypeChecker.h"
2322
#include "TypeCheckAccess.h"

‎lib/Sema/TypeCheckExpr.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "swift/AST/SourceFile.h"
2626
#include "swift/AST/TypeCheckRequests.h"
2727
#include "swift/Parse/Lexer.h"
28-
#include "ConstraintSystem.h"
2928

3029
using namespace swift;
3130

‎lib/Sema/TypeCheckPropertyWrapper.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// This file implements semantic analysis for property wrappers.
1414
//
1515
//===----------------------------------------------------------------------===//
16-
#include "ConstraintSystem.h"
1716
#include "TypeChecker.h"
1817
#include "TypeCheckType.h"
1918
#include "swift/AST/ASTContext.h"

‎lib/Sema/TypeCheckProtocol.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//===----------------------------------------------------------------------===//
1616

1717
#include "TypeCheckProtocol.h"
18-
#include "ConstraintSystem.h"
1918
#include "DerivedConformances.h"
2019
#include "MiscDiagnostics.h"
2120
#include "TypeAccessScopeChecker.h"

0 commit comments

Comments
 (0)