AST: Split off Effects.h from Decl.h

Also remove the hash and equality operations on ProtocolRethrowsRequirementList;
this is no longer needed now that the AnyValue type eraser is gone.

Author: slavapestov

include/swift/AST/Decl.h

@@ -86,9 +86,11 @@ namespace swift {
   struct PropertyWrapperTypeInfo;
   struct PropertyWrapperMutability;
   class ProtocolDecl;
+  class ProtocolRethrowsRequirementList;
   class ProtocolType;
   struct RawComment;
   enum class ResilienceExpansion : unsigned;
+  enum class FunctionRethrowingKind : uint8_t;
   class TrailingWhereClause;
   class TypeAliasDecl;
   class Stmt;
@@ -3918,66 +3920,6 @@ enum class KnownDerivableProtocolKind : uint8_t {
   Actor,
 };
 
-class ProtocolRethrowsRequirementList {
-public:
-  typedef std::pair<Type, ValueDecl *> Entry;
-
-private:
-  ArrayRef<Entry> entries;
-
-public:
-  ProtocolRethrowsRequirementList(ArrayRef<Entry> entries) : entries(entries) {}
-  ProtocolRethrowsRequirementList() : entries() {}
-
-  typedef const Entry *const_iterator;
-  typedef const_iterator iterator;
-
-  const_iterator begin() const { return entries.begin(); }
-  const_iterator end() const { return entries.end(); }
-
-  size_t size() const { return entries.size(); }
-
-  void print(raw_ostream &OS) const;
-
-  SWIFT_DEBUG_DUMP;
-
-  friend bool operator==(const ProtocolRethrowsRequirementList &lhs,
-                         const ProtocolRethrowsRequirementList &rhs) {
-    if (lhs.size() != rhs.size()) {
-      return false;
-    }
-    auto lhsIter = lhs.begin();
-    auto rhsIter = rhs.begin();
-    while (lhsIter != lhs.end() && rhsIter != rhs.end()) {
-      if (lhsIter->first->isEqual(rhsIter->first)) {
-        return false;
-      }
-      if (lhsIter->second != rhsIter->second) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  friend bool operator!=(const ProtocolRethrowsRequirementList &lhs,
-                         const ProtocolRethrowsRequirementList &rhs) {
-    return !(lhs == rhs);
-  }
-
-  friend llvm::hash_code hash_value(
-    const ProtocolRethrowsRequirementList &list) {
-    return llvm::hash_combine(list.size()); // it is good enought for
-    // llvm::hash_code hash;
-    // for (auto entry : list) {
-    //   hash = llvm::hash_combine(hash, entry.first->getCanonicalType());
-    //   hash = llvm::hash_combine(hash, entry.second);
-    // }
-    // return hash;
-  }
-};
-
-void simple_display(raw_ostream &out, const ProtocolRethrowsRequirementList reqs);
-
 /// ProtocolDecl - A declaration of a protocol, for example:
 ///
 ///   protocol Drawable {
@@ -5575,23 +5517,6 @@ class ImportAsMemberStatus {
   }
 };
 
-enum class FunctionRethrowingKind : uint8_t {
-  /// The function is not throwing
-  None,
-
-  /// The function rethrows by closure
-  ByClosure, 
-
-  /// The function rethrows by conformance
-  ByConformance, 
-
-  /// The function throws
-  Throws, 
-
-  /// The function throwing determinate is invalid
-  Invalid
-};
-
 /// Base class for function-like declarations.
 class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   friend class NeedsNewVTableEntryRequest;

include/swift/AST/Effects.h

@@ -0,0 +1,79 @@
+//===--- Decl.h - Swift Language Declaration ASTs ---------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines some data types for rethrows and reasync effects.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_EFFECTS_H
+#define SWIFT_EFFECTS_H
+
+#include "swift/AST/Type.h"
+
+#include <utility>
+
+namespace llvm {
+class raw_ostream;
+}
+
+namespace swift {
+
+class ValueDecl;
+
+class ProtocolRethrowsRequirementList {
+public:
+  typedef std::pair<Type, ValueDecl *> Entry;
+
+private:
+  ArrayRef<Entry> entries;
+
+public:
+  ProtocolRethrowsRequirementList(ArrayRef<Entry> entries) : entries(entries) {}
+  ProtocolRethrowsRequirementList() : entries() {}
+
+  typedef const Entry *const_iterator;
+  typedef const_iterator iterator;
+
+  const_iterator begin() const { return entries.begin(); }
+  const_iterator end() const { return entries.end(); }
+
+  size_t size() const { return entries.size(); }
+
+  void print(raw_ostream &OS) const;
+
+  SWIFT_DEBUG_DUMP;
+};
+
+void simple_display(llvm::raw_ostream &out, const ProtocolRethrowsRequirementList reqs);
+
+enum class FunctionRethrowingKind : uint8_t {
+  /// The function is not throwing
+  None,
+
+  /// The function rethrows by closure
+  ByClosure, 
+
+  /// The function rethrows by conformance
+  ByConformance, 
+
+  /// The function throws
+  Throws, 
+
+  /// The function throwing determinate is invalid
+  Invalid
+};
+
+void simple_display(llvm::raw_ostream &out, FunctionRethrowingKind value);
+
+} // end namespace swift
+
+#endif

include/swift/AST/TypeCheckRequests.h

@@ -19,6 +19,7 @@
 #include "swift/AST/ActorIsolation.h"
 #include "swift/AST/AnyFunctionRef.h"
 #include "swift/AST/ASTTypeIDs.h"
+#include "swift/AST/Effects.h"
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/Type.h"
@@ -790,8 +791,6 @@ class FunctionRethrowingKindRequest :
   bool isCached() const { return true; }
 };
 
-void simple_display(llvm::raw_ostream &out, FunctionRethrowingKind value);
-
 /// Request the custom attribute which attaches a result builder to the
 /// given declaration.
 class AttachedResultBuilderRequest :

lib/AST/ASTVerifier.cpp

@@ -18,6 +18,7 @@
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/AccessScope.h"
 #include "swift/AST/Decl.h"
+#include "swift/AST/Effects.h"
 #include "swift/AST/ExistentialLayout.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/ForeignAsyncConvention.h"

lib/SILGen/SILGenApply.cpp

@@ -24,6 +24,7 @@
 #include "Varargs.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/DiagnosticsSIL.h"
+#include "swift/AST/Effects.h"
 #include "swift/AST/ForeignAsyncConvention.h"
 #include "swift/AST/ForeignErrorConvention.h"
 #include "swift/AST/GenericEnvironment.h"

lib/Sema/TypeCheckAttr.cpp

@@ -23,6 +23,7 @@
 #include "swift/AST/ASTVisitor.h"
 #include "swift/AST/ClangModuleLoader.h"
 #include "swift/AST/DiagnosticsParse.h"
+#include "swift/AST/Effects.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/GenericSignatureBuilder.h"
 #include "swift/AST/ImportCache.h"

lib/Sema/TypeCheckEffects.cpp

@@ -19,6 +19,7 @@
 #include "TypeCheckConcurrency.h"
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/DiagnosticsSema.h"
+#include "swift/AST/Effects.h"
 #include "swift/AST/Initializer.h"
 #include "swift/AST/Pattern.h"
 #include "swift/AST/PrettyStackTrace.h"