Sema: Move DeclReferenceType to PreparedOverload.h

Author: slavapestov

include/swift/Sema/ConstraintSystem.h

@@ -64,6 +64,9 @@ namespace constraints {
 
 class ConstraintSystem;
 class SyntacticElementTarget;
+
+// PreparedOverload.h
+struct DeclReferenceType;
 struct PreparedOverload;
 struct PreparedOverloadBuilder;
 
@@ -2144,34 +2147,6 @@ struct ClosureIsolatedByPreconcurrency {
   bool operator()(const ClosureExpr *expr) const;
 };
 
-/// Describes the type produced when referencing a declaration.
-struct DeclReferenceType {
-  /// The "opened" type, which is the type of the declaration where any
-  /// generic parameters have been replaced with type variables.
-  ///
-  /// The mapping from generic parameters to type variables will have been
-  /// recorded by \c recordOpenedTypes when this type is produced.
-  Type openedType;
-
-  /// The opened type, after performing contextual type adjustments such as
-  /// removing concurrency-related annotations for a `@preconcurrency`
-  /// operation.
-  Type adjustedOpenedType;
-
-  /// The type of the reference, based on the original opened type. This is the
-  /// type that the expression used to form the declaration reference would
-  /// have if no adjustments had been applied.
-  Type referenceType;
-
-  /// The type of the reference, which is the adjusted opened type after
-  /// (e.g.) applying the base of a member access. This is the type of the
-  /// expression used to form the declaration reference.
-  Type adjustedReferenceType;
-
-  /// The type that could be thrown by accessing this declaration.
-  Type thrownErrorTypeOnAccess;
-};
-
 /// Describes a system of constraints on type variables, the
 /// solution of which assigns concrete types to each of the type variables.
 /// Constraint systems are typically generated given an (untyped) expression.

include/swift/Sema/PreparedOverload.h

@@ -27,6 +27,34 @@ namespace constraints {
 class ConstraintLocatorBuilder;
 class ConstraintSystem;
 
+/// Describes the type produced when referencing a declaration.
+struct DeclReferenceType {
+  /// The "opened" type, which is the type of the declaration where any
+  /// generic parameters have been replaced with type variables.
+  ///
+  /// The mapping from generic parameters to type variables will have been
+  /// recorded by \c recordOpenedTypes when this type is produced.
+  Type openedType;
+
+  /// The opened type, after performing contextual type adjustments such as
+  /// removing concurrency-related annotations for a `@preconcurrency`
+  /// operation.
+  Type adjustedOpenedType;
+
+  /// The type of the reference, based on the original opened type. This is the
+  /// type that the expression used to form the declaration reference would
+  /// have if no adjustments had been applied.
+  Type referenceType;
+
+  /// The type of the reference, which is the adjusted opened type after
+  /// (e.g.) applying the base of a member access. This is the type of the
+  /// expression used to form the declaration reference.
+  Type adjustedReferenceType;
+
+  /// The type that could be thrown by accessing this declaration.
+  Type thrownErrorTypeOnAccess;
+};
+
 /// Describes a dependent type that has been opened to a particular type
 /// variable.
 using OpenedType = std::pair<GenericTypeParamType *, TypeVariableType *>;
@@ -101,6 +129,7 @@ struct PreparedOverload {
   };
 
   ArrayRef<Change> Changes;
+  DeclReferenceType DeclType;
 };
 
 struct PreparedOverloadBuilder {

lib/Sema/TypeCheckProtocol.cpp

@@ -62,6 +62,7 @@
 #include "swift/Basic/StringExtras.h"
 #include "swift/ClangImporter/ClangModule.h"
 #include "swift/Sema/IDETypeChecking.h"
+#include "swift/Sema/PreparedOverload.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Statistic.h"

lib/Sema/TypeOfReference.cpp

@@ -2617,7 +2617,7 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
 
     if (enablePreparedOverloads) {
       PreparingOverload = false;
-      PreparedOverload result{preparedOverload.Changes};
+      PreparedOverload result{preparedOverload.Changes, declRefType};
       replayChanges(locator, result);
     }