[nfc] fix bad merge

Author: kavon

include/swift/AST/TypeCheckRequests.h

@@ -428,46 +428,6 @@ class HasNoncopyableAnnotationRequest
   void cacheResult(bool value) const;
 };
 
-/// Determine whether the given type is noncopyable.
-/// Assumes a generic signature has been built.
-class IsNoncopyableRequest
-    : public SimpleRequest<IsNoncopyableRequest, bool(CanType),
-                           RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  bool evaluate(Evaluator &evaluator, CanType type) const;
-
-public:
-  // Caching.
-  bool isCached() const { return true; }
-};
-
-/// Determine whether the given declaration is escapable.
-class IsEscapableRequest
-    : public SimpleRequest<IsEscapableRequest, bool(ValueDecl *),
-                           RequestFlags::SeparatelyCached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  bool evaluate(Evaluator &evaluator, ValueDecl *decl) const;
-
-public:
-  // Separate caching.
-  bool isCached() const { return true; }
-  llvm::Optional<bool> getCachedResult() const;
-  void cacheResult(bool value) const;
-};
-
-
 /// Determine whether the given declaration is escapable.
 class IsEscapableRequest
     : public SimpleRequest<IsEscapableRequest, bool(ValueDecl *),