AST: Split off Effects.cpp from Decl.cpp

Author: slavapestov

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,73 @@
+//===--- 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/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 getRethrowingRequirements().size() > 0;
+}
+
+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;
+  }
+}

lib/AST/TypeCheckRequests.cpp

@@ -278,31 +278,6 @@ void ExistentialTypeSupportedRequest::cacheResult(bool value) const {
   decl->setCachedExistentialTypeSupported(value);
 }
 
-//----------------------------------------------------------------------------//
-// getRethrowingKind computation.
-//----------------------------------------------------------------------------//
-
-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;
-  }
-}
-
 //----------------------------------------------------------------------------//
 // isFinal computation.
 //----------------------------------------------------------------------------//