Clean up

Author: calda

include/swift/Sema/ConstraintSystem.h

@@ -607,11 +607,8 @@ enum class ConstraintSystemFlags {
   /// Disable macro expansions.
   DisableMacroExpansions = 0x40,
 
-  /// Enable old type-checker performance hacks.
-  EnablePerformanceHacks = 0x80,
-
   /// Don't record a failed constraint after adding an unsolvable constraint.
-  DisableRecordFailedConstraint = 0x100,
+  DisableRecordFailedConstraint = 0x80,
 };
 
 /// Options that affect the constraint system as a whole.

lib/Sema/TypeCheckType.cpp

@@ -58,6 +58,7 @@
 #include "swift/ClangImporter/ClangImporter.h"
 #include "swift/Parse/Lexer.h"
 #include "swift/Sema/SILTypeResolutionContext.h"
+#include "swift/Sema/TypeVariableType.h"
 #include "swift/Strings.h"
 #include "swift/Subsystems.h"
 #include "clang/AST/ASTContext.h"