Merge pull request swiftlang#35841 from slavapestov/rethrows-cleanup

Rethrows checking cleanup

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/AST/CMakeLists.txt

@@ -44,6 +44,7 @@ add_swift_host_library(swiftAST STATIC
   DiagnosticEngine.cpp
   DiagnosticList.cpp
   DocComment.cpp
+  Effects.cpp
   Evaluator.cpp
   Expr.cpp
   ExtInfo.cpp

lib/AST/Decl.cpp

@@ -4934,26 +4934,6 @@ bool ProtocolDecl::existentialTypeSupported() const {
     ExistentialTypeSupportedRequest{const_cast<ProtocolDecl *>(this)}, true);
 }
 
-void swift::simple_display(llvm::raw_ostream &out, const ProtocolRethrowsRequirementList list) {
-  for (auto entry : list) {
-    simple_display(out, entry.first);
-    simple_display(out, entry.second);
-  }
-}
-
-
-ProtocolRethrowsRequirementList 
-ProtocolDecl::getRethrowingRequirements() const {
-  return evaluateOrDefault(getASTContext().evaluator,
-    ProtocolRethrowsRequirementsRequest{const_cast<ProtocolDecl *>(this)}, 
-    ProtocolRethrowsRequirementList());
-}
-
-bool 
-ProtocolDecl::isRethrowingProtocol() const {
-  return getRethrowingRequirements().size() > 0;
-}
-
 StringRef ProtocolDecl::getObjCRuntimeName(
                           llvm::SmallVectorImpl<char> &buffer) const {
   // If there is an 'objc' attribute with a name, use that name.
@@ -6800,12 +6780,6 @@ bool AbstractFunctionDecl::canBeAsyncHandler() const {
                            false);
 }
 
-FunctionRethrowingKind AbstractFunctionDecl::getRethrowingKind() const {
-  return evaluateOrDefault(getASTContext().evaluator,
-    FunctionRethrowingKindRequest{const_cast<AbstractFunctionDecl *>(this)}, 
-    FunctionRethrowingKind::Invalid);
-}
-
 BraceStmt *AbstractFunctionDecl::getBody(bool canSynthesize) const {
   if ((getBodyKind() == BodyKind::Synthesize ||
        getBodyKind() == BodyKind::Unparsed) &&

lib/AST/Effects.cpp

@@ -0,0 +1,80 @@
+//===--- Effects.cpp - Effect Checking ASTs -------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 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 implements some logic for rethrows and reasync checking.
+//
+//===----------------------------------------------------------------------===//
+
+#include "swift/AST/ASTContext.h"
+#include "swift/AST/Effects.h"
+#include "swift/AST/Evaluator.h"
+#include "swift/AST/Decl.h"
+#include "swift/AST/ProtocolConformanceRef.h"
+#include "swift/AST/Type.h"
+#include "swift/AST/TypeCheckRequests.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/Support/raw_ostream.h"
+
+using namespace swift;
+
+void swift::simple_display(llvm::raw_ostream &out,
+                           const ProtocolRethrowsRequirementList list) {
+  for (auto entry : list) {
+    simple_display(out, entry.first);
+    simple_display(out, entry.second);
+  }
+}
+
+ProtocolRethrowsRequirementList 
+ProtocolDecl::getRethrowingRequirements() const {
+  return evaluateOrDefault(getASTContext().evaluator,
+    ProtocolRethrowsRequirementsRequest{const_cast<ProtocolDecl *>(this)}, 
+    ProtocolRethrowsRequirementList());
+}
+
+bool ProtocolDecl::isRethrowingProtocol() const {
+  return getAttrs().hasAttribute<swift::AtRethrowsAttr>();
+}
+
+FunctionRethrowingKind AbstractFunctionDecl::getRethrowingKind() const {
+  return evaluateOrDefault(getASTContext().evaluator,
+    FunctionRethrowingKindRequest{const_cast<AbstractFunctionDecl *>(this)}, 
+    FunctionRethrowingKind::Invalid);
+}
+
+void swift::simple_display(llvm::raw_ostream &out,
+                           FunctionRethrowingKind kind) {
+  switch (kind) {
+  case FunctionRethrowingKind::None:
+    out << "non-throwing";
+    break;
+  case FunctionRethrowingKind::ByClosure:
+    out << "by closure";
+    break;
+  case FunctionRethrowingKind::ByConformance:
+    out << "by conformance";
+    break;
+  case FunctionRethrowingKind::Throws:
+    out << "throws";
+    break;
+  case FunctionRethrowingKind::Invalid:
+    out << "invalid";
+    break;
+  }
+}
+
+bool ProtocolConformanceRef::classifyAsThrows() const {
+  if (!isConcrete()) { return true; }
+  return evaluateOrDefault(getRequirement()->getASTContext().evaluator,
+     ProtocolConformanceRefClassifyAsThrowsRequest{ *this }, 
+     true);
+}