Merge pull request #59373 from zoecarver/nfc-operator-cleanup

Author: zoecarver

include/swift/SIL/AbstractionPattern.h

@@ -194,16 +194,6 @@ class AbstractionPattern {
     /// non-static member function. OrigType is valid and is a function type.
     /// CXXMethod is valid.
     PartialCurriedCXXMethodType,
-    /// The uncurried imported type of a C++ operator non-static member
-    /// function. OrigType is valid and is a function type. CXXMethod is valid.
-    CXXOperatorMethodType,
-    /// The curried imported type of a C++ operator non-static member function.
-    /// OrigType is valid and is a function type. CXXMethod is valid.
-    CurriedCXXOperatorMethodType,
-    /// The partially-applied curried imported type of a C++ operator non-static
-    /// member function. OrigType is valid and is a function type. CXXMethod is
-    /// valid.
-    PartialCurriedCXXOperatorMethodType,
     /// A Swift function whose parameters and results are opaque. This is
     /// like `AP::Type<T>((T) -> T)`, except that the number of parameters is
     /// unspecified.
@@ -470,9 +460,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
       return true;
 
     default:
@@ -513,9 +500,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
       return true;
 
     default:
@@ -614,9 +598,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::ObjCCompletionHandlerArgumentsType:
       return true;
     case Kind::Invalid:
@@ -712,10 +693,6 @@ class AbstractionPattern {
   static AbstractionPattern
   getCurriedCXXMethod(CanType origType, const AbstractFunctionDecl *function);
 
-  static AbstractionPattern
-  getCurriedCXXOperatorMethod(CanType origType,
-                              const AbstractFunctionDecl *function);
-
   /// Return an abstraction pattern for the uncurried type of a C++ method.
   ///
   /// For example, if the original function is:
@@ -733,16 +710,6 @@ class AbstractionPattern {
     return pattern;
   }
 
-  static AbstractionPattern
-  getCXXOperatorMethod(CanType origType, const clang::CXXMethodDecl *method,
-                       ImportAsMemberStatus memberStatus) {
-    assert(isa<AnyFunctionType>(origType));
-    AbstractionPattern pattern;
-    pattern.initCXXMethod(nullptr, origType, method,
-                          Kind::CXXOperatorMethodType, memberStatus);
-    return pattern;
-  }
-
   /// Return an abstraction pattern for the curried type of a C++ method.
   ///
   /// For example, if the original function is:
@@ -760,17 +727,6 @@ class AbstractionPattern {
     return pattern;
   }
 
-  static AbstractionPattern
-  getCurriedCXXOperatorMethod(CanType origType,
-                              const clang::CXXMethodDecl *method,
-                              ImportAsMemberStatus memberStatus) {
-    assert(isa<AnyFunctionType>(origType));
-    AbstractionPattern pattern;
-    pattern.initCXXMethod(nullptr, origType, method,
-                          Kind::CurriedCXXOperatorMethodType, memberStatus);
-    return pattern;
-  }
-
   /// For a C-function-as-method pattern,
   /// get the index of the C function parameter that was imported as the
   /// `self` parameter of the imported method, or None if this is a static
@@ -877,18 +833,6 @@ class AbstractionPattern {
     return pattern;
   }
 
-  static AbstractionPattern
-  getPartialCurriedCXXOperatorMethod(CanGenericSignature signature,
-                                     CanType origType,
-                                     const clang::CXXMethodDecl *method,
-                                     ImportAsMemberStatus memberStatus) {
-    assert(isa<AnyFunctionType>(origType));
-    AbstractionPattern pattern;
-    pattern.initCXXMethod(signature, origType, method,
-                          Kind::PartialCurriedCXXOperatorMethodType, memberStatus);
-    return pattern;
-  }
-
 public:
   /// Return an abstraction pattern for the type of an Objective-C method.
   static AbstractionPattern
@@ -1026,9 +970,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::Type:
     case Kind::Discard:
       return OrigType;
@@ -1065,9 +1006,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::Type:
     case Kind::Discard:
     case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1106,9 +1044,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::ObjCCompletionHandlerArgumentsType:
       return true;
     }
@@ -1147,9 +1082,7 @@ class AbstractionPattern {
   /// If so, it is legal to call getCXXMethod().
   bool isCXXMethod() const {
     return (getKind() == Kind::CXXMethodType ||
-            getKind() == Kind::CurriedCXXMethodType ||
-            getKind() == Kind::CXXOperatorMethodType ||
-            getKind() == Kind::CurriedCXXOperatorMethodType);
+            getKind() == Kind::CurriedCXXMethodType);
   }
 
   const clang::CXXMethodDecl *getCXXMethod() const {
@@ -1184,9 +1117,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
     case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1224,9 +1154,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::Type:
     case Kind::Discard:
     case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1256,9 +1183,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
     case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1289,9 +1213,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
       return false;
@@ -1320,9 +1241,6 @@ class AbstractionPattern {
     case Kind::CXXMethodType:
     case Kind::CurriedCXXMethodType:
     case Kind::PartialCurriedCXXMethodType:
-    case Kind::CXXOperatorMethodType:
-    case Kind::CurriedCXXOperatorMethodType:
-    case Kind::PartialCurriedCXXOperatorMethodType:
     case Kind::OpaqueFunction:
     case Kind::OpaqueDerivativeFunction:
       llvm_unreachable("pattern is not a tuple");      

lib/ClangImporter/ImportDecl.cpp

@@ -8872,16 +8872,6 @@ bool importer::isSpecialUIKitStructZeroProperty(const clang::NamedDecl *decl) {
   return ident->isStr("UIEdgeInsetsZero") || ident->isStr("UIOffsetZero");
 }
 
-bool importer::isImportedAsStatic(const clang::OverloadedOperatorKind op) {
-  switch (op) {
-#define OVERLOADED_OPERATOR(Name,Spelling,Token,Unary,Binary,MemberOnly) \
-  case clang::OO_##Name: return !MemberOnly;
-#include "clang/Basic/OperatorKinds.def"
-  default:
-    llvm_unreachable("not an operator");
-  }
-}
-
 bool importer::hasSameUnderlyingType(const clang::Type *a,
                                      const clang::TemplateTypeParmDecl *b) {
   while (a->isPointerType() || a->isReferenceType())

lib/ClangImporter/ImporterImpl.h

@@ -1771,10 +1771,6 @@ bool shouldSuppressDeclImport(const clang::Decl *decl);
 /// but are now renamed using the swift_name attribute.
 bool isSpecialUIKitStructZeroProperty(const clang::NamedDecl *decl);
 
-/// \returns true if this operator should be made a static function
-/// even if imported as a non-static member function.
-bool isImportedAsStatic(clang::OverloadedOperatorKind op);
-
 /// \returns true if \p a has the same underlying type as \p b after removing
 /// any pointer/reference specifiers. Note that this does not currently look through
 /// nested types other than pointers or references.